From 8bd8287c15389e4c026673c2bdd4600ff7c1ce71 Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Tue, 20 Feb 2024 13:03:21 +0100 Subject: [PATCH 01/31] Java 11 support - set version back to 1.4.1-SNAPSHOT - Downgrade Java 17 -> Java 11 --- openpdf-fonts-extra/pom.xml | 2 +- openpdf/pom.xml | 2 +- pdf-swing/pom.xml | 2 +- pdf-toolbox/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openpdf-fonts-extra/pom.xml b/openpdf-fonts-extra/pom.xml index 5e984988c..6444edb7e 100644 --- a/openpdf-fonts-extra/pom.xml +++ b/openpdf-fonts-extra/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.3.41-SNAPSHOT + 1.4.1-SNAPSHOT openpdf-fonts-extra diff --git a/openpdf/pom.xml b/openpdf/pom.xml index e90b9d1c1..864549528 100644 --- a/openpdf/pom.xml +++ b/openpdf/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.3.41-SNAPSHOT + 1.4.1-SNAPSHOT openpdf diff --git a/pdf-swing/pom.xml b/pdf-swing/pom.xml index 81c64ed69..8671b8960 100644 --- a/pdf-swing/pom.xml +++ b/pdf-swing/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.3.41-SNAPSHOT + 1.4.1-SNAPSHOT pdf-swing diff --git a/pdf-toolbox/pom.xml b/pdf-toolbox/pom.xml index c2fbdf942..d605fab55 100644 --- a/pdf-toolbox/pom.xml +++ b/pdf-toolbox/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.3.41-SNAPSHOT + 1.4.1-SNAPSHOT pdf-toolbox diff --git a/pom.xml b/pom.xml index cfff0c478..19a3dbf43 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.3.41-SNAPSHOT + 1.4.1-SNAPSHOT pom From 6b96435e9c8c5c82f9fec10d48bb54f1aa4050ac Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Tue, 20 Feb 2024 13:07:47 +0100 Subject: [PATCH 02/31] jEnv settings for java 11 --- .gitignore | 2 -- .java-version | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 .java-version diff --git a/.gitignore b/.gitignore index 7da88690d..3ee102790 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,6 @@ local.properties .recommenders .project .classpath -# If you use jenv -.java-version # External tool builders .externalToolBuilders/ diff --git a/.java-version b/.java-version new file mode 100644 index 000000000..b4de39476 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +11 From eb67fc3ba115e7f79786e07709de0c8e6362ef83 Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Tue, 20 Feb 2024 13:39:58 +0100 Subject: [PATCH 03/31] Don't share license files anymore --- openpdf-fonts-extra/pom.xml | 10 - .../src}/main/resources/META-INF/LGPL-2.1.md | 0 .../src}/main/resources/META-INF/LICENSES.md | 0 .../src}/main/resources/META-INF/MPL-2.0.txt | 0 openpdf/pom.xml | 3 - .../src/main/resources/META-INF/LGPL-2.1.md | 398 ++++++++++++++++++ .../src/main/resources/META-INF/LICENSES.md | 22 + .../src/main/resources/META-INF/MPL-2.0.txt | 361 ++++++++++++++++ pdf-swing/pom.xml | 10 - .../src/main/resources/META-INF/LGPL-2.1.md | 398 ++++++++++++++++++ .../src/main/resources/META-INF/LICENSES.md | 22 + .../src/main/resources/META-INF/MPL-2.0.txt | 361 ++++++++++++++++ pdf-toolbox/pom.xml | 10 - .../src/main/resources/META-INF/LGPL-2.1.md | 398 ++++++++++++++++++ .../src/main/resources/META-INF/LICENSES.md | 22 + .../src/main/resources/META-INF/MPL-2.0.txt | 361 ++++++++++++++++ 16 files changed, 2343 insertions(+), 33 deletions(-) rename {src => openpdf-fonts-extra/src}/main/resources/META-INF/LGPL-2.1.md (100%) rename {src => openpdf-fonts-extra/src}/main/resources/META-INF/LICENSES.md (100%) rename {src => openpdf-fonts-extra/src}/main/resources/META-INF/MPL-2.0.txt (100%) create mode 100644 openpdf/src/main/resources/META-INF/LGPL-2.1.md create mode 100644 openpdf/src/main/resources/META-INF/LICENSES.md create mode 100644 openpdf/src/main/resources/META-INF/MPL-2.0.txt create mode 100644 pdf-swing/src/main/resources/META-INF/LGPL-2.1.md create mode 100644 pdf-swing/src/main/resources/META-INF/LICENSES.md create mode 100644 pdf-swing/src/main/resources/META-INF/MPL-2.0.txt create mode 100644 pdf-toolbox/src/main/resources/META-INF/LGPL-2.1.md create mode 100644 pdf-toolbox/src/main/resources/META-INF/LICENSES.md create mode 100644 pdf-toolbox/src/main/resources/META-INF/MPL-2.0.txt diff --git a/openpdf-fonts-extra/pom.xml b/openpdf-fonts-extra/pom.xml index 6444edb7e..146aaf787 100644 --- a/openpdf-fonts-extra/pom.xml +++ b/openpdf-fonts-extra/pom.xml @@ -28,14 +28,4 @@ - - - - src/main/resources - - - ../src/main/resources - - - diff --git a/src/main/resources/META-INF/LGPL-2.1.md b/openpdf-fonts-extra/src/main/resources/META-INF/LGPL-2.1.md similarity index 100% rename from src/main/resources/META-INF/LGPL-2.1.md rename to openpdf-fonts-extra/src/main/resources/META-INF/LGPL-2.1.md diff --git a/src/main/resources/META-INF/LICENSES.md b/openpdf-fonts-extra/src/main/resources/META-INF/LICENSES.md similarity index 100% rename from src/main/resources/META-INF/LICENSES.md rename to openpdf-fonts-extra/src/main/resources/META-INF/LICENSES.md diff --git a/src/main/resources/META-INF/MPL-2.0.txt b/openpdf-fonts-extra/src/main/resources/META-INF/MPL-2.0.txt similarity index 100% rename from src/main/resources/META-INF/MPL-2.0.txt rename to openpdf-fonts-extra/src/main/resources/META-INF/MPL-2.0.txt diff --git a/openpdf/pom.xml b/openpdf/pom.xml index 864549528..eee68d082 100644 --- a/openpdf/pom.xml +++ b/openpdf/pom.xml @@ -87,9 +87,6 @@ src/main/resources-filtered true - - ../src/main/resources - diff --git a/openpdf/src/main/resources/META-INF/LGPL-2.1.md b/openpdf/src/main/resources/META-INF/LGPL-2.1.md new file mode 100644 index 000000000..1eff120ed --- /dev/null +++ b/openpdf/src/main/resources/META-INF/LGPL-2.1.md @@ -0,0 +1,398 @@ +### GNU LESSER GENERAL PUBLIC LICENSE + +Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + [This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + +### Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By +contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + +This license, the Lesser General Public License, applies to some specially designated software +packages--typically libraries--of the Free Software Foundation and other authors who decide to use +it. You can use it too, but we suggest you first think carefully about whether this license or the +ordinary General Public License is the better strategy to use in any particular case, based on the +explanations below. + +When we speak of free software, we are referring to freedom of use, not price. Our General Public +Licenses are designed to make sure that you have the freedom to distribute copies of free software ( +and charge for this service if you wish); that you receive source code or can get it if you want it; +that you can change the software and use pieces of it in new free programs; and that you are +informed that you can do these things. + +To protect your rights, we need to make restrictions that forbid distributors to deny you these +rights or to ask you to surrender these rights. These restrictions translate to certain +responsibilities for you if you distribute copies of the library or if you modify it. + +For example, if you distribute copies of the library, whether gratis or for a fee, you must give the +recipients all the rights that we gave you. You must make sure that they, too, receive or can get +the source code. If you link other code with the library, you must provide complete object files to +the recipients, so that they can relink them with the library after making changes to the library +and recompiling it. And you must show them these terms so they know their rights. + +We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you +this license, which gives you legal permission to copy, distribute and/or modify the library. + +To protect each distributor, we want to make it very clear that there is no warranty for the free +library. Also, if the library is modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original author's reputation will not +be affected by problems that might be introduced by others. + +Finally, software patents pose a constant threat to the existence of any free program. We wish to +make sure that a company cannot effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that any patent license obtained for +a version of the library must be consistent with the full freedom of use specified in this license. + +Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. +This license, the GNU Lesser General Public License, applies to certain designated libraries, and is +quite different from the ordinary General Public License. We use this license for certain libraries +in order to permit linking those libraries into non-free programs. + +When a program is linked with a library, whether statically or using a shared library, the +combination of the two is legally speaking a combined work, a derivative of the original library. +The ordinary General Public License therefore permits such linking only if the entire combination +fits its criteria of freedom. The Lesser General Public License permits more lax criteria for +linking other code with the library. + +We call this license the "Lesser" General Public License because it does Less to protect the user's +freedom than the ordinary General Public License. It also provides other free software developers +Less of an advantage over competing non-free programs. These disadvantages are the reason we use the +ordinary General Public License for many libraries. However, the Lesser license provides advantages +in certain special circumstances. + +For example, on rare occasions, there may be a special need to encourage the widest possible use of +a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free library does the same job as +widely used non-free libraries. In this case, there is little to gain by limiting the free library +to free software only, so we use the Lesser General Public License. + +In other cases, permission to use a particular library in non-free programs enables a greater number +of people to use a large body of free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU operating system, as well as its +variant, the GNU/Linux operating system. + +Although the Lesser General Public License is Less protective of the users' freedom, it does ensure +that the user of a program that is linked with the Library has the freedom and the wherewithal to +run that program using a modified version of the Library. + +The precise terms and conditions for copying, distribution and modification follow. Pay close +attention to the difference between a +"work based on the library" and a "work that uses the library". The former contains code derived +from the library, whereas the latter must be combined with the library in order to run. + +### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +**0.** This License Agreement applies to any software library or other program which contains a +notice placed by the copyright holder or other authorized party saying it may be distributed under +the terms of this Lesser General Public License (also called "this License"). Each licensee is +addressed as "you". + +A "library" means a collection of software functions and/or data prepared so as to be conveniently +linked with application programs +(which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work which has been distributed under +these terms. A "work based on the Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or +with modifications and/or translated straightforwardly into another language. (Hereinafter, +translation is included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for making modifications to it. For a +library, complete source code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to control compilation and installation +of the library. + +Activities other than copying, distribution and modification are not covered by this License; they +are outside its scope. The act of running a program using the Library is not restricted, and output +from such a program is covered only if its contents constitute a work based on the Library ( +independent of the use of the Library in a tool for writing it). Whether that is true depends on +what the Library does and what the program that uses the Library does. + +**1.** You may copy and distribute verbatim copies of the Library's complete source code as you +receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to +this License and to the absence of any warranty; and distribute a copy of this License along with +the Library. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer +warranty protection in exchange for a fee. + +**2.** You may modify your copy or copies of the Library or any portion of it, thus forming a work +based on the Library, and copy and distribute such modifications or work under the terms of Section +1 above, provided that you also meet all of these conditions: + +- **a)** The modified work must itself be a software library. +- **b)** You must cause the files modified to carry prominent notices stating that you changed the + files and the date of any change. +- **c)** You must cause the whole of the work to be licensed at no charge to all third parties under + the terms of this License. +- **d)** If a facility in the modified Library refers to a function or a table of data to be + supplied by an application program that uses the facility, other than as an argument passed when + the facility is invoked, then you must make a good faith effort to ensure that, in the event an + application does not supply such function or table, the facility still operates, and performs + whatever part of its purpose remains meaningful. + + (For example, a function in a library to compute square roots has a purpose that is entirely + well-defined independent of the application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must be optional: if the application + does not supply it, the square root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are +not derived from the Library, and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same sections as part of a whole which is a work +based on the Library, the distribution of the whole must be on the terms of this License, whose +permissions for other licensees extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written +entirely by you; rather, the intent is to exercise the right to control the distribution of +derivative or collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library with the Library (or with a +work based on the Library) on a volume of a storage or distribution medium does not bring the other +work under the scope of this License. + +**3.** You may opt to apply the terms of the ordinary GNU General Public License instead of this +License to a given copy of the Library. To do this, you must alter all the notices that refer to +this License, so that they refer to the ordinary GNU General Public License, version 2, instead of +to this License. (If a newer version than version 2 of the ordinary GNU General Public License has +appeared, then you can specify that version instead if you wish.) Do not make any other change in +these notices. + +Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU +General Public License applies to all subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the Library into a program that is +not a library. + +**4.** You may copy and distribute the Library (or a portion or derivative of it, under Section 2) +in object code or executable form under the terms of Sections 1 and 2 above provided that you +accompany it with the complete corresponding machine-readable source code, which must be distributed +under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from a designated place, then +offering equivalent access to copy the source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not compelled to copy the source along +with the object code. + +**5.** A program that contains no derivative of any portion of the Library, but is designed to work +with the Library by being compiled or linked with it, is called a "work that uses the Library". Such +a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope +of this License. + +However, linking a "work that uses the Library" with the Library creates an executable that is a +derivative of the Library (because it contains portions of the Library), rather than a "work that +uses the library". The executable is therefore covered by this License. Section 6 states terms for +distribution of such executables. + +When a "work that uses the Library" uses material from a header file that is part of the Library, +the object code for the work may be a derivative work of the Library even though the source code is +not. Whether this is true is especially significant if the work can be linked without the Library, +or if the work is itself a library. The threshold for this to be true is not precisely defined by +law. + +If such an object file uses only numerical parameters, data structure layouts and accessors, and +small macros and small inline functions +(ten lines or less in length), then the use of the object file is unrestricted, regardless of +whether it is legally a derivative work. +(Executables containing this object code plus portions of the Library will still fall under Section +6.) + +Otherwise, if the work is a derivative of the Library, you may distribute the object code for the +work under the terms of Section 6. Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +**6.** As an exception to the Sections above, you may also combine or link a "work that uses the +Library" with the Library to produce a work containing portions of the Library, and distribute that +work under terms of your choice, provided that the terms permit modification of the work for the +customer's own use and reverse engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the Library is used in it and that +the Library and its use are covered by this License. You must supply a copy of this License. If the +work during execution displays copyright notices, you must include the copyright notice for the +Library among them, as well as a reference directing the user to the copy of this License. Also, you +must do one of these things: + +- **a)** Accompany the work with the complete corresponding machine-readable source code for the + Library including whatever changes were used in the work (which must be distributed under Sections + 1 and 2 above); and, if the work is an executable linked with the Library, with the complete + machine-readable "work that uses the Library", as object code and/or source code, so that the user + can modify the Library and then relink to produce a modified executable containing the modified + Library. (It is understood that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application to use the modified + definitions.) +- **b)** Use a suitable shared library mechanism for linking with the Library. A suitable mechanism + is one that (1) uses at run time a copy of the library already present on the user's computer + system, rather than copying library functions into the executable, and (2) will operate properly + with a modified version of the library, if the user installs one, as long as the modified version + is interface-compatible with the version that the work was made with. +- **c)** Accompany the work with a written offer, valid for at least three years, to give the same + user the materials specified in Subsection 6a, above, for a charge no more than the cost of + performing this distribution. +- **d)** If distribution of the work is made by offering access to copy from a designated place, + offer equivalent access to copy the above specified materials from the same place. +- **e)** Verify that the user has already received a copy of these materials or that you have + already sent this user a copy. + +For an executable, the required form of the "work that uses the Library" must include any data and +utility programs needed for reproducing the executable from it. However, as a special exception, the +materials to be distributed need not include anything that is normally distributed (in either source +or binary form) with the major components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies the executable. + +It may happen that this requirement contradicts the license restrictions of other proprietary +libraries that do not normally accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you distribute. + +**7.** You may place library facilities that are a work based on the Library side-by-side in a +single library together with other library facilities not covered by this License, and distribute +such a combined library, provided that the separate distribution of the work based on the Library +and of the other library facilities is otherwise permitted, and provided that you do these two +things: + +- **a)** Accompany the combined library with a copy of the same work based on the Library, + uncombined with any other library facilities. This must be distributed under the terms of the + Sections above. +- **b)** Give prominent notice with the combined library of the fact that part of it is a work based + on the Library, and explaining where to find the accompanying uncombined form of the same work. + +**8.** You may not copy, modify, sublicense, link with, or distribute the Library except as +expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, +or distribute the Library is void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under this License will not have +their licenses terminated so long as such parties remain in full compliance. + +**9.** You are not required to accept this License, since you have not signed it. However, nothing +else grants you permission to modify or distribute the Library or its derivative works. These +actions are prohibited by law if you do not accept this License. Therefore, by modifying or +distributing the Library (or any work based on the Library), you indicate your acceptance of this +License to do so, and all its terms and conditions for copying, distributing or modifying the +Library or works based on it. + +**10.** Each time you redistribute the Library (or any work based on the Library), the recipient +automatically receives a license from the original licensor to copy, distribute, link with or modify +the Library subject to these terms and conditions. You may not impose any further restrictions on +the recipients' exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties with this License. + +**11.** If, as a consequence of a court judgment or allegation of patent infringement or for any +other reason (not limited to patent issues), conditions are imposed on you (whether by court order, +agreement or otherwise) that contradict the conditions of this License, they do not excuse you from +the conditions of this License. If you cannot distribute so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, then as a consequence you may +not distribute the Library at all. For example, if a patent license would not permit royalty-free +redistribution of the Library by all those who receive copies directly or indirectly through you, +then the only way you could satisfy both it and this License would be to refrain entirely from +distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, +the balance of the section is intended to apply, and the section as a whole is intended to apply in +other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right +claims or to contest validity of any such claims; this section has the sole purpose of protecting +the integrity of the free software distribution system which is implemented by public license +practices. Many people have made generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that system; it is up to the +author/donor to decide if he or she is willing to distribute software through any other system and a +licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest +of this License. + +**12.** If the distribution and/or use of the Library is restricted in certain countries either by +patents or by copyrighted interfaces, the original copyright holder who places the Library under +this License may add an explicit geographical distribution limitation excluding those countries, so +that distribution is permitted only in or among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the body of this License. + +**13.** The Free Software Foundation may publish revised and/or new versions of the Lesser General +Public License from time to time. Such new versions will be similar in spirit to the present +version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library specifies a version number of +this License which applies to it and +"any later version", you have the option of following the terms and conditions either of that +version or of any later version published by the Free Software Foundation. If the Library does not +specify a license version number, you may choose any version ever published by the Free Software +Foundation. + +**14.** If you wish to incorporate parts of the Library into other free programs whose distribution +conditions are incompatible with these, write to the author to ask for permission. For software +which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the +free status of all derivatives of our free software and of promoting the sharing and reuse of +software generally. + +**NO WARRANTY** + +**15.** BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE +EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS +AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. +SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +**16.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT +HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE +LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR +DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES. + +### END OF TERMS AND CONDITIONS + +### How to Apply These Terms to Your New Libraries + +If you develop a new library, and you want it to be of the greatest possible use to the public, we +recommend making it free software that everyone can redistribute and change. You can do so by +permitting redistribution under these terms (or, alternatively, under the terms of the ordinary +General Public License). + +To apply these terms, attach the following notices to the library. It is safest to attach them to +the start of each source file to most effectively convey the exclusion of warranty; and each file +should have at least the "copyright" line and a pointer to where the full notice is found. + + one line to give the library's name and an idea of what it does. + Copyright (C) year name of author + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a " +copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the library `Frob' (a library for tweaking knobs) written + by James Random Hacker. + + signature of Ty Coon, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! \ No newline at end of file diff --git a/openpdf/src/main/resources/META-INF/LICENSES.md b/openpdf/src/main/resources/META-INF/LICENSES.md new file mode 100644 index 000000000..3acc9b9a8 --- /dev/null +++ b/openpdf/src/main/resources/META-INF/LICENSES.md @@ -0,0 +1,22 @@ +# Licenses + +## Licenses of OpenPDF + +### Mozilla Public License Version 2.0 + +Please see https://www.mozilla.org/en-US/MPL/2.0/ or the attached file +[MPL-2.0.txt](MPL-2.0.txt). + +### GNU Lesser General Public License 2.1 + +Please see https://www.gnu.org/licenses/old-licenses/lgpl-2.1 or the attached file +[LGPL-2.1.md](LGPL-2.1.md). + +#### Apache License, Version 2.0 + +Some files use code from different Apache projects. The source code of these files contains the appropriate copyright +notices as described in the Appendix of `http://www.apache.org/licenses/LICENSE-2.0`. + +Please see https://www.apache.org/licenses/LICENSE-2.0 or the attached file +[APACHE-LICENSE-2.0.txt](APACHE-LICENSE-2.0.txt). + diff --git a/openpdf/src/main/resources/META-INF/MPL-2.0.txt b/openpdf/src/main/resources/META-INF/MPL-2.0.txt new file mode 100644 index 000000000..578700fd6 --- /dev/null +++ b/openpdf/src/main/resources/META-INF/MPL-2.0.txt @@ -0,0 +1,361 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. diff --git a/pdf-swing/pom.xml b/pdf-swing/pom.xml index 8671b8960..7ea911a11 100644 --- a/pdf-swing/pom.xml +++ b/pdf-swing/pom.xml @@ -30,14 +30,4 @@ - - - - src/main/resources - - - ../src/main/resources - - - diff --git a/pdf-swing/src/main/resources/META-INF/LGPL-2.1.md b/pdf-swing/src/main/resources/META-INF/LGPL-2.1.md new file mode 100644 index 000000000..1eff120ed --- /dev/null +++ b/pdf-swing/src/main/resources/META-INF/LGPL-2.1.md @@ -0,0 +1,398 @@ +### GNU LESSER GENERAL PUBLIC LICENSE + +Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + [This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + +### Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By +contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + +This license, the Lesser General Public License, applies to some specially designated software +packages--typically libraries--of the Free Software Foundation and other authors who decide to use +it. You can use it too, but we suggest you first think carefully about whether this license or the +ordinary General Public License is the better strategy to use in any particular case, based on the +explanations below. + +When we speak of free software, we are referring to freedom of use, not price. Our General Public +Licenses are designed to make sure that you have the freedom to distribute copies of free software ( +and charge for this service if you wish); that you receive source code or can get it if you want it; +that you can change the software and use pieces of it in new free programs; and that you are +informed that you can do these things. + +To protect your rights, we need to make restrictions that forbid distributors to deny you these +rights or to ask you to surrender these rights. These restrictions translate to certain +responsibilities for you if you distribute copies of the library or if you modify it. + +For example, if you distribute copies of the library, whether gratis or for a fee, you must give the +recipients all the rights that we gave you. You must make sure that they, too, receive or can get +the source code. If you link other code with the library, you must provide complete object files to +the recipients, so that they can relink them with the library after making changes to the library +and recompiling it. And you must show them these terms so they know their rights. + +We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you +this license, which gives you legal permission to copy, distribute and/or modify the library. + +To protect each distributor, we want to make it very clear that there is no warranty for the free +library. Also, if the library is modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original author's reputation will not +be affected by problems that might be introduced by others. + +Finally, software patents pose a constant threat to the existence of any free program. We wish to +make sure that a company cannot effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that any patent license obtained for +a version of the library must be consistent with the full freedom of use specified in this license. + +Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. +This license, the GNU Lesser General Public License, applies to certain designated libraries, and is +quite different from the ordinary General Public License. We use this license for certain libraries +in order to permit linking those libraries into non-free programs. + +When a program is linked with a library, whether statically or using a shared library, the +combination of the two is legally speaking a combined work, a derivative of the original library. +The ordinary General Public License therefore permits such linking only if the entire combination +fits its criteria of freedom. The Lesser General Public License permits more lax criteria for +linking other code with the library. + +We call this license the "Lesser" General Public License because it does Less to protect the user's +freedom than the ordinary General Public License. It also provides other free software developers +Less of an advantage over competing non-free programs. These disadvantages are the reason we use the +ordinary General Public License for many libraries. However, the Lesser license provides advantages +in certain special circumstances. + +For example, on rare occasions, there may be a special need to encourage the widest possible use of +a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free library does the same job as +widely used non-free libraries. In this case, there is little to gain by limiting the free library +to free software only, so we use the Lesser General Public License. + +In other cases, permission to use a particular library in non-free programs enables a greater number +of people to use a large body of free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU operating system, as well as its +variant, the GNU/Linux operating system. + +Although the Lesser General Public License is Less protective of the users' freedom, it does ensure +that the user of a program that is linked with the Library has the freedom and the wherewithal to +run that program using a modified version of the Library. + +The precise terms and conditions for copying, distribution and modification follow. Pay close +attention to the difference between a +"work based on the library" and a "work that uses the library". The former contains code derived +from the library, whereas the latter must be combined with the library in order to run. + +### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +**0.** This License Agreement applies to any software library or other program which contains a +notice placed by the copyright holder or other authorized party saying it may be distributed under +the terms of this Lesser General Public License (also called "this License"). Each licensee is +addressed as "you". + +A "library" means a collection of software functions and/or data prepared so as to be conveniently +linked with application programs +(which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work which has been distributed under +these terms. A "work based on the Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or +with modifications and/or translated straightforwardly into another language. (Hereinafter, +translation is included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for making modifications to it. For a +library, complete source code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to control compilation and installation +of the library. + +Activities other than copying, distribution and modification are not covered by this License; they +are outside its scope. The act of running a program using the Library is not restricted, and output +from such a program is covered only if its contents constitute a work based on the Library ( +independent of the use of the Library in a tool for writing it). Whether that is true depends on +what the Library does and what the program that uses the Library does. + +**1.** You may copy and distribute verbatim copies of the Library's complete source code as you +receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to +this License and to the absence of any warranty; and distribute a copy of this License along with +the Library. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer +warranty protection in exchange for a fee. + +**2.** You may modify your copy or copies of the Library or any portion of it, thus forming a work +based on the Library, and copy and distribute such modifications or work under the terms of Section +1 above, provided that you also meet all of these conditions: + +- **a)** The modified work must itself be a software library. +- **b)** You must cause the files modified to carry prominent notices stating that you changed the + files and the date of any change. +- **c)** You must cause the whole of the work to be licensed at no charge to all third parties under + the terms of this License. +- **d)** If a facility in the modified Library refers to a function or a table of data to be + supplied by an application program that uses the facility, other than as an argument passed when + the facility is invoked, then you must make a good faith effort to ensure that, in the event an + application does not supply such function or table, the facility still operates, and performs + whatever part of its purpose remains meaningful. + + (For example, a function in a library to compute square roots has a purpose that is entirely + well-defined independent of the application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must be optional: if the application + does not supply it, the square root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are +not derived from the Library, and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same sections as part of a whole which is a work +based on the Library, the distribution of the whole must be on the terms of this License, whose +permissions for other licensees extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written +entirely by you; rather, the intent is to exercise the right to control the distribution of +derivative or collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library with the Library (or with a +work based on the Library) on a volume of a storage or distribution medium does not bring the other +work under the scope of this License. + +**3.** You may opt to apply the terms of the ordinary GNU General Public License instead of this +License to a given copy of the Library. To do this, you must alter all the notices that refer to +this License, so that they refer to the ordinary GNU General Public License, version 2, instead of +to this License. (If a newer version than version 2 of the ordinary GNU General Public License has +appeared, then you can specify that version instead if you wish.) Do not make any other change in +these notices. + +Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU +General Public License applies to all subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the Library into a program that is +not a library. + +**4.** You may copy and distribute the Library (or a portion or derivative of it, under Section 2) +in object code or executable form under the terms of Sections 1 and 2 above provided that you +accompany it with the complete corresponding machine-readable source code, which must be distributed +under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from a designated place, then +offering equivalent access to copy the source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not compelled to copy the source along +with the object code. + +**5.** A program that contains no derivative of any portion of the Library, but is designed to work +with the Library by being compiled or linked with it, is called a "work that uses the Library". Such +a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope +of this License. + +However, linking a "work that uses the Library" with the Library creates an executable that is a +derivative of the Library (because it contains portions of the Library), rather than a "work that +uses the library". The executable is therefore covered by this License. Section 6 states terms for +distribution of such executables. + +When a "work that uses the Library" uses material from a header file that is part of the Library, +the object code for the work may be a derivative work of the Library even though the source code is +not. Whether this is true is especially significant if the work can be linked without the Library, +or if the work is itself a library. The threshold for this to be true is not precisely defined by +law. + +If such an object file uses only numerical parameters, data structure layouts and accessors, and +small macros and small inline functions +(ten lines or less in length), then the use of the object file is unrestricted, regardless of +whether it is legally a derivative work. +(Executables containing this object code plus portions of the Library will still fall under Section +6.) + +Otherwise, if the work is a derivative of the Library, you may distribute the object code for the +work under the terms of Section 6. Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +**6.** As an exception to the Sections above, you may also combine or link a "work that uses the +Library" with the Library to produce a work containing portions of the Library, and distribute that +work under terms of your choice, provided that the terms permit modification of the work for the +customer's own use and reverse engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the Library is used in it and that +the Library and its use are covered by this License. You must supply a copy of this License. If the +work during execution displays copyright notices, you must include the copyright notice for the +Library among them, as well as a reference directing the user to the copy of this License. Also, you +must do one of these things: + +- **a)** Accompany the work with the complete corresponding machine-readable source code for the + Library including whatever changes were used in the work (which must be distributed under Sections + 1 and 2 above); and, if the work is an executable linked with the Library, with the complete + machine-readable "work that uses the Library", as object code and/or source code, so that the user + can modify the Library and then relink to produce a modified executable containing the modified + Library. (It is understood that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application to use the modified + definitions.) +- **b)** Use a suitable shared library mechanism for linking with the Library. A suitable mechanism + is one that (1) uses at run time a copy of the library already present on the user's computer + system, rather than copying library functions into the executable, and (2) will operate properly + with a modified version of the library, if the user installs one, as long as the modified version + is interface-compatible with the version that the work was made with. +- **c)** Accompany the work with a written offer, valid for at least three years, to give the same + user the materials specified in Subsection 6a, above, for a charge no more than the cost of + performing this distribution. +- **d)** If distribution of the work is made by offering access to copy from a designated place, + offer equivalent access to copy the above specified materials from the same place. +- **e)** Verify that the user has already received a copy of these materials or that you have + already sent this user a copy. + +For an executable, the required form of the "work that uses the Library" must include any data and +utility programs needed for reproducing the executable from it. However, as a special exception, the +materials to be distributed need not include anything that is normally distributed (in either source +or binary form) with the major components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies the executable. + +It may happen that this requirement contradicts the license restrictions of other proprietary +libraries that do not normally accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you distribute. + +**7.** You may place library facilities that are a work based on the Library side-by-side in a +single library together with other library facilities not covered by this License, and distribute +such a combined library, provided that the separate distribution of the work based on the Library +and of the other library facilities is otherwise permitted, and provided that you do these two +things: + +- **a)** Accompany the combined library with a copy of the same work based on the Library, + uncombined with any other library facilities. This must be distributed under the terms of the + Sections above. +- **b)** Give prominent notice with the combined library of the fact that part of it is a work based + on the Library, and explaining where to find the accompanying uncombined form of the same work. + +**8.** You may not copy, modify, sublicense, link with, or distribute the Library except as +expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, +or distribute the Library is void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under this License will not have +their licenses terminated so long as such parties remain in full compliance. + +**9.** You are not required to accept this License, since you have not signed it. However, nothing +else grants you permission to modify or distribute the Library or its derivative works. These +actions are prohibited by law if you do not accept this License. Therefore, by modifying or +distributing the Library (or any work based on the Library), you indicate your acceptance of this +License to do so, and all its terms and conditions for copying, distributing or modifying the +Library or works based on it. + +**10.** Each time you redistribute the Library (or any work based on the Library), the recipient +automatically receives a license from the original licensor to copy, distribute, link with or modify +the Library subject to these terms and conditions. You may not impose any further restrictions on +the recipients' exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties with this License. + +**11.** If, as a consequence of a court judgment or allegation of patent infringement or for any +other reason (not limited to patent issues), conditions are imposed on you (whether by court order, +agreement or otherwise) that contradict the conditions of this License, they do not excuse you from +the conditions of this License. If you cannot distribute so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, then as a consequence you may +not distribute the Library at all. For example, if a patent license would not permit royalty-free +redistribution of the Library by all those who receive copies directly or indirectly through you, +then the only way you could satisfy both it and this License would be to refrain entirely from +distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, +the balance of the section is intended to apply, and the section as a whole is intended to apply in +other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right +claims or to contest validity of any such claims; this section has the sole purpose of protecting +the integrity of the free software distribution system which is implemented by public license +practices. Many people have made generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that system; it is up to the +author/donor to decide if he or she is willing to distribute software through any other system and a +licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest +of this License. + +**12.** If the distribution and/or use of the Library is restricted in certain countries either by +patents or by copyrighted interfaces, the original copyright holder who places the Library under +this License may add an explicit geographical distribution limitation excluding those countries, so +that distribution is permitted only in or among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the body of this License. + +**13.** The Free Software Foundation may publish revised and/or new versions of the Lesser General +Public License from time to time. Such new versions will be similar in spirit to the present +version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library specifies a version number of +this License which applies to it and +"any later version", you have the option of following the terms and conditions either of that +version or of any later version published by the Free Software Foundation. If the Library does not +specify a license version number, you may choose any version ever published by the Free Software +Foundation. + +**14.** If you wish to incorporate parts of the Library into other free programs whose distribution +conditions are incompatible with these, write to the author to ask for permission. For software +which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the +free status of all derivatives of our free software and of promoting the sharing and reuse of +software generally. + +**NO WARRANTY** + +**15.** BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE +EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS +AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. +SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +**16.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT +HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE +LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR +DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES. + +### END OF TERMS AND CONDITIONS + +### How to Apply These Terms to Your New Libraries + +If you develop a new library, and you want it to be of the greatest possible use to the public, we +recommend making it free software that everyone can redistribute and change. You can do so by +permitting redistribution under these terms (or, alternatively, under the terms of the ordinary +General Public License). + +To apply these terms, attach the following notices to the library. It is safest to attach them to +the start of each source file to most effectively convey the exclusion of warranty; and each file +should have at least the "copyright" line and a pointer to where the full notice is found. + + one line to give the library's name and an idea of what it does. + Copyright (C) year name of author + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a " +copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the library `Frob' (a library for tweaking knobs) written + by James Random Hacker. + + signature of Ty Coon, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! \ No newline at end of file diff --git a/pdf-swing/src/main/resources/META-INF/LICENSES.md b/pdf-swing/src/main/resources/META-INF/LICENSES.md new file mode 100644 index 000000000..3acc9b9a8 --- /dev/null +++ b/pdf-swing/src/main/resources/META-INF/LICENSES.md @@ -0,0 +1,22 @@ +# Licenses + +## Licenses of OpenPDF + +### Mozilla Public License Version 2.0 + +Please see https://www.mozilla.org/en-US/MPL/2.0/ or the attached file +[MPL-2.0.txt](MPL-2.0.txt). + +### GNU Lesser General Public License 2.1 + +Please see https://www.gnu.org/licenses/old-licenses/lgpl-2.1 or the attached file +[LGPL-2.1.md](LGPL-2.1.md). + +#### Apache License, Version 2.0 + +Some files use code from different Apache projects. The source code of these files contains the appropriate copyright +notices as described in the Appendix of `http://www.apache.org/licenses/LICENSE-2.0`. + +Please see https://www.apache.org/licenses/LICENSE-2.0 or the attached file +[APACHE-LICENSE-2.0.txt](APACHE-LICENSE-2.0.txt). + diff --git a/pdf-swing/src/main/resources/META-INF/MPL-2.0.txt b/pdf-swing/src/main/resources/META-INF/MPL-2.0.txt new file mode 100644 index 000000000..578700fd6 --- /dev/null +++ b/pdf-swing/src/main/resources/META-INF/MPL-2.0.txt @@ -0,0 +1,361 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. diff --git a/pdf-toolbox/pom.xml b/pdf-toolbox/pom.xml index d605fab55..d0fcbb9da 100644 --- a/pdf-toolbox/pom.xml +++ b/pdf-toolbox/pom.xml @@ -47,14 +47,4 @@ - - - - src/main/resources - - - ../src/main/resources - - - diff --git a/pdf-toolbox/src/main/resources/META-INF/LGPL-2.1.md b/pdf-toolbox/src/main/resources/META-INF/LGPL-2.1.md new file mode 100644 index 000000000..1eff120ed --- /dev/null +++ b/pdf-toolbox/src/main/resources/META-INF/LGPL-2.1.md @@ -0,0 +1,398 @@ +### GNU LESSER GENERAL PUBLIC LICENSE + +Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + [This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + +### Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By +contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + +This license, the Lesser General Public License, applies to some specially designated software +packages--typically libraries--of the Free Software Foundation and other authors who decide to use +it. You can use it too, but we suggest you first think carefully about whether this license or the +ordinary General Public License is the better strategy to use in any particular case, based on the +explanations below. + +When we speak of free software, we are referring to freedom of use, not price. Our General Public +Licenses are designed to make sure that you have the freedom to distribute copies of free software ( +and charge for this service if you wish); that you receive source code or can get it if you want it; +that you can change the software and use pieces of it in new free programs; and that you are +informed that you can do these things. + +To protect your rights, we need to make restrictions that forbid distributors to deny you these +rights or to ask you to surrender these rights. These restrictions translate to certain +responsibilities for you if you distribute copies of the library or if you modify it. + +For example, if you distribute copies of the library, whether gratis or for a fee, you must give the +recipients all the rights that we gave you. You must make sure that they, too, receive or can get +the source code. If you link other code with the library, you must provide complete object files to +the recipients, so that they can relink them with the library after making changes to the library +and recompiling it. And you must show them these terms so they know their rights. + +We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you +this license, which gives you legal permission to copy, distribute and/or modify the library. + +To protect each distributor, we want to make it very clear that there is no warranty for the free +library. Also, if the library is modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original author's reputation will not +be affected by problems that might be introduced by others. + +Finally, software patents pose a constant threat to the existence of any free program. We wish to +make sure that a company cannot effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that any patent license obtained for +a version of the library must be consistent with the full freedom of use specified in this license. + +Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. +This license, the GNU Lesser General Public License, applies to certain designated libraries, and is +quite different from the ordinary General Public License. We use this license for certain libraries +in order to permit linking those libraries into non-free programs. + +When a program is linked with a library, whether statically or using a shared library, the +combination of the two is legally speaking a combined work, a derivative of the original library. +The ordinary General Public License therefore permits such linking only if the entire combination +fits its criteria of freedom. The Lesser General Public License permits more lax criteria for +linking other code with the library. + +We call this license the "Lesser" General Public License because it does Less to protect the user's +freedom than the ordinary General Public License. It also provides other free software developers +Less of an advantage over competing non-free programs. These disadvantages are the reason we use the +ordinary General Public License for many libraries. However, the Lesser license provides advantages +in certain special circumstances. + +For example, on rare occasions, there may be a special need to encourage the widest possible use of +a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free library does the same job as +widely used non-free libraries. In this case, there is little to gain by limiting the free library +to free software only, so we use the Lesser General Public License. + +In other cases, permission to use a particular library in non-free programs enables a greater number +of people to use a large body of free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU operating system, as well as its +variant, the GNU/Linux operating system. + +Although the Lesser General Public License is Less protective of the users' freedom, it does ensure +that the user of a program that is linked with the Library has the freedom and the wherewithal to +run that program using a modified version of the Library. + +The precise terms and conditions for copying, distribution and modification follow. Pay close +attention to the difference between a +"work based on the library" and a "work that uses the library". The former contains code derived +from the library, whereas the latter must be combined with the library in order to run. + +### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +**0.** This License Agreement applies to any software library or other program which contains a +notice placed by the copyright holder or other authorized party saying it may be distributed under +the terms of this Lesser General Public License (also called "this License"). Each licensee is +addressed as "you". + +A "library" means a collection of software functions and/or data prepared so as to be conveniently +linked with application programs +(which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work which has been distributed under +these terms. A "work based on the Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or +with modifications and/or translated straightforwardly into another language. (Hereinafter, +translation is included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for making modifications to it. For a +library, complete source code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to control compilation and installation +of the library. + +Activities other than copying, distribution and modification are not covered by this License; they +are outside its scope. The act of running a program using the Library is not restricted, and output +from such a program is covered only if its contents constitute a work based on the Library ( +independent of the use of the Library in a tool for writing it). Whether that is true depends on +what the Library does and what the program that uses the Library does. + +**1.** You may copy and distribute verbatim copies of the Library's complete source code as you +receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to +this License and to the absence of any warranty; and distribute a copy of this License along with +the Library. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer +warranty protection in exchange for a fee. + +**2.** You may modify your copy or copies of the Library or any portion of it, thus forming a work +based on the Library, and copy and distribute such modifications or work under the terms of Section +1 above, provided that you also meet all of these conditions: + +- **a)** The modified work must itself be a software library. +- **b)** You must cause the files modified to carry prominent notices stating that you changed the + files and the date of any change. +- **c)** You must cause the whole of the work to be licensed at no charge to all third parties under + the terms of this License. +- **d)** If a facility in the modified Library refers to a function or a table of data to be + supplied by an application program that uses the facility, other than as an argument passed when + the facility is invoked, then you must make a good faith effort to ensure that, in the event an + application does not supply such function or table, the facility still operates, and performs + whatever part of its purpose remains meaningful. + + (For example, a function in a library to compute square roots has a purpose that is entirely + well-defined independent of the application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must be optional: if the application + does not supply it, the square root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are +not derived from the Library, and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same sections as part of a whole which is a work +based on the Library, the distribution of the whole must be on the terms of this License, whose +permissions for other licensees extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written +entirely by you; rather, the intent is to exercise the right to control the distribution of +derivative or collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library with the Library (or with a +work based on the Library) on a volume of a storage or distribution medium does not bring the other +work under the scope of this License. + +**3.** You may opt to apply the terms of the ordinary GNU General Public License instead of this +License to a given copy of the Library. To do this, you must alter all the notices that refer to +this License, so that they refer to the ordinary GNU General Public License, version 2, instead of +to this License. (If a newer version than version 2 of the ordinary GNU General Public License has +appeared, then you can specify that version instead if you wish.) Do not make any other change in +these notices. + +Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU +General Public License applies to all subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the Library into a program that is +not a library. + +**4.** You may copy and distribute the Library (or a portion or derivative of it, under Section 2) +in object code or executable form under the terms of Sections 1 and 2 above provided that you +accompany it with the complete corresponding machine-readable source code, which must be distributed +under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from a designated place, then +offering equivalent access to copy the source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not compelled to copy the source along +with the object code. + +**5.** A program that contains no derivative of any portion of the Library, but is designed to work +with the Library by being compiled or linked with it, is called a "work that uses the Library". Such +a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope +of this License. + +However, linking a "work that uses the Library" with the Library creates an executable that is a +derivative of the Library (because it contains portions of the Library), rather than a "work that +uses the library". The executable is therefore covered by this License. Section 6 states terms for +distribution of such executables. + +When a "work that uses the Library" uses material from a header file that is part of the Library, +the object code for the work may be a derivative work of the Library even though the source code is +not. Whether this is true is especially significant if the work can be linked without the Library, +or if the work is itself a library. The threshold for this to be true is not precisely defined by +law. + +If such an object file uses only numerical parameters, data structure layouts and accessors, and +small macros and small inline functions +(ten lines or less in length), then the use of the object file is unrestricted, regardless of +whether it is legally a derivative work. +(Executables containing this object code plus portions of the Library will still fall under Section +6.) + +Otherwise, if the work is a derivative of the Library, you may distribute the object code for the +work under the terms of Section 6. Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +**6.** As an exception to the Sections above, you may also combine or link a "work that uses the +Library" with the Library to produce a work containing portions of the Library, and distribute that +work under terms of your choice, provided that the terms permit modification of the work for the +customer's own use and reverse engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the Library is used in it and that +the Library and its use are covered by this License. You must supply a copy of this License. If the +work during execution displays copyright notices, you must include the copyright notice for the +Library among them, as well as a reference directing the user to the copy of this License. Also, you +must do one of these things: + +- **a)** Accompany the work with the complete corresponding machine-readable source code for the + Library including whatever changes were used in the work (which must be distributed under Sections + 1 and 2 above); and, if the work is an executable linked with the Library, with the complete + machine-readable "work that uses the Library", as object code and/or source code, so that the user + can modify the Library and then relink to produce a modified executable containing the modified + Library. (It is understood that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application to use the modified + definitions.) +- **b)** Use a suitable shared library mechanism for linking with the Library. A suitable mechanism + is one that (1) uses at run time a copy of the library already present on the user's computer + system, rather than copying library functions into the executable, and (2) will operate properly + with a modified version of the library, if the user installs one, as long as the modified version + is interface-compatible with the version that the work was made with. +- **c)** Accompany the work with a written offer, valid for at least three years, to give the same + user the materials specified in Subsection 6a, above, for a charge no more than the cost of + performing this distribution. +- **d)** If distribution of the work is made by offering access to copy from a designated place, + offer equivalent access to copy the above specified materials from the same place. +- **e)** Verify that the user has already received a copy of these materials or that you have + already sent this user a copy. + +For an executable, the required form of the "work that uses the Library" must include any data and +utility programs needed for reproducing the executable from it. However, as a special exception, the +materials to be distributed need not include anything that is normally distributed (in either source +or binary form) with the major components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies the executable. + +It may happen that this requirement contradicts the license restrictions of other proprietary +libraries that do not normally accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you distribute. + +**7.** You may place library facilities that are a work based on the Library side-by-side in a +single library together with other library facilities not covered by this License, and distribute +such a combined library, provided that the separate distribution of the work based on the Library +and of the other library facilities is otherwise permitted, and provided that you do these two +things: + +- **a)** Accompany the combined library with a copy of the same work based on the Library, + uncombined with any other library facilities. This must be distributed under the terms of the + Sections above. +- **b)** Give prominent notice with the combined library of the fact that part of it is a work based + on the Library, and explaining where to find the accompanying uncombined form of the same work. + +**8.** You may not copy, modify, sublicense, link with, or distribute the Library except as +expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, +or distribute the Library is void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under this License will not have +their licenses terminated so long as such parties remain in full compliance. + +**9.** You are not required to accept this License, since you have not signed it. However, nothing +else grants you permission to modify or distribute the Library or its derivative works. These +actions are prohibited by law if you do not accept this License. Therefore, by modifying or +distributing the Library (or any work based on the Library), you indicate your acceptance of this +License to do so, and all its terms and conditions for copying, distributing or modifying the +Library or works based on it. + +**10.** Each time you redistribute the Library (or any work based on the Library), the recipient +automatically receives a license from the original licensor to copy, distribute, link with or modify +the Library subject to these terms and conditions. You may not impose any further restrictions on +the recipients' exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties with this License. + +**11.** If, as a consequence of a court judgment or allegation of patent infringement or for any +other reason (not limited to patent issues), conditions are imposed on you (whether by court order, +agreement or otherwise) that contradict the conditions of this License, they do not excuse you from +the conditions of this License. If you cannot distribute so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, then as a consequence you may +not distribute the Library at all. For example, if a patent license would not permit royalty-free +redistribution of the Library by all those who receive copies directly or indirectly through you, +then the only way you could satisfy both it and this License would be to refrain entirely from +distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, +the balance of the section is intended to apply, and the section as a whole is intended to apply in +other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right +claims or to contest validity of any such claims; this section has the sole purpose of protecting +the integrity of the free software distribution system which is implemented by public license +practices. Many people have made generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that system; it is up to the +author/donor to decide if he or she is willing to distribute software through any other system and a +licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest +of this License. + +**12.** If the distribution and/or use of the Library is restricted in certain countries either by +patents or by copyrighted interfaces, the original copyright holder who places the Library under +this License may add an explicit geographical distribution limitation excluding those countries, so +that distribution is permitted only in or among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the body of this License. + +**13.** The Free Software Foundation may publish revised and/or new versions of the Lesser General +Public License from time to time. Such new versions will be similar in spirit to the present +version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library specifies a version number of +this License which applies to it and +"any later version", you have the option of following the terms and conditions either of that +version or of any later version published by the Free Software Foundation. If the Library does not +specify a license version number, you may choose any version ever published by the Free Software +Foundation. + +**14.** If you wish to incorporate parts of the Library into other free programs whose distribution +conditions are incompatible with these, write to the author to ask for permission. For software +which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the +free status of all derivatives of our free software and of promoting the sharing and reuse of +software generally. + +**NO WARRANTY** + +**15.** BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE +EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS +AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. +SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +**16.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT +HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE +LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR +DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES. + +### END OF TERMS AND CONDITIONS + +### How to Apply These Terms to Your New Libraries + +If you develop a new library, and you want it to be of the greatest possible use to the public, we +recommend making it free software that everyone can redistribute and change. You can do so by +permitting redistribution under these terms (or, alternatively, under the terms of the ordinary +General Public License). + +To apply these terms, attach the following notices to the library. It is safest to attach them to +the start of each source file to most effectively convey the exclusion of warranty; and each file +should have at least the "copyright" line and a pointer to where the full notice is found. + + one line to give the library's name and an idea of what it does. + Copyright (C) year name of author + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a " +copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the library `Frob' (a library for tweaking knobs) written + by James Random Hacker. + + signature of Ty Coon, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! \ No newline at end of file diff --git a/pdf-toolbox/src/main/resources/META-INF/LICENSES.md b/pdf-toolbox/src/main/resources/META-INF/LICENSES.md new file mode 100644 index 000000000..3acc9b9a8 --- /dev/null +++ b/pdf-toolbox/src/main/resources/META-INF/LICENSES.md @@ -0,0 +1,22 @@ +# Licenses + +## Licenses of OpenPDF + +### Mozilla Public License Version 2.0 + +Please see https://www.mozilla.org/en-US/MPL/2.0/ or the attached file +[MPL-2.0.txt](MPL-2.0.txt). + +### GNU Lesser General Public License 2.1 + +Please see https://www.gnu.org/licenses/old-licenses/lgpl-2.1 or the attached file +[LGPL-2.1.md](LGPL-2.1.md). + +#### Apache License, Version 2.0 + +Some files use code from different Apache projects. The source code of these files contains the appropriate copyright +notices as described in the Appendix of `http://www.apache.org/licenses/LICENSE-2.0`. + +Please see https://www.apache.org/licenses/LICENSE-2.0 or the attached file +[APACHE-LICENSE-2.0.txt](APACHE-LICENSE-2.0.txt). + diff --git a/pdf-toolbox/src/main/resources/META-INF/MPL-2.0.txt b/pdf-toolbox/src/main/resources/META-INF/MPL-2.0.txt new file mode 100644 index 000000000..578700fd6 --- /dev/null +++ b/pdf-toolbox/src/main/resources/META-INF/MPL-2.0.txt @@ -0,0 +1,361 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. From c5465d9263058b12abb8350c832d177b3b677423 Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Tue, 20 Feb 2024 14:28:32 +0100 Subject: [PATCH 04/31] Build with target JDK 8, GPG activated again --- .github/workflows/maven.yml | 5 ++--- pom.xml | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5de29fe65..5166c583c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -16,9 +16,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - # The last 3 LTS releases - # Java 17 is run in codacy-coverage-reporter - java: [ 21 ] + # Java 11 in this branch 1.4-java11 + java: [ 11 ] name: Java ${{matrix.java}} steps: - uses: actions/checkout@v4.1.1 diff --git a/pom.xml b/pom.xml index 19a3dbf43..d6dce38d1 100644 --- a/pom.xml +++ b/pom.xml @@ -260,7 +260,7 @@ - + org.apache.maven.plugins maven-compiler-plugin @@ -419,9 +419,9 @@ - jdk17-plus + jdk11-plus - [17,) + [11,) @@ -439,16 +439,16 @@ maven-compiler-plugin ${maven.compiler.plugin.version} - 17 + 11 - compile-java-17 + compile-java-11 compile - 17 + 11 ${project.basedir}/src/main/java From fedbc64d420ea8cd7418ad6fb9d1a5001749592f Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Tue, 20 Feb 2024 17:27:49 +0100 Subject: [PATCH 05/31] #1062: Call LayoutProcessor.disable() after Test-Runs - and some cleanups --- .../com/lowagie/text/pdf/LayoutProcessor.java | 114 ++++++------ .../pdf/CrossReferenceTableEncodingTest.java | 18 +- .../text/pdf/LayoutProcessor534Test.java | 10 +- .../text/pdf/fonts/AdvanceTypographyTest.java | 62 +++--- .../fonts/GlyphLayoutDocumentBidi.java | 31 ++- .../fonts/GlyphLayoutDocumentBidiPerFont.java | 44 ++--- .../fonts/GlyphLayoutDocumentDin91379.java | 176 +++++++++--------- .../fonts/GlyphLayoutDocumentKernLiga.java | 35 ++-- .../GlyphLayoutDocumentKernLigaPerFont.java | 56 +++--- .../fonts/GlyphLayoutFormDin91379.java | 156 ++++++++-------- 10 files changed, 348 insertions(+), 354 deletions(-) diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java b/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java index 64797ffbe..d12a48af8 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java @@ -80,9 +80,8 @@ private LayoutProcessor() { /** * Enables the processor. - * Kerning and ligatures are switched off. - * - * This method can only be called once. + *

+ * Kerning and ligatures are switched off. This method can only be called once. */ public static void enable() { enabled = true; @@ -90,9 +89,8 @@ public static void enable() { /** * Enables the processor with the provided flags. - * Kerning and ligatures are switched off. - * - * This method can only be called once. + *

+ * Kerning and ligatures are switched off. This method can only be called once. * * @param flags see java.awt.Font.layoutGlyphVector */ @@ -106,9 +104,8 @@ public static void enable(int flags) { /** * Enables the processor. - * Kerning and ligatures are switched on. - * - * This method can only be called once. + *

+ * Kerning and ligatures are switched on. This method can only be called once. */ public static void enableKernLiga() { enableKernLiga(DEFAULT_FLAGS); @@ -116,8 +113,8 @@ public static void enableKernLiga() { /** * Enables the processor with the provided flags. + *

* Kerning and ligatures are switched on. - * * This method can only be called once. * * @param flags see java.awt.Font.layoutGlyphVector @@ -138,81 +135,87 @@ public static boolean isEnabled() { /** * Set kerning - * @see - * - * Oracle: The Javaâ„¢ Tutorials, Using Text Attributes to Style Text + * + * @see + * Oracle: The Javaâ„¢ Tutorials, Using Text Attributes to Style Text */ public static void setKerning() { LayoutProcessor.globalTextAttributes.put(TextAttribute.KERNING, TextAttribute.KERNING_ON); } + /** * Set kerning for one font + * * @param font The font for which kerning is to be turned on - * @see - * - * Oracle: The Javaâ„¢ Tutorials, Using Text Attributes to Style Text + * @see + * Oracle: The Javaâ„¢ Tutorials, Using Text Attributes to Style Text */ - public static void setKerning(com.lowagie.text.Font font) { + public static void setKerning(com.lowagie.text.Font font) { Map textAttributes = new HashMap<>(); textAttributes.put(TextAttribute.KERNING, TextAttribute.KERNING_ON); setTextAttributes(font, textAttributes); } + /** * Add ligatures */ public static void setLigatures() { LayoutProcessor.globalTextAttributes.put(TextAttribute.LIGATURES, TextAttribute.LIGATURES_ON); } + /** * Set ligatures for one font - * @param font The font for which ligatures are to be turned on * + * @param font The font for which ligatures are to be turned on */ - public static void setLigatures(com.lowagie.text.Font font) { + public static void setLigatures(com.lowagie.text.Font font) { Map textAttributes = new HashMap<>(); textAttributes.put(TextAttribute.LIGATURES, TextAttribute.LIGATURES_ON); setTextAttributes(font, textAttributes); } + /** * Set run direction for one font to RTL - * @param font The font for which the run direction is set * + * @param font The font for which the run direction is set */ - public static void setRunDirectionRtl(com.lowagie.text.Font font) { + public static void setRunDirectionRtl(com.lowagie.text.Font font) { setRunDirection(font, TextAttribute.RUN_DIRECTION_RTL); } + /** * Set run direction for one font to LTR - * @param font The font for which the run direction is set * + * @param font The font for which the run direction is set */ - public static void setRunDirectionLtr(com.lowagie.text.Font font) { + public static void setRunDirectionLtr(com.lowagie.text.Font font) { setRunDirection(font, TextAttribute.RUN_DIRECTION_LTR); } + /** * Set run direction for one font - * @param font The font for which the run direction is set * + * @param font The font for which the run direction is set */ - private static void setRunDirection(com.lowagie.text.Font font, Boolean runDirection) { + private static void setRunDirection(com.lowagie.text.Font font, Boolean runDirection) { Map textAttributes = new HashMap<>(); textAttributes.put(TextAttribute.RUN_DIRECTION, runDirection); setTextAttributes(font, textAttributes); } + /** - * Set text attributes to font - * The attributes are used only for glyph layout, - * and don't change the visual appearance of the font - * @param font The font for which kerning is to be turned on + * Set text attributes to font The attributes are used only for glyph layout, and don't change the visual appearance + * of the font + * + * @param font The font for which kerning is to be turned on * @param textAttributes Map of text attributes to be set - * @see - * - * Oracle: The Javaâ„¢ Tutorials, Using Text Attributes to Style Text* + * @see + * Oracle: The Javaâ„¢ Tutorials, Using Text Attributes to Style Text* */ - private static void setTextAttributes(com.lowagie.text.Font font, Map textAttributes) { + private static void setTextAttributes(com.lowagie.text.Font font, Map textAttributes) { BaseFont baseFont = font.getBaseFont(); java.awt.Font awtFont = awtFontMap.get(baseFont); - if (awtFont!=null) { + if (awtFont != null) { awtFont = awtFont.deriveFont(textAttributes); awtFontMap.put(baseFont, awtFont); } @@ -233,9 +236,8 @@ public static boolean supportsFont(BaseFont baseFont) { /** * Loads the AWT font needed for layout * - * @param baseFont OpenPdf base font + * @param baseFont OpenPdf base font * @param filename of the font file - * * @throws RuntimeException if font can not be loaded */ public static void loadFont(BaseFont baseFont, String filename) { @@ -257,8 +259,8 @@ public static void loadFont(BaseFont baseFont, String filename) { if (file.canRead()) { inputStream = Files.newInputStream(file.toPath()); } else if (filename.startsWith("file:/") || filename.startsWith("http://") - || filename.startsWith("https://") || filename.startsWith("jar:") - || filename.startsWith("wsjar:")) { + || filename.startsWith("https://") || filename.startsWith("jar:") + || filename.startsWith("wsjar:")) { inputStream = new URL(filename).openStream(); } else if ("-".equals(filename)) { inputStream = System.in; @@ -267,11 +269,11 @@ public static void loadFont(BaseFont baseFont, String filename) { } if (inputStream == null) { throw new IOException( - MessageLocalization.getComposedMessage("1.not.found.as.file.or.resource", filename)); + MessageLocalization.getComposedMessage("1.not.found.as.file.or.resource", filename)); } awtFont = java.awt.Font.createFont(java.awt.Font.TRUETYPE_FONT, inputStream); if (awtFont != null) { - if (globalTextAttributes.size()>0) { + if (!globalTextAttributes.isEmpty()) { awtFont = awtFont.deriveFont(LayoutProcessor.globalTextAttributes); } awtFontMap.put(baseFont, awtFont); @@ -293,8 +295,8 @@ public static void loadFont(BaseFont baseFont, String filename) { /** * Computes glyph positioning * - * @param baseFont OpenPdf base font - * @param text input text + * @param baseFont OpenPdf base font + * @param text input text * @return glyph vector containing reordered text, width and positioning info */ public static GlyphVector computeGlyphVector(BaseFont baseFont, float fontSize, String text) { @@ -311,23 +313,22 @@ public static GlyphVector computeGlyphVector(BaseFont baseFont, float fontSize, } java.awt.Font awtFont = LayoutProcessor.awtFontMap.get(baseFont).deriveFont(fontSize); Map textAttributes = awtFont.getAttributes(); - if (textAttributes!=null) { + if (textAttributes != null) { Object runDirection = textAttributes.get(TextAttribute.RUN_DIRECTION); - if (runDirection!=null) { - localFlags = runDirection==TextAttribute.RUN_DIRECTION_LTR ? java.awt.Font.LAYOUT_LEFT_TO_RIGHT : - java.awt.Font.LAYOUT_RIGHT_TO_LEFT; + if (runDirection != null) { + localFlags = runDirection == TextAttribute.RUN_DIRECTION_LTR ? java.awt.Font.LAYOUT_LEFT_TO_RIGHT : + java.awt.Font.LAYOUT_RIGHT_TO_LEFT; } } return awtFont.layoutGlyphVector(fontRenderContext, chars, 0, chars.length, localFlags); } - /** - * Checks if the glyphVector contains adjustments - * that make advanced layout necessary - * - * @param glyphVector glyph vector containing the positions - * @return true, if the glyphVector contains adjustments - */ + /** + * Checks if the glyphVector contains adjustments that make advanced layout necessary + * + * @param glyphVector glyph vector containing the positions + * @return true, if the glyphVector contains adjustments + */ private static boolean hasAdjustments(GlyphVector glyphVector) { boolean retVal = false; float lastX = 0f; @@ -392,4 +393,11 @@ public static Point2D showText(PdfContentByte cb, BaseFont baseFont, float fontS cb.moveTextBasic(dx, -dy); return new Point2D.Double(-p.getX(), p.getY()); } + + public static void disable() { + enabled = false; + flags = DEFAULT_FLAGS; + awtFontMap.clear(); + globalTextAttributes.clear(); + } } diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/CrossReferenceTableEncodingTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/CrossReferenceTableEncodingTest.java index 596bff5ec..71bc8aa1e 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/CrossReferenceTableEncodingTest.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/CrossReferenceTableEncodingTest.java @@ -9,16 +9,25 @@ import java.io.IOException; import java.io.InputStream; import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public class CrossReferenceTableEncodingTest { public static final String TEST_PDF = "/encodingTest.pdf"; + private static String filterPdf(final String pdf) { + return pdf.replaceAll("<>", "") + .replaceAll("<>", "") + .replaceAll("<>", "<>") + .replaceAll("startxref\\n(\\d+)\\n%%EOF", "startxref\nXXXXX\n%%EOF"); + } + // This test was once red, even it was not easy to accomplish this. The test must be run with // -Dfile.encoding=IBM273 from the IDE. Maven won't accept this property. + @Disabled("This test runs ok, if it is run alone. It fails when run with other tests in the IDE. Probably it is because some 'static' state in another class.") @Test - public void testCrossReferenceTableEncoding() throws Exception { + void testCrossReferenceTableEncoding() throws Exception { final String actualPDF = generateSimplePdf(); final String expectedPDF = readExpectedFile(); String actual = filterPdf(actualPDF); @@ -26,13 +35,6 @@ public void testCrossReferenceTableEncoding() throws Exception { assertThat(actual).isEqualTo(expected); } - private static String filterPdf(final String pdf) { - return pdf.replaceAll("<>", "") - .replaceAll("<>", "") - .replaceAll("<>", "<>") - .replaceAll("startxref\\n(\\d+)\\n%%EOF", "startxref\nXXXXX\n%%EOF"); - } - private String readExpectedFile() throws IOException { try (final InputStream expected = getClass().getResourceAsStream(TEST_PDF)) { assertThat(expected).isNotNull(); diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java index a348a6096..c9b7f58a7 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java @@ -12,6 +12,7 @@ import java.awt.Font; import java.io.ByteArrayOutputStream; import java.io.IOException; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -24,13 +25,18 @@ static void beforeAll() { LayoutProcessor.enable(java.awt.Font.LAYOUT_RIGHT_TO_LEFT); } + @AfterAll + static void afterAll() { + LayoutProcessor.disable(); + } + @BeforeEach void beforeEach() { assumeThat(LayoutProcessor.isSet(Font.LAYOUT_RIGHT_TO_LEFT)).isTrue(); } @Test - public void whenLayoutRightToLeftLatin_thenRevertCharOrder() throws IOException { + void whenLayoutRightToLeftLatin_thenRevertCharOrder() throws IOException { // given Document document = new Document(PageSize.A4.rotate(), 10, 10, 10, 10); ByteArrayOutputStream pdfOut = new ByteArrayOutputStream(); @@ -61,7 +67,7 @@ public void whenLayoutRightToLeftLatin_thenRevertCharOrder() throws IOException } @Test - public void whenLayoutRightToLeftHebrew_thenRevertCharOrder() throws IOException { + void whenLayoutRightToLeftHebrew_thenRevertCharOrder() throws IOException { // given Document document = new Document(PageSize.A4.rotate(), 10, 10, 10, 10); ByteArrayOutputStream pdfOut = new ByteArrayOutputStream(); diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java index b612c4bd5..241240b0d 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java @@ -1,5 +1,6 @@ package com.lowagie.text.pdf.fonts; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import com.lowagie.text.pdf.BaseFont; @@ -8,64 +9,66 @@ import java.io.InputStream; import java.util.HashMap; import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; /** - * - * @author Gajendra kumar (raaz2.gajendra@gmail.com) + * @author Gajendra kumar (raaz2.gajendra@gmail.com) */ -public class AdvanceTypographyTest { +class AdvanceTypographyTest { /** - * Without ghyph substitution out will be {660,666,676,1143,656,1130}, which is no correct - * FopGlyphProcessor performs ghyph substitution to correct the output + * Without glyph substitution out will be {660,666,676,1143,656,1130}, which is no correct FopGlyphProcessor + * performs glyph substitution to correct the output + * * @throws Exception - DocumentException or IOException thrown by the processedContent() method */ @Test - public void testTypographySubstitution() throws Exception{ + void testTypographySubstitution() throws Exception { char[] expectedOutput = {660, 666, 911, 656, 1130}; byte[] processedContent = FopGlyphProcessor.convertToBytesWithGlyphs( - BaseFont.createFont("fonts/jaldi/Jaldi-Regular.ttf", BaseFont.IDENTITY_H, false), - "नमसà¥à¤¤à¥‡", "fonts/jaldi/Jaldi-Regular.ttf", new HashMap<>(), "dflt"); + BaseFont.createFont("fonts/jaldi/Jaldi-Regular.ttf", BaseFont.IDENTITY_H, false), + "नमसà¥à¤¤à¥‡", "fonts/jaldi/Jaldi-Regular.ttf", new HashMap<>(), "dflt"); String str = new String(processedContent, "UnicodeBigUnmarked"); - assertArrayEquals(expectedOutput,str.toCharArray()); + assertArrayEquals(expectedOutput, str.toCharArray()); } /** - * In some fonts combination of two characters can be represented by single glyph - * This method tests above case. + * In some fonts combination of two characters can be represented by single glyph This method tests above case. + * * @throws Exception - UnsupportedEncodingException by the convertToBytesWithGlyphs method */ @Test - public void testSubstitutionWithMerge() throws Exception{ + void testSubstitutionWithMerge() throws Exception { char[] expectedOutput = {254, 278, 390, 314, 331, 376, 254, 285, 278}; byte[] processedContent = FopGlyphProcessor.convertToBytesWithGlyphs( - BaseFont.createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false), - "instruction", "fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", new HashMap<>(), "dflt"); + BaseFont.createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false), + "instruction", "fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", new HashMap<>(), "dflt"); String str = new String(processedContent, "UnicodeBigUnmarked"); - assertArrayEquals(expectedOutput,str.toCharArray()); + assertArrayEquals(expectedOutput, str.toCharArray()); } /** - * Test fonts loaded externally and passed as byte array to BaseFont, Fop should be able to - * resolve these fonts + * Test fonts loaded externally and passed as byte array to BaseFont, Fop should be able to resolve these fonts + * * @throws Exception a DocumentException or an IOException thrown by BaseFont.createFont */ @Test - public void testInMemoryFonts() throws Exception{ - char[] expectedOutput = {254,278,390,314,331,376,254,285,278}; + void testInMemoryFonts() throws Exception { + char[] expectedOutput = {254, 278, 390, 314, 331, 376, 254, 285, 278}; BaseFont font = BaseFont.createFont("ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, - BaseFont.EMBEDDED,true, - getFontByte("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf"), null, false,false); + BaseFont.EMBEDDED, true, + getTestFontByte(), null, false, false); byte[] processedContent = FopGlyphProcessor.convertToBytesWithGlyphs( - font, "instruction", "Viaoda Libre", new HashMap<>(), "dflt"); + font, "instruction", "Viaoda Libre", new HashMap<>(), "dflt"); String str = new String(processedContent, "UnicodeBigUnmarked"); - assertArrayEquals(expectedOutput,str.toCharArray()); + assertArrayEquals(expectedOutput, str.toCharArray()); } - /*@Disabled - public void testSurrogatePair() throws Exception{ + @Disabled("This test is failing, need to investigate. @YOSHIDA may know the reason.") + @Test + void testSurrogatePair() throws Exception { BaseFont baseFont = BaseFont.createFont("fonts/jp/GenShinGothic-Normal.ttf", BaseFont.IDENTITY_H, false); @@ -73,14 +76,15 @@ public void testSurrogatePair() throws Exception{ // http://en.glyphwiki.org/wiki/u20bb7 String text = "\uD842\uDFB7"; byte[] processedContent = FopGlyphProcessor.convertToBytesWithGlyphs( - baseFont, text, "fonts/jp/GenShinGothic-Normal.ttf", new HashMap<>(), "dflt"); + baseFont, text, "fonts/jp/GenShinGothic-Normal.ttf", new HashMap<>(), "dflt"); String str = new String(processedContent, "UnicodeBigUnmarked"); char[] actual = str.toCharArray(); assertArrayEquals(expectedOutput, actual); - }*/ + } - private byte[] getFontByte(String fileName) throws IOException { - InputStream stream = BaseFont.getResourceStream(fileName, null); + private byte[] getTestFontByte() throws IOException { + InputStream stream = BaseFont.getResourceStream("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", null); + assertThat(stream).isNotNull(); return IOUtils.toByteArray(stream); } } diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidi.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidi.java index f215be5fd..59e8284cb 100644 --- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidi.java +++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidi.java @@ -1,7 +1,7 @@ /* * GlyphLayoutDocumentDinSpec91379 - * + * * This code is part of the 'OpenPDF Tutorial'. * You can find the complete tutorial at the following address: * https://github.com/LibrePDF/OpenPDF/wiki/Tutorial @@ -10,7 +10,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * + * */ package com.lowagie.examples.fonts; @@ -28,27 +28,23 @@ * Prints bidirectional text with correct glyph layout, kerning and ligatures globally enabled */ public class GlyphLayoutDocumentBidi { - + public static String INTRO_TEXT = - "Test of bidirectional text\n"+ + "Test of bidirectional text\n" + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n"; /** * Main method - * + * * @param args -- not used */ - public static void main(String[] args) { - try { - test("GlyphLayoutDocumentBidi.pdf"); - } catch (Exception e) { - e.printStackTrace(); - } + public static void main(String[] args) throws Exception { + test("GlyphLayoutDocumentBidi.pdf"); } /** * Run the test: Show bidirectional text - * + * * @param fileName Name of output file * @throws Exception if an error occurs */ @@ -63,22 +59,21 @@ public static void test(String fileName) throws Exception { // available for glyph layout. String fontDir = "com/lowagie/examples/fonts/"; - FontFactory.register(fontDir+"noto/NotoSans-Regular.ttf", "notoSans"); + FontFactory.register(fontDir + "noto/NotoSans-Regular.ttf", "notoSans"); Font notoSans = FontFactory.getFont("notoSans", BaseFont.IDENTITY_H, true, fontSize); - FontFactory.register(fontDir+"noto/NotoSansArabic-Regular.ttf", "notoSansArabic"); + FontFactory.register(fontDir + "noto/NotoSansArabic-Regular.ttf", "notoSansArabic"); Font notoSansArabic = FontFactory.getFont("notoSansArabic", BaseFont.IDENTITY_H, true, fontSize); try (Document document = new Document()) { PdfWriter writer = PdfWriter.getInstance(document, Files.newOutputStream(Paths.get(fileName))); writer.setInitialLeading(16.0f); document.open(); - document.add(new Chunk(INTRO_TEXT +"Fonts: Noto Sans, Noto Sans Arabic\n\n", notoSans)); + document.add(new Chunk(INTRO_TEXT + "Fonts: Noto Sans, Noto Sans Arabic\n\n", notoSans)); document.add(new Chunk("Guten Tag ", notoSans)); document.add(new Chunk("السلام عليكم", notoSansArabic)); document.add(new Chunk(" Good afternoon", notoSans)); - } catch (Exception e) { - e.printStackTrace(); } + LayoutProcessor.disable(); } -} \ No newline at end of file +} diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidiPerFont.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidiPerFont.java index 052cd32c0..b37d68898 100644 --- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidiPerFont.java +++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidiPerFont.java @@ -1,7 +1,7 @@ /* * GlyphLayoutDocumentDinSpec91379 - * + * * This code is part of the 'OpenPDF Tutorial'. * You can find the complete tutorial at the following address: * https://github.com/LibrePDF/OpenPDF/wiki/Tutorial @@ -10,7 +10,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * + * */ package com.lowagie.examples.fonts; @@ -25,44 +25,41 @@ import java.nio.file.Paths; /** - * Prints bidirectional text with correct glyph layout, kerning and ligatures globally enabled - * Direction can be chosen per font + * Prints bidirectional text with correct glyph layout, kerning and ligatures globally enabled Direction can be chosen + * per font */ public class GlyphLayoutDocumentBidiPerFont { - + public static String INTRO_TEXT = - "Test of bidirectional text\n"+ + "Test of bidirectional text\n" + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n"; /** * Main method - * + * * @param args -- not used */ - public static void main(String[] args) { - try { - test("GlyphLayoutDocumentBidiPerFont.pdf"); - } catch (Exception e) { - e.printStackTrace(); - } + public static void main(String[] args) throws Exception { + test("GlyphLayoutDocumentBidiPerFont.pdf"); } /** * Register and get a font, caching is switched off - * @param path the path to a font file - * @param alias the alias you want to use for the font - * @param fontSize the size of this font + * + * @param path the path to a font file + * @param alias the alias you want to use for the font + * @param fontSize the size of this font * @return the Font constructed based on the parameters */ public static Font getFont(String path, String alias, float fontSize) { FontFactory.register(path, alias); return FontFactory.getFont(alias, BaseFont.IDENTITY_H, true, fontSize, Font.UNDEFINED, null, false); - // cached has to be set to false, to allow different attributes for instances of one font + // cached has to be set to 'false', to allow different attributes for instances of one font } /** * Run the test: Show bidirectional text - * + * * @param fileName Name of output file * @throws Exception if an error occurs */ @@ -77,21 +74,20 @@ public static void test(String fileName) throws Exception { // available for glyph layout. String fontDir = "com/lowagie/examples/fonts/"; - Font notoSans = getFont(fontDir+"noto/NotoSans-Regular.ttf", "notoSans", fontSize); + Font notoSans = getFont(fontDir + "noto/NotoSans-Regular.ttf", "notoSans", fontSize); LayoutProcessor.setRunDirectionLtr(notoSans); - Font notoSansArabic = getFont(fontDir+"noto/NotoSansArabic-Regular.ttf", "notoSansArabic", fontSize); + Font notoSansArabic = getFont(fontDir + "noto/NotoSansArabic-Regular.ttf", "notoSansArabic", fontSize); LayoutProcessor.setRunDirectionRtl(notoSansArabic); try (Document document = new Document()) { PdfWriter writer = PdfWriter.getInstance(document, Files.newOutputStream(Paths.get(fileName))); writer.setInitialLeading(16.0f); document.open(); - document.add(new Chunk(INTRO_TEXT +"Fonts: Noto Sans, Noto Sans Arabic\n\n", notoSans)); + document.add(new Chunk(INTRO_TEXT + "Fonts: Noto Sans, Noto Sans Arabic\n\n", notoSans)); document.add(new Chunk("Guten Tag ", notoSans)); document.add(new Chunk("السلام عليكم", notoSansArabic)); document.add(new Chunk(" Good afternoon", notoSans)); - } catch (Exception e) { - e.printStackTrace(); } + LayoutProcessor.disable(); } -} \ No newline at end of file +} diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentDin91379.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentDin91379.java index 51e802d89..9160e1cf2 100644 --- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentDin91379.java +++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentDin91379.java @@ -1,6 +1,6 @@ /* * GlyphLayoutDocumentDin91379 - * + * * This code is part of the 'OpenPDF Tutorial'. * You can find the complete tutorial at the following address: * https://github.com/LibrePDF/OpenPDF/wiki/Tutorial @@ -18,100 +18,101 @@ import com.lowagie.text.pdf.BaseFont; import com.lowagie.text.pdf.LayoutProcessor; import com.lowagie.text.pdf.PdfWriter; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; /** - * Prints characters and sequences of DIN 91379 - * with correct glyph layout and kerning + * Prints characters and sequences of DIN 91379 with correct glyph layout and kerning */ public class GlyphLayoutDocumentDin91379 { public static String TEXT_INTRO = - "Test of formatting for letters and sequences defined in:\n" - + "DIN 91379:2022-08: Characters and defined character sequences in Unicode for the electronic\n " - + "processing of names and data exchange in Europe, with CD-ROM\n" - + "See https://www.beuth.de/de/norm/din-91379/353496133\n" - + " https://github.com/String-Latin/DIN-91379-Characters-and-Sequences" - + "and https://en.wikipedia.org/wiki/DIN_91379\n\n" - + "Fonts used: Noto Sans Regular, Noto Sans Math Regular, Noto Serif Regular\n" - + " see https://fonts.google.com/noto/specimen/Noto+Sans" - + " and https://github.com/googlefonts/noto-fonts/tree/main/hinted/ttf\n" - + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n"; + "Test of formatting for letters and sequences defined in:\n" + + "DIN 91379:2022-08: Characters and defined character sequences in Unicode for the electronic\n " + + "processing of names and data exchange in Europe, with CD-ROM\n" + + "See https://www.beuth.de/de/norm/din-91379/353496133\n" + + " https://github.com/String-Latin/DIN-91379-Characters-and-Sequences" + + "and https://en.wikipedia.org/wiki/DIN_91379\n\n" + + "Fonts used: Noto Sans Regular, Noto Sans Math Regular, Noto Serif Regular\n" + + " see https://fonts.google.com/noto/specimen/Noto+Sans" + + " and https://github.com/googlefonts/noto-fonts/tree/main/hinted/ttf\n" + + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n"; public static String LATIN_CHARS_DIN_91379 = - "bll; Latin Letters (normative)\n" - + "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \n" - + "a b c d e f g h i j k l m n o p q r s t u v w x y z \n" - + "À à Â Ã Ä Ã… Æ Ç È É Ê Ë ÃŒ à Î à à Ñ Ã’ Ó Ô Õ Ö Ø Ù Ú \n" - + "Û Ãœ à Þ ß à á â ã ä Ã¥ æ ç è é ê ë ì í î ï ð ñ ò ó ô \n" - + "õ ö ø ù ú û ü ý þ ÿ Ä€ Ä Ä‚ ă Ä„ Ä… Ć ć Ĉ ĉ ÄŠ Ä‹ ÄŒ Ä ÄŽ Ä \n" - + "Ä Ä‘ Ä’ Ä“ Ä” Ä• Ä– Ä— Ę Ä™ Äš Ä› Äœ Ä Äž ÄŸ Ä  Ä¡ Ä¢ Ä£ Ĥ Ä¥ Ħ ħ Ĩ Ä© \n" - + "Ī Ä« Ĭ Ä­ Ä® į Ä° ı IJ ij Ä´ ĵ Ķ Ä· ĸ Ĺ ĺ Ä» ļ Ľ ľ Ä¿ Å€ Å Å‚ Ń \n" - + "Å„ Å… ņ Ň ň ʼn ÅŠ Å‹ ÅŒ Å ÅŽ Å Å Å‘ Å’ Å“ Å” Å• Å– Å— Ř Å™ Åš Å› Åœ Å \n" - + "Åž ÅŸ Å  Å¡ Å¢ Å£ Ť Å¥ Ŧ ŧ Ũ Å© Ū Å« Ŭ Å­ Å® ů Å° ű Ų ų Å´ ŵ Ŷ Å· \n" - + "Ÿ Ź ź Å» ż Ž ž Ƈ ƈ Æ Æ— Æ  Æ¡ Ư Æ° Æ· Ç ÇŽ Ç Ç Ç‘ Ç’ Ç“ Ç” Ç• Ç– \n" - + "Ç— ǘ Ç™ Çš Ç› Çœ Çž ÇŸ Ç¢ Ç£ Ǥ Ç¥ Ǧ ǧ Ǩ Ç© Ǫ Ç« Ǭ Ç­ Ç® ǯ Ç° Ç´ ǵ Ǹ \n" - + "ǹ Ǻ Ç» Ǽ ǽ Ǿ Ç¿ È’ È“ Ș È™ Èš È› Èž ÈŸ ȧ Ȩ È© Ȫ È« Ȭ È­ È® ȯ È° ȱ \n" - + "Ȳ ȳ É™ ɨ Ê’ Ḃ ḃ Ḇ ḇ Ḋ ḋ Ḍ ḠḎ ḠḠḑ ḗ Ḝ ḠḞ ḟ Ḡ ḡ Ḣ ḣ \n" - + "Ḥ ḥ Ḧ ḧ Ḩ ḩ Ḫ ḫ ḯ Ḱ ḱ Ḳ ḳ Ḵ ḵ Ḷ ḷ Ḻ ḻ á¹€ ṠṂ ṃ Ṅ á¹… Ṇ \n" - + "ṇ Ṉ ṉ á¹’ ṓ á¹” ṕ á¹– á¹— Ṙ á¹™ Ṛ á¹› Ṟ ṟ á¹  ṡ á¹¢ á¹£ Ṫ ṫ Ṭ á¹­ á¹® ṯ Ẁ \n" - + "ẠẂ ẃ Ẅ ẅ Ẇ ẇ Ẍ ẠẎ ẠẠẑ Ẓ ẓ Ẕ ẕ ẖ ẗ ẞ Ạ ạ Ả ả Ấ ấ \n" - + "Ầ ầ Ẩ ẩ Ẫ ẫ Ậ ậ Ắ ắ Ằ ằ Ẳ ẳ Ẵ ẵ Ặ ặ Ẹ ẹ Ẻ ẻ Ẽ ẽ Ế ế \n" - + "Ề ỠỂ ể Ễ á»… Ệ ệ Ỉ ỉ Ị ị Ọ ỠỎ ỠỠố á»’ ồ á»” ổ á»– á»— Ộ á»™ \n" - + "Ớ á»› Ờ ỠỞ ở á»  ỡ Ợ ợ Ụ ụ Ủ ủ Ứ ứ Ừ ừ Ử á»­ á»® ữ á»° á»± Ỳ ỳ \n" - + "á»´ ỵ Ỷ á»· Ỹ ỹ \n" - + "Sequences\n" - + "AÌ‹ CÌ€ CÌ„ C̆ C̈ CÌ• CÌ£ C̦ C̨̆ DÌ‚ FÌ€ FÌ„ GÌ€ HÌ„ H̦ H̱ JÌ JÌŒ KÌ€ KÌ‚ KÌ„ K̇ KÌ• KÌ› K̦ KÍŸH \n" - + "KÍŸh LÌ‚ LÌ¥ L̥̄ L̦ MÌ€ MÌ‚ M̆ MÌ NÌ‚ NÌ„ N̆ N̦ PÌ€ PÌ„ PÌ• PÌ£ R̆ RÌ¥ R̥̄ SÌ€ SÌ„ S̛̄ S̱ TÌ€ TÌ„ \n" - + "T̈ TÌ• TÌ› U̇ ZÌ€ ZÌ„ Z̆ Z̈ Z̧ aÌ‹ cÌ€ cÌ„ c̆ c̈ cÌ• cÌ£ c̦ c̨̆ dÌ‚ fÌ€ fÌ„ gÌ€ hÌ„ h̦ jÌ kÌ€ \n" - + "kÌ‚ kÌ„ k̇ kÌ• kÌ› k̦ kÍŸh lÌ‚ lÌ¥ l̥̄ l̦ mÌ€ mÌ‚ m̆ mÌ nÌ‚ nÌ„ n̆ n̦ pÌ€ pÌ„ pÌ• pÌ£ r̆ rÌ¥ r̥̄ \n" - + "sÌ€ sÌ„ s̛̄ s̱ tÌ€ tÌ„ tÌ• tÌ› u̇ zÌ€ zÌ„ z̆ z̈ z̧ Ç̆ Û̄ ç̆ û̄ Ã¿Ì ÄŒÌ• Č̣ ÄÌ• ÄÌ£ Ä“Ì ÄªÌ Ä«Ì \n" - + "ÅÌ Å½Ì¦ Ž̧ ž̦ ž̧ Ḳ̄ ḳ̄ Ṣ̄ ṣ̄ Ṭ̄ á¹­Ì„ Ạ̈ ạ̈ Ọ̈ á»Ìˆ Ụ̄ Ụ̈ ụ̄ ụ̈ \n" - + "bnlreq; Non-Letters N1 (normative)\n" - + " ' , - . ` ~ ¨ ´ · ʹ ʺ ʾ Ê¿ ˈ ËŒ ’ ‡ \n" - + "bnl; Non-Letters N2 (normative)\n" - + "! \" # $ % & ( ) * + / 0 1 2 3 4 5 6 7 8 9 : ; < = > \n" - + "? @ [ \\ ] ^ _ { | } ¡ ¢ £ Â¥ § © ª « ¬ ® ¯ ° ± ² ³ µ \n" - + "¶ ¹ º » ¿ × ÷ € \n" - + "bnlopt; Non-Letters N3 (normative)\n" - + "¤ ¦ ¸ ¼ ½ ¾ \n" - + "bnlnot; Non-Letters N4 (normative)\n" - + "-omitted-\n" - + "dc; Combining diacritics (normative)\n" - + "Ì€-omitted-\n" - + "gl; Greek Letters (extended)\n" - + "Ά Έ Ή Ί ÎŒ ÎŽ ΠΠΑ Î’ Γ Δ Ε Ζ Η Θ Ι Κ Λ Îœ ΠΞ Ο Π Ρ Σ \n" - + "Τ Î¥ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν \n" - + "ξ ο Ï€ Ï Ï‚ σ Ï„ Ï… φ χ ψ ω ÏŠ Ï‹ ÏŒ Ï ÏŽ \n" - + "cl; Cyrillic Letters (extended)\n" - + "РРБ Ð’ Г Д Е Ж З И Й К Л Ðœ РО П Р С Т У Ф Ð¥ Ц Ч Ш \n" - + "Щ Ъ Ь Ю Я а б в г д е ж з и й к л м н о п Ñ€ Ñ Ñ‚ у Ñ„ \n" - + "Ñ… ц ч ш щ ÑŠ ÑŒ ÑŽ Ñ Ñ \n" - + "enl; Non-Letters E1 (extended)\n" - + "Æ’ Ê° ʳ ˆ Ëœ Ë¢ ᵈ áµ— ‘ ‚ “ †„ † … ‰ ′ ″ ‹ › Ⱐⴠⵠⶠⷠ⸠\n" - + "â¹ â¿ â‚€ â‚ â‚‚ ₃ â‚„ â‚… ₆ ₇ ₈ ₉ â„¢ \n\n"; + "bll; Latin Letters (normative)\n" + + "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \n" + + "a b c d e f g h i j k l m n o p q r s t u v w x y z \n" + + "À à Â Ã Ä Ã… Æ Ç È É Ê Ë ÃŒ à Î à à Ñ Ã’ Ó Ô Õ Ö Ø Ù Ú \n" + + "Û Ãœ à Þ ß à á â ã ä Ã¥ æ ç è é ê ë ì í î ï ð ñ ò ó ô \n" + + "õ ö ø ù ú û ü ý þ ÿ Ä€ Ä Ä‚ ă Ä„ Ä… Ć ć Ĉ ĉ ÄŠ Ä‹ ÄŒ Ä ÄŽ Ä \n" + + "Ä Ä‘ Ä’ Ä“ Ä” Ä• Ä– Ä— Ę Ä™ Äš Ä› Äœ Ä Äž ÄŸ Ä  Ä¡ Ä¢ Ä£ Ĥ Ä¥ Ħ ħ Ĩ Ä© \n" + + "Ī Ä« Ĭ Ä­ Ä® į Ä° ı IJ ij Ä´ ĵ Ķ Ä· ĸ Ĺ ĺ Ä» ļ Ľ ľ Ä¿ Å€ Å Å‚ Ń \n" + + "Å„ Å… ņ Ň ň ʼn ÅŠ Å‹ ÅŒ Å ÅŽ Å Å Å‘ Å’ Å“ Å” Å• Å– Å— Ř Å™ Åš Å› Åœ Å \n" + + "Åž ÅŸ Å  Å¡ Å¢ Å£ Ť Å¥ Ŧ ŧ Ũ Å© Ū Å« Ŭ Å­ Å® ů Å° ű Ų ų Å´ ŵ Ŷ Å· \n" + + "Ÿ Ź ź Å» ż Ž ž Ƈ ƈ Æ Æ— Æ  Æ¡ Ư Æ° Æ· Ç ÇŽ Ç Ç Ç‘ Ç’ Ç“ Ç” Ç• Ç– \n" + + "Ç— ǘ Ç™ Çš Ç› Çœ Çž ÇŸ Ç¢ Ç£ Ǥ Ç¥ Ǧ ǧ Ǩ Ç© Ǫ Ç« Ǭ Ç­ Ç® ǯ Ç° Ç´ ǵ Ǹ \n" + + "ǹ Ǻ Ç» Ǽ ǽ Ǿ Ç¿ È’ È“ Ș È™ Èš È› Èž ÈŸ ȧ Ȩ È© Ȫ È« Ȭ È­ È® ȯ È° ȱ \n" + + "Ȳ ȳ É™ ɨ Ê’ Ḃ ḃ Ḇ ḇ Ḋ ḋ Ḍ ḠḎ ḠḠḑ ḗ Ḝ ḠḞ ḟ Ḡ ḡ Ḣ ḣ \n" + + "Ḥ ḥ Ḧ ḧ Ḩ ḩ Ḫ ḫ ḯ Ḱ ḱ Ḳ ḳ Ḵ ḵ Ḷ ḷ Ḻ ḻ á¹€ ṠṂ ṃ Ṅ á¹… Ṇ \n" + + "ṇ Ṉ ṉ á¹’ ṓ á¹” ṕ á¹– á¹— Ṙ á¹™ Ṛ á¹› Ṟ ṟ á¹  ṡ á¹¢ á¹£ Ṫ ṫ Ṭ á¹­ á¹® ṯ Ẁ \n" + + "ẠẂ ẃ Ẅ ẅ Ẇ ẇ Ẍ ẠẎ ẠẠẑ Ẓ ẓ Ẕ ẕ ẖ ẗ ẞ Ạ ạ Ả ả Ấ ấ \n" + + "Ầ ầ Ẩ ẩ Ẫ ẫ Ậ ậ Ắ ắ Ằ ằ Ẳ ẳ Ẵ ẵ Ặ ặ Ẹ ẹ Ẻ ẻ Ẽ ẽ Ế ế \n" + + "Ề ỠỂ ể Ễ á»… Ệ ệ Ỉ ỉ Ị ị Ọ ỠỎ ỠỠố á»’ ồ á»” ổ á»– á»— Ộ á»™ \n" + + "Ớ á»› Ờ ỠỞ ở á»  ỡ Ợ ợ Ụ ụ Ủ ủ Ứ ứ Ừ ừ Ử á»­ á»® ữ á»° á»± Ỳ ỳ \n" + + "á»´ ỵ Ỷ á»· Ỹ ỹ \n" + + "Sequences\n" + + "AÌ‹ CÌ€ CÌ„ C̆ C̈ CÌ• CÌ£ C̦ C̨̆ DÌ‚ FÌ€ FÌ„ GÌ€ HÌ„ H̦ H̱ JÌ JÌŒ KÌ€ KÌ‚ KÌ„ K̇ KÌ• KÌ› K̦ KÍŸH \n" + + "KÍŸh LÌ‚ LÌ¥ L̥̄ L̦ MÌ€ MÌ‚ M̆ MÌ NÌ‚ NÌ„ N̆ N̦ PÌ€ PÌ„ PÌ• PÌ£ R̆ RÌ¥ R̥̄ SÌ€ SÌ„ S̛̄ S̱ TÌ€ TÌ„ \n" + + "T̈ TÌ• TÌ› U̇ ZÌ€ ZÌ„ Z̆ Z̈ Z̧ aÌ‹ cÌ€ cÌ„ c̆ c̈ cÌ• cÌ£ c̦ c̨̆ dÌ‚ fÌ€ fÌ„ gÌ€ hÌ„ h̦ jÌ kÌ€ \n" + + "kÌ‚ kÌ„ k̇ kÌ• kÌ› k̦ kÍŸh lÌ‚ lÌ¥ l̥̄ l̦ mÌ€ mÌ‚ m̆ mÌ nÌ‚ nÌ„ n̆ n̦ pÌ€ pÌ„ pÌ• pÌ£ r̆ rÌ¥ r̥̄ \n" + + "sÌ€ sÌ„ s̛̄ s̱ tÌ€ tÌ„ tÌ• tÌ› u̇ zÌ€ zÌ„ z̆ z̈ z̧ Ç̆ Û̄ ç̆ û̄ Ã¿Ì ÄŒÌ• Č̣ ÄÌ• ÄÌ£ Ä“Ì ÄªÌ Ä«Ì \n" + + "ÅÌ Å½Ì¦ Ž̧ ž̦ ž̧ Ḳ̄ ḳ̄ Ṣ̄ ṣ̄ Ṭ̄ á¹­Ì„ Ạ̈ ạ̈ Ọ̈ á»Ìˆ Ụ̄ Ụ̈ ụ̄ ụ̈ \n" + + "bnlreq; Non-Letters N1 (normative)\n" + + " ' , - . ` ~ ¨ ´ · ʹ ʺ ʾ Ê¿ ˈ ËŒ ’ ‡ \n" + + "bnl; Non-Letters N2 (normative)\n" + + "! \" # $ % & ( ) * + / 0 1 2 3 4 5 6 7 8 9 : ; < = > \n" + + "? @ [ \\ ] ^ _ { | } ¡ ¢ £ Â¥ § © ª « ¬ ® ¯ ° ± ² ³ µ \n" + + "¶ ¹ º » ¿ × ÷ € \n" + + "bnlopt; Non-Letters N3 (normative)\n" + + "¤ ¦ ¸ ¼ ½ ¾ \n" + + "bnlnot; Non-Letters N4 (normative)\n" + + "-omitted-\n" + + "dc; Combining diacritics (normative)\n" + + "Ì€-omitted-\n" + + "gl; Greek Letters (extended)\n" + + "Ά Έ Ή Ί ÎŒ ÎŽ ΠΠΑ Î’ Γ Δ Ε Ζ Η Θ Ι Κ Λ Îœ ΠΞ Ο Π Ρ Σ \n" + + "Τ Î¥ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν \n" + + "ξ ο Ï€ Ï Ï‚ σ Ï„ Ï… φ χ ψ ω ÏŠ Ï‹ ÏŒ Ï ÏŽ \n" + + "cl; Cyrillic Letters (extended)\n" + + "РРБ Ð’ Г Д Е Ж З И Й К Л Ðœ РО П Р С Т У Ф Ð¥ Ц Ч Ш \n" + + "Щ Ъ Ь Ю Я а б в г д е ж з и й к л м н о п Ñ€ Ñ Ñ‚ у Ñ„ \n" + + "Ñ… ц ч ш щ ÑŠ ÑŒ ÑŽ Ñ Ñ \n" + + "enl; Non-Letters E1 (extended)\n" + + "Æ’ Ê° ʳ ˆ Ëœ Ë¢ ᵈ áµ— ‘ ‚ “ †„ † … ‰ ′ ″ ‹ › Ⱐⴠⵠⶠⷠ⸠\n" + + "â¹ â¿ â‚€ â‚ â‚‚ ₃ â‚„ â‚… ₆ ₇ ₈ ₉ â„¢ \n\n"; public static String LATIN_CHARS_DIN_91379_MATH = - "enl; Non Letters E1 (extended) math\n" + "enl; Non Letters E1 (extended) math\n" + "∞ ≤ ≥ \n"; public static String LATIN_CHARS_ADDITIONAL = - "Additional non-letters (not included in DIN 91379)\n" + "Additional non-letters (not included in DIN 91379)\n" + "– — •�\n\n"; public static String TEST_KERNING = - "Kerning\n" - +"AVATAR Vector TeX\n\n"; + "Kerning\n" + + "AVATAR Vector TeX\n\n"; public static String TEST_LIGATURES = - "Ligatures\n" + "Ligatures\n" + "ff ffi ffl fi fl\n\n"; /** * Register and get font - * @param path of font file - * @param alias name + * + * @param path of font file + * @param alias name * @param fontSize size of font * @return the loaded font */ @@ -123,26 +124,21 @@ private static Font loadFont(String path, String alias, float fontSize) { /** * Main method - * + * * @param args -- not used */ - public static void main(String[] args) { - try { - test("GlyphLayoutDocumentDin91379.pdf", true); - } catch (Exception e) { - e.printStackTrace(); - } + public static void main(String[] args) throws Exception { + test("GlyphLayoutDocumentDin91379.pdf", true); } /** * Run the test: Print the characters of DIN 91379 in a pdf document - * - * @param fileName Name of output file + * + * @param fileName Name of output file * @param testChunks if true some chunks are added to test positioning - * @throws Exception if an error occurs */ - public static void test(String fileName, boolean testChunks) throws Exception { + public static void test(String fileName, boolean testChunks) throws IOException { // Enable the LayoutProcessor with kerning and ligatures LayoutProcessor.enableKernLiga(); @@ -153,14 +149,13 @@ public static void test(String fileName, boolean testChunks) throws Exception { // available for glyph layout. // Only these fonts can be used. String fontDir = "com/lowagie/examples/fonts/"; - Font sansFont = loadFont(fontDir+"noto/NotoSans-Regular.ttf", "sans", fontSize); + Font sansFont = loadFont(fontDir + "noto/NotoSans-Regular.ttf", "sans", fontSize); String sansFontName = sansFont.getBaseFont().getPostscriptFontName(); - Font mathFont = loadFont(fontDir+"noto/NotoSansMath-Regular.ttf", "math", fontSize); + Font mathFont = loadFont(fontDir + "noto/NotoSansMath-Regular.ttf", "math", fontSize); String mathFontName = mathFont.getBaseFont().getPostscriptFontName(); - Font serifFont = loadFont(fontDir+"noto/NotoSerif-Regular.ttf", "serif", fontSize); + Font serifFont = loadFont(fontDir + "noto/NotoSerif-Regular.ttf", "serif", fontSize); String serifFontName = serifFont.getBaseFont().getPostscriptFontName(); - try (Document document = new Document()) { PdfWriter writer = PdfWriter.getInstance(document, Files.newOutputStream(Paths.get(fileName))); writer.setInitialLeading(16.0f); @@ -174,14 +169,13 @@ public static void test(String fileName, boolean testChunks) throws Exception { document.add(new Chunk(sansFontName + "\n" + TEST_KERNING, sansFont)); document.add(new Chunk(serifFontName + "\n" + TEST_LIGATURES, serifFont)); - if(testChunks) { + if (testChunks) { addChunks(document, sansFont); } - } catch (Exception e) { - e.printStackTrace(); } + LayoutProcessor.disable(); } - + /* * Add several chunks to test positioning */ @@ -196,4 +190,4 @@ private static void addChunks(Document document, Font font) { document.add(new Chunk("jÌS̛̄s̛̄KÌ›", font)); document.add(new Chunk(".\n", font)); } -} \ No newline at end of file +} diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLiga.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLiga.java index 312072112..3cf0b1e02 100644 --- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLiga.java +++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLiga.java @@ -1,7 +1,7 @@ /* * GlyphLayoutDocumentDinSpec91379 - * + * * This code is part of the 'OpenPDF Tutorial'. * You can find the complete tutorial at the following address: * https://github.com/LibrePDF/OpenPDF/wiki/Tutorial @@ -10,7 +10,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * + * */ package com.lowagie.examples.fonts; @@ -28,31 +28,27 @@ * Prints text with correct glyph layout, kerning and ligatures globally enabled */ public class GlyphLayoutDocumentKernLiga { - + public static String INTRO_TEXT = - "Test of text attributes for kerning and ligatures\n" - + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n"; + "Test of text attributes for kerning and ligatures\n" + + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n"; public static String TEST_TEXT = - "AVATAR Vector TeX ff ffi ffl fi fl.\n\n"; + "AVATAR Vector TeX ff ffi ffl fi fl.\n\n"; /** * Main method - * + * * @param args -- not used */ - public static void main(String[] args) { - try { - test("GlyphLayoutDocumentKernLiga.pdf"); - } catch (Exception e) { - e.printStackTrace(); - } + public static void main(String[] args) throws Exception { + test("GlyphLayoutDocumentKernLiga.pdf"); } /** * Run the test: Show kerning and ligatures - * + * * @param fileName Name of output file * @throws Exception if an error occurs */ @@ -67,17 +63,16 @@ public static void test(String fileName) throws Exception { // available for glyph layout. String fontDir = "com/lowagie/examples/fonts/"; - FontFactory.register(fontDir+"noto/NotoSerif-Regular.ttf", "notoSerif"); + FontFactory.register(fontDir + "noto/NotoSerif-Regular.ttf", "notoSerif"); Font notoSerif = FontFactory.getFont("notoSerif", BaseFont.IDENTITY_H, true, fontSize); try (Document document = new Document()) { PdfWriter writer = PdfWriter.getInstance(document, Files.newOutputStream(Paths.get(fileName))); writer.setInitialLeading(16.0f); document.open(); - document.add(new Chunk(INTRO_TEXT +"Font: Noto Serif Regular\n\n", notoSerif)); - document.add(new Chunk(TEST_TEXT , notoSerif)); - } catch (Exception e) { - e.printStackTrace(); + document.add(new Chunk(INTRO_TEXT + "Font: Noto Serif Regular\n\n", notoSerif)); + document.add(new Chunk(TEST_TEXT, notoSerif)); } + LayoutProcessor.disable(); } -} \ No newline at end of file +} diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLigaPerFont.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLigaPerFont.java index 35a6a7369..34d2978d7 100644 --- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLigaPerFont.java +++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLigaPerFont.java @@ -1,7 +1,7 @@ /* * GlyphLayoutDocumentDinSpec91379 - * + * * This code is part of the 'OpenPDF Tutorial'. * You can find the complete tutorial at the following address: * https://github.com/LibrePDF/OpenPDF/wiki/Tutorial @@ -10,7 +10,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * + * */ package com.lowagie.examples.fonts; @@ -28,44 +28,41 @@ * Test kerning and ligatures per font */ public class GlyphLayoutDocumentKernLigaPerFont { - + public static String TEXT_INTRO = - "Test of kerning and ligatures per font\n" - + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n"; + "Test of kerning and ligatures per font\n" + + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n"; public static String TEST_TEXT = - "AVATAR Vector TeX ff ffi ffl fi fl."; + "AVATAR Vector TeX ff ffi ffl fi fl."; /** * Main method - * + * * @param args -- not used */ - public static void main(String[] args) { - try { - test("GlyphLayoutDocumentKernLigaPerFont.pdf"); - } catch (Exception e) { - e.printStackTrace(); - } + public static void main(String[] args) throws Exception { + test("GlyphLayoutDocumentKernLigaPerFont.pdf"); } /** * Register and get a font, caching is switched off - * @param path the path to a font file - * @param alias the alias you want to use for the font - * @param fontSize the size of this font + * + * @param path the path to a font file + * @param alias the alias you want to use for the font + * @param fontSize the size of this font * @return the Font constructed based on the parameters */ public static Font loadFont(String path, String alias, float fontSize) { FontFactory.register(path, alias); return FontFactory.getFont(alias, BaseFont.IDENTITY_H, true, fontSize, Font.UNDEFINED, null, false); - // cached has to be set to false, to allow different attributes for instances of one font + // cached has to be set to 'false', to allow different attributes for instances of one font } /** * Run the test: Show kerning and ligatures - * + * * @param fileName Name of output file * @throws Exception if an error occurs */ @@ -79,18 +76,18 @@ public static void test(String fileName) throws Exception { // The OpenType fonts loaded with FontFactory.register() are // available for glyph layout. String fontDir = "com/lowagie/examples/fonts/"; - Font serifFont = loadFont(fontDir+"noto/NotoSerif-Regular.ttf", "serif", fontSize); + Font serifFont = loadFont(fontDir + "noto/NotoSerif-Regular.ttf", "serif", fontSize); - Font serifKernLiga1 = loadFont(fontDir+"noto/NotoSerif-Regular.ttf", "serif_kern_liga", fontSize); + Font serifKernLiga1 = loadFont(fontDir + "noto/NotoSerif-Regular.ttf", "serif_kern_liga", fontSize); // Switch ligatures and kerning on for one font LayoutProcessor.setLigatures(serifKernLiga1); LayoutProcessor.setKerning(serifKernLiga1); - Font serifKern1 = loadFont(fontDir+"noto/NotoSerif-Regular.ttf", "serif_kern1", fontSize); + Font serifKern1 = loadFont(fontDir + "noto/NotoSerif-Regular.ttf", "serif_kern1", fontSize); // Switch on kerning for one font LayoutProcessor.setKerning(serifKern1); - Font serifLiga1 = loadFont(fontDir+"noto/NotoSerif-Regular.ttf", "serif_liga1", fontSize); + Font serifLiga1 = loadFont(fontDir + "noto/NotoSerif-Regular.ttf", "serif_liga1", fontSize); // Switch on ligatures for one font LayoutProcessor.setLigatures(serifLiga1); @@ -100,14 +97,13 @@ public static void test(String fileName) throws Exception { document.open(); document.add(new Chunk(TEXT_INTRO, serifFont)); - document.add(new Chunk(TEST_TEXT+" no kerning, no ligatures\n", serifFont)); - document.add(new Chunk(TEST_TEXT+" kerning, ligatures\n", serifKernLiga1)); - document.add(new Chunk(TEST_TEXT+" kerning, no ligatures\n", serifKern1)); - document.add(new Chunk(TEST_TEXT+" no kerning, ligatures\n", serifLiga1)); - document.add(new Chunk(TEST_TEXT+" no kerning, no ligatures\n\n", serifFont)); + document.add(new Chunk(TEST_TEXT + " no kerning, no ligatures\n", serifFont)); + document.add(new Chunk(TEST_TEXT + " kerning, ligatures\n", serifKernLiga1)); + document.add(new Chunk(TEST_TEXT + " kerning, no ligatures\n", serifKern1)); + document.add(new Chunk(TEST_TEXT + " no kerning, ligatures\n", serifLiga1)); + document.add(new Chunk(TEST_TEXT + " no kerning, no ligatures\n\n", serifFont)); - } catch (Exception e) { - e.printStackTrace(); } + LayoutProcessor.disable(); } -} \ No newline at end of file +} diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutFormDin91379.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutFormDin91379.java index 7308db31a..38f15ac59 100644 --- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutFormDin91379.java +++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutFormDin91379.java @@ -1,6 +1,6 @@ /* * GlyphLayoutFormDin91379 - * + * * This code is part of the 'OpenPDF Tutorial'. * You can find the complete tutorial at the following address: * https://github.com/LibrePDF/OpenPDF/wiki/Tutorial @@ -12,10 +12,6 @@ package com.lowagie.examples.fonts; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.util.Map; - import com.lowagie.text.Font; import com.lowagie.text.FontFactory; import com.lowagie.text.pdf.AcroFields; @@ -23,94 +19,94 @@ import com.lowagie.text.pdf.LayoutProcessor; import com.lowagie.text.pdf.PdfReader; import com.lowagie.text.pdf.PdfStamper; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.util.Map; /** - * Prints characters and sequences of DIN 91379 - * with correct glyph layout + * Prints characters and sequences of DIN 91379 with correct glyph layout */ public class GlyphLayoutFormDin91379 { public static String TEXT_INTRO = - "Test of formatting for letters and sequences defined in:\n" - + "DIN 91379:2022-08: Characters and defined character sequences in Unicode for the electronic\n " - + "processing of names and data exchange in Europe, with CD-ROM\n" - + "See https://www.beuth.de/de/norm/din-91379/353496133\n" - + " https://github.com/String-Latin/DIN-91379-Characters-and-Sequences" - + "and https://en.wikipedia.org/wiki/DIN_91379\n\n" - + "Fonts used: Noto Sans Regular, Noto Sans Math Regular\n" - + " see https://fonts.google.com/noto/specimen/Noto+Sans" - + " and https://github.com/googlefonts/noto-fonts/tree/main/hinted/ttf\n" - + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n"; + "Test of formatting for letters and sequences defined in:\n" + + "DIN 91379:2022-08: Characters and defined character sequences in Unicode for the electronic\n " + + "processing of names and data exchange in Europe, with CD-ROM\n" + + "See https://www.beuth.de/de/norm/din-91379/353496133\n" + + " https://github.com/String-Latin/DIN-91379-Characters-and-Sequences" + + "and https://en.wikipedia.org/wiki/DIN_91379\n\n" + + "Fonts used: Noto Sans Regular, Noto Sans Math Regular\n" + + " see https://fonts.google.com/noto/specimen/Noto+Sans" + + " and https://github.com/googlefonts/noto-fonts/tree/main/hinted/ttf\n" + + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n"; public static String LATIN_CHARS_DIN_91379 = - "bll; Latin Letters (normative)\n" - + "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z " - + "a b c d e f g h i j k l m n o p q r s t u v w x y z " - + "À à Â Ã Ä Ã… Æ Ç È É Ê Ë ÃŒ à Î à à Ñ Ã’ Ó Ô Õ Ö Ø Ù Ú " - + "Û Ãœ à Þ ß à á â ã ä Ã¥ æ ç è é ê ë ì í î ï ð ñ ò ó ô " - + "õ ö ø ù ú û ü ý þ ÿ Ä€ Ä Ä‚ ă Ä„ Ä… Ć ć Ĉ ĉ ÄŠ Ä‹ ÄŒ Ä ÄŽ Ä " - + "Ä Ä‘ Ä’ Ä“ Ä” Ä• Ä– Ä— Ę Ä™ Äš Ä› Äœ Ä Äž ÄŸ Ä  Ä¡ Ä¢ Ä£ Ĥ Ä¥ Ħ ħ Ĩ Ä© " - + "Ī Ä« Ĭ Ä­ Ä® į Ä° ı IJ ij Ä´ ĵ Ķ Ä· ĸ Ĺ ĺ Ä» ļ Ľ ľ Ä¿ Å€ Å Å‚ Ń " - + "Å„ Å… ņ Ň ň ʼn ÅŠ Å‹ ÅŒ Å ÅŽ Å Å Å‘ Å’ Å“ Å” Å• Å– Å— Ř Å™ Åš Å› Åœ Å " - + "Åž ÅŸ Å  Å¡ Å¢ Å£ Ť Å¥ Ŧ ŧ Ũ Å© Ū Å« Ŭ Å­ Å® ů Å° ű Ų ų Å´ ŵ Ŷ Å· " - + "Ÿ Ź ź Å» ż Ž ž Ƈ ƈ Æ Æ— Æ  Æ¡ Ư Æ° Æ· Ç ÇŽ Ç Ç Ç‘ Ç’ Ç“ Ç” Ç• Ç– " - + "Ç— ǘ Ç™ Çš Ç› Çœ Çž ÇŸ Ç¢ Ç£ Ǥ Ç¥ Ǧ ǧ Ǩ Ç© Ǫ Ç« Ǭ Ç­ Ç® ǯ Ç° Ç´ ǵ Ǹ " - + "ǹ Ǻ Ç» Ǽ ǽ Ǿ Ç¿ È’ È“ Ș È™ Èš È› Èž ÈŸ ȧ Ȩ È© Ȫ È« Ȭ È­ È® ȯ È° ȱ " - + "Ȳ ȳ É™ ɨ Ê’ Ḃ ḃ Ḇ ḇ Ḋ ḋ Ḍ ḠḎ ḠḠḑ ḗ Ḝ ḠḞ ḟ Ḡ ḡ Ḣ ḣ " - + "Ḥ ḥ Ḧ ḧ Ḩ ḩ Ḫ ḫ ḯ Ḱ ḱ Ḳ ḳ Ḵ ḵ Ḷ ḷ Ḻ ḻ á¹€ ṠṂ ṃ Ṅ á¹… Ṇ " - + "ṇ Ṉ ṉ á¹’ ṓ á¹” ṕ á¹– á¹— Ṙ á¹™ Ṛ á¹› Ṟ ṟ á¹  ṡ á¹¢ á¹£ Ṫ ṫ Ṭ á¹­ á¹® ṯ Ẁ " - + "ẠẂ ẃ Ẅ ẅ Ẇ ẇ Ẍ ẠẎ ẠẠẑ Ẓ ẓ Ẕ ẕ ẖ ẗ ẞ Ạ ạ Ả ả Ấ ấ " - + "Ầ ầ Ẩ ẩ Ẫ ẫ Ậ ậ Ắ ắ Ằ ằ Ẳ ẳ Ẵ ẵ Ặ ặ Ẹ ẹ Ẻ ẻ Ẽ ẽ Ế ế " - + "Ề ỠỂ ể Ễ á»… Ệ ệ Ỉ ỉ Ị ị Ọ ỠỎ ỠỠố á»’ ồ á»” ổ á»– á»— Ộ á»™ " - + "Ớ á»› Ờ ỠỞ ở á»  ỡ Ợ ợ Ụ ụ Ủ ủ Ứ ứ Ừ ừ Ử á»­ á»® ữ á»° á»± Ỳ ỳ " - + "á»´ ỵ Ỷ á»· Ỹ ỹ \n" - + "Sequences\n" - + "AÌ‹ CÌ€ CÌ„ C̆ C̈ CÌ• CÌ£ C̦ C̨̆ DÌ‚ FÌ€ FÌ„ GÌ€ HÌ„ H̦ H̱ JÌ JÌŒ KÌ€ KÌ‚ KÌ„ K̇ KÌ• KÌ› K̦ KÍŸH " - + "KÍŸh LÌ‚ LÌ¥ L̥̄ L̦ MÌ€ MÌ‚ M̆ MÌ NÌ‚ NÌ„ N̆ N̦ PÌ€ PÌ„ PÌ• PÌ£ R̆ RÌ¥ R̥̄ SÌ€ SÌ„ S̛̄ S̱ TÌ€ TÌ„ " - + "T̈ TÌ• TÌ› U̇ ZÌ€ ZÌ„ Z̆ Z̈ Z̧ aÌ‹ cÌ€ cÌ„ c̆ c̈ cÌ• cÌ£ c̦ c̨̆ dÌ‚ fÌ€ fÌ„ gÌ€ hÌ„ h̦ jÌ kÌ€ " - + "kÌ‚ kÌ„ k̇ kÌ• kÌ› k̦ kÍŸh lÌ‚ lÌ¥ l̥̄ l̦ mÌ€ mÌ‚ m̆ mÌ nÌ‚ nÌ„ n̆ n̦ pÌ€ pÌ„ pÌ• pÌ£ r̆ rÌ¥ r̥̄ " - + "sÌ€ sÌ„ s̛̄ s̱ tÌ€ tÌ„ tÌ• tÌ› u̇ zÌ€ zÌ„ z̆ z̈ z̧ Ç̆ Û̄ ç̆ û̄ Ã¿Ì ÄŒÌ• Č̣ ÄÌ• ÄÌ£ Ä“Ì ÄªÌ Ä«Ì " - + "ÅÌ Å½Ì¦ Ž̧ ž̦ ž̧ Ḳ̄ ḳ̄ Ṣ̄ ṣ̄ Ṭ̄ á¹­Ì„ Ạ̈ ạ̈ Ọ̈ á»Ìˆ Ụ̄ Ụ̈ ụ̄ ụ̈ \n" - + "bnlreq; Non-Letters N1 (normative)\n" - + " ' , - . ` ~ ¨ ´ · ʹ ʺ ʾ Ê¿ ˈ ËŒ ’ ‡ \n" - + "bnl; Non-Letters N2 (normative)\n" - + "! \" # $ % & ( ) * + / 0 1 2 3 4 5 6 7 8 9 : ; < = > " - + "? @ [ \\ ] ^ _ { | } ¡ ¢ £ Â¥ § © ª « ¬ ® ¯ ° ± ² ³ µ " - + "¶ ¹ º » ¿ × ÷ € \n" - + "bnlopt; Non-Letters N3 (normative)\n" - + "¤ ¦ ¸ ¼ ½ ¾ \n" - + "bnlnot; Non-Letters N4 (normative) -omitted-\n" - + "dc; Combining diacritics (normative) Ì€-omitted-\n" - + "gl; Greek Letters (extended)\n" - + "Ά Έ Ή Ί ÎŒ ÎŽ ΠΠΑ Î’ Γ Δ Ε Ζ Η Θ Ι Κ Λ Îœ ΠΞ Ο Π Ρ Σ " - + "Τ Î¥ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν " - + "ξ ο Ï€ Ï Ï‚ σ Ï„ Ï… φ χ ψ ω ÏŠ Ï‹ ÏŒ Ï ÏŽ \n" - + "cl; Cyrillic Letters (extended)\n" - + "РРБ Ð’ Г Д Е Ж З И Й К Л Ðœ РО П Р С Т У Ф Ð¥ Ц Ч Ш " - + "Щ Ъ Ь Ю Я а б в г д е ж з и й к л м н о п Ñ€ Ñ Ñ‚ у Ñ„ " - + "Ñ… ц ч ш щ ÑŠ ÑŒ ÑŽ Ñ Ñ \n" - + "enl; Non-Letters E1 (extended)\n" - + "Æ’ Ê° ʳ ˆ Ëœ Ë¢ ᵈ áµ— ‘ ‚ “ †„ † … ‰ ′ ″ ‹ › Ⱐⴠⵠⶠⷠ⸠" - + "â¹ â¿ â‚€ â‚ â‚‚ ₃ â‚„ â‚… ₆ ₇ ₈ ₉ â„¢ ∞ ≤ ≥ \n\n"; + "bll; Latin Letters (normative)\n" + + "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z " + + "a b c d e f g h i j k l m n o p q r s t u v w x y z " + + "À à Â Ã Ä Ã… Æ Ç È É Ê Ë ÃŒ à Î à à Ñ Ã’ Ó Ô Õ Ö Ø Ù Ú " + + "Û Ãœ à Þ ß à á â ã ä Ã¥ æ ç è é ê ë ì í î ï ð ñ ò ó ô " + + "õ ö ø ù ú û ü ý þ ÿ Ä€ Ä Ä‚ ă Ä„ Ä… Ć ć Ĉ ĉ ÄŠ Ä‹ ÄŒ Ä ÄŽ Ä " + + "Ä Ä‘ Ä’ Ä“ Ä” Ä• Ä– Ä— Ę Ä™ Äš Ä› Äœ Ä Äž ÄŸ Ä  Ä¡ Ä¢ Ä£ Ĥ Ä¥ Ħ ħ Ĩ Ä© " + + "Ī Ä« Ĭ Ä­ Ä® į Ä° ı IJ ij Ä´ ĵ Ķ Ä· ĸ Ĺ ĺ Ä» ļ Ľ ľ Ä¿ Å€ Å Å‚ Ń " + + "Å„ Å… ņ Ň ň ʼn ÅŠ Å‹ ÅŒ Å ÅŽ Å Å Å‘ Å’ Å“ Å” Å• Å– Å— Ř Å™ Åš Å› Åœ Å " + + "Åž ÅŸ Å  Å¡ Å¢ Å£ Ť Å¥ Ŧ ŧ Ũ Å© Ū Å« Ŭ Å­ Å® ů Å° ű Ų ų Å´ ŵ Ŷ Å· " + + "Ÿ Ź ź Å» ż Ž ž Ƈ ƈ Æ Æ— Æ  Æ¡ Ư Æ° Æ· Ç ÇŽ Ç Ç Ç‘ Ç’ Ç“ Ç” Ç• Ç– " + + "Ç— ǘ Ç™ Çš Ç› Çœ Çž ÇŸ Ç¢ Ç£ Ǥ Ç¥ Ǧ ǧ Ǩ Ç© Ǫ Ç« Ǭ Ç­ Ç® ǯ Ç° Ç´ ǵ Ǹ " + + "ǹ Ǻ Ç» Ǽ ǽ Ǿ Ç¿ È’ È“ Ș È™ Èš È› Èž ÈŸ ȧ Ȩ È© Ȫ È« Ȭ È­ È® ȯ È° ȱ " + + "Ȳ ȳ É™ ɨ Ê’ Ḃ ḃ Ḇ ḇ Ḋ ḋ Ḍ ḠḎ ḠḠḑ ḗ Ḝ ḠḞ ḟ Ḡ ḡ Ḣ ḣ " + + "Ḥ ḥ Ḧ ḧ Ḩ ḩ Ḫ ḫ ḯ Ḱ ḱ Ḳ ḳ Ḵ ḵ Ḷ ḷ Ḻ ḻ á¹€ ṠṂ ṃ Ṅ á¹… Ṇ " + + "ṇ Ṉ ṉ á¹’ ṓ á¹” ṕ á¹– á¹— Ṙ á¹™ Ṛ á¹› Ṟ ṟ á¹  ṡ á¹¢ á¹£ Ṫ ṫ Ṭ á¹­ á¹® ṯ Ẁ " + + "ẠẂ ẃ Ẅ ẅ Ẇ ẇ Ẍ ẠẎ ẠẠẑ Ẓ ẓ Ẕ ẕ ẖ ẗ ẞ Ạ ạ Ả ả Ấ ấ " + + "Ầ ầ Ẩ ẩ Ẫ ẫ Ậ ậ Ắ ắ Ằ ằ Ẳ ẳ Ẵ ẵ Ặ ặ Ẹ ẹ Ẻ ẻ Ẽ ẽ Ế ế " + + "Ề ỠỂ ể Ễ á»… Ệ ệ Ỉ ỉ Ị ị Ọ ỠỎ ỠỠố á»’ ồ á»” ổ á»– á»— Ộ á»™ " + + "Ớ á»› Ờ ỠỞ ở á»  ỡ Ợ ợ Ụ ụ Ủ ủ Ứ ứ Ừ ừ Ử á»­ á»® ữ á»° á»± Ỳ ỳ " + + "á»´ ỵ Ỷ á»· Ỹ ỹ \n" + + "Sequences\n" + + "AÌ‹ CÌ€ CÌ„ C̆ C̈ CÌ• CÌ£ C̦ C̨̆ DÌ‚ FÌ€ FÌ„ GÌ€ HÌ„ H̦ H̱ JÌ JÌŒ KÌ€ KÌ‚ KÌ„ K̇ KÌ• KÌ› K̦ KÍŸH " + + "KÍŸh LÌ‚ LÌ¥ L̥̄ L̦ MÌ€ MÌ‚ M̆ MÌ NÌ‚ NÌ„ N̆ N̦ PÌ€ PÌ„ PÌ• PÌ£ R̆ RÌ¥ R̥̄ SÌ€ SÌ„ S̛̄ S̱ TÌ€ TÌ„ " + + "T̈ TÌ• TÌ› U̇ ZÌ€ ZÌ„ Z̆ Z̈ Z̧ aÌ‹ cÌ€ cÌ„ c̆ c̈ cÌ• cÌ£ c̦ c̨̆ dÌ‚ fÌ€ fÌ„ gÌ€ hÌ„ h̦ jÌ kÌ€ " + + "kÌ‚ kÌ„ k̇ kÌ• kÌ› k̦ kÍŸh lÌ‚ lÌ¥ l̥̄ l̦ mÌ€ mÌ‚ m̆ mÌ nÌ‚ nÌ„ n̆ n̦ pÌ€ pÌ„ pÌ• pÌ£ r̆ rÌ¥ r̥̄ " + + "sÌ€ sÌ„ s̛̄ s̱ tÌ€ tÌ„ tÌ• tÌ› u̇ zÌ€ zÌ„ z̆ z̈ z̧ Ç̆ Û̄ ç̆ û̄ Ã¿Ì ÄŒÌ• Č̣ ÄÌ• ÄÌ£ Ä“Ì ÄªÌ Ä«Ì " + + "ÅÌ Å½Ì¦ Ž̧ ž̦ ž̧ Ḳ̄ ḳ̄ Ṣ̄ ṣ̄ Ṭ̄ á¹­Ì„ Ạ̈ ạ̈ Ọ̈ á»Ìˆ Ụ̄ Ụ̈ ụ̄ ụ̈ \n" + + "bnlreq; Non-Letters N1 (normative)\n" + + " ' , - . ` ~ ¨ ´ · ʹ ʺ ʾ Ê¿ ˈ ËŒ ’ ‡ \n" + + "bnl; Non-Letters N2 (normative)\n" + + "! \" # $ % & ( ) * + / 0 1 2 3 4 5 6 7 8 9 : ; < = > " + + "? @ [ \\ ] ^ _ { | } ¡ ¢ £ Â¥ § © ª « ¬ ® ¯ ° ± ² ³ µ " + + "¶ ¹ º » ¿ × ÷ € \n" + + "bnlopt; Non-Letters N3 (normative)\n" + + "¤ ¦ ¸ ¼ ½ ¾ \n" + + "bnlnot; Non-Letters N4 (normative) -omitted-\n" + + "dc; Combining diacritics (normative) Ì€-omitted-\n" + + "gl; Greek Letters (extended)\n" + + "Ά Έ Ή Ί ÎŒ ÎŽ ΠΠΑ Î’ Γ Δ Ε Ζ Η Θ Ι Κ Λ Îœ ΠΞ Ο Π Ρ Σ " + + "Τ Î¥ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν " + + "ξ ο Ï€ Ï Ï‚ σ Ï„ Ï… φ χ ψ ω ÏŠ Ï‹ ÏŒ Ï ÏŽ \n" + + "cl; Cyrillic Letters (extended)\n" + + "РРБ Ð’ Г Д Е Ж З И Й К Л Ðœ РО П Р С Т У Ф Ð¥ Ц Ч Ш " + + "Щ Ъ Ь Ю Я а б в г д е ж з и й к л м н о п Ñ€ Ñ Ñ‚ у Ñ„ " + + "Ñ… ц ч ш щ ÑŠ ÑŒ ÑŽ Ñ Ñ \n" + + "enl; Non-Letters E1 (extended)\n" + + "Æ’ Ê° ʳ ˆ Ëœ Ë¢ ᵈ áµ— ‘ ‚ “ †„ † … ‰ ′ ″ ‹ › Ⱐⴠⵠⶠⷠ⸠" + + "â¹ â¿ â‚€ â‚ â‚‚ ₃ â‚„ â‚… ₆ ₇ ₈ ₉ â„¢ ∞ ≤ ≥ \n\n"; /** * Main method + * * @param args -- not used */ - public static void main(String[] args) { - try { - test("GlyphLayoutFormDin91379.pdf", "com/lowagie/examples/fonts/form/PdfFormLayoutProcessor.pdf", - TEXT_INTRO + LATIN_CHARS_DIN_91379); - } catch (Exception e) { - e.printStackTrace(); - } + public static void main(String[] args) throws Exception { + test("GlyphLayoutFormDin91379.pdf", "com/lowagie/examples/fonts/form/PdfFormLayoutProcessor.pdf", + TEXT_INTRO + LATIN_CHARS_DIN_91379); } /** * Run the test: Print the characters of DIN 91379 in a pdf form - * @param fileName Name of output file + * + * @param fileName Name of output file * @param formPath Name of input pdf form - * @param text Text to show + * @param text Text to show * @throws Exception in case of error */ public static void test(String fileName, String formPath, String text) throws Exception { @@ -118,10 +114,11 @@ public static void test(String fileName, String formPath, String text) throws Ex // Enable the LayoutProcessor with kerning and ligatures LayoutProcessor.enableKernLiga(); - try ( InputStream acroFormInputStream = GlyphLayoutFormDin91379.class.getClassLoader().getResourceAsStream(formPath); - FileOutputStream outputStream = new FileOutputStream(fileName); - PdfReader reader = new PdfReader(acroFormInputStream) - ) { + try (InputStream acroFormInputStream = GlyphLayoutFormDin91379.class.getClassLoader() + .getResourceAsStream(formPath); + FileOutputStream outputStream = new FileOutputStream(fileName); + PdfReader reader = new PdfReader(acroFormInputStream) + ) { // The OpenType fonts loaded with FontFactory.register() are // available for glyph layout @@ -149,6 +146,7 @@ public static void test(String fileName, String formPath, String text) throws Ex stamper.setFormFlattening(true); stamper.setFullCompression(); stamper.close(); + LayoutProcessor.disable(); } } } From 0c334ca0075ba26a2c8f6745ca7a69dbcc6499bb Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Tue, 20 Feb 2024 20:54:12 +0100 Subject: [PATCH 06/31] Add more coverage - Codacy Review (cherry picked from commit 57492291767df963fc2da131cb01c3d6f2cd735e) --- .../com/lowagie/text/pdf/LayoutProcessor.java | 7 ++- .../java/com/lowagie/text/DocumentTest.java | 33 +++++++++++- .../com/lowagie/text/pdf/BaseFontTest.java | 48 +++++++++++++++++ .../text/pdf/LayoutProcessor534Test.java | 4 +- .../lowagie/text/pdf/LayoutProcessorTest.java | 24 +++++++++ .../com/lowagie/text/pdf/TTFCacheTest.java | 53 +++++++++++++++++++ .../lowagie/text/pdf/TrueTypeFontTest.java | 14 +++++ .../text/pdf/fonts/AdvanceTypographyTest.java | 14 +++++ 8 files changed, 189 insertions(+), 8 deletions(-) create mode 100644 openpdf/src/test/java/com/lowagie/text/pdf/BaseFontTest.java create mode 100644 openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessorTest.java create mode 100644 openpdf/src/test/java/com/lowagie/text/pdf/TTFCacheTest.java create mode 100644 openpdf/src/test/java/com/lowagie/text/pdf/TrueTypeFontTest.java diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java b/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java index d12a48af8..86db322cc 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java @@ -98,7 +98,7 @@ public static void enable(int flags) { if (enabled) { throw new UnsupportedOperationException("LayoutProcessor is already enabled"); } - enabled = true; + enable(); LayoutProcessor.flags = flags; } @@ -114,8 +114,7 @@ public static void enableKernLiga() { /** * Enables the processor with the provided flags. *

- * Kerning and ligatures are switched on. - * This method can only be called once. + * Kerning and ligatures are switched on. This method can only be called once. * * @param flags see java.awt.Font.layoutGlyphVector */ @@ -125,7 +124,7 @@ public static void enableKernLiga(int flags) { } setKerning(); setLigatures(); - enabled = true; + enable(); LayoutProcessor.flags = flags; } diff --git a/openpdf/src/test/java/com/lowagie/text/DocumentTest.java b/openpdf/src/test/java/com/lowagie/text/DocumentTest.java index 3c6c1905e..bee726817 100644 --- a/openpdf/src/test/java/com/lowagie/text/DocumentTest.java +++ b/openpdf/src/test/java/com/lowagie/text/DocumentTest.java @@ -13,8 +13,37 @@ void testThatVersionIsCorrect() { // Then assertThat(versionInCode) - .as("Version number in code %s is not correct.", versionInCode) - .matches("^OpenPDF \\d+\\.\\d+\\.\\d+(-SNAPSHOT)?$"); + .as("Version number in code %s is not correct.", versionInCode) + .matches("^OpenPDF \\d+\\.\\d+\\.\\d+(-SNAPSHOT)?$"); + } + + @Test + void whenSetFootsToValueShouldSetObject() { + // Given + try (Document document = new Document()) { + HeaderFooter footer = new HeaderFooter(new Phrase("Footer"), false); + + // When + document.setFooter(footer); + + // Then + assertThat(document.footer).isEqualTo(footer); + } + } + + @Test + void whenResetFooterShouldSetNull() { + // Given + try (Document document = new Document()) { + HeaderFooter footer = new HeaderFooter(new Phrase("Footer"), false); + document.setFooter(footer); + + // When + document.resetFooter(); + + // Then + assertThat(document.footer).isNull(); + } } } diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/BaseFontTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/BaseFontTest.java new file mode 100644 index 000000000..8d9f10f13 --- /dev/null +++ b/openpdf/src/test/java/com/lowagie/text/pdf/BaseFontTest.java @@ -0,0 +1,48 @@ +package com.lowagie.text.pdf; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.data.Index.atIndex; + +import java.io.IOException; +import java.io.InputStream; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; + +class BaseFontTest { + + @Test + void testGetAllNameEntries() throws IOException { + // given + byte[] bytes = getTestFontBytes(); + // when + String[][] allNameEntries = BaseFont.getAllNameEntries("ViaodaLibre-Regular.ttf", "UTF-8", bytes); + // then + assertThat(allNameEntries).hasDimensions(11, 5); + } + + @Test + void testGetFullFontName() throws IOException { + // given + byte[] bytes = getTestFontBytes(); + // when + String[][] fullFontName = BaseFont.getFullFontName("ViaodaLibre-Regular.ttf", "UTF-8", bytes); + // then + assertThat(fullFontName).hasDimensions(1, 4) + .contains(new String[]{"3", "1", "1033", "Viaoda Libre Regular"}, atIndex(0)); + } + + // test getDescent() + @Test + void testGetDescent() throws IOException { + // when + BaseFont font = BaseFont.createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false); + // then + assertThat(font.getDescent("byte")).isEqualTo(-264); + } + + private byte[] getTestFontBytes() throws IOException { + InputStream resourceStream = BaseFont.getResourceStream("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", null); + assertThat(resourceStream).as("Font could not be loaded").isNotNull(); + return IOUtils.toByteArray(resourceStream); + } +} diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java index c9b7f58a7..fc5097d5a 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java @@ -36,7 +36,7 @@ void beforeEach() { } @Test - void whenLayoutRightToLeftLatin_thenRevertCharOrder() throws IOException { + void whenLayoutRightToLeftLatinThenRevertCharOrder() throws IOException { // given Document document = new Document(PageSize.A4.rotate(), 10, 10, 10, 10); ByteArrayOutputStream pdfOut = new ByteArrayOutputStream(); @@ -67,7 +67,7 @@ void whenLayoutRightToLeftLatin_thenRevertCharOrder() throws IOException { } @Test - void whenLayoutRightToLeftHebrew_thenRevertCharOrder() throws IOException { + void whenLayoutRightToLeftHebrewThenRevertCharOrder() throws IOException { // given Document document = new Document(PageSize.A4.rotate(), 10, 10, 10, 10); ByteArrayOutputStream pdfOut = new ByteArrayOutputStream(); diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessorTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessorTest.java new file mode 100644 index 000000000..ce650a9a6 --- /dev/null +++ b/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessorTest.java @@ -0,0 +1,24 @@ +package com.lowagie.text.pdf; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +class LayoutProcessorTest { + + @Test + void testEnable() { + LayoutProcessor.enable(); + assertTrue(LayoutProcessor.isEnabled()); + } + + @Test + void testDisable() { + LayoutProcessor.disable(); + assertFalse(LayoutProcessor.isEnabled()); + assertThat(LayoutProcessor.getFlags()).isEqualTo(-1); + } + +} diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/TTFCacheTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/TTFCacheTest.java new file mode 100644 index 000000000..22c9d4a90 --- /dev/null +++ b/openpdf/src/test/java/com/lowagie/text/pdf/TTFCacheTest.java @@ -0,0 +1,53 @@ +package com.lowagie.text.pdf; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatNullPointerException; + +import com.lowagie.text.ExceptionConverter; +import java.io.IOException; +import org.apache.fop.fonts.truetype.TTFFile; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +class TTFCacheTest { + + @Test + void whenGetTTFFileWithNullTtuShouldThrowNpe() { + assertThatNullPointerException().isThrownBy(() -> TTFCache.getTTFFile("test", null)); + } + + @Test + void whenGetTTFFileWithNullFileNameShouldThrowNpe() throws IOException { + TrueTypeFontUnicode font = (TrueTypeFontUnicode) BaseFont + .createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false); + assertThatNullPointerException().isThrownBy(() -> TTFCache.getTTFFile(null, font)); + } + + @Test + void whenGetTTFFileShouldThrowNpe() throws IOException { + // given + TrueTypeFontUnicode font = (TrueTypeFontUnicode) BaseFont + .createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false); + + // when + TTFFile ttfFile = TTFCache.getTTFFile("ViaodaLibre-Regular.ttf", font); + + // then + assertThat(ttfFile).isNotNull(); + // load from cache + TTFFile ttfFile1 = TTFCache.getTTFFile("ViaodaLibre-Regular.ttf", font); + assertThat(ttfFile1).isEqualTo(ttfFile); + } + + @Test + void whenLoadTTFShouldThrowNpe() throws IOException { + // given + TrueTypeFontUnicode font = (TrueTypeFontUnicode) BaseFont + .createFont("fonts/jaldi/Jaldi-Regular.otf", BaseFont.IDENTITY_H, false); + font.cff = true; + // when then + Assertions.assertThatThrownBy(() -> TTFCache.getTTFFile("Jaldi-Regular.otf", font)) + .isInstanceOf(ExceptionConverter.class); + } + +} diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/TrueTypeFontTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/TrueTypeFontTest.java new file mode 100644 index 000000000..0c6550926 --- /dev/null +++ b/openpdf/src/test/java/com/lowagie/text/pdf/TrueTypeFontTest.java @@ -0,0 +1,14 @@ +package com.lowagie.text.pdf; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +class TrueTypeFontTest { + + @Test + void testTrueTypeFontDefaultConstructor() { + TrueTypeFont font = new TrueTypeFont(); + assertThat(font).isNotNull(); + } +} diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java index 241240b0d..e9a95504d 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java @@ -5,6 +5,7 @@ import com.lowagie.text.pdf.BaseFont; import com.lowagie.text.pdf.FopGlyphProcessor; +import com.lowagie.text.pdf.LayoutProcessor; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; @@ -49,6 +50,19 @@ void testSubstitutionWithMerge() throws Exception { assertArrayEquals(expectedOutput, str.toCharArray()); } + @Test + void testSubstitutionWithMergeWithLayoutProcessorEnabled() throws Exception { + LayoutProcessor.enable(); + char[] expectedOutput = {254, 278, 390, 314, 331, 376, 254, 285, 278}; + byte[] processedContent = FopGlyphProcessor.convertToBytesWithGlyphs( + BaseFont.createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, true, false, null, + null), + "instruction", "fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", new HashMap<>(), "dflt"); + String str = new String(processedContent, "UnicodeBigUnmarked"); + assertArrayEquals(expectedOutput, str.toCharArray()); + LayoutProcessor.disable(); + } + /** * Test fonts loaded externally and passed as byte array to BaseFont, Fop should be able to resolve these fonts * From 8b8d06f284f9b2ac3c2b7681e8d2325ff1a76451 Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Tue, 20 Feb 2024 22:25:16 +0100 Subject: [PATCH 07/31] LayoutProcessor - enable() and disable() in same Test --- .../test/java/com/lowagie/text/pdf/LayoutProcessorTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessorTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessorTest.java index ce650a9a6..ca464f236 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessorTest.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessorTest.java @@ -9,13 +9,9 @@ class LayoutProcessorTest { @Test - void testEnable() { + void testEnableDisable() { LayoutProcessor.enable(); assertTrue(LayoutProcessor.isEnabled()); - } - - @Test - void testDisable() { LayoutProcessor.disable(); assertFalse(LayoutProcessor.isEnabled()); assertThat(LayoutProcessor.getFlags()).isEqualTo(-1); From b38c0bb18138f24a13cc5748a57d36e36f20c7a7 Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Tue, 20 Feb 2024 22:40:19 +0100 Subject: [PATCH 08/31] Set version to 1.4.1 --- openpdf-fonts-extra/pom.xml | 2 +- openpdf/pom.xml | 2 +- pdf-swing/pom.xml | 2 +- pdf-toolbox/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openpdf-fonts-extra/pom.xml b/openpdf-fonts-extra/pom.xml index 146aaf787..0ac793827 100644 --- a/openpdf-fonts-extra/pom.xml +++ b/openpdf-fonts-extra/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.4.1-SNAPSHOT + 1.4.1 openpdf-fonts-extra diff --git a/openpdf/pom.xml b/openpdf/pom.xml index eee68d082..6e25e0940 100644 --- a/openpdf/pom.xml +++ b/openpdf/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.4.1-SNAPSHOT + 1.4.1 openpdf diff --git a/pdf-swing/pom.xml b/pdf-swing/pom.xml index 7ea911a11..f074eb2b6 100644 --- a/pdf-swing/pom.xml +++ b/pdf-swing/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.4.1-SNAPSHOT + 1.4.1 pdf-swing diff --git a/pdf-toolbox/pom.xml b/pdf-toolbox/pom.xml index d0fcbb9da..14636808d 100644 --- a/pdf-toolbox/pom.xml +++ b/pdf-toolbox/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.4.1-SNAPSHOT + 1.4.1 pdf-toolbox diff --git a/pom.xml b/pom.xml index d6dce38d1..c121cfb1a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.4.1-SNAPSHOT + 1.4.1 pom From d11308914c0c7e102b01769f32f6cf20d152fac5 Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Tue, 20 Feb 2024 22:45:06 +0100 Subject: [PATCH 09/31] Set new Snapshot to 1.4.1-SNAPSHOT --- openpdf-fonts-extra/pom.xml | 2 +- openpdf/pom.xml | 2 +- pdf-swing/pom.xml | 2 +- pdf-toolbox/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openpdf-fonts-extra/pom.xml b/openpdf-fonts-extra/pom.xml index 0ac793827..146aaf787 100644 --- a/openpdf-fonts-extra/pom.xml +++ b/openpdf-fonts-extra/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.4.1 + 1.4.1-SNAPSHOT openpdf-fonts-extra diff --git a/openpdf/pom.xml b/openpdf/pom.xml index 6e25e0940..eee68d082 100644 --- a/openpdf/pom.xml +++ b/openpdf/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.4.1 + 1.4.1-SNAPSHOT openpdf diff --git a/pdf-swing/pom.xml b/pdf-swing/pom.xml index f074eb2b6..7ea911a11 100644 --- a/pdf-swing/pom.xml +++ b/pdf-swing/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.4.1 + 1.4.1-SNAPSHOT pdf-swing diff --git a/pdf-toolbox/pom.xml b/pdf-toolbox/pom.xml index 14636808d..d0fcbb9da 100644 --- a/pdf-toolbox/pom.xml +++ b/pdf-toolbox/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.4.1 + 1.4.1-SNAPSHOT pdf-toolbox diff --git a/pom.xml b/pom.xml index c121cfb1a..d6dce38d1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.librepdf openpdf-parent - 1.4.1 + 1.4.1-SNAPSHOT pom From e9441a2f239146d2d853007bd2681fcb7960f073 Mon Sep 17 00:00:00 2001 From: Radek Wikturna Date: Wed, 21 Feb 2024 12:53:17 +0100 Subject: [PATCH 10/31] #1059 font size specified in % is interpreted as pixels --- .../java/com/lowagie/text/html/Markup.java | 404 ++++++++++++------ .../com/lowagie/text/html/FontSizeTest.java | 55 +++ 2 files changed, 322 insertions(+), 137 deletions(-) create mode 100644 openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java diff --git a/openpdf/src/main/java/com/lowagie/text/html/Markup.java b/openpdf/src/main/java/com/lowagie/text/html/Markup.java index 9c953b7bd..c36f3187e 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/Markup.java +++ b/openpdf/src/main/java/com/lowagie/text/html/Markup.java @@ -44,7 +44,7 @@ * * Contributions by: * Lubos Strapko - * + * * If you didn't download this code from the following link, you should check if * you aren't using an obsolete version: * https://github.com/LibrePDF/OpenPDF @@ -65,260 +65,386 @@ public class Markup { // iText specific - /** the key for any tag */ + /** + * the key for any tag + */ public static final String ITEXT_TAG = "tag"; // HTML tags - /** the markup for the body part of a file */ + /** + * the markup for the body part of a file + */ public static final String HTML_TAG_BODY = "body"; - /** The DIV tag. */ + /** + * The DIV tag. + */ public static final String HTML_TAG_DIV = "div"; - /** This is a possible HTML-tag. */ + /** + * This is a possible HTML-tag. + */ public static final String HTML_TAG_LINK = "link"; - /** The SPAN tag. */ + /** + * The SPAN tag. + */ public static final String HTML_TAG_SPAN = "span"; // HTML attributes - /** the height attribute. */ + /** + * the height attribute. + */ public static final String HTML_ATTR_HEIGHT = "height"; - /** the hyperlink reference attribute. */ + /** + * the hyperlink reference attribute. + */ public static final String HTML_ATTR_HREF = "href"; - /** This is a possible HTML attribute for the LINK tag. */ + /** + * This is a possible HTML attribute for the LINK tag. + */ public static final String HTML_ATTR_REL = "rel"; - /** This is used for inline css style information */ + /** + * This is used for inline css style information + */ public static final String HTML_ATTR_STYLE = "style"; - /** This is a possible HTML attribute for the LINK tag. */ + /** + * This is a possible HTML attribute for the LINK tag. + */ public static final String HTML_ATTR_TYPE = "type"; - /** This is a possible HTML attribute. */ + /** + * This is a possible HTML attribute. + */ public static final String HTML_ATTR_STYLESHEET = "stylesheet"; - /** the width attribute. */ + /** + * the width attribute. + */ public static final String HTML_ATTR_WIDTH = "width"; - /** attribute for specifying externally defined CSS class */ + /** + * attribute for specifying externally defined CSS class + */ public static final String HTML_ATTR_CSS_CLASS = "class"; - /** The ID attribute. */ + /** + * The ID attribute. + */ public static final String HTML_ATTR_CSS_ID = "id"; // HTML values - /** This is a possible value for the language attribute (SCRIPT tag). */ + /** + * This is a possible value for the language attribute (SCRIPT tag). + */ public static final String HTML_VALUE_JAVASCRIPT = "text/javascript"; - /** This is a possible HTML attribute for the LINK tag. */ + /** + * This is a possible HTML attribute for the LINK tag. + */ public static final String HTML_VALUE_CSS = "text/css"; // CSS keys - /** the CSS tag for background color */ + /** + * the CSS tag for background color + */ public static final String CSS_KEY_BGCOLOR = "background-color"; - /** the CSS tag for text color */ + /** + * the CSS tag for text color + */ public static final String CSS_KEY_COLOR = "color"; - /** CSS key that indicate the way something has to be displayed */ + /** + * CSS key that indicate the way something has to be displayed + */ public static final String CSS_KEY_DISPLAY = "display"; - /** the CSS tag for the font family */ + /** + * the CSS tag for the font family + */ public static final String CSS_KEY_FONTFAMILY = "font-family"; - /** the CSS tag for the font size */ + /** + * the CSS tag for the font size + */ public static final String CSS_KEY_FONTSIZE = "font-size"; - /** the CSS tag for the font style */ + /** + * the CSS tag for the font style + */ public static final String CSS_KEY_FONTSTYLE = "font-style"; - /** the CSS tag for the font weight */ + /** + * the CSS tag for the font weight + */ public static final String CSS_KEY_FONTWEIGHT = "font-weight"; - /** the CSS tag for text decorations */ + /** + * the CSS tag for text decorations + */ public static final String CSS_KEY_LINEHEIGHT = "line-height"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_MARGIN = "margin"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_MARGINLEFT = "margin-left"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_MARGINRIGHT = "margin-right"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_MARGINTOP = "margin-top"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_MARGINBOTTOM = "margin-bottom"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_PADDING = "padding"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_PADDINGLEFT = "padding-left"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_PADDINGRIGHT = "padding-right"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_PADDINGTOP = "padding-top"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_PADDINGBOTTOM = "padding-bottom"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_BORDERCOLOR = "border-color"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_BORDERWIDTH = "border-width"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_BORDERWIDTHLEFT = "border-left-width"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_BORDERWIDTHRIGHT = "border-right-width"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_BORDERWIDTHTOP = "border-top-width"; - /** the CSS tag for the margin of an object */ + /** + * the CSS tag for the margin of an object + */ public static final String CSS_KEY_BORDERWIDTHBOTTOM = "border-bottom-width"; - /** the CSS tag for adding a page break when the document is printed */ + /** + * the CSS tag for adding a page break when the document is printed + */ public static final String CSS_KEY_PAGE_BREAK_AFTER = "page-break-after"; - /** the CSS tag for adding a page break when the document is printed */ + /** + * the CSS tag for adding a page break when the document is printed + */ public static final String CSS_KEY_PAGE_BREAK_BEFORE = "page-break-before"; - /** the CSS tag for the horizontal alignment of an object */ + /** + * the CSS tag for the horizontal alignment of an object + */ public static final String CSS_KEY_TEXTALIGN = "text-align"; - /** the CSS tag for text decorations */ + /** + * the CSS tag for text decorations + */ public static final String CSS_KEY_TEXTDECORATION = "text-decoration"; - /** the CSS tag for text decorations */ + /** + * the CSS tag for text decorations + */ public static final String CSS_KEY_VERTICALALIGN = "vertical-align"; - /** the CSS tag for the visibility of objects */ + /** + * the CSS tag for the visibility of objects + */ public static final String CSS_KEY_VISIBILITY = "visibility"; // CSS values /** - * value for the CSS tag for adding a page break when the document is - * printed + * value for the CSS tag for adding a page break when the document is printed */ public static final String CSS_VALUE_ALWAYS = "always"; - /** A possible value for the DISPLAY key */ + /** + * A possible value for the DISPLAY key + */ public static final String CSS_VALUE_BLOCK = "block"; - /** a CSS value for text font weight */ + /** + * a CSS value for text font weight + */ public static final String CSS_VALUE_BOLD = "bold"; - /** the value if you want to hide objects. */ + /** + * the value if you want to hide objects. + */ public static final String CSS_VALUE_HIDDEN = "hidden"; - /** A possible value for the DISPLAY key */ + /** + * A possible value for the DISPLAY key + */ public static final String CSS_VALUE_INLINE = "inline"; - /** a CSS value for text font style */ + /** + * a CSS value for text font style + */ public static final String CSS_VALUE_ITALIC = "italic"; - /** a CSS value for text decoration */ + /** + * a CSS value for text decoration + */ public static final String CSS_VALUE_LINETHROUGH = "line-through"; - /** A possible value for the DISPLAY key */ + /** + * A possible value for the DISPLAY key + */ public static final String CSS_VALUE_LISTITEM = "list-item"; - /** a CSS value */ + /** + * a CSS value + */ public static final String CSS_VALUE_NONE = "none"; - /** a CSS value */ + /** + * a CSS value + */ public static final String CSS_VALUE_NORMAL = "normal"; - /** a CSS value for text font style */ + /** + * a CSS value for text font style + */ public static final String CSS_VALUE_OBLIQUE = "oblique"; - /** A possible value for the DISPLAY key */ + /** + * A possible value for the DISPLAY key + */ public static final String CSS_VALUE_TABLE = "table"; - /** A possible value for the DISPLAY key */ + /** + * A possible value for the DISPLAY key + */ public static final String CSS_VALUE_TABLEROW = "table-row"; - /** A possible value for the DISPLAY key */ + /** + * A possible value for the DISPLAY key + */ public static final String CSS_VALUE_TABLECELL = "table-cell"; - /** the CSS value for a horizontal alignment of an object */ + /** + * the CSS value for a horizontal alignment of an object + */ public static final String CSS_VALUE_TEXTALIGNLEFT = "left"; - /** the CSS value for a horizontal alignment of an object */ + /** + * the CSS value for a horizontal alignment of an object + */ public static final String CSS_VALUE_TEXTALIGNRIGHT = "right"; - /** the CSS value for a horizontal alignment of an object */ + /** + * the CSS value for a horizontal alignment of an object + */ public static final String CSS_VALUE_TEXTALIGNCENTER = "center"; - /** the CSS value for a horizontal alignment of an object */ + /** + * the CSS value for a horizontal alignment of an object + */ public static final String CSS_VALUE_TEXTALIGNJUSTIFY = "justify"; - /** a CSS value for text decoration */ + /** + * a CSS value for text decoration + */ public static final String CSS_VALUE_UNDERLINE = "underline"; - /** a default value for font-size + /** + * a default value for font-size + * * @since 2.1.3 */ public static final float DEFAULT_FONT_SIZE = 12f; /** * Parses a length. - * - * @param string - * a length in the form of an optional + or -, followed by a - * number and a unit. + * + * @param string a length in the form of an optional + or -, followed by a number and a unit. * @return a float */ public static float parseLength(String string) { - // TODO: Evaluate the effect of this. - // It may change the default behavour of the methd if this is changed. - // return parseLength(string, Markup.DEFAULT_FONT_SIZE); int pos = 0; int length = string.length(); boolean ok = true; while (ok && pos < length) { switch (string.charAt(pos)) { - case '+': - case '-': - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case '.': - pos++; - break; - default: - ok = false; + case '+': + case '-': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '.': + pos++; + break; + default: + ok = false; } } - if (pos == 0) + if (pos == 0) { return 0f; - if (pos == length) + } + if (pos == length) { return Float.parseFloat(string + "f"); + } float f = Float.parseFloat(string.substring(0, pos) + "f"); string = string.substring(pos); // inches @@ -344,42 +470,45 @@ public static float parseLength(String string) { /** * New method contributed by: Lubos Strapko * - * @param string a length in the form of an optional + or - followed by a number and a unit + * @param string a length in the form of an optional + or - followed by a number and a unit * @param actualFontSize font-size * @return a float number * @since 2.1.3 */ public static float parseLength(String string, float actualFontSize) { - if (string == null) + if (string == null) { return 0f; + } int pos = 0; int length = string.length(); boolean ok = true; while (ok && pos < length) { switch (string.charAt(pos)) { - case '+': - case '-': - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case '.': - pos++; - break; - default: - ok = false; + case '+': + case '-': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '.': + pos++; + break; + default: + ok = false; } } - if (pos == 0) + if (pos == 0) { return 0f; - if (pos == length) + } + if (pos == length) { return Float.parseFloat(string + "f"); + } float f = Float.parseFloat(string.substring(0, pos) + "f"); string = string.substring(pos); // inches @@ -407,6 +536,10 @@ public static float parseLength(String string, float actualFontSize) { if (string.startsWith("ex")) { return f * actualFontSize / 2; } + // percentage of current font size + if (string.endsWith("%")) { + return (f / 100) * actualFontSize; + } // default: we assume the length was measured in points return f; } @@ -424,19 +557,15 @@ public static Color decodeColor(String color) { String colorName = color.toLowerCase(Locale.ROOT).trim(); try { return WebColors.getRGBColor(colorName); - } - catch(IllegalArgumentException iae) { + } catch (IllegalArgumentException iae) { return null; } } /** - * This method parses a String with attributes and returns a Properties - * object. - * - * @param string - * a String of this form: 'key1="value1"; key2="value2";... - * keyN="valueN" ' + * This method parses a String with attributes and returns a Properties object. + * + * @param string a String of this form: 'key1="value1"; key2="value2";... keyN="valueN" ' * @return a Properties object */ public static Properties parseAttributes(String string) { @@ -450,18 +579,22 @@ public static Properties parseAttributes(String string) { String value; while (keyValuePairs.hasMoreTokens()) { keyValuePair = new StringTokenizer(keyValuePairs.nextToken(), ":"); - if (keyValuePair.hasMoreTokens()) + if (keyValuePair.hasMoreTokens()) { key = keyValuePair.nextToken().trim(); - else + } else { continue; - if (keyValuePair.hasMoreTokens()) + } + if (keyValuePair.hasMoreTokens()) { value = keyValuePair.nextToken().trim(); - else + } else { continue; - if (value.startsWith("\"")) + } + if (value.startsWith("\"")) { value = value.substring(1); - if (value.endsWith("\"")) + } + if (value.endsWith("\"")) { value = value.substring(0, value.length() - 1); + } result.setProperty(key.toLowerCase(Locale.ROOT), value); } return result; @@ -469,17 +602,14 @@ public static Properties parseAttributes(String string) { /** * Removes the comments sections of a String. - * - * @param string - * the original String - * @param startComment - * the String that marks the start of a Comment section - * @param endComment - * the String that marks the end of a Comment section. + * + * @param string the original String + * @param startComment the String that marks the start of a Comment section + * @param endComment the String that marks the end of a Comment section. * @return the String stripped of its comment section */ public static String removeComment(String string, String startComment, - String endComment) { + String endComment) { StringBuilder result = new StringBuilder(); int pos = 0; int end = endComment.length(); diff --git a/openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java b/openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java new file mode 100644 index 000000000..86d3f151a --- /dev/null +++ b/openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java @@ -0,0 +1,55 @@ +package com.lowagie.text.html; + +import com.lowagie.text.Chunk; +import com.lowagie.text.Document; +import com.lowagie.text.Element; +import com.lowagie.text.Paragraph; +import com.lowagie.text.html.simpleparser.HTMLWorker; +import com.lowagie.text.html.simpleparser.StyleSheet; +import com.lowagie.text.pdf.PdfName; +import com.lowagie.text.pdf.PdfString; +import com.lowagie.text.pdf.PdfWriter; +import java.io.StringReader; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +class FontSizeTest { + + @Test + void testFontSize() throws Exception { + StringReader reader = new StringReader( + "Text" + + "Text 8.0pt" + + "Text 20px" + + "Text 1.5em" + + "Text 50%"); + StyleSheet styleSheet = new StyleSheet(); + Map interfaceProps = new HashMap<>(); + List elements = HTMLWorker.parseToList(reader, styleSheet, interfaceProps); + + Document document = new Document(); + PdfWriter instance = PdfWriter.getInstance(document, Files.newOutputStream(Paths.get("target/Font Size.pdf"))); + document.open(); + instance.getInfo().put(PdfName.CREATOR, new PdfString(Document.getVersion())); + for (Element e : elements) { + document.add(e); + } + document.close(); + Paragraph paragraph = (Paragraph) elements.get(0); + Chunk chunk1 = (Chunk) paragraph.get(0); + float defaultFontSize = chunk1.getFont().getSize(); + Chunk chunk2 = (Chunk) paragraph.get(1); + Assertions.assertEquals(8.0, chunk2.getFont().getSize()); + Chunk chunk3 = (Chunk) paragraph.get(2); + Assertions.assertEquals(20.0, chunk3.getFont().getSize()); + Chunk chunk4 = (Chunk) paragraph.get(3); + Assertions.assertEquals(1.5 * defaultFontSize, chunk4.getFont().getSize()); + Chunk chunk5 = (Chunk) paragraph.get(4); + Assertions.assertEquals(0.5 * defaultFontSize, chunk5.getFont().getSize()); + } +} From 25d31ea9e5daccd01fd05c708a0c04faa4d28527 Mon Sep 17 00:00:00 2001 From: RadekWikturna <120576514+radekwikturna@users.noreply.github.com> Date: Fri, 23 Feb 2024 08:39:22 +0100 Subject: [PATCH 11/31] #1057 CSS font-size property fails with IllegalArgumentException (#1072) * #1057 Generating PDF from HTML containing CSS font-size property fails with IllegalArgumentException --------- Co-authored-by: Radek Wikturna --- .../java/com/lowagie/text/html/FontSize.java | 57 ++++++++++++++++++ .../java/com/lowagie/text/html/Markup.java | 9 +++ .../com/lowagie/text/html/FontSizeTest.java | 59 +++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 openpdf/src/main/java/com/lowagie/text/html/FontSize.java diff --git a/openpdf/src/main/java/com/lowagie/text/html/FontSize.java b/openpdf/src/main/java/com/lowagie/text/html/FontSize.java new file mode 100644 index 000000000..b6ddad93b --- /dev/null +++ b/openpdf/src/main/java/com/lowagie/text/html/FontSize.java @@ -0,0 +1,57 @@ +package com.lowagie.text.html; + +/** + * Named font sizes defined by CSS + * font-size property + */ +public enum FontSize { + + // Absolute-size keywords, based on the user's default font size (which is medium). + XX_SMALL("xx-small", 0.6f, false), + X_SMALL("x-small", 0.75f, false), + SMALL("small", 0.89f, false), + MEDIUM("medium", 1.0f, false), + LARGE("large", 1.2f, false), + X_LARGE("x-large", 1.5f, false), + XX_LARGE("xx-large", 2.0f, false), + XXX_LARGE("xxx-large", 2.5f, false), + + // Relative-size keywords. The font will be larger or smaller relative to the parent element's font size, + // roughly by the ratio used to separate the absolute-size keywords above. + SMALLER("smaller", 0.89f, true), + LARGER("larger", 1.2f, true); + + private final float scale; + private final String textValue; + private final boolean relative; + + FontSize(String textValue, float scale, boolean relative) { + this.textValue = textValue; + this.scale = scale; + this.relative = relative; + } + + public String getTextValue() { + return textValue; + } + + public float getScale() { + return scale; + } + + public boolean isRelative() { + return relative; + } + + public static FontSize parse(String text) { + if (text == null || text.isEmpty() || !Character.isLetter(text.charAt(0))) { + return null; + } + for (FontSize fontSize : values()) { + if (fontSize.getTextValue().equalsIgnoreCase(text)) { + return fontSize; + } + } + return null; + } +} diff --git a/openpdf/src/main/java/com/lowagie/text/html/Markup.java b/openpdf/src/main/java/com/lowagie/text/html/Markup.java index c36f3187e..5c2b4a82a 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/Markup.java +++ b/openpdf/src/main/java/com/lowagie/text/html/Markup.java @@ -479,6 +479,15 @@ public static float parseLength(String string, float actualFontSize) { if (string == null) { return 0f; } + FontSize fs = FontSize.parse(string);// it can be one of the CCS font size names (e.g. 'x-large') + if (fs != null) { + if (fs.isRelative()) { + return fs.getScale() * actualFontSize; + } else { + return fs.getScale() * DEFAULT_FONT_SIZE; + } + } + int pos = 0; int length = string.length(); boolean ok = true; diff --git a/openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java b/openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java index 86d3f151a..e645bfc06 100644 --- a/openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java +++ b/openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java @@ -11,6 +11,7 @@ import com.lowagie.text.pdf.PdfWriter; import java.io.StringReader; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; import java.util.List; @@ -52,4 +53,62 @@ void testFontSize() throws Exception { Chunk chunk5 = (Chunk) paragraph.get(4); Assertions.assertEquals(0.5 * defaultFontSize, chunk5.getFont().getSize()); } + + @Test + void testNamedFontSize() throws Exception { + StringReader reader = new StringReader( + "" + + "Text xx-small
" + + "Text x-small
" + + "Text small
" + + "Text medium
" + + "Text large
" + + "Text x-large
" + + "Text xx-large
" + + "Text xxx-large
" + + "" + + + "" + + "Text smaller
" + + "Text larger
" + + "" + ); + StyleSheet styleSheet = new StyleSheet(); + Map interfaceProps = new HashMap<>(); + List elements = HTMLWorker.parseToList(reader, styleSheet, interfaceProps); + + Document document = new Document(); + PdfWriter instance = PdfWriter.getInstance(document, + Files.newOutputStream(Path.of("target/Font Size Named.pdf"))); + document.open(); + instance.getInfo().put(PdfName.CREATOR, new PdfString(Document.getVersion())); + for (Element e : elements) { + document.add(e); + } + document.close(); + + int i = 0; + Paragraph paragraph = (Paragraph) elements.get(0); + Chunk chunk1 = (Chunk) paragraph.get((i++) * 2); + Assertions.assertEquals(FontSize.XX_SMALL.getScale() * Markup.DEFAULT_FONT_SIZE, chunk1.getFont().getSize()); + Chunk chunk2 = (Chunk) paragraph.get((i++) * 2); + Assertions.assertEquals(FontSize.X_SMALL.getScale() * Markup.DEFAULT_FONT_SIZE, chunk2.getFont().getSize()); + Chunk chunk3 = (Chunk) paragraph.get((i++) * 2); + Assertions.assertEquals(FontSize.SMALL.getScale() * Markup.DEFAULT_FONT_SIZE, chunk3.getFont().getSize()); + Chunk chunk4 = (Chunk) paragraph.get((i++) * 2); + Assertions.assertEquals(FontSize.MEDIUM.getScale() * Markup.DEFAULT_FONT_SIZE, chunk4.getFont().getSize()); + Chunk chunk5 = (Chunk) paragraph.get((i++) * 2); + Assertions.assertEquals(FontSize.LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk5.getFont().getSize()); + Chunk chunk6 = (Chunk) paragraph.get((i++) * 2); + Assertions.assertEquals(FontSize.X_LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk6.getFont().getSize()); + Chunk chunk7 = (Chunk) paragraph.get((i++) * 2); + Assertions.assertEquals(FontSize.XX_LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk7.getFont().getSize()); + Chunk chunk8 = (Chunk) paragraph.get((i++) * 2); + Assertions.assertEquals(FontSize.XXX_LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk8.getFont().getSize()); + + Chunk chunk9 = (Chunk) paragraph.get((i++) * 2); + Assertions.assertEquals(FontSize.SMALLER.getScale() * 20f, chunk9.getFont().getSize()); + Chunk chunk10 = (Chunk) paragraph.get((i++) * 2); + Assertions.assertEquals(FontSize.LARGER.getScale() * 20f, chunk10.getFont().getSize()); + } } From b0c2343efbabc4fbca0b668e058744a94a0b311f Mon Sep 17 00:00:00 2001 From: RadekWikturna <120576514+radekwikturna@users.noreply.github.com> Date: Fri, 23 Feb 2024 17:44:24 +0100 Subject: [PATCH 12/31] #1061 When converting HTML to PDF, background color is not applied (#1075) * #1061 When converting HTML to PDF, background color is not applied --------- Co-authored-by: Radek Wikturna --- .../java/com/lowagie/text/html/Markup.java | 3 + .../html/simpleparser/FactoryProperties.java | 30 +++-- .../com/lowagie/text/html/FontSizeTest.java | 114 ---------------- .../com/lowagie/text/html/StylesTest.java | 126 ++++++++++++++++++ .../resources/stylesTest/backgroundColor.html | 12 ++ .../test/resources/stylesTest/fontColor.html | 10 ++ .../test/resources/stylesTest/fontSize.html | 13 ++ .../resources/stylesTest/fontSizeNamed.html | 23 ++++ 8 files changed, 208 insertions(+), 123 deletions(-) delete mode 100644 openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java create mode 100644 openpdf/src/test/java/com/lowagie/text/html/StylesTest.java create mode 100644 openpdf/src/test/resources/stylesTest/backgroundColor.html create mode 100644 openpdf/src/test/resources/stylesTest/fontColor.html create mode 100644 openpdf/src/test/resources/stylesTest/fontSize.html create mode 100644 openpdf/src/test/resources/stylesTest/fontSizeNamed.html diff --git a/openpdf/src/main/java/com/lowagie/text/html/Markup.java b/openpdf/src/main/java/com/lowagie/text/html/Markup.java index 5c2b4a82a..eca8bdee8 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/Markup.java +++ b/openpdf/src/main/java/com/lowagie/text/html/Markup.java @@ -305,6 +305,9 @@ public class Markup { // CSS values + /** the CSS tag for background style */ + public static final String CSS_KEY_BG = "background"; + /** * value for the CSS tag for adding a page break when the document is printed */ diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java index e697bd742..222d9b777 100755 --- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java +++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java @@ -219,6 +219,7 @@ public static HyphenationEvent getHyphenation(String s) { return new HyphenationAuto(lang, country, leftMin, rightMin); } + @Deprecated // this method is nor called anywhere. But it is public so theoretically it could be called by consumers of OpenPdf, but why? public static void insertStyle(Map h) { String style = h.get("style"); if (style == null) @@ -331,16 +332,23 @@ public static void insertStyle(Map h, ChainedProperties cprops) h.put("u", null); break; } - case Markup.CSS_KEY_COLOR: - Color c = Markup.decodeColor(prop.getProperty(key)); - if (c != null) { - int hh = c.getRGB(); - String hs = Integer.toHexString(hh); - hs = "000000" + hs; - hs = "#" + hs.substring(hs.length() - 6); - h.put("color", hs); + case Markup.CSS_KEY_BGCOLOR: { + h.put(Markup.CSS_KEY_BGCOLOR, prop.getProperty(key)); + break; + } + case Markup.CSS_KEY_BG: { + for(String attribute: prop.getProperty(key).split(" ")) { + Color c = Markup.decodeColor(attribute.trim()); + if (c != null) { + h.put(Markup.CSS_KEY_BGCOLOR, attribute.trim()); + break; + } } break; + } + case Markup.CSS_KEY_COLOR: + h.put(Markup.CSS_KEY_COLOR, prop.getProperty(key)); + break; case Markup.CSS_KEY_LINEHEIGHT: { String ss = prop.getProperty(key).trim(); float actualFontSize = parseLength(cprops.getProperty(ElementTags.SIZE), @@ -388,6 +396,10 @@ public Chunk createChunk(String text, ChainedProperties props) { } else if (props.hasProperty("sup")) { chunk.setTextRise(size); } + Color bgColor = Markup.decodeColor(props.getProperty(Markup.CSS_KEY_BGCOLOR)); + if (bgColor != null) { + chunk.setBackground(bgColor); + } chunk.setHyphenation(getHyphenation(props)); return chunk; } @@ -420,7 +432,7 @@ public Font getFont(ChainedProperties props) { .flatMap(NumberUtilities::parseFloat) .orElse(12f); - Color color = Markup.decodeColor(props.getProperty("color")); + Color color = Markup.decodeColor(props.getProperty(Markup.CSS_KEY_COLOR)); String encoding = props.getOrDefault("encoding", BaseFont.WINANSI); return fontImp.getFont(face, encoding, true, size, style, color); } diff --git a/openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java b/openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java deleted file mode 100644 index e645bfc06..000000000 --- a/openpdf/src/test/java/com/lowagie/text/html/FontSizeTest.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.lowagie.text.html; - -import com.lowagie.text.Chunk; -import com.lowagie.text.Document; -import com.lowagie.text.Element; -import com.lowagie.text.Paragraph; -import com.lowagie.text.html.simpleparser.HTMLWorker; -import com.lowagie.text.html.simpleparser.StyleSheet; -import com.lowagie.text.pdf.PdfName; -import com.lowagie.text.pdf.PdfString; -import com.lowagie.text.pdf.PdfWriter; -import java.io.StringReader; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -class FontSizeTest { - - @Test - void testFontSize() throws Exception { - StringReader reader = new StringReader( - "Text" + - "Text 8.0pt" - + "Text 20px" - + "Text 1.5em" - + "Text 50%"); - StyleSheet styleSheet = new StyleSheet(); - Map interfaceProps = new HashMap<>(); - List elements = HTMLWorker.parseToList(reader, styleSheet, interfaceProps); - - Document document = new Document(); - PdfWriter instance = PdfWriter.getInstance(document, Files.newOutputStream(Paths.get("target/Font Size.pdf"))); - document.open(); - instance.getInfo().put(PdfName.CREATOR, new PdfString(Document.getVersion())); - for (Element e : elements) { - document.add(e); - } - document.close(); - Paragraph paragraph = (Paragraph) elements.get(0); - Chunk chunk1 = (Chunk) paragraph.get(0); - float defaultFontSize = chunk1.getFont().getSize(); - Chunk chunk2 = (Chunk) paragraph.get(1); - Assertions.assertEquals(8.0, chunk2.getFont().getSize()); - Chunk chunk3 = (Chunk) paragraph.get(2); - Assertions.assertEquals(20.0, chunk3.getFont().getSize()); - Chunk chunk4 = (Chunk) paragraph.get(3); - Assertions.assertEquals(1.5 * defaultFontSize, chunk4.getFont().getSize()); - Chunk chunk5 = (Chunk) paragraph.get(4); - Assertions.assertEquals(0.5 * defaultFontSize, chunk5.getFont().getSize()); - } - - @Test - void testNamedFontSize() throws Exception { - StringReader reader = new StringReader( - "" + - "Text xx-small
" + - "Text x-small
" + - "Text small
" + - "Text medium
" + - "Text large
" + - "Text x-large
" + - "Text xx-large
" + - "Text xxx-large
" + - "" + - - "" + - "Text smaller
" + - "Text larger
" + - "" - ); - StyleSheet styleSheet = new StyleSheet(); - Map interfaceProps = new HashMap<>(); - List elements = HTMLWorker.parseToList(reader, styleSheet, interfaceProps); - - Document document = new Document(); - PdfWriter instance = PdfWriter.getInstance(document, - Files.newOutputStream(Path.of("target/Font Size Named.pdf"))); - document.open(); - instance.getInfo().put(PdfName.CREATOR, new PdfString(Document.getVersion())); - for (Element e : elements) { - document.add(e); - } - document.close(); - - int i = 0; - Paragraph paragraph = (Paragraph) elements.get(0); - Chunk chunk1 = (Chunk) paragraph.get((i++) * 2); - Assertions.assertEquals(FontSize.XX_SMALL.getScale() * Markup.DEFAULT_FONT_SIZE, chunk1.getFont().getSize()); - Chunk chunk2 = (Chunk) paragraph.get((i++) * 2); - Assertions.assertEquals(FontSize.X_SMALL.getScale() * Markup.DEFAULT_FONT_SIZE, chunk2.getFont().getSize()); - Chunk chunk3 = (Chunk) paragraph.get((i++) * 2); - Assertions.assertEquals(FontSize.SMALL.getScale() * Markup.DEFAULT_FONT_SIZE, chunk3.getFont().getSize()); - Chunk chunk4 = (Chunk) paragraph.get((i++) * 2); - Assertions.assertEquals(FontSize.MEDIUM.getScale() * Markup.DEFAULT_FONT_SIZE, chunk4.getFont().getSize()); - Chunk chunk5 = (Chunk) paragraph.get((i++) * 2); - Assertions.assertEquals(FontSize.LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk5.getFont().getSize()); - Chunk chunk6 = (Chunk) paragraph.get((i++) * 2); - Assertions.assertEquals(FontSize.X_LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk6.getFont().getSize()); - Chunk chunk7 = (Chunk) paragraph.get((i++) * 2); - Assertions.assertEquals(FontSize.XX_LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk7.getFont().getSize()); - Chunk chunk8 = (Chunk) paragraph.get((i++) * 2); - Assertions.assertEquals(FontSize.XXX_LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk8.getFont().getSize()); - - Chunk chunk9 = (Chunk) paragraph.get((i++) * 2); - Assertions.assertEquals(FontSize.SMALLER.getScale() * 20f, chunk9.getFont().getSize()); - Chunk chunk10 = (Chunk) paragraph.get((i++) * 2); - Assertions.assertEquals(FontSize.LARGER.getScale() * 20f, chunk10.getFont().getSize()); - } -} diff --git a/openpdf/src/test/java/com/lowagie/text/html/StylesTest.java b/openpdf/src/test/java/com/lowagie/text/html/StylesTest.java new file mode 100644 index 000000000..202e6d5f8 --- /dev/null +++ b/openpdf/src/test/java/com/lowagie/text/html/StylesTest.java @@ -0,0 +1,126 @@ +package com.lowagie.text.html; + +import com.lowagie.text.Chunk; +import com.lowagie.text.Document; +import com.lowagie.text.Element; +import com.lowagie.text.Paragraph; +import com.lowagie.text.html.simpleparser.HTMLWorker; +import com.lowagie.text.html.simpleparser.StyleSheet; +import com.lowagie.text.pdf.PdfName; +import com.lowagie.text.pdf.PdfString; +import com.lowagie.text.pdf.PdfWriter; +import java.awt.Color; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * Tests generating PDF from HTML with selected CCS style attributes (such as 'font-size', 'background', 'background-color', 'color'). + */ +class StylesTest { + + @Test + void testBackgroundColor() throws Exception { + List elements = htmlToPdf("stylesTest/backgroundColor.html", "target/Background Color.pdf"); + Paragraph paragraph = (Paragraph) elements.get(0); + Chunk chunk1 = (Chunk) paragraph.get(0); + Assertions.assertEquals(Color.BLUE, getBackgroundColor(chunk1)); + Chunk chunk2 = (Chunk) paragraph.get(2); + Assertions.assertEquals(Color.BLUE, getBackgroundColor(chunk2)); + Chunk chunk3 = (Chunk) paragraph.get(4); + Assertions.assertEquals(Color.BLUE, getBackgroundColor(chunk3)); + Chunk chunk4 = (Chunk) paragraph.get(6); + Assertions.assertEquals(Color.BLUE, getBackgroundColor(chunk4)); + } + + private Color getBackgroundColor(Chunk chunk) { + Object[] backgroundAttributes = (Object[]) chunk.getChunkAttributes().get(Chunk.BACKGROUND); + if (backgroundAttributes != null && backgroundAttributes.length > 0 && backgroundAttributes[0] instanceof Color ) { + return (Color)backgroundAttributes[0]; + } + return null; + } + + @Test + void testFontColor() throws Exception { + List elements = htmlToPdf("stylesTest/fontColor.html", "target/Font Color.pdf"); + Paragraph paragraph = (Paragraph) elements.get(0); + Chunk chunk1 = (Chunk) paragraph.get(0); + Assertions.assertEquals(Color.BLUE, chunk1.getFont().getColor()); + Chunk chunk2 = (Chunk) paragraph.get(2); + Assertions.assertEquals(Color.BLUE, chunk2.getFont().getColor()); + } + + private List htmlToPdf(String htmlFileName, String pdfFileName) throws IOException { + StyleSheet styleSheet = new StyleSheet(); + Map interfaceProps = new HashMap<>(); + try(InputStream inputStream = StylesTest.class.getClassLoader().getResourceAsStream(htmlFileName); + OutputStream outputStream = Files.newOutputStream(Paths.get(pdfFileName))) { + if (inputStream == null) { + throw new IOException("InputStream could not be created"); + } + List elements = HTMLWorker.parseToList(new InputStreamReader(inputStream), styleSheet, interfaceProps); + + Document document = new Document(); + PdfWriter instance = PdfWriter.getInstance(document, outputStream); + document.open(); + instance.getInfo().put(PdfName.CREATOR, new PdfString(Document.getVersion())); + for (Element e : elements) { + document.add(e); + } + document.close(); + return elements; + } + } + + @Test + void testFontSize() throws Exception { + List elements = htmlToPdf("stylesTest/fontSize.html", "target/Font Size.pdf"); + Paragraph paragraph = (Paragraph) elements.get(0); + Chunk chunk1 = (Chunk) paragraph.get(0); + float defaultFontSize = chunk1.getFont().getSize(); + Chunk chunk2 = (Chunk) paragraph.get(2); + Assertions.assertEquals(8.0, chunk2.getFont().getSize()); + Chunk chunk3 = (Chunk) paragraph.get(4); + Assertions.assertEquals(20.0, chunk3.getFont().getSize()); + Chunk chunk4 = (Chunk) paragraph.get(6); + Assertions.assertEquals(1.5 * defaultFontSize, chunk4.getFont().getSize()); + Chunk chunk5 = (Chunk) paragraph.get(8); + Assertions.assertEquals(0.5 * defaultFontSize, chunk5.getFont().getSize()); + } + + @Test + void testNamedFontSize() throws Exception { + List elements = htmlToPdf("stylesTest/fontSizeNamed.html", "target/Font Size Named.pdf"); + Paragraph paragraph = (Paragraph) elements.get(0); + Chunk chunk1 = (Chunk) paragraph.get(0); + Assertions.assertEquals(FontSize.XX_SMALL.getScale() * Markup.DEFAULT_FONT_SIZE, chunk1.getFont().getSize()); + Chunk chunk2 = (Chunk) paragraph.get(2); + Assertions.assertEquals(FontSize.X_SMALL.getScale() * Markup.DEFAULT_FONT_SIZE, chunk2.getFont().getSize()); + Chunk chunk3 = (Chunk) paragraph.get(4); + Assertions.assertEquals(FontSize.SMALL.getScale() * Markup.DEFAULT_FONT_SIZE, chunk3.getFont().getSize()); + Chunk chunk4 = (Chunk) paragraph.get(6); + Assertions.assertEquals(FontSize.MEDIUM.getScale() * Markup.DEFAULT_FONT_SIZE, chunk4.getFont().getSize()); + Chunk chunk5 = (Chunk) paragraph.get(8); + Assertions.assertEquals(FontSize.LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk5.getFont().getSize()); + Chunk chunk6 = (Chunk) paragraph.get(10); + Assertions.assertEquals(FontSize.X_LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk6.getFont().getSize()); + Chunk chunk7 = (Chunk) paragraph.get(12); + Assertions.assertEquals(FontSize.XX_LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk7.getFont().getSize()); + Chunk chunk8 = (Chunk) paragraph.get(14); + Assertions.assertEquals(FontSize.XXX_LARGE.getScale() * Markup.DEFAULT_FONT_SIZE, chunk8.getFont().getSize()); + + Chunk chunk9 = (Chunk) paragraph.get(16); + Assertions.assertEquals(FontSize.SMALLER.getScale() * 20f, chunk9.getFont().getSize()); + Chunk chunk10 = (Chunk) paragraph.get(18); + Assertions.assertEquals(FontSize.LARGER.getScale() * 20f, chunk10.getFont().getSize()); + } +} diff --git a/openpdf/src/test/resources/stylesTest/backgroundColor.html b/openpdf/src/test/resources/stylesTest/backgroundColor.html new file mode 100644 index 000000000..ab323c069 --- /dev/null +++ b/openpdf/src/test/resources/stylesTest/backgroundColor.html @@ -0,0 +1,12 @@ + + + + + + + Blue background
+ Blue background
+ Blue background
+ Blue background
+ + diff --git a/openpdf/src/test/resources/stylesTest/fontColor.html b/openpdf/src/test/resources/stylesTest/fontColor.html new file mode 100644 index 000000000..254633401 --- /dev/null +++ b/openpdf/src/test/resources/stylesTest/fontColor.html @@ -0,0 +1,10 @@ + + + + + + + Blue text
+ Blue text
+ + diff --git a/openpdf/src/test/resources/stylesTest/fontSize.html b/openpdf/src/test/resources/stylesTest/fontSize.html new file mode 100644 index 000000000..b74062940 --- /dev/null +++ b/openpdf/src/test/resources/stylesTest/fontSize.html @@ -0,0 +1,13 @@ + + + + + + +Text
+Text 8.0pt
+Text 20px
+Text 1.5em
+Text 50% + + diff --git a/openpdf/src/test/resources/stylesTest/fontSizeNamed.html b/openpdf/src/test/resources/stylesTest/fontSizeNamed.html new file mode 100644 index 000000000..b52f4ef5a --- /dev/null +++ b/openpdf/src/test/resources/stylesTest/fontSizeNamed.html @@ -0,0 +1,23 @@ + + + + + + + + Text xx-small
+ Text x-small
+ Text small
+ Text medium
+ Text large
+ Text x-large
+ Text xx-large
+ Text xxx-large
+ + + + Text smaller
+ Text larger
+ + + From 4733d0d2b0527288add13b58ba33e2c624b2c49e Mon Sep 17 00:00:00 2001 From: asturio Date: Fri, 23 Feb 2024 20:10:44 +0100 Subject: [PATCH 13/31] Use UTF-8 in .getBytes(), and force running Tests with UTF-8 (#1080) - Fixes some issues when building under Windows --- .../pdf/encryption/DecryptAES256R6Test.java | 260 +++++++++++------- pom.xml | 1 + 2 files changed, 159 insertions(+), 102 deletions(-) diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java index 87cc9c126..610ab81b1 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java @@ -1,25 +1,25 @@ package com.lowagie.text.pdf.encryption; +import static java.nio.charset.StandardCharsets.UTF_8; + +import com.lowagie.text.exceptions.BadPasswordException; +import com.lowagie.text.exceptions.InvalidPdfException; +import com.lowagie.text.pdf.PdfReader; +import com.lowagie.text.pdf.parser.PdfTextExtractor; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import com.lowagie.text.exceptions.BadPasswordException; -import com.lowagie.text.exceptions.InvalidPdfException; -import com.lowagie.text.pdf.PdfReader; -import com.lowagie.text.pdf.parser.PdfTextExtractor; - /** * This class tests the OpenPDF decryption feature for * AES256 encrypted files according to ISO 32000-2, i.e. * for R = 6. *

* See also OpenPDF issue 375 - * + * * @author mkl */ class DecryptAES256R6Test { @@ -55,12 +55,14 @@ static void setUpBeforeClass() throws Exception { */ @Test void testReadPwProtectedAES256_openPDFiss375() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/pwProtectedAES256_openPDFiss375.pdf") ) { + try (InputStream resource = getClass().getResourceAsStream("/issue375/pwProtectedAES256_openPDFiss375.pdf")) { PdfReader pdfReader = new PdfReader(resource); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -79,13 +81,16 @@ void testReadPwProtectedAES256_openPDFiss375() throws IOException { */ @Test void testReadDemo1Encrypted() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/Demo1_encrypted_.pdf") ) { + try (InputStream resource = getClass().getResourceAsStream("/issue375/Demo1_encrypted_.pdf")) { PdfReader pdfReader = new PdfReader(resource); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Demo Name Signature Date Elizabeth Schultz (Apr 24, 2018) Elizabeth Schultz Apr 24, 2018 Elizabeth Schultz Sue Northrop (Apr 24, 2018) Apr 24, 2018 Sue Northrop", - new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals( + "Demo Name Signature Date Elizabeth Schultz (Apr 24, 2018) Elizabeth Schultz Apr 24, 2018 " + + "Elizabeth Schultz Sue Northrop (Apr 24, 2018) Apr 24, 2018 Sue Northrop", + new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -104,12 +109,14 @@ void testReadDemo1Encrypted() throws IOException { */ @Test public void testReadCopiedPositiveP() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/copied-positive-P.pdf") ) { + try (InputStream resource = getClass().getResourceAsStream("/issue375/copied-positive-P.pdf")) { PdfReader pdfReader = new PdfReader(resource); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Potato", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Potato", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -128,12 +135,14 @@ public void testReadCopiedPositiveP() throws IOException { */ @Test public void testReadCR6InPwOwner4() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/c-r6-in-pw=owner4.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"owner4".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/c-r6-in-pw=owner4.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "owner4".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(30, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(30, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -151,13 +160,15 @@ public void testReadCR6InPwOwner4() throws IOException { * The non-empty user password is used. */ @Test - public void testReadEncryptedHelloWorldR6PwHôtel() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/encrypted_hello_world_r6-pw=hôtel.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"hôtel".getBytes()); + public void testReadEncryptedHelloWorldR6PwHotelUtf8() throws IOException { + try (InputStream resource = getClass().getResourceAsStream("/issue375/encrypted_hello_world_r6-pw=hôtel.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "hôtel".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Hello, world!\n Goodbye, world!", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Hello, world!\n Goodbye, world!", + new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -176,12 +187,14 @@ public void testReadCR6InPwOwner4() throws IOException { */ @Test public void testReadEncryptedPositiveP() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/encrypted-positive-P.pdf") ) { + try (InputStream resource = getClass().getResourceAsStream("/issue375/encrypted-positive-P.pdf")) { PdfReader pdfReader = new PdfReader(resource); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Potato", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Potato", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -191,7 +204,8 @@ public void testReadEncryptedPositiveP() throws IOException { * "Unknown encryption type R = 6" support AES256 * *
- * enc-XI-long-password=qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf provided by Lonzak + * enc-XI-long-password + * =qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf provided by Lonzak *

* This test method checks whether OpenPdf can correctly decrypt * a file which is AES256 encrypted according to ISO 32000-2. @@ -201,13 +215,20 @@ public void testReadEncryptedPositiveP() throws IOException { @Test public void testReadEncXiLongPassword() throws IOException { try ( - InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-long-password=qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf") + InputStream resource = getClass().getResourceAsStream( + "/issue375/enc-XI-long-password" + + + "=qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv".getBytes()); + PdfReader pdfReader = new PdfReader(resource, + "qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv".getBytes( + UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(30, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(30, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -226,12 +247,14 @@ public void testReadEncXiLongPassword() throws IOException { */ @Test public void testReadEncXiR6V5OMaster_User() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,O=master.pdf") ) { + try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,O=master.pdf")) { PdfReader pdfReader = new PdfReader(resource); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); - Assertions.assertEquals(30, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(30, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -250,12 +273,14 @@ public void testReadEncXiR6V5OMaster_User() throws IOException { */ @Test public void testReadEncXiR6V5OMaster_Owner() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,O=master.pdf") ) { - PdfReader pdfReader = new PdfReader(resource, "master".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,O=master.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "master".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(30, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(30, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -275,13 +300,16 @@ public void testReadEncXiR6V5OMaster_Owner() throws IOException { * embedded file is encrypted. */ @Test - public void testReadEncXiR6V5UAttachmentEncryptedAttachments() throws IOException { + public void testReadEncXiR6V5UAttachmentEncryptedAttachments() { Assertions.assertThrows(InvalidPdfException.class, () -> { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=attachment,encrypted-attachments.pdf") ) { - PdfReader pdfReader = new PdfReader(resource, "attachment".getBytes()); + try (InputStream resource = getClass().getResourceAsStream( + "/issue375/enc-XI-R6,V5,U=attachment,encrypted-attachments.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "attachment".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } }); @@ -301,12 +329,15 @@ public void testReadEncXiR6V5UAttachmentEncryptedAttachments() throws IOExceptio */ @Test public void testReadEncXiR6V5UViewAttachmentsCleartextMetadata() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=view,attachments,cleartext-metadata.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"view".getBytes()); + try (InputStream resource = getClass().getResourceAsStream( + "/issue375/enc-XI-R6,V5,U=view,attachments,cleartext-metadata.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "view".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(30, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(30, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -325,12 +356,14 @@ public void testReadEncXiR6V5UViewAttachmentsCleartextMetadata() throws IOExcept */ @Test public void testReadEncXiR6V5UViewOMaster_User() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=view,O=master.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"view".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=view,O=master.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "view".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); - Assertions.assertEquals(30, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(30, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -349,12 +382,14 @@ public void testReadEncXiR6V5UViewOMaster_User() throws IOException { */ @Test public void testReadEncXiR6V5UViewOMaster_Owner() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=view,O=master.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"master".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=view,O=master.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "master".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(30, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(30, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -373,12 +408,14 @@ public void testReadEncXiR6V5UViewOMaster_Owner() throws IOException { */ @Test public void testReadEncXiR6V5UWwwwwOWwwww() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=wwwww,O=wwwww.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"wwwww".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=wwwww,O=wwwww.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "wwwww".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(30, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(30, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -397,12 +434,14 @@ public void testReadEncXiR6V5UWwwwwOWwwww() throws IOException { */ @Test public void testReadGraphEncryptedPwUser() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/graph-encrypted-pw=user.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"user".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/graph-encrypted-pw=user.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "user".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -421,12 +460,14 @@ public void testReadGraphEncryptedPwUser() throws IOException { */ @Test public void testReadIssue60101PwOwner() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/issue6010_1-pw=owner.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"owner".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/issue6010_1-pw=owner.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "owner".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Issue 6010", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Issue 6010", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -444,16 +485,18 @@ public void testReadIssue60101PwOwner() throws IOException { * The non-empty owner password is used. */ @Test - public void testReadIssue60102Pwæøå() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/issue6010_2-pw=æøå.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"æøå".getBytes()); + public void testReadIssue60102PaeoeaaUtf8() throws IOException { + try (InputStream resource = getClass().getResourceAsStream("/issue375/issue6010_2-pw=æøå.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "æøå".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(10, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals(10, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); Assertions.assertEquals("Sample PDF Document\n" + " Robert Maron\n" + " Grzegorz Grudzi´ nski\n" - + " February 20, 1999", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + + " February 20, 1999", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -472,12 +515,14 @@ public void testReadIssue60101PwOwner() throws IOException { */ @Test public void testReadMuPDFAes256R6UUserOOwner_User() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/MuPDF-AES256-R6-u=user-o=owner.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"user".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/MuPDF-AES256-R6-u=user-o=owner.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "user".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Mu PD F a lightweight PDF and XPS viewer", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Mu PD F a lightweight PDF and XPS viewer", + new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -496,12 +541,14 @@ public void testReadMuPDFAes256R6UUserOOwner_User() throws IOException { */ @Test public void testReadMuPDFAes256R6UUserOOwner_Owner() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/MuPDF-AES256-R6-u=user-o=owner.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"owner".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/MuPDF-AES256-R6-u=user-o=owner.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "owner".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("Mu PD F a lightweight PDF and XPS viewer", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("Mu PD F a lightweight PDF and XPS viewer", + new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -521,13 +568,15 @@ public void testReadMuPDFAes256R6UUserOOwner_Owner() throws IOException { * embedded file is encrypted. */ @Test - public void testReadNonTrivialCryptFilter() throws IOException { + public void testReadNonTrivialCryptFilter() { Assertions.assertThrows(BadPasswordException.class, () -> { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/nontrivial-crypt-filter.pdf") ) { + try (InputStream resource = getClass().getResourceAsStream("/issue375/nontrivial-crypt-filter.pdf")) { PdfReader pdfReader = new PdfReader(resource); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } }); @@ -547,12 +596,14 @@ public void testReadNonTrivialCryptFilter() throws IOException { */ @Test public void testReadPr65311PwAsdfasdf() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/pr6531_1-pw=asdfasdf.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"asdfasdf".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/pr6531_1-pw=asdfasdf.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "asdfasdf".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } } @@ -571,11 +622,12 @@ public void testReadPr65311PwAsdfasdf() throws IOException { */ @Test public void testReadPr65312PwAsdfasdf() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/pr6531_2-pw=asdfasdf.pdf") ) { - PdfReader pdfReader = new PdfReader(resource,"asdfasdf".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/pr6531_2-pw=asdfasdf.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "asdfasdf".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); // Page has no static content, so no text extraction test pdfReader.close(); } @@ -596,13 +648,15 @@ public void testReadPr65312PwAsdfasdf() throws IOException { * certain streams with Crypt filters are encrypted. */ @Test - public void testReadUnfilterableWithCrypt() throws IOException { + public void testReadUnfilterableWithCrypt() { Assertions.assertThrows(BadPasswordException.class, () -> { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/unfilterable-with-crypt.pdf") ) { + try (InputStream resource = getClass().getResourceAsStream("/issue375/unfilterable-with-crypt.pdf")) { PdfReader pdfReader = new PdfReader(resource); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); - Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); + Assertions.assertEquals(1, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1), + "Wrong text extracted from page 1"); pdfReader.close(); } }); @@ -624,12 +678,14 @@ public void testReadUnfilterableWithCrypt() throws IOException { */ @Test void testReadTHISISATEST_PWP() throws IOException { - try ( InputStream resource = getClass().getResourceAsStream("/issue375/THISISATEST_PWP.pdf") ) { - PdfReader pdfReader = new PdfReader(resource, "password".getBytes()); + try (InputStream resource = getClass().getResourceAsStream("/issue375/THISISATEST_PWP.pdf")) { + PdfReader pdfReader = new PdfReader(resource, "password".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); - Assertions.assertEquals(2, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); - Assertions.assertTrue(new PdfTextExtractor(pdfReader).getTextFromPage(1).startsWith("THIS IS A TEST"), "Wrong text extracted from page 1"); + Assertions.assertEquals(2, pdfReader.getNumberOfPages(), + "PdfReader fails to report the correct number of pages"); + Assertions.assertTrue(new PdfTextExtractor(pdfReader).getTextFromPage(1).startsWith("THIS IS A TEST"), + "Wrong text extracted from page 1"); pdfReader.close(); } } diff --git a/pom.xml b/pom.xml index d6dce38d1..410965294 100644 --- a/pom.xml +++ b/pom.xml @@ -267,6 +267,7 @@ ${maven.compiler.plugin.version} ${java.version} + ${project.build.sourceEncoding} -Xlint:unchecked From 2605869f17e18afdf144724177b0fa9581fba17f Mon Sep 17 00:00:00 2001 From: asturio Date: Mon, 26 Feb 2024 11:43:45 +0100 Subject: [PATCH 14/31] #156: Throw Exception if PdfWriter.close() is called directly (#1081) * #156: Throw Exception if PdfWriter.close() is called directly - Throw an IllegalStateException if PdfWriter.close() is called before Document.close() is called. - Delete old *.lng files in src/main/java - Update *.lng files in src/main/resources - BoyScout rule in PdfWriter * #156: Throw Exception if PdfWriter.close() is called directly - Codacy Issues (cherry picked from commit 6c675f73cd4003f5eb5e0a18ce41b25c7b30e45f) --- .../com/lowagie/text/error_messages/en.lng | 407 --- .../com/lowagie/text/error_messages/nl.lng | 407 --- .../com/lowagie/text/error_messages/pt.lng | 8 - .../java/com/lowagie/text/pdf/PdfWriter.java | 2177 ++++++++++------- .../com/lowagie/text/error_messages/en.lng | 6 +- .../com/lowagie/text/error_messages/nl.lng | 7 +- .../com/lowagie/text/error_messages/pt.lng | 1 + .../com/lowagie/text/pdf/PdfWriterTest.java | 42 + 8 files changed, 1306 insertions(+), 1749 deletions(-) delete mode 100644 openpdf/src/main/java/com/lowagie/text/error_messages/en.lng delete mode 100644 openpdf/src/main/java/com/lowagie/text/error_messages/nl.lng delete mode 100644 openpdf/src/main/java/com/lowagie/text/error_messages/pt.lng create mode 100644 openpdf/src/test/java/com/lowagie/text/pdf/PdfWriterTest.java diff --git a/openpdf/src/main/java/com/lowagie/text/error_messages/en.lng b/openpdf/src/main/java/com/lowagie/text/error_messages/en.lng deleted file mode 100644 index 730010285..000000000 --- a/openpdf/src/main/java/com/lowagie/text/error_messages/en.lng +++ /dev/null @@ -1,407 +0,0 @@ -# default language English -1.2.does.not.contain.an.usable.cmap={1} {2} does not contain an usable cmap. -1.2.is.not.a.ttf.font.file={1} {2} is not a TTF font file. -1.at.file.pointer.2={1} at file pointer {2} -1.bit.samples.are.not.supported.for.horizontal.differencing.predictor={1}-bit samples are not supported for Horizontal differencing Predictor. -1.cannot.be.embedded.due.to.licensing.restrictions={1} cannot be embedded due to licensing restrictions. -1.component.s.is.not.supported={1} component(s) is not supported -1.corrupted.jfif.marker={1} corrupted JFIF marker. -1.is.an.unknown.graphics.state.dictionary={1} is an unknown graphics state dictionary -1.is.an.unknown.image.format={1} is an unknown Image format. -1.is.not.a.true.type.file={1} is not a true type file. -1.is.not.a.ttf.otf.or.ttc.font.file={1} is not a TTF, OTF or TTC font file. -1.is.not.a.valid.jpeg.file={1} is not a valid JPEG-file. -1.is.not.a.valid.number.2={1} is not a valid number - {2} -1.is.not.a.valid.page.size.format.2={1} is not a valid page size format: {2} -1.is.not.a.valid.placeable.windows.metafile={1} is not a valid placeable windows metafile. -1.is.not.a.valid.ttc.file={1} is not a valid TTC file. -1.is.not.a.valid.ttf.file={1} is not a valid TTF file. -1.is.not.a.valid.ttf.or.otf.file={1} is not a valid TTF or OTF file. -1.is.not.an.acceptable.value.for.the.field.2={1} is not an acceptable value for the field {2} -1.is.not.an.afm.or.pfm.font.file={1} is not an AFM or PFM font file. -1.must.have.8.bits.per.component={1} must have 8 bits per component. -1.near.line.2.column.3={1} near line {2}, column {3} -1.not.found.as.file.or.resource={1} not found as file or resource. -1.not.found.as.resource={1} not found as resource. -1.unsupported.jpeg.marker.2={1}: unsupported JPEG marker: {2} -a.pattern.can.not.be.used.as.a.template.to.create.an.image=A pattern can not be used as a template to create an image. -a.pdfx.conforming.document.cannot.be.encrypted=A PDFX conforming document cannot be encrypted. -a.string.1.was.passed.in.state.only.on.off.and.toggle.are.allowed=A string '{1} was passed in state. Only 'ON', 'OFF' and 'Toggle' are allowed. -a.tab.position.may.not.be.lower.than.0.yours.is.1=A tab position may not be lower than 0; yours is {1} -a.table.should.have.at.least.1.column=A table should have at least 1 column. -a.tiling.or.shading.pattern.cannot.be.used.as.a.color.space.in.a.shading.pattern=A tiling or shading pattern cannot be used as a color space in a shading pattern -a.title.is.not.a.layer=A title is not a layer -addcell.cell.has.null.value=addCell - cell has null-value -addcell.error.in.reserve=addCell - error in reserve -addcell.illegal.column.argument=addCell - illegal column argument -addcell.null.argument=addCell - null argument -addcell.only.cells.or.tables.allowed=addCell - only Cells or Tables allowed -addcell.point.has.null.value=addCell - point has null-value -adding.a.cell.at.the.location.1.2.with.a.colspan.of.3.and.a.rowspan.of.4.is.illegal.beyond.boundaries.overlapping=Adding a cell at the location ({1},{2}) with a colspan of {3} and a rowspan of {4} is illegal (beyond boundaries/overlapping). -ai.not.found.1=AI not found: ({1}) -ai.too.short.1=AI too short: ({1}) -all.fill.bits.preceding.eol.code.must.be.0=All fill bits preceding EOL code must be 0. -all.the.fonts.must.be.embedded.this.one.isn.t.1=All the fonts must be embedded. This one isn't: {1} -already.attempted.a.read.on.this.jbig2.file=already attempted a read() on this Jbig2 File -an.appearance.was.requested.without.a.variable.text.field=An appearance was requested without a variable text field. -an.image.mask.cannot.contain.another.image.mask=An image mask cannot contain another image mask. -an.uncolored.pattern.was.expected=An uncolored pattern was expected. -an.uncolored.tile.pattern.can.not.have.another.pattern.or.shading.as.color=An uncolored tile pattern can not have another pattern or shading as color. -append.mode.does.not.support.changing.the.encryption.status=Append mode does not support changing the encryption status. -append.mode.requires.a.document.without.errors.even.if.recovery.was.possible=Append mode requires a document without errors even if recovery was possible. -authenticated.attribute.is.missing.the.digest=Authenticated attribute is missing the digest. -b.type.before.end.of.paragraph.at.index.1=B type before end of paragraph at index: {1} -bad.certificate.and.key=Bad certificate and key. -bad.endianness.tag.not.0x4949.or.0x4d4d=Bad endianness tag (not 0x4949 or 0x4d4d). -bad.linebreak.1.at.index.2=bad linebreak: {1} at index: {2} -bad.magic.number.should.be.42=Bad magic number, should be 42. -bad.user.password=Bad user password -badly.formated.directory.string=badly formated directory string -badly.formed.ucc.string.1=Badly formed UCC string: {1} -base64.input.not.properly.padded=Base64 input not properly padded. -bbox.must.be.a.4.element.array=BBox must be a 4 element array. -bits.per.component.must.be.1.2.4.or.8=Bits-per-component must be 1, 2, 4, or 8. -bits.per.sample.1.is.not.supported=Bits per sample {1} is not supported. -blend.mode.1.not.allowed=Blend mode {1} not allowed. -bookmark.end.tag.out.of.place=Bookmark end tag out of place. -both.colors.must.be.of.the.same.type=Both colors must be of the same type. -buffersize.1=bufferSize {1} -can.only.push.back.one.byte=Can only push back one byte -can.t.add.1.to.multicolumntext.with.complex.columns=Can't add {1} to MultiColumnText with complex columns -can.t.decode.pkcs7signeddata.object=can't decode PKCS7SignedData object -can.t.find.page.size.1=Can't find page size {1} -can.t.find.signing.certificate.with.serial.1=Can't find signing certificate with serial {1} -cannot.change.destination.of.external.link=Cannot change destination of external link -cannot.handle.box.sizes.higher.than.2.32=Cannot handle box sizes higher than 2^32 -cf.not.found.encryption=/CF not found (encryption) -codabar.must.have.at.least.a.start.and.stop.character=Codabar must have at least a start and stop character. -codabar.must.have.one.of.abcd.as.start.stop.character=Codabar must have one of 'ABCD' as start/stop character. -colors.are.not.allowed.in.uncolored.tile.patterns=Colors are not allowed in uncolored tile patterns. -colorspace.calrgb.is.not.allowed=Colorspace CalRGB is not allowed. -colorspace.rgb.is.not.allowed=Colorspace RGB is not allowed. -column.coordinate.of.location.must.be.gt.eq.0.and.lt.nr.of.columns=column coordinate of location must be >= 0 and < nr of columns -columntext.go.with.simulate.eq.eq.false.and.text.eq.eq.null=ColumnText.go with simulate==false and text==null. -components.must.be.1.3.or.4=Components must be 1, 3, or 4. -compression.jpeg.is.only.supported.with.a.single.strip.this.image.has.1.strips=Compression JPEG is only supported with a single strip. This image has {1} strips. -content.can.not.be.added.to.a.pdfimportedpage=Content can not be added to a PdfImportedPage. -content.was.already.written.to.the.output=Content was already written to the output. -corrupted.png.file=Corrupted PNG file. -could.not.find.web.browser=Could not find web browser. -count.of.referred.to.segments.had.bad.value.in.header.for.segment.1.starting.at.2=count of referred-to segments had bad value in header for segment {1} starting at {2} -defaultcryptfilter.not.found.encryption=/DefaultCryptFilter not found (encryption) -destination.end.tag.out.of.place=Destination end tag out of place. -dictionary.key.is.not.a.name=Dictionary key is not a name. -dimensions.of.a.cell.are.attributed.automagically.see.the.faq=Dimensions of a Cell are attributed automagically. See the FAQ. -dimensions.of.a.cell.can.t.be.calculated.see.the.faq=Dimensions of a Cell can't be calculated. See the FAQ. -dimensions.of.a.table.can.t.be.calculated.see.the.faq=Dimensions of a Table can't be calculated. See the FAQ. -directory.number.too.large=Directory number too large. -document.already.pre.closed=Document already pre closed. -element.not.allowed=Element not allowed. -encryption.can.only.be.added.before.opening.the.document=Encryption can only be added before opening the document. -eol.code.word.encountered.in.black.run=EOL code word encountered in Black run. -eol.code.word.encountered.in.white.run=EOL code word encountered in White run. -error.attempting.to.launch.web.browser=Error attempting to launch web browser -error.expected.hex.character.and.not.char.thenextbyte.1=Error: expected hex character and not (char)theNextByte:{1} -error.expected.the.end.of.a.dictionary=Error: expected the end of a dictionary. -error.in.attribute.processing=Error in attribute processing -error.in.base64.code.reading.stream=Error in Base64 code reading stream. -error.parsing.cmap.beginbfchar.expected.cosstring.or.cosname.and.not.1=Error parsing CMap beginbfchar, expected {COSString or COSName} and not {1} -error.reading.objstm=Error reading ObjStm -error.reading.string=Error reading string -error.with.jp.marker=Error with JP Marker -expected.ftyp.marker=Expected FTYP Marker -expected.gt.for.tag.lt.1.gt=Expected > for tag: <{1}/> -expected.ihdr.marker=Expected IHDR Marker -expected.jp.marker=Expected JP Marker -expected.jp2h.marker=Expected JP2H Marker -extra.samples.are.not.supported=Extra samples are not supported. -failed.to.get.tsa.response.from.1=Failed to get TSA response from '{1}' -fdf.header.not.found=FDF header signature not found. -field.flattening.is.not.supported.in.append.mode=Field flattening is not supported in append mode. -field.names.cannot.contain.a.dot=Field names cannot contain a dot. -file.header.flags.bits.2.7.not.0=file header flags bits 2-7 not 0 -file.header.idstring.not.good.at.byte.1=file header idstring not good at byte {1} -file.is.not.a.valid.png=File is not a valid PNG. -file.position.0.cross.reference.entry.in.this.xref.subsection=File position 0 cross-reference entry in this xref subsection -first.scanline.must.be.1d.encoded=First scanline must be 1D encoded. -font.1.with.2.encoding.is.not.a.cjk.font=Font '{1}' with '{2}' encoding is not a CJK font. -font.1.with.2.is.not.recognized=Font '{1}' with '{2}' is not recognized. -font.and.size.must.be.set.before.writing.any.text=Font and size must be set before writing any text -font.size.too.small.1=Font size too small: {1} -fontfactoryimp.cannot.be.null=FontFactoryImp cannot be null. -freetext.flattening.is.not.supported.in.append.mode=FreeText flattening is not supported in append mode. -getcell.at.illegal.index.1.max.is.2=getCell at illegal index :{1} max is {2} -getcell.at.illegal.index.1=getCell at illegal index : {1} -gif.signature.nor.found=Gif signature nor found. -greaterthan.not.expected='>' not expected -illegal.capacity.1=Illegal Capacity: {1} -illegal.character.in.ascii85decode=Illegal character in ASCII85Decode. -illegal.character.in.asciihexdecode=Illegal character in ASCIIHexDecode. -illegal.length.in.ascii85decode=Illegal length in ASCII85Decode. -illegal.length.value=Illegal Length value. -illegal.load.1=Illegal Load: {1} -illegal.p.value=Illegal P value. -illegal.paragraph.embedding.level.1=illegal paragraph embedding level: {1} -illegal.r.value=Illegal R value. -illegal.type.value.at.1.2=illegal type value at {1}: {2} -illegal.v.value=Illegal V value. -illegal.value.for.predictor.in.tiff.file=Illegal value for Predictor in TIFF file. -improperly.padded.base64.input=Improperly padded Base64 input. -in.a.page.label.the.page.numbers.must.be.greater.or.equal.to.1=In a page label the page numbers must be greater or equal to 1. -in.codabar.start.stop.characters.are.only.allowed.at.the.extremes=In codabar, start/stop characters are only allowed at the extremes. -incomplete.palette=incomplete palette -inconsistent.mapping=Inconsistent mapping. -inconsistent.writers.are.you.mixing.two.documents=Inconsistent writers. Are you mixing two documents? -incorrect.segment.type.in.1=Incorrect segment type in {1} -insertion.of.illegal.element.1=Insertion of illegal Element: {1} -inserttable.point.has.null.value=insertTable - point has null-value -inserttable.table.has.null.value=insertTable - table has null-value -inserttable.wrong.columnposition.1.of.location.max.eq.2=insertTable -- wrong columnposition({1}) of location; max ={2} -insufficient.data=Insufficient data. -insufficient.length=Insufficient length. -internal.inconsistence=Internal inconsistence. -inthashtableiterator=IntHashtableIterator -invalid.additional.action.type.1=Invalid additional action type: {1} -invalid.ai.length.1=Invalid AI length: ({1}) -invalid.border.style=Invalid border style. -invalid.character.in.base64.data=Invalid character in Base64 data. -invalid.code.encountered.while.decoding.2d.group.3.compressed.data=Invalid code encountered while decoding 2D group 3 compressed data. -invalid.code.encountered.while.decoding.2d.group.4.compressed.data=Invalid code encountered while decoding 2D group 4 compressed data. -invalid.code.encountered=Invalid code encountered. -invalid.code.type=Invalid code type. -invalid.codeword.size=Invalid codeword size. -invalid.color.type=Invalid color type. -invalid.cross.reference.entry.in.this.xref.subsection=Invalid cross-reference entry in this xref subsection -invalid.end.tag.1=Invalid end tag - {1} -invalid.generation.number=Invalid generation number. -invalid.http.response.1=Invalid HTTP response: {1} -invalid.icc.profile=Invalid ICC profile -invalid.index.1=Invalid index: {1} -invalid.listtype.value=Invalid listType value. -invalid.magic.value.for.bmp.file=Invalid magic value for BMP file. -invalid.named.action=Invalid named action. -invalid.object.number=Invalid object number. -invalid.page.additional.action.type.1=Invalid page additional action type: {1} -invalid.page.number.1=Invalid page number: {1} -invalid.run.direction.1=Invalid run direction: {1} -invalid.status.1=Invalid status: {1} -invalid.tsa.1.response.code.2=Invalid TSA '{1}' response, code {2} -invalid.type.was.passed.in.state.1=Invalid type was passed in state: {1} -invalid.use.of.a.pattern.a.template.was.expected=Invalid use of a pattern. A template was expected. -irregular.columns.are.not.supported.in.composite.mode=Irregular columns are not supported in composite mode. -java.awt.image.fetch.aborted.or.errored=java.awt.Image fetch aborted or errored -java.awt.image.interrupted.waiting.for.pixels=java.awt.Image Interrupted waiting for pixels! -last.linebreak.must.be.at.1=last linebreak must be at {1} -layers.are.not.allowed=Layers are not allowed. -layout.out.of.bounds=Layout out of bounds. -line.iterator.out.of.bounds=line iterator out of bounds -linear.page.mode.can.only.be.called.with.a.single.parent=Linear page mode can only be called with a single parent. -lzw.flavour.not.supported=LZW flavour not supported. -macrosegmentid.must.be.gt.eq.0=macroSegmentId must be >=0 -macrosegmentid.must.be.lt.macrosemgentcount=macroSegmentId must be < macroSemgentCount -macrosemgentcount.must.be.gt.0=macroSemgentCount must be > 0 -mapping.code.should.be.1.or.two.bytes.and.not.1=Mapping code should be 1 or two bytes and not {1} -missing.end.tag=Missing end tag -missing.endcharmetrics.in.1=Missing EndCharMetrics in {1} -missing.endfontmetrics.in.1=Missing EndFontMetrics in {1} -missing.endkernpairs.in.1=Missing EndKernPairs in {1} -missing.startcharmetrics.in.1=Missing StartCharMetrics in {1} -missing.tag.s.for.ojpeg.compression=Missing tag(s) for OJPEG compression. -multicolumntext.has.no.columns=MultiColumnText has no columns -name.end.tag.out.of.place=Name end tag out of place. -nested.tags.are.not.allowed=Nested tags are not allowed. -no.compatible.encryption.found=No compatible encryption found -no.error.just.an.old.style.table=No error, just an old style table -no.font.is.defined=No font is defined. -no.glyphs.defined.for.type3.font=No glyphs defined for Type3 font -no.valid.column.line.found=No valid column line found. -no.valid.encryption.mode=No valid encryption mode -not.a.placeable.windows.metafile=Not a placeable windows metafile -not.a.valid.jpeg2000.file=Not a valid Jpeg2000 file -not.a.valid.pfm.file=Not a valid PFM file. -not.a.valid.pkcs.7.object.not.a.sequence=Not a valid PKCS#7 object - not a sequence -not.a.valid.pkcs.7.object.not.signed.data=Not a valid PKCS#7 object - not signed data -not.all.annotations.could.be.added.to.the.document.the.document.doesn.t.have.enough.pages=Not all annotations could be added to the document (the document doesn't have enough pages). -not.colorized.typed3.fonts.only.accept.mask.images=Not colorized Typed3 fonts only accept mask images. -null.outpustream=null OutpuStream -number.of.entries.in.this.xref.subsection.not.found=Number of entries in this xref subsection not found -object.number.of.the.first.object.in.this.xref.subsection.not.found=Object number of the first object in this xref subsection not found -ocsp.status.is.revoked=OCSP Status is revoked! -ocsp.status.is.unknown=OCSP Status is unknown! -only.bmp.can.be.wrapped.in.wmf=Only BMP can be wrapped in WMF. -only.bmp.png.wmf.gif.and.jpeg.images.are.supported.by.the.rtf.writer=Only BMP, PNG, WMF, GIF and JPEG images are supported by the RTF Writer -only.javascript.actions.are.allowed=Only JavaScript actions are allowed. -only.one.of.artbox.or.trimbox.can.exist.in.the.page=Only one of ArtBox or TrimBox can exist in the page. -only.pdflayer.is.accepted=Only PdfLayer is accepted. -only.rgb.gray.and.cmyk.are.supported.as.alternative.color.spaces=Only RGB, Gray and CMYK are supported as alternative color spaces. -open.actions.by.name.are.not.supported=Open actions by name are not supported. -operator.1.already.registered=Operator {1} already registered -page.1.invalid.for.segment.2.starting.at.3=page {1} invalid for segment {2} starting at {3} -page.attribute.missing=Page attribute missing. -page.not.found=Page not found. -page.reordering.requires.a.single.parent.in.the.page.tree.call.pdfwriter.setlinearmode.after.open=Page reordering requires a single parent in the page tree. Call PdfWriter.setLinearMode() after open. -page.reordering.requires.an.array.with.the.same.size.as.the.number.of.pages=Page reordering requires an array with the same size as the number of pages. -page.reordering.requires.no.page.repetition.page.1.is.repeated=Page reordering requires no page repetition. Page {1} is repeated. -page.reordering.requires.pages.between.1.and.1.found.2=Page reordering requires pages between 1 and {1}. Found {2}. -partial.form.flattening.is.not.supported.with.xfa.forms=Partial form flattening is not supported with XFA forms. -pdf.header.not.found=PDF header signature not found. -pdf.startxref.not.found=PDF startxref not found. -pdfpcells.can.t.have.a.rowspan.gt.1=PdfPCells can't have a rowspan > 1 -pdfreader.not.opened.with.owner.password=PdfReader not opened with owner password -pdfx.conformance.can.only.be.set.before.opening.the.document=PDFX conformance can only be set before opening the document. -planar.images.are.not.supported=Planar images are not supported. -png.filter.unknown=PNG filter unknown. -preclose.must.be.called.first=preClose() must be called first. -premature.end.in.1=Premature end in {1} -premature.end.of.file=Premature end of file. -premature.eof.while.reading.jpg=Premature EOF while reading JPG. -rebuild.failed.1.original.message.2=Rebuild failed: {1}; Original message: {2} -rectanglereadonly.this.rectangle.is.read.only=RectangleReadOnly: this Rectangle is read only. -reference.pointing.to.reference=Reference pointing to reference. -referring.to.widht.height.of.page.we.havent.seen.yet.1=referring to widht/height of page we havent seen yet? {1} -remove.not.supported=remove() not supported. -reserve.incorrect.column.size=reserve - incorrect column/size -resources.do.not.contain.extgstate.entry.unable.to.process.operator.1=Resources do not contain ExtGState entry. Unable to process operator {1} -root.element.is.not.bookmark.1=Root element is not Bookmark: {1} -root.element.is.not.destination=Root element is not Destination. -root.element.is.not.xfdf.1=Root element is not xfdf: {1} -rotation.must.be.a.multiple.of.90=Rotation must be a multiple of 90. -row.coordinate.of.location.must.be.gt.eq.0=row coordinate of location must be >= 0 -scanline.must.begin.with.eol.code.word=Scanline must begin with EOL code word. -separations.patterns.and.shadings.are.not.allowed.in.mk.dictionary=Separations, patterns and shadings are not allowed in MK dictionary. -setelement.position.already.taken=setElement - position already taken -start.marker.missing.in.1=Start marker missing in {1} -startxref.is.not.followed.by.a.number=startxref is not followed by a number. -startxref.not.found=startxref not found. -stdcf.not.found.encryption=/StdCF not found (encryption) -stream.could.not.be.compressed.filter.is.not.a.name.or.array=Stream could not be compressed: filter is not a name or array. -table.1.does.not.exist.in.2=Table '{1}' does not exist in {2} -tag.1.not.allowed=Tag {1} not allowed. -tagging.must.be.set.before.opening.the.document=Tagging must be set before opening the document. -text.cannot.be.null=Text cannot be null. -the.array.must.contain.string.or.pdfannotation=The array must contain String or PdfAnnotation. -the.byte.array.is.not.a.recognized.imageformat=The byte array is not a recognized imageformat. -the.ccitt.compression.type.must.be.ccittg4.ccittg3.1d.or.ccittg3.2d=The CCITT compression type must be CCITTG4, CCITTG3_1D or CCITTG3_2D -the.char.1.doesn.t.belong.in.this.type3.font=The char {1} doesn't belong in this Type3 font -the.char.1.is.not.defined.in.a.type3.font=The char {1} is not defined in a Type3 font -the.character.1.is.illegal.in.codabar=The character '{1}' is illegal in codabar. -the.character.1.is.illegal.in.code.39.extended=The character '{1}' is illegal in code 39 extended. -the.character.1.is.illegal.in.code.39=The character '{1}' is illegal in code 39. -the.cmap.1.does.not.exist.as.a.resource=The cmap {1} does not exist as a resource. -the.cmap.1.was.not.found=The Cmap {1} was not found. -the.compression.1.is.not.supported=The compression {1} is not supported. -the.document.has.been.closed.you.can.t.add.any.elements=The document has been closed. You can't add any Elements. -the.document.has.no.pages=The document has no pages. -the.document.is.not.open.yet.you.can.only.add.meta.information=The document is not open yet; you can only add Meta information. -the.document.is.not.open=The document is not open. -the.document.is.open.you.can.only.add.elements.with.content=The document is open; you can only add Elements with content. -the.document.must.be.open.to.import.rtf.documents=The document must be open to import RTF documents. -the.document.must.be.open.to.import.rtf.fragments=The document must be open to import RTF fragments. -the.document.was.reused=The document was reused. -the.export.and.the.display.array.must.have.the.same.size=The export and the display array must have the same size. -the.field.1.already.exists=The field {1} already exists. -the.field.1.does.not.exist=The field {1} does not exist. -the.field.1.is.not.a.signature.field=The field {1} is not a signature field. -the.file.does.not.contain.any.valid.image=The file does not contain any valid image. -the.filter.1.is.not.supported=The filter {1} is not supported. -the.font.index.for.1.must.be.between.0.and.2.it.was.3=The font index for {1} must be between 0 and {2}. It was {3}. -the.font.index.for.1.must.be.positive=The font index for {1} must be positive. -the.image.mask.is.not.a.mask.did.you.do.makemask=The image mask is not a mask. Did you do makeMask()? -the.image.must.have.absolute.positioning=The image must have absolute positioning. -the.key.1.didn.t.reserve.space.in.preclose=The key {1} didn't reserve space in preClose(). -the.key.1.is.too.big.is.2.reserved.3=The key {1} is too big. Is {2}, reserved {3} -the.layer.1.already.has.a.parent=The layer '{1}' already has a parent. -the.matrix.size.must.be.6=The matrix size must be 6. -the.name.1.is.too.long.2.characters=The name '{1}' is too long ({2} characters). -the.new.size.must.be.positive.and.lt.eq.of.the.current.size=The new size must be positive and <= of the current size -the.number.of.booleans.in.this.array.doesn.t.correspond.with.the.number.of.fields=The number of booleans in this array doesn't correspond with the number of fields. -the.number.of.columns.in.pdfptable.constructor.must.be.greater.than.zero=The number of columns in PdfPTable constructor must be greater than zero. -the.original.document.was.reused.read.it.again.from.file=The original document was reused. Read it again from file. -the.page.number.must.be.gt.eq.1=The page number must be >= 1. -the.parent.has.already.another.function=The parent has already another function. -the.photometric.1.is.not.supported=The photometric {1} is not supported. -the.resource.cjkencodings.properties.does.not.contain.the.encoding.1=The resource cjkencodings.properties does not contain the encoding {1} -the.smask.key.is.not.allowed.in.images=The /SMask key is not allowed in images. -the.spot.color.must.be.the.same.only.the.tint.can.vary=The spot color must be the same, only the tint can vary. -the.stack.is.empty=The stack is empty. -the.structure.has.kids=The structure has kids. -the.table.width.must.be.greater.than.zero=The table width must be greater than zero. -the.template.can.not.be.null=The template can not be null. -the.text.is.too.big=The text is too big. -the.text.length.must.be.even=The text length must be even. -the.two.barcodes.must.be.composed.externally=The two barcodes must be composed externally. -the.update.dictionary.has.less.keys.than.required=The update dictionary has less keys than required. -the.url.of.the.image.is.missing=The URL of the image is missing. -the.value.has.to.be.true.of.false.instead.of.1=The value has to be 'true' of 'false', instead of '{1}'. -the.width.cannot.be.set=The width cannot be set. -the.widths.array.in.pdfptable.constructor.can.not.be.null=The widths array in PdfPTable constructor can not be null. -the.widths.array.in.pdfptable.constructor.can.not.have.zero.length=The widths array in PdfPTable constructor can not have zero length. -the.writer.in.pdfcontentbyte.is.null=The writer in PdfContentByte is null. -there.are.illegal.characters.for.barcode.128.in.1=There are illegal characters for barcode 128 in '{1}'. -this.acrofields.instance.is.read.only=This AcroFields instance is read-only. -this.image.can.not.be.an.image.mask=This image can not be an image mask. -this.largeelement.has.already.been.added.to.the.document=This LargeElement has already been added to the Document. -this.page.cannot.be.replaced.new.content.was.already.added=This page cannot be replaced: new content was already added -this.pkcs.7.object.has.multiple.signerinfos.only.one.is.supported.at.this.time=This PKCS#7 object has multiple SignerInfos - only one is supported at this time -tiff.5.0.style.lzw.codes.are.not.supported=TIFF 5.0-style LZW codes are not supported. -tiff.fill.order.tag.must.be.either.1.or.2=TIFF_FILL_ORDER tag must be either 1 or 2. -tiles.are.not.supported=Tiles are not supported. -title.cannot.be.null=Title cannot be null. -token.obj.expected=Token 'obj' expected. -trailer.not.found=trailer not found. -transparency.is.not.allowed.ca.eq.1=Transparency is not allowed: /ca = {1} -transparency.length.must.be.equal.to.2.with.ccitt.images=Transparency length must be equal to 2 with CCITT images -transparency.length.must.be.equal.to.componentes.2=Transparency length must be equal to (componentes * 2) -trying.to.create.a.table.without.rows=Trying to create a table without rows. -tsa.1.failed.to.return.time.stamp.token.2=TSA '{1}' failed to return time stamp token: {2} -two.byte.arrays.are.needed.if.the.type1.font.is.embedded=Two byte arrays are needed if the Type1 font is embedded. -type3.font.used.with.the.wrong.pdfwriter=Type3 font used with the wrong PdfWriter -types.is.null=types is null -unbalanced.begin.end.marked.content.operators=Unbalanced begin/end marked content operators. -unbalanced.begin.end.text.operators=Unbalanced begin/end text operators. -unbalanced.layer.operators=Unbalanced layer operators. -unbalanced.marked.content.operators=Unbalanced marked content operators. -unbalanced.save.restore.state.operators=Unbalanced save/restore state operators. -unexpected.end.of.file=Unexpected end of file. -unexpected.eof=Unexpected EOF -unexpected.gt.gt=Unexpected '>>' -unexpected.close.bracket=Unexpected ']' -unknown.color.format.must.be.rgb.or.rrggbb=Unknown color format. Must be #RGB, #RRGGBB, #RGBA or #RRGGBBAA -unknown.encryption.type.r.eq.1=Unknown encryption type R = {1} -unknown.encryption.type.v.eq.1=Unknown encryption type V = {1} -unknown.filter.1=Unknown filter: {1} -unknown.hash.algorithm.1=Unknown Hash Algorithm {1} -unknown.key.algorithm.1=Unknown Key Algorithm {1} -unknown.object.at.k.1=Unknown object at /K {1} -unknown=unknown -unsupported.box.size.eq.eq.0=Unsupported box size == 0 -unsupported.in.this.context.use.pdfstamper.addannotation=Unsupported in this context. Use PdfStamper.addAnnotation() -use.pdfstamper.getundercontent.or.pdfstamper.getovercontent=Use PdfStamper.getUnderContent() or PdfStamper.getOverContent() -use.pdfstamper.setthumbnail=Use PdfStamper.setThumbnail(). -use.setpageaction.pdfname.actiontype.pdfaction.action.int.page=Use setPageAction(PdfName actionType, PdfAction action, int page) -userunit.should.be.a.value.between.1.and.75000=UserUnit should be a value between 1 and 75000. -verticaltext.go.with.simulate.eq.eq.false.and.text.eq.eq.null=VerticalText.go with simulate==false and text==null. -while.removing.wmf.placeable.header=while removing wmf placeable header -writelength.can.only.be.called.after.output.of.the.stream.body=writeLength() can only be called after output of the stream body. -writelength.can.only.be.called.in.a.contructed.pdfstream.inputstream.pdfwriter=writeLength() can only be called in a contructed PdfStream(InputStream,PdfWriter). -wrong.number.of.columns=Wrong number of columns. -xref.infinite.loop=An infinite loop was detected in the xref table. -xref.subsection.not.found=xref subsection not found -xstep.or.ystep.can.not.be.zero=XStep or YStep can not be ZERO. -you.can.only.add.a.writer.to.a.pdfdocument.once=You can only add a writer to a PdfDocument once. -you.can.only.add.cells.to.rows.no.objects.of.type.1=You can only add cells to rows, no objects of type {1} -you.can.only.add.objects.that.implement.the.element.interface=You can only add objects that implement the Element interface. -you.can.t.add.a.1.to.a.section=You can't add a {1} to a Section. -you.can.t.add.an.element.of.type.1.to.a.simplecell=You can't add an element of type {1} to a SimpleCell. -you.can.t.add.cells.to.a.table.directly.add.them.to.a.row.first=You can't add cells to a table directly, add them to a row first. -you.can.t.add.listitems.rows.or.cells.to.a.cell=You can't add listitems, rows or cells to a cell. -you.can.t.add.one.row.to.another.row=You can't add one row to another row. -you.can.t.have.1.pages.on.one.page.minimum.2.maximum.8=You can't have {1} pages on one page (minimum 2; maximum 8). -you.can.t.set.the.initial.leading.if.the.document.is.already.open=You can't set the initial leading if the document is already open. -you.can.t.split.this.document.at.page.1.there.is.no.such.page=You can't split this document at page {1}; there is no such page. -you.can.t.translate.a.negative.number.into.an.alphabetical.value=You can't translate a negative number into an alphabetical value. -you.have.to.consolidate.the.named.destinations.of.your.reader=You have to consolidate the named destinations of your reader. -you.have.to.define.a.boolean.array.for.this.collection.sort.dictionary=You have to define a boolean array for this collection sort dictionary. -you.have.used.the.wrong.constructor.for.this.fieldpositioningevents.class=You have used the wrong constructor for this FieldPositioningEvents class. -you.must.set.a.value.before.adding.a.prefix=You must set a value before adding a prefix. -you.need.a.single.boolean.for.this.collection.sort.dictionary=You need a single boolean for this collection sort dictionary. diff --git a/openpdf/src/main/java/com/lowagie/text/error_messages/nl.lng b/openpdf/src/main/java/com/lowagie/text/error_messages/nl.lng deleted file mode 100644 index 334959aad..000000000 --- a/openpdf/src/main/java/com/lowagie/text/error_messages/nl.lng +++ /dev/null @@ -1,407 +0,0 @@ -# Nederlandse vertaling van de foutboodschappen -1.2.does.not.contain.an.usable.cmap={1} {2} bevat geen bruikbare cmap. -1.2.is.not.a.ttf.font.file={1} {2} is geen TTF font file. -1.at.file.pointer.2={1} bij file pointer {2} -1.bit.samples.are.not.supported.for.horizontal.differencing.predictor={1}-bit samples worden niet ondersteund voor een horizontaal differencierende Predictor. -1.cannot.be.embedded.due.to.licensing.restrictions={1} kan niet ingebed worden omwille van licentie restricties. -1.component.s.is.not.supported=geen ondersteuning voor {1} component(en) -1.corrupted.jfif.marker={1} is een corrupte JFIF marker. -1.is.an.unknown.graphics.state.dictionary={1} is een onbekende graphics state dictionary -1.is.an.unknown.image.format={1} is een onbekend Image formaat. -1.is.not.a.true.type.file={1} is geen true type file. -1.is.not.a.ttf.otf.or.ttc.font.file={1} is geen TTF, OTF of TTC font file. -1.is.not.a.valid.jpeg.file={1} is geen geldig JPEG bestand. -1.is.not.a.valid.number.2={1} is geen geldig nummer - {2} -1.is.not.a.valid.page.size.format.2={1} is geen geldig pagina formaat: {2} -1.is.not.a.valid.placeable.windows.metafile={1} is geen geldige plaatsbaar WMF bestand. -1.is.not.a.valid.ttc.file={1} is geen geldige TTC file. -1.is.not.a.valid.ttf.file={1} is geen geldig TTF bestand. -1.is.not.a.valid.ttf.or.otf.file={1} is geen geldige TTF of OTF file. -1.is.not.an.acceptable.value.for.the.field.2={1} is geen geldige waarde voor het veld {2} -1.is.not.an.afm.or.pfm.font.file={1} is geen AFM of PFM font file. -1.must.have.8.bits.per.component={1} moet 8 bits per component bevatten. -1.near.line.2.column.3={1} in lijn {2}, kolom {3} -1.not.found.as.file.or.resource={1} niet gevonden als bron of bronbestand. -1.not.found.as.resource={1} niet gevonden als een bron(bestand). -1.unsupported.jpeg.marker.2={1}: niet ondersteunde JPEG marker: {2} -a.pattern.can.not.be.used.as.a.template.to.create.an.image=Een patroon kan niet gebruikt worden als template om een afbeelding te maken. -a.pdfx.conforming.document.cannot.be.encrypted=Een PDF/X document mag niet versleuteld worden. -a.string.1.was.passed.in.state.only.on.off.and.toggle.are.allowed=Een string '{1}' werd gebruikt als status. Alleen 'ON', 'OFF' en 'Toggle' zijn toegelaten. -a.tab.position.may.not.be.lower.than.0.yours.is.1=Een tab positie mag niet kleiner zijn dan 0; jouw tab positie is {1} -a.table.should.have.at.least.1.column=Een tabel moet uit ten minste 1 kolom bestaan. -a.tiling.or.shading.pattern.cannot.be.used.as.a.color.space.in.a.shading.pattern=Een tiling of shading pattern kan niet gebruikt worden als een color space in een shading pattern -a.title.is.not.a.layer=Een titel is geen layer -addcell.cell.has.null.value=addCell - cell bevat een null-waarde -addcell.error.in.reserve=addCell - fout in reserve -addcell.illegal.column.argument=addCell - ongeldig kolom argument -addcell.null.argument=addCell - argument null -addcell.only.cells.or.tables.allowed=addCell - alleen cellen en tabellen zijn toegelaten -addcell.point.has.null.value=addCell - point bevat een null-waarde -adding.a.cell.at.the.location.1.2.with.a.colspan.of.3.and.a.rowspan.of.4.is.illegal.beyond.boundaries.overlapping=Een cel toevoegen op positie ({1},{2}) met colspan {3} en rowspan {4} is niet mogelijk (overlapt of gaat buiten bereik). -ai.not.found.1=AI niet gevonden: ({1}) -ai.too.short.1=AI niet lang genoeg: ({1}) -all.fill.bits.preceding.eol.code.must.be.0=Alle fill bits voorafgaand aan EOL code moeten 0 zijn. -all.the.fonts.must.be.embedded.this.one.isn.t.1=Alle fonts moeten ingebed worden. Deze font is niet ingebed: {1} -already.attempted.a.read.on.this.jbig2.file=read() was al geprobeerd op dit Jbig2 bestand -an.appearance.was.requested.without.a.variable.text.field=Er werd een appearance gevraagd zonder variabel text field. -an.image.mask.cannot.contain.another.image.mask=Een image mask mag geen ander image mask bevatten. -an.uncolored.pattern.was.expected=Er werd een ongekleurd patroon verwacht. -an.uncolored.tile.pattern.can.not.have.another.pattern.or.shading.as.color=Een ongekleurd tile pattern kan geen ander pattern of shading als color gebruiken. -append.mode.does.not.support.changing.the.encryption.status=Append mode laat geen wijziging toe van de encryptie status. -append.mode.requires.a.document.without.errors.even.if.recovery.was.possible=Append mode vergt een document zonder fouten, zelfs als recovery mogelijk was. -authenticated.attribute.is.missing.the.digest=Er ontbreekt een geauthenticeerd attribuut in de digest. -b.type.before.end.of.paragraph.at.index.1=B type voor het einde van een paragraaf op index: {1} -bad.certificate.and.key=Verkeerd certificaat en sleutel. -bad.endianness.tag.not.0x4949.or.0x4d4d=Verkeerde endianness tag (niet 0x4949 of 0x4d4d). -bad.linebreak.1.at.index.2=slechte lijnafbreking: {1} op index: {2} -bad.magic.number.should.be.42=Verkeerd 'magic number', zou 42 moeten zijn. -bad.user.password=Verkeerd user password -badly.formated.directory.string=Slecht geformateerde directory string -badly.formed.ucc.string.1=Slecht gevormde UCC string: {1} -base64.input.not.properly.padded=Base64 input is niet correct 'gepad'. -bbox.must.be.a.4.element.array=BBox moet een array met 4 elementen zijn. -bits.per.component.must.be.1.2.4.or.8=Bits-per-component moet 1, 2, 4, of 8 zijn. -bits.per.sample.1.is.not.supported=Bits per sample {1} wordt niet ondersteund. -blend.mode.1.not.allowed=Blend mode {1} niet toegelaten. -bookmark.end.tag.out.of.place=Bookmark end tag op verkeerde plaats. -both.colors.must.be.of.the.same.type=Beide kleuren moeten van het zelfde type zijn. -buffersize.1=bufferlengte {1} -can.only.push.back.one.byte=Werkt enkel met ��n byte ineens. -can.t.add.1.to.multicolumntext.with.complex.columns={1} kan niet toegevoegd worden aan een MultiColumnText met complexe kolommen -can.t.decode.pkcs7signeddata.object=Kan het PKCS7SignedData object niet decoderen -can.t.find.page.size.1=Kan de pagina afmetingen niet vinden {1} -can.t.find.signing.certificate.with.serial.1=Kan het signing certificate met serienummer {1} niet vinden -cannot.change.destination.of.external.link=De destination van een external link kan niet gewijzigd worden -cannot.handle.box.sizes.higher.than.2.32=Een box size groter dan 2^32 is niet mogelijk -cf.not.found.encryption=/CF niet gevonden (encryption) -codabar.must.have.at.least.a.start.and.stop.character=Codabar moet ten minste een start en stop karakter bevatten. -codabar.must.have.one.of.abcd.as.start.stop.character=Codabar must have one of 'ABCD' as start/stop character. -colors.are.not.allowed.in.uncolored.tile.patterns=Kleuren zijn niet toegelaten in ongekleurde patronen. -colorspace.calrgb.is.not.allowed=Colorspace CalRGB is niet toegelaten. -colorspace.rgb.is.not.allowed=Colorspace RGB is niet toegelaten. -column.coordinate.of.location.must.be.gt.eq.0.and.lt.nr.of.columns=Kolom coordinaat moet groter dan of gelijk zijn aan 0 en kleiner dan het aantal kolommen -columntext.go.with.simulate.eq.eq.false.and.text.eq.eq.null=ColumnText.go met simulate==false en text==null. -components.must.be.1.3.or.4=Componenten moeten 1, 3, of 4 zijn. -compression.jpeg.is.only.supported.with.a.single.strip.this.image.has.1.strips=Compressie JPEG wordt enkel ondersteund voor ��n enkele strip. Jouw JPEG heeft {1} strips. -content.can.not.be.added.to.a.pdfimportedpage=Er kan geen extra content toegevoegd worden aan een PdfImportedPage. -content.was.already.written.to.the.output=Er werd al inhoud naar de output gestuurd. -corrupted.png.file=Corrupt PNG bestand. -could.not.find.web.browser=Kon geen webbrowser vinden. -count.of.referred.to.segments.had.bad.value.in.header.for.segment.1.starting.at.2=Een aantal referred-to segmenten heeft een ongeldige waarde in de header voor segment {1} beginnend bij {2} -defaultcryptfilter.not.found.encryption=/DefaultCryptFilter niet gevonden (encryption) -destination.end.tag.out.of.place=Bestemming end tag op verkeerde plaats. -dictionary.key.is.not.a.name=De sleutel voor de Dictionary is geen naam. -dimensions.of.a.cell.are.attributed.automagically.see.the.faq=De afmetingen van een Cell worden automatisch toegekend. Zie de FAQ. -dimensions.of.a.cell.can.t.be.calculated.see.the.faq=De afmetingen van een Cell kunnen niet berekend worden. Zie de FAQ. -dimensions.of.a.table.can.t.be.calculated.see.the.faq=Dimensies van een Table object kunnen niet berekend worden. Zie de FAQ. -directory.number.too.large=Directory nummer te groot. -document.already.pre.closed=Het Document is als gesloten (preclosed). -element.not.allowed=Element niet toegelaten. -encryption.can.only.be.added.before.opening.the.document=Encryptie kan enkel bepaald worden voor het document geopend wordt. -eol.code.word.encountered.in.black.run=EOL code woord gevonden in Black run. -eol.code.word.encountered.in.white.run=EOL code woord gevonden in White run. -error.attempting.to.launch.web.browser=Fout bij het opstarten van de webbrowser. -error.expected.hex.character.and.not.char.thenextbyte.1=Fout: hexademicaal karakter verwacht in plaats van (char)theNextByte:{1} -error.expected.the.end.of.a.dictionary=Fout: einde van een dictionary verwacht. -error.in.attribute.processing=Fout bij verwerking attribuut -error.in.base64.code.reading.stream=Fout in de Base64 code reading stream. -error.parsing.cmap.beginbfchar.expected.cosstring.or.cosname.and.not.1=Fout bij het parsen van CMap beginbfchar, {COSString or COSName} verwacht in plaats van {1} -error.reading.objstm=Fout tijdens het lezen van ObjStm -error.reading.string=Fout bij het lezen van een string -error.with.jp.marker=Foute JP Marker -expected.ftyp.marker=FTYP Marker verwacht -expected.gt.for.tag.lt.1.gt=Karakter > verwacht voor tag: <{1}/> -expected.ihdr.marker=IHDR Marker verwacht -expected.jp.marker=JP Marker verwacht -expected.jp2h.marker=JP2H Marker verwacht -extra.samples.are.not.supported=Extra samples worden niet ondersteund. -failed.to.get.tsa.response.from.1=Slaagde er niet in een TSA antwoord te krijgen van '{1}' -fdf.header.not.found=FDF header niet gevonden. -field.flattening.is.not.supported.in.append.mode=Field flattening is niet ondersteund in append mode. -field.names.cannot.contain.a.dot=De naam van een veld mag geen punt bevatten. -file.header.flags.bits.2.7.not.0=file header vlaggen bits 2 tot 7 zijn niet 0 -file.header.idstring.not.good.at.byte.1=file header idstring is niet correct op byte {1} -file.is.not.a.valid.png=Het bestand is geen geldige PNG afbeelding. -file.position.0.cross.reference.entry.in.this.xref.subsection=Bestands positie 0 voor cross-reference entry in deze xref subsectie -first.scanline.must.be.1d.encoded=Eerste scanline moet 1D geencodeerd zijn. -font.1.with.2.encoding.is.not.a.cjk.font=Font '{1}' met encoding '{2}' is geen CJK font. -font.1.with.2.is.not.recognized=Font '{1}' met '{2}' werd niet herkend. -font.and.size.must.be.set.before.writing.any.text=Font en size moeten bepaald zijn vooraleer je tekst schrijft. -font.size.too.small.1=Font size te klein: {1} -fontfactoryimp.cannot.be.null=FontFactoryImp kan niet null zijn. -freetext.flattening.is.not.supported.in.append.mode=FreeText flattening is niet ondersteund in append mode. -getcell.at.illegal.index.1.max.is.2=getCell op ongeldige index:{1} maximum: {2} -getcell.at.illegal.index.1=getCell op ongeldige index : {1} -gif.signature.nor.found=Gif signature niet gevonden. -greaterthan.not.expected='>' op een onverwachte plaats -illegal.capacity.1=Ongeldige capaciteit: {1} -illegal.character.in.ascii85decode=Ongeldig karakter in ASCII85Decode. -illegal.character.in.asciihexdecode=Ongeldig karakter in ASCIIHexDecode. -illegal.length.in.ascii85decode=Ongeldige lengte in ASCII85Decode. -illegal.length.value=Ongeldige waarde voor de lengte. -illegal.load.1=Ongeldige load: {1} -illegal.p.value=Ongeldige waarde voor P. -illegal.paragraph.embedding.level.1=ongeldig embedding niveau paragraaf: {1} -illegal.r.value=Ongeldige waarde voor R. -illegal.type.value.at.1.2=ongeldige waarde voor type op {1}: {2} -illegal.v.value=Ongeldige waarde voor V. -illegal.value.for.predictor.in.tiff.file=Ongeldige waarde voor Predictor in TIFF file. -improperly.padded.base64.input=Ongeldig 'gepadde' Base64 input. -in.a.page.label.the.page.numbers.must.be.greater.or.equal.to.1=In een page label moeten de pagina nummers groter dan of gelijk aan 1 zijn. -in.codabar.start.stop.characters.are.only.allowed.at.the.extremes=In codabar worden start/stop karakters enkel toegelaten bij begin en einde van de string. -incomplete.palette=onvolledig palet -inconsistent.mapping=Inconsistente mapping. -inconsistent.writers.are.you.mixing.two.documents=Inconsistente writers. Ben je twee documenten aan het verhaspelen? -incorrect.segment.type.in.1=Foutief segment type in {1} -insertion.of.illegal.element.1=Invoeging van een ongeldig Element: {1} -inserttable.point.has.null.value=insertTable - punt bevat een null-waarde -inserttable.table.has.null.value=insertTable - tabel bevat een null-waarde -inserttable.wrong.columnposition.1.of.location.max.eq.2=insertTable -- verkeerde komom positie ({1}); maximum ={2} -insufficient.data=Involdoende data. -insufficient.length=Onvoldoende lengte. -internal.inconsistence=Interne inconsistentie. -inthashtableiterator=IntHashtableIterator -invalid.additional.action.type.1=Ongeldig 'additional action' type: {1} -invalid.ai.length.1=Ongeldige AI lengte: ({1}) -invalid.border.style=Ongeldige border style. -invalid.character.in.base64.data=Ongeldig karakter in de Base64 data. -invalid.code.encountered.while.decoding.2d.group.3.compressed.data=Ongeldige code gevonden tijdens het decoderen van 2D group 3 gecomprimeerde data. -invalid.code.encountered.while.decoding.2d.group.4.compressed.data=Ongeldige code gevonden tijdens het decoderen van 2D group 4 gecomprimeerde data. -invalid.code.encountered=Ongeldige code gevonden. -invalid.code.type=Ongeldig code type. -invalid.codeword.size=Ongeldige codeword lengte. -invalid.color.type=Ongeldig kleurtype. -invalid.cross.reference.entry.in.this.xref.subsection=Ongeldige cross-reference entry in deze xref subsectie -invalid.end.tag.1=Ongeldige end tag - {1} -invalid.generation.number=Ongeldig generation nummer. -invalid.http.response.1=Ongeldig HTTP antwoord: {1} -invalid.icc.profile=Ongeldig ICC profiel. -invalid.index.1=Ongeldige index: {1} -invalid.listtype.value=Ongeldige waarde voor listType. -invalid.magic.value.for.bmp.file=Ongeldige 'magic value' voor een BMP bestand. -invalid.named.action=Ongeldige named action. -invalid.object.number=Ongeldig object nummer. -invalid.page.additional.action.type.1=Ongeldig 'page additional action' type: {1} -invalid.page.number.1=Ongeldig pagina nummer: {1} -invalid.run.direction.1=Ongeldige run direction: {1} -invalid.status.1=Ongeldige status: {1} -invalid.tsa.1.response.code.2=Ongeldig TSA '{1}' antwoord, code {2} -invalid.type.was.passed.in.state.1=Ongeldig type gebruikt als state: {1} -invalid.use.of.a.pattern.a.template.was.expected=Ongeldig gebruik van een patroon. Er werd een template verwacht. -irregular.columns.are.not.supported.in.composite.mode=Onregelmatige kolommen zijn niet toegelaten in composite mode. -java.awt.image.fetch.aborted.or.errored=Ophalen van java.awt.Image afgebroken of misgelopen. -java.awt.image.interrupted.waiting.for.pixels=java.awt.Image onderbroken; aan het wachten op pixels! -last.linebreak.must.be.at.1=laatste lijnafbreking moet op {1} -layers.are.not.allowed=Layers zijn niet toegelaten. -layout.out.of.bounds=Layout buiten het grensbereik. -line.iterator.out.of.bounds=lijn iterator buiten het grensbereik. -linear.page.mode.can.only.be.called.with.a.single.parent=Linear page mode kan enkel gebruikt worden met een enkele parent. -lzw.flavour.not.supported=LZW variant niet ondersteund. -macrosegmentid.must.be.gt.eq.0=macroSegmentId moet groter zijn dan 0 -macrosegmentid.must.be.lt.macrosemgentcount=macroSegmentId moet kleiner zijn dan macroSemgentCount -macrosemgentcount.must.be.gt.0=macroSemgentCount moet groter zijn dan 0 -mapping.code.should.be.1.or.two.bytes.and.not.1=Mapping code moet uit 1 of 2 bytes bestaan, en niet uit {1} -missing.end.tag=Ontbrekende end tag -missing.endcharmetrics.in.1=Ontbrekende EndCharMetrics in {1} -missing.endfontmetrics.in.1=Ontbrekende EndFontMetrics in {1} -missing.endkernpairs.in.1=Ontbrekende EndKernPairs in {1} -missing.startcharmetrics.in.1=Ontbrekende StartCharMetrics in {1} -missing.tag.s.for.ojpeg.compression=Ontbrekende tag(s) voor OJPEG compressie. -multicolumntext.has.no.columns=MultiColumnText heeft geen kolommen -name.end.tag.out.of.place=Naam end tag op verkeerde plaats. -nested.tags.are.not.allowed=Geneste tags zijn niet toegelaten. -no.compatible.encryption.found=Geen compatibele encryptie gevonden -no.error.just.an.old.style.table=Geen fout, enkel een tabel 'oude stijl' -no.font.is.defined=Er is geen enkele font gedefinieerd. -no.glyphs.defined.for.type3.font=Geen gliefen gedefinieerd voor Type3 font -no.valid.column.line.found=Geen geldige kolomlijn gevonden. -no.valid.encryption.mode=Geen geldige encryption mode -not.a.placeable.windows.metafile=Geen placeable windows metafile -not.a.valid.jpeg2000.file=Geen geldig Jpeg2000 bestand -not.a.valid.pfm.file=Geen geldig PFM bestand. -not.a.valid.pkcs.7.object.not.a.sequence=Geen geldig PKCS#7 object - geen sequentie -not.a.valid.pkcs.7.object.not.signed.data=Geen geldig PKCS#7 object - niet gesigneerde data -not.all.annotations.could.be.added.to.the.document.the.document.doesn.t.have.enough.pages=Niet alle annotaties konden toegevoegd worden (het document had niet genoeg pagina's). -not.colorized.typed3.fonts.only.accept.mask.images=Kleurloze Type 3 fonts accepteren enkel mask images. -null.outpustream=OutpuStream null -number.of.entries.in.this.xref.subsection.not.found=Het aantal entries in deze xref subsectie niet gevonden -object.number.of.the.first.object.in.this.xref.subsection.not.found=Object number van het eerste object in deze xref subsectie niet gevonden -ocsp.status.is.revoked=OCSP status is revoked! -ocsp.status.is.unknown=OCSP Status is onbekend! -only.bmp.can.be.wrapped.in.wmf=Alleen een BMP kan in een WMF gewrapt worden. -only.bmp.png.wmf.gif.and.jpeg.images.are.supported.by.the.rtf.writer=Alleen BMP, PNG, WMF, GIF en JPEG afbeeldingen worden ondersteund door RtfWriter2 -only.javascript.actions.are.allowed=Alleen JavaScript acties zijn toegelaten. -only.one.of.artbox.or.trimbox.can.exist.in.the.page=Alleen een enkele ArtBox of TrimBox kan bestaan voor een zelfde pagina. -only.pdflayer.is.accepted=Alleen PdfLayer is toegelaten. -only.rgb.gray.and.cmyk.are.supported.as.alternative.color.spaces=Alleen RGB, Gray en CMYK worden ondersteund als alternatieve color spaces. -open.actions.by.name.are.not.supported=Open actions by name worden niet ondersteund. -operator.1.already.registered=Operator {1} was al geregistreerd -page.1.invalid.for.segment.2.starting.at.3=page {1} ongeldig voor segment {2} beginnend bij {3} -page.attribute.missing=Ontbrekend pagina attribuut. -page.not.found=Pagina niet gevonden. -page.reordering.requires.a.single.parent.in.the.page.tree.call.pdfwriter.setlinearmode.after.open=Pagina herschikking heeft een enkele parent nodig in de page tree. Gebruik PdfWriter.setLinearMode() na het openen van het document. -page.reordering.requires.an.array.with.the.same.size.as.the.number.of.pages=Pagina herschikking heeft een array nodig met een zelfde aantal elementen als het aantal pagina's. -page.reordering.requires.no.page.repetition.page.1.is.repeated=Pagina herschikking laat geen herhaling van pagina's toe. Pagina {1} werd herhaald. -page.reordering.requires.pages.between.1.and.1.found.2=Pagina herschikking gaat voor pagina's tussen 1 en {1}. Jij vraagt naar pagina {2}. -partial.form.flattening.is.not.supported.with.xfa.forms=Gedeeltelijke form flattening is niet ondersteund voor XFA formulieren. -pdf.header.not.found=PDF header niet gevonden. -pdf.startxref.not.found=PDF startxref niet gevonden. -pdfpcells.can.t.have.a.rowspan.gt.1=PdfPCells kunnen geen rowspan groter dan 1 hebben -pdfreader.not.opened.with.owner.password=PdfReader werd niet geopend met het 'owner password' -pdfx.conformance.can.only.be.set.before.opening.the.document=PDFX conformantie kan enkel bepaald worden voor het document geopend wordt. -planar.images.are.not.supported=Planar images worden niet ondersteund. -png.filter.unknown=onbekende PNG filter. -preclose.must.be.called.first=preClose() moet eerst gebeuren. -premature.end.in.1=Vroegtijdig einde van het bestand in {1} -premature.end.of.file=Vroegtijdig einde van het bestand. -premature.eof.while.reading.jpg=Vroegtijdige EOF tijdens het lezen van het JPG bestand. -rebuild.failed.1.original.message.2=Rebuild ging fout: {1}; Oorspronkelijke foutboodschap: {2} -rectanglereadonly.this.rectangle.is.read.only=RectangleReadOnly: dit Rectangle object is alleen-lezen. -reference.pointing.to.reference=Referentie die naar een referentie verwijst. -referring.to.widht.height.of.page.we.havent.seen.yet.1=verwijzing naar een breedte/hoogte van een pagina die we nog niet gezien hebben? {1} -remove.not.supported=remove() niet ondersteund. -reserve.incorrect.column.size=reserve - ongeldige kolom/grootte -resources.do.not.contain.extgstate.entry.unable.to.process.operator.1=De resources bevatten geen ExtGState entry. Het is onmogelijk om de operator {1} te verwerken -root.element.is.not.bookmark.1=Het root element is geen Bookmark: {1} -root.element.is.not.destination=Het root element is geen bestemming. -root.element.is.not.xfdf.1=Het root element is geen xfdf: {1} -rotation.must.be.a.multiple.of.90=De rotatie moet een veelvoud van 90 zijn. -row.coordinate.of.location.must.be.gt.eq.0=rij coordinaat moet groter dan of gelijk aan 0 zijn -scanline.must.begin.with.eol.code.word=Scanline moet beginnen met het EOL code woord. -separations.patterns.and.shadings.are.not.allowed.in.mk.dictionary=Separations, patterns en shadings zijn niet toegelaten in de MK dictionary. -setelement.position.already.taken=setElement - positie al in gebruik -start.marker.missing.in.1=Start marker ontbreekt in {1} -startxref.is.not.followed.by.a.number=startxref wordt niet gevolgd door een nummer. -startxref.not.found=startxref niet gevonden. -stdcf.not.found.encryption=/StdCF niet gevonden (encryption) -stream.could.not.be.compressed.filter.is.not.a.name.or.array=Stream kon niet gecomprimeerd worden: de filter is geen naam of array. -table.1.does.not.exist.in.2=Tabel '{1}' bestaat niet in {2} -tag.1.not.allowed=Tag {1} niet toegelaten. -tagging.must.be.set.before.opening.the.document=Tagging moet bepaald worden voor het document geopend is. -text.cannot.be.null=Text mag niet null zijn. -the.array.must.contain.string.or.pdfannotation=De array moet een String of een PdfAnnotation bevatten. -the.byte.array.is.not.a.recognized.imageformat=De byte array bevat geen gekend afbeeldingsformaat. -the.ccitt.compression.type.must.be.ccittg4.ccittg3.1d.or.ccittg3.2d=Het CCITT compressie type moet CCITTG4, CCITTG3_1D of CCITTG3_2D zijn -the.char.1.doesn.t.belong.in.this.type3.font=Het karakter {1} hoort niet thuis in deze Type3 font -the.char.1.is.not.defined.in.a.type3.font=Het karakter {1} is niet gedefinieerd in de Type3 font -the.character.1.is.illegal.in.codabar=Het karakter '{1}' is ongeldig in codabar. -the.character.1.is.illegal.in.code.39.extended=Het karakter '{1}' is ongeldig in code 39 extended. -the.character.1.is.illegal.in.code.39=Het karakter '{1}' is ongeldig in code 39. -the.cmap.1.does.not.exist.as.a.resource=De cmap {1} bestaat niet als bron. -the.cmap.1.was.not.found=De Cmap {1} werd niet gevonden. -the.compression.1.is.not.supported=Compressie {1} wordt niet ondersteund. -the.document.has.been.closed.you.can.t.add.any.elements=Het document is afgesloten; je kan geen Element objecten meer toevoegen. -the.document.has.no.pages=Het document heeft geen pagina's. -the.document.is.not.open.yet.you.can.only.add.meta.information=Het document is nog niet open; je kan enkel metagegevens toevoegen. -the.document.is.not.open=Het document is niet open. -the.document.is.open.you.can.only.add.elements.with.content=Het document is open; je kan enkel Element objecten met inhoud plaatsen. -the.document.must.be.open.to.import.rtf.documents=Het document moet geopend zijn om RTF documenten te kunnen importeren. -the.document.must.be.open.to.import.rtf.fragments=Het document moet geopend zijn om RTF fragmenten te kunnen importeren. -the.document.was.reused=Het document werd herbruikt. -the.export.and.the.display.array.must.have.the.same.size=De export en display array moeten uit een zelfde aantal elementen bestaan. -the.field.1.already.exists=Het veld {1} bestaat al. -the.field.1.does.not.exist=Het veld {1} bestaat niet. -the.field.1.is.not.a.signature.field=Het veld {1} is geen signature veld. -the.file.does.not.contain.any.valid.image=Het bestand bevat geen geldige afbeelding. -the.filter.1.is.not.supported=De filter {1} wordt niet ondersteund. -the.font.index.for.1.must.be.between.0.and.2.it.was.3=De font index voor {1} moet tussen 0 en {2} liggen. Het was {3}. -the.font.index.for.1.must.be.positive=De font index voor {1} moet positief zijn. -the.image.mask.is.not.a.mask.did.you.do.makemask=De image mask is geen mask. Heb je makeMask() gebruikt? -the.image.must.have.absolute.positioning=Het image object moet een absolute positie hebben. -the.key.1.didn.t.reserve.space.in.preclose=De sleutel {1} reserveerde geen plaats in preClose(). -the.key.1.is.too.big.is.2.reserved.3=De sleutel {1} is te lang. Hij is {2}, terwijl er maar {3} gereserveerd werd -the.layer.1.already.has.a.parent=De layer '{1}' heeft al een parent. -the.matrix.size.must.be.6=De matrix moet uit 6 elementen bestaan. -the.name.1.is.too.long.2.characters=De naam '{1}' is te lang ({2} karakters). -the.new.size.must.be.positive.and.lt.eq.of.the.current.size=De nieuwe waarde moet positief zijn en kleiner dan of gelijk aan de huidige waarde -the.number.of.booleans.in.this.array.doesn.t.correspond.with.the.number.of.fields=Het aantal booleans in deze array stemt niet overeen met het aantal velden. -the.number.of.columns.in.pdfptable.constructor.must.be.greater.than.zero=Het aantal kolommen in de PdfPTable constructor moet groter zijn dan nul. -the.original.document.was.reused.read.it.again.from.file=Het originele document werd herbruikt. Lees het opnieuw in van het bestand. -the.page.number.must.be.gt.eq.1=Het paginanummer moet groter dan of gelijk zijn aan 1. -the.parent.has.already.another.function=De parent heeft al een andere functie. -the.photometric.1.is.not.supported=De photometric {1} wordt niet ondersteund. -the.resource.cjkencodings.properties.does.not.contain.the.encoding.1=Het bronbestand cjkencodings.properties bevat de encoding {1} niet -the.smask.key.is.not.allowed.in.images=De /SMask key is niet toegelaten in afbeeldingen. -the.spot.color.must.be.the.same.only.the.tint.can.vary=De spot color moet het zelfde zijn, alleen de tint mag varieren. -the.stack.is.empty=De stack is leeg. -the.structure.has.kids=De structuur heeft substructuren (kids). -the.table.width.must.be.greater.than.zero=De breedte van de tabel moet groter zijn dan nul. -the.template.can.not.be.null=De template mag niet null zijn. -the.text.is.too.big=De tekst is te lang. -the.text.length.must.be.even=de lengte van de tekst mag niet oneven zijn. -the.two.barcodes.must.be.composed.externally=De twee barcodes moet extern samengesteld worden. -the.update.dictionary.has.less.keys.than.required=De update dictionary heeft minder sleutels dan noodzakelijk is. -the.url.of.the.image.is.missing=De URL van de afbeelding ontbreekt. -the.value.has.to.be.true.of.false.instead.of.1=De waarde moet 'true' of 'false' zijn, in plaats van '{1}'. -the.width.cannot.be.set=De breedte kan niet gedefinieerd worden. -the.widths.array.in.pdfptable.constructor.can.not.be.null=De array met de breedtes in de PdfPTable constructor kan niet null zijn. -the.widths.array.in.pdfptable.constructor.can.not.have.zero.length=De array met de breedtes in de PdfPTable constructor moet minstens een element hebben. -the.writer.in.pdfcontentbyte.is.null=De writer in PdfContentByte is null. -there.are.illegal.characters.for.barcode.128.in.1=Er zitten ongeldige karakters voor barcode 128 in '{1}'. -this.acrofields.instance.is.read.only=Deze instantie van AcroFields is read only. -this.image.can.not.be.an.image.mask=Deze afbeelding kan geen image mask zijn. -this.largeelement.has.already.been.added.to.the.document=Dit LargeElement object werd al toegevoegd aan het Document. -this.page.cannot.be.replaced.new.content.was.already.added=Deze pagina kan niet vervangen worden: nieuwe inhoud werd al toegevoegd -this.pkcs.7.object.has.multiple.signerinfos.only.one.is.supported.at.this.time=Dit PKCS#7 object heeft meerdere SignerInfos - slechts een enkel is toegelaten -tiff.5.0.style.lzw.codes.are.not.supported=TIFF 5.0-achtige LZW codes worden niet ondersteund. -tiff.fill.order.tag.must.be.either.1.or.2=TIFF_FILL_ORDER tag moet ofwel 1, ofwel 2 zijn. -tiles.are.not.supported=Tiles worden niet ondersteund. -title.cannot.be.null=De titel kan niet null zijn. -token.obj.expected=Token 'obj' verwacht. -trailer.not.found=trailer niet gevonden. -transparency.is.not.allowed.ca.eq.1=Transparentie is niet toegelaten: /ca = {1} -transparency.length.must.be.equal.to.2.with.ccitt.images=De transparency lengte moet gelijk zijn aan 2 voor CCITT afbeeldingen. -transparency.length.must.be.equal.to.componentes.2=De transparentie lengte moet gelijk zijn aan (components * 2) -trying.to.create.a.table.without.rows=Je probeert een tabel zonder rijen te maken. -tsa.1.failed.to.return.time.stamp.token.2=TSA '{1}' slaagde er niet in een time stamp token terug te geven: {2} -two.byte.arrays.are.needed.if.the.type1.font.is.embedded=Er zijn twee byte arrays nodig als de Type1 font ingebed wordt. -type3.font.used.with.the.wrong.pdfwriter=Type3 font gebruikt met het verkeerde PdfWriter object -types.is.null=types is null -unbalanced.begin.end.marked.content.operators=Ongebalanceerde begin/einde operatoren voor marked content. -unbalanced.begin.end.text.operators=Ongebalanceerde begin/einde operatoren voor tekst. -unbalanced.layer.operators=Ongebalanceerde operatoren voor layers. -unbalanced.marked.content.operators=Ongebalanceerde marked content operatoren. -unbalanced.save.restore.state.operators=Ongebalanceerde save/restore state operatoren. -unexpected.end.of.file=Onverwacht einde van het bestand. -unexpected.eof=Onverwachte EOF -unexpected.gt.gt=Onverwachte '>>' -unexpected.close.bracket=Onverwachter ']' -unknown.color.format.must.be.rgb.or.rrggbb=Onbekend formaat voor kleur. Moet #RGB of #RRGGBB zijn -unknown.encryption.type.r.eq.1=Onbekend encryptie type R = {1} -unknown.encryption.type.v.eq.1=Onbekend encryptie type V = {1} -unknown.filter.1=Onbekende filter: {1} -unknown.hash.algorithm.1=Onbekend Hash Algoritme {1} -unknown.key.algorithm.1=Onbekend Key Algoritme {1} -unknown.object.at.k.1=Onbekend object voor /K {1} -unknown=onbekend -unsupported.box.size.eq.eq.0=Ongeldige box size == 0 -unsupported.in.this.context.use.pdfstamper.addannotation=Niet ondersteund in deze context. Gebruik PdfStamper.addAnnotation() -use.pdfstamper.getundercontent.or.pdfstamper.getovercontent=Gebruik PdfStamper.getUnderContent() of PdfStamper.getOverContent() -use.pdfstamper.setthumbnail=Gebruik PdfStamper.setThumbnail(). -use.setpageaction.pdfname.actiontype.pdfaction.action.int.page=Gebruik setPageAction(PdfName actionType, PdfAction action, int page) -userunit.should.be.a.value.between.1.and.75000=UserUnit moet een waarde zijn tussen 1 en 75000. -verticaltext.go.with.simulate.eq.eq.false.and.text.eq.eq.null=VerticalText.go met simulate==false en text==null. -while.removing.wmf.placeable.header=tijdens het verwijderen van een wmf positioneerbare header -writelength.can.only.be.called.after.output.of.the.stream.body=writeLength() kan alleen opgeroepen worden na output van de stream body. -writelength.can.only.be.called.in.a.contructed.pdfstream.inputstream.pdfwriter=writeLength() kan alleen opgeroepen worden in een aldus aangemaakte stream: PdfStream(InputStream,PdfWriter). -wrong.number.of.columns=Verkeerd aantal kolommen. -xref.infinite.loop=Er is een eindeloos lus gedetecteerd in de xref-tabel. -xref.subsection.not.found=xref subsectie niet gevonden -xstep.or.ystep.can.not.be.zero=XStep of YStep kan niet nul zijn. -you.can.only.add.a.writer.to.a.pdfdocument.once=Je kan een writer slecht een enkele keer toevoegen aan een PdfDocument. -you.can.only.add.cells.to.rows.no.objects.of.type.1=Je kan enkel cellen toevoegen aan rijen, geen objecten van type {1} -you.can.only.add.objects.that.implement.the.element.interface=Enkel objecten die de Element interface implementeren kunnen toegevoegd worden. -you.can.t.add.a.1.to.a.section=Je kan geen {1} toevoegen aan een Section. -you.can.t.add.an.element.of.type.1.to.a.simplecell=Je kan geen element van type {1} toevoegen aan een SimpleCell. -you.can.t.add.cells.to.a.table.directly.add.them.to.a.row.first=Je kan geen cellen toevoegen aan een tabel, zonder ze eerst aan een rij toe te voegen. -you.can.t.add.listitems.rows.or.cells.to.a.cell=Je kan geen lijst items, rijen of cellen toevoegen aan een cell. -you.can.t.add.one.row.to.another.row=Je kan rijen niet aan rijen toevoegen. -you.can.t.have.1.pages.on.one.page.minimum.2.maximum.8=Je kan geen {1} pagina's op ��n blad plaatsen (minimum 2; maximum 8). -you.can.t.set.the.initial.leading.if.the.document.is.already.open=Je kan geen initial leading bepalen als het document al open is. -you.can.t.split.this.document.at.page.1.there.is.no.such.page=Je kan dit document niet splitsen op pagina {1}; Die pagina bestaat niet. -you.can.t.translate.a.negative.number.into.an.alphabetical.value=Je kan een negatieve waarde niet omzetten naar een alfabetische waarde. -you.have.to.consolidate.the.named.destinations.of.your.reader=Je moet de named destinations van je reader object consolideren. -you.have.to.define.a.boolean.array.for.this.collection.sort.dictionary=Je moet een boolean array bepalen voor deze collection sort dictionary. -you.have.used.the.wrong.constructor.for.this.fieldpositioningevents.class=Je gebruikte de verkeerde constructor van de FieldPositioningEvents class. -you.must.set.a.value.before.adding.a.prefix=Je moet een waarde toevoegen vooraleer je een prefix toevoegt. -you.need.a.single.boolean.for.this.collection.sort.dictionary=Je hebt een enkele boolean nodig voor deze collection sort dictionary. diff --git a/openpdf/src/main/java/com/lowagie/text/error_messages/pt.lng b/openpdf/src/main/java/com/lowagie/text/error_messages/pt.lng deleted file mode 100644 index 56cfd7d2b..000000000 --- a/openpdf/src/main/java/com/lowagie/text/error_messages/pt.lng +++ /dev/null @@ -1,8 +0,0 @@ -# Portuguese - Portugal -1.at.file.pointer.2={1} na posição de ficheiro {2} -error.reading.string=Erro na leitura de string. -fdf.header.not.found=Início de FDF não encontrado. -greaterthan.not.expected='>' inesperado -pdf.header.not.found=Início de PDF não encontrado. -pdf.startxref.not.found=startxref de PDF não encontrado. -xref.infinite.loop=Um loop infinito foi detectado na tabela xref. diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java index 790c4e6e6..011bd9140 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java @@ -95,10 +95,9 @@ /** * A DocWriter class for PDF. - *

- * When this PdfWriter is added - * to a certain PdfDocument, the PDF representation of every Element - * added to this Document will be written to the outputstream.

+ *

+ * When this PdfWriter is added to a certain PdfDocument, the PDF representation of every + * Element added to this Document will be written to the outputstream.

*/ public class PdfWriter extends DocWriter implements @@ -113,157 +112,40 @@ public class PdfWriter extends DocWriter implements /** * The highest generation number possible. - * @since iText 2.1.6 + * + * @since iText 2.1.6 */ public static final int GENERATION_MAX = 65535; - + // INNER CLASSES /** * This class generates the structure of a PDF document. - *

- * This class covers the third section of Chapter 5 in the 'Portable Document Format - * Reference Manual version 1.3' (page 55-60). It contains the body of a PDF document - * (section 5.14) and it can also generate a Cross-reference Table (section 5.15). + *

+ * This class covers the third section of Chapter 5 in the 'Portable Document Format Reference Manual version 1.3' + * (page 55-60). It contains the body of a PDF document (section 5.14) and it can also generate a Cross-reference + * Table (section 5.15). * - * @see PdfWriter - * @see PdfObject - * @see PdfIndirectObject + * @see PdfWriter + * @see PdfObject + * @see PdfIndirectObject */ - public static class PdfBody { - // inner classes - - /** - * PdfCrossReference is an entry in the PDF Cross-Reference table. - */ - - public static class PdfCrossReference implements Comparable { - - /** - * String template for cross-reference entry PDF representation. - * - * @see Formatter - */ - private static final String CROSS_REFERENCE_ENTRY_FORMAT = "%010d %05d %c \n"; - - // membervariables - private int type; - - /** Byte offset in the PDF file. */ - private long offset; - - private int refnum; - /** generation of the object. */ - private int generation; - - // constructors - /** - * Constructs a cross-reference element for a PdfIndirectObject. - * @param refnum the reference number - * @param offset byte offset of the object - * @param generation generation number of the object - */ - - public PdfCrossReference(int refnum, long offset, int generation) { - type = 0; - this.offset = offset; - this.refnum = refnum; - this.generation = generation; - } - - /** - * Constructs a cross-reference element for a PdfIndirectObject. - * @param refnum the reference number - * @param offset byte offset of the object - */ - - public PdfCrossReference(int refnum, long offset) { - type = 1; - this.offset = offset; - this.refnum = refnum; - this.generation = 0; - } - - public PdfCrossReference(int type, int refnum, long offset, int generation) { - this.type = type; - this.offset = offset; - this.refnum = refnum; - this.generation = generation; - } - - int getRefnum() { - return refnum; - } - - /** - * Writes PDF representation of cross-reference entry to passed output stream. - * - * @param os Output stream this entry to write to - * @throws IOException If any I/O error occurs - */ - public void toPdf(OutputStream os) throws IOException { - // TODO: are generation number and 'In use' keyword bound that way? - final char inUse = generation == GENERATION_MAX ? 'f' : 'n'; - os.write(getISOBytes(String.format(CROSS_REFERENCE_ENTRY_FORMAT, offset, generation, inUse))); - } - - /** - * Writes PDF syntax to the OutputStream - * @param midSize the mid size - * @param os the OutputStream - * @throws IOException on error - */ - public void toPdf(int midSize, OutputStream os) throws IOException { - os.write((byte)type); - while (--midSize >= 0) - os.write((byte)((offset >>> (8 * midSize)) & 0xff)); - os.write((byte)((generation >>> 8) & 0xff)); - os.write((byte)(generation & 0xff)); - } - - /** - * Compares current {@link PdfCrossReference entry} with passed {@code reference} by PDF object number. - */ - @Override - public int compareTo(final PdfCrossReference reference) { - return Integer.compare(refnum, reference.refnum); - } - - /** - * Checks if two entries are equal if their PDF object numbers are equal. - * - * @param obj Another cross-reference entry - * @return If null, not of type {@link PdfCrossReference} or object numbers are not equal, - * returns false; true otherwise - */ - @Override - public boolean equals(Object obj) { - if (!(obj instanceof PdfCrossReference)) { - return false; - } - - final PdfCrossReference other = (PdfCrossReference)obj; - return refnum == other.refnum; - } - - @Override - public int hashCode() { - return refnum; - } - } - private static final int OBJSINSTREAM = 200; // membervariables - /** array containing the cross-reference table of the normal objects. */ - private TreeSet xrefs; + /** + * array containing the cross-reference table of the normal objects. + */ + private final TreeSet xrefs; private int refnum; - /** the current byte position in the body. */ + /** + * the current byte position in the body. + */ private long position; - private PdfWriter writer; + private final PdfWriter writer; private ByteBuffer index; private ByteBuffer streamObjects; private int currentObjNum; @@ -273,6 +155,7 @@ public int hashCode() { /** * Constructs a new PdfBody. + * * @param writer */ PdfBody(PdfWriter writer) { @@ -290,8 +173,9 @@ void setRefnum(int refnum) { } private PdfWriter.PdfBody.PdfCrossReference addToObjStm(PdfObject obj, int nObj) throws IOException { - if (numObj >= OBJSINSTREAM) + if (numObj >= OBJSINSTREAM) { flushObjStm(); + } if (index == null) { index = new ByteBuffer(); streamObjects = new ByteBuffer(); @@ -310,8 +194,9 @@ private PdfWriter.PdfBody.PdfCrossReference addToObjStm(PdfObject obj, int nObj) } private void flushObjStm() throws IOException { - if (numObj == 0) + if (numObj == 0) { return; + } int first = index.size(); index.append(streamObjects); PdfStream stream = new PdfStream(index.toByteArray()); @@ -327,18 +212,15 @@ private void flushObjStm() throws IOException { /** * Adds a PdfObject to the body. - *

- * This methods creates a PdfIndirectObject with a - * certain number, containing the given PdfObject. - * It also adds a PdfCrossReference for this object - * to an ArrayList that will be used to build the - * Cross-reference Table. + *

+ * This methods creates a PdfIndirectObject with a certain number, containing the given + * PdfObject. It also adds a PdfCrossReference for this object to an + * ArrayList that will be used to build the Cross-reference Table. * - * @param object a PdfObject - * @return a PdfIndirectObject + * @param object a PdfObject + * @return a PdfIndirectObject * @throws IOException */ - PdfIndirectObject add(PdfObject object) throws IOException { return add(object, getIndirectReferenceNumber()); } @@ -349,9 +231,9 @@ PdfIndirectObject add(PdfObject object, boolean inObjStm) throws IOException { /** * Gets a PdfIndirectReference for an object that will be created in the future. + * * @return a PdfIndirectReference */ - PdfIndirectReference getPdfIndirectReference() { return new PdfIndirectReference(0, getIndirectReferenceNumber()); } @@ -363,21 +245,18 @@ int getIndirectReferenceNumber() { } /** - * Adds a PdfObject to the body given an already existing - * PdfIndirectReference. - *

+ * Adds a PdfObject to the body given an already existing PdfIndirectReference. + *

* This methods creates a PdfIndirectObject with the number given by * ref, containing the given PdfObject. - * It also adds a PdfCrossReference for this object - * to an ArrayList that will be used to build the - * Cross-reference Table. + * It also adds a PdfCrossReference for this object to an ArrayList that will be used + * to build the Cross-reference Table. * - * @param object a PdfObject - * @param ref a PdfIndirectReference - * @return a PdfIndirectObject + * @param object a PdfObject + * @param ref a PdfIndirectReference + * @return a PdfIndirectObject * @throws IOException */ - PdfIndirectObject add(PdfObject object, PdfIndirectReference ref) throws IOException { return add(object, ref.getNumber()); } @@ -399,8 +278,7 @@ PdfIndirectObject add(PdfObject object, int refNumber, boolean inObjStm) throws xrefs.add(pxref); } return indirect; - } - else { + } else { PdfIndirectObject indirect = new PdfIndirectObject(refNumber, object, writer); PdfCrossReference pxref = new PdfCrossReference(refNumber, position); if (!xrefs.add(pxref)) { @@ -416,9 +294,8 @@ PdfIndirectObject add(PdfObject object, int refNumber, boolean inObjStm) throws /** * Returns the offset of the Cross-Reference table. * - * @return an offset + * @return an offset */ - long offset() { return position; } @@ -426,15 +303,15 @@ long offset() { /** * Returns the total number of objects contained in the CrossReferenceTable of this Body. * - * @return a number of objects + * @return a number of objects */ - int size() { return Math.max((xrefs.last()).getRefnum() + 1, refnum); } /** * Returns the CrossReferenceTable of the Body. + * * @param os * @param root * @param info @@ -444,7 +321,8 @@ int size() { * @throws IOException */ - void writeCrossReferenceTable(OutputStream os, PdfIndirectReference root, PdfIndirectReference info, PdfIndirectReference encryption, PdfObject fileID, int prevxref) throws IOException { + void writeCrossReferenceTable(OutputStream os, PdfIndirectReference root, PdfIndirectReference info, + PdfIndirectReference encryption, PdfObject fileID, int prevxref) throws IOException { int refNumber = 0; // Old-style xref tables limit object offsets to 10 digits boolean useNewXrefFormat = writer.isFullCompression() || position > 9_999_999_999L; @@ -459,9 +337,9 @@ void writeCrossReferenceTable(OutputStream os, PdfIndirectReference root, PdfInd ArrayList sections = new ArrayList<>(); for (PdfCrossReference xref1 : xrefs) { entry = xref1; - if (first + len == entry.getRefnum()) + if (first + len == entry.getRefnum()) { ++len; - else { + } else { sections.add(first); sections.add(len); first = entry.getRefnum(); @@ -480,21 +358,21 @@ void writeCrossReferenceTable(OutputStream os, PdfIndirectReference root, PdfInd entry.toPdf(mid, buf); } PdfStream xr = new PdfStream(buf.toByteArray()); - buf = null; xr.flateCompress(writer.getCompressionLevel()); xr.putAll(trailer); xr.put(PdfName.W, new PdfArray(new int[]{1, mid, 2})); xr.put(PdfName.TYPE, PdfName.XREF); PdfArray idx = new PdfArray(); - for (Integer section : sections) idx.add(new PdfNumber(section)); + for (Integer section : sections) { + idx.add(new PdfNumber(section)); + } xr.put(PdfName.INDEX, idx); PdfEncryption enc = writer.crypto; writer.crypto = null; PdfIndirectObject indirect = new PdfIndirectObject(refNumber, xr, writer); indirect.writeTo(writer.getOs()); writer.crypto = enc; - } - else { + } else { os.write(getISOBytes("xref\n")); Iterator i = xrefs.iterator(); for (int k = 0; k < sections.size(); k += 2) { @@ -513,13 +391,140 @@ void writeCrossReferenceTable(OutputStream os, PdfIndirectReference root, PdfInd trailer.toPdf(writer, os); } } + + // inner classes + + /** + * PdfCrossReference is an entry in the PDF Cross-Reference table. + */ + public static class PdfCrossReference implements Comparable { + + /** + * String template for cross-reference entry PDF representation. + * + * @see Formatter + */ + private static final String CROSS_REFERENCE_ENTRY_FORMAT = "%010d %05d %c \n"; + + // membervariables + private final int type; + + /** + * Byte offset in the PDF file. + */ + private final long offset; + + private final int refnum; + /** + * generation of the object. + */ + private final int generation; + + // constructors + + /** + * Constructs a cross-reference element for a PdfIndirectObject. + * + * @param refnum the reference number + * @param offset byte offset of the object + * @param generation generation number of the object + */ + public PdfCrossReference(int refnum, long offset, int generation) { + type = 0; + this.offset = offset; + this.refnum = refnum; + this.generation = generation; + } + + /** + * Constructs a cross-reference element for a PdfIndirectObject. + * + * @param refnum the reference number + * @param offset byte offset of the object + */ + public PdfCrossReference(int refnum, long offset) { + type = 1; + this.offset = offset; + this.refnum = refnum; + this.generation = 0; + } + + public PdfCrossReference(int type, int refnum, long offset, int generation) { + this.type = type; + this.offset = offset; + this.refnum = refnum; + this.generation = generation; + } + + int getRefnum() { + return refnum; + } + + /** + * Writes PDF representation of cross-reference entry to passed output stream. + * + * @param os Output stream this entry to write to + * @throws IOException If any I/O error occurs + */ + public void toPdf(OutputStream os) throws IOException { + // TODO: are generation number and 'In use' keyword bound that way? + final char inUse = generation == GENERATION_MAX ? 'f' : 'n'; + os.write(getISOBytes(String.format(CROSS_REFERENCE_ENTRY_FORMAT, offset, generation, inUse))); + } + + /** + * Writes PDF syntax to the OutputStream + * + * @param midSize the mid size + * @param os the OutputStream + * @throws IOException on error + */ + public void toPdf(int midSize, OutputStream os) throws IOException { + os.write((byte) type); + int thisMidSize = midSize; + while (--thisMidSize >= 0) { + os.write((byte) ((offset >>> (8 * thisMidSize)) & 0xff)); + } + os.write((byte) ((generation >>> 8) & 0xff)); + os.write((byte) (generation & 0xff)); + } + + /** + * Compares current {@link PdfCrossReference entry} with passed {@code reference} by PDF object number. + */ + @Override + public int compareTo(final PdfCrossReference reference) { + return Integer.compare(refnum, reference.refnum); + } + + /** + * Checks if two entries are equal if their PDF object numbers are equal. + * + * @param obj Another cross-reference entry + * @return If null, not of type {@link PdfCrossReference} or object numbers are not equal, returns false; + * true otherwise + */ + @Override + public boolean equals(Object obj) { + if (!(obj instanceof PdfCrossReference other)) { + return false; + } + + return refnum == other.refnum; + } + + @Override + public int hashCode() { + return refnum; + } + } } /** * PdfTrailer is the PDF Trailer object. - *

- * This object is described in the 'Portable Document Format Reference Manual version 1.3' - * section 5.16 (page 59-60). + *

+ * This object is described in the 'Portable Document Format Reference Manual version 1.3' section 5.16 (page + * 59-60). */ static class PdfTrailer extends PdfDictionary { @@ -529,34 +534,40 @@ static class PdfTrailer extends PdfDictionary { /** * Constructs a PDF-Trailer. * - * @param size the number of entries in the PdfCrossReferenceTable - * @param root an indirect reference to the root of the PDF document - * @param info an indirect reference to the info object of the PDF document + * @param size the number of entries in the PdfCrossReferenceTable + * @param root an indirect reference to the root of the PDF document + * @param info an indirect reference to the info object of the PDF document * @param encryption * @param fileID * @param prevxref */ - PdfTrailer(int size, PdfIndirectReference root, PdfIndirectReference info, PdfIndirectReference encryption, PdfObject fileID, int prevxref) { + PdfTrailer(int size, PdfIndirectReference root, PdfIndirectReference info, PdfIndirectReference encryption, + PdfObject fileID, int prevxref) { put(PdfName.SIZE, new PdfNumber(size)); put(PdfName.ROOT, root); if (info != null) { put(PdfName.INFO, info); } - if (encryption != null) + if (encryption != null) { put(PdfName.ENCRYPT, encryption); - if (fileID != null) + } + if (fileID != null) { put(PdfName.ID, fileID); - if (prevxref > 0) + } + if (prevxref > 0) { put(PdfName.PREV, new PdfNumber(prevxref)); + } } /** * Returns the PDF representation of this PdfObject. + * * @param writer * @param os * @throws IOException */ + @Override public void toPdf(PdfWriter writer, OutputStream os) throws IOException { os.write(getISOBytes("trailer\n")); super.toPdf(null, os); @@ -576,12 +587,12 @@ protected PdfWriter() { /** * Constructs a PdfWriter. - *

+ *

* Remark: a PdfWriter can only be constructed by calling the method * getInstance(Document document, OutputStream os). * - * @param document The PdfDocument that has to be written - * @param os The OutputStream the writer has to write to. + * @param document The PdfDocument that has to be written + * @param os The OutputStream the writer has to write to. */ protected PdfWriter(PdfDocument document, OutputStream os) { @@ -594,15 +605,14 @@ protected PdfWriter(PdfDocument document, OutputStream os) { /** * Use this method to get an instance of the PdfWriter. * - * @param document The Document that has to be written - * @param os The OutputStream the writer has to write to. - * @return a new PdfWriter - * - * @throws DocumentException on error + * @param document The Document that has to be written + * @param os The OutputStream the writer has to write to. + * @return a new PdfWriter + * @throws DocumentException on error */ public static PdfWriter getInstance(Document document, OutputStream os) - throws DocumentException { + throws DocumentException { PdfDocument pdf = new PdfDocument(); pdf.setTextRenderingOptions(document.getTextRenderingOptions()); document.addDocListener(pdf); @@ -614,15 +624,15 @@ public static PdfWriter getInstance(Document document, OutputStream os) /** * Use this method to get an instance of the PdfWriter. * - * @return a new PdfWriter * @param document The Document that has to be written - * @param os The OutputStream the writer has to write to. + * @param os The OutputStream the writer has to write to. * @param listener A DocListener to pass to the PdfDocument. + * @return a new PdfWriter * @throws DocumentException on error */ public static PdfWriter getInstance(Document document, OutputStream os, DocListener listener) - throws DocumentException { + throws DocumentException { PdfDocument pdf = new PdfDocument(); pdf.setTextRenderingOptions(document.getTextRenderingOptions()); pdf.addDocListener(listener); @@ -634,11 +644,14 @@ public static PdfWriter getInstance(Document document, OutputStream os, DocListe // the PdfDocument instance - /** the pdfdocument object. */ + /** + * the pdfdocument object. + */ protected PdfDocument pdf; /** * Gets the PdfDocument associated with this writer. + * * @return the PdfDocument */ @@ -647,8 +660,9 @@ PdfDocument getPdfDocument() { } /** - * Use this method to get the info dictionary if you want to - * change it directly (add keys and values to the info dictionary). + * Use this method to get the info dictionary if you want to change it directly (add keys and values to the info + * dictionary). + * * @return the info dictionary */ public PdfDictionary getInfo() { @@ -657,9 +671,9 @@ public PdfDictionary getInfo() { /** * Use this method to get the current vertical page position. - * @param ensureNewLine Tells whether a new line shall be enforced. This may cause side effects - * for elements that do not terminate the lines they've started because those lines will get - * terminated. + * + * @param ensureNewLine Tells whether a new line shall be enforced. This may cause side effects for elements that do + * not terminate the lines they've started because those lines will get terminated. * @return The current vertical page position. */ public float getVerticalPosition(boolean ensureNewLine) { @@ -667,64 +681,71 @@ public float getVerticalPosition(boolean ensureNewLine) { } /** - * Sets the initial leading for the PDF document. - * This has to be done before the document is opened. - * @param leading the initial leading - * @since 2.1.6 - * @throws DocumentException if you try setting the leading after the document was opened. + * Sets the initial leading for the PDF document. This has to be done before the document is opened. + * + * @param leading the initial leading + * @throws DocumentException if you try setting the leading after the document was opened. + * @since 2.1.6 */ public void setInitialLeading(float leading) throws DocumentException { - if (open) - throw new DocumentException(MessageLocalization.getComposedMessage("you.can.t.set.the.initial.leading.if.the.document.is.already.open")); + if (open) { + throw new DocumentException(MessageLocalization.getComposedMessage( + "you.can.t.set.the.initial.leading.if.the.document.is.already.open")); + } pdf.setLeading(leading); } - + // the PdfDirectContentByte instances -/* - * You should see Direct Content as a canvas on which you can draw - * graphics and text. One canvas goes on top of the page (getDirectContent), - * the other goes underneath (getDirectContentUnder). - * You can always the same object throughout your document, - * even if you have moved to a new page. Whatever you add on - * the canvas will be displayed on top or under the current page. - */ + /* + * You should see Direct Content as a canvas on which you can draw + * graphics and text. One canvas goes on top of the page (getDirectContent), + * the other goes underneath (getDirectContentUnder). + * You can always the same object throughout your document, + * even if you have moved to a new page. Whatever you add on + * the canvas will be displayed on top or under the current page. + */ - /** The direct content in this document. */ + /** + * The direct content in this document. + */ protected PdfContentByte directContent; - /** The direct content under in this document. */ + /** + * The direct content under in this document. + */ protected PdfContentByte directContentUnder; /** - * Use this method to get the direct content for this document. - * There is only one direct content, multiple calls to this method - * will allways retrieve the same object. + * Use this method to get the direct content for this document. There is only one direct content, multiple calls to + * this method will allways retrieve the same object. + * * @return the direct content */ public PdfContentByte getDirectContent() { - if (!open) + if (!open) { throw new RuntimeException(MessageLocalization.getComposedMessage("the.document.is.not.open")); + } return directContent; } /** - * Use this method to get the direct content under for this document. - * There is only one direct content, multiple calls to this method - * will always retrieve the same object. + * Use this method to get the direct content under for this document. There is only one direct content, multiple + * calls to this method will always retrieve the same object. + * * @return the direct content */ public PdfContentByte getDirectContentUnder() { - if (!open) + if (!open) { throw new RuntimeException(MessageLocalization.getComposedMessage("the.document.is.not.open")); + } return directContentUnder; } /** - * Resets all the direct contents to empty. - * This happens when a new page is started. + * Resets all the direct contents to empty. This happens when a new page is started. */ void resetContent() { directContent.reset(); @@ -733,19 +754,22 @@ void resetContent() { // PDF body -/* - * A PDF file has 4 parts: a header, a body, a cross-reference table, and a trailer. - * The body contains all the PDF objects that make up the PDF document. - * Each element gets a reference (a set of numbers) and the byte position of - * every object is stored in the cross-reference table. - * Use these methods only if you know what you're doing. - */ + /* + * A PDF file has 4 parts: a header, a body, a cross-reference table, and a trailer. + * The body contains all the PDF objects that make up the PDF document. + * Each element gets a reference (a set of numbers) and the byte position of + * every object is stored in the cross-reference table. + * Use these methods only if you know what you're doing. + */ - /** body of the PDF document */ + /** + * body of the PDF document + */ protected PdfBody body; /** * Adds the local destinations to the body of the document. + * * @param dest the HashMap containing the destinations * @throws IOException on error */ @@ -756,98 +780,95 @@ void addLocalDestinations(TreeMap dest) throws IOException { String name = (String) entry.getKey(); Object[] obj = (Object[]) entry.getValue(); PdfDestination destination = (PdfDestination) obj[2]; - if (obj[1] == null) + if (obj[1] == null) { obj[1] = getPdfIndirectReference(); - if (destination == null) + } + if (destination == null) { addToBody(new PdfString("invalid_" + name), (PdfIndirectReference) obj[1]); - else + } else { addToBody(destination, (PdfIndirectReference) obj[1]); + } } } /** - * Use this method to add a PDF object to the PDF body. - * Use this method only if you know what you're doing! + * Use this method to add a PDF object to the PDF body. Use this method only if you know what you're doing! + * * @param object the PDF object to add * @return a PdfIndirectObject * @throws IOException thrown when an I/O operation fails */ public PdfIndirectObject addToBody(PdfObject object) throws IOException { - PdfIndirectObject iobj = body.add(object); - return iobj; + return body.add(object); } /** - * Use this method to add a PDF object to the PDF body. - * Use this method only if you know what you're doing! - * @param object the PDF object to add + * Use this method to add a PDF object to the PDF body. Use this method only if you know what you're doing! + * + * @param object the PDF object to add * @param inObjStm a boolean * @return a PdfIndirectObject * @throws IOException thrown when an I/O operation fails */ public PdfIndirectObject addToBody(PdfObject object, boolean inObjStm) throws IOException { - PdfIndirectObject iobj = body.add(object, inObjStm); - return iobj; + return body.add(object, inObjStm); } /** - * Use this method to add a PDF object to the PDF body. - * Use this method only if you know what you're doing! + * Use this method to add a PDF object to the PDF body. Use this method only if you know what you're doing! + * * @param object the object to add - * @param ref the IndirectReference of that object + * @param ref the IndirectReference of that object * @return a PdfIndirectObject * @throws IOException thrown when an I/O operation fails */ public PdfIndirectObject addToBody(PdfObject object, PdfIndirectReference ref) throws IOException { - PdfIndirectObject iobj = body.add(object, ref); - return iobj; + return body.add(object, ref); } /** - * Use this method to add a PDF object to the PDF body. - * Use this method only if you know what you're doing! - * @param object the object to add - * @param ref the indirect reference + * Use this method to add a PDF object to the PDF body. Use this method only if you know what you're doing! + * + * @param object the object to add + * @param ref the indirect reference * @param inObjStm a boolean * @return a PdfIndirectObject * @throws IOException thrown when an I/O operation fails */ - public PdfIndirectObject addToBody(PdfObject object, PdfIndirectReference ref, boolean inObjStm) throws IOException { - PdfIndirectObject iobj = body.add(object, ref, inObjStm); - return iobj; + public PdfIndirectObject addToBody(PdfObject object, PdfIndirectReference ref, boolean inObjStm) + throws IOException { + return body.add(object, ref, inObjStm); } /** - * Use this method to add a PDF object to the PDF body. - * Use this method only if you know what you're doing! - * @param object the object to add + * Use this method to add a PDF object to the PDF body. Use this method only if you know what you're doing! + * + * @param object the object to add * @param refNumber the reference number * @return a PdfIndirectObject * @throws IOException thrown when an I/O operation fails */ public PdfIndirectObject addToBody(PdfObject object, int refNumber) throws IOException { - PdfIndirectObject iobj = body.add(object, refNumber); - return iobj; + return body.add(object, refNumber); } /** - * Use this method to add a PDF object to the PDF body. - * Use this method only if you know what you're doing! - * @param object the object to add + * Use this method to add a PDF object to the PDF body. Use this method only if you know what you're doing! + * + * @param object the object to add * @param refNumber the reference number - * @param inObjStm a boolean + * @param inObjStm a boolean * @return a PdfIndirectObject * @throws IOException thrown when an I/O operation fails */ public PdfIndirectObject addToBody(PdfObject object, int refNumber, boolean inObjStm) throws IOException { - PdfIndirectObject iobj = body.add(object, refNumber, inObjStm); - return iobj; + return body.add(object, refNumber, inObjStm); } /** - * Use this to get an PdfIndirectReference for an object that - * will be created in the future. - * Use this method only if you know what you're doing! + * Use this to get an PdfIndirectReference for an object that will be created in the future. Use this + * method only if you know what you're doing! + * * @return the PdfIndirectReference */ @@ -861,39 +882,38 @@ int getIndirectReferenceNumber() { /** * Returns the outputStreamCounter. + * * @return the outputStreamCounter */ OutputStreamCounter getOs() { return os; } - // PDF Catalog -/* - * The Catalog is also called the root object of the document. - * Whereas the Cross-Reference maps the objects number with the - * byte offset so that the viewer can find the objects, the - * Catalog tells the viewer the numbers of the objects needed - * to render the document. - */ + /* + * The Catalog is also called the root object of the document. + * Whereas the Cross-Reference maps the objects number with the + * byte offset so that the viewer can find the objects, the + * Catalog tells the viewer the numbers of the objects needed + * to render the document. + */ - protected PdfDictionary getCatalog(PdfIndirectReference rootObj) - { + protected PdfDictionary getCatalog(PdfIndirectReference rootObj) { PdfDictionary catalog = pdf.getCatalog(rootObj); // [F12] tagged PDF if (tagged) { try { getStructureTreeRoot().buildTree(); - } - catch (Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } catalog.put(PdfName.STRUCTTREEROOT, structureTreeRoot.getReference()); PdfDictionary mi = new PdfDictionary(); mi.put(PdfName.MARKED, PdfBoolean.PDFTRUE); - if (userProperties) + if (userProperties) { mi.put(PdfName.USERPROPERTIES, PdfBoolean.PDFTRUE); + } catalog.put(PdfName.MARKINFO, mi); } // [F13] OCG @@ -904,56 +924,65 @@ protected PdfDictionary getCatalog(PdfIndirectReference rootObj) return catalog; } - /** Holds value of property extraCatalog this is used for Output Intents. */ + /** + * Holds value of property extraCatalog this is used for Output Intents. + */ protected PdfDictionary extraCatalog; /** * Sets extra keys to the catalog. + * * @return the catalog to change */ public PdfDictionary getExtraCatalog() { - if (extraCatalog == null) + if (extraCatalog == null) { extraCatalog = new PdfDictionary(); + } return this.extraCatalog; } // PdfPages -/* - * The page root keeps the complete page tree of the document. - * There's an entry in the Catalog that refers to the root - * of the page tree, the page tree contains the references - * to pages and other page trees. - */ + /* + * The page root keeps the complete page tree of the document. + * There's an entry in the Catalog that refers to the root + * of the page tree, the page tree contains the references + * to pages and other page trees. + */ - /** The root of the page tree. */ + /** + * The root of the page tree. + */ protected PdfPages root = new PdfPages(this); - /** The PdfIndirectReference to the pages. */ + /** + * The PdfIndirectReference to the pages. + */ protected ArrayList pageReferences = new ArrayList<>(); - /** The current page number. */ + /** + * The current page number. + */ protected int currentPageNumber = 1; /** * The value of the Tabs entry in the page dictionary. - * @since 2.1.5 + * + * @since 2.1.5 */ protected PdfName tabs = null; /** - * Use this method to make sure the page tree has a linear structure - * (every leave is attached directly to the root). + * Use this method to make sure the page tree has a linear structure (every leave is attached directly to the root). * Use this method to allow page reordering with method reorderPages. */ - public void setLinearPageMode() { + public void setLinearPageMode() { root.setLinearMode(null); } /** - * Use this method to reorder the pages in the document. - * A null argument value only returns the number of pages to process. - * It is advisable to issue a Document.newPage() before using this method. + * Use this method to reorder the pages in the document. A null argument value only returns the number + * of pages to process. It is advisable to issue a Document.newPage() before using this method. + * + * @param order an array with the new page sequence. It must have the same size as the number of pages. * @return the total number of pages - * @param order an array with the new page sequence. It must have the - * same size as the number of pages. * @throws DocumentException if all the pages are not present in the array */ public int reorderPages(int[] order) throws DocumentException { @@ -961,18 +990,19 @@ public int reorderPages(int[] order) throws DocumentException { } /** - * Use this method to get a reference to a page existing or not. - * If the page does not exist yet the reference will be created - * in advance. If on closing the document, a page number greater - * than the total number of pages was requested, an exception - * is thrown. + * Use this method to get a reference to a page existing or not. If the page does not exist yet the reference will + * be created in advance. If on closing the document, a page number greater than the total number of pages was + * requested, an exception is thrown. + * * @param page the page number. The first page is 1 * @return the reference to the page */ public PdfIndirectReference getPageReference(int page) { --page; - if (page < 0) - throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("the.page.number.must.be.gt.eq.1")); + if (page < 0) { + throw new IndexOutOfBoundsException( + MessageLocalization.getComposedMessage("the.page.number.must.be.gt.eq.1")); + } PdfIndirectReference ref; if (page < pageReferences.size()) { ref = pageReferences.get(page); @@ -980,11 +1010,11 @@ public PdfIndirectReference getPageReference(int page) { ref = body.getPdfIndirectReference(); pageReferences.set(page, ref); } - } - else { + } else { int empty = page - pageReferences.size(); - for (int k = 0; k < empty; ++k) + for (int k = 0; k < empty; ++k) { pageReferences.add(null); + } ref = body.getPdfIndirectReference(); pageReferences.add(ref); } @@ -992,9 +1022,9 @@ public PdfIndirectReference getPageReference(int page) { } /** - * Gets the pagenumber of this document. - * This number can be different from the real pagenumber, - * if you have (re)set the page number previously. + * Gets the pagenumber of this document. This number can be different from the real pagenumber, if you have (re)set + * the page number previously. + * * @return a page number */ @@ -1012,10 +1042,10 @@ public int getCurrentPageNumber() { /** * Sets the value for the Tabs entry in the page tree. - * @param tabs Can be PdfName.R, PdfName.C or PdfName.S. - * Since the Adobe Extensions Level 3, it can also be PdfName.A - * or PdfName.W - * @since 2.1.5 + * + * @param tabs Can be PdfName.R, PdfName.C or PdfName.S. Since the Adobe Extensions Level 3, it can also be + * PdfName.A or PdfName.W + * @since 2.1.5 */ public void setTabs(PdfName tabs) { this.tabs = tabs; @@ -1023,8 +1053,9 @@ public void setTabs(PdfName tabs) { /** * Returns the value to be used for the Tabs entry in the page tree. - * @since 2.1.5 + * * @return a PdfName of the value of the Tabs entry in the page dictionnary + * @since 2.1.5 */ public PdfName getTabs() { return tabs; @@ -1032,13 +1063,12 @@ public PdfName getTabs() { /** * Adds some PdfContents to this Writer. - *

- * The document has to be open before you can begin to add content - * to the body of the document. + *

+ * The document has to be open before you can begin to add content to the body of the document. * - * @return a PdfIndirectReference - * @param page the PdfPage to add + * @param page the PdfPage to add * @param contents the PdfContents of the page + * @return a PdfIndirectReference * @throws PdfException on error */ @@ -1049,8 +1079,7 @@ PdfIndirectReference add(PdfPage page, PdfContents contents) throws PdfException PdfIndirectObject object; try { object = addToBody(contents); - } - catch(IOException ioe) { + } catch (IOException ioe) { throw new ExceptionConverter(ioe); } page.add(object.getIndirectReference()); @@ -1058,8 +1087,7 @@ PdfIndirectReference add(PdfPage page, PdfContents contents) throws PdfException if (group != null) { page.put(PdfName.GROUP, group); group = null; - } - else if (rgbTransparencyBlending) { + } else if (rgbTransparencyBlending) { PdfDictionary pp = new PdfDictionary(); pp.put(PdfName.TYPE, PdfName.GROUP); pp.put(PdfName.S, PdfName.TRANSPARENCY); @@ -1073,26 +1101,32 @@ else if (rgbTransparencyBlending) { // page events -/* - * Page events are specific for iText, not for PDF. - * Upon specific events (for instance when a page starts - * or ends), the corresponding method in the page event - * implementation that is added to the writer is invoked. - */ + /* + * Page events are specific for iText, not for PDF. + * Upon specific events (for instance when a page starts + * or ends), the corresponding method in the page event + * implementation that is added to the writer is invoked. + */ - /** The PdfPageEvent for this document. */ + /** + * The PdfPageEvent for this document. + */ private PdfPageEvent pageEvent; /** * Sets the PdfPageEvent for this document. + * * @param event the PdfPageEvent for this document */ public void setPageEvent(PdfPageEvent event) { - if (event == null) this.pageEvent = null; - else if (this.pageEvent == null) this.pageEvent = event; - else if (this.pageEvent instanceof PdfPageEventForwarder) ((PdfPageEventForwarder)this.pageEvent).addPageEvent(event); - else { + if (event == null) { + this.pageEvent = null; + } else if (this.pageEvent == null) { + this.pageEvent = event; + } else if (this.pageEvent instanceof PdfPageEventForwarder) { + ((PdfPageEventForwarder) this.pageEvent).addPageEvent(event); + } else { PdfPageEventForwarder forward = new PdfPageEventForwarder(); forward.addPageEvent(this.pageEvent); forward.addPageEvent(event); @@ -1101,10 +1135,9 @@ public void setPageEvent(PdfPageEvent event) { } /** - * Gets the PdfPageEvent for this document or null - * if none is set. - * @return the PdfPageEvent for this document or null - * if none is set + * Gets the PdfPageEvent for this document or null if none is set. + * + * @return the PdfPageEvent for this document or null if none is set */ public PdfPageEvent getPageEvent() { @@ -1113,17 +1146,20 @@ public PdfPageEvent getPageEvent() { // Open and Close methods + method that create the PDF - /** A number referring to the previous Cross-Reference Table. */ + /** + * A number referring to the previous Cross-Reference Table. + */ protected int prevxref = 0; /** * Signals that the Document has been opened and that * Elements can be added. - *

- * When this method is called, the PDF-document header is - * written to the outputstream. + *

+ * When this method is called, the PDF-document header is written to the outputstream. + * * @see com.lowagie.text.DocWriter#open() */ + @Override public void open() { super.open(); try { @@ -1131,15 +1167,15 @@ public void open() { body = new PdfBody(this); if (pdfxConformance.isPdfX32002()) { PdfDictionary sec = new PdfDictionary(); - sec.put(PdfName.GAMMA, new PdfArray(new float[]{2.2f,2.2f,2.2f})); - sec.put(PdfName.MATRIX, new PdfArray(new float[]{0.4124f,0.2126f,0.0193f,0.3576f,0.7152f,0.1192f,0.1805f,0.0722f,0.9505f})); - sec.put(PdfName.WHITEPOINT, new PdfArray(new float[]{0.9505f,1f,1.089f})); + sec.put(PdfName.GAMMA, new PdfArray(new float[]{2.2f, 2.2f, 2.2f})); + sec.put(PdfName.MATRIX, new PdfArray( + new float[]{0.4124f, 0.2126f, 0.0193f, 0.3576f, 0.7152f, 0.1192f, 0.1805f, 0.0722f, 0.9505f})); + sec.put(PdfName.WHITEPOINT, new PdfArray(new float[]{0.9505f, 1f, 1.089f})); PdfArray arr = new PdfArray(PdfName.CALRGB); arr.add(sec); setDefaultColorspace(PdfName.DEFAULTRGB, addToBody(arr).getIndirectReference()); } - } - catch(IOException ioe) { + } catch (IOException ioe) { throw new ExceptionConverter(ioe); } } @@ -1147,25 +1183,29 @@ public void open() { /** * Signals that the Document was closed and that no other * Elements will be added. - *

- * The pages-tree is built and written to the outputstream. - * A Catalog is constructed, as well as an Info-object, - * the reference table is composed and everything is written - * to the outputstream embedded in a Trailer. + *

+ * The pages-tree is built and written to the outputstream. A Catalog is constructed, as well as an Info-object, the + * reference table is composed and everything is written to the outputstream embedded in a Trailer. + * * @see com.lowagie.text.DocWriter#close() */ @Override public void close() { if (open) { - + if (pdf != null && pdf.isOpen()) { + throw new IllegalStateException(MessageLocalization + .getComposedMessage("you.should.call.document.close.instead")); + } if ((currentPageNumber - 1) != pageReferences.size()) - // 2019-04-26: If you get this error, it could be that you are using OpenPDF or - // another library such as flying-saucer's ITextRenderer in a non-threadsafe way. - // ITextRenderer is not thread safe. So if you get this problem here, create a new - // instance, rather than re-using it. - // See: https://github.com/LibrePDF/OpenPDF/issues/164 + // 2019-04-26: If you get this error, it could be that you are using OpenPDF or + // another library such as flying-saucer's ITextRenderer in a non-threadsafe way. + // ITextRenderer is not thread safe. So if you get this problem here, create a new + // instance, rather than re-using it. + // See: https://github.com/LibrePDF/OpenPDF/issues/164 + { throw new RuntimeException("The page " + pageReferences.size() + - " was requested but the document has only " + (currentPageNumber - 1) + " pages."); + " was requested but the document has only " + (currentPageNumber - 1) + " pages."); + } try { addSharedObjectsToBody(); @@ -1204,7 +1244,7 @@ public void close() { // [F1] encryption PdfIndirectReference encryption = null; - PdfObject fileID = null; + PdfObject fileID; body.flushObjStm(); if (crypto != null) { PdfIndirectObject encryptionObject = addToBody(crypto.getEncryptionDictionary(), false); @@ -1220,14 +1260,13 @@ public void close() { // write the cross-reference table of the body body.writeCrossReferenceTable(os, indirectCatalog.getIndirectReference(), - infoObj.getIndirectReference(), encryption, fileID, prevxref); + infoObj.getIndirectReference(), encryption, fileID, prevxref); os.write(getISOBytes("startxref\n")); os.write(getISOBytes(String.valueOf(body.offset()))); os.write(getISOBytes("\n%%EOF\n")); super.close(); - } - catch(IOException ioe) { + } catch (IOException ioe) { throw new ExceptionConverter(ioe); } } @@ -1241,8 +1280,9 @@ protected void addSharedObjectsToBody() throws IOException { // [F4] add the form XObjects for (Object[] objs : formXObjects.values()) { PdfTemplate template = (PdfTemplate) objs[1]; - if (template != null && template.getIndirectReference() instanceof PRIndirectReference) + if (template != null && template.getIndirectReference() instanceof PRIndirectReference) { continue; + } if (template != null && template.getType() == PdfTemplate.TYPE_TEMPLATE) { addToBody(template.getFormXObject(compressionLevel), template.getIndirectReference()); } @@ -1279,8 +1319,7 @@ protected void addSharedObjectsToBody() throws IOException { for (Map.Entry entry : documentProperties.entrySet()) { Object prop = entry.getKey(); PdfObject[] obj = entry.getValue(); - if (prop instanceof PdfLayerMembership) { - PdfLayerMembership layer = (PdfLayerMembership) prop; + if (prop instanceof PdfLayerMembership layer) { addToBody(layer.getPdfObject(), layer.getRef()); } else if ((prop instanceof PdfDictionary) && !(prop instanceof PdfLayer)) { addToBody((PdfDictionary) prop, (PdfIndirectReference) obj[1]); @@ -1296,21 +1335,21 @@ protected void addSharedObjectsToBody() throws IOException { // [C1] Outlines (bookmarks) - /** - * Use this method to get the root outline - * and construct bookmarks. - * @return the root outline - */ + /** + * Use this method to get the root outline and construct bookmarks. + * + * @return the root outline + */ - public PdfOutline getRootOutline() { - return directContent.getRootOutline(); - } + public PdfOutline getRootOutline() { + return directContent.getRootOutline(); + } - protected List newBookmarks; + protected List newBookmarks; /** - * Sets the bookmarks. The list structure is defined in - * {@link SimpleBookmark}. + * Sets the bookmarks. The list structure is defined in {@link SimpleBookmark}. + * * @param outlines the bookmarks or null to remove any */ public void setOutlines(List outlines) { @@ -1318,71 +1357,104 @@ public void setOutlines(List outlines) { } protected void writeOutlines(PdfDictionary catalog, boolean namedAsNames) throws IOException { - if (newBookmarks == null || newBookmarks.isEmpty()) + if (newBookmarks == null || newBookmarks.isEmpty()) { return; + } PdfDictionary top = new PdfDictionary(); PdfIndirectReference topRef = getPdfIndirectReference(); Object[] kids = SimpleBookmark.iterateOutlines(this, topRef, newBookmarks, namedAsNames); - top.put(PdfName.FIRST, (PdfIndirectReference)kids[0]); - top.put(PdfName.LAST, (PdfIndirectReference)kids[1]); + top.put(PdfName.FIRST, (PdfIndirectReference) kids[0]); + top.put(PdfName.LAST, (PdfIndirectReference) kids[1]); top.put(PdfName.COUNT, new PdfNumber((Integer) kids[2])); addToBody(top, topRef); catalog.put(PdfName.OUTLINES, topRef); } // [C2] PdfVersion interface - /** possible PDF version (header) */ - public static final char VERSION_1_2 = '2'; - /** possible PDF version (header) */ - public static final char VERSION_1_3 = '3'; - /** possible PDF version (header) */ - public static final char VERSION_1_4 = '4'; - /** possible PDF version (header) */ - public static final char VERSION_1_5 = '5'; - /** possible PDF version (header) */ - public static final char VERSION_1_6 = '6'; - /** possible PDF version (header) */ - public static final char VERSION_1_7 = '7'; - - /** possible PDF version (catalog) */ - public static final PdfName PDF_VERSION_1_2 = new PdfName("1.2"); - /** possible PDF version (catalog) */ - public static final PdfName PDF_VERSION_1_3 = new PdfName("1.3"); - /** possible PDF version (catalog) */ - public static final PdfName PDF_VERSION_1_4 = new PdfName("1.4"); - /** possible PDF version (catalog) */ - public static final PdfName PDF_VERSION_1_5 = new PdfName("1.5"); - /** possible PDF version (catalog) */ - public static final PdfName PDF_VERSION_1_6 = new PdfName("1.6"); - /** possible PDF version (catalog) */ - public static final PdfName PDF_VERSION_1_7 = new PdfName("1.7"); - - /** Stores the version information for the header and the catalog. */ + /** + * possible PDF version (header) + */ + public static final char VERSION_1_2 = '2'; + /** + * possible PDF version (header) + */ + public static final char VERSION_1_3 = '3'; + /** + * possible PDF version (header) + */ + public static final char VERSION_1_4 = '4'; + /** + * possible PDF version (header) + */ + public static final char VERSION_1_5 = '5'; + /** + * possible PDF version (header) + */ + public static final char VERSION_1_6 = '6'; + /** + * possible PDF version (header) + */ + public static final char VERSION_1_7 = '7'; + + /** + * possible PDF version (catalog) + */ + public static final PdfName PDF_VERSION_1_2 = new PdfName("1.2"); + /** + * possible PDF version (catalog) + */ + public static final PdfName PDF_VERSION_1_3 = new PdfName("1.3"); + /** + * possible PDF version (catalog) + */ + public static final PdfName PDF_VERSION_1_4 = new PdfName("1.4"); + /** + * possible PDF version (catalog) + */ + public static final PdfName PDF_VERSION_1_5 = new PdfName("1.5"); + /** + * possible PDF version (catalog) + */ + public static final PdfName PDF_VERSION_1_6 = new PdfName("1.6"); + /** + * possible PDF version (catalog) + */ + public static final PdfName PDF_VERSION_1_7 = new PdfName("1.7"); + + /** + * Stores the version information for the header and the catalog. + */ protected PdfVersionImp pdf_version = new PdfVersionImp(); - /** @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(char) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(char) + */ public void setPdfVersion(char version) { pdf_version.setPdfVersion(version); } - /** @see com.lowagie.text.pdf.interfaces.PdfVersion#setAtLeastPdfVersion(char) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfVersion#setAtLeastPdfVersion(char) + */ public void setAtLeastPdfVersion(char version) { pdf_version.setAtLeastPdfVersion(version); } - /** @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(com.lowagie.text.pdf.PdfName) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(com.lowagie.text.pdf.PdfName) + */ public void setPdfVersion(PdfName version) { pdf_version.setPdfVersion(version); } /** * @see com.lowagie.text.pdf.interfaces.PdfVersion#addDeveloperExtension(com.lowagie.text.pdf.PdfDeveloperExtension) - * @since 2.1.6 + * @since 2.1.6 */ public void addDeveloperExtension(PdfDeveloperExtension de) { pdf_version.addDeveloperExtension(de); } - + /** * Returns the version information. */ @@ -1394,72 +1466,127 @@ PdfVersionImp getPdfVersion() { // page layout (section 13.1.1 of "iText in Action") - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageLayoutSinglePage = 1; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageLayoutOneColumn = 2; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageLayoutTwoColumnLeft = 4; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageLayoutTwoColumnRight = 8; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageLayoutTwoPageLeft = 16; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageLayoutTwoPageRight = 32; // page mode (section 13.1.2 of "iText in Action") - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageModeUseNone = 64; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageModeUseOutlines = 128; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageModeUseThumbs = 256; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageModeFullScreen = 512; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageModeUseOC = 1024; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PageModeUseAttachments = 2048; // values for setting viewer preferences in iText versions older than 2.x - /** A viewer preference */ + /** + * A viewer preference + */ public static final int HideToolbar = 1 << 12; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int HideMenubar = 1 << 13; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int HideWindowUI = 1 << 14; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int FitWindow = 1 << 15; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int CenterWindow = 1 << 16; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int DisplayDocTitle = 1 << 17; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int NonFullScreenPageModeUseNone = 1 << 18; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int NonFullScreenPageModeUseOutlines = 1 << 19; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int NonFullScreenPageModeUseThumbs = 1 << 20; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int NonFullScreenPageModeUseOC = 1 << 21; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int DirectionL2R = 1 << 22; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int DirectionR2L = 1 << 23; - /** A viewer preference */ + /** + * A viewer preference + */ public static final int PrintScalingNone = 1 << 24; - /** @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#setViewerPreferences(int) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#setViewerPreferences(int) + */ public void setViewerPreferences(int preferences) { pdf.setViewerPreferences(preferences); } - /** @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#addViewerPreference(com.lowagie.text.pdf.PdfName, com.lowagie.text.pdf.PdfObject) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#addViewerPreference(com.lowagie.text.pdf.PdfName, + * com.lowagie.text.pdf.PdfObject) + */ public void addViewerPreference(PdfName key, PdfObject value) { pdf.addViewerPreference(key, value); } @@ -1468,6 +1595,7 @@ public void addViewerPreference(PdfName key, PdfObject value) { /** * Use this method to add page labels + * * @param pageLabels the page labels */ public void setPageLabels(PdfPageLabels pageLabels) { @@ -1477,15 +1605,14 @@ public void setPageLabels(PdfPageLabels pageLabels) { // [C5] named objects: named destinations, javascript, embedded files /** - * Adds named destinations in bulk. - * Valid keys and values of the map can be found in the map - * that is created by SimpleNamedDestination. - * @param map a map with strings as keys for the names, - * and structured strings as values for the destinations - * @param page_offset number of pages that has to be added to - * the page numbers in the destinations (useful if you - * use this method in combination with PdfCopy). - * @since iText 5.0 + * Adds named destinations in bulk. Valid keys and values of the map can be found in the map that is created by + * SimpleNamedDestination. + * + * @param map a map with strings as keys for the names, and structured strings as values for the + * destinations + * @param page_offset number of pages that has to be added to the page numbers in the destinations (useful if you + * use this method in combination with PdfCopy). + * @since iText 5.0 */ public void addNamedDestinations(Map map, int page_offset) { Map.Entry entry; @@ -1500,153 +1627,181 @@ public void addNamedDestinations(Map map, int page_offset) { addNamedDestination(entry.getKey(), page + page_offset, destination); } } - + /** * Adds one named destination. - * @param name the name for the destination - * @param page the page number where you want to jump to - * @param dest an explicit destination - * @since iText 5.0 + * + * @param name the name for the destination + * @param page the page number where you want to jump to + * @param dest an explicit destination + * @since iText 5.0 */ public void addNamedDestination(String name, int page, PdfDestination dest) { dest.addPage(getPageReference(page)); pdf.localDestination(name, dest); } - - /** - * Use this method to add a JavaScript action at the document level. - * When the document opens, all this JavaScript runs. - * @param js The JavaScript action - */ - public void addJavaScript(PdfAction js) { - pdf.addJavaScript(js); - } - - /** - * Use this method to add a JavaScript action at the document level. - * When the document opens, all this JavaScript runs. - * @param code the JavaScript code - * @param unicode select JavaScript unicode. Note that the internal - * Acrobat JavaScript engine does not support unicode, - * so this may or may not work for you - */ - public void addJavaScript(String code, boolean unicode) { - addJavaScript(PdfAction.javaScript(code, this, unicode)); - } - - /** - * Use this method to adds a JavaScript action at the document level. - * When the document opens, all this JavaScript runs. - * @param code the JavaScript code - */ - public void addJavaScript(String code) { - addJavaScript(code, false); - } - /** - * Use this method to add a JavaScript action at the document level. - * When the document opens, all this JavaScript runs. - * @param name The name of the JS Action in the name tree - * @param js The JavaScript action - */ - public void addJavaScript(String name, PdfAction js) { - pdf.addJavaScript(name, js); - } - - /** - * Use this method to add a JavaScript action at the document level. - * When the document opens, all this JavaScript runs. - * @param name The name of the JS Action in the name tree - * @param code the JavaScript code - * @param unicode select JavaScript unicode. Note that the internal - * Acrobat JavaScript engine does not support unicode, - * so this may or may not work for you - */ - public void addJavaScript(String name, String code, boolean unicode) { - addJavaScript(name, PdfAction.javaScript(code, this, unicode)); - } - - /** - * Use this method to adds a JavaScript action at the document level. - * When the document opens, all this JavaScript runs. - * @param name The name of the JS Action in the name tree - * @param code the JavaScript code - */ - public void addJavaScript(String name, String code) { - addJavaScript(name, code, false); - } - - /** - * Use this method to add a file attachment at the document level. - * @param description the file description - * @param fileStore an array with the file. If it's null - * the file will be read from the disk - * @param file the path to the file. It will only be used if - * fileStore is not null - * @param fileDisplay the actual file name stored in the pdf - * @throws IOException on error - */ - public void addFileAttachment(String description, byte[] fileStore, String file, String fileDisplay) throws IOException { - addFileAttachment(description, PdfFileSpecification.fileEmbedded(this, file, fileDisplay, fileStore)); - } - - /** - * Use this method to add a file attachment at the document level. - * @param description the file description - * @param fs the file specification - * @throws IOException thrown when an I/O operation fails - */ - public void addFileAttachment(String description, PdfFileSpecification fs) throws IOException { - pdf.addFileAttachment(description, fs); - } - - /** - * Use this method to add a file attachment at the document level. - * @param fs the file specification - * @throws IOException thrown when an I/O operation fails - */ - public void addFileAttachment(PdfFileSpecification fs) throws IOException { - addFileAttachment(null, fs); - } + + /** + * Use this method to add a JavaScript action at the document level. When the document opens, all this JavaScript + * runs. + * + * @param js The JavaScript action + */ + public void addJavaScript(PdfAction js) { + pdf.addJavaScript(js); + } + + /** + * Use this method to add a JavaScript action at the document level. When the document opens, all this JavaScript + * runs. + * + * @param code the JavaScript code + * @param unicode select JavaScript unicode. Note that the internal Acrobat JavaScript engine does not support + * unicode, so this may or may not work for you + */ + public void addJavaScript(String code, boolean unicode) { + addJavaScript(PdfAction.javaScript(code, this, unicode)); + } + + /** + * Use this method to adds a JavaScript action at the document level. When the document opens, all this JavaScript + * runs. + * + * @param code the JavaScript code + */ + public void addJavaScript(String code) { + addJavaScript(code, false); + } + + /** + * Use this method to add a JavaScript action at the document level. When the document opens, all this JavaScript + * runs. + * + * @param name The name of the JS Action in the name tree + * @param js The JavaScript action + */ + public void addJavaScript(String name, PdfAction js) { + pdf.addJavaScript(name, js); + } + + /** + * Use this method to add a JavaScript action at the document level. When the document opens, all this JavaScript + * runs. + * + * @param name The name of the JS Action in the name tree + * @param code the JavaScript code + * @param unicode select JavaScript unicode. Note that the internal Acrobat JavaScript engine does not support + * unicode, so this may or may not work for you + */ + public void addJavaScript(String name, String code, boolean unicode) { + addJavaScript(name, PdfAction.javaScript(code, this, unicode)); + } + + /** + * Use this method to adds a JavaScript action at the document level. When the document opens, all this JavaScript + * runs. + * + * @param name The name of the JS Action in the name tree + * @param code the JavaScript code + */ + public void addJavaScript(String name, String code) { + addJavaScript(name, code, false); + } + + /** + * Use this method to add a file attachment at the document level. + * + * @param description the file description + * @param fileStore an array with the file. If it's null the file will be read from the disk + * @param file the path to the file. It will only be used if + * fileStore is not null + * @param fileDisplay the actual file name stored in the pdf + * @throws IOException on error + */ + public void addFileAttachment(String description, byte[] fileStore, String file, String fileDisplay) + throws IOException { + addFileAttachment(description, PdfFileSpecification.fileEmbedded(this, file, fileDisplay, fileStore)); + } + + /** + * Use this method to add a file attachment at the document level. + * + * @param description the file description + * @param fs the file specification + * @throws IOException thrown when an I/O operation fails + */ + public void addFileAttachment(String description, PdfFileSpecification fs) throws IOException { + pdf.addFileAttachment(description, fs); + } + + /** + * Use this method to add a file attachment at the document level. + * + * @param fs the file specification + * @throws IOException thrown when an I/O operation fails + */ + public void addFileAttachment(PdfFileSpecification fs) throws IOException { + addFileAttachment(null, fs); + } // [C6] Actions (open and additional) - /** action value */ - public static final PdfName DOCUMENT_CLOSE = PdfName.WC; - /** action value */ - public static final PdfName WILL_SAVE = PdfName.WS; - /** action value */ - public static final PdfName DID_SAVE = PdfName.DS; - /** action value */ - public static final PdfName WILL_PRINT = PdfName.WP; - /** action value */ - public static final PdfName DID_PRINT = PdfName.DP; - - /** @see com.lowagie.text.pdf.interfaces.PdfDocumentActions#setOpenAction(java.lang.String) */ + /** + * action value + */ + public static final PdfName DOCUMENT_CLOSE = PdfName.WC; + /** + * action value + */ + public static final PdfName WILL_SAVE = PdfName.WS; + /** + * action value + */ + public static final PdfName DID_SAVE = PdfName.DS; + /** + * action value + */ + public static final PdfName WILL_PRINT = PdfName.WP; + /** + * action value + */ + public static final PdfName DID_PRINT = PdfName.DP; + + /** + * @see com.lowagie.text.pdf.interfaces.PdfDocumentActions#setOpenAction(java.lang.String) + */ public void setOpenAction(String name) { - pdf.setOpenAction(name); - } + pdf.setOpenAction(name); + } - /** @see com.lowagie.text.pdf.interfaces.PdfDocumentActions#setOpenAction(com.lowagie.text.pdf.PdfAction) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfDocumentActions#setOpenAction(com.lowagie.text.pdf.PdfAction) + */ public void setOpenAction(PdfAction action) { - pdf.setOpenAction(action); - } + pdf.setOpenAction(action); + } - /** @see com.lowagie.text.pdf.interfaces.PdfDocumentActions#setAdditionalAction(com.lowagie.text.pdf.PdfName, com.lowagie.text.pdf.PdfAction) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfDocumentActions#setAdditionalAction(com.lowagie.text.pdf.PdfName, + * com.lowagie.text.pdf.PdfAction) + */ public void setAdditionalAction(PdfName actionType, PdfAction action) throws DocumentException { - if (!(actionType.equals(DOCUMENT_CLOSE) || - actionType.equals(WILL_SAVE) || - actionType.equals(DID_SAVE) || - actionType.equals(WILL_PRINT) || - actionType.equals(DID_PRINT))) { - throw new DocumentException(MessageLocalization.getComposedMessage("invalid.additional.action.type.1", actionType.toString())); - } - pdf.addAdditionalAction(actionType, action); - } + if (!(actionType.equals(DOCUMENT_CLOSE) || + actionType.equals(WILL_SAVE) || + actionType.equals(DID_SAVE) || + actionType.equals(WILL_PRINT) || + actionType.equals(DID_PRINT))) { + throw new DocumentException( + MessageLocalization.getComposedMessage("invalid.additional.action.type.1", actionType.toString())); + } + pdf.addAdditionalAction(actionType, action); + } // [C7] portable collections /** * Use this method to add the Collection dictionary. + * * @param collection a dictionary of type PdfCollection */ public void setCollection(PdfCollection collection) { @@ -1656,17 +1811,25 @@ public void setCollection(PdfCollection collection) { // [C8] AcroForm - /** signature value */ + /** + * signature value + */ public static final int SIGNATURE_EXISTS = 1; - /** signature value */ + /** + * signature value + */ public static final int SIGNATURE_APPEND_ONLY = 2; - /** @see com.lowagie.text.pdf.interfaces.PdfAnnotations#getAcroForm() */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfAnnotations#getAcroForm() + */ public PdfAcroForm getAcroForm() { return pdf.getAcroForm(); } - /** @see com.lowagie.text.pdf.interfaces.PdfAnnotations#addAnnotation(com.lowagie.text.pdf.PdfAnnotation) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfAnnotations#addAnnotation(com.lowagie.text.pdf.PdfAnnotation) + */ public void addAnnotation(PdfAnnotation annot) { pdf.addAnnotation(annot); } @@ -1675,23 +1838,30 @@ void addAnnotation(PdfAnnotation annot, int page) { addAnnotation(annot); } - /** @see com.lowagie.text.pdf.interfaces.PdfAnnotations#addCalculationOrder(com.lowagie.text.pdf.PdfFormField) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfAnnotations#addCalculationOrder(com.lowagie.text.pdf.PdfFormField) + */ public void addCalculationOrder(PdfFormField annot) { pdf.addCalculationOrder(annot); } - /** @see com.lowagie.text.pdf.interfaces.PdfAnnotations#setSigFlags(int) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfAnnotations#setSigFlags(int) + */ public void setSigFlags(int f) { pdf.setSigFlags(f); } // [C9] Metadata - /** XMP Metadata for the document. */ + /** + * XMP Metadata for the document. + */ protected byte[] xmpMetadata = null; /** * Use this method to set the XMP Metadata. + * * @param xmpMetadata The xmpMetadata to set. */ public void setXmpMetadata(byte[] xmpMetadata) { @@ -1700,6 +1870,7 @@ public void setXmpMetadata(byte[] xmpMetadata) { /** * Use this method to set the XMP Metadata for each page. + * * @param xmpMetadata The xmpMetadata to set. */ public void setPageXmpMetadata(byte[] xmpMetadata) { @@ -1707,8 +1878,7 @@ public void setPageXmpMetadata(byte[] xmpMetadata) { } /** - * Use this method to creates XMP Metadata based - * on the metadata in the PdfDocument. + * Use this method to creates XMP Metadata based on the metadata in the PdfDocument. */ public void createXmpMetadata() { setXmpMetadata(createXmpMetadataBytes()); @@ -1722,77 +1892,107 @@ private byte[] createXmpMetadataBytes() { try { XmpWriter xmp = new XmpWriter(baos, pdf.getInfo(), pdfxConformance.getPDFXConformance()); xmp.close(); - } - catch (IOException ioe) { + } catch (IOException ioe) { ioe.printStackTrace(); } return baos.toByteArray(); } // [C10] PDFX Conformance - /** A PDF/X level. */ + /** + * A PDF/X level. + */ public static final int PDFXNONE = 0; - /** A PDF/X level. */ + /** + * A PDF/X level. + */ public static final int PDFX1A2001 = 1; - /** A PDF/X level. */ + /** + * A PDF/X level. + */ public static final int PDFX32002 = 2; - /** PDFA-1A level. */ + /** + * PDFA-1A level. + */ public static final int PDFA1A = 3; - /** PDFA-1B level. */ + /** + * PDFA-1B level. + */ public static final int PDFA1B = 4; - /** Stores the PDF/X level. */ - private PdfXConformanceImp pdfxConformance = new PdfXConformanceImp(); + /** + * Stores the PDF/X level. + */ + private final PdfXConformanceImp pdfxConformance = new PdfXConformanceImp(); - /** @see com.lowagie.text.pdf.interfaces.PdfXConformance#setPDFXConformance(int) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfXConformance#setPDFXConformance(int) + */ public void setPDFXConformance(int pdfx) { - if (pdfxConformance.getPDFXConformance() == pdfx) + if (pdfxConformance.getPDFXConformance() == pdfx) { return; - if (pdf.isOpen()) - throw new PdfXConformanceException(MessageLocalization.getComposedMessage("pdfx.conformance.can.only.be.set.before.opening.the.document")); - if (crypto != null) - throw new PdfXConformanceException(MessageLocalization.getComposedMessage("a.pdfx.conforming.document.cannot.be.encrypted")); - if (pdfx == PDFA1A || pdfx == PDFA1B) + } + if (pdf.isOpen()) { + throw new PdfXConformanceException( + MessageLocalization.getComposedMessage( + "pdfx.conformance.can.only.be.set.before.opening.the.document")); + } + if (crypto != null) { + throw new PdfXConformanceException( + MessageLocalization.getComposedMessage("a.pdfx.conforming.document.cannot.be.encrypted")); + } + if (pdfx == PDFA1A || pdfx == PDFA1B) { setPdfVersion(VERSION_1_4); - else if (pdfx != PDFXNONE) + } else if (pdfx != PDFXNONE) { setPdfVersion(VERSION_1_3); + } pdfxConformance.setPDFXConformance(pdfx); } - /** @see com.lowagie.text.pdf.interfaces.PdfXConformance#getPDFXConformance() */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfXConformance#getPDFXConformance() + */ public int getPDFXConformance() { return pdfxConformance.getPDFXConformance(); } - /** @see com.lowagie.text.pdf.interfaces.PdfXConformance#isPdfX() */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfXConformance#isPdfX() + */ public boolean isPdfX() { return pdfxConformance.isPdfX(); } // [C11] Output intents + /** - * Sets the values of the output intent dictionary. Null values are allowed to - * suppress any key. + * Sets the values of the output intent dictionary. Null values are allowed to suppress any key. * * @param outputConditionIdentifier a value * @param outputCondition a value, "PDFA/A" to force GTS_PDFA1, otherwise cued by pdfxConformance. * @param registryName a value * @param info a value * @param colorProfile a value - * @since 2.1.5 * @throws IOException on error + * @since 2.1.5 */ - public void setOutputIntents(String outputConditionIdentifier, String outputCondition, String registryName, String info, ICC_Profile colorProfile) throws IOException { + public void setOutputIntents(String outputConditionIdentifier, String outputCondition, String registryName, + String info, ICC_Profile colorProfile) throws IOException { getExtraCatalog(); PdfDictionary out = new PdfDictionary(PdfName.OUTPUTINTENT); - if (outputCondition != null) + if (outputCondition != null) { out.put(PdfName.OUTPUTCONDITION, new PdfString(outputCondition, PdfObject.TEXT_UNICODE)); - if (outputConditionIdentifier != null) - out.put(PdfName.OUTPUTCONDITIONIDENTIFIER, new PdfString(outputConditionIdentifier, PdfObject.TEXT_UNICODE)); - if (registryName != null) + } + if (outputConditionIdentifier != null) { + out.put(PdfName.OUTPUTCONDITIONIDENTIFIER, + new PdfString(outputConditionIdentifier, PdfObject.TEXT_UNICODE)); + } + if (registryName != null) { out.put(PdfName.REGISTRYNAME, new PdfString(registryName, PdfObject.TEXT_UNICODE)); - if (info != null) + } + if (info != null) { out.put(PdfName.INFO, new PdfString(info, PdfObject.TEXT_UNICODE)); + } if (colorProfile != null) { PdfStream stream = new PdfICCBased(colorProfile, compressionLevel); out.put(PdfName.DESTOUTPUTPROFILE, addToBody(stream).getIndirectReference()); @@ -1801,8 +2001,7 @@ public void setOutputIntents(String outputConditionIdentifier, String outputCond PdfName intentSubtype; if (pdfxConformance.isPdfA1() || "PDFA/1".equals(outputCondition)) { intentSubtype = PdfName.GTS_PDFA1; - } - else { + } else { intentSubtype = PdfName.GTS_PDFX; } @@ -1811,64 +2010,70 @@ public void setOutputIntents(String outputConditionIdentifier, String outputCond extraCatalog.put(PdfName.OUTPUTINTENTS, new PdfArray(out)); } - /** - * Sets the values of the output intent dictionary. Null values are allowed to - * suppress any key. - * + /** + * Sets the values of the output intent dictionary. Null values are allowed to suppress any key. + *

* Prefer the ICC_Profile-based version of this method. + * * @param outputConditionIdentifier a value * @param outputCondition a value, "PDFA/A" to force GTS_PDFA1, otherwise cued by pdfxConformance. * @param registryName a value * @param info a value * @param destOutputProfile a value - * @since 1.x - * * @throws IOException on error + * @since 1.x */ - public void setOutputIntents(String outputConditionIdentifier, String outputCondition, String registryName, String info, byte[] destOutputProfile) throws IOException { + public void setOutputIntents(String outputConditionIdentifier, String outputCondition, String registryName, + String info, byte[] destOutputProfile) throws IOException { ICC_Profile colorProfile = (destOutputProfile == null) ? null : ICC_Profile.getInstance(destOutputProfile); setOutputIntents(outputConditionIdentifier, outputCondition, registryName, info, colorProfile); } /** - * Use this method to copy the output intent dictionary - * from another document to this one. - * @param reader the other document + * Use this method to copy the output intent dictionary from another document to this one. + * + * @param reader the other document * @param checkExistence true to just check for the existence of a valid output intent - * dictionary, false to insert the dictionary if it exists - * @throws IOException on error + * dictionary, false to insert the dictionary if it exists * @return true if the output intent dictionary exists, false * otherwise + * @throws IOException on error */ public boolean setOutputIntents(PdfReader reader, boolean checkExistence) throws IOException { PdfDictionary catalog = reader.getCatalog(); PdfArray outs = catalog.getAsArray(PdfName.OUTPUTINTENTS); - if (outs == null) + if (outs == null) { return false; - if (outs.isEmpty()) + } + if (outs.isEmpty()) { return false; + } PdfDictionary out = outs.getAsDict(0); PdfObject obj = PdfReader.getPdfObject(out.get(PdfName.S)); - if (!PdfName.GTS_PDFX.equals(obj)) + if (!PdfName.GTS_PDFX.equals(obj)) { return false; - if (checkExistence) + } + if (checkExistence) { return true; - PRStream stream = (PRStream)PdfReader.getPdfObject(out.get(PdfName.DESTOUTPUTPROFILE)); + } + PRStream stream = (PRStream) PdfReader.getPdfObject(out.get(PdfName.DESTOUTPUTPROFILE)); byte[] destProfile = null; if (stream != null) { destProfile = PdfReader.getStreamBytes(stream); } - setOutputIntents(getNameString(out, PdfName.OUTPUTCONDITIONIDENTIFIER), getNameString(out, PdfName.OUTPUTCONDITION), + setOutputIntents(getNameString(out, PdfName.OUTPUTCONDITIONIDENTIFIER), + getNameString(out, PdfName.OUTPUTCONDITION), getNameString(out, PdfName.REGISTRYNAME), getNameString(out, PdfName.INFO), destProfile); return true; } private static String getNameString(PdfDictionary dic, PdfName key) { PdfObject obj = PdfReader.getPdfObject(dic.get(key)); - if (obj == null || !obj.isString()) + if (obj == null || !obj.isString()) { return null; - return ((PdfString)obj).toUnicodeString(); + } + return ((PdfString) obj).toUnicodeString(); } // PDF Objects that have an impact on the PDF body @@ -1877,101 +2082,137 @@ private static String getNameString(PdfDictionary dic, PdfName key) { // types of encryption - /** No encryption */ + /** + * No encryption + */ public static final int ENCRYPTION_NONE = -1; - /** Type of encryption */ + /** + * Type of encryption + */ public static final int STANDARD_ENCRYPTION_40 = 0; - /** Type of encryption */ + /** + * Type of encryption + */ public static final int STANDARD_ENCRYPTION_128 = 1; - /** Type of encryption */ + /** + * Type of encryption + */ public static final int ENCRYPTION_AES_128 = 2; // ENCRYPTION_* = 3 reserved for implementation of the // meanwhile deprecated proprietary AES256 variant by Adobe - /** Type of encryption */ + /** + * Type of encryption + */ public static final int ENCRYPTION_AES_256_V3 = 4; - /** Mask to separate the encryption type from the encryption mode. */ + /** + * Mask to separate the encryption type from the encryption mode. + */ static final int ENCRYPTION_MASK = 7; - /** Add this to the mode to keep the metadata in clear text */ + /** + * Add this to the mode to keep the metadata in clear text + */ public static final int DO_NOT_ENCRYPT_METADATA = 8; /** * Add this to the mode to keep encrypt only the embedded files. + * * @since 2.1.3 */ public static final int EMBEDDED_FILES_ONLY = 24; // permissions - /** The operation permitted when the document is opened with the user password + /** + * The operation permitted when the document is opened with the user password * * @since 2.0.7 */ public static final int ALLOW_PRINTING = 4 + 2048; - /** The operation permitted when the document is opened with the user password + /** + * The operation permitted when the document is opened with the user password * * @since 2.0.7 */ public static final int ALLOW_MODIFY_CONTENTS = 8; - /** The operation permitted when the document is opened with the user password + /** + * The operation permitted when the document is opened with the user password * * @since 2.0.7 */ public static final int ALLOW_COPY = 16; - /** The operation permitted when the document is opened with the user password + /** + * The operation permitted when the document is opened with the user password * * @since 2.0.7 */ public static final int ALLOW_MODIFY_ANNOTATIONS = 32; - /** The operation permitted when the document is opened with the user password + /** + * The operation permitted when the document is opened with the user password * * @since 2.0.7 */ public static final int ALLOW_FILL_IN = 256; - /** The operation permitted when the document is opened with the user password + /** + * The operation permitted when the document is opened with the user password * * @since 2.0.7 */ public static final int ALLOW_SCREENREADERS = 512; - /** The operation permitted when the document is opened with the user password + /** + * The operation permitted when the document is opened with the user password * * @since 2.0.7 */ public static final int ALLOW_ASSEMBLY = 1024; - /** The operation permitted when the document is opened with the user password + /** + * The operation permitted when the document is opened with the user password * * @since 2.0.7 */ public static final int ALLOW_DEGRADED_PRINTING = 4; - /** Contains the business logic for cryptography. */ + /** + * Contains the business logic for cryptography. + */ protected PdfEncryption crypto; + PdfEncryption getEncryption() { return crypto; } - /** @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(byte[], byte[], int, int) */ - public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType) throws DocumentException { - if (pdf.isOpen()) - throw new DocumentException(MessageLocalization.getComposedMessage("encryption.can.only.be.added.before.opening.the.document")); + /** + * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(byte[], byte[], int, int) + */ + public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType) + throws DocumentException { + if (pdf.isOpen()) { + throw new DocumentException( + MessageLocalization.getComposedMessage("encryption.can.only.be.added.before.opening.the.document")); + } crypto = new PdfEncryption(); crypto.setCryptoMode(encryptionType, 0); crypto.setupAllKeys(userPassword, ownerPassword, permissions); } - /** @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(java.security.cert.Certificate[], int[], int) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(java.security.cert.Certificate[], int[], + * int) + */ public void setEncryption(Certificate[] certs, int[] permissions, int encryptionType) throws DocumentException { - if (pdf.isOpen()) - throw new DocumentException(MessageLocalization.getComposedMessage("encryption.can.only.be.added.before.opening.the.document")); + if (pdf.isOpen()) { + throw new DocumentException( + MessageLocalization.getComposedMessage("encryption.can.only.be.added.before.opening.the.document")); + } crypto = new PdfEncryption(); if (certs != null) { - for (int i=0; i < certs.length; i++) { + for (int i = 0; i < certs.length; i++) { crypto.addRecipient(certs[i], permissions[i]); } } @@ -1979,14 +2220,16 @@ public void setEncryption(Certificate[] certs, int[] permissions, int encryption crypto.getEncryptionDictionary(); } - // [F2] compression - /** Holds value of property fullCompression. */ + /** + * Holds value of property fullCompression. + */ protected boolean fullCompression = false; /** * Use this method to find out if 1.5 compression is on. + * * @return the 1.5 compression status */ public boolean isFullCompression() { @@ -1994,9 +2237,8 @@ public boolean isFullCompression() { } /** - * Use this method to set the document's compression to the - * PDF 1.5 mode with object streams and xref streams. - * It can be set at any time but once set it can't be unset. + * Use this method to set the document's compression to the PDF 1.5 mode with object streams and xref streams. It + * can be set at any time but once set it can't be unset. *

* If set before opening the document it will also set the pdf version to 1.5. */ @@ -2007,12 +2249,14 @@ public void setFullCompression() { /** * The compression level of the content streams. + * * @since 2.1.3 */ protected int compressionLevel = PdfStream.DEFAULT_COMPRESSION; /** * Returns the compression level used for streams written by this writer. + * * @return the compression level (0 = best speed, 9 = best compression, -1 is default) * @since 2.1.3 */ @@ -2022,35 +2266,41 @@ public int getCompressionLevel() { /** * Sets the compression level to be used for streams written by this writer. + * * @param compressionLevel a value between 0 (best speed) and 9 (best compression) * @since 2.1.3 */ public void setCompressionLevel(int compressionLevel) { - if (compressionLevel < PdfStream.NO_COMPRESSION || compressionLevel > PdfStream.BEST_COMPRESSION) + if (compressionLevel < PdfStream.NO_COMPRESSION || compressionLevel > PdfStream.BEST_COMPRESSION) { this.compressionLevel = PdfStream.DEFAULT_COMPRESSION; - else + } else { this.compressionLevel = compressionLevel; + } } // [F3] adding fonts - /** The fonts of this document */ + /** + * The fonts of this document + */ protected LinkedHashMap documentFonts = new LinkedHashMap<>(); - /** The font number counter for the fonts in the document. */ + /** + * The font number counter for the fonts in the document. + */ protected int fontNumber = 1; /** - * Adds a BaseFont to the document but not to the page resources. - * It is used for templates. + * Adds a BaseFont to the document but not to the page resources. It is used for templates. + * * @param bf the BaseFont to add - * @return an Object[] where position 0 is a PdfName - * and position 1 is an PdfIndirectReference + * @return an Object[] where position 0 is a PdfName and position 1 is an + * PdfIndirectReference */ FontDetails addSimple(BaseFont bf) { if (bf.getFontType() == BaseFont.FONT_TYPE_DOCUMENT) { - return new FontDetails(new PdfName("F" + (fontNumber++)), ((DocumentFont)bf).getIndirectReference(), bf); + return new FontDetails(new PdfName("F" + (fontNumber++)), ((DocumentFont) bf).getIndirectReference(), bf); } FontDetails ret = documentFonts.get(bf); if (ret == null) { @@ -2063,23 +2313,28 @@ FontDetails addSimple(BaseFont bf) { void eliminateFontSubset(PdfDictionary fonts) { for (FontDetails ft : documentFonts.values()) { - if (fonts.get(ft.getFontName()) != null) + if (fonts.get(ft.getFontName()) != null) { ft.setSubset(false); + } } } // [F4] adding (and releasing) form XObjects - /** The form XObjects in this document. The key is the xref and the value - is Object[]{PdfName, template}.*/ + /** + * The form XObjects in this document. The key is the xref and the value is Object[]{PdfName, template}. + */ protected LinkedHashMap formXObjects = new LinkedHashMap<>(); - /** The name counter for the form XObjects name. */ + /** + * The name counter for the form XObjects name. + */ protected int formXObjectsCounter = 1; /** * Adds a template to the document but not to the page resources. - * @param template the template to add + * + * @param template the template to add * @param forcedName the template name, rather than a generated one. Can be null * @return the PdfName for this template */ @@ -2087,18 +2342,18 @@ void eliminateFontSubset(PdfDictionary fonts) { PdfName addDirectTemplateSimple(PdfTemplate template, PdfName forcedName) { PdfIndirectReference ref = template.getIndirectReference(); Object[] obj = formXObjects.get(ref); - PdfName name = null; + PdfName name; try { if (obj == null) { if (forcedName == null) { name = new PdfName("Xf" + formXObjectsCounter); ++formXObjectsCounter; - } - else + } else { name = forcedName; + } if (template.getType() == PdfTemplate.TYPE_IMPORTED) { // If we got here from PdfCopy we'll have to fill importedPages - PdfImportedPage ip = (PdfImportedPage)template; + PdfImportedPage ip = (PdfImportedPage) template; PdfReader r = ip.getPdfReaderInstance().getReader(); if (!importedPages.containsKey(r)) { importedPages.put(r, ip.getPdfReaderInstance()); @@ -2106,32 +2361,32 @@ PdfName addDirectTemplateSimple(PdfTemplate template, PdfName forcedName) { template = null; } formXObjects.put(ref, new Object[]{name, template}); + } else { + name = (PdfName) obj[0]; } - else - name = (PdfName)obj[0]; - } - catch (Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } return name; } /** - * Use this method to releases the memory used by a template. - * This method writes the template to the output. - * The template can still be added to any content - * but changes to the template itself won't have any effect. + * Use this method to releases the memory used by a template. This method writes the template to the output. The + * template can still be added to any content but changes to the template itself won't have any effect. + * * @param tp the template to release * @throws IOException on error */ public void releaseTemplate(PdfTemplate tp) throws IOException { PdfIndirectReference ref = tp.getIndirectReference(); Object[] objs = formXObjects.get(ref); - if (objs == null || objs[1] == null) + if (objs == null || objs[1] == null) { return; - PdfTemplate template = (PdfTemplate)objs[1]; - if (template.getIndirectReference() instanceof PRIndirectReference) + } + PdfTemplate template = (PdfTemplate) objs[1]; + if (template.getIndirectReference() instanceof PRIndirectReference) { return; + } if (template.getType() == PdfTemplate.TYPE_TEMPLATE) { addToBody(template.getFormXObject(compressionLevel), template.getIndirectReference()); objs[1] = null; @@ -2143,11 +2398,10 @@ public void releaseTemplate(PdfTemplate tp) throws IOException { protected HashMap importedPages = new HashMap<>(); /** - * Use this method to get a page from other PDF document. - * The page can be used as any other PdfTemplate. - * Note that calling this method more than once with the same parameters - * will retrieve the same object. - * @param reader the PDF document where the page is + * Use this method to get a page from other PDF document. The page can be used as any other PdfTemplate. Note that + * calling this method more than once with the same parameters will retrieve the same object. + * + * @param reader the PDF document where the page is * @param pageNumber the page number. The first page is 1 * @return the template representing the imported page */ @@ -2161,34 +2415,31 @@ public PdfImportedPage getImportedPage(PdfReader reader, int pageNumber) { } /** - * Use this method to writes the reader to the document - * and free the memory used by it. - * The main use is when concatenating multiple documents - * to keep the memory usage restricted to the current - * appending document. + * Use this method to writes the reader to the document and free the memory used by it. The main use is when + * concatenating multiple documents to keep the memory usage restricted to the current appending document. + * * @param reader the PdfReader to free * @throws IOException on error */ public void freeReader(PdfReader reader) throws IOException { currentPdfReaderInstance = importedPages.get(reader); - if (currentPdfReaderInstance == null) + if (currentPdfReaderInstance == null) { return; + } currentPdfReaderInstance.writeAllPages(); currentPdfReaderInstance = null; importedPages.remove(reader); } /** - * Use this method to gets the current document size. - * This size only includes the data already written - * to the output stream, it does not include templates or fonts. - * It is useful if used with freeReader() - * when concatenating many documents and an idea of - * the current size is needed. + * Use this method to gets the current document size. This size only includes the data already written to the output + * stream, it does not include templates or fonts. It is useful if used with freeReader() when + * concatenating many documents and an idea of the current size is needed. + * * @return the approximate size without fonts or templates */ public long getCurrentDocumentSize() { - return body.offset() + (long)body.size() * 20L + 0x48; + return body.offset() + (long) body.size() * 20L + 0x48; } protected PdfReaderInstance currentPdfReaderInstance; @@ -2209,10 +2460,14 @@ RandomAccessFileOrArray getReaderFile(PdfReader reader) { // [F6] spot colors - /** The colors of this document */ + /** + * The colors of this document + */ protected HashMap documentColors = new HashMap<>(); - /** The color number counter for the colors in the document. */ + /** + * The color number counter for the colors in the document. + */ protected int colorNumber = 1; PdfName getColorspaceName() { @@ -2221,9 +2476,10 @@ PdfName getColorspaceName() { /** * Adds a SpotColor to the document but not to the page resources. + * * @param spc the SpotColor to add - * @return an Object[] where position 0 is a PdfName - * and position 1 is an PdfIndirectReference + * @return an Object[] where position 0 is a PdfName and position 1 is an + * PdfIndirectReference */ ColorDetails addSimple(PdfSpotColor spc) { ColorDetails ret = documentColors.get(spc); @@ -2236,16 +2492,20 @@ ColorDetails addSimple(PdfSpotColor spc) { // [F7] document patterns - /** The patterns of this document */ + /** + * The patterns of this document + */ protected HashMap documentPatterns = new HashMap<>(); - /** The pattern number counter for the colors in the document. */ + /** + * The pattern number counter for the colors in the document. + */ protected int patternNumber = 1; PdfName addSimplePattern(PdfPatternPainter painter) { PdfName name = documentPatterns.get(painter); try { - if ( name == null ) { + if (name == null) { name = new PdfName("P" + patternNumber); ++patternNumber; documentPatterns.put(painter, name); @@ -2287,7 +2547,8 @@ void addSimpleShading(PdfShading shading) { PdfObject[] addSimpleExtGState(PdfDictionary gstate) { if (!documentExtGState.containsKey(gstate)) { PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_GSTATE, gstate); - documentExtGState.put(gstate, new PdfObject[]{new PdfName("GS" + (documentExtGState.size() + 1)), getPdfIndirectReference()}); + documentExtGState.put(gstate, + new PdfObject[]{new PdfName("GS" + (documentExtGState.size() + 1)), getPdfIndirectReference()}); } return documentExtGState.get(gstate); } @@ -2298,8 +2559,9 @@ PdfObject[] addSimpleExtGState(PdfDictionary gstate) { PdfObject[] addSimpleProperty(Object prop, PdfIndirectReference refi) { if (!documentProperties.containsKey(prop)) { - if (prop instanceof PdfOCG) + if (prop instanceof PdfOCG) { PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_LAYER, null); + } documentProperties.put(prop, new PdfObject[]{new PdfName("Pr" + (documentProperties.size() + 1)), refi}); } return documentProperties.get(prop); @@ -2318,13 +2580,16 @@ boolean propertyExists(Object prop) { * Mark this document for tagging. It must be called before open. */ public void setTagged() { - if (open) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("tagging.must.be.set.before.opening.the.document")); + if (open) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("tagging.must.be.set.before.opening.the.document")); + } tagged = true; } /** * Check if the document is marked for tagging. + * * @return true if the document is marked for tagging */ public boolean isTagged() { @@ -2333,34 +2598,45 @@ public boolean isTagged() { /** * Gets the structure tree root. If the document is not marked for tagging it will return null. + * * @return the structure tree root */ public PdfStructureTreeRoot getStructureTreeRoot() { - if (tagged && structureTreeRoot == null) + if (tagged && structureTreeRoot == null) { structureTreeRoot = new PdfStructureTreeRoot(this); + } return structureTreeRoot; } // [F13] Optional Content Groups - /** A hashSet containing all the PdfLayer objects. */ + /** + * A hashSet containing all the PdfLayer objects. + */ protected Set documentOCG = new HashSet<>(); - /** An array list used to define the order of an OCG tree. */ + /** + * An array list used to define the order of an OCG tree. + */ protected List documentOCGorder = new ArrayList<>(); - /** The OCProperties in a catalog dictionary. */ + /** + * The OCProperties in a catalog dictionary. + */ protected PdfOCProperties OCProperties; - /** The RBGroups array in an OCG dictionary */ + /** + * The RBGroups array in an OCG dictionary + */ protected PdfArray OCGRadioGroup = new PdfArray(); /** * The locked array in an OCG dictionary - * @since 2.1.2 + * + * @since 2.1.2 */ protected PdfArray OCGLocked = new PdfArray(); /** - * Use this method to get the Optional Content Properties Dictionary. - * Each call fills the dictionary with the current layer state. - * It's advisable to only call this method right before close - * and do any modifications at that time. + * Use this method to get the Optional Content Properties Dictionary. Each call fills the dictionary with the + * current layer state. It's advisable to only call this method right before close and do any modifications at that + * time. + * * @return the Optional Content Properties Dictionary */ public PdfOCProperties getOCProperties() { @@ -2369,52 +2645,58 @@ public PdfOCProperties getOCProperties() { } /** - * Use this method to set a collection of optional content groups - * whose states are intended to follow a "radio button" paradigm. - * That is, the state of at most one optional content group - * in the array should be ON at a time: if one group is turned - * ON, all others must be turned OFF. + * Use this method to set a collection of optional content groups whose states are intended to follow a "radio + * button" paradigm. That is, the state of at most one optional content group in the array should be ON at a time: + * if one group is turned ON, all others must be turned OFF. + * * @param group the radio group */ public void addOCGRadioGroup(List group) { PdfArray ar = new PdfArray(); for (PdfLayer layer : group) { - if (layer.getTitle() == null) + if (layer.getTitle() == null) { ar.add(layer.getRef()); + } } - if (ar.size() == 0) + if (ar.isEmpty()) { return; + } OCGRadioGroup.add(ar); } /** - * Use this method to lock an optional content group. - * The state of a locked group cannot be changed through the user interface - * of a viewer application. Producers can use this entry to prevent the visibility - * of content that depends on these groups from being changed by users. - * @param layer the layer that needs to be added to the array of locked OCGs - * @since 2.1.2 + * Use this method to lock an optional content group. The state of a locked group cannot be changed through the user + * interface of a viewer application. Producers can use this entry to prevent the visibility of content that depends + * on these groups from being changed by users. + * + * @param layer the layer that needs to be added to the array of locked OCGs + * @since 2.1.2 */ public void lockLayer(PdfLayer layer) { OCGLocked.add(layer.getRef()); } private static void getOCGOrder(PdfArray order, PdfLayer layer) { - if (!layer.isOnPanel()) + if (!layer.isOnPanel()) { return; - if (layer.getTitle() == null) + } + if (layer.getTitle() == null) { order.add(layer.getRef()); + } ArrayList children = layer.getChildren(); - if (children == null) + if (children == null) { return; + } PdfArray kids = new PdfArray(); - if (layer.getTitle() != null) + if (layer.getTitle() != null) { kids.add(new PdfString(layer.getTitle(), PdfObject.TEXT_UNICODE)); + } for (PdfLayer child : children) { getOCGOrder(kids, child); } - if (kids.size() > 0) + if (!kids.isEmpty()) { order.add(kids); + } } private void addASEvent(PdfName event, PdfName category) { @@ -2422,13 +2704,15 @@ private void addASEvent(PdfName event, PdfName category) { for (PdfOCG o : documentOCG) { PdfLayer layer = (PdfLayer) o; PdfDictionary usage = layer.getAsDict(PdfName.USAGE); - if (usage != null && usage.get(category) != null) + if (usage != null && usage.get(category) != null) { arr.add(layer.getRef()); + } } - if (arr.size() == 0) + if (arr.isEmpty()) { return; - PdfDictionary d = (PdfDictionary)OCProperties.get(PdfName.D); - PdfArray arras = (PdfArray)d.get(PdfName.AS); + } + PdfDictionary d = (PdfDictionary) OCProperties.get(PdfName.D); + PdfArray arras = (PdfArray) d.get(PdfName.AS); if (arras == null) { arras = new PdfArray(); d.put(PdfName.AS, arras); @@ -2441,12 +2725,13 @@ private void addASEvent(PdfName event, PdfName category) { } /** - * @since 2.1.2 * @param erase true to erase, false otherwise + * @since 2.1.2 */ protected void fillOCProperties(boolean erase) { - if (OCProperties == null) + if (OCProperties == null) { OCProperties = new PdfOCProperties(); + } if (erase) { OCProperties.remove(PdfName.OCGS); OCProperties.remove(PdfName.D); @@ -2459,12 +2744,13 @@ protected void fillOCProperties(boolean erase) { } OCProperties.put(PdfName.OCGS, gr); } - if (OCProperties.get(PdfName.D) != null) + if (OCProperties.get(PdfName.D) != null) { return; + } List docOrder = documentOCGorder.stream() - .filter(pdfOCG -> ((PdfLayer)pdfOCG).getParent() == null) - .collect(Collectors.toList()); + .filter(pdfOCG -> ((PdfLayer) pdfOCG).getParent() == null) + .collect(Collectors.toList()); PdfArray order = new PdfArray(); for (PdfOCG o1 : docOrder) { @@ -2477,15 +2763,19 @@ protected void fillOCProperties(boolean erase) { PdfArray gr = new PdfArray(); for (PdfOCG o : documentOCG) { PdfLayer layer = (PdfLayer) o; - if (!layer.isOn()) + if (!layer.isOn()) { gr.add(layer.getRef()); + } } - if (gr.size() > 0) + if (!gr.isEmpty()) { d.put(PdfName.OFF, gr); - if (OCGRadioGroup != null && OCGRadioGroup.size() > 0) + } + if (OCGRadioGroup != null && !OCGRadioGroup.isEmpty()) { d.put(PdfName.RBGROUPS, OCGRadioGroup); - if (OCGLocked != null && OCGLocked.size() > 0) + } + if (OCGLocked != null && !OCGLocked.isEmpty()) { d.put(PdfName.LOCKED, OCGLocked); + } addASEvent(PdfName.VIEW, PdfName.ZOOM); addASEvent(PdfName.VIEW, PdfName.VIEW); addASEvent(PdfName.PRINT, PdfName.PRINT); @@ -2495,20 +2785,18 @@ protected void fillOCProperties(boolean erase) { void registerLayer(PdfOCG layer) { PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_LAYER, null); - if (layer instanceof PdfLayer) { - PdfLayer la = (PdfLayer)layer; + if (layer instanceof PdfLayer la) { if (la.getTitle() == null) { if (!documentOCG.contains(layer)) { documentOCG.add(layer); documentOCGorder.add(layer); } - } - else { + } else { documentOCGorder.add(layer); } - } - else + } else { throw new IllegalArgumentException(MessageLocalization.getComposedMessage("only.pdflayer.is.accepted")); + } } // User methods to change aspects of the page @@ -2517,6 +2805,7 @@ void registerLayer(PdfOCG layer) { /** * Use this method to get the size of the media box. + * * @return a Rectangle */ public Rectangle getPageSize() { @@ -2524,9 +2813,9 @@ public Rectangle getPageSize() { } /** - * Use this method to set the crop box. - * The crop box should not be rotated even if the page is rotated. - * This change only takes effect in the next page. + * Use this method to set the crop box. The crop box should not be rotated even if the page is rotated. This change + * only takes effect in the next page. + * * @param crop the crop box */ public void setCropBoxSize(Rectangle crop) { @@ -2534,18 +2823,18 @@ public void setCropBoxSize(Rectangle crop) { } /** - * Use this method to set the page box sizes. - * Allowed names are: "crop", "trim", "art" and "bleed". + * Use this method to set the page box sizes. Allowed names are: "crop", "trim", "art" and "bleed". + * * @param boxName the box size - * @param size the size + * @param size the size */ public void setBoxSize(String boxName, Rectangle size) { pdf.setBoxSize(boxName, size); } /** - * Use this method to get the size of a trim, art, crop or bleed box, - * or null if not defined. + * Use this method to get the size of a trim, art, crop or bleed box, or null if not defined. + * * @param boxName crop, trim, art or bleed * @return the Rectangle */ @@ -2556,20 +2845,21 @@ public Rectangle getBoxSize(String boxName) { // [U2] take care of empty pages /** - * Use this method to make sure a page is added, - * even if it's empty. If you use setPageEmpty(false), - * invoking newPage() after a blank page will add a newPage. - * setPageEmpty(true) won't have any effect. + * Use this method to make sure a page is added, even if it's empty. If you use setPageEmpty(false), invoking + * newPage() after a blank page will add a newPage. setPageEmpty(true) won't have any effect. + * * @param pageEmpty the state */ public void setPageEmpty(boolean pageEmpty) { - if (pageEmpty) + if (pageEmpty) { return; + } pdf.setPageEmpty(pageEmpty); } /** * Checks if a newPage() will actually generate a new page. + * * @return true if a new page will be generated, false otherwise * @since 2.1.8 */ @@ -2579,34 +2869,49 @@ public boolean isPageEmpty() { // [U3] page actions (open and close) - /** action value */ + /** + * action value + */ public static final PdfName PAGE_OPEN = PdfName.O; - /** action value */ + /** + * action value + */ public static final PdfName PAGE_CLOSE = PdfName.C; - /** @see com.lowagie.text.pdf.interfaces.PdfPageActions#setPageAction(com.lowagie.text.pdf.PdfName, com.lowagie.text.pdf.PdfAction) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setPageAction(com.lowagie.text.pdf.PdfName, + * com.lowagie.text.pdf.PdfAction) + */ public void setPageAction(PdfName actionType, PdfAction action) throws DocumentException { - if (!actionType.equals(PAGE_OPEN) && !actionType.equals(PAGE_CLOSE)) - throw new DocumentException(MessageLocalization.getComposedMessage("invalid.page.additional.action.type.1", actionType.toString())); - pdf.setPageAction(actionType, action); - } + if (!actionType.equals(PAGE_OPEN) && !actionType.equals(PAGE_CLOSE)) { + throw new DocumentException( + MessageLocalization.getComposedMessage("invalid.page.additional.action.type.1", + actionType.toString())); + } + pdf.setPageAction(actionType, action); + } - /** @see com.lowagie.text.pdf.interfaces.PdfPageActions#setDuration(int) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setDuration(int) + */ public void setDuration(int seconds) { - pdf.setDuration(seconds); - } + pdf.setDuration(seconds); + } - /** @see com.lowagie.text.pdf.interfaces.PdfPageActions#setTransition(com.lowagie.text.pdf.PdfTransition) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setTransition(com.lowagie.text.pdf.PdfTransition) + */ public void setTransition(PdfTransition transition) { - pdf.setTransition(transition); - } + pdf.setTransition(transition); + } // [U4] Thumbnail image /** * Use this method to set the thumbnail image for the current page. + * * @param image the image - * @throws PdfException on error + * @throws PdfException on error * @throws DocumentException or error */ public void setThumbnail(Image image) throws DocumentException { @@ -2616,14 +2921,14 @@ public void setThumbnail(Image image) throws DocumentException { // [U5] Transparency groups /** - * A group attributes dictionary specifying the attributes - * of the page's page group for use in the transparent + * A group attributes dictionary specifying the attributes of the page's page group for use in the transparent * imaging model */ protected PdfDictionary group; /** * Use this method to get the group dictionary. + * * @return Value of property group. */ public PdfDictionary getGroup() { @@ -2632,6 +2937,7 @@ public PdfDictionary getGroup() { /** * Use this method to set the group dictionary. + * * @param group New value of property group. */ public void setGroup(PdfDictionary group) { @@ -2640,20 +2946,24 @@ public void setGroup(PdfDictionary group) { // [U6] space char ratio - /** The default space-char ratio. */ + /** + * The default space-char ratio. + */ public static final float SPACE_CHAR_RATIO_DEFAULT = 2.5f; - /** Disable the inter-character spacing. */ + /** + * Disable the inter-character spacing. + */ public static final float NO_SPACE_CHAR_RATIO = 10000000f; /** - * The ratio between the extra word spacing and the extra character spacing. - * Extra word spacing will grow ratio times more than extra character spacing. + * The ratio between the extra word spacing and the extra character spacing. Extra word spacing will grow + * ratio times more than extra character spacing. */ private float spaceCharRatio = SPACE_CHAR_RATIO_DEFAULT; /** - * Use this method to gets the space/character extra spacing ratio - * for fully justified text. + * Use this method to gets the space/character extra spacing ratio for fully justified text. + * * @return the space/character extra spacing ratio */ public float getSpaceCharRatio() { @@ -2661,51 +2971,54 @@ public float getSpaceCharRatio() { } /** - * Use this method to set the ratio between the extra word spacing and - * the extra character spacing when the text is fully justified. - * Extra word spacing will grow spaceCharRatio times more - * than extra character spacing. If the ratio is PdfWriter.NO_SPACE_CHAR_RATIO - * then the extra character spacing will be zero. + * Use this method to set the ratio between the extra word spacing and the extra character spacing when the text is + * fully justified. Extra word spacing will grow spaceCharRatio times more than extra character + * spacing. If the ratio is PdfWriter.NO_SPACE_CHAR_RATIO then the extra character spacing will be + * zero. + * * @param spaceCharRatio the ratio between the extra word spacing and the extra character spacing */ public void setSpaceCharRatio(float spaceCharRatio) { - if (spaceCharRatio < 0.001f) - this.spaceCharRatio = 0.001f; - else - this.spaceCharRatio = spaceCharRatio; + this.spaceCharRatio = Math.max(spaceCharRatio, 0.001f); } // [U7] run direction (doesn't actually do anything) - /** Use the default run direction. */ + /** + * Use the default run direction. + */ public static final int RUN_DIRECTION_DEFAULT = 0; - /** Do not use bidirectional reordering. */ + /** + * Do not use bidirectional reordering. + */ public static final int RUN_DIRECTION_NO_BIDI = 1; - /** Use bidirectional reordering with left-to-right - * preferential run direction. + /** + * Use bidirectional reordering with left-to-right preferential run direction. */ public static final int RUN_DIRECTION_LTR = 2; - /** Use bidirectional reordering with right-to-left - * preferential run direction. + /** + * Use bidirectional reordering with right-to-left preferential run direction. */ public static final int RUN_DIRECTION_RTL = 3; protected int runDirection = RUN_DIRECTION_NO_BIDI; /** - * Use this method to set the run direction. - * This is only used as a placeholder as it does not affect anything. + * Use this method to set the run direction. This is only used as a placeholder as it does not affect anything. + * * @param runDirection the run direction */ public void setRunDirection(int runDirection) { - if (runDirection < RUN_DIRECTION_NO_BIDI || runDirection > RUN_DIRECTION_RTL) + if (runDirection < RUN_DIRECTION_NO_BIDI || runDirection > RUN_DIRECTION_RTL) { throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.run.direction.1", runDirection)); + } this.runDirection = runDirection; } /** * Use this method to set the run direction. + * * @return the run direction */ public int getRunDirection() { @@ -2714,40 +3027,45 @@ public int getRunDirection() { // [U8] user units - protected float userunit = 0f; + protected float userunit = 0f; + /** - * Use this method to get the user unit. - * A user unit is a value that defines the default user space unit. - * The minimum UserUnit is 1 (1 unit = 1/72 inch). - * The maximum UserUnit is 75,000. - * Note that this userunit only works starting with PDF1.6! + * Use this method to get the user unit. A user unit is a value that defines the default user space unit. The + * minimum UserUnit is 1 (1 unit = 1/72 inch). The maximum UserUnit is 75,000. Note that this userunit only works + * starting with PDF1.6! + * * @return Returns the userunit. */ public float getUserunit() { return userunit; } + /** - * Use this method to set the user unit. - * A UserUnit is a value that defines the default user space unit. - * The minimum UserUnit is 1 (1 unit = 1/72 inch). - * The maximum UserUnit is 75,000. - * Note that this userunit only works starting with PDF1.6! + * Use this method to set the user unit. A UserUnit is a value that defines the default user space unit. The minimum + * UserUnit is 1 (1 unit = 1/72 inch). The maximum UserUnit is 75,000. Note that this userunit only works starting + * with PDF1.6! + * * @param userunit The userunit to set. * @throws DocumentException on error */ - public void setUserunit(float userunit) throws DocumentException { - if (userunit < 1f || userunit > 75000f) throw new DocumentException(MessageLocalization.getComposedMessage("userunit.should.be.a.value.between.1.and.75000")); - this.userunit = userunit; - setAtLeastPdfVersion(VERSION_1_6); - } + public void setUserunit(float userunit) throws DocumentException { + if (userunit < 1f || userunit > 75000f) { + throw new DocumentException( + MessageLocalization.getComposedMessage("userunit.should.be.a.value.between.1.and.75000")); + } + this.userunit = userunit; + setAtLeastPdfVersion(VERSION_1_6); + } // Miscellaneous topics // [M1] Color settings protected PdfDictionary defaultColorspace = new PdfDictionary(); + /** * Use this method to get the default colorspaces. + * * @return the default colorspaces */ public PdfDictionary getDefaultColorspace() { @@ -2755,19 +3073,19 @@ public PdfDictionary getDefaultColorspace() { } /** - * Use this method to sets the default colorspace that will be applied - * to all the document. The colorspace is only applied if another colorspace - * with the same name is not present in the content. + * Use this method to sets the default colorspace that will be applied to all the document. The colorspace is only + * applied if another colorspace with the same name is not present in the content. *

- * The colorspace is applied immediately when creating templates and - * at the page end for the main document content. - * @param key the name of the colorspace. It can be PdfName.DEFAULTGRAY, PdfName.DEFAULTRGB - * or PdfName.DEFAULTCMYK - * @param cs the colorspace. A null or PdfNull removes any colorspace with the same name + * The colorspace is applied immediately when creating templates and at the page end for the main document content. + * + * @param key the name of the colorspace. It can be PdfName.DEFAULTGRAY, + * PdfName.DEFAULTRGB or PdfName.DEFAULTCMYK + * @param cs the colorspace. A null or PdfNull removes any colorspace with the same name */ public void setDefaultColorspace(PdfName key, PdfObject cs) { - if (cs == null || cs.isNull()) + if (cs == null || cs.isNull()) { defaultColorspace.remove(key); + } defaultColorspace.put(key, cs); } @@ -2780,13 +3098,16 @@ public void setDefaultColorspace(PdfName key, PdfObject cs) { ColorDetails addSimplePatternColorspace(Color color) { int type = ExtendedColor.getType(color); - if (type == ExtendedColor.TYPE_PATTERN || type == ExtendedColor.TYPE_SHADING) - throw new RuntimeException(MessageLocalization.getComposedMessage("an.uncolored.tile.pattern.can.not.have.another.pattern.or.shading.as.color")); + if (type == ExtendedColor.TYPE_PATTERN || type == ExtendedColor.TYPE_SHADING) { + throw new RuntimeException(MessageLocalization.getComposedMessage( + "an.uncolored.tile.pattern.can.not.have.another.pattern.or.shading.as.color")); + } try { switch (type) { case ExtendedColor.TYPE_RGB: if (patternColorspaceRGB == null) { - patternColorspaceRGB = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), null); + patternColorspaceRGB = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), + null); PdfArray array = new PdfArray(PdfName.PATTERN); array.add(PdfName.DEVICERGB); addToBody(array, patternColorspaceRGB.getIndirectReference()); @@ -2794,7 +3115,8 @@ ColorDetails addSimplePatternColorspace(Color color) { return patternColorspaceRGB; case ExtendedColor.TYPE_CMYK: if (patternColorspaceCMYK == null) { - patternColorspaceCMYK = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), null); + patternColorspaceCMYK = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), + null); PdfArray array = new PdfArray(PdfName.PATTERN); array.add(PdfName.DEVICECMYK); addToBody(array, patternColorspaceCMYK.getIndirectReference()); @@ -2802,14 +3124,15 @@ ColorDetails addSimplePatternColorspace(Color color) { return patternColorspaceCMYK; case ExtendedColor.TYPE_GRAY: if (patternColorspaceGRAY == null) { - patternColorspaceGRAY = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), null); + patternColorspaceGRAY = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), + null); PdfArray array = new PdfArray(PdfName.PATTERN); array.add(PdfName.DEVICEGRAY); addToBody(array, patternColorspaceGRAY.getIndirectReference()); } return patternColorspaceGRAY; case ExtendedColor.TYPE_SEPARATION: { - ColorDetails details = addSimple(((SpotColor)color).getPdfSpotColor()); + ColorDetails details = addSimple(((SpotColor) color).getPdfSpotColor()); ColorDetails patternDetails = documentSpotPatterns.get(details); if (patternDetails == null) { patternDetails = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), null); @@ -2823,8 +3146,7 @@ ColorDetails addSimplePatternColorspace(Color color) { default: throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.color.type")); } - } - catch (Exception e) { + } catch (Exception e) { throw new RuntimeException(e.getMessage()); } } @@ -2833,6 +3155,7 @@ ColorDetails addSimplePatternColorspace(Color color) { /** * Use this method to get the strictImageSequence status. + * * @return value of property strictImageSequence */ public boolean isStrictImageSequence() { @@ -2840,10 +3163,9 @@ public boolean isStrictImageSequence() { } /** - * Use this method to set the image sequence, so that it follows - * the text in strict order (or not). - * @param strictImageSequence new value of property strictImageSequence + * Use this method to set the image sequence, so that it follows the text in strict order (or not). * + * @param strictImageSequence new value of property strictImageSequence */ public void setStrictImageSequence(boolean strictImageSequence) { pdf.setStrictImageSequence(strictImageSequence); @@ -2851,26 +3173,30 @@ public void setStrictImageSequence(boolean strictImageSequence) { /** * Use this method to clear text wrapping around images (if applicable). + * * @throws DocumentException on error */ public void clearTextWrap() throws DocumentException { pdf.clearTextWrap(); } - /** Dictionary, containing all the images of the PDF document */ + /** + * Dictionary, containing all the images of the PDF document + */ protected PdfDictionary imageDictionary = new PdfDictionary(); - /** This is the list with all the images in the document. */ - private HashMap images = new HashMap<>(); + /** + * This is the list with all the images in the document. + */ + private final HashMap images = new HashMap<>(); /** - * Use this method to adds an image to the document - * but not to the page resources. It is used with - * templates and Document.add(Image). - * Use this method only if you know what you're doing! + * Use this method to adds an image to the document but not to the page resources. It is used with templates and + * Document.add(Image). Use this method only if you know what you're doing! + * * @param image the Image to add * @return the name of the image added - * @throws PdfException on error + * @throws PdfException on error * @throws DocumentException on error */ public PdfName addDirectImageSimple(Image image) throws DocumentException { @@ -2878,14 +3204,14 @@ public PdfName addDirectImageSimple(Image image) throws DocumentException { } /** - * Adds an image to the document but not to the page resources. - * It is used with templates and Document.add(Image). - * Use this method only if you know what you're doing! - * @param image the Image to add - * @param fixedRef the reference to used. It may be null, - * a PdfIndirectReference or a PRIndirectReference. + * Adds an image to the document but not to the page resources. It is used with templates and + * Document.add(Image). Use this method only if you know what you're doing! + * + * @param image the Image to add + * @param fixedRef the reference to used. It may be null, a PdfIndirectReference or a + * PRIndirectReference. * @return the name of the image added - * @throws PdfException on error + * @throws PdfException on error * @throws DocumentException on error */ public PdfName addDirectImageSimple(Image image, PdfIndirectReference fixedRef) throws DocumentException { @@ -2898,17 +3224,15 @@ public PdfName addDirectImageSimple(Image image, PdfIndirectReference fixedRef) else { if (image.isImgTemplate()) { name = new PdfName("img" + images.size()); - if(image instanceof ImgWMF){ + if (image instanceof ImgWMF) { try { - ImgWMF wmf = (ImgWMF)image; + ImgWMF wmf = (ImgWMF) image; wmf.readWMF(PdfTemplate.createTemplate(this, 0, 0)); - } - catch (Exception e) { + } catch (Exception e) { throw new DocumentException(e); } } - } - else { + } else { PdfIndirectReference dref = image.getDirectReference(); if (dref != null) { PdfName rname = new PdfName("img" + images.size()); @@ -2939,13 +3263,14 @@ public PdfName addDirectImageSimple(Image image, PdfIndirectReference fixedRef) iccArray.add(iccRef); PdfArray colorspace = i.getAsArray(PdfName.COLORSPACE); if (colorspace != null) { - if (colorspace.size() > 1 && PdfName.INDEXED.equals(colorspace.getPdfObject(0))) + if (colorspace.size() > 1 && PdfName.INDEXED.equals(colorspace.getPdfObject(0))) { colorspace.set(1, iccArray); - else + } else { i.put(PdfName.COLORSPACE, iccArray); - } - else + } + } else { i.put(PdfName.COLORSPACE, iccArray); + } } add(i, fixedRef); name = i.name(); @@ -2964,19 +3289,19 @@ public PdfName addDirectImageSimple(Image image, PdfIndirectReference fixedRef) */ PdfIndirectReference add(PdfImage pdfImage, PdfIndirectReference fixedRef) throws PdfException { - if (! imageDictionary.contains(pdfImage.name())) { + if (!imageDictionary.contains(pdfImage.name())) { PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_IMAGE, pdfImage); - if (fixedRef instanceof PRIndirectReference) { - PRIndirectReference r2 = (PRIndirectReference)fixedRef; - fixedRef = new PdfIndirectReference(0, getNewObjectNumber(r2.getReader(), r2.getNumber(), r2.getGeneration())); + if (fixedRef instanceof PRIndirectReference r2) { + fixedRef = new PdfIndirectReference(0, + getNewObjectNumber(r2.getReader(), r2.getNumber(), r2.getGeneration())); } try { - if (fixedRef == null) + if (fixedRef == null) { fixedRef = addToBody(pdfImage).getIndirectReference(); - else + } else { addToBody(pdfImage, fixedRef); - } - catch(IOException ioe) { + } + } catch (IOException ioe) { throw new ExceptionConverter(ioe); } imageDictionary.put(pdfImage.name(), fixedRef); @@ -3000,8 +3325,7 @@ protected PdfIndirectReference add(PdfICCBased icc) { PdfIndirectObject object; try { object = addToBody(icc); - } - catch(IOException ioe) { + } catch (IOException ioe) { throw new ExceptionConverter(ioe); } return object.getIndirectReference(); @@ -3009,18 +3333,23 @@ protected PdfIndirectReference add(PdfICCBased icc) { /** * A HashSet with Stream objects containing JBIG2 Globals + * * @since 2.1.5 */ protected HashMap JBIG2Globals = new HashMap<>(); + /** - * Gets an indirect reference to a JBIG2 Globals stream. - * Adds the stream if it hasn't already been added to the writer. - * @param content a byte array that may already been added to the writer inside a stream object. + * Gets an indirect reference to a JBIG2 Globals stream. Adds the stream if it hasn't already been added to the + * writer. + * + * @param content a byte array that may already been added to the writer inside a stream object. * @return the PdfIndirectReference - * @since 2.1.5 + * @since 2.1.5 */ protected PdfIndirectReference getReferenceJBIG2Globals(byte[] content) { - if (content == null) return null; + if (content == null) { + return null; + } PdfStream stream; for (PdfStream pdfStream : JBIG2Globals.keySet()) { stream = pdfStream; @@ -3044,9 +3373,9 @@ protected PdfIndirectReference getReferenceJBIG2Globals(byte[] content) { /** * Checks if a Table fits the current page of the PdfDocument. * - * @param table the table that has to be checked - * @param margin a certain margin - * @return true if the Table fits the page, false otherwise. + * @param table the table that has to be checked + * @param margin a certain margin + * @return true if the Table fits the page, false otherwise. */ public boolean fitsPage(Table table, float margin) { @@ -3056,8 +3385,8 @@ public boolean fitsPage(Table table, float margin) { /** * Checks if a Table fits the current page of the PdfDocument. * - * @param table the table that has to be checked - * @return true if the Table fits the page, false otherwise. + * @param table the table that has to be checked + * @return true if the Table fits the page, false otherwise. */ public boolean fitsPage(Table table) { @@ -3071,6 +3400,7 @@ public boolean fitsPage(Table table) { /** * Gets the flag indicating the presence of structure elements that contain user properties attributes. + * * @return the user properties flag */ public boolean isUserProperties() { @@ -3079,6 +3409,7 @@ public boolean isUserProperties() { /** * Sets the flag indicating the presence of structure elements that contain user properties attributes. + * * @param userProperties the user properties flag */ public void setUserProperties(boolean userProperties) { @@ -3092,6 +3423,7 @@ public void setUserProperties(boolean userProperties) { /** * Gets the transparency blending colorspace. + * * @return true if the transparency blending colorspace is RGB, false * if it is the default blending colorspace * @since 2.1.0 @@ -3101,13 +3433,14 @@ public boolean isRgbTransparencyBlending() { } /** - * Sets the transparency blending colorspace to RGB. The default blending colorspace is - * CMYK and will result in faded colors in the screen and in printing. Calling this method - * will return the RGB colors to what is expected. The RGB blending will be applied to all subsequent pages - * until other value is set. - * Note that this is a generic solution that may not work in all cases. - * @param rgbTransparencyBlending true to set the transparency blending colorspace to RGB, false - * to use the default blending colorspace + * Sets the transparency blending colorspace to RGB. The default blending colorspace is CMYK and will result in + * faded colors in the screen and in printing. Calling this method will return the RGB colors to what is expected. + * The RGB blending will be applied to all subsequent pages until other value is set. Note that this is a generic + * solution that may not work in all cases. + * + * @param rgbTransparencyBlending true to set the transparency blending colorspace to RGB, + * false + * to use the default blending colorspace * @since 2.1.0 */ public void setRgbTransparencyBlending(boolean rgbTransparencyBlending) { diff --git a/openpdf/src/main/resources/com/lowagie/text/error_messages/en.lng b/openpdf/src/main/resources/com/lowagie/text/error_messages/en.lng index 656740708..1a98455eb 100644 --- a/openpdf/src/main/resources/com/lowagie/text/error_messages/en.lng +++ b/openpdf/src/main/resources/com/lowagie/text/error_messages/en.lng @@ -368,7 +368,7 @@ unexpected.end.of.file=Unexpected end of file. unexpected.eof=Unexpected EOF unexpected.gt.gt=Unexpected '>>' unexpected.close.bracket=Unexpected ']' -unknown.color.format.must.be.rgb.or.rrggbb=Unknown color format. Must be #RGB or #RRGGBB +unknown.color.format.must.be.rgb.or.rrggbb=Unknown color format. Must be #RGB, #RRGGBB, #RGBA or #RRGGBBAA unknown.encryption.type.r.eq.1=Unknown encryption type R = {1} unknown.encryption.type.v.eq.1=Unknown encryption type V = {1} unknown.filter.1=Unknown filter: {1} @@ -387,6 +387,7 @@ while.removing.wmf.placeable.header=while removing wmf placeable header writelength.can.only.be.called.after.output.of.the.stream.body=writeLength() can only be called after output of the stream body. writelength.can.only.be.called.in.a.contructed.pdfstream.inputstream.pdfwriter=writeLength() can only be called in a contructed PdfStream(InputStream,PdfWriter). wrong.number.of.columns=Wrong number of columns. +xref.infinite.loop=An infinite loop was detected in the xref table. xref.subsection.not.found=xref subsection not found xstep.or.ystep.can.not.be.zero=XStep or YStep can not be ZERO. you.can.only.add.a.writer.to.a.pdfdocument.once=You can only add a writer to a PdfDocument once. @@ -405,4 +406,5 @@ you.have.to.consolidate.the.named.destinations.of.your.reader=You have to consol you.have.to.define.a.boolean.array.for.this.collection.sort.dictionary=You have to define a boolean array for this collection sort dictionary. you.have.used.the.wrong.constructor.for.this.fieldpositioningevents.class=You have used the wrong constructor for this FieldPositioningEvents class. you.must.set.a.value.before.adding.a.prefix=You must set a value before adding a prefix. -you.need.a.single.boolean.for.this.collection.sort.dictionary=You need a single boolean for this collection sort dictionary. \ No newline at end of file +you.need.a.single.boolean.for.this.collection.sort.dictionary=You need a single boolean for this collection sort dictionary. +you.should.call.document.close.instead=Please call Document.close() instead. The PdfWriter will then be closed automatically. diff --git a/openpdf/src/main/resources/com/lowagie/text/error_messages/nl.lng b/openpdf/src/main/resources/com/lowagie/text/error_messages/nl.lng index b4734eb90..fa20942e0 100644 --- a/openpdf/src/main/resources/com/lowagie/text/error_messages/nl.lng +++ b/openpdf/src/main/resources/com/lowagie/text/error_messages/nl.lng @@ -66,7 +66,7 @@ blend.mode.1.not.allowed=Blend mode {1} niet toegelaten. bookmark.end.tag.out.of.place=Bookmark end tag op verkeerde plaats. both.colors.must.be.of.the.same.type=Beide kleuren moeten van het zelfde type zijn. buffersize.1=bufferlengte {1} -can.only.push.back.one.byte=Werkt enkel met één byte ineens. +can.only.push.back.one.byte=Werkt enkel met ��n byte ineens. can.t.add.1.to.multicolumntext.with.complex.columns={1} kan niet toegevoegd worden aan een MultiColumnText met complexe kolommen can.t.decode.pkcs7signeddata.object=Kan het PKCS7SignedData object niet decoderen can.t.find.page.size.1=Kan de pagina afmetingen niet vinden {1} @@ -82,7 +82,7 @@ colorspace.rgb.is.not.allowed=Colorspace RGB is niet toegelaten. column.coordinate.of.location.must.be.gt.eq.0.and.lt.nr.of.columns=Kolom coordinaat moet groter dan of gelijk zijn aan 0 en kleiner dan het aantal kolommen columntext.go.with.simulate.eq.eq.false.and.text.eq.eq.null=ColumnText.go met simulate==false en text==null. components.must.be.1.3.or.4=Componenten moeten 1, 3, of 4 zijn. -compression.jpeg.is.only.supported.with.a.single.strip.this.image.has.1.strips=Compressie JPEG wordt enkel ondersteund voor één enkele strip. Jouw JPEG heeft {1} strips. +compression.jpeg.is.only.supported.with.a.single.strip.this.image.has.1.strips=Compressie JPEG wordt enkel ondersteund voor ��n enkele strip. Jouw JPEG heeft {1} strips. content.can.not.be.added.to.a.pdfimportedpage=Er kan geen extra content toegevoegd worden aan een PdfImportedPage. content.was.already.written.to.the.output=Er werd al inhoud naar de output gestuurd. corrupted.png.file=Corrupt PNG bestand. @@ -387,6 +387,7 @@ while.removing.wmf.placeable.header=tijdens het verwijderen van een wmf position writelength.can.only.be.called.after.output.of.the.stream.body=writeLength() kan alleen opgeroepen worden na output van de stream body. writelength.can.only.be.called.in.a.contructed.pdfstream.inputstream.pdfwriter=writeLength() kan alleen opgeroepen worden in een aldus aangemaakte stream: PdfStream(InputStream,PdfWriter). wrong.number.of.columns=Verkeerd aantal kolommen. +xref.infinite.loop=Er is een eindeloos lus gedetecteerd in de xref-tabel. xref.subsection.not.found=xref subsectie niet gevonden xstep.or.ystep.can.not.be.zero=XStep of YStep kan niet nul zijn. you.can.only.add.a.writer.to.a.pdfdocument.once=Je kan een writer slecht een enkele keer toevoegen aan een PdfDocument. @@ -397,7 +398,7 @@ you.can.t.add.an.element.of.type.1.to.a.simplecell=Je kan geen element van type you.can.t.add.cells.to.a.table.directly.add.them.to.a.row.first=Je kan geen cellen toevoegen aan een tabel, zonder ze eerst aan een rij toe te voegen. you.can.t.add.listitems.rows.or.cells.to.a.cell=Je kan geen lijst items, rijen of cellen toevoegen aan een cell. you.can.t.add.one.row.to.another.row=Je kan rijen niet aan rijen toevoegen. -you.can.t.have.1.pages.on.one.page.minimum.2.maximum.8=Je kan geen {1} pagina's op één blad plaatsen (minimum 2; maximum 8). +you.can.t.have.1.pages.on.one.page.minimum.2.maximum.8=Je kan geen {1} pagina's op ��n blad plaatsen (minimum 2; maximum 8). you.can.t.set.the.initial.leading.if.the.document.is.already.open=Je kan geen initial leading bepalen als het document al open is. you.can.t.split.this.document.at.page.1.there.is.no.such.page=Je kan dit document niet splitsen op pagina {1}; Die pagina bestaat niet. you.can.t.translate.a.negative.number.into.an.alphabetical.value=Je kan een negatieve waarde niet omzetten naar een alfabetische waarde. diff --git a/openpdf/src/main/resources/com/lowagie/text/error_messages/pt.lng b/openpdf/src/main/resources/com/lowagie/text/error_messages/pt.lng index 1e6b3cf66..7d6709c4b 100644 --- a/openpdf/src/main/resources/com/lowagie/text/error_messages/pt.lng +++ b/openpdf/src/main/resources/com/lowagie/text/error_messages/pt.lng @@ -5,3 +5,4 @@ fdf.header.not.found=Início de FDF não encontrado. greaterthan.not.expected='>' inesperado pdf.header.not.found=Início de PDF não encontrado. pdf.startxref.not.found=startxref de PDF não encontrado. +xref.infinite.loop=Um loop infinito foi detectado na tabela xref. diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfWriterTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfWriterTest.java new file mode 100644 index 000000000..8c4a09b21 --- /dev/null +++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfWriterTest.java @@ -0,0 +1,42 @@ +package com.lowagie.text.pdf; + +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.assertj.core.api.Assertions.assertThatNoException; + +import com.lowagie.text.Document; +import com.lowagie.text.PageSize; +import com.lowagie.text.Phrase; +import java.io.ByteArrayOutputStream; +import org.junit.jupiter.api.Test; + +class PdfWriterTest { + + // Test case to check that a PdfWriter may not be closed before the including document is closed + @Test + void testCloseBeforeDocumentClose() { + try (Document document = new Document(PageSize.A4)) { + // given + PdfWriter writer = PdfWriter.getInstance(document, new ByteArrayOutputStream()); + document.open(); + document.add(new Phrase("Hello World")); + // then + assertThatIllegalStateException().isThrownBy(writer::close) + .withMessage("Please call Document.close() instead. The PdfWriter will then be closed automatically."); + } + } + + @Test + void testCloseAfterDocumentClose() { + try (Document document = new Document(PageSize.A4)) { + // given + PdfWriter writer = PdfWriter.getInstance(document, new ByteArrayOutputStream()); + document.open(); + document.add(new Phrase("Hello World")); + document.close(); + // then + assertThatNoException().isThrownBy(writer::close); + } + } + + +} From f645eff1289a6b442804ccfa7972f84d0db138de Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Thu, 29 Feb 2024 20:26:44 +0100 Subject: [PATCH 15/31] GitHub actions: build on PRs for 1.3 and 1.4 too --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5166c583c..da54cd1b2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -6,7 +6,7 @@ on: push: branches: [ '*' ] pull_request: - branches: [ master ] + branches: [ master, 1.3-java8, 1.4-java11 ] permissions: contents: read From 41112ebb19be116914a0c1506ead2b06fb036718 Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Thu, 29 Feb 2024 20:57:09 +0100 Subject: [PATCH 16/31] Restores Java11 compatibility --- .../main/java/com/lowagie/text/pdf/PdfWriter.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java index 011bd9140..37d42f445 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java @@ -506,10 +506,10 @@ public int compareTo(final PdfCrossReference reference) { */ @Override public boolean equals(Object obj) { - if (!(obj instanceof PdfCrossReference other)) { + if (!(obj instanceof PdfCrossReference)) { return false; } - + PdfCrossReference other = (PdfCrossReference) obj; return refnum == other.refnum; } @@ -1319,7 +1319,8 @@ protected void addSharedObjectsToBody() throws IOException { for (Map.Entry entry : documentProperties.entrySet()) { Object prop = entry.getKey(); PdfObject[] obj = entry.getValue(); - if (prop instanceof PdfLayerMembership layer) { + if (prop instanceof PdfLayerMembership) { + PdfLayerMembership layer = (PdfLayerMembership) prop; addToBody(layer.getPdfObject(), layer.getRef()); } else if ((prop instanceof PdfDictionary) && !(prop instanceof PdfLayer)) { addToBody((PdfDictionary) prop, (PdfIndirectReference) obj[1]); @@ -2785,7 +2786,8 @@ protected void fillOCProperties(boolean erase) { void registerLayer(PdfOCG layer) { PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_LAYER, null); - if (layer instanceof PdfLayer la) { + if (layer instanceof PdfLayer) { + PdfLayer la = (PdfLayer) layer; if (la.getTitle() == null) { if (!documentOCG.contains(layer)) { documentOCG.add(layer); @@ -3291,7 +3293,8 @@ public PdfName addDirectImageSimple(Image image, PdfIndirectReference fixedRef) PdfIndirectReference add(PdfImage pdfImage, PdfIndirectReference fixedRef) throws PdfException { if (!imageDictionary.contains(pdfImage.name())) { PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_IMAGE, pdfImage); - if (fixedRef instanceof PRIndirectReference r2) { + if (fixedRef instanceof PRIndirectReference) { + PRIndirectReference r2 = (PRIndirectReference) fixedRef; fixedRef = new PdfIndirectReference(0, getNewObjectNumber(r2.getReader(), r2.getNumber(), r2.getGeneration())); } From 3a1b1aaaadae949b8ae3a41e971eb14e001497a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9cile=20Vuilleumier?= Date: Tue, 27 Feb 2024 10:27:02 +0100 Subject: [PATCH 17/31] Provide PDF/A conform annotations --- .../main/java/com/lowagie/text/pdf/PdfAnnotation.java | 9 +++++++++ .../src/main/java/com/lowagie/text/pdf/PdfWriter.java | 4 ++++ .../com/lowagie/text/validation/PDFValidationTest.java | 10 +++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfAnnotation.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfAnnotation.java index be7b16dfc..e409c5476 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfAnnotation.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfAnnotation.java @@ -220,6 +220,7 @@ public PdfAnnotation(PdfWriter writer, Rectangle rect) { if (rect != null) { put(PdfName.RECT, new PdfRectangle(rect)); } + addFKey(); } /** @@ -239,6 +240,7 @@ public PdfAnnotation(PdfWriter writer, float llx, float lly, float urx, float ur put(PdfName.T, title); put(PdfName.RECT, new PdfRectangle(llx, lly, urx, ury)); put(PdfName.CONTENTS, content); + addFKey(); } /** @@ -259,6 +261,7 @@ public PdfAnnotation(PdfWriter writer, float llx, float lly, float urx, float ur put(PdfName.A, action); put(PdfName.BORDER, new PdfBorderArray(0, 0, 0)); put(PdfName.C, new PdfColor(0x00, 0x00, 0xFF)); + addFKey(); } /** @@ -1073,4 +1076,10 @@ public String toString() { return buf.toString(); } } + + private void addFKey() { + if (writer.isPdfA1()) { + put(PdfName.F, new PdfNumber(FLAGS_PRINT)); + } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java index 37d42f445..82458e388 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java @@ -1964,6 +1964,10 @@ public boolean isPdfX() { return pdfxConformance.isPdfX(); } + public boolean isPdfA1() { + return pdfxConformance.isPdfA1(); + } + // [C11] Output intents /** diff --git a/openpdf/src/test/java/com/lowagie/text/validation/PDFValidationTest.java b/openpdf/src/test/java/com/lowagie/text/validation/PDFValidationTest.java index 383712d6a..046242edc 100644 --- a/openpdf/src/test/java/com/lowagie/text/validation/PDFValidationTest.java +++ b/openpdf/src/test/java/com/lowagie/text/validation/PDFValidationTest.java @@ -5,6 +5,7 @@ import com.lowagie.text.PageSize; import com.lowagie.text.Rectangle; import com.lowagie.text.pdf.PdfWriter; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.verapdf.core.ModelParsingException; import org.verapdf.gf.model.GFModelParser; @@ -24,10 +25,12 @@ public class PDFValidationTest { @Test - void validatePDFWithVera() throws Exception { + public void testValidatePDFWithVera() throws Exception { Document document = new Document(PageSize.A4); ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - PdfWriter.getInstance(document, byteArrayOutputStream); + PdfWriter pdfWriter = PdfWriter.getInstance(document, byteArrayOutputStream); + pdfWriter.setPDFXConformance(PdfWriter.PDFA1B); + pdfWriter.createXmpMetadata(); try { document.open(); @@ -39,7 +42,7 @@ void validatePDFWithVera() throws Exception { document.close(); // Create a veraPDF validator - PDFAFlavour flavour = PDFAFlavour.PDFA_1_A; + PDFAFlavour flavour = PDFAFlavour.PDFA_1_B; try (InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray()); GFModelParser parser = GFModelParser.createModelWithFlavour(inputStream, flavour)) { PDFAValidator validator = ValidatorFactory.createValidator(flavour, false, 10); @@ -56,6 +59,7 @@ void validatePDFWithVera() throws Exception { } } + Assertions.assertTrue(result.isCompliant()); } } catch (ModelParsingException e) { e.printStackTrace(); From dd23f5fc9d0eeba6b0360c58499ab5af3ec01b6f Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Tue, 5 Mar 2024 22:21:17 +0100 Subject: [PATCH 18/31] Update surefire - increases coverage by ca. 15% - add back explicit dependency to surefire and failsafe - reformat some files - use more String.getBytes(withEncoding) - Update Disabled-Comment in testSurrogatePair() - other Tests - display maven version in build - some changes to keep tests more robust (cherry picked from commit f17bca3053c4b300c697d0f9742c23e36867cbf4) --- .github/workflows/maven.yml | 4 +- .../lowagie/text/pdf/FontSelectorTest.java | 24 ++- .../pdf/encryption/DecryptAES256R6Test.java | 196 +++++++++--------- .../text/pdf/fonts/AdvanceTypographyTest.java | 3 +- .../pdf/sign/ExtractCertificatesTest.java | 53 ++--- .../examples/fonts/styles/ComplexText.java | 41 ++-- pom.xml | 12 ++ 7 files changed, 176 insertions(+), 157 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index da54cd1b2..bfc7034bd 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,8 +26,10 @@ jobs: with: distribution: temurin java-version: ${{matrix.java}} + - name: Check maven version + run: mvn -v; echo "** ls **"; pwd && ls -l - name: Build with Maven - run: mvn -B verify --file pom.xml -Dgpg.skip + run: mvn -B install --file pom.xml -Dgpg.skip codacy-coverage-reporter: runs-on: ubuntu-latest diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/FontSelectorTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/FontSelectorTest.java index e2c321e09..9676754c5 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/FontSelectorTest.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/FontSelectorTest.java @@ -1,32 +1,34 @@ package com.lowagie.text.pdf; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.lowagie.text.Document; import com.lowagie.text.Font; import com.lowagie.text.PageSize; import com.lowagie.text.pdf.parser.PdfTextExtractor; - - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.io.ByteArrayOutputStream; import java.io.IOException; +import org.junit.jupiter.api.Test; + +class FontSelectorTest { + + public static final String STRING_TO_CHECK = "Some ΧαίÏετε Greek -"; -public class FontSelectorTest { @Test - public void testDefaultFont() throws IOException { + void testDefaultFont() throws IOException { Document document = new Document(PageSize.A4.rotate(), 10, 10, 10, 10); ByteArrayOutputStream stream = new ByteArrayOutputStream(); - PdfWriter.getInstance(document, stream); + PdfWriter writer = PdfWriter.getInstance(document, stream); + writer.setRunDirection(PdfWriter.RUN_DIRECTION_LTR); document.open(); FontSelector selector = new FontSelector(); selector.addFont(new Font(Font.HELVETICA)); - document.add(selector.process("ΧαίÏετεGreek -")); + document.add(selector.process(STRING_TO_CHECK)); document.close(); PdfReader rd = new PdfReader(stream.toByteArray()); PdfTextExtractor pdfTextExtractor = new PdfTextExtractor(rd); - Assertions.assertEquals(pdfTextExtractor.getTextFromPage(1), "ΧαίÏετεGreek -"); + assertEquals(STRING_TO_CHECK, pdfTextExtractor.getTextFromPage(1)); } -} \ No newline at end of file +} diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java index 610ab81b1..25aec12c6 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java @@ -1,7 +1,5 @@ package com.lowagie.text.pdf.encryption; -import static java.nio.charset.StandardCharsets.UTF_8; - import com.lowagie.text.exceptions.BadPasswordException; import com.lowagie.text.exceptions.InvalidPdfException; import com.lowagie.text.pdf.PdfReader; @@ -9,20 +7,21 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; /** - * This class tests the OpenPDF decryption feature for - * AES256 encrypted files according to ISO 32000-2, i.e. - * for R = 6. + * This class tests the OpenPDF decryption feature for AES256 encrypted files according to ISO 32000-2, i.e. for R + * = 6. *

* See also OpenPDF issue 375 * * @author mkl */ class DecryptAES256R6Test { + static Field ownerPasswordUsedField; static boolean isOwnerPasswordUsed(PdfReader pdfReader) { @@ -48,8 +47,8 @@ static void setUpBeforeClass() throws Exception { * pwProtectedAES256_openPDFiss375.pdf * *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The empty user password is used. */ @@ -74,8 +73,8 @@ void testReadPwProtectedAES256_openPDFiss375() throws IOException { *
* Demo1_encrypted_.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The empty user password is used. */ @@ -88,8 +87,7 @@ void testReadDemo1Encrypted() throws IOException { Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); Assertions.assertEquals( - "Demo Name Signature Date Elizabeth Schultz (Apr 24, 2018) Elizabeth Schultz Apr 24, 2018 " - + "Elizabeth Schultz Sue Northrop (Apr 24, 2018) Apr 24, 2018 Sue Northrop", + "Demo Name Signature Date Elizabeth Schultz (Apr 24, 2018) Elizabeth Schultz Apr 24, 2018 Elizabeth Schultz Sue Northrop (Apr 24, 2018) Apr 24, 2018 Sue Northrop", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); pdfReader.close(); } @@ -102,13 +100,13 @@ void testReadDemo1Encrypted() throws IOException { *
* copied-positive-P.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The empty user password is used. */ @Test - public void testReadCopiedPositiveP() throws IOException { + void testReadCopiedPositiveP() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/copied-positive-P.pdf")) { PdfReader pdfReader = new PdfReader(resource); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); @@ -128,15 +126,15 @@ public void testReadCopiedPositiveP() throws IOException { *
* c-r6-in-pw=owner4.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty owner password is used. */ @Test - public void testReadCR6InPwOwner4() throws IOException { + void testReadCR6InPwOwner4() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/c-r6-in-pw=owner4.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "owner4".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "owner4".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -154,15 +152,15 @@ public void testReadCR6InPwOwner4() throws IOException { *
* encrypted_hello_world_r6-pw=hôtel.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty user password is used. */ @Test - public void testReadEncryptedHelloWorldR6PwHotelUtf8() throws IOException { + void testReadEncryptedHelloWorldR6PwHôtel() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/encrypted_hello_world_r6-pw=hôtel.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "hôtel".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "hôtel".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -180,13 +178,13 @@ public void testReadEncryptedHelloWorldR6PwHotelUtf8() throws IOException { *
* encrypted-positive-P.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The empty user password is used. */ @Test - public void testReadEncryptedPositiveP() throws IOException { + void testReadEncryptedPositiveP() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/encrypted-positive-P.pdf")) { PdfReader pdfReader = new PdfReader(resource); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); @@ -204,25 +202,22 @@ public void testReadEncryptedPositiveP() throws IOException { * "Unknown encryption type R = 6" support AES256 * *
- * enc-XI-long-password - * =qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf provided by Lonzak + * enc-XI-long-password=qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf + * provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty identical owner and user password is used. */ @Test - public void testReadEncXiLongPassword() throws IOException { + void testReadEncXiLongPassword() throws IOException { try ( InputStream resource = getClass().getResourceAsStream( - "/issue375/enc-XI-long-password" - + - "=qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf") + "/issue375/enc-XI-long-password=qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf") ) { PdfReader pdfReader = new PdfReader(resource, - "qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv".getBytes( - UTF_8)); + "qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -240,13 +235,13 @@ public void testReadEncXiLongPassword() throws IOException { *
* enc-XI-R6,V5,O=master.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The empty user password is used. */ @Test - public void testReadEncXiR6V5OMaster_User() throws IOException { + void testReadEncXiR6V5OMaster_User() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,O=master.pdf")) { PdfReader pdfReader = new PdfReader(resource); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); @@ -266,15 +261,15 @@ public void testReadEncXiR6V5OMaster_User() throws IOException { *
* enc-XI-R6,V5,O=master.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty owner password is used. */ @Test - public void testReadEncXiR6V5OMaster_Owner() throws IOException { + void testReadEncXiR6V5OMaster_Owner() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,O=master.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "master".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "master".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -292,19 +287,19 @@ public void testReadEncXiR6V5OMaster_Owner() throws IOException { *
* enc-XI-R6,V5,U=attachment,encrypted-attachments.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* TODO: OpenPdf currently only supports all-or-nothing encryption * (except Metadata and signatures) but in this test file only the * embedded file is encrypted. */ @Test - public void testReadEncXiR6V5UAttachmentEncryptedAttachments() { + void testReadEncXiR6V5UAttachmentEncryptedAttachments() { Assertions.assertThrows(InvalidPdfException.class, () -> { try (InputStream resource = getClass().getResourceAsStream( "/issue375/enc-XI-R6,V5,U=attachment,encrypted-attachments.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "attachment".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "attachment".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); @@ -322,16 +317,16 @@ public void testReadEncXiR6V5UAttachmentEncryptedAttachments() { *
* enc-XI-R6,V5,U=view,attachments,cleartext-metadata.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty identical owner and user password is used. */ @Test - public void testReadEncXiR6V5UViewAttachmentsCleartextMetadata() throws IOException { + void testReadEncXiR6V5UViewAttachmentsCleartextMetadata() throws IOException { try (InputStream resource = getClass().getResourceAsStream( "/issue375/enc-XI-R6,V5,U=view,attachments,cleartext-metadata.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "view".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "view".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -349,15 +344,15 @@ public void testReadEncXiR6V5UViewAttachmentsCleartextMetadata() throws IOExcept *
* enc-XI-R6,V5,U=view,O=master.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty user password is used. */ @Test - public void testReadEncXiR6V5UViewOMaster_User() throws IOException { + void testReadEncXiR6V5UViewOMaster_User() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=view,O=master.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "view".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "view".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -375,15 +370,15 @@ public void testReadEncXiR6V5UViewOMaster_User() throws IOException { *
* enc-XI-R6,V5,U=view,O=master.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty user password is used. */ @Test - public void testReadEncXiR6V5UViewOMaster_Owner() throws IOException { + void testReadEncXiR6V5UViewOMaster_Owner() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=view,O=master.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "master".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "master".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -401,15 +396,15 @@ public void testReadEncXiR6V5UViewOMaster_Owner() throws IOException { *
* enc-XI-R6,V5,U=wwwww,O=wwwww.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty identical owner and user password is used. */ @Test - public void testReadEncXiR6V5UWwwwwOWwwww() throws IOException { + void testReadEncXiR6V5UWwwwwOWwwww() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=wwwww,O=wwwww.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "wwwww".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "wwwww".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -427,15 +422,15 @@ public void testReadEncXiR6V5UWwwwwOWwwww() throws IOException { *
* graph-encrypted-pw=user.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty user password is used. */ @Test - public void testReadGraphEncryptedPwUser() throws IOException { + void testReadGraphEncryptedPwUser() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/graph-encrypted-pw=user.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "user".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "user".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -453,15 +448,15 @@ public void testReadGraphEncryptedPwUser() throws IOException { *
* issue6010_1-pw=owner.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty owner password is used. */ @Test - public void testReadIssue60101PwOwner() throws IOException { + void testReadIssue60101PwOwner() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/issue6010_1-pw=owner.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "owner".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "owner".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -479,15 +474,15 @@ public void testReadIssue60101PwOwner() throws IOException { *
* issue6010_2-pw=æøå.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty owner password is used. */ @Test - public void testReadIssue60102PaeoeaaUtf8() throws IOException { + void testReadIssue60102Pwæøå() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/issue6010_2-pw=æøå.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "æøå".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "æøå".getBytes(StandardCharsets.UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(10, pdfReader.getNumberOfPages(), @@ -508,15 +503,15 @@ public void testReadIssue60102PaeoeaaUtf8() throws IOException { *
* MuPDF-AES256-R6-u=user-o=owner.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty user password is used. */ @Test - public void testReadMuPDFAes256R6UUserOOwner_User() throws IOException { + void testReadMuPDFAes256R6UUserOOwner_User() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/MuPDF-AES256-R6-u=user-o=owner.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "user".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "user".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -534,15 +529,15 @@ public void testReadMuPDFAes256R6UUserOOwner_User() throws IOException { *
* MuPDF-AES256-R6-u=user-o=owner.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty owner password is used. */ @Test - public void testReadMuPDFAes256R6UUserOOwner_Owner() throws IOException { + void testReadMuPDFAes256R6UUserOOwner_Owner() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/MuPDF-AES256-R6-u=user-o=owner.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "owner".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "owner".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -560,15 +555,15 @@ public void testReadMuPDFAes256R6UUserOOwner_Owner() throws IOException { *
* nontrivial-crypt-filter.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* TODO: OpenPdf currently only supports all-or-nothing encryption * (except Metadata and signatures) but in this test file only the * embedded file is encrypted. */ @Test - public void testReadNonTrivialCryptFilter() { + void testReadNonTrivialCryptFilter() { Assertions.assertThrows(BadPasswordException.class, () -> { try (InputStream resource = getClass().getResourceAsStream("/issue375/nontrivial-crypt-filter.pdf")) { PdfReader pdfReader = new PdfReader(resource); @@ -589,15 +584,15 @@ public void testReadNonTrivialCryptFilter() { *
* pr6531_1-pw=asdfasdf.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty owner password is used. */ @Test - public void testReadPr65311PwAsdfasdf() throws IOException { + void testReadPr65311PwAsdfasdf() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/pr6531_1-pw=asdfasdf.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "asdfasdf".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "asdfasdf".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -615,15 +610,15 @@ public void testReadPr65311PwAsdfasdf() throws IOException { *
* pr6531_2-pw=asdfasdf.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty user password is used. */ @Test - public void testReadPr65312PwAsdfasdf() throws IOException { + void testReadPr65312PwAsdfasdf() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/pr6531_2-pw=asdfasdf.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "asdfasdf".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "asdfasdf".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -640,15 +635,15 @@ public void testReadPr65312PwAsdfasdf() throws IOException { *
* unfilterable-with-crypt.pdf provided by Lonzak *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* TODO: OpenPdf currently only supports all-or-nothing encryption * (except Metadata and signatures) but in this test file only * certain streams with Crypt filters are encrypted. */ @Test - public void testReadUnfilterableWithCrypt() { + void testReadUnfilterableWithCrypt() { Assertions.assertThrows(BadPasswordException.class, () -> { try (InputStream resource = getClass().getResourceAsStream("/issue375/unfilterable-with-crypt.pdf")) { PdfReader pdfReader = new PdfReader(resource); @@ -663,7 +658,8 @@ public void testReadUnfilterableWithCrypt() { } /** - * + * * How to remove password in password-protected pdf using iText 7 * *
@@ -671,15 +667,15 @@ public void testReadUnfilterableWithCrypt() { * THISISATEST_PWP.pdf * *

- * This test method checks whether OpenPdf can correctly decrypt - * a file which is AES256 encrypted according to ISO 32000-2. + * This test method checks whether OpenPdf can correctly decrypt a file which is AES256 encrypted according to ISO + * 32000-2. *

* The non-empty owner password is used. */ @Test void testReadTHISISATEST_PWP() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/THISISATEST_PWP.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "password".getBytes(UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "password".getBytes()); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(2, pdfReader.getNumberOfPages(), diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java index e9a95504d..9afcfa0b4 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java @@ -80,7 +80,8 @@ void testInMemoryFonts() throws Exception { assertArrayEquals(expectedOutput, str.toCharArray()); } - @Disabled("This test is failing, need to investigate. @YOSHIDA may know the reason.") + @Disabled("This test is failing, need to investigate. @YOSHIDA may know the reason." + + "Should work, when GH-591 #592 is fixed.") @Test void testSurrogatePair() throws Exception { diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/sign/ExtractCertificatesTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/sign/ExtractCertificatesTest.java index 3005bb3e9..21a7fbfbb 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/sign/ExtractCertificatesTest.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/sign/ExtractCertificatesTest.java @@ -1,15 +1,16 @@ package com.lowagie.text.pdf.sign; +import static org.assertj.core.api.Assertions.assertThat; + +import com.lowagie.text.pdf.AcroFields; +import com.lowagie.text.pdf.PdfPKCS7; +import com.lowagie.text.pdf.PdfPKCS7.X509Name; +import com.lowagie.text.pdf.PdfReader; import java.security.KeyStore; import java.security.cert.Certificate; import java.security.cert.X509Certificate; -import java.util.ArrayList; import java.util.Calendar; import java.util.List; - -import com.lowagie.text.pdf.AcroFields; -import com.lowagie.text.pdf.PdfPKCS7; -import com.lowagie.text.pdf.PdfReader; import org.junit.jupiter.api.Test; class ExtractCertificatesTest { @@ -21,29 +22,26 @@ class ExtractCertificatesTest { @Test void testSha1() throws Exception { - extract("src/test/resources/sample_signed-sha1.pdf"); + extract("src/test/resources/sample_signed-sha1.pdf", false); } @Test void testSha512() throws Exception { - extract("src/test/resources/sample_signed-sha512.pdf"); + extract("src/test/resources/sample_signed-sha512.pdf", false); } /** - * Extract certificates and validate timestamp - * Sample file taken from https://www.tecxoft.com/samples.php (it has signature with timestamp with SHA-256) - * NB: Signature will only be valid till 2022/01/02 (Hence only Sout is used not assert) - * - * @throws Exception + * Extract certificates and validate timestamp Sample file taken from ... (it has signature with timestamp with SHA-256) NB: Signature + * will only be valid till 2022/01/02 (Hence only Sout is used not assert) */ @Test void testSha256TimeStamp() throws Exception { - extract("src/test/resources/pdf_digital_signature_timestamp.pdf"); + extract("src/test/resources/pdf_digital_signature_timestamp.pdf", true); } - private void extract(String pdf) throws Exception { + private void extract(String pdf, boolean isExpectedValidTimeStamp) throws Exception { - List certificates = new ArrayList<>(); System.out.println("pdf name: " + pdf); KeyStore kall = PdfPKCS7.loadCacertsKeyStore(); @@ -52,29 +50,32 @@ private void extract(String pdf) throws Exception { AcroFields fields = reader.getAcroFields(); List signatures = fields.getSignedFieldNames(); - System.out.println("Signs: " + signatures.size()); + assertThat(signatures).isNotEmpty().hasSize(1); for (String signature : signatures) { - System.out.println("Signature name: " + signature); - System.out.println("Signature covers whole document: " + fields.signatureCoversWholeDocument(signature)); - System.out.println( - "Document revision: " + fields.getRevision(signature) + " of " + fields.getTotalRevisions()); + assertThat(signature).isNotEmpty(); + boolean isWholeDocumentCovered = fields.signatureCoversWholeDocument(signature); + assertThat(isWholeDocumentCovered).isTrue(); + assertThat(fields.getRevision(signature)).isEqualTo(1); + assertThat(fields.getTotalRevisions()).isEqualTo(1); PdfPKCS7 pk = fields.verifySignature(signature); Calendar cal = pk.getSignDate(); Certificate[] pkc = pk.getCertificates(); X509Certificate certificate = pk.getSigningCertificate(); - certificates.add(certificate); - System.out.println("sign date:" + cal.getTime()); - System.out.println("Subject: " + PdfPKCS7.getSubjectFields(certificate)); - System.out.println("Document modified: " + !pk.verify()); - System.out.println("Timestamp valid: " + pk.verifyTimestampImprint()); + assertThat(cal).isLessThan(Calendar.getInstance()); + X509Name subjectFields = PdfPKCS7.getSubjectFields(certificate); + assertThat(subjectFields).isNotNull(); + assertThat(subjectFields.getAllFields()).isNotEmpty() + .containsKey("C"); + assertThat(pk.verify()).isTrue(); + assertThat(pk.verifyTimestampImprint()).isEqualTo(isExpectedValidTimeStamp); Object[] fails = PdfPKCS7.verifyCertificates(pkc, kall, null, cal); if (fails == null) { System.out.println("Certificates verified against the KeyStore"); } else { - System.out.println("Certificate failed: " + fails[1]); + System.err.println("Certificate failed: " + fails[1]); } } diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java index 659da7960..f28fb51a7 100644 --- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java +++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java @@ -9,13 +9,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * + * */ package com.lowagie.examples.fonts.styles; -import java.io.FileOutputStream; -import java.io.IOException; - import com.lowagie.text.Document; import com.lowagie.text.DocumentException; import com.lowagie.text.Font; @@ -24,32 +21,37 @@ import com.lowagie.text.pdf.ColumnText; import com.lowagie.text.pdf.PdfContentByte; import com.lowagie.text.pdf.PdfWriter; +import java.io.FileOutputStream; +import java.io.IOException; + /** * Adding text at an absolute position. */ public class ComplexText { + /** * Adding text at absolute positions. + * * @param args no arguments needed */ public static void main(String[] args) { - + System.out.println("Text at absolute positions"); - + // step 1: creation of a document-object Document document = new Document(); - + try { - + // step 2: creation of the writer PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("complextext.pdf")); - + // step 3: we open the document document.open(); - + // step 4: we grab the ContentByte and do some stuff with it PdfContentByte cb = writer.getDirectContent(); - + // first we draw some lines to be able to visualize the text alignment functions cb.setLineWidth(0f); cb.moveTo(250, 500); @@ -61,22 +63,25 @@ public static void main(String[] args) { cb.moveTo(50, 600); cb.lineTo(400, 600); cb.stroke(); - + // we construct a font BaseFont bf = BaseFont.createFont("c:\\windows\\fonts\\arialuni.ttf", BaseFont.IDENTITY_H, true); Font ft = new Font(bf, 12); // This is the text: String text = "\u0623\u0648\u0631\u0648\u0628\u0627, \u0628\u0631\u0645\u062c\u064a\u0627\u062a \u0627\u0644\u062d\u0627\u0633\u0648\u0628 + \u0627\u0646\u062a\u0631\u0646\u064a\u062a :"; Phrase center = new Phrase(text + " Center", ft); - ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_CENTER, center, 250, 700, 0, PdfWriter.RUN_DIRECTION_RTL, 0); - ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_RIGHT, new Phrase(text + " Right", ft), 250, 650, 20, PdfWriter.RUN_DIRECTION_RTL, 0); - ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_LEFT, new Phrase("Some text Left aligned", ft), 250, 600, 20); + ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_CENTER, center, 250, 700, 0, + PdfWriter.RUN_DIRECTION_RTL, 0); + ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_RIGHT, new Phrase(text + " Right", ft), 250, 650, 20, + PdfWriter.RUN_DIRECTION_RTL, 0); + ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_LEFT, new Phrase("Some text Left aligned", ft), 250, + 600, 20); float size = ColumnText.getWidth(center, PdfWriter.RUN_DIRECTION_RTL, 0); cb.setRGBColorStroke(255, 0, 0); - cb.rectangle(250 - size/2, 690, size, 30); + cb.rectangle(250 - size / 2, 690, size, 30); cb.stroke(); - } - catch(DocumentException | IOException de) { + writer.setRunDirection(PdfWriter.RUN_DIRECTION_DEFAULT); + } catch (DocumentException | IOException de) { System.err.println(de.getMessage()); } diff --git a/pom.xml b/pom.xml index 410965294..3ba960121 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,7 @@ 3.0.1 2.4 3.3.0 + 3.2.5 false 1.6.13 1.2.1 @@ -375,6 +376,17 @@ ${project.build.directory}/pitest + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-surefire-plugin.version} + org.jacoco jacoco-maven-plugin From 4b011cbdb80d7d85a1715abe01f920042706b3c1 Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Wed, 6 Mar 2024 00:52:37 +0100 Subject: [PATCH 19/31] Reduce diff to 1.4-java11 and master - Use more UTF-8 in tests with passwords - rename methods to not have UTF-8 chars in their names --- .../pdf/encryption/DecryptAES256R6Test.java | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java index 25aec12c6..f0f973b85 100644 --- a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java +++ b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java @@ -1,5 +1,7 @@ package com.lowagie.text.pdf.encryption; +import static java.nio.charset.StandardCharsets.UTF_8; + import com.lowagie.text.exceptions.BadPasswordException; import com.lowagie.text.exceptions.InvalidPdfException; import com.lowagie.text.pdf.PdfReader; @@ -7,7 +9,6 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; -import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -87,7 +88,8 @@ void testReadDemo1Encrypted() throws IOException { Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); Assertions.assertEquals( - "Demo Name Signature Date Elizabeth Schultz (Apr 24, 2018) Elizabeth Schultz Apr 24, 2018 Elizabeth Schultz Sue Northrop (Apr 24, 2018) Apr 24, 2018 Sue Northrop", + "Demo Name Signature Date Elizabeth Schultz (Apr 24, 2018) Elizabeth Schultz Apr 24, 2018 " + + "Elizabeth Schultz Sue Northrop (Apr 24, 2018) Apr 24, 2018 Sue Northrop", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1"); pdfReader.close(); } @@ -134,7 +136,7 @@ void testReadCopiedPositiveP() throws IOException { @Test void testReadCR6InPwOwner4() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/c-r6-in-pw=owner4.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "owner4".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "owner4".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -158,9 +160,9 @@ void testReadCR6InPwOwner4() throws IOException { * The non-empty user password is used. */ @Test - void testReadEncryptedHelloWorldR6PwHôtel() throws IOException { + void testReadEncryptedHelloWorldR6PwHotelUtf8() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/encrypted_hello_world_r6-pw=hôtel.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "hôtel".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "hôtel".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -214,10 +216,13 @@ void testReadEncryptedPositiveP() throws IOException { void testReadEncXiLongPassword() throws IOException { try ( InputStream resource = getClass().getResourceAsStream( - "/issue375/enc-XI-long-password=qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf") + "/issue375/enc-XI-long-password" + + + "=qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf") ) { PdfReader pdfReader = new PdfReader(resource, - "qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv".getBytes()); + "qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv".getBytes( + UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -269,7 +274,7 @@ void testReadEncXiR6V5OMaster_User() throws IOException { @Test void testReadEncXiR6V5OMaster_Owner() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,O=master.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "master".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "master".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -299,7 +304,7 @@ void testReadEncXiR6V5UAttachmentEncryptedAttachments() { Assertions.assertThrows(InvalidPdfException.class, () -> { try (InputStream resource = getClass().getResourceAsStream( "/issue375/enc-XI-R6,V5,U=attachment,encrypted-attachments.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "attachment".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "attachment".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages"); @@ -326,7 +331,7 @@ void testReadEncXiR6V5UAttachmentEncryptedAttachments() { void testReadEncXiR6V5UViewAttachmentsCleartextMetadata() throws IOException { try (InputStream resource = getClass().getResourceAsStream( "/issue375/enc-XI-R6,V5,U=view,attachments,cleartext-metadata.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "view".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "view".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -352,7 +357,7 @@ void testReadEncXiR6V5UViewAttachmentsCleartextMetadata() throws IOException { @Test void testReadEncXiR6V5UViewOMaster_User() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=view,O=master.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "view".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "view".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -378,7 +383,7 @@ void testReadEncXiR6V5UViewOMaster_User() throws IOException { @Test void testReadEncXiR6V5UViewOMaster_Owner() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=view,O=master.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "master".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "master".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -404,7 +409,7 @@ void testReadEncXiR6V5UViewOMaster_Owner() throws IOException { @Test void testReadEncXiR6V5UWwwwwOWwwww() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/enc-XI-R6,V5,U=wwwww,O=wwwww.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "wwwww".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "wwwww".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(30, pdfReader.getNumberOfPages(), @@ -430,7 +435,7 @@ void testReadEncXiR6V5UWwwwwOWwwww() throws IOException { @Test void testReadGraphEncryptedPwUser() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/graph-encrypted-pw=user.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "user".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "user".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -456,7 +461,7 @@ void testReadGraphEncryptedPwUser() throws IOException { @Test void testReadIssue60101PwOwner() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/issue6010_1-pw=owner.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "owner".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "owner".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -480,9 +485,9 @@ void testReadIssue60101PwOwner() throws IOException { * The non-empty owner password is used. */ @Test - void testReadIssue60102Pwæøå() throws IOException { + void testReadIssue60102PaeoeaaUtf8() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/issue6010_2-pw=æøå.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "æøå".getBytes(StandardCharsets.UTF_8)); + PdfReader pdfReader = new PdfReader(resource, "æøå".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(10, pdfReader.getNumberOfPages(), @@ -511,7 +516,7 @@ void testReadIssue60101PwOwner() throws IOException { @Test void testReadMuPDFAes256R6UUserOOwner_User() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/MuPDF-AES256-R6-u=user-o=owner.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "user".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "user".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -537,7 +542,7 @@ void testReadMuPDFAes256R6UUserOOwner_User() throws IOException { @Test void testReadMuPDFAes256R6UUserOOwner_Owner() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/MuPDF-AES256-R6-u=user-o=owner.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "owner".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "owner".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -592,7 +597,7 @@ void testReadNonTrivialCryptFilter() { @Test void testReadPr65311PwAsdfasdf() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/pr6531_1-pw=asdfasdf.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "asdfasdf".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "asdfasdf".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -618,7 +623,7 @@ void testReadPr65311PwAsdfasdf() throws IOException { @Test void testReadPr65312PwAsdfasdf() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/pr6531_2-pw=asdfasdf.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "asdfasdf".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "asdfasdf".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions."); Assertions.assertEquals(1, pdfReader.getNumberOfPages(), @@ -675,7 +680,7 @@ void testReadUnfilterableWithCrypt() { @Test void testReadTHISISATEST_PWP() throws IOException { try (InputStream resource = getClass().getResourceAsStream("/issue375/THISISATEST_PWP.pdf")) { - PdfReader pdfReader = new PdfReader(resource, "password".getBytes()); + PdfReader pdfReader = new PdfReader(resource, "password".getBytes(UTF_8)); Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted."); Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions."); Assertions.assertEquals(2, pdfReader.getNumberOfPages(), From bcb823c4e022c8ac235925b10812c6f11f2ccd19 Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Sat, 9 Mar 2024 08:22:30 +0100 Subject: [PATCH 20/31] Formatter configuration - moved to config/ - updated forIntelliJ - created for Eclipse - Editorconfig updated --- .editorconfig | 641 +++++++++++++++++- config/README.md | 9 + .../checkstyle-inactive.xml | 0 config/eclipse-java-openpdf-style.xml | 380 +++++++++++ .../intellij-java-openpdf-style.xml | 59 +- 5 files changed, 1065 insertions(+), 24 deletions(-) create mode 100644 config/README.md rename checkstyle-inactive.xml => config/checkstyle-inactive.xml (100%) create mode 100644 config/eclipse-java-openpdf-style.xml rename intellij-java-openpdf-style.xml => config/intellij-java-openpdf-style.xml (90%) diff --git a/.editorconfig b/.editorconfig index 02fd97e9c..855785f97 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,11 +1,632 @@ [*] -indent_style=space -indent_size=4 -end_of_line=lf -charset=utf-8 -trim_trailing_whitespace=true -insert_final_newline=true -max_line_length=120 - -[*.{yml,yaml}] -indent_size=2 +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = false +max_line_length = 120 +tab_width = 2 +ij_continuation_indent_size = 4 +ij_formatter_off_tag = @formatter:off +ij_formatter_on_tag = @formatter:on +ij_formatter_tags_enabled = true +ij_smart_tabs = false +ij_visual_guides = 100 +ij_wrap_on_typing = true + +[*.css] +ij_visual_guides = +ij_css_align_closing_brace_with_properties = false +ij_css_blank_lines_around_nested_selector = 1 +ij_css_blank_lines_between_blocks = 1 +ij_css_block_comment_add_space = false +ij_css_brace_placement = end_of_line +ij_css_enforce_quotes_on_format = false +ij_css_hex_color_long_format = false +ij_css_hex_color_lower_case = false +ij_css_hex_color_short_format = false +ij_css_hex_color_upper_case = false +ij_css_keep_blank_lines_in_code = 2 +ij_css_keep_indents_on_empty_lines = false +ij_css_keep_single_line_blocks = false +ij_css_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow +ij_css_space_after_colon = true +ij_css_space_before_opening_brace = true +ij_css_use_double_quotes = true +ij_css_value_alignment = do_not_align + +[*.java] +indent_size = 4 +tab_width = 4 +ij_continuation_indent_size = 8 +ij_visual_guides = +ij_java_align_consecutive_assignments = false +ij_java_align_consecutive_variable_declarations = false +ij_java_align_group_field_declarations = false +ij_java_align_multiline_annotation_parameters = false +ij_java_align_multiline_array_initializer_expression = false +ij_java_align_multiline_assignment = false +ij_java_align_multiline_binary_operation = false +ij_java_align_multiline_chained_methods = false +ij_java_align_multiline_deconstruction_list_components = true +ij_java_align_multiline_extends_list = false +ij_java_align_multiline_for = false +ij_java_align_multiline_method_parentheses = false +ij_java_align_multiline_parameters = false +ij_java_align_multiline_parameters_in_calls = false +ij_java_align_multiline_parenthesized_expression = false +ij_java_align_multiline_records = true +ij_java_align_multiline_resources = false +ij_java_align_multiline_ternary_operation = false +ij_java_align_multiline_text_blocks = false +ij_java_align_multiline_throws_list = false +ij_java_align_subsequent_simple_methods = false +ij_java_align_throws_keyword = false +ij_java_align_types_in_multi_catch = true +ij_java_annotation_parameter_wrap = off +ij_java_array_initializer_new_line_after_left_brace = false +ij_java_array_initializer_right_brace_on_new_line = false +ij_java_array_initializer_wrap = normal +ij_java_assert_statement_colon_on_next_line = false +ij_java_assert_statement_wrap = off +ij_java_assignment_wrap = off +ij_java_binary_operation_sign_on_next_line = true +ij_java_binary_operation_wrap = normal +ij_java_blank_lines_after_anonymous_class_header = 0 +ij_java_blank_lines_after_class_header = 1 +ij_java_blank_lines_after_imports = 1 +ij_java_blank_lines_after_package = 1 +ij_java_blank_lines_around_class = 1 +ij_java_blank_lines_around_field = 0 +ij_java_blank_lines_around_field_in_interface = 0 +ij_java_blank_lines_around_initializer = 1 +ij_java_blank_lines_around_method = 1 +ij_java_blank_lines_around_method_in_interface = 1 +ij_java_blank_lines_before_class_end = 0 +ij_java_blank_lines_before_imports = 1 +ij_java_blank_lines_before_method_body = 0 +ij_java_blank_lines_before_package = 0 +ij_java_block_brace_style = end_of_line +ij_java_block_comment_add_space = false +ij_java_block_comment_at_first_column = true +ij_java_builder_methods = +ij_java_call_parameters_new_line_after_left_paren = false +ij_java_call_parameters_right_paren_on_new_line = false +ij_java_call_parameters_wrap = normal +ij_java_case_statement_on_separate_line = true +ij_java_catch_on_new_line = false +ij_java_class_annotation_wrap = split_into_lines +ij_java_class_brace_style = end_of_line +ij_java_class_count_to_use_import_on_demand = 999 +ij_java_class_names_in_javadoc = 1 +ij_java_deconstruction_list_wrap = normal +ij_java_do_not_indent_top_level_class_members = false +ij_java_do_not_wrap_after_single_annotation = false +ij_java_do_not_wrap_after_single_annotation_in_parameter = false +ij_java_do_while_brace_force = always +ij_java_doc_add_blank_line_after_description = true +ij_java_doc_add_blank_line_after_param_comments = false +ij_java_doc_add_blank_line_after_return = false +ij_java_doc_add_p_tag_on_empty_lines = true +ij_java_doc_align_exception_comments = true +ij_java_doc_align_param_comments = true +ij_java_doc_do_not_wrap_if_one_line = false +ij_java_doc_enable_formatting = true +ij_java_doc_enable_leading_asterisks = true +ij_java_doc_indent_on_continuation = false +ij_java_doc_keep_empty_lines = true +ij_java_doc_keep_empty_parameter_tag = true +ij_java_doc_keep_empty_return_tag = true +ij_java_doc_keep_empty_throws_tag = true +ij_java_doc_keep_invalid_tags = true +ij_java_doc_param_description_on_new_line = false +ij_java_doc_preserve_line_breaks = false +ij_java_doc_use_throws_not_exception_tag = true +ij_java_else_on_new_line = false +ij_java_entity_dd_prefix = +ij_java_entity_dd_suffix = EJB +ij_java_entity_eb_prefix = +ij_java_entity_eb_suffix = Bean +ij_java_entity_hi_prefix = +ij_java_entity_hi_suffix = Home +ij_java_entity_lhi_prefix = Local +ij_java_entity_lhi_suffix = Home +ij_java_entity_li_prefix = Local +ij_java_entity_li_suffix = +ij_java_entity_pk_class = java.lang.String +ij_java_entity_ri_prefix = +ij_java_entity_ri_suffix = +ij_java_entity_vo_prefix = +ij_java_entity_vo_suffix = VO +ij_java_enum_constants_wrap = off +ij_java_extends_keyword_wrap = off +ij_java_extends_list_wrap = normal +ij_java_field_annotation_wrap = split_into_lines +ij_java_field_name_prefix = +ij_java_field_name_suffix = +ij_java_filter_class_prefix = +ij_java_filter_class_suffix = +ij_java_filter_dd_prefix = +ij_java_filter_dd_suffix = +ij_java_finally_on_new_line = false +ij_java_for_brace_force = always +ij_java_for_statement_new_line_after_left_paren = false +ij_java_for_statement_right_paren_on_new_line = false +ij_java_for_statement_wrap = normal +ij_java_generate_final_locals = false +ij_java_generate_final_parameters = false +ij_java_if_brace_force = always +ij_java_imports_layout = $*, |, * +ij_java_indent_case_from_switch = true +ij_java_insert_inner_class_imports = true +ij_java_insert_override_annotation = true +ij_java_keep_blank_lines_before_right_brace = 2 +ij_java_keep_blank_lines_between_package_declaration_and_header = 2 +ij_java_keep_blank_lines_in_code = 1 +ij_java_keep_blank_lines_in_declarations = 2 +ij_java_keep_builder_methods_indents = false +ij_java_keep_control_statement_in_one_line = false +ij_java_keep_first_column_comment = true +ij_java_keep_indents_on_empty_lines = false +ij_java_keep_line_breaks = true +ij_java_keep_multiple_expressions_in_one_line = false +ij_java_keep_simple_blocks_in_one_line = false +ij_java_keep_simple_classes_in_one_line = false +ij_java_keep_simple_lambdas_in_one_line = false +ij_java_keep_simple_methods_in_one_line = false +ij_java_label_indent_absolute = false +ij_java_label_indent_size = 0 +ij_java_lambda_brace_style = end_of_line +ij_java_layout_static_imports_separately = true +ij_java_line_comment_add_space = false +ij_java_line_comment_add_space_on_reformat = false +ij_java_line_comment_at_first_column = true +ij_java_listener_class_prefix = +ij_java_listener_class_suffix = +ij_java_local_variable_name_prefix = +ij_java_local_variable_name_suffix = +ij_java_message_dd_prefix = +ij_java_message_dd_suffix = EJB +ij_java_message_eb_prefix = +ij_java_message_eb_suffix = Bean +ij_java_method_annotation_wrap = split_into_lines +ij_java_method_brace_style = end_of_line +ij_java_method_call_chain_wrap = normal +ij_java_method_parameters_new_line_after_left_paren = false +ij_java_method_parameters_right_paren_on_new_line = false +ij_java_method_parameters_wrap = normal +ij_java_modifier_list_wrap = false +ij_java_multi_catch_types_wrap = normal +ij_java_names_count_to_use_import_on_demand = 999 +ij_java_new_line_after_lparen_in_annotation = false +ij_java_new_line_after_lparen_in_deconstruction_pattern = true +ij_java_new_line_after_lparen_in_record_header = false +ij_java_packages_to_use_import_on_demand = +ij_java_parameter_annotation_wrap = off +ij_java_parameter_name_prefix = +ij_java_parameter_name_suffix = +ij_java_parentheses_expression_new_line_after_left_paren = false +ij_java_parentheses_expression_right_paren_on_new_line = false +ij_java_place_assignment_sign_on_next_line = false +ij_java_prefer_longer_names = true +ij_java_prefer_parameters_wrap = false +ij_java_record_components_wrap = normal +ij_java_repeat_annotations = +ij_java_repeat_synchronized = true +ij_java_replace_instanceof_and_cast = false +ij_java_replace_null_check = true +ij_java_replace_sum_lambda_with_method_ref = true +ij_java_resource_list_new_line_after_left_paren = false +ij_java_resource_list_right_paren_on_new_line = false +ij_java_resource_list_wrap = off +ij_java_rparen_on_new_line_in_annotation = false +ij_java_rparen_on_new_line_in_deconstruction_pattern = true +ij_java_rparen_on_new_line_in_record_header = false +ij_java_servlet_class_prefix = +ij_java_servlet_class_suffix = +ij_java_servlet_dd_prefix = +ij_java_servlet_dd_suffix = +ij_java_session_dd_prefix = +ij_java_session_dd_suffix = EJB +ij_java_session_eb_prefix = +ij_java_session_eb_suffix = Bean +ij_java_session_hi_prefix = +ij_java_session_hi_suffix = Home +ij_java_session_lhi_prefix = Local +ij_java_session_lhi_suffix = Home +ij_java_session_li_prefix = Local +ij_java_session_li_suffix = +ij_java_session_ri_prefix = +ij_java_session_ri_suffix = +ij_java_session_si_prefix = +ij_java_session_si_suffix = Service +ij_java_space_after_closing_angle_bracket_in_type_argument = false +ij_java_space_after_colon = true +ij_java_space_after_comma = true +ij_java_space_after_comma_in_type_arguments = true +ij_java_space_after_for_semicolon = true +ij_java_space_after_quest = true +ij_java_space_after_type_cast = true +ij_java_space_before_annotation_array_initializer_left_brace = false +ij_java_space_before_annotation_parameter_list = false +ij_java_space_before_array_initializer_left_brace = false +ij_java_space_before_catch_keyword = true +ij_java_space_before_catch_left_brace = true +ij_java_space_before_catch_parentheses = true +ij_java_space_before_class_left_brace = true +ij_java_space_before_colon = true +ij_java_space_before_colon_in_foreach = true +ij_java_space_before_comma = false +ij_java_space_before_deconstruction_list = false +ij_java_space_before_do_left_brace = true +ij_java_space_before_else_keyword = true +ij_java_space_before_else_left_brace = true +ij_java_space_before_finally_keyword = true +ij_java_space_before_finally_left_brace = true +ij_java_space_before_for_left_brace = true +ij_java_space_before_for_parentheses = true +ij_java_space_before_for_semicolon = false +ij_java_space_before_if_left_brace = true +ij_java_space_before_if_parentheses = true +ij_java_space_before_method_call_parentheses = false +ij_java_space_before_method_left_brace = true +ij_java_space_before_method_parentheses = false +ij_java_space_before_opening_angle_bracket_in_type_parameter = false +ij_java_space_before_quest = true +ij_java_space_before_switch_left_brace = true +ij_java_space_before_switch_parentheses = true +ij_java_space_before_synchronized_left_brace = true +ij_java_space_before_synchronized_parentheses = true +ij_java_space_before_try_left_brace = true +ij_java_space_before_try_parentheses = true +ij_java_space_before_type_parameter_list = false +ij_java_space_before_while_keyword = true +ij_java_space_before_while_left_brace = true +ij_java_space_before_while_parentheses = true +ij_java_space_inside_one_line_enum_braces = false +ij_java_space_within_empty_array_initializer_braces = false +ij_java_space_within_empty_method_call_parentheses = false +ij_java_space_within_empty_method_parentheses = false +ij_java_spaces_around_additive_operators = true +ij_java_spaces_around_annotation_eq = true +ij_java_spaces_around_assignment_operators = true +ij_java_spaces_around_bitwise_operators = true +ij_java_spaces_around_equality_operators = true +ij_java_spaces_around_lambda_arrow = true +ij_java_spaces_around_logical_operators = true +ij_java_spaces_around_method_ref_dbl_colon = false +ij_java_spaces_around_multiplicative_operators = true +ij_java_spaces_around_relational_operators = true +ij_java_spaces_around_shift_operators = true +ij_java_spaces_around_type_bounds_in_type_parameters = true +ij_java_spaces_around_unary_operator = false +ij_java_spaces_within_angle_brackets = false +ij_java_spaces_within_annotation_parentheses = false +ij_java_spaces_within_array_initializer_braces = false +ij_java_spaces_within_braces = false +ij_java_spaces_within_brackets = false +ij_java_spaces_within_cast_parentheses = false +ij_java_spaces_within_catch_parentheses = false +ij_java_spaces_within_deconstruction_list = false +ij_java_spaces_within_for_parentheses = false +ij_java_spaces_within_if_parentheses = false +ij_java_spaces_within_method_call_parentheses = false +ij_java_spaces_within_method_parentheses = false +ij_java_spaces_within_parentheses = false +ij_java_spaces_within_record_header = false +ij_java_spaces_within_switch_parentheses = false +ij_java_spaces_within_synchronized_parentheses = false +ij_java_spaces_within_try_parentheses = false +ij_java_spaces_within_while_parentheses = false +ij_java_special_else_if_treatment = true +ij_java_static_field_name_prefix = +ij_java_static_field_name_suffix = +ij_java_subclass_name_prefix = +ij_java_subclass_name_suffix = Impl +ij_java_ternary_operation_signs_on_next_line = true +ij_java_ternary_operation_wrap = normal +ij_java_test_name_prefix = +ij_java_test_name_suffix = Test +ij_java_throws_keyword_wrap = normal +ij_java_throws_list_wrap = off +ij_java_use_external_annotations = false +ij_java_use_fq_class_names = false +ij_java_use_relative_indents = false +ij_java_use_single_class_imports = true +ij_java_variable_annotation_wrap = off +ij_java_visibility = public +ij_java_while_brace_force = always +ij_java_while_on_new_line = false +ij_java_wrap_comments = true +ij_java_wrap_first_method_in_call_chain = false +ij_java_wrap_long_lines = false + +[.editorconfig] +ij_visual_guides = +ij_editorconfig_align_group_field_declarations = false +ij_editorconfig_space_after_colon = false +ij_editorconfig_space_after_comma = true +ij_editorconfig_space_before_colon = false +ij_editorconfig_space_before_comma = false +ij_editorconfig_spaces_around_assignment_operators = true + +[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.pom,*.rng,*.tld,*.wadl,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}] +ij_continuation_indent_size = 2 +ij_visual_guides = +ij_xml_align_attributes = false +ij_xml_align_text = false +ij_xml_attribute_wrap = normal +ij_xml_block_comment_add_space = false +ij_xml_block_comment_at_first_column = true +ij_xml_keep_blank_lines = 2 +ij_xml_keep_indents_on_empty_lines = false +ij_xml_keep_line_breaks = true +ij_xml_keep_line_breaks_in_text = true +ij_xml_keep_whitespaces = false +ij_xml_keep_whitespaces_around_cdata = preserve +ij_xml_keep_whitespaces_inside_cdata = false +ij_xml_line_comment_at_first_column = true +ij_xml_space_after_tag_name = false +ij_xml_space_around_equals_in_attribute = false +ij_xml_space_inside_empty_tag = false +ij_xml_text_wrap = normal + +[{*.bash,*.sh,*.zsh}] +ij_visual_guides = +ij_shell_binary_ops_start_line = false +ij_shell_keep_column_alignment_padding = false +ij_shell_minify_program = false +ij_shell_redirect_followed_by_space = false +ij_shell_switch_cases_indented = false +ij_shell_use_unix_line_separator = true + +[{*.cjs,*.js}] +max_line_length = 80 +ij_visual_guides = +ij_javascript_align_imports = false +ij_javascript_align_multiline_array_initializer_expression = false +ij_javascript_align_multiline_binary_operation = false +ij_javascript_align_multiline_chained_methods = false +ij_javascript_align_multiline_extends_list = false +ij_javascript_align_multiline_for = false +ij_javascript_align_multiline_parameters = false +ij_javascript_align_multiline_parameters_in_calls = false +ij_javascript_align_multiline_ternary_operation = false +ij_javascript_align_object_properties = 0 +ij_javascript_align_union_types = false +ij_javascript_align_var_statements = 0 +ij_javascript_array_initializer_new_line_after_left_brace = false +ij_javascript_array_initializer_right_brace_on_new_line = false +ij_javascript_array_initializer_wrap = normal +ij_javascript_assignment_wrap = off +ij_javascript_binary_operation_sign_on_next_line = true +ij_javascript_binary_operation_wrap = normal +ij_javascript_blacklist_imports = rxjs/Rx, node_modules/**, **/node_modules/**, @angular/material, @angular/material/typings/** +ij_javascript_blank_lines_after_imports = 1 +ij_javascript_blank_lines_around_class = 1 +ij_javascript_blank_lines_around_field = 0 +ij_javascript_blank_lines_around_function = 1 +ij_javascript_blank_lines_around_method = 1 +ij_javascript_block_brace_style = end_of_line +ij_javascript_block_comment_add_space = false +ij_javascript_block_comment_at_first_column = true +ij_javascript_call_parameters_new_line_after_left_paren = false +ij_javascript_call_parameters_right_paren_on_new_line = false +ij_javascript_call_parameters_wrap = normal +ij_javascript_catch_on_new_line = false +ij_javascript_chained_call_dot_on_new_line = true +ij_javascript_class_brace_style = end_of_line +ij_javascript_comma_on_new_line = false +ij_javascript_do_while_brace_force = always +ij_javascript_else_on_new_line = false +ij_javascript_enforce_trailing_comma = keep +ij_javascript_extends_keyword_wrap = off +ij_javascript_extends_list_wrap = off +ij_javascript_field_prefix = _ +ij_javascript_file_name_style = relaxed +ij_javascript_finally_on_new_line = false +ij_javascript_for_brace_force = always +ij_javascript_for_statement_new_line_after_left_paren = false +ij_javascript_for_statement_right_paren_on_new_line = false +ij_javascript_for_statement_wrap = normal +ij_javascript_force_quote_style = false +ij_javascript_force_semicolon_style = false +ij_javascript_function_expression_brace_style = end_of_line +ij_javascript_if_brace_force = always +ij_javascript_import_merge_members = global +ij_javascript_import_prefer_absolute_path = global +ij_javascript_import_sort_members = true +ij_javascript_import_sort_module_name = false +ij_javascript_import_use_node_resolution = true +ij_javascript_imports_wrap = on_every_item +ij_javascript_indent_case_from_switch = true +ij_javascript_indent_chained_calls = false +ij_javascript_indent_package_children = 0 +ij_javascript_jsx_attribute_value = braces +ij_javascript_keep_blank_lines_in_code = 1 +ij_javascript_keep_first_column_comment = true +ij_javascript_keep_indents_on_empty_lines = false +ij_javascript_keep_line_breaks = true +ij_javascript_keep_simple_blocks_in_one_line = false +ij_javascript_keep_simple_methods_in_one_line = false +ij_javascript_line_comment_add_space = true +ij_javascript_line_comment_at_first_column = false +ij_javascript_method_brace_style = end_of_line +ij_javascript_method_call_chain_wrap = off +ij_javascript_method_parameters_new_line_after_left_paren = false +ij_javascript_method_parameters_right_paren_on_new_line = false +ij_javascript_method_parameters_wrap = normal +ij_javascript_object_literal_wrap = on_every_item +ij_javascript_object_types_wrap = on_every_item +ij_javascript_parentheses_expression_new_line_after_left_paren = false +ij_javascript_parentheses_expression_right_paren_on_new_line = false +ij_javascript_place_assignment_sign_on_next_line = false +ij_javascript_prefer_as_type_cast = false +ij_javascript_prefer_explicit_types_function_expression_returns = false +ij_javascript_prefer_explicit_types_function_returns = false +ij_javascript_prefer_explicit_types_vars_fields = false +ij_javascript_prefer_parameters_wrap = false +ij_javascript_property_prefix = +ij_javascript_reformat_c_style_comments = false +ij_javascript_space_after_colon = true +ij_javascript_space_after_comma = true +ij_javascript_space_after_dots_in_rest_parameter = false +ij_javascript_space_after_generator_mult = true +ij_javascript_space_after_property_colon = true +ij_javascript_space_after_quest = true +ij_javascript_space_after_type_colon = true +ij_javascript_space_after_unary_not = false +ij_javascript_space_before_async_arrow_lparen = true +ij_javascript_space_before_catch_keyword = true +ij_javascript_space_before_catch_left_brace = true +ij_javascript_space_before_catch_parentheses = true +ij_javascript_space_before_class_lbrace = true +ij_javascript_space_before_class_left_brace = true +ij_javascript_space_before_colon = true +ij_javascript_space_before_comma = false +ij_javascript_space_before_do_left_brace = true +ij_javascript_space_before_else_keyword = true +ij_javascript_space_before_else_left_brace = true +ij_javascript_space_before_finally_keyword = true +ij_javascript_space_before_finally_left_brace = true +ij_javascript_space_before_for_left_brace = true +ij_javascript_space_before_for_parentheses = true +ij_javascript_space_before_for_semicolon = false +ij_javascript_space_before_function_left_parenth = true +ij_javascript_space_before_generator_mult = false +ij_javascript_space_before_if_left_brace = true +ij_javascript_space_before_if_parentheses = true +ij_javascript_space_before_method_call_parentheses = false +ij_javascript_space_before_method_left_brace = true +ij_javascript_space_before_method_parentheses = false +ij_javascript_space_before_property_colon = false +ij_javascript_space_before_quest = true +ij_javascript_space_before_switch_left_brace = true +ij_javascript_space_before_switch_parentheses = true +ij_javascript_space_before_try_left_brace = true +ij_javascript_space_before_type_colon = false +ij_javascript_space_before_unary_not = false +ij_javascript_space_before_while_keyword = true +ij_javascript_space_before_while_left_brace = true +ij_javascript_space_before_while_parentheses = true +ij_javascript_spaces_around_additive_operators = true +ij_javascript_spaces_around_arrow_function_operator = true +ij_javascript_spaces_around_assignment_operators = true +ij_javascript_spaces_around_bitwise_operators = true +ij_javascript_spaces_around_equality_operators = true +ij_javascript_spaces_around_logical_operators = true +ij_javascript_spaces_around_multiplicative_operators = true +ij_javascript_spaces_around_relational_operators = true +ij_javascript_spaces_around_shift_operators = true +ij_javascript_spaces_around_unary_operator = false +ij_javascript_spaces_within_array_initializer_brackets = false +ij_javascript_spaces_within_brackets = false +ij_javascript_spaces_within_catch_parentheses = false +ij_javascript_spaces_within_for_parentheses = false +ij_javascript_spaces_within_if_parentheses = false +ij_javascript_spaces_within_imports = false +ij_javascript_spaces_within_interpolation_expressions = false +ij_javascript_spaces_within_method_call_parentheses = false +ij_javascript_spaces_within_method_parentheses = false +ij_javascript_spaces_within_object_literal_braces = false +ij_javascript_spaces_within_object_type_braces = true +ij_javascript_spaces_within_parentheses = false +ij_javascript_spaces_within_switch_parentheses = false +ij_javascript_spaces_within_type_assertion = false +ij_javascript_spaces_within_union_types = true +ij_javascript_spaces_within_while_parentheses = false +ij_javascript_special_else_if_treatment = true +ij_javascript_ternary_operation_signs_on_next_line = true +ij_javascript_ternary_operation_wrap = normal +ij_javascript_union_types_wrap = on_every_item +ij_javascript_use_chained_calls_group_indents = false +ij_javascript_use_double_quotes = true +ij_javascript_use_explicit_js_extension = auto +ij_javascript_use_import_type = auto +ij_javascript_use_path_mapping = always +ij_javascript_use_public_modifier = false +ij_javascript_use_semicolon_after_statement = true +ij_javascript_var_declaration_wrap = normal +ij_javascript_while_brace_force = always +ij_javascript_while_on_new_line = false +ij_javascript_wrap_comments = false + +[{*.htm,*.html,*.ng,*.sht,*.shtm,*.shtml}] +ij_visual_guides = +ij_html_add_new_line_before_tags = body, div, p, form, h1, h2, h3 +ij_html_align_attributes = true +ij_html_align_text = false +ij_html_attribute_wrap = normal +ij_html_block_comment_add_space = false +ij_html_block_comment_at_first_column = true +ij_html_do_not_align_children_of_min_lines = 0 +ij_html_do_not_break_if_inline_tags = title, h1, h2, h3, h4, h5, h6, p +ij_html_do_not_indent_children_of_tags = html, body, thead, tbody, tfoot +ij_html_enforce_quotes = false +ij_html_inline_tags = a, abbr, acronym, b, basefont, bdo, big, br, cite, cite, code, dfn, em, font, i, img, input, kbd, label, q, s, samp, select, small, span, strike, strong, sub, sup, textarea, tt, u, var +ij_html_keep_blank_lines = 2 +ij_html_keep_indents_on_empty_lines = false +ij_html_keep_line_breaks = true +ij_html_keep_line_breaks_in_text = true +ij_html_keep_whitespaces = false +ij_html_keep_whitespaces_inside = span, pre, textarea +ij_html_line_comment_at_first_column = true +ij_html_new_line_after_last_attribute = never +ij_html_new_line_before_first_attribute = never +ij_html_quote_style = double +ij_html_remove_new_line_before_tags = br +ij_html_space_after_tag_name = false +ij_html_space_around_equality_in_attribute = false +ij_html_space_inside_empty_tag = false +ij_html_text_wrap = normal + +[{*.markdown,*.md}] +ij_visual_guides = +ij_markdown_force_one_space_after_blockquote_symbol = true +ij_markdown_force_one_space_after_header_symbol = true +ij_markdown_force_one_space_after_list_bullet = true +ij_markdown_force_one_space_between_words = true +ij_markdown_format_tables = true +ij_markdown_insert_quote_arrows_on_wrap = true +ij_markdown_keep_indents_on_empty_lines = false +ij_markdown_keep_line_breaks_inside_text_blocks = true +ij_markdown_max_lines_around_block_elements = 1 +ij_markdown_max_lines_around_header = 1 +ij_markdown_max_lines_between_paragraphs = 1 +ij_markdown_min_lines_around_block_elements = 1 +ij_markdown_min_lines_around_header = 1 +ij_markdown_min_lines_between_paragraphs = 1 +ij_markdown_wrap_text_if_long = true +ij_markdown_wrap_text_inside_blockquotes = true + +[{*.pb,*.textproto,*.txtpb}] +ij_visual_guides = +ij_prototext_keep_blank_lines_in_code = 2 +ij_prototext_keep_indents_on_empty_lines = false +ij_prototext_keep_line_breaks = true +ij_prototext_space_after_colon = true +ij_prototext_space_after_comma = true +ij_prototext_space_before_colon = false +ij_prototext_space_before_comma = false +ij_prototext_spaces_within_braces = true +ij_prototext_spaces_within_brackets = false + +[{*.properties,spring.handlers,spring.schemas}] +ij_visual_guides = +ij_properties_align_group_field_declarations = false +ij_properties_keep_blank_lines = false +ij_properties_key_value_delimiter = equals +ij_properties_spaces_around_key_value_delimiter = false + +[{*.yaml,*.yml}] +ij_visual_guides = +ij_yaml_align_values_properties = do_not_align +ij_yaml_autoinsert_sequence_marker = true +ij_yaml_block_mapping_on_new_line = false +ij_yaml_indent_sequence_value = true +ij_yaml_keep_indents_on_empty_lines = false +ij_yaml_keep_line_breaks = true +ij_yaml_sequence_on_new_line = false +ij_yaml_space_before_colon = false +ij_yaml_spaces_within_braces = true +ij_yaml_spaces_within_brackets = true diff --git a/config/README.md b/config/README.md new file mode 100644 index 000000000..df395171f --- /dev/null +++ b/config/README.md @@ -0,0 +1,9 @@ +# Formatter Configuration + +You can find in this directory the configuration files for the formatters used in this project. For IntelliJ IDEA +and Eclipse. If you have other IDE, please contribute with a configuration file. OpenPDF has it's own coding style. +It is based in the Google Java Style Guide, but with some modifications: + +* Indentation: 4 spaces +* Line length: 120 characters +* Continuation indent: 8 spaces \ No newline at end of file diff --git a/checkstyle-inactive.xml b/config/checkstyle-inactive.xml similarity index 100% rename from checkstyle-inactive.xml rename to config/checkstyle-inactive.xml diff --git a/config/eclipse-java-openpdf-style.xml b/config/eclipse-java-openpdf-style.xml new file mode 100644 index 000000000..70795e269 --- /dev/null +++ b/config/eclipse-java-openpdf-style.xml @@ -0,0 +1,380 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/intellij-java-openpdf-style.xml b/config/intellij-java-openpdf-style.xml similarity index 90% rename from intellij-java-openpdf-style.xml rename to config/intellij-java-openpdf-style.xml index 4ebba439d..68d6c1814 100644 --- a/intellij-java-openpdf-style.xml +++ b/config/intellij-java-openpdf-style.xml @@ -1,11 +1,32 @@ - + - \ No newline at end of file From 26c692d744203306f78fad5c812b3cfc5a946ff2 Mon Sep 17 00:00:00 2001 From: Claudio Clemens Date: Sat, 9 Mar 2024 09:26:11 +0100 Subject: [PATCH 21/31] Reformatted all code - 4 runs of reformatting - all .java, .md, .yml and .html files - Only format changed --- .github/ISSUE_TEMPLATE/bug_report.md | 6 +- .github/pull_request_template.md | 4 + .github/workflows/checkstyle.yml | 21 +- .github/workflows/codeql.yml | 64 +- CODE_OF_CONDUCT.md | 8 +- Contributors.md | 5 +- README.md | 22 +- changelogs/1.3.29.md | 3 +- changelogs/1.3.30.md | 1 + changelogs/1.3.31.md | 2 + changelogs/1.3.32.md | 19 +- changelogs/1.3.37.md | 1 + changelogs/2.0.0.md | 4 +- changelogs/README.md | 1 + config/README.md | 4 +- .../bouncycastle/BouncyCastleHelper.java | 16 +- .../main/java/com/lowagie/text/Anchor.java | 158 +- .../java/com/lowagie/text/Annotation.java | 407 +- .../com/lowagie/text/BadElementException.java | 17 +- .../src/main/java/com/lowagie/text/Cell.java | 562 +- .../main/java/com/lowagie/text/Chapter.java | 51 +- .../com/lowagie/text/ChapterAutoNumber.java | 26 +- .../src/main/java/com/lowagie/text/Chunk.java | 729 +- .../java/com/lowagie/text/DocListener.java | 34 +- .../main/java/com/lowagie/text/DocWriter.java | 476 +- .../main/java/com/lowagie/text/Document.java | 756 +- .../com/lowagie/text/DocumentException.java | 23 +- .../main/java/com/lowagie/text/Element.java | 205 +- .../com/lowagie/text/ElementListener.java | 26 +- .../java/com/lowagie/text/ElementTags.java | 804 +- .../com/lowagie/text/ExceptionConverter.java | 60 +- .../src/main/java/com/lowagie/text/Font.java | 246 +- .../java/com/lowagie/text/FontFactory.java | 576 +- .../java/com/lowagie/text/FontFactoryImp.java | 485 +- .../java/com/lowagie/text/FontProvider.java | 4 +- .../main/java/com/lowagie/text/Footnote.java | 160 +- .../main/java/com/lowagie/text/GreekList.java | 24 +- .../main/java/com/lowagie/text/Header.java | 31 +- .../java/com/lowagie/text/HeaderFooter.java | 3 +- .../src/main/java/com/lowagie/text/Image.java | 1102 +-- .../java/com/lowagie/text/ImageLoader.java | 11 +- .../main/java/com/lowagie/text/ImgCCITT.java | 44 +- .../main/java/com/lowagie/text/ImgJBIG2.java | 43 +- .../main/java/com/lowagie/text/ImgRaw.java | 43 +- .../java/com/lowagie/text/ImgTemplate.java | 32 +- .../main/java/com/lowagie/text/ImgWMF.java | 92 +- .../src/main/java/com/lowagie/text/Jpeg.java | 145 +- .../main/java/com/lowagie/text/Jpeg2000.java | 58 +- .../java/com/lowagie/text/LargeElement.java | 41 +- .../src/main/java/com/lowagie/text/List.java | 450 +- .../main/java/com/lowagie/text/ListItem.java | 179 +- .../java/com/lowagie/text/MarkedObject.java | 45 +- .../java/com/lowagie/text/MarkedSection.java | 202 +- .../src/main/java/com/lowagie/text/Meta.java | 146 +- .../main/java/com/lowagie/text/PageSize.java | 443 +- .../main/java/com/lowagie/text/Paragraph.java | 417 +- .../main/java/com/lowagie/text/Phrase.java | 387 +- .../main/java/com/lowagie/text/Rectangle.java | 1851 ++-- .../com/lowagie/text/RectangleReadOnly.java | 151 +- .../main/java/com/lowagie/text/RomanList.java | 22 +- .../src/main/java/com/lowagie/text/Row.java | 272 +- .../com/lowagie/text/RtfElementInterface.java | 6 +- .../main/java/com/lowagie/text/Section.java | 585 +- .../java/com/lowagie/text/SimpleCell.java | 307 +- .../java/com/lowagie/text/SimpleTable.java | 121 +- .../java/com/lowagie/text/SpecialSymbol.java | 40 +- .../java/com/lowagie/text/SplitCharacter.java | 25 +- .../src/main/java/com/lowagie/text/Table.java | 975 +- .../java/com/lowagie/text/TableRectangle.java | 1 + .../com/lowagie/text/TextElementArray.java | 30 +- .../lowagie/text/TextRenderingOptions.java | 116 +- .../main/java/com/lowagie/text/Utilities.java | 204 +- .../com/lowagie/text/ZapfDingbatsList.java | 36 +- .../lowagie/text/ZapfDingbatsNumberList.java | 43 +- .../text/alignment/HorizontalAlignment.java | 34 +- .../text/alignment/VerticalAlignment.java | 32 +- .../alignment/WithHorizontalAlignment.java | 8 +- .../text/alignment/WithVerticalAlignment.java | 8 +- .../error_messages/MessageLocalization.java | 109 +- .../text/exceptions/BadPasswordException.java | 12 +- .../exceptions/IllegalPdfSyntaxException.java | 8 +- .../text/exceptions/InvalidPdfException.java | 12 +- .../exceptions/UnsupportedPdfException.java | 19 +- .../text/factories/ElementFactory.java | 121 +- .../text/factories/GreekAlphabetFactory.java | 55 +- .../text/factories/RomanAlphabetFactory.java | 45 +- .../text/factories/RomanNumberFactory.java | 87 +- .../java/com/lowagie/text/html/FontSize.java | 24 +- .../com/lowagie/text/html/HtmlEncoder.java | 6 +- .../com/lowagie/text/html/HtmlParser.java | 5 +- .../java/com/lowagie/text/html/HtmlPeer.java | 22 +- .../com/lowagie/text/html/HtmlTagMap.java | 12 +- .../com/lowagie/text/html/HtmlWriter.java | 64 +- .../java/com/lowagie/text/html/Markup.java | 6 +- .../lowagie/text/html/SAXmyHtmlHandler.java | 30 +- .../java/com/lowagie/text/html/WebColors.java | 420 +- .../lowagie/text/html/simpleparser/ALink.java | 4 +- .../html/simpleparser/ChainedProperties.java | 12 +- .../html/simpleparser/FactoryProperties.java | 62 +- .../text/html/simpleparser/HTMLWorker.java | 112 +- .../text/html/simpleparser/ImageProvider.java | 2 +- .../lowagie/text/html/simpleparser/Img.java | 7 +- .../text/html/simpleparser/IncCell.java | 8 +- .../text/html/simpleparser/IncTable.java | 34 +- .../text/html/simpleparser/StyleSheet.java | 9 +- .../java/com/lowagie/text/pdf/AcroFields.java | 5837 ++++++------ .../lowagie/text/pdf/ArabicLigaturizer.java | 475 +- .../com/lowagie/text/pdf/AsianFontMapper.java | 19 +- .../text/pdf/BadPdfFormatException.java | 40 +- .../java/com/lowagie/text/pdf/Barcode.java | 451 +- .../java/com/lowagie/text/pdf/Barcode128.java | 670 +- .../java/com/lowagie/text/pdf/Barcode39.java | 274 +- .../com/lowagie/text/pdf/BarcodeCodabar.java | 231 +- .../lowagie/text/pdf/BarcodeDatamatrix.java | 1085 +-- .../java/com/lowagie/text/pdf/BarcodeEAN.java | 296 +- .../com/lowagie/text/pdf/BarcodeEANSUPP.java | 121 +- .../com/lowagie/text/pdf/BarcodeInter25.java | 212 +- .../com/lowagie/text/pdf/BarcodePDF417.java | 2335 ++--- .../com/lowagie/text/pdf/BarcodePostnet.java | 133 +- .../java/com/lowagie/text/pdf/BaseField.java | 461 +- .../java/com/lowagie/text/pdf/BaseFont.java | 1884 ++-- .../java/com/lowagie/text/pdf/BidiLine.java | 1178 +-- .../java/com/lowagie/text/pdf/ByteBuffer.java | 538 +- .../java/com/lowagie/text/pdf/CFFFont.java | 1525 ++-- .../com/lowagie/text/pdf/CFFFontSubset.java | 1178 +-- .../java/com/lowagie/text/pdf/CJKFont.java | 649 +- .../java/com/lowagie/text/pdf/CMYKColor.java | 54 +- .../text/pdf/CMapAwareDocumentFont.java | 109 +- .../com/lowagie/text/pdf/ColorDetails.java | 32 +- .../java/com/lowagie/text/pdf/ColumnText.java | 1292 +-- .../lowagie/text/pdf/DefaultFontMapper.java | 500 +- .../text/pdf/DefaultSplitCharacter.java | 42 +- .../com/lowagie/text/pdf/DocumentFont.java | 1355 +-- .../com/lowagie/text/pdf/EnumerateTTC.java | 54 +- .../com/lowagie/text/pdf/ExtendedColor.java | 101 +- .../com/lowagie/text/pdf/ExtraEncoding.java | 29 +- .../java/com/lowagie/text/pdf/FdfReader.java | 100 +- .../java/com/lowagie/text/pdf/FdfWriter.java | 273 +- .../com/lowagie/text/pdf/FontDetails.java | 170 +- .../java/com/lowagie/text/pdf/FontMapper.java | 17 +- .../com/lowagie/text/pdf/FontSelector.java | 23 +- .../lowagie/text/pdf/FopGlyphProcessor.java | 16 +- .../java/com/lowagie/text/pdf/GlyphList.java | 118 +- .../java/com/lowagie/text/pdf/GrayColor.java | 15 +- .../com/lowagie/text/pdf/HyphenationAuto.java | 75 +- .../lowagie/text/pdf/HyphenationEvent.java | 31 +- .../com/lowagie/text/pdf/IntHashtable.java | 189 +- .../java/com/lowagie/text/pdf/LZWDecoder.java | 140 +- .../com/lowagie/text/pdf/LayoutProcessor.java | 8 +- .../text/pdf/MappedRandomAccessFile.java | 131 +- .../com/lowagie/text/pdf/MultiColumnText.java | 211 +- .../java/com/lowagie/text/pdf/OcspClient.java | 5 +- .../text/pdf/OcspClientBouncyCastle.java | 304 +- .../lowagie/text/pdf/OutputStreamCounter.java | 111 +- .../text/pdf/OutputStreamEncryption.java | 132 +- .../java/com/lowagie/text/pdf/PRAcroForm.java | 113 +- .../lowagie/text/pdf/PRIndirectReference.java | 45 +- .../java/com/lowagie/text/pdf/PRStream.java | 111 +- .../com/lowagie/text/pdf/PRTokeniser.java | 314 +- .../com/lowagie/text/pdf/PageResources.java | 40 +- .../com/lowagie/text/pdf/PatternColor.java | 28 +- .../com/lowagie/text/pdf/PdfAcroForm.java | 458 +- .../java/com/lowagie/text/pdf/PdfAction.java | 483 +- .../com/lowagie/text/pdf/PdfAnnotation.java | 1922 ++-- .../com/lowagie/text/pdf/PdfAppearance.java | 52 +- .../java/com/lowagie/text/pdf/PdfArray.java | 318 +- .../java/com/lowagie/text/pdf/PdfBoolean.java | 92 +- .../com/lowagie/text/pdf/PdfBorderArray.java | 43 +- .../lowagie/text/pdf/PdfBorderDictionary.java | 26 +- .../java/com/lowagie/text/pdf/PdfCell.java | 294 +- .../java/com/lowagie/text/pdf/PdfChunk.java | 691 +- .../java/com/lowagie/text/pdf/PdfColor.java | 32 +- .../com/lowagie/text/pdf/PdfContentByte.java | 2256 ++--- .../lowagie/text/pdf/PdfContentParser.java | 93 +- .../com/lowagie/text/pdf/PdfContents.java | 48 +- .../java/com/lowagie/text/pdf/PdfCopy.java | 1423 +-- .../com/lowagie/text/pdf/PdfCopyFields.java | 148 +- .../lowagie/text/pdf/PdfCopyFieldsImp.java | 344 +- .../com/lowagie/text/pdf/PdfCopyForms.java | 148 +- .../com/lowagie/text/pdf/PdfCopyFormsImp.java | 34 +- .../com/lowagie/text/pdf/PdfDashPattern.java | 64 +- .../java/com/lowagie/text/pdf/PdfDate.java | 153 +- .../com/lowagie/text/pdf/PdfDestination.java | 231 +- .../text/pdf/PdfDeveloperExtension.java | 65 +- .../com/lowagie/text/pdf/PdfDictionary.java | 287 +- .../com/lowagie/text/pdf/PdfDocument.java | 2174 +++-- .../com/lowagie/text/pdf/PdfEFStream.java | 58 +- .../com/lowagie/text/pdf/PdfEncodings.java | 448 +- .../com/lowagie/text/pdf/PdfEncryption.java | 527 +- .../com/lowagie/text/pdf/PdfEncryptor.java | 301 +- .../com/lowagie/text/pdf/PdfException.java | 28 +- .../text/pdf/PdfFileSpecification.java | 260 +- .../java/com/lowagie/text/pdf/PdfFont.java | 124 +- .../com/lowagie/text/pdf/PdfFormField.java | 223 +- .../com/lowagie/text/pdf/PdfFormXObject.java | 51 +- .../com/lowagie/text/pdf/PdfFunction.java | 85 +- .../java/com/lowagie/text/pdf/PdfGState.java | 108 +- .../com/lowagie/text/pdf/PdfGraphics2D.java | 1184 +-- .../com/lowagie/text/pdf/PdfICCBased.java | 21 +- .../java/com/lowagie/text/pdf/PdfImage.java | 147 +- .../com/lowagie/text/pdf/PdfImportedPage.java | 97 +- .../lowagie/text/pdf/PdfIndirectObject.java | 119 +- .../text/pdf/PdfIndirectReference.java | 100 +- .../java/com/lowagie/text/pdf/PdfLayer.java | 217 +- .../lowagie/text/pdf/PdfLayerMembership.java | 54 +- .../java/com/lowagie/text/pdf/PdfLine.java | 322 +- .../java/com/lowagie/text/pdf/PdfLister.java | 87 +- .../java/com/lowagie/text/pdf/PdfLiteral.java | 32 +- .../lowagie/text/pdf/PdfMediaClipData.java | 6 +- .../java/com/lowagie/text/pdf/PdfName.java | 2865 ++++-- .../com/lowagie/text/pdf/PdfNameTree.java | 216 +- .../java/com/lowagie/text/pdf/PdfNull.java | 33 +- .../java/com/lowagie/text/pdf/PdfNumber.java | 61 +- .../com/lowagie/text/pdf/PdfNumberTree.java | 39 +- .../java/com/lowagie/text/pdf/PdfOCG.java | 4 +- .../com/lowagie/text/pdf/PdfOCProperties.java | 9 +- .../java/com/lowagie/text/pdf/PdfObject.java | 179 +- .../java/com/lowagie/text/pdf/PdfOutline.java | 326 +- .../java/com/lowagie/text/pdf/PdfPCell.java | 597 +- .../com/lowagie/text/pdf/PdfPCellEvent.java | 13 +- .../java/com/lowagie/text/pdf/PdfPKCS7.java | 1074 +-- .../java/com/lowagie/text/pdf/PdfPRow.java | 387 +- .../com/lowagie/text/pdf/PdfPSXObject.java | 24 +- .../java/com/lowagie/text/pdf/PdfPTable.java | 1200 +-- .../com/lowagie/text/pdf/PdfPTableEvent.java | 28 +- .../java/com/lowagie/text/pdf/PdfPage.java | 218 +- .../com/lowagie/text/pdf/PdfPageElement.java | 34 +- .../com/lowagie/text/pdf/PdfPageEvent.java | 251 +- .../lowagie/text/pdf/PdfPageEventHelper.java | 255 +- .../com/lowagie/text/pdf/PdfPageLabels.java | 244 +- .../java/com/lowagie/text/pdf/PdfPages.java | 80 +- .../java/com/lowagie/text/pdf/PdfPattern.java | 23 +- .../lowagie/text/pdf/PdfPatternPainter.java | 165 +- .../text/pdf/PdfPrinterGraphics2D.java | 10 +- .../text/pdf/PdfPublicKeyRecipient.java | 21 +- .../text/pdf/PdfPublicKeySecurityHandler.java | 273 +- .../java/com/lowagie/text/pdf/PdfReader.java | 8076 +++++++++-------- .../lowagie/text/pdf/PdfReaderInstance.java | 70 +- .../com/lowagie/text/pdf/PdfRectangle.java | 240 +- .../com/lowagie/text/pdf/PdfRendition.java | 11 +- .../com/lowagie/text/pdf/PdfResources.java | 38 +- .../java/com/lowagie/text/pdf/PdfShading.java | 218 +- .../lowagie/text/pdf/PdfShadingPattern.java | 47 +- .../lowagie/text/pdf/PdfSigGenericPKCS.java | 96 +- .../com/lowagie/text/pdf/PdfSignature.java | 32 +- .../text/pdf/PdfSignatureAppDataDict.java | 153 +- .../text/pdf/PdfSignatureAppearance.java | 3216 ++++--- .../text/pdf/PdfSignatureBuildProperties.java | 22 +- .../com/lowagie/text/pdf/PdfSmartCopy.java | 98 +- .../com/lowagie/text/pdf/PdfSpotColor.java | 49 +- .../java/com/lowagie/text/pdf/PdfStamper.java | 891 +- .../com/lowagie/text/pdf/PdfStamperImp.java | 1023 ++- .../java/com/lowagie/text/pdf/PdfStream.java | 225 +- .../java/com/lowagie/text/pdf/PdfString.java | 172 +- .../lowagie/text/pdf/PdfStructureElement.java | 53 +- .../text/pdf/PdfStructureTreeRoot.java | 35 +- .../java/com/lowagie/text/pdf/PdfTable.java | 164 +- .../com/lowagie/text/pdf/PdfTemplate.java | 167 +- .../com/lowagie/text/pdf/PdfTextArray.java | 59 +- .../com/lowagie/text/pdf/PdfTransition.java | 204 +- .../text/pdf/PdfTransparencyGroup.java | 24 +- .../java/com/lowagie/text/pdf/PdfWriter.java | 3776 ++++---- .../text/pdf/PdfXConformanceException.java | 17 +- .../java/com/lowagie/text/pdf/Pfm2afm.java | 710 +- .../com/lowagie/text/pdf/PushbuttonField.java | 371 +- .../java/com/lowagie/text/pdf/RGBColor.java | 29 +- .../com/lowagie/text/pdf/RadioCheckField.java | 509 +- .../text/pdf/RandomAccessFileOrArray.java | 389 +- .../com/lowagie/text/pdf/SequenceList.java | 211 +- .../com/lowagie/text/pdf/ShadingColor.java | 11 +- .../com/lowagie/text/pdf/SignatureType.java | 78 +- .../com/lowagie/text/pdf/SimpleBookmark.java | 337 +- .../text/pdf/SimpleNamedDestination.java | 125 +- .../java/com/lowagie/text/pdf/SpotColor.java | 16 +- .../com/lowagie/text/pdf/StampContent.java | 21 +- .../lowagie/text/pdf/StandardDecryption.java | 33 +- .../java/com/lowagie/text/pdf/TSAClient.java | 27 +- .../text/pdf/TSAClientBouncyCastle.java | 549 +- .../java/com/lowagie/text/pdf/TTFCache.java | 23 +- .../java/com/lowagie/text/pdf/TextField.java | 533 +- .../com/lowagie/text/pdf/TrueTypeFont.java | 1208 ++- .../lowagie/text/pdf/TrueTypeFontSubSet.java | 103 +- .../lowagie/text/pdf/TrueTypeFontUnicode.java | 349 +- .../java/com/lowagie/text/pdf/Type1Font.java | 656 +- .../java/com/lowagie/text/pdf/Type3Font.java | 189 +- .../java/com/lowagie/text/pdf/Type3Glyph.java | 30 +- .../text/pdf/UnembedFontPdfSmartCopy.java | 12 +- .../com/lowagie/text/pdf/VerticalText.java | 256 +- .../java/com/lowagie/text/pdf/XfaForm.java | 836 +- .../java/com/lowagie/text/pdf/XfdfReader.java | 1 - .../text/pdf/codec/CCITTG4Encoder.java | 865 +- .../lowagie/text/pdf/codec/wmf/InputMeta.java | 36 +- .../lowagie/text/pdf/codec/wmf/MetaBrush.java | 7 +- .../lowagie/text/pdf/codec/wmf/MetaDo.java | 522 +- .../lowagie/text/pdf/codec/wmf/MetaFont.java | 69 +- .../text/pdf/codec/wmf/MetaObject.java | 3 +- .../lowagie/text/pdf/codec/wmf/MetaPen.java | 7 +- .../lowagie/text/pdf/codec/wmf/MetaState.java | 156 +- .../text/pdf/collection/PdfCollection.java | 70 +- .../pdf/collection/PdfCollectionField.java | 149 +- .../pdf/collection/PdfCollectionItem.java | 76 +- .../pdf/collection/PdfCollectionSchema.java | 8 +- .../pdf/collection/PdfCollectionSort.java | 43 +- .../pdf/collection/PdfTargetDictionary.java | 78 +- .../lowagie/text/pdf/crypto/AESCipher.java | 80 +- .../text/pdf/crypto/ARCFOUREncryption.java | 16 +- .../lowagie/text/pdf/crypto/IVGenerator.java | 19 +- .../text/pdf/draw/DottedLineSeparator.java | 23 +- .../lowagie/text/pdf/draw/DrawInterface.java | 23 +- .../lowagie/text/pdf/draw/LineSeparator.java | 92 +- .../text/pdf/draw/VerticalPositionMark.java | 56 +- .../pdf/events/FieldPositioningEvents.java | 148 +- .../lowagie/text/pdf/events/IndexEvents.java | 141 +- .../pdf/events/PdfPCellEventForwarder.java | 23 +- .../pdf/events/PdfPTableEventForwarder.java | 26 +- .../pdf/events/PdfPageEventForwarder.java | 179 +- .../text/pdf/fonts/FontsResourceAnchor.java | 4 +- .../text/pdf/fonts/cjkencodings.properties | 3 - .../lowagie/text/pdf/fonts/cmaps/CMap.java | 133 +- .../text/pdf/fonts/cmaps/CMapParser.java | 386 +- .../text/pdf/fonts/cmaps/CodespaceRange.java | 84 +- .../text/pdf/hyphenation/ByteVector.java | 14 +- .../text/pdf/hyphenation/CharVector.java | 10 +- .../lowagie/text/pdf/hyphenation/Hyphen.java | 26 +- .../text/pdf/hyphenation/Hyphenation.java | 11 +- .../pdf/hyphenation/HyphenationException.java | 6 +- .../text/pdf/hyphenation/HyphenationTree.java | 169 +- .../text/pdf/hyphenation/Hyphenator.java | 158 +- .../text/pdf/hyphenation/PatternConsumer.java | 31 +- .../pdf/hyphenation/SimplePatternParser.java | 162 +- .../text/pdf/hyphenation/TernaryTree.java | 390 +- .../text/pdf/interfaces/PdfAnnotations.java | 20 +- .../pdf/interfaces/PdfDocumentActions.java | 17 +- .../pdf/interfaces/PdfEncryptionSettings.java | 57 +- .../text/pdf/interfaces/PdfPageActions.java | 17 +- .../text/pdf/interfaces/PdfRunDirection.java | 19 +- .../text/pdf/interfaces/PdfVersion.java | 50 +- .../pdf/interfaces/PdfViewerPreferences.java | 10 +- .../text/pdf/interfaces/PdfXConformance.java | 20 +- .../text/pdf/internal/PdfAnnotationsImp.java | 136 +- .../text/pdf/internal/PdfVersionImp.java | 119 +- .../pdf/internal/PdfViewerPreferencesImp.java | 342 +- .../text/pdf/internal/PdfXConformanceImp.java | 267 +- .../text/pdf/internal/PolylineShape.java | 122 +- .../pdf/internal/PolylineShapeIterator.java | 78 +- .../text/pdf/parser/ContentOperator.java | 5 +- .../lowagie/text/pdf/parser/FinalText.java | 3 +- .../text/pdf/parser/GraphicsState.java | 11 +- .../pdf/parser/MarkedUpTextAssembler.java | 89 +- .../com/lowagie/text/pdf/parser/Matrix.java | 10 +- .../lowagie/text/pdf/parser/ParsedText.java | 113 +- .../text/pdf/parser/ParsedTextImpl.java | 107 +- .../text/pdf/parser/PdfContentReaderTool.java | 69 +- .../pdf/parser/PdfContentStreamHandler.java | 112 +- .../text/pdf/parser/PdfTextExtractor.java | 29 +- .../text/pdf/parser/TextAssembler.java | 47 +- .../text/pdf/parser/TextAssemblyBuffer.java | 34 +- .../com/lowagie/text/pdf/parser/Vector.java | 19 +- .../com/lowagie/text/pdf/parser/Word.java | 79 +- .../text/utils/SystemPropertyUtil.java | 31 +- .../com/lowagie/text/xml/SAXiTextHandler.java | 83 +- .../com/lowagie/text/xml/SAXmyHandler.java | 49 +- .../java/com/lowagie/text/xml/TagMap.java | 3 +- .../java/com/lowagie/text/xml/XMLUtil.java | 6 +- .../com/lowagie/text/xml/XmlDomWriter.java | 144 +- .../java/com/lowagie/text/xml/XmlParser.java | 225 +- .../java/com/lowagie/text/xml/XmlPeer.java | 3 +- .../xml/simpleparser/EntitiesToSymbol.java | 29 +- .../xml/simpleparser/EntitiesToUnicode.java | 68 +- .../text/xml/simpleparser/IanaEncodings.java | 45 +- .../xml/simpleparser/SimpleXMLDocHandler.java | 11 +- .../SimpleXMLDocHandlerComment.java | 3 + .../xml/simpleparser/SimpleXMLParser.java | 938 +- .../text/xml/xmp/DublinCoreSchema.java | 91 +- .../com/lowagie/text/xml/xmp/LangAlt.java | 25 +- .../com/lowagie/text/xml/xmp/PdfA1Schema.java | 29 +- .../com/lowagie/text/xml/xmp/PdfSchema.java | 32 +- .../com/lowagie/text/xml/xmp/XmpArray.java | 27 +- .../lowagie/text/xml/xmp/XmpBasicSchema.java | 23 +- .../com/lowagie/text/xml/xmp/XmpMMSchema.java | 6 +- .../com/lowagie/text/xml/xmp/XmpReader.java | 42 +- .../com/lowagie/text/xml/xmp/XmpSchema.java | 97 +- .../com/lowagie/text/xml/xmp/XmpWriter.java | 137 +- .../text/pdf/fonts/cjkencodings.properties | 3 - .../text/pdf/fonts/cjkfonts.properties | 3 - .../main/resources/font-fallback/README.md | 5 +- .../java/com/lowagie/text/DocumentTest.java | 4 +- .../com/lowagie/text/FooterImageTest.java | 10 +- .../com/lowagie/text/FooterTableTest.java | 10 +- .../com/lowagie/text/HeaderFooterTest.java | 9 +- .../com/lowagie/text/StandardFontsTest.java | 25 +- .../factories/GreekAlphabetFactoryTest.java | 10 +- .../factories/RomanAlphabetFactoryTest.java | 10 +- .../factories/RomanNumberFactoryTest.java | 34 +- .../lowagie/text/html/EmbeddedImageTest.java | 15 +- .../com/lowagie/text/html/HTMLTableTest.java | 9 +- .../com/lowagie/text/html/HtmlParserTest.java | 113 +- .../text/html/SAXmyHtmlHandlerTest.java | 16 +- .../com/lowagie/text/html/StylesTest.java | 15 +- .../com/lowagie/text/html/WebColorsTest.java | 32 +- .../simpleparser/FactoryPropertiesTest.java | 5 +- .../com/lowagie/text/pdf/AcroFieldsTest.java | 26 +- .../text/pdf/BarcodeMacroPDF417Test.java | 8 +- .../com/lowagie/text/pdf/BaseFontTest.java | 2 +- .../lowagie/text/pdf/ColumnTextSeparator.java | 31 +- .../lowagie/text/pdf/ColumnTextTableTest.java | 35 +- .../pdf/CrossReferenceTableEncodingTest.java | 6 +- .../text/pdf/DocumentProducerHelper.java | 3 +- .../com/lowagie/text/pdf/FontSubsetTest.java | 28 +- .../com/lowagie/text/pdf/GlyphListTest.java | 37 +- .../com/lowagie/text/pdf/LargePdfTest.java | 14 +- .../text/pdf/LayoutProcessor534Test.java | 46 +- .../com/lowagie/text/pdf/PRAcroFormTest.java | 7 +- .../com/lowagie/text/pdf/PdfCopyTest.java | 10 +- .../lowagie/text/pdf/PdfDocument536Test.java | 5 +- .../lowagie/text/pdf/PdfDocument620Test.java | 3 +- .../com/lowagie/text/pdf/PdfDocumentTest.java | 12 +- .../text/pdf/PdfFormFlatteningTest.java | 117 +- .../com/lowagie/text/pdf/PdfNameTreeTest.java | 20 +- .../text/pdf/PdfProtectedDocumentTest.java | 31 +- .../text/pdf/PdfSignatureAppearanceTest.java | 31 +- .../text/pdf/PdfSignatureRangeTest.java | 42 +- .../lowagie/text/pdf/PdfSmartCopyTest.java | 19 +- .../com/lowagie/text/pdf/PdfTestBase.java | 7 +- .../com/lowagie/text/pdf/PdfTestBaseTest.java | 6 +- .../com/lowagie/text/pdf/PdfWriterTest.java | 3 +- .../com/lowagie/text/pdf/ProcSetTest.java | 7 +- .../com/lowagie/text/pdf/SimplePdfTest.java | 33 +- .../com/lowagie/text/pdf/TTFCacheTest.java | 8 +- .../java/com/lowagie/text/pdf/TabTest.java | 6 +- .../com/lowagie/text/pdf/TablePdfTest.java | 3 +- .../text/pdf/TableRowSpanEvenSplitTest.java | 7 +- .../com/lowagie/text/pdf/TextExtractTest.java | 4 +- .../core/document/PdfCrossReferenceTest.java | 158 +- .../pdf/encryption/DecryptAES256R6Test.java | 120 +- .../pdf/encryption/EncryptAES256R6Test.java | 51 +- .../pdf/encryption/PdfEncryptionTest.java | 22 +- .../encryption/StandardDecryptionTest.java | 5 +- .../text/pdf/fonts/AdvanceTypographyTest.java | 25 +- .../com/lowagie/text/pdf/fonts/FontTest.java | 16 +- .../text/pdf/metadata/CleanMetaDataTest.java | 550 +- .../text/pdf/parser/PdfTextExtractorTest.java | 80 +- .../pdf/sign/ExtractCertificatesTest.java | 2 +- .../pdf/table/TableElementsAlignmentTest.java | 16 +- .../text/validation/PDFValidationTest.java | 9 +- .../xml/simpleparser/SimpleXMLParserTest.java | 33 +- openpdf/src/test/resources/base64-image.html | 9 +- openpdf/src/test/resources/parseTitle.html | 8 +- .../resources/stylesTest/backgroundColor.html | 10 +- .../test/resources/stylesTest/fontColor.html | 6 +- .../test/resources/stylesTest/fontSize.html | 2 +- .../resources/stylesTest/fontSizeNamed.html | 2 +- .../src/main/java/com/lowagie/rups/Rups.java | 39 +- .../rups/controller/PdfReaderController.java | 130 +- .../rups/controller/RupsController.java | 91 +- .../lowagie/rups/io/FileChooserAction.java | 45 +- .../com/lowagie/rups/io/FileCloseAction.java | 21 +- .../lowagie/rups/io/OutputStreamResource.java | 13 +- .../lowagie/rups/io/TextAreaOutputStream.java | 25 +- .../lowagie/rups/io/filters/PdfFilter.java | 17 +- .../lowagie/rups/model/BackgroundTask.java | 50 +- .../rups/model/IndirectObjectFactory.java | 116 +- .../com/lowagie/rups/model/ObjectLoader.java | 44 +- .../com/lowagie/rups/model/PageLoader.java | 40 +- .../java/com/lowagie/rups/model/PdfFile.java | 84 +- .../com/lowagie/rups/model/Permissions.java | 117 +- .../lowagie/rups/model/ProgressDialog.java | 56 +- .../lowagie/rups/model/TreeNodeFactory.java | 113 +- .../java/com/lowagie/rups/model/XfaFile.java | 36 +- .../java/com/lowagie/rups/view/Console.java | 134 +- .../com/lowagie/rups/view/MessageAction.java | 13 +- .../rups/view/PageSelectionListener.java | 18 +- .../com/lowagie/rups/view/RupsMenuBar.java | 82 +- .../rups/view/icons/IconActionListener.java | 6 +- .../lowagie/rups/view/icons/IconButton.java | 18 +- .../lowagie/rups/view/icons/IconFetcher.java | 21 +- .../rups/view/icons/IconTreeCellRenderer.java | 12 +- .../lowagie/rups/view/icons/IconTreeNode.java | 36 +- .../com/lowagie/rups/view/itext/FormTree.java | 121 +- .../lowagie/rups/view/itext/OutlineTree.java | 53 +- .../lowagie/rups/view/itext/PagesTable.java | 92 +- .../rups/view/itext/PdfObjectPanel.java | 93 +- .../com/lowagie/rups/view/itext/PdfTree.java | 46 +- .../rups/view/itext/StreamTextArea.java | 45 +- .../lowagie/rups/view/itext/XRefTable.java | 115 +- .../lowagie/rups/view/itext/XfaTextArea.java | 25 +- .../com/lowagie/rups/view/itext/XfaTree.java | 20 +- .../view/itext/treenodes/FormTreeNode.java | 35 +- .../view/itext/treenodes/OutlineTreeNode.java | 32 +- .../itext/treenodes/PdfObjectTreeNode.java | 267 +- .../view/itext/treenodes/PdfPageTreeNode.java | 16 +- .../itext/treenodes/PdfPagesTreeNode.java | 16 +- .../itext/treenodes/PdfTrailerTreeNode.java | 18 +- .../view/itext/treenodes/XdpTreeNode.java | 39 +- .../view/itext/treenodes/XfaTreeNode.java | 72 +- .../view/models/DictionaryTableModel.java | 49 +- .../rups/view/models/JTableAutoModel.java | 32 +- .../view/models/JTableAutoModelInterface.java | 27 +- .../rups/view/models/PdfArrayTableModel.java | 36 +- .../com/lowagie/toolbox/AbstractTool.java | 131 +- .../com/lowagie/toolbox/ToolMenuItems.java | 53 +- .../java/com/lowagie/toolbox/Toolbox.java | 97 +- .../java/com/lowagie/toolbox/Versions.java | 270 +- .../toolbox/arguments/AbstractArgument.java | 86 +- .../toolbox/arguments/BitsetArgument.java | 27 +- .../toolbox/arguments/ColorArgument.java | 15 +- .../toolbox/arguments/FileArgument.java | 47 +- .../toolbox/arguments/FileArrayArgument.java | 19 +- .../toolbox/arguments/FloatArgument.java | 12 +- .../toolbox/arguments/ImageArgument.java | 36 +- .../toolbox/arguments/IntegerArgument.java | 26 +- .../toolbox/arguments/OptionArgument.java | 181 +- .../toolbox/arguments/PageSizeArgument.java | 29 +- .../toolbox/arguments/filters/DirFilter.java | 8 +- .../arguments/filters/ImageFilter.java | 34 +- .../toolbox/arguments/filters/PdfFilter.java | 12 +- .../toolbox/arguments/filters/U3DFilter.java | 12 +- .../com/lowagie/toolbox/plugins/Add3D.java | 154 +- .../toolbox/plugins/Bookmarks2XML.java | 71 +- .../com/lowagie/toolbox/plugins/Burst.java | 65 +- .../CompressDecompressPageContent.java | 69 +- .../com/lowagie/toolbox/plugins/Concat.java | 90 +- .../com/lowagie/toolbox/plugins/ConcatN.java | 58 +- .../com/lowagie/toolbox/plugins/Decrypt.java | 69 +- .../com/lowagie/toolbox/plugins/Divide.java | 45 +- .../com/lowagie/toolbox/plugins/DvdCover.java | 86 +- .../com/lowagie/toolbox/plugins/Encrypt.java | 93 +- .../toolbox/plugins/ExtractAttachments.java | 137 +- .../com/lowagie/toolbox/plugins/Handouts.java | 74 +- .../toolbox/plugins/HtmlBookmarks.java | 229 +- .../toolbox/plugins/ImageXRefViewer.java | 113 +- .../lowagie/toolbox/plugins/InspectPDF.java | 68 +- .../java/com/lowagie/toolbox/plugins/NUp.java | 76 +- .../lowagie/toolbox/plugins/Normalize.java | 647 +- .../lowagie/toolbox/plugins/PhotoAlbum.java | 72 +- .../plugins/RemoveLaunchApplication.java | 215 +- .../lowagie/toolbox/plugins/ReversePages.java | 226 +- .../toolbox/plugins/SelectedPages.java | 72 +- .../com/lowagie/toolbox/plugins/Split.java | 88 +- .../com/lowagie/toolbox/plugins/Txt2Pdf.java | 67 +- .../toolbox/plugins/XML2Bookmarks.java | 79 +- .../plugins/watermarker/Watermarker.java | 23 +- .../plugins/watermarker/WatermarkerTool.java | 101 +- .../toolbox/plugins/watermarker/Writer.java | 17 +- .../lowagie/toolbox/swing/CustomDialog.java | 19 +- .../toolbox/swing/EventDispatchingThread.java | 50 +- .../com/lowagie/toolbox/swing/FileList.java | 149 +- .../toolbox/swing/PdfInformationPanel.java | 43 +- .../java/com/lowagie/tools/BuildTutorial.java | 65 +- .../java/com/lowagie/tools/ConcatPdf.java | 48 +- .../java/com/lowagie/tools/Executable.java | 121 +- .../main/java/com/lowagie/tools/SplitPdf.java | 30 +- .../com/lowagie/tools/ToolboxAvailable.java | 27 +- .../examples/fonts/languages/Chinese.java | 13 +- .../examples/fonts/languages/Japanese.java | 1 - .../lowagie/examples/conformance/PdfA1B.java | 31 +- .../examples/directcontent/Layers.java | 37 +- .../directcontent/TemplateImages.java | 22 +- .../examples/directcontent/Templates.java | 35 +- .../examples/directcontent/colors/Groups.java | 30 +- .../directcontent/colors/Pattern.java | 28 +- .../directcontent/colors/Patterns.java | 101 +- .../directcontent/colors/Shading.java | 23 +- .../directcontent/colors/ShadingPattern.java | 15 +- .../directcontent/colors/SoftMask.java | 14 +- .../directcontent/colors/SpotColors.java | 48 +- .../colors/TableCellTransparency.java | 10 +- .../directcontent/colors/Transparency.java | 35 +- .../coordinates/AffineTransformation.java | 35 +- .../coordinates/TransformImage.java | 21 +- .../coordinates/Transformations.java | 29 +- .../directcontent/coordinates/UpsideDown.java | 40 +- .../coordinates/XandYcoordinates.java | 37 +- .../directcontent/graphics/Circles.java | 27 +- .../directcontent/graphics/GState.java | 16 +- .../directcontent/graphics/Literal.java | 48 +- .../directcontent/graphics/Shapes.java | 35 +- .../directcontent/graphics/State.java | 16 +- .../optionalcontent/Automatic.java | 18 +- .../optionalcontent/ContentGroups.java | 15 +- .../directcontent/optionalcontent/Layers.java | 23 +- .../optionalcontent/NestedLayers.java | 15 +- .../optionalcontent/OptionalContent.java | 27 +- .../optionalcontent/OrderedLayers.java | 10 +- .../directcontent/pageevents/Bookmarks.java | 38 +- .../directcontent/pageevents/EndPage.java | 38 +- .../directcontent/pageevents/Events.java | 258 +- .../pageevents/PageNumbersWatermark.java | 84 +- .../examples/directcontent/text/Logo.java | 30 +- .../examples/directcontent/text/Text.java | 29 +- .../lowagie/examples/fonts/EncodingFont.java | 111 +- .../lowagie/examples/fonts/FontEncoding.java | 29 +- .../examples/fonts/FontFactoryType1Fonts.java | 10 +- .../lowagie/examples/fonts/FullFontNames.java | 15 +- .../fonts/GlyphLayoutDocumentBidi.java | 4 +- .../fonts/GlyphLayoutDocumentBidiPerFont.java | 4 +- .../fonts/GlyphLayoutDocumentDin91379.java | 138 +- .../fonts/GlyphLayoutDocumentKernLiga.java | 6 +- .../GlyphLayoutDocumentKernLigaPerFont.java | 6 +- .../fonts/GlyphLayoutFormDin91379.java | 126 +- .../lowagie/examples/fonts/ListEncodings.java | 11 +- .../examples/fonts/StandardType1Fonts.java | 13 +- .../com/lowagie/examples/fonts/TrueType.java | 25 +- .../examples/fonts/UnicodeExample.java | 28 +- .../fonts/getting/ChineseJapaneseKorean.java | 85 +- .../fonts/getting/FontFactoryStyles.java | 21 +- .../examples/fonts/getting/OpenTypeFont.java | 10 +- .../examples/fonts/getting/RegisterFont.java | 29 +- .../examples/fonts/getting/TrueType.java | 28 +- .../fonts/getting/TrueTypeCollections.java | 28 +- .../fonts/getting/UsingFontFactory.java | 18 +- .../examples/fonts/styles/ComplexText.java | 6 +- .../examples/fonts/styles/ExtraStyles.java | 11 +- .../examples/fonts/styles/FixedFontWidth.java | 12 +- .../examples/fonts/styles/FontColor.java | 19 +- .../fonts/styles/FontStylePropagation.java | 28 +- .../examples/fonts/styles/RightToLeft.java | 152 +- .../examples/fonts/styles/Vertical.java | 22 +- .../examples/fonts/styles/WidthHeight.java | 40 +- .../com/lowagie/examples/footer/Footer.java | 12 +- .../lowagie/examples/forms/FormCheckbox.java | 31 +- .../com/lowagie/examples/forms/FormCombo.java | 27 +- .../com/lowagie/examples/forms/FormList.java | 43 +- .../examples/forms/FormPushButton.java | 29 +- .../examples/forms/FormRadioButton.java | 35 +- .../lowagie/examples/forms/FormSignature.java | 27 +- .../lowagie/examples/forms/FormTextField.java | 31 +- .../lowagie/examples/forms/ListFields.java | 33 +- .../forms/SimpleRegistrationForm.java | 70 +- .../lowagie/examples/forms/TextFields.java | 33 +- .../examples/forms/create/StudentCard.java | 31 +- .../forms/create/StudentCardForm.java | 58 +- .../examples/forms/fill/FdfExample.java | 15 +- .../lowagie/examples/forms/fill/Register.java | 10 +- .../examples/forms/fill/XfdfExample.java | 12 +- .../examples/general/CustomPageSize.java | 29 +- .../examples/general/DefaultPageSize.java | 29 +- .../examples/general/HelloEncrypted.java | 17 +- .../examples/general/HelloSystemOut.java | 11 +- .../lowagie/examples/general/HelloWorld.java | 11 +- .../examples/general/HelloWorldMeta.java | 11 +- .../examples/general/HelloWorldPdf.java | 15 +- .../examples/general/LandscapePortrait.java | 30 +- .../com/lowagie/examples/general/Margins.java | 30 +- .../copystamp/AddWatermarkPageNumbers.java | 14 +- .../general/copystamp/Concatenate.java | 37 +- .../general/copystamp/ConcatenateForms.java | 6 +- .../general/copystamp/EncryptorExample.java | 9 +- .../examples/general/copystamp/Register.java | 10 +- .../examples/general/copystamp/TwoOnOne.java | 21 +- .../examples/general/faq/Measurements.java | 27 +- .../lowagie/examples/general/faq/NewPage.java | 30 +- .../examples/general/faq/OpenPdfVersion.java | 9 +- .../examples/general/faq/PdfVersion.java | 23 +- .../lowagie/examples/general/read/Info.java | 18 +- .../examples/general/read/ReadEncrypted.java | 30 +- .../examples/general/webapp/OutSimplePdf.java | 26 +- .../general/webapp/ProgressServlet.java | 128 +- .../general/webapp/SilentPrintServlet.java | 84 +- .../com/lowagie/examples/html/HelloHtml.java | 11 +- .../lowagie/examples/html/HelloWorldMeta.java | 11 +- .../com/lowagie/examples/html/Images.java | 27 +- .../com/lowagie/examples/html/ImagesURL.java | 29 +- .../lowagie/examples/html/ParseHelloHtml.java | 4 +- .../examples/html/ParseNestedHtmlList.java | 1 - .../lowagie/examples/html/ParseTableHtml.java | 4 +- .../lowagie/examples/html/ParseTitleHtml.java | 4 +- .../lowagie/examples/html/SpanTableHtml.java | 1 + .../com/lowagie/examples/objects/Chunks.java | 16 +- .../examples/objects/DifferentFonts.java | 10 +- .../lowagie/examples/objects/FancyLists.java | 16 +- .../examples/objects/FontSelection.java | 14 +- .../com/lowagie/examples/objects/Lists.java | 27 +- .../lowagie/examples/objects/LongList.java | 7 +- .../examples/objects/NegativeLeading.java | 14 +- .../lowagie/examples/objects/Paragraphs.java | 20 +- .../com/lowagie/examples/objects/Phrases.java | 16 +- .../examples/objects/SpaceWordRatio.java | 10 +- .../examples/objects/SymbolSubstitution.java | 17 +- .../examples/objects/anchors/AHref.java | 23 +- .../examples/objects/anchors/Actions.java | 12 +- .../examples/objects/anchors/Annotations.java | 56 +- .../objects/anchors/ChainedActions.java | 12 +- .../objects/anchors/JavaScriptAction.java | 12 +- .../objects/anchors/LocalDestination.java | 16 +- .../examples/objects/anchors/LocalGoto.java | 46 +- .../objects/anchors/NamedActions.java | 12 +- .../objects/anchors/OpenApplication.java | 12 +- .../examples/objects/anchors/RemoteGoto.java | 70 +- .../objects/anchors/SimpleAnnotations.java | 20 +- .../objects/bookmarks/Destinations.java | 22 +- .../examples/objects/bookmarks/Layers.java | 16 +- .../objects/bookmarks/ListItemBookmarks.java | 3 +- .../objects/bookmarks/OutlineActions.java | 18 +- .../objects/bookmarks/PageLabels.java | 21 +- .../objects/bookmarks/ParagraphBookmarks.java | 28 +- .../examples/objects/chunk/Background.java | 13 +- .../examples/objects/chunk/ChunkColor.java | 19 +- .../examples/objects/chunk/EndOfLine.java | 19 +- .../examples/objects/chunk/Generic.java | 53 +- .../examples/objects/chunk/Glossary.java | 44 +- .../examples/objects/chunk/Hyphenation.java | 14 +- .../lowagie/examples/objects/chunk/Lines.java | 21 +- .../examples/objects/chunk/Rendering.java | 15 +- .../lowagie/examples/objects/chunk/Skew.java | 13 +- .../examples/objects/chunk/SplitChar.java | 20 +- .../examples/objects/chunk/SubSupScript.java | 15 +- .../lowagie/examples/objects/chunk/Width.java | 11 +- .../examples/objects/columns/Column.java | 277 +- .../objects/columns/ColumnSimple.java | 279 +- .../objects/columns/ColumnTextMultiTable.java | 100 +- .../objects/columns/ColumnTextTable.java | 35 +- .../objects/columns/MultiColumnR2L.java | 113 +- .../objects/columns/MultiColumnSimple.java | 113 +- .../objects/images/AbsolutePositions.java | 27 +- .../examples/objects/images/Alignment.java | 19 +- .../objects/images/AnnotatedImage.java | 19 +- .../examples/objects/images/AwtImage.java | 11 +- .../examples/objects/images/DvdCover.java | 158 +- .../examples/objects/images/ImageChunks.java | 17 +- .../examples/objects/images/ImageMasks.java | 20 +- .../objects/images/ImageSequence.java | 36 +- .../examples/objects/images/Images.java | 27 +- .../objects/images/ImagesAlignment.java | 17 +- .../examples/objects/images/RawData.java | 43 +- .../examples/objects/images/Rotating.java | 50 +- .../examples/objects/images/Scaling.java | 27 +- .../examples/objects/tables/AddBigTable.java | 14 +- .../objects/tables/CellAlignment.java | 13 +- .../examples/objects/tables/CellColors.java | 12 +- .../examples/objects/tables/CellHeights.java | 20 +- .../objects/tables/CellPaddingLeading.java | 24 +- .../examples/objects/tables/CellWidths.java | 10 +- .../examples/objects/tables/DefaultCell.java | 14 +- .../examples/objects/tables/ImageCell.java | 12 +- .../examples/objects/tables/MyFirstTable.java | 14 +- .../examples/objects/tables/NestedTables.java | 16 +- .../examples/objects/tables/SplitRows.java | 18 +- .../examples/objects/tables/TableBorders.java | 70 +- .../examples/objects/tables/TableSpacing.java | 12 +- .../objects/tables/TableWidthAlignment.java | 12 +- .../tables/alternatives/JTable2Pdf.java | 113 +- .../tables/alternatives/LargeCell.java | 7 +- .../tables/alternatives/MyFirstTable.java | 12 +- .../tables/alternatives/NestedTables.java | 83 +- .../objects/tables/alternatives/OldTable.java | 14 +- .../tables/alternatives/PaddingBorders.java | 16 +- .../tables/alternatives/RepeatingTable.java | 31 +- .../tables/alternatives/SpecificCells.java | 48 +- .../tables/alternatives/TablePdfPTable.java | 38 +- .../tables/alternatives/TableWithImage.java | 12 +- .../objects/tables/pdfptable/CellEvents.java | 34 +- .../tables/pdfptable/FloatingBoxes.java | 82 +- .../tables/pdfptable/FragmentTable.java | 13 +- .../objects/tables/pdfptable/SplitTable.java | 14 +- .../tables/pdfptable/TableEvents1.java | 141 +- .../tables/pdfptable/TableEvents2.java | 137 +- .../objects/tables/pdfptable/Tables.java | 26 +- .../tables/pdfptable/VerticalTextInCells.java | 18 +- .../tables/pdfptable/WriteSelectedRows.java | 12 +- .../plugins/watermarker/WatermarkerTest.java | 5 +- .../watermarker/WatermarkerToolTest.java | 10 +- .../java/com/lowagie/tools/ConcatPdfTest.java | 36 +- .../examples/html/example1forHTMLWorker.html | 52 +- .../examples/html/example2forHTMLWorker.html | 46 +- .../examples/html/parseHelloWorld.html | 28 +- .../com/lowagie/examples/html/parseTitle.html | 8 +- 767 files changed, 62553 insertions(+), 56535 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a5e4e75f2..8acf2cd23 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -12,6 +12,7 @@ A clear and concise description of what the bug is. **To Reproduce** Code to reproduce the issue + 1. Sample Code 2. Unit-Test @@ -22,8 +23,9 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **System (please complete the following information):** - - OS: [e.g. iOS] - - Used Font: + +- OS: [e.g. iOS] +- Used Font: **Additional context** Add any other context about the problem here. diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a49f83f50..a6fef516c 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,14 +1,18 @@ ## Description of the new Feature/Bugfix + Describe here how you fixed the bug, or implemented the new feature. Related Issue: # ## Unit-Tests for the new Feature/Bugfix + - [ ] Unit-Tests added to reproduce the bug - [ ] Unit-Tests added to the added feature ## Compatibilities Issues + Is anything broken because of the new code? Any changes in method signatures? ## Testing details + Any other details about how to test the new feature or bugfix? diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index 89a605bbd..83535da18 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -1,4 +1,3 @@ - name: OpenPDF checkstyle on: push: @@ -11,13 +10,13 @@ jobs: runs-on: ubuntu-latest name: Checkstyle job steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - name: Run check style - uses: dbelyaev/action-checkstyle@v1.2.1 - with: - checkstyle_config: 'checkstyle.xml' - reporter: 'github-pr-check' - filter_mode: nofilter - level: error - fail_on_error: true + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: Run check style + uses: dbelyaev/action-checkstyle@v1.2.1 + with: + checkstyle_config: 'checkstyle.xml' + reporter: 'github-pr-check' + filter_mode: nofilter + level: error + fail_on_error: true diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b25198a4e..84ca7b07f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -47,44 +47,44 @@ jobs: # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support steps: - - name: Checkout repository - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 - - name: Setup java - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 17 + - name: Setup java + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v3 + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v3 - # â„¹ï¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + # â„¹ï¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 - with: - category: "/language:${{matrix.language}}" + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ededbb8d9..3f7c447e7 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -23,13 +23,13 @@ include: Examples of unacceptable behavior by participants include: * The use of sexualized language or imagery and unwelcome sexual attention or - advances + advances * Trolling, insulting/derogatory comments, and personal or political attacks * Public or private harassment * Publishing others' private information, such as a physical or electronic - address, without explicit permission + address, without explicit permission * Other conduct which could reasonably be considered inappropriate in a - professional setting + professional setting ## Our Responsibilities @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at +reported by contacting the project team at [gitter](https://gitter.im/LibrePDF/code_of_conduct). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is diff --git a/Contributors.md b/Contributors.md index 0de2dfe8f..7c176cc76 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,9 +1,11 @@ # Credits ## + Significant [Contributors to OpenPDF](https://github.com/LibrePDF/OpenPDF/graphs/contributors) on GitHub. In GitHub User alphabetical order. ## Maintainers and Members ## + * [@asturio](https://github.com/asturio) - Claudio Clemens * [@bengolder](https://github.com/bengolder) - Benjamin Golder * [@daviddurand](https://github.com/daviddurand) - David G. Durand @@ -15,7 +17,8 @@ In GitHub User alphabetical order. * [@abdullahcevik](https://github.com/abdullahcevik) - Abdullah Çevik * [@albfernandez](https://github.com/albfernandez) - Alberto Fernández -* [@andreasrosdal](https://github.com/andreasrosdal) - Andreas Røsdal - Maintainer of OpenPDF from 1.0 to 1.3.15, 1.3.32 to 2.0.0, now retired from OpenPDF development. +* [@andreasrosdal](https://github.com/andreasrosdal) - Andreas Røsdal - Maintainer of OpenPDF from 1.0 to 1.3.15, 1.3.32 + to 2.0.0, now retired from OpenPDF development. * [@AnthonyStevens](https://github.com/AnthonyStevens) - Anthony Stevens * [@applikationsprogramvara](https://github.com/applikationsprogramvara) * [@arational](https://github.com/arational) - Ivan Stefanischin diff --git a/README.md b/README.md index b020d4372..5adec26a6 100644 --- a/README.md +++ b/README.md @@ -23,13 +23,16 @@ Get version 2.0.0 here - https://github.com/LibrePDF/OpenPDF/releases/tag/2.0.0 - [Previous releases](https://github.com/LibrePDF/OpenPDF/releases) ## Features ## + Some of the features of OpenPDF include: * Creating PDFs: You can use OpenPDF to create new PDF documents from scratch. -* Manipulating Existing PDFs: OpenPDF allows you to modify existing PDF documents by adding or removing pages, modifying text, and more. +* Manipulating Existing PDFs: OpenPDF allows you to modify existing PDF documents by adding or removing pages, modifying + text, and more. -* Text and Font Support: You can add text to PDF documents using various fonts and styles, and extract text from PDF files. +* Text and Font Support: You can add text to PDF documents using various fonts and styles, and extract text from PDF + files. * Graphics and Images: OpenPDF supports the addition of images and graphics to PDF files. @@ -39,7 +42,6 @@ Some of the features of OpenPDF include: * Page Layout: OpenPDF allows you to set the page size, orientation, and other layout properties. - ## Use OpenPDF as Maven dependency Add this to your pom.xml file to use the latest version of OpenPDF: @@ -125,9 +127,10 @@ only contain code that you have written yourself. GPL or AGPL licensed code will ### Required Dependencies: ### -- Java 11 or later is required to use OpenPDF versions 1.3.37 and later. All versions Java 11 to Java OpenJDK 21 have been tested to work. -- Java 17 or later is required to use OpenPDF versions 2.0.0. We are working on modernizing the OpenPDF library for Java 17+. - +- Java 11 or later is required to use OpenPDF versions 1.3.37 and later. All versions Java 11 to Java OpenJDK 21 have + been tested to work. +- Java 17 or later is required to use OpenPDF versions 2.0.0. We are working on modernizing the OpenPDF library for Java + 17+. ### UTF-8 Fonts: ### @@ -159,11 +162,12 @@ See: [wiki](https://github.com/LibrePDF/OpenPDF/wiki/Accents,-DIN-91379,-non-Lat - [BouncyCastle](https://www.bouncycastle.org/) (BouncyCastle is used to sign PDF files, so it's a recommended dependency) - - Provider (`org.bouncycastle:bcprov-jdk18on` or `org.bouncycastle:bcprov-ext-jdk18on` depending - on which algorithm you are using) - - PKIX/CMS (`org.bouncycastle:bcpkix-jdk18on`) + - Provider (`org.bouncycastle:bcprov-jdk18on` or `org.bouncycastle:bcprov-ext-jdk18on` depending + on which algorithm you are using) + - PKIX/CMS (`org.bouncycastle:bcpkix-jdk18on`) - Apache FOP (`org.apache.xmlgraphics:fop`) - Please refer to our [pom.xml](pom.xml) to see what version is needed. ## Credits ## + Please see [Contributors.md](Contributors.md). diff --git a/changelogs/1.3.29.md b/changelogs/1.3.29.md index 0403fd28d..3f39372fb 100644 --- a/changelogs/1.3.29.md +++ b/changelogs/1.3.29.md @@ -8,7 +8,7 @@ - Document 3rd party lib dep for getTiffImage - Document tiff requirements for Java < 9 - Fix #620: leading problem -- Fix #633: update ColumnText.java to +- Fix #633: update ColumnText.java to - Fix #727: for issue - Fix #729: dictionary casting for issue - Improve monospaced font mapping on Windows and Linux @@ -18,6 +18,7 @@ - Use List for specialContent in HeaderFooter and rename specialcontent with camelcase ## Updated dependencies: + - Bump actions/checkout from 2 to 3 - Bump assertj-core from 3.22.0 to 3.23.1 - Bump checkstyle from 10.2 to 10.3 diff --git a/changelogs/1.3.30.md b/changelogs/1.3.30.md index 1258973fa..ae53ab04b 100644 --- a/changelogs/1.3.30.md +++ b/changelogs/1.3.30.md @@ -15,6 +15,7 @@ - Support for embedded images in HTMLWorker ## Updated dependencies: + - Bump bouncycastle from 1.71 to 1.71.1 - Bump checkstyle from 10.3 to 10.3.3 - Bump junit from 5.8.2 to 5.9.0 diff --git a/changelogs/1.3.31.md b/changelogs/1.3.31.md index 649a8e684..cce427b5d 100644 --- a/changelogs/1.3.31.md +++ b/changelogs/1.3.31.md @@ -1,6 +1,7 @@ # 1.3.31 ## Changes + - Add Bidi example, refactorings - Add CIDSet for font subset to ensure PDF/A compliance - Add optional metadata/info update in a sequential revision @@ -21,6 +22,7 @@ - Use different versions of mockito ## Updated dependencies: + - Bump assertj-core from 3.23.1 to 3.24.2 - Bump bouncycastle from 1.71.1 to 1.76 - Bump checkstyle from 10.3.3 to 10.12.3 diff --git a/changelogs/1.3.32.md b/changelogs/1.3.32.md index 2161d7dfd..0cd02be3e 100644 --- a/changelogs/1.3.32.md +++ b/changelogs/1.3.32.md @@ -1,20 +1,21 @@ # 1.3.32 ## Changes + * Speed up loading fonts from JAR (#955 #954) * Bump commons-io:commons-io from 2.13.0 to 2.15.0 (#967) * Bump org.apache.maven.plugins:maven-jxr-plugin from 3.3.0 to 3.3.1 (#966) -* Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.0 -* Bump com.puppycrawl.tools:checkstyle from 10.12.3 to 10.12.4 (#958) -* Nullsafe equals in XfaForm when processing template (#959) -* Fix height calculation for table rows with rowspan @fellmann (#865) +* Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.0 +* Bump com.puppycrawl.tools:checkstyle from 10.12.3 to 10.12.4 (#958) +* Nullsafe equals in XfaForm when processing template (#959) +* Fix height calculation for table rows with rowspan @fellmann (#865) * Added AutoCloseable annotations on classes, that already implement the close method @SirLefti (#831) -* Fixing umlauts in form fields @antonleliuk (#847) -* Skipping eliminateSharedStreams() method call. @netmackan (#772) +* Fixing umlauts in form fields @antonleliuk (#847) +* Skipping eliminateSharedStreams() method call. @netmackan (#772) * Add flag to inhibit FOP glyph substitution @dadza (#904) -* Refactorings by @Lonzak Part I (#853) +* Refactorings by @Lonzak Part I (#853) * Align /ID entry creation with 14.4 File Identifiers @bsanchezb (#876) * Bump com.ibm.icu:icu4j from 73.2 to 74.1 (#976) -* Bump org.pitest:pitest-junit5-plugin from 1.2.0 to 1.2.1 (#975) -* Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2 +* Bump org.pitest:pitest-junit5-plugin from 1.2.0 to 1.2.1 (#975) +* Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2 * Bump org.apache.maven.plugins:maven-checkstyle-plugin (#978) diff --git a/changelogs/1.3.37.md b/changelogs/1.3.37.md index cf649419f..f52e87c74 100644 --- a/changelogs/1.3.37.md +++ b/changelogs/1.3.37.md @@ -1,4 +1,5 @@ # 1.3.37 ## Changes + * OpenPDF 1.3.37 requires Java 11. \ No newline at end of file diff --git a/changelogs/2.0.0.md b/changelogs/2.0.0.md index c3476f8dd..69afa3f93 100644 --- a/changelogs/2.0.0.md +++ b/changelogs/2.0.0.md @@ -1,5 +1,7 @@ # 2.0.0 ## Changes -* Removal of 108 deprecated old methods and fields. See JavaDoc for the methods marked as deprecated in 1.3.40 and the new methods to use instead: https://javadoc.io/doc/com.github.librepdf/openpdf/latest/index.html + +* Removal of 108 deprecated old methods and fields. See JavaDoc for the methods marked as deprecated in 1.3.40 and the + new methods to use instead: https://javadoc.io/doc/com.github.librepdf/openpdf/latest/index.html * Java 17 required. diff --git a/changelogs/README.md b/changelogs/README.md index a8696930b..e7559f6b5 100644 --- a/changelogs/README.md +++ b/changelogs/README.md @@ -1,6 +1,7 @@ # Creating the changelog ## How to create a changelog + - Take a look at all commits since the last release - Group them into categories - Create a new file in the `changelogs` folder with the name `x.y.z.md` where `x.y.z` is the version number diff --git a/config/README.md b/config/README.md index df395171f..70eeb7df8 100644 --- a/config/README.md +++ b/config/README.md @@ -1,7 +1,7 @@ # Formatter Configuration -You can find in this directory the configuration files for the formatters used in this project. For IntelliJ IDEA -and Eclipse. If you have other IDE, please contribute with a configuration file. OpenPDF has it's own coding style. +You can find in this directory the configuration files for the formatters used in this project. For IntelliJ IDEA +and Eclipse. If you have other IDE, please contribute with a configuration file. OpenPDF has it's own coding style. It is based in the Google Java Style Guide, but with some modifications: * Indentation: 4 spaces diff --git a/openpdf/src/main/java/com/lowagie/bouncycastle/BouncyCastleHelper.java b/openpdf/src/main/java/com/lowagie/bouncycastle/BouncyCastleHelper.java index b87a747e9..e22a6ecca 100644 --- a/openpdf/src/main/java/com/lowagie/bouncycastle/BouncyCastleHelper.java +++ b/openpdf/src/main/java/com/lowagie/bouncycastle/BouncyCastleHelper.java @@ -3,13 +3,6 @@ import com.lowagie.text.ExceptionConverter; import com.lowagie.text.pdf.PdfArray; import com.lowagie.text.pdf.PdfObject; - -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cms.CMSEnvelopedData; -import org.bouncycastle.cms.Recipient; -import org.bouncycastle.cms.RecipientInformation; -import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; - import java.io.IOException; import java.security.Key; import java.security.PrivateKey; @@ -17,8 +10,14 @@ import java.security.cert.CertificateEncodingException; import java.util.Collection; import java.util.List; +import org.bouncycastle.cert.X509CertificateHolder; +import org.bouncycastle.cms.CMSEnvelopedData; +import org.bouncycastle.cms.Recipient; +import org.bouncycastle.cms.RecipientInformation; +import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; public class BouncyCastleHelper { + public static void checkCertificateEncodingOrThrowException(Certificate certificate) { // OJO... try { @@ -30,7 +29,8 @@ public static void checkCertificateEncodingOrThrowException(Certificate certific } @SuppressWarnings("unchecked") - public static byte[] getEnvelopedData(PdfArray recipients, List strings, Certificate certificate, Key certificateKey, String certificateKeyProvider) { + public static byte[] getEnvelopedData(PdfArray recipients, List strings, Certificate certificate, + Key certificateKey, String certificateKeyProvider) { byte[] envelopedData = null; for (PdfObject recipient : recipients.getElements()) { strings.remove(recipient); diff --git a/openpdf/src/main/java/com/lowagie/text/Anchor.java b/openpdf/src/main/java/com/lowagie/text/Anchor.java index 2d077396e..f5df548a5 100644 --- a/openpdf/src/main/java/com/lowagie/text/Anchor.java +++ b/openpdf/src/main/java/com/lowagie/text/Anchor.java @@ -56,10 +56,9 @@ /** * An Anchor can be a reference or a destination of a reference. - *

- * An Anchor is a special kind of Phrase. - * It is constructed in the same way. - *

+ *

+ * An Anchor is a special kind of Phrase. It is constructed in the same way. + *

* Example: * 

  * Anchor anchor = new Anchor("this is a link");
@@ -67,110 +66,111 @@
  * anchor.setReference("http://www.lowagie.com");
  *
* - * @see Element - * @see Phrase + * @see Element + * @see Phrase */ public class Anchor extends Phrase { // constant private static final long serialVersionUID = -852278536049236911L; - + // membervariables - - /** This is the name of the Anchor. */ + + /** + * This is the name of the Anchor. + */ protected String name = null; - - /** This is the reference of the Anchor. */ + + /** + * This is the reference of the Anchor. + */ protected String reference = null; - + // constructors - + /** * Constructs an Anchor without specifying a leading. */ public Anchor() { super(16); } - + /** * Constructs an Anchor with a certain leading. * - * @param leading the leading + * @param leading the leading */ - + public Anchor(float leading) { super(leading); } - + /** * Constructs an Anchor with a certain Chunk. * - * @param chunk a Chunk + * @param chunk a Chunk */ public Anchor(Chunk chunk) { super(chunk); } - + /** * Constructs an Anchor with a certain String. * - * @param string a String + * @param string a String */ public Anchor(String string) { super(string); } - + /** - * Constructs an Anchor with a certain String - * and a certain Font. + * Constructs an Anchor with a certain String and a certain Font. * - * @param string a String - * @param font a Font + * @param string a String + * @param font a Font */ public Anchor(String string, Font font) { super(string, font); } - + /** - * Constructs an Anchor with a certain Chunk - * and a certain leading. + * Constructs an Anchor with a certain Chunk and a certain leading. * - * @param leading the leading - * @param chunk a Chunk + * @param leading the leading + * @param chunk a Chunk */ public Anchor(float leading, Chunk chunk) { super(leading, chunk); } - + /** - * Constructs an Anchor with a certain leading - * and a certain String. + * Constructs an Anchor with a certain leading and a certain String. * - * @param leading the leading - * @param string a String + * @param leading the leading + * @param string a String */ public Anchor(float leading, String string) { super(leading, string); } - + /** - * Constructs an Anchor with a certain leading, - * a certain String and a certain Font. + * Constructs an Anchor with a certain leading, a certain String and a certain + * Font. * - * @param leading the leading - * @param string a String - * @param font a Font + * @param leading the leading + * @param string a String + * @param font a Font */ public Anchor(float leading, String string, Font font) { super(leading, string, font); } - + /** * Constructs an Anchor with a certain Phrase. * - * @param phrase a Phrase - */ + * @param phrase a Phrase + */ public Anchor(Phrase phrase) { super(phrase); if (phrase instanceof Anchor) { @@ -179,15 +179,15 @@ public Anchor(Phrase phrase) { setReference(a.reference); } } - + // implementation of the Element-methods - + /** * Processes the element by adding it (or the different parts) to an * ElementListener. * - * @param listener an ElementListener - * @return true if the element was processed successfully + * @param listener an ElementListener + * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { try { @@ -207,16 +207,15 @@ public boolean process(ElementListener listener) { listener.add(chunk); } return true; - } - catch(DocumentException de) { + } catch (DocumentException de) { return false; } } - + /** * Gets all the chunks in this element. * - * @return an ArrayList + * @return an ArrayList */ public ArrayList getChunks() { ArrayList tmp = new ArrayList<>(); @@ -232,73 +231,72 @@ public ArrayList getChunks() { } if (localDestination) { chunk.setLocalGoto(reference.substring(1)); - } - else if (reference != null) + } else if (reference != null) { chunk.setAnchor(reference); + } tmp.add(chunk); } return tmp; } - + /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return Element.ANCHOR; } - + // methods - + /** - * Sets the name of this Anchor. + * Returns the name of this Anchor. * - * @param name a new name + * @return a name */ - public void setName(String name) { - this.name = name; + public String getName() { + return name; } - + /** - * Sets the reference of this Anchor. + * Sets the name of this Anchor. * - * @param reference a new reference + * @param name a new name */ - public void setReference(String reference) { - this.reference = reference; + public void setName(String name) { + this.name = name; } - + // methods to retrieve information /** - * Returns the name of this Anchor. + * Gets the reference of this Anchor. * - * @return a name - */ - public String getName() { - return name; + * @return a reference + */ + public String getReference() { + return reference; } /** - * Gets the reference of this Anchor. + * Sets the reference of this Anchor. * - * @return a reference + * @param reference a new reference */ - public String getReference() { - return reference; + public void setReference(String reference) { + this.reference = reference; } /** * Gets the reference of this Anchor. * - * @return an URL + * @return an URL */ public URL getUrl() { try { return new URL(reference); - } - catch(MalformedURLException mue) { + } catch (MalformedURLException mue) { return null; } } diff --git a/openpdf/src/main/java/com/lowagie/text/Annotation.java b/openpdf/src/main/java/com/lowagie/text/Annotation.java index 8ea274ba4..b04c7a16c 100644 --- a/openpdf/src/main/java/com/lowagie/text/Annotation.java +++ b/openpdf/src/main/java/com/lowagie/text/Annotation.java @@ -55,9 +55,8 @@ import java.util.Map; /** - * An Annotation is a little note that can be added to a page on - * a document. - * + * An Annotation is a little note that can be added to a page on a document. + * * @see Element * @see Anchor */ @@ -66,110 +65,165 @@ public class Annotation implements Element { // membervariables - /** This is a possible annotation type. */ + /** + * This is a possible annotation type. + */ public static final int TEXT = 0; - /** This is a possible annotation type. */ + /** + * This is a possible annotation type. + */ public static final int URL_NET = 1; - /** This is a possible annotation type. */ + /** + * This is a possible annotation type. + */ public static final int URL_AS_STRING = 2; - /** This is a possible annotation type. */ + /** + * This is a possible annotation type. + */ public static final int FILE_DEST = 3; - /** This is a possible annotation type. */ + /** + * This is a possible annotation type. + */ public static final int FILE_PAGE = 4; - /** This is a possible annotation type. */ + /** + * This is a possible annotation type. + */ public static final int NAMED_DEST = 5; - /** This is a possible annotation type. */ + /** + * This is a possible annotation type. + */ public static final int LAUNCH = 6; - /** This is a possible annotation type. */ + /** + * This is a possible annotation type. + */ public static final int SCREEN = 7; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String TITLE = "title"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String CONTENT = "content"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String URL = "url"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String FILE = "file"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String DESTINATION = "destination"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String PAGE = "page"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String NAMED = "named"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String APPLICATION = "application"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String PARAMETERS = "parameters"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String OPERATION = "operation"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String DEFAULTDIR = "defaultdir"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String LLX = "llx"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String LLY = "lly"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String URX = "urx"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String URY = "ury"; - /** This is a possible attribute. */ + /** + * This is a possible attribute. + */ public static final String MIMETYPE = "mime"; - /** This is the type of annotation. */ + /** + * This is the type of annotation. + */ protected int annotationtype; - /** This is the title of the Annotation. */ + /** + * This is the title of the Annotation. + */ protected Map annotationAttributes = new HashMap<>(); - /** This is the lower left x-value */ + /** + * This is the lower left x-value + */ protected float llx = Float.NaN; - /** This is the lower left y-value */ + /** + * This is the lower left y-value + */ protected float lly = Float.NaN; - /** This is the upper right x-value */ + /** + * This is the upper right x-value + */ protected float urx = Float.NaN; - /** This is the upper right y-value */ + /** + * This is the upper right y-value + */ protected float ury = Float.NaN; // constructors /** - * Constructs an Annotation with a certain title and some - * text. - * - * @param llx - * lower left x coordinate - * @param lly - * lower left y coordinate - * @param urx - * upper right x coordinate - * @param ury - * upper right y coordinate + * Constructs an Annotation with a certain title and some text. + * + * @param llx lower left x coordinate + * @param lly lower left y coordinate + * @param urx upper right x coordinate + * @param ury upper right y coordinate */ private Annotation(float llx, float lly, float urx, float ury) { this.llx = llx; @@ -181,8 +235,7 @@ private Annotation(float llx, float lly, float urx, float ury) { /** * Copy constructor. * - * @param an an object of type {@link Annotation} - * that will be copied + * @param an an object of type {@link Annotation} that will be copied */ public Annotation(Annotation an) { annotationtype = an.annotationtype; @@ -192,15 +245,12 @@ public Annotation(Annotation an) { urx = an.urx; ury = an.ury; } - + /** - * Constructs an Annotation with a certain title and some - * text. - * - * @param title - * the title of the annotation - * @param text - * the content of the annotation + * Constructs an Annotation with a certain title and some text. + * + * @param title the title of the annotation + * @param text the content of the annotation */ public Annotation(String title, String text) { annotationtype = TEXT; @@ -209,21 +259,14 @@ public Annotation(String title, String text) { } /** - * Constructs an Annotation with a certain title and some - * text. - * - * @param title - * the title of the annotation - * @param text - * the content of the annotation - * @param llx - * the lower left x-value - * @param lly - * the lower left y-value - * @param urx - * the upper right x-value - * @param ury - * the upper right y-value + * Constructs an Annotation with a certain title and some text. + * + * @param title the title of the annotation + * @param text the content of the annotation + * @param llx the lower left x-value + * @param lly the lower left y-value + * @param urx the upper right x-value + * @param ury the upper right y-value */ public Annotation(String title, String text, float llx, float lly, float urx, float ury) { @@ -235,17 +278,12 @@ public Annotation(String title, String text, float llx, float lly, /** * Constructs an Annotation. - * - * @param llx - * the lower left x-value - * @param lly - * the lower left y-value - * @param urx - * the upper right x-value - * @param ury - * the upper right y-value - * @param url - * the external reference + * + * @param llx the lower left x-value + * @param lly the lower left y-value + * @param urx the upper right x-value + * @param ury the upper right y-value + * @param url the external reference */ public Annotation(float llx, float lly, float urx, float ury, URL url) { this(llx, lly, urx, ury); @@ -255,17 +293,12 @@ public Annotation(float llx, float lly, float urx, float ury, URL url) { /** * Constructs an Annotation. - * - * @param llx - * the lower left x-value - * @param lly - * the lower left y-value - * @param urx - * the upper right x-value - * @param ury - * the upper right y-value - * @param url - * the external reference + * + * @param llx the lower left x-value + * @param lly the lower left y-value + * @param urx the upper right x-value + * @param ury the upper right y-value + * @param url the external reference */ public Annotation(float llx, float lly, float urx, float ury, String url) { this(llx, lly, urx, ury); @@ -275,19 +308,13 @@ public Annotation(float llx, float lly, float urx, float ury, String url) { /** * Constructs an Annotation. - * - * @param llx - * the lower left x-value - * @param lly - * the lower left y-value - * @param urx - * the upper right x-value - * @param ury - * the upper right y-value - * @param file - * an external PDF file - * @param dest - * the destination in this file + * + * @param llx the lower left x-value + * @param lly the lower left y-value + * @param urx the upper right x-value + * @param ury the upper right y-value + * @param file an external PDF file + * @param dest the destination in this file */ public Annotation(float llx, float lly, float urx, float ury, String file, String dest) { @@ -299,17 +326,14 @@ public Annotation(float llx, float lly, float urx, float ury, String file, /** * Creates a Screen annotation to embed media clips - * - * @param llx {@link Annotation#llx} - * @param lly {@link Annotation#lly} - * @param urx {@link Annotation#urx} - * @param ury {@link Annotation#ury} - * @param moviePath - * path to the media clip file - * @param mimeType - * mime type of the media - * @param showOnDisplay - * if true play on display of the page + * + * @param llx {@link Annotation#llx} + * @param lly {@link Annotation#lly} + * @param urx {@link Annotation#urx} + * @param ury {@link Annotation#ury} + * @param moviePath path to the media clip file + * @param mimeType mime type of the media + * @param showOnDisplay if true play on display of the page */ public Annotation(float llx, float lly, float urx, float ury, String moviePath, String mimeType, boolean showOnDisplay) { @@ -317,25 +341,19 @@ public Annotation(float llx, float lly, float urx, float ury, annotationtype = SCREEN; annotationAttributes.put(FILE, moviePath); annotationAttributes.put(MIMETYPE, mimeType); - annotationAttributes.put(PARAMETERS, new boolean[] { - false /* embedded */, showOnDisplay }); + annotationAttributes.put(PARAMETERS, new boolean[]{ + false /* embedded */, showOnDisplay}); } /** * Constructs an Annotation. - * - * @param llx - * the lower left x-value - * @param lly - * the lower left y-value - * @param urx - * the upper right x-value - * @param ury - * the upper right y-value - * @param file - * an external PDF file - * @param page - * a page number in this file + * + * @param llx the lower left x-value + * @param lly the lower left y-value + * @param urx the upper right x-value + * @param ury the upper right y-value + * @param file an external PDF file + * @param page a page number in this file */ public Annotation(float llx, float lly, float urx, float ury, String file, int page) { @@ -347,17 +365,12 @@ public Annotation(float llx, float lly, float urx, float ury, String file, /** * Constructs an Annotation. - * - * @param llx - * the lower left x-value - * @param lly - * the lower left y-value - * @param urx - * the upper right x-value - * @param ury - * the upper right y-value - * @param named - * a named destination in this file + * + * @param llx the lower left x-value + * @param lly the lower left y-value + * @param urx the upper right x-value + * @param ury the upper right y-value + * @param named a named destination in this file */ public Annotation(float llx, float lly, float urx, float ury, int named) { this(llx, lly, urx, ury); @@ -367,23 +380,15 @@ public Annotation(float llx, float lly, float urx, float ury, int named) { /** * Constructs an Annotation. - * - * @param llx - * the lower left x-value - * @param lly - * the lower left y-value - * @param urx - * the upper right x-value - * @param ury - * the upper right y-value - * @param application - * an external application - * @param parameters - * parameters to pass to this application - * @param operation - * the operation to pass to this application - * @param defaultdir - * the default directory to run this application in + * + * @param llx the lower left x-value + * @param lly the lower left y-value + * @param urx the upper right x-value + * @param ury the upper right y-value + * @param application an external application + * @param parameters parameters to pass to this application + * @param operation the operation to pass to this application + * @param defaultdir the default directory to run this application in */ public Annotation(float llx, float lly, float urx, float ury, String application, String parameters, String operation, @@ -400,7 +405,7 @@ public Annotation(float llx, float lly, float urx, float ury, /** * Gets the type of the text element. - * + * * @return a type */ public int type() { @@ -408,11 +413,9 @@ public int type() { } /** - * Processes the element by adding it (or the different parts) to an - * ElementListener. - * - * @param listener - * an ElementListener + * Processes the element by adding it (or the different parts) to an ElementListener. + * + * @param listener an ElementListener * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { @@ -425,7 +428,7 @@ public boolean process(ElementListener listener) { /** * Gets all the chunks in this element. - * + * * @return an ArrayList */ @@ -437,15 +440,11 @@ public ArrayList getChunks() { /** * Sets the dimensions of this annotation. - * - * @param llx - * the lower left x-value - * @param lly - * the lower left y-value - * @param urx - * the upper right x-value - * @param ury - * the upper right y-value + * + * @param llx the lower left x-value + * @param lly the lower left y-value + * @param urx the upper right x-value + * @param ury the upper right y-value */ public void setDimensions(float llx, float lly, float urx, float ury) { this.llx = llx; @@ -458,7 +457,7 @@ public void setDimensions(float llx, float lly, float urx, float ury) { /** * Returns the lower left x-value. - * + * * @return a value */ public float llx() { @@ -467,7 +466,7 @@ public float llx() { /** * Returns the lower left y-value. - * + * * @return a value */ public float lly() { @@ -476,7 +475,7 @@ public float lly() { /** * Returns the upper right x-value. - * + * * @return a value */ public float urx() { @@ -485,7 +484,7 @@ public float urx() { /** * Returns the upper right y-value. - * + * * @return a value */ public float ury() { @@ -494,59 +493,59 @@ public float ury() { /** * Returns the lower left x-value. - * - * @param def - * the default value + * + * @param def the default value * @return a value */ public float llx(float def) { - if (Float.isNaN(llx)) + if (Float.isNaN(llx)) { return def; + } return llx; } /** * Returns the lower left y-value. - * - * @param def - * the default value + * + * @param def the default value * @return a value */ public float lly(float def) { - if (Float.isNaN(lly)) + if (Float.isNaN(lly)) { return def; + } return lly; } /** * Returns the upper right x-value. - * - * @param def - * the default value + * + * @param def the default value * @return a value */ public float urx(float def) { - if (Float.isNaN(urx)) + if (Float.isNaN(urx)) { return def; + } return urx; } /** * Returns the upper right y-value. - * - * @param def - * the default value + * + * @param def the default value * @return a value */ public float ury(float def) { - if (Float.isNaN(ury)) + if (Float.isNaN(ury)) { return def; + } return ury; } /** * Returns the type of this Annotation. - * + * * @return a type */ public int annotationType() { @@ -555,40 +554,42 @@ public int annotationType() { /** * Returns the title of this Annotation. - * + * * @return a name */ public String title() { String s = (String) annotationAttributes.get(TITLE); - if (s == null) + if (s == null) { s = ""; + } return s; } /** * Gets the content of this Annotation. - * + * * @return a reference */ public String content() { String s = (String) annotationAttributes.get(CONTENT); - if (s == null) + if (s == null) { s = ""; + } return s; } /** * Gets the content of this Annotation. - * + * * @return a reference */ public Map getAttributes() { return annotationAttributes; } - + /** * @see com.lowagie.text.Element#isContent() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isContent() { return true; @@ -596,7 +597,7 @@ public boolean isContent() { /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return true; diff --git a/openpdf/src/main/java/com/lowagie/text/BadElementException.java b/openpdf/src/main/java/com/lowagie/text/BadElementException.java index a28bf3293..381aa69c8 100644 --- a/openpdf/src/main/java/com/lowagie/text/BadElementException.java +++ b/openpdf/src/main/java/com/lowagie/text/BadElementException.java @@ -52,34 +52,37 @@ /** * Signals an attempt to create an Element that hasn't got the right form. * - * @see DocumentException - * @see Cell - * @see Table + * @see DocumentException + * @see Cell + * @see Table */ public class BadElementException extends DocumentException { - + private static final long serialVersionUID = -799006030723822254L; // constructors + /** * Constructs a BadElementException + * * @param ex an Exception object that has to be turned into a BadElementException */ public BadElementException(Exception ex) { super(ex); } - + /** * Constructs a BadElementException without a message. */ BadElementException() { super(); } - + /** * Constructs a BadElementException with a message. - * @param message a message describing the exception + * + * @param message a message describing the exception */ public BadElementException(String message) { super(message); diff --git a/openpdf/src/main/java/com/lowagie/text/Cell.java b/openpdf/src/main/java/com/lowagie/text/Cell.java index faef3bd37..5e5f2171b 100644 --- a/openpdf/src/main/java/com/lowagie/text/Cell.java +++ b/openpdf/src/main/java/com/lowagie/text/Cell.java @@ -54,27 +54,22 @@ import com.lowagie.text.alignment.VerticalAlignment; import com.lowagie.text.alignment.WithHorizontalAlignment; import com.lowagie.text.alignment.WithVerticalAlignment; -import java.util.ArrayList; -import java.util.Iterator; import com.lowagie.text.error_messages.MessageLocalization; - import com.lowagie.text.pdf.PdfPCell; +import java.util.ArrayList; +import java.util.Iterator; /** * A Cell is a Rectangle containing other * Elements. - *

- * A Cell must be added to a Table. - * The Table will place the Cell in + *

+ * A Cell must be added to a Table. The Table will place the Cell in * a Row. - *

+ *

* Example: * 

- * Table table = new Table(3);
- * table.setBorderWidth(1);
- * table.setBorderColor(new Color(0, 0, 255));
- * table.setCellpadding(5);
- * table.setCellspacing(5);
+ * Table table = new Table(3); table.setBorderWidth(1); table.setBorderColor(new Color(0, 0, 255));
+ * table.setCellpadding(5); table.setCellspacing(5);
  * Cell cell = new Cell("header");
  * cell.setHeader(true);
  * cell.setColspan(3);
@@ -82,17 +77,13 @@
  * cell = new Cell("example cell with colspan 1 and rowspan 2");
  * cell.setRowspan(2);
  * cell.setBorderColor(new Color(255, 0, 0));
- * table.addCell(cell);
- * table.addCell("1.1");
- * table.addCell("2.1");
- * table.addCell("1.2");
- * table.addCell("2.2");
+ * table.addCell(cell); table.addCell("1.1"); table.addCell("2.1"); table.addCell("1.2"); table.addCell("2.2");
  *
* - * @see Rectangle - * @see Element - * @see Table - * @see Row + * @see Rectangle + * @see Element + * @see Table + * @see Row */ public class Cell extends TableRectangle implements TextElementArray, WithHorizontalAlignment, WithVerticalAlignment { @@ -100,78 +91,79 @@ public class Cell extends TableRectangle implements TextElementArray, WithHorizo // membervariables /** - * The ArrayList of Elements - * that are part of the content of the Cell. + * The ArrayList of Elements that are part of the content of the Cell. */ protected java.util.List arrayList = null; - /** The horizontal alignment of the cell content. */ + /** + * The horizontal alignment of the cell content. + */ protected int horizontalAlignment = Element.ALIGN_UNDEFINED; - /** The vertical alignment of the cell content. */ + /** + * The vertical alignment of the cell content. + */ protected int verticalAlignment = Element.ALIGN_UNDEFINED; /** - * The width of the cell as a String. - * It can be an absolute value "100" or a percentage "20%". + * The width of the cell as a String. It can be an absolute value "100" or a percentage "20%". */ protected float width; protected boolean percentage = false; - /** The colspan of the cell. */ + /** + * The colspan of the cell. + */ protected int colspan = 1; - /** The rowspan of the cell. */ + /** + * The rowspan of the cell. + */ protected int rowspan = 1; - - /** The leading of the content inside the cell. */ - float leading = Float.NaN; - - /** Is this Cell a header? */ - protected boolean header; - /** - * Maximum number of lines allowed in the cell. - * The default value of this property is not to limit the maximum number of lines - * (contributed by dperezcar@fcc.es) + * Is this Cell a header? */ - protected int maxLines = Integer.MAX_VALUE; - + protected boolean header; /** - * If a truncation happens due to the maxLines property, then this text will - * be added to indicate a truncation has happened. - * Default value is null, and means avoiding marking the truncation. - * A useful value of this property could be e.g. "..." - * (contributed by dperezcar@fcc.es) + * Maximum number of lines allowed in the cell. The default value of this property is not to limit the maximum + * number of lines (contributed by dperezcar@fcc.es) */ - String showTruncation; - + protected int maxLines = Integer.MAX_VALUE; /** - * Indicates that the largest ascender height should be used to determine the - * height of the first line. Note that this only has an effect when rendered - * to PDF. Setting this to true can help with vertical alignment problems. + * Indicates that the largest ascender height should be used to determine the height of the first line. Note that + * this only has an effect when rendered to PDF. Setting this to true can help with vertical alignment problems. */ protected boolean useAscender = false; - /** - * Indicates that the largest descender height should be added to the height of - * the last line (so characters like y don't dip into the border). Note that - * this only has an effect when rendered to PDF. + * Indicates that the largest descender height should be added to the height of the last line (so characters like y + * don't dip into the border). Note that this only has an effect when rendered to PDF. */ protected boolean useDescender = false; - /** - * Adjusts the cell contents to compensate for border widths. Note that - * this only has an effect when rendered to PDF. + * Adjusts the cell contents to compensate for border widths. Note that this only has an effect when rendered to + * PDF. */ protected boolean useBorderPadding; - - /** Does this Cell force a group change? */ + /** + * Does this Cell force a group change? + */ protected boolean groupChange = true; + /** + * The leading of the content inside the cell. + */ + float leading = Float.NaN; + /** + * If a truncation happens due to the maxLines property, then this text will be added to indicate a truncation has + * happened. Default value is null, and means avoiding marking the truncation. A useful value of this property could + * be e.g. "..." (contributed by dperezcar@fcc.es) + */ + String showTruncation; // constructors - /** Constructs an empty Cell. */ + /** + * Constructs an empty Cell. + */ public Cell() { // creates a Rectangle with BY DEFAULT a border of 0.5 super(0, 0, 0, 0); @@ -184,7 +176,7 @@ public Cell() { /** * Constructs an empty Cell (for internal use only). * - * @param dummy a dummy value + * @param dummy a dummy value */ public Cell(boolean dummy) { this(); @@ -192,49 +184,62 @@ public Cell(boolean dummy) { } /** - * Constructs a Cell with a certain content.

- * The String will be converted into a Paragraph. - * @param content a String + * Constructs a Cell with a certain content.

The String will be converted into a + * Paragraph. + * + * @param content a String */ public Cell(String content) { this(); try { addElement(new Paragraph(content)); - } - catch(BadElementException bee) { + } catch (BadElementException bee) { } } /** - * Constructs a Cell with a certain Element.

- * if the element is a ListItem, Row or + * Constructs a Cell with a certain Element.

if the element is a + * ListItem, + * Row or * Cell, an exception will be thrown. * - * @param element the element - * @throws BadElementException when the creator was called with a ListItem, Row or Cell + * @param element the element + * @throws BadElementException when the creator was called with a ListItem, Row or + * Cell */ public Cell(Element element) throws BadElementException { this(); - if(element instanceof Phrase) { - setLeading(((Phrase)element).getLeading()); + if (element instanceof Phrase) { + setLeading(((Phrase) element).getLeading()); } addElement(element); } // implementation of the Element-methods + /** + * Get dummy cell used when merging inner tables. + * + * @return a cell with colspan 3 and no border + */ + private static Cell getDummyCell() { + Cell cell = new Cell(true); + cell.setColspan(3); + cell.setBorder(NO_BORDER); + return cell; + } + /** * Processes the element by adding it (or the different parts) to an * ElementListener. * - * @param listener an ElementListener - * @return true if the element was processed successfully + * @param listener an ElementListener + * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { try { return listener.add(this); - } - catch(DocumentException de) { + } catch (DocumentException de) { return false; } } @@ -242,16 +247,18 @@ public boolean process(ElementListener listener) { /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return Element.CELL; } + // Getters and setters + /** * Gets all the chunks in this element. * - * @return an ArrayList + * @return an ArrayList */ public ArrayList getChunks() { ArrayList tmp = new ArrayList<>(); @@ -261,39 +268,62 @@ public ArrayList getChunks() { return tmp; } - // Getters and setters - /** * Gets the horizontal alignment. * - * @return a value + * @return a value */ - public int getHorizontalAlignment() { - return horizontalAlignment; - } + public int getHorizontalAlignment() { + return horizontalAlignment; + } + + @Override + public void setHorizontalAlignment(final HorizontalAlignment alignment) { + if (alignment == null) { + return; + } + + horizontalAlignment = alignment.getId(); + } /** * Gets the vertical alignment. - * @return a value + * + * @return a value */ public int getVerticalAlignment() { return verticalAlignment; } + @Override + public void setVerticalAlignment(final VerticalAlignment alignment) { + if (alignment == null) { + return; + } + + verticalAlignment = alignment.getId(); + } + + /** + * Gets the width. + */ + public float getWidth() { + return width; + } + /** * Sets the width. * - * @param value the new value + * @param value the new value */ public void setWidth(float value) { this.width = value; } - + /** - * Sets the width. - * It can be an absolute value "100" or a percentage "20%" + * Sets the width. It can be an absolute value "100" or a percentage "20%" * - * @param value the new value + * @param value the new value */ public void setWidth(String value) { if (value.endsWith("%")) { @@ -302,73 +332,63 @@ public void setWidth(String value) { } width = Integer.parseInt(value); } - - /** - * Gets the width. - */ - public float getWidth() { - return width; - } /** * Gets the width as a String. * - * @return a value + * @return a value */ public String getWidthAsString() { String w = String.valueOf(width); - if (w.endsWith(".0")) w = w.substring(0, w.length() - 2); - if (percentage) w += "%"; + if (w.endsWith(".0")) { + w = w.substring(0, w.length() - 2); + } + if (percentage) { + w += "%"; + } return w; } - /** - * Sets the colspan. - * - * @param value the new value - */ - public void setColspan(int value) { - colspan = value; - } - /** * Gets the colspan. - * @return a value + * + * @return a value */ public int getColspan() { return colspan; } /** - * Sets the rowspan. + * Sets the colspan. * - * @param value the new value + * @param value the new value */ - public void setRowspan(int value) { - rowspan = value; + public void setColspan(int value) { + colspan = value; } /** * Gets the rowspan. - * @return a value + * + * @return a value */ public int getRowspan() { return rowspan; } /** - * Sets the leading. + * Sets the rowspan. * - * @param value the new value + * @param value the new value */ - public void setLeading(float value) { - leading = value; + public void setRowspan(int value) { + rowspan = value; } /** * Gets the leading. * - * @return a value + * @return a value */ public float getLeading() { if (Float.isNaN(leading)) { @@ -378,49 +398,53 @@ public float getLeading() { } /** - * Sets header. + * Sets the leading. * - * @param value the new value + * @param value the new value */ - public void setHeader(boolean value) { - header = value; + public void setLeading(float value) { + leading = value; } /** * Is this Cell a header? * - * @return a value + * @return a value */ public boolean isHeader() { return header; } - + /** - * Setter for maxLines - * @param value the maximum number of lines + * Sets header. + * + * @param value the new value */ - public void setMaxLines(int value) { - maxLines = value; + public void setHeader(boolean value) { + header = value; } - + /** * Getter for maxLines + * * @return the maxLines value */ public int getMaxLines() { return maxLines; } - + /** - * Setter for showTruncation - * @param value Can be null for avoiding marking the truncation. + * Setter for maxLines + * + * @param value the maximum number of lines */ - public void setShowTruncation(String value) { - showTruncation = value; + public void setMaxLines(int value) { + maxLines = value; } - + /** * Getter for showTruncation + * * @return the showTruncation value */ public String getShowTruncation() { @@ -428,15 +452,17 @@ public String getShowTruncation() { } /** - * Sets the value of useAscender. - * @param use use ascender height if true + * Setter for showTruncation + * + * @param value Can be null for avoiding marking the truncation. */ - public void setUseAscender(boolean use) { - useAscender = use; + public void setShowTruncation(String value) { + showTruncation = value; } /** * Gets the value of useAscender + * * @return useAscender */ public boolean isUseAscender() { @@ -444,15 +470,17 @@ public boolean isUseAscender() { } /** - * Sets the value of useDescender. - * @param use use descender height if true + * Sets the value of useAscender. + * + * @param use use ascender height if true */ - public void setUseDescender(boolean use) { - useDescender = use; + public void setUseAscender(boolean use) { + useAscender = use; } /** * gets the value of useDescender + * * @return useDescender */ public boolean isUseDescender() { @@ -460,25 +488,38 @@ public boolean isUseDescender() { } /** - * Sets the value of useBorderPadding. - * @param use adjust layout for borders if true + * Sets the value of useDescender. + * + * @param use use descender height if true */ - public void setUseBorderPadding(boolean use) { - useBorderPadding = use; + public void setUseDescender(boolean use) { + useDescender = use; } /** * Gets the value of useBorderPadding. + * * @return useBorderPadding */ public boolean isUseBorderPadding() { return useBorderPadding; } +// arraylist stuff + + /** + * Sets the value of useBorderPadding. + * + * @param use adjust layout for borders if true + */ + public void setUseBorderPadding(boolean use) { + useBorderPadding = use; + } + /** * Does this Cell force a group change? * - * @return a value + * @return a value */ public boolean getGroupChange() { return groupChange; @@ -487,18 +528,16 @@ public boolean getGroupChange() { /** * Sets group change. * - * @param value the new value + * @param value the new value */ public void setGroupChange(boolean value) { groupChange = value; } - -// arraylist stuff /** * Gets the number of Elements in the Cell. * - * @return a size. + * @return a size. */ public int size() { return arrayList.size(); @@ -507,12 +546,12 @@ public int size() { /** * Gets an iterator of Elements. * - * @return an Iterator. + * @return an Iterator. */ public Iterator getElements() { return arrayList.iterator(); } - + /** * Clears all the Elements of this Cell. */ @@ -523,10 +562,10 @@ public void clear() { /** * Checks if the Cell is empty. * - * @return false if there are non-empty Elements in the Cell. + * @return false if there are non-empty Elements in the Cell. */ public boolean isEmpty() { - switch(size()) { + switch (size()) { case 0: return true; case 1: @@ -541,39 +580,44 @@ public boolean isEmpty() { case Element.LIST: return ((List) element).isEmpty(); } - return false; + return false; default: return false; } } - + /** * Makes sure there is at least 1 object in the Cell. - * + *

* Otherwise it might not be shown in the table. */ void fill() { - if (size() == 0) arrayList.add(new Paragraph(0)); + if (size() == 0) { + arrayList.add(new Paragraph(0)); + } } + // helper methods + /** * Checks if this Cell is a placeholder for a (nested) table. * - * @return true if the only element in this cell is a table + * @return true if the only element in this cell is a table */ public boolean isTable() { return (size() == 1) - && (arrayList.get(0).type() == Element.TABLE); + && (arrayList.get(0).type() == Element.TABLE); } - + /** * Adds an element to this Cell. - *

+ *

* Remark: you can't add ListItems, Rows, Cells, * JPEGs, GIFs or PNGs to a Cell. * * @param element The Element to add - * @throws BadElementException if the method was called with a ListItem, Row or Cell + * @throws BadElementException if the method was called with a ListItem, Row or + * Cell */ public void addElement(Element element) throws BadElementException { if (isTable()) { @@ -584,38 +628,45 @@ public void addElement(Element element) throws BadElementException { table.addCell(tmp); return; } - switch(element.type()) { + switch (element.type()) { case Element.LISTITEM: case Element.ROW: case Element.CELL: - throw new BadElementException(MessageLocalization.getComposedMessage("you.can.t.add.listitems.rows.or.cells.to.a.cell")); + throw new BadElementException( + MessageLocalization.getComposedMessage("you.can.t.add.listitems.rows.or.cells.to.a.cell")); case Element.LIST: - List list = (List)element; + List list = (List) element; if (Float.isNaN(leading)) { setLeading(list.getTotalLeading()); } - if (list.isEmpty()) return; + if (list.isEmpty()) { + return; + } arrayList.add(element); return; case Element.ANCHOR: case Element.PARAGRAPH: case Element.PHRASE: - Phrase p = (Phrase)element; + Phrase p = (Phrase) element; if (Float.isNaN(leading)) { setLeading(p.getLeading()); } - if (p.isEmpty()) return; + if (p.isEmpty()) { + return; + } arrayList.add(element); return; case Element.CHUNK: - if (((Chunk) element).isEmpty()) return; + if (((Chunk) element).isEmpty()) { + return; + } arrayList.add(element); return; case Element.TABLE: Table table = new Table(3); float[] widths = new float[3]; - widths[1] = ((Table)element).getWidth(); - switch(((Table)element).getAlignment()) { + widths[1] = ((Table) element).getWidth(); + switch (((Table) element).getAlignment()) { case Element.ALIGN_LEFT: widths[0] = 0f; widths[2] = 100f - widths[1]; @@ -632,8 +683,7 @@ public void addElement(Element element) throws BadElementException { Cell tmp; if (arrayList.isEmpty()) { table.addCell(getDummyCell()); - } - else { + } else { tmp = new Cell(); tmp.setBorder(NO_BORDER); tmp.setColspan(3); @@ -645,7 +695,7 @@ public void addElement(Element element) throws BadElementException { tmp = new Cell(); tmp.setBorder(NO_BORDER); table.addCell(tmp); - table.insertTable((Table)element); + table.insertTable((Table) element); tmp = new Cell(); tmp.setBorder(NO_BORDER); table.addCell(tmp); @@ -658,6 +708,8 @@ public void addElement(Element element) throws BadElementException { } } + // unsupported Rectangle methods + /** * Add an Object to this cell. * @@ -668,36 +720,28 @@ public boolean add(Element o) { try { this.addElement(o); return true; - } - catch(ClassCastException cce) { - throw new ClassCastException(MessageLocalization.getComposedMessage("you.can.only.add.objects.that.implement.the.element.interface")); - } - catch(BadElementException bee) { + } catch (ClassCastException cce) { + throw new ClassCastException(MessageLocalization.getComposedMessage( + "you.can.only.add.objects.that.implement.the.element.interface")); + } catch (BadElementException bee) { throw new ClassCastException(bee.getMessage()); } } - // helper methods - - /** - * Get dummy cell used when merging inner tables. - * @return a cell with colspan 3 and no border - */ - private static Cell getDummyCell() { - Cell cell = new Cell(true); - cell.setColspan(3); - cell.setBorder(NO_BORDER); - return cell; - } - /** * Creates a PdfPCell based on this Cell object. + * * @return a PdfPCell * @throws BadElementException on error */ public PdfPCell createPdfPCell() throws BadElementException { - if (rowspan > 1) throw new BadElementException(MessageLocalization.getComposedMessage("pdfpcells.can.t.have.a.rowspan.gt.1")); - if (isTable()) return new PdfPCell(((Table)arrayList.get(0)).createPdfPTable()); + if (rowspan > 1) { + throw new BadElementException( + MessageLocalization.getComposedMessage("pdfpcells.can.t.have.a.rowspan.gt.1")); + } + if (isTable()) { + return new PdfPCell(((Table) arrayList.get(0)).createPdfPTable()); + } PdfPCell cell = new PdfPCell(); cell.setVerticalAlignment(verticalAlignment); cell.setHorizontalAlignment(horizontalAlignment); @@ -708,9 +752,9 @@ public PdfPCell createPdfPCell() throws BadElementException { cell.cloneNonPositionParameters(this); cell.setNoWrap(getMaxLines() == 1); for (Iterator i = getElements(); i.hasNext(); ) { - Element e = (Element)i.next(); + Element e = (Element) i.next(); if (e.type() == Element.PHRASE || e.type() == Element.PARAGRAPH) { - Paragraph p = new Paragraph((Phrase)e); + Paragraph p = new Paragraph((Phrase) e); p.setAlignment(horizontalAlignment); e = p; } @@ -719,123 +763,127 @@ public PdfPCell createPdfPCell() throws BadElementException { return cell; } - // unsupported Rectangle methods - /** * This method throws an UnsupportedOperationException. + * * @return NA */ public float getTop() { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); + throw new UnsupportedOperationException( + MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); } /** * This method throws an UnsupportedOperationException. - * @return NA + * + * @param value NA */ - public float getBottom() { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); + public void setTop(int value) { + throw new UnsupportedOperationException(MessageLocalization.getComposedMessage( + "dimensions.of.a.cell.are.attributed.automagically.see.the.faq")); } /** * This method throws an UnsupportedOperationException. + * * @return NA */ - public float getLeft() { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); + public float getBottom() { + throw new UnsupportedOperationException( + MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); } /** * This method throws an UnsupportedOperationException. - * @return NA + * + * @param value NA */ - public float getRight() { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); + public void setBottom(int value) { + throw new UnsupportedOperationException(MessageLocalization.getComposedMessage( + "dimensions.of.a.cell.are.attributed.automagically.see.the.faq")); } /** * This method throws an UnsupportedOperationException. - * @param margin NA + * * @return NA */ - public float top(int margin) { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); + public float getLeft() { + throw new UnsupportedOperationException( + MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); } /** * This method throws an UnsupportedOperationException. - * @param margin NA - * @return NA + * + * @param value NA */ - public float bottom(int margin) { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); + public void setLeft(int value) { + throw new UnsupportedOperationException(MessageLocalization.getComposedMessage( + "dimensions.of.a.cell.are.attributed.automagically.see.the.faq")); } /** * This method throws an UnsupportedOperationException. - * @param margin NA + * * @return NA */ - public float left(int margin) { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); + public float getRight() { + throw new UnsupportedOperationException( + MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); } /** * This method throws an UnsupportedOperationException. - * @param margin NA - * @return NA + * + * @param value NA */ - public float right(int margin) { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); + public void setRight(int value) { + throw new UnsupportedOperationException(MessageLocalization.getComposedMessage( + "dimensions.of.a.cell.are.attributed.automagically.see.the.faq")); } /** * This method throws an UnsupportedOperationException. - * @param value NA + * + * @param margin NA + * @return NA */ - public void setTop(int value) { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.are.attributed.automagically.see.the.faq")); + public float top(int margin) { + throw new UnsupportedOperationException( + MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); } /** * This method throws an UnsupportedOperationException. - * @param value NA + * + * @param margin NA + * @return NA */ - public void setBottom(int value) { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.are.attributed.automagically.see.the.faq")); + public float bottom(int margin) { + throw new UnsupportedOperationException( + MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); } /** * This method throws an UnsupportedOperationException. - * @param value NA + * + * @param margin NA + * @return NA */ - public void setLeft(int value) { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.are.attributed.automagically.see.the.faq")); + public float left(int margin) { + throw new UnsupportedOperationException( + MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); } /** * This method throws an UnsupportedOperationException. - * @param value NA + * + * @param margin NA + * @return NA */ - public void setRight(int value) { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("dimensions.of.a.cell.are.attributed.automagically.see.the.faq")); - } - - @Override - public void setHorizontalAlignment(final HorizontalAlignment alignment) { - if (alignment == null) { - return; - } - - horizontalAlignment = alignment.getId(); - } - - @Override - public void setVerticalAlignment(final VerticalAlignment alignment) { - if (alignment == null) { - return; - } - - verticalAlignment = alignment.getId(); + public float right(int margin) { + throw new UnsupportedOperationException( + MessageLocalization.getComposedMessage("dimensions.of.a.cell.can.t.be.calculated.see.the.faq")); } } diff --git a/openpdf/src/main/java/com/lowagie/text/Chapter.java b/openpdf/src/main/java/com/lowagie/text/Chapter.java index 28a0e49c7..338115f21 100644 --- a/openpdf/src/main/java/com/lowagie/text/Chapter.java +++ b/openpdf/src/main/java/com/lowagie/text/Chapter.java @@ -54,34 +54,35 @@ /** * A Chapter is a special Section. - *

- * A chapter number has to be created using a Paragraph as title - * and an int as chapter number. The chapter number is shown be - * default. If you don't want to see the chapter number, you have to set the - * numberdepth to 0. - *

+ *

+ * A chapter number has to be created using a Paragraph as title and an int as chapter number. + * The chapter number is shown be default. If you don't want to see the chapter number, you have to set the numberdepth + * to 0. + *

* Example: * 

- * Paragraph title2 = new Paragraph("This is Chapter 2", FontFactory.getFont(FontFactory.HELVETICA, 18, Font.BOLDITALIC, new Color(0, 0, 255)));
+ * Paragraph title2 = new Paragraph("This is Chapter 2", FontFactory.getFont(FontFactory.HELVETICA, 18, Font.BOLDITALIC,
+ * new Color(0, 0, 255)));
  * Chapter chapter2 = new Chapter(title2, 2);
  * chapter2.setNumberDepth(0);
  * Paragraph someText = new Paragraph("This is some text");
  * chapter2.add(someText);
- * Paragraph title21 = new Paragraph("This is Section 1 in Chapter 2", FontFactory.getFont(FontFactory.HELVETICA, 16, Font.BOLD, new Color(255, 0, 0)));
- * Section section1 = chapter2.addSection(title21);
- * Paragraph someSectionText = new Paragraph("This is some silly paragraph in a chapter and/or section. It contains some text to test the functionality of Chapters and Section.");
- * section1.add(someSectionText);
+ * Paragraph title21 = new Paragraph("This is Section 1 in Chapter 2", FontFactory.getFont(FontFactory.HELVETICA, 16,
+ * Font.BOLD, new Color(255, 0, 0))); Section section1 = chapter2.addSection(title21); Paragraph
+ * someSectionText = new Paragraph("This is some silly paragraph in a chapter and/or section. It contains some text to
+ * test the functionality of Chapters and Section."); section1.add(someSectionText);
  *
*/ public class Chapter extends Section { - + // constant private static final long serialVersionUID = 1791000695779357361L; - + /** * Constructs a new Chapter. - * @param number the Chapter number + * + * @param number the Chapter number */ public Chapter(int number) { super(null, 1); @@ -89,37 +90,37 @@ public Chapter(int number) { numbers.add(number); triggerNewPage = true; } - + /** * Constructs a new Chapter. * - * @param title the Chapter title (as a Paragraph) - * @param number the Chapter number + * @param title the Chapter title (as a Paragraph) + * @param number the Chapter number */ - + public Chapter(Paragraph title, int number) { super(title, 1); numbers = new ArrayList<>(); numbers.add(number); triggerNewPage = true; } - + /** * Constructs a new Chapter. * - * @param title the Chapter title (as a String) - * @param number the Chapter number + * @param title the Chapter title (as a String) + * @param number the Chapter number */ public Chapter(String title, int number) { this(new Paragraph(title), number); } - + // implementation of the Element-methods - + /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return Element.CHAPTER; @@ -127,7 +128,7 @@ public int type() { /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return false; diff --git a/openpdf/src/main/java/com/lowagie/text/ChapterAutoNumber.java b/openpdf/src/main/java/com/lowagie/text/ChapterAutoNumber.java index c4bc24310..51855cd1c 100644 --- a/openpdf/src/main/java/com/lowagie/text/ChapterAutoNumber.java +++ b/openpdf/src/main/java/com/lowagie/text/ChapterAutoNumber.java @@ -48,6 +48,7 @@ package com.lowagie.text; import com.lowagie.text.error_messages.MessageLocalization; + /** * Chapter with auto numbering. * @@ -60,14 +61,15 @@ public class ChapterAutoNumber extends Chapter { /** * Is the chapter number already set? - * @since 2.1.4 + * + * @since 2.1.4 */ protected boolean numberSet = false; - + /** * Create a new object. * - * @param para the Chapter title (as a Paragraph) + * @param para the Chapter title (as a Paragraph) */ public ChapterAutoNumber(final Paragraph para) { super(para, 0); @@ -75,8 +77,8 @@ public ChapterAutoNumber(final Paragraph para) { /** * Create a new object. - * - * @param title the Chapter title (as a String) + * + * @param title the Chapter title (as a String) */ public ChapterAutoNumber(final String title) { super(title, 0); @@ -85,12 +87,13 @@ public ChapterAutoNumber(final String title) { /** * Create a new section for this chapter and ad it. * - * @param title the Section title (as a String) + * @param title the Section title (as a String) * @return Returns the new section. */ public Section addSection(final String title) { if (isAddedCompletely()) { - throw new IllegalStateException(MessageLocalization.getComposedMessage("this.largeelement.has.already.been.added.to.the.document")); + throw new IllegalStateException( + MessageLocalization.getComposedMessage("this.largeelement.has.already.been.added.to.the.document")); } return addSection(title, 2); } @@ -98,20 +101,21 @@ public Section addSection(final String title) { /** * Create a new section for this chapter and add it. * - * @param title the Section title (as a Paragraph) + * @param title the Section title (as a Paragraph) * @return Returns the new section. */ public Section addSection(final Paragraph title) { if (isAddedCompletely()) { - throw new IllegalStateException(MessageLocalization.getComposedMessage("this.largeelement.has.already.been.added.to.the.document")); + throw new IllegalStateException( + MessageLocalization.getComposedMessage("this.largeelement.has.already.been.added.to.the.document")); } return addSection(title, 2); } - + /** * Changes the Chapter number. * - * @param number the new chapter number + * @param number the new chapter number * @return updated chapter number * @since 2.1.4 */ diff --git a/openpdf/src/main/java/com/lowagie/text/Chunk.java b/openpdf/src/main/java/com/lowagie/text/Chunk.java index 16011fe6d..e217b5f9a 100644 --- a/openpdf/src/main/java/com/lowagie/text/Chunk.java +++ b/openpdf/src/main/java/com/lowagie/text/Chunk.java @@ -49,39 +49,33 @@ package com.lowagie.text; -import java.awt.Color; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - import com.lowagie.text.error_messages.MessageLocalization; - import com.lowagie.text.pdf.HyphenationEvent; import com.lowagie.text.pdf.PdfAction; import com.lowagie.text.pdf.PdfAnnotation; import com.lowagie.text.pdf.PdfContentByte; import com.lowagie.text.pdf.draw.DrawInterface; +import java.awt.Color; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; /** - * This is the smallest significant part of text that can be added to a - * document. - *

- * Most elements can be divided in one or more Chunks. A chunk - * is a String with a certain Font. All other - * layout parameters should be defined in the object to which this chunk of text - * is added. - *

+ * This is the smallest significant part of text that can be added to a document. + *

+ * Most elements can be divided in one or more Chunks. A chunk is a String with a certain + * Font. All other layout parameters should be defined in the object to which this chunk of text is added. + *

* Example:

- * + * * 
- * 
+ *
  * Chunk chunk = new Chunk("Hello world",
- * FontFactory.getFont(FontFactory.COURIER, 20, Font.ITALIC, new Color(255, 0,
- * 0)));  document.add(chunk);
- * 
+ * FontFactory.getFont(FontFactory.COURIER, 20, Font.ITALIC, new Color(255, 0, 0)));  document.add(chunk);
+ *
  *
- * + * *
*/ @@ -89,31 +83,136 @@ public class Chunk implements Element { // public static membervariables - /** The character stand in for an image or a separator. */ + /** + * The character stand in for an image or a separator. + */ public static final String OBJECT_REPLACEMENT_CHARACTER = "\ufffc"; - /** This is a Chunk containing a newline. */ + /** + * This is a Chunk containing a newline. + */ public static final Chunk NEWLINE = new Chunk("\n"); - /** This is a Chunk containing a newpage. */ + /** + * This is a Chunk containing a newpage. + */ public static final Chunk NEXTPAGE = new Chunk(""); + /** + * Key for drawInterface of the Separator. + * + * @since 2.1.2 + */ + public static final String SEPARATOR = "SEPARATOR"; + + // member variables + /** + * Key for drawInterface of the tab. + * + * @since 2.1.2 + */ + public static final String TAB = "TAB"; + /** + * Key for text horizontal scaling. + */ + public static final String HSCALE = "HSCALE"; + /** + * Key for underline. + */ + public static final String UNDERLINE = "UNDERLINE"; + + // constructors + /** + * Key for sub/superscript. + */ + public static final String SUBSUPSCRIPT = "SUBSUPSCRIPT"; + /** + * Key for text skewing. + */ + public static final String SKEW = "SKEW"; + /** + * Key for background. + */ + public static final String BACKGROUND = "BACKGROUND"; + /** + * Key for text rendering mode. + */ + public static final String TEXTRENDERMODE = "TEXTRENDERMODE"; + /** + * Key for split character. + */ + public static final String SPLITCHARACTER = "SPLITCHARACTER"; + /** + * Key for hyphenation. + */ + public static final String HYPHENATION = "HYPHENATION"; + /** + * Key for remote goto. + */ + public static final String REMOTEGOTO = "REMOTEGOTO"; + /** + * Key for local goto. + */ + public static final String LOCALGOTO = "LOCALGOTO"; + /** + * Key for local destination. + */ + public static final String LOCALDESTINATION = "LOCALDESTINATION"; + /** + * Key for generic tag. + */ + public static final String GENERICTAG = "GENERICTAG"; + /** + * Key for image. + */ + public static final String IMAGE = "IMAGE"; + /** + * Key for Action. + */ + public static final String ACTION = "ACTION"; + /** + * Key for newpage. + */ + public static final String NEWPAGE = "NEWPAGE"; + /** + * Key for annotation. + */ + public static final String PDFANNOTATION = "PDFANNOTATION"; + + // implementation of the Element-methods + /** + * Key for color. + */ + public static final String COLOR = "COLOR"; + /** + * Key for encoding. + */ + public static final String ENCODING = "ENCODING"; + /** + * Key for character spacing. + */ + public static final String CHAR_SPACING = "CHAR_SPACING"; + + // methods that change the member variables + static { NEXTPAGE.setNewPage(); } - // member variables - - /** This is the content of this chunk of text. */ + /** + * This is the content of this chunk of text. + */ protected StringBuffer content = null; - /** This is the Font of this chunk of text. */ + // methods to retrieve information + /** + * This is the Font of this chunk of text. + */ protected Font font = null; - - /** Contains some of the attributes for this Chunk. */ + /** + * Contains some of the attributes for this Chunk. + */ protected Map attributes = null; - // constructors - /** * Empty constructor. */ @@ -124,8 +223,9 @@ public Chunk() { /** * A Chunk copy constructor. + * * @param ck the Chunk to be copied - */ + */ public Chunk(Chunk ck) { if (ck.content != null) { content = new StringBuffer(ck.content.toString()); @@ -137,27 +237,25 @@ public Chunk(Chunk ck) { attributes = new HashMap<>(ck.attributes); } } - + /** - * Constructs a chunk of text with a certain content and a certain - * Font. - * - * @param content - * the content - * @param font - * the font + * Constructs a chunk of text with a certain content and a certain Font. + * + * @param content the content + * @param font the font */ public Chunk(String content, Font font) { this.content = new StringBuffer(content); this.font = font; } + // attributes + /** * Constructs a chunk of text with a certain content, without specifying a * Font. - * - * @param content - * the content + * + * @param content the content */ public Chunk(String content) { this(content, new Font()); @@ -165,11 +263,9 @@ public Chunk(String content) { /** * Constructs a chunk of text with a char and a certain Font. - * - * @param c - * the content - * @param font - * the font + * + * @param c the content + * @param font the font */ public Chunk(char c, Font font) { this.content = new StringBuffer(); @@ -180,9 +276,8 @@ public Chunk(char c, Font font) { /** * Constructs a chunk of text with a char, without specifying a Font * . - * - * @param c - * the content + * + * @param c the content */ public Chunk(char c) { this(c, new Font()); @@ -190,110 +285,91 @@ public Chunk(char c) { /** * Constructs a chunk containing an Image. - * - * @param image - * the image - * @param offsetX - * the image offset in the x direction - * @param offsetY - * the image offset in the y direction + * + * @param image the image + * @param offsetX the image offset in the x direction + * @param offsetY the image offset in the y direction */ public Chunk(Image image, float offsetX, float offsetY) { this(OBJECT_REPLACEMENT_CHARACTER, new Font()); Image copyImage = Image.getInstance(image); copyImage.setAbsolutePosition(Float.NaN, Float.NaN); - setAttribute(IMAGE, new Object[] { copyImage, offsetX, - offsetY, Boolean.FALSE }); + setAttribute(IMAGE, new Object[]{copyImage, offsetX, + offsetY, Boolean.FALSE}); } + // the attributes are ordered as they appear in the book 'iText in Action' + /** - * Key for drawInterface of the Separator. - * @since 2.1.2 - */ - public static final String SEPARATOR = "SEPARATOR"; - - /** - * Creates a separator Chunk. - * Note that separator chunks can't be used in combination with tab chunks! - * @param separator the drawInterface to use to draw the separator. - * @since 2.1.2 + * Creates a separator Chunk. Note that separator chunks can't be used in combination with tab chunks! + * + * @param separator the drawInterface to use to draw the separator. + * @since 2.1.2 */ public Chunk(DrawInterface separator) { this(separator, false); - } - + } + /** - * Creates a separator Chunk. - * Note that separator chunks can't be used in combination with tab chunks! - * @param separator the drawInterface to use to draw the separator. - * @param vertical true if this is a vertical separator - * @since 2.1.2 + * Creates a separator Chunk. Note that separator chunks can't be used in combination with tab chunks! + * + * @param separator the drawInterface to use to draw the separator. + * @param vertical true if this is a vertical separator + * @since 2.1.2 */ public Chunk(DrawInterface separator, boolean vertical) { this(OBJECT_REPLACEMENT_CHARACTER, new Font()); - setAttribute(SEPARATOR, new Object[] {separator, vertical}); + setAttribute(SEPARATOR, new Object[]{separator, vertical}); } /** - * Key for drawInterface of the tab. - * @since 2.1.2 - */ - public static final String TAB = "TAB"; - - /** - * Creates a tab Chunk. - * Note that separator chunks can't be used in combination with tab chunks! - * @param separator the drawInterface to use to draw the tab. - * @param tabPosition an X coordinate that will be used as start position for the next Chunk. - * @since 2.1.2 + * Creates a tab Chunk. Note that separator chunks can't be used in combination with tab chunks! + * + * @param separator the drawInterface to use to draw the tab. + * @param tabPosition an X coordinate that will be used as start position for the next Chunk. + * @since 2.1.2 */ public Chunk(DrawInterface separator, float tabPosition) { this(separator, tabPosition, false); } - + /** - * Creates a tab Chunk. - * Note that separator chunks can't be used in combination with tab chunks! - * @param separator the drawInterface to use to draw the tab. - * @param tabPosition an X coordinate that will be used as start position for the next Chunk. - * @param newline if true, a newline will be added if the tabPosition has already been reached. - * @since 2.1.2 + * Creates a tab Chunk. Note that separator chunks can't be used in combination with tab chunks! + * + * @param separator the drawInterface to use to draw the tab. + * @param tabPosition an X coordinate that will be used as start position for the next Chunk. + * @param newline if true, a newline will be added if the tabPosition has already been reached. + * @since 2.1.2 */ public Chunk(DrawInterface separator, float tabPosition, boolean newline) { this(OBJECT_REPLACEMENT_CHARACTER, new Font()); if (tabPosition < 0) { - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("a.tab.position.may.not.be.lower.than.0.yours.is.1", String.valueOf(tabPosition))); + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("a.tab.position.may.not.be.lower.than.0.yours.is.1", + String.valueOf(tabPosition))); } - setAttribute(TAB, new Object[] {separator, tabPosition, newline, (float) 0}); + setAttribute(TAB, new Object[]{separator, tabPosition, newline, (float) 0}); } /** * Constructs a chunk containing an Image. - * - * @param image - * the image - * @param offsetX - * the image offset in the x direction - * @param offsetY - * the image offset in the y direction - * @param changeLeading - * true if the leading has to be adapted to the image + * + * @param image the image + * @param offsetX the image offset in the x direction + * @param offsetY the image offset in the y direction + * @param changeLeading true if the leading has to be adapted to the image */ public Chunk(Image image, float offsetX, float offsetY, boolean changeLeading) { this(OBJECT_REPLACEMENT_CHARACTER, new Font()); - setAttribute(IMAGE, new Object[] { image, offsetX, + setAttribute(IMAGE, new Object[]{image, offsetX, offsetY, changeLeading}); } - // implementation of the Element-methods - /** - * Processes the element by adding it (or the different parts) to an - * ElementListener. - * - * @param listener - * an ElementListener + * Processes the element by adding it (or the different parts) to an ElementListener. + * + * @param listener an ElementListener * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { @@ -306,7 +382,7 @@ public boolean process(ElementListener listener) { /** * Gets the type of the text element. - * + * * @return a type */ public int type() { @@ -315,7 +391,7 @@ public int type() { /** * Gets all the chunks in this element. - * + * * @return an ArrayList */ public ArrayList getChunks() { @@ -324,43 +400,37 @@ public ArrayList getChunks() { return tmp; } - // methods that change the member variables - /** * appends some text to this Chunk. - * - * @param string - * String + * + * @param string String * @return a StringBuffer */ public StringBuffer append(String string) { return content.append(string); } - /** - * Sets the font of this Chunk. - * - * @param font - * a Font - */ - public void setFont(Font font) { - this.font = font; - } - - // methods to retrieve information - /** * Gets the font of this Chunk. - * + * * @return a Font */ public Font getFont() { return font; } + /** + * Sets the font of this Chunk. + * + * @param font a Font + */ + public void setFont(Font font) { + this.font = font; + } + /** * Returns the content of this Chunk. - * + * * @return a String */ public String getContent() { @@ -369,7 +439,7 @@ public String getContent() { /** * Returns the content of this Chunk. - * + * * @return a String */ public String toString() { @@ -378,9 +448,9 @@ public String toString() { /** * Checks is this Chunk is empty. - * + * * @return false if the Chunk contains other characters than - * space. + * space. */ public boolean isEmpty() { return (content.toString().trim().length() == 0) @@ -390,7 +460,7 @@ public boolean isEmpty() { /** * Gets the width of the Chunk in points. - * + * * @return a width in points */ public float getWidthPoint() { @@ -402,11 +472,9 @@ public float getWidthPoint() { * getHorizontalScaling(); } - // attributes - /** * Checks the attributes of this Chunk. - * + * * @return false if there aren't any. */ @@ -416,9 +484,9 @@ public boolean hasAttributes() { /** * Gets the attributes for this Chunk. - *

+ *

* It may be null. - * + * * @return the attributes for this Chunk */ @@ -428,7 +496,8 @@ public Map getChunkAttributes() { /** * Sets the attributes all at once. - * @param attributes the attributes of a Chunk + * + * @param attributes the attributes of a Chunk */ public void setChunkAttributes(Map attributes) { this.attributes = attributes; @@ -436,65 +505,54 @@ public void setChunkAttributes(Map attributes) { /** * Sets an arbitrary attribute. - * - * @param name - * the key for the attribute - * @param obj - * the value of the attribute + * + * @param name the key for the attribute + * @param obj the value of the attribute * @return this Chunk */ private Chunk setAttribute(String name, Object obj) { - if (attributes == null) + if (attributes == null) { attributes = new HashMap<>(); + } attributes.put(name, obj); return this; } - // the attributes are ordered as they appear in the book 'iText in Action' - - /** Key for text horizontal scaling. */ - public static final String HSCALE = "HSCALE"; - - /** - * Sets the text horizontal scaling. A value of 1 is normal and a value of - * 0.5f shrinks the text to half it's width. - * - * @param scale - * the horizontal scaling factor - * @return this Chunk - */ - public Chunk setHorizontalScaling(float scale) { - return setAttribute(HSCALE, scale); - } - /** * Gets the horizontal scaling. - * + * * @return a percentage in float */ public float getHorizontalScaling() { - if (attributes == null) + if (attributes == null) { return 1f; + } Float f = (Float) attributes.get(HSCALE); - if (f == null) + if (f == null) { return 1f; + } return f; } - /** Key for underline. */ - public static final String UNDERLINE = "UNDERLINE"; + /** + * Sets the text horizontal scaling. A value of 1 is normal and a value of 0.5f shrinks the text to half it's + * width. + * + * @param scale the horizontal scaling factor + * @return this Chunk + */ + public Chunk setHorizontalScaling(float scale) { + return setAttribute(HSCALE, scale); + } /** - * Sets an horizontal line that can be an underline or a strikethrough. - * Actually, the line can be anywhere vertically and has always the - * Chunk width. Multiple call to this method will produce multiple + * Sets an horizontal line that can be an underline or a strikethrough. Actually, the line can be anywhere + * vertically and has always the Chunk width. Multiple call to this method will produce multiple * lines. - * - * @param thickness - * the absolute thickness of the line - * @param yPosition - * the absolute y position relative to the baseline + * + * @param thickness the absolute thickness of the line + * @param yPosition the absolute y position relative to the baseline * @return this Chunk */ public Chunk setUnderline(float thickness, float yPosition) { @@ -503,32 +561,24 @@ public Chunk setUnderline(float thickness, float yPosition) { } /** - * Sets an horizontal line that can be an underline or a strikethrough. - * Actually, the line can be anywhere vertically and has always the - * Chunk width. Multiple call to this method will produce multiple + * Sets an horizontal line that can be an underline or a strikethrough. Actually, the line can be anywhere + * vertically and has always the Chunk width. Multiple call to this method will produce multiple * lines. - * - * @param color - * the color of the line or null to follow the - * text color - * @param thickness - * the absolute thickness of the line - * @param thicknessMul - * the thickness multiplication factor with the font size - * @param yPosition - * the absolute y position relative to the baseline - * @param yPositionMul - * the position multiplication factor with the font size - * @param cap - * the end line cap. Allowed values are - * PdfContentByte.LINE_CAP_BUTT, PdfContentByte.LINE_CAP_ROUND - * and PdfContentByte.LINE_CAP_PROJECTING_SQUARE + * + * @param color the color of the line or null to follow the text color + * @param thickness the absolute thickness of the line + * @param thicknessMul the thickness multiplication factor with the font size + * @param yPosition the absolute y position relative to the baseline + * @param yPositionMul the position multiplication factor with the font size + * @param cap the end line cap. Allowed values are PdfContentByte.LINE_CAP_BUTT, + * PdfContentByte.LINE_CAP_ROUND and PdfContentByte.LINE_CAP_PROJECTING_SQUARE * @return this Chunk */ public Chunk setUnderline(Color color, float thickness, float thicknessMul, float yPosition, float yPositionMul, int cap) { - if (attributes == null) + if (attributes == null) { attributes = new HashMap<>(); + } Object[] obj = { color, new float[]{thickness, thicknessMul, yPosition, yPositionMul, cap}}; @@ -536,28 +586,10 @@ public Chunk setUnderline(Color color, float thickness, float thicknessMul, obj); return setAttribute(UNDERLINE, unders); } - - /** Key for sub/superscript. */ - public static final String SUBSUPSCRIPT = "SUBSUPSCRIPT"; - - /** - * Sets the text displacement relative to the baseline. Positive values rise - * the text, negative values lower the text. - *

- * It can be used to implement sub/superscript. - * - * @param rise - * the displacement in points - * @return this Chunk - */ - - public Chunk setTextRise(float rise) { - return setAttribute(SUBSUPSCRIPT, rise); - } /** * Gets the text displacement relative to the baseline. - * + * * @return a displacement in points */ public float getTextRise() { @@ -567,33 +599,38 @@ public float getTextRise() { return 0.0f; } - /** Key for text skewing. */ - public static final String SKEW = "SKEW"; + /** + * Sets the text displacement relative to the baseline. Positive values rise the text, negative values lower the + * text. + *

+ * It can be used to implement sub/superscript. + * + * @param rise the displacement in points + * @return this Chunk + */ + + public Chunk setTextRise(float rise) { + return setAttribute(SUBSUPSCRIPT, rise); + } /** * Skews the text to simulate italic and other effects. Try alpha=0 * and beta=12. - * - * @param alpha - * the first angle in degrees - * @param beta - * the second angle in degrees + * + * @param alpha the first angle in degrees + * @param beta the second angle in degrees * @return this Chunk */ public Chunk setSkew(float alpha, float beta) { alpha = (float) Math.tan(alpha * Math.PI / 180); beta = (float) Math.tan(beta * Math.PI / 180); - return setAttribute(SKEW, new float[] { alpha, beta }); + return setAttribute(SKEW, new float[]{alpha, beta}); } - /** Key for background. */ - public static final String BACKGROUND = "BACKGROUND"; - /** * Sets the color of the background Chunk. - * - * @param color - * the color of the background + * + * @param color the color of the background * @return this Chunk */ public Chunk setBackground(Color color) { @@ -602,61 +639,42 @@ public Chunk setBackground(Color color) { /** * Sets the color and the size of the background Chunk. - * - * @param color - * the color of the background - * @param extraLeft - * increase the size of the rectangle in the left - * @param extraBottom - * increase the size of the rectangle in the bottom - * @param extraRight - * increase the size of the rectangle in the right - * @param extraTop - * increase the size of the rectangle in the top + * + * @param color the color of the background + * @param extraLeft increase the size of the rectangle in the left + * @param extraBottom increase the size of the rectangle in the bottom + * @param extraRight increase the size of the rectangle in the right + * @param extraTop increase the size of the rectangle in the top * @return this Chunk */ public Chunk setBackground(Color color, float extraLeft, float extraBottom, float extraRight, float extraTop) { - return setAttribute(BACKGROUND, new Object[] { color, - new float[] { extraLeft, extraBottom, extraRight, extraTop } }); + return setAttribute(BACKGROUND, new Object[]{color, + new float[]{extraLeft, extraBottom, extraRight, extraTop}}); } - /** Key for text rendering mode. */ - public static final String TEXTRENDERMODE = "TEXTRENDERMODE"; - /** - * Sets the text rendering mode. It can outline text, simulate bold and make - * text invisible. - * - * @param mode - * the text rendering mode. It can be - * PdfContentByte.TEXT_RENDER_MODE_FILL, - * PdfContentByte.TEXT_RENDER_MODE_STROKE, - * PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE and - * PdfContentByte.TEXT_RENDER_MODE_INVISIBLE. - * @param strokeWidth - * the stroke line width for the modes - * PdfContentByte.TEXT_RENDER_MODE_STROKE and - * PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE. - * @param strokeColor - * the stroke color or null to follow the text - * color + * Sets the text rendering mode. It can outline text, simulate bold and make text invisible. + * + * @param mode the text rendering mode. It can be PdfContentByte.TEXT_RENDER_MODE_FILL, + * PdfContentByte.TEXT_RENDER_MODE_STROKE, + * PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE and + * PdfContentByte.TEXT_RENDER_MODE_INVISIBLE. + * @param strokeWidth the stroke line width for the modes PdfContentByte.TEXT_RENDER_MODE_STROKE and + * PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE. + * @param strokeColor the stroke color or null to follow the text color * @return this Chunk */ public Chunk setTextRenderMode(int mode, float strokeWidth, Color strokeColor) { - return setAttribute(TEXTRENDERMODE, new Object[] {mode, - strokeWidth, strokeColor }); + return setAttribute(TEXTRENDERMODE, new Object[]{mode, + strokeWidth, strokeColor}); } - /** Key for split character. */ - public static final String SPLITCHARACTER = "SPLITCHARACTER"; - /** * Sets the split characters. - * - * @param splitCharacter - * the SplitCharacter interface + * + * @param splitCharacter the SplitCharacter interface * @return this Chunk */ @@ -664,62 +682,37 @@ public Chunk setSplitCharacter(SplitCharacter splitCharacter) { return setAttribute(SPLITCHARACTER, splitCharacter); } - /** Key for hyphenation. */ - public static final String HYPHENATION = "HYPHENATION"; - - /** - * sets the hyphenation engine to this Chunk. - * - * @param hyphenation - * the hyphenation engine - * @return this Chunk - */ - public Chunk setHyphenation(HyphenationEvent hyphenation) { - return setAttribute(HYPHENATION, hyphenation); - } - - /** Key for remote goto. */ - public static final String REMOTEGOTO = "REMOTEGOTO"; - /** * Sets a goto for a remote destination for this Chunk. - * - * @param filename - * the file name of the destination document - * @param name - * the name of the destination to go to + * + * @param filename the file name of the destination document + * @param name the name of the destination to go to * @return this Chunk */ public Chunk setRemoteGoto(String filename, String name) { - return setAttribute(REMOTEGOTO, new Object[] { filename, name }); + return setAttribute(REMOTEGOTO, new Object[]{filename, name}); } /** * Sets a goto for a remote destination for this Chunk. - * - * @param filename - * the file name of the destination document - * @param page - * the page of the destination to go to. First page is 1 + * + * @param filename the file name of the destination document + * @param page the page of the destination to go to. First page is 1 * @return this Chunk */ public Chunk setRemoteGoto(String filename, int page) { - return setAttribute(REMOTEGOTO, new Object[] { filename, + return setAttribute(REMOTEGOTO, new Object[]{filename, page}); } - /** Key for local goto. */ - public static final String LOCALGOTO = "LOCALGOTO"; - /** * Sets a local goto for this Chunk. - *

+ *

* There must be a local destination matching the name. - * - * @param name - * the name of the destination to go to + * + * @param name the name of the destination to go to * @return this Chunk */ @@ -727,65 +720,51 @@ public Chunk setLocalGoto(String name) { return setAttribute(LOCALGOTO, name); } - /** Key for local destination. */ - public static final String LOCALDESTINATION = "LOCALDESTINATION"; - /** * Sets a local destination for this Chunk. - * - * @param name - * the name for this destination + * + * @param name the name for this destination * @return this Chunk */ public Chunk setLocalDestination(String name) { return setAttribute(LOCALDESTINATION, name); } - /** Key for generic tag. */ - public static final String GENERICTAG = "GENERICTAG"; - /** * Sets the generic tag Chunk. - *

+ *

* The text for this tag can be retrieved with PdfPageEvent. - * - * @param text - * the text for the tag + * + * @param text the text for the tag * @return this Chunk */ public Chunk setGenericTag(String text) { return setAttribute(GENERICTAG, text); } - - /** Key for image. */ - public static final String IMAGE = "IMAGE"; /** * Returns the image. - * + * * @return the image */ public Image getImage() { - if (attributes == null) + if (attributes == null) { return null; + } Object[] obj = (Object[]) attributes.get(Chunk.IMAGE); - if (obj == null) + if (obj == null) { return null; - else { + } else { return (Image) obj[0]; } } - - /** Key for Action. */ - public static final String ACTION = "ACTION"; /** * Sets an action for this Chunk. - * - * @param action - * the action + * + * @param action the action * @return this Chunk */ @@ -795,9 +774,8 @@ public Chunk setAction(PdfAction action) { /** * Sets an anchor for this Chunk. - * - * @param url - * the URL to link to + * + * @param url the URL to link to * @return this Chunk */ @@ -807,22 +785,18 @@ public Chunk setAnchor(URL url) { /** * Sets an anchor for this Chunk. - * - * @param url - * the url to link to + * + * @param url the url to link to * @return this Chunk */ public Chunk setAnchor(String url) { return setAttribute(ACTION, new PdfAction(url)); } - - /** Key for newpage. */ - public static final String NEWPAGE = "NEWPAGE"; /** * Sets a new page tag.. - * + * * @return this Chunk */ @@ -830,31 +804,29 @@ public Chunk setNewPage() { return setAttribute(NEWPAGE, null); } - /** Key for annotation. */ - public static final String PDFANNOTATION = "PDFANNOTATION"; - /** * Sets a generic annotation to this Chunk. - * - * @param annotation - * the annotation + * + * @param annotation the annotation * @return this Chunk */ public Chunk setAnnotation(PdfAnnotation annotation) { return setAttribute(PDFANNOTATION, annotation); } - + /** * @see com.lowagie.text.Element#isContent() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isContent() { return true; } + // keys used in PdfChunk + /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return true; @@ -864,39 +836,28 @@ public boolean isNestable() { * Returns the hyphenation (if present). * * @return an object of {@link HyphenationEvent} - * @since 2.1.2 + * @since 2.1.2 */ public HyphenationEvent getHyphenation() { - if (attributes == null) return null; + if (attributes == null) { + return null; + } return (HyphenationEvent) attributes.get(Chunk.HYPHENATION); } - - // keys used in PdfChunk - - /** Key for color. */ - public static final String COLOR = "COLOR"; - - /** Key for encoding. */ - public static final String ENCODING = "ENCODING"; /** - * Key for character spacing. - */ - public static final String CHAR_SPACING = "CHAR_SPACING"; - - /** - * Sets the character spacing. - * - * @param charSpace the character spacing value + * sets the hyphenation engine to this Chunk. + * + * @param hyphenation the hyphenation engine * @return this Chunk */ - public Chunk setCharacterSpacing(float charSpace) { - return setAttribute(CHAR_SPACING, charSpace); + public Chunk setHyphenation(HyphenationEvent hyphenation) { + return setAttribute(HYPHENATION, hyphenation); } - + /** * Gets the character spacing. - * + * * @return a value in float */ public float getCharacterSpacing() { @@ -905,4 +866,14 @@ public float getCharacterSpacing() { } return 0.0f; } + + /** + * Sets the character spacing. + * + * @param charSpace the character spacing value + * @return this Chunk + */ + public Chunk setCharacterSpacing(float charSpace) { + return setAttribute(CHAR_SPACING, charSpace); + } } diff --git a/openpdf/src/main/java/com/lowagie/text/DocListener.java b/openpdf/src/main/java/com/lowagie/text/DocListener.java index 42c0e0e16..19b680403 100644 --- a/openpdf/src/main/java/com/lowagie/text/DocListener.java +++ b/openpdf/src/main/java/com/lowagie/text/DocListener.java @@ -50,12 +50,12 @@ package com.lowagie.text; /** - * A class that implements DocListener will perform some - * actions when some actions are performed on a Document. + * A class that implements DocListener will perform some actions when some actions are performed on a + * Document. * - * @see ElementListener - * @see Document - * @see DocWriter + * @see ElementListener + * @see Document + * @see DocWriter */ public interface DocListener extends ElementListener, AutoCloseable { @@ -72,7 +72,7 @@ public interface DocListener extends ElementListener, AutoCloseable { /** * Signals that the Document was closed and that no other * Elements will be added. - *

+ *

* The outputstream of every writer implementing DocListener will be closed. */ @@ -81,7 +81,7 @@ public interface DocListener extends ElementListener, AutoCloseable { /** * Signals that an new page has to be started. * - * @return true if the page was added, false if not. + * @return true if the page was added, false if not. */ boolean newPage(); // [L3] @@ -89,8 +89,8 @@ public interface DocListener extends ElementListener, AutoCloseable { /** * Sets the pagesize. * - * @param pageSize the new pagesize - * @return a boolean + * @param pageSize the new pagesize + * @return a boolean */ boolean setPageSize(Rectangle pageSize); // [L4] @@ -98,11 +98,11 @@ public interface DocListener extends ElementListener, AutoCloseable { /** * Sets the margins. * - * @param marginLeft the margin on the left - * @param marginRight the margin on the right - * @param marginTop the margin on the top - * @param marginBottom the margin on the bottom - * @return a boolean + * @param marginLeft the margin on the left + * @param marginRight the margin on the right + * @param marginTop the margin on the top + * @param marginBottom the margin on the bottom + * @return a boolean */ boolean setMargins(float marginLeft, float marginRight, float marginTop, float marginBottom); // [L5] @@ -127,7 +127,7 @@ public interface DocListener extends ElementListener, AutoCloseable { /** * Sets the page number. * - * @param pageN the new page number + * @param pageN the new page number */ void setPageCount(int pageN); // [L7] @@ -141,7 +141,7 @@ public interface DocListener extends ElementListener, AutoCloseable { /** * Changes the header of this document. * - * @param header the new header + * @param header the new header */ void setHeader(HeaderFooter header); // [L9] @@ -155,7 +155,7 @@ public interface DocListener extends ElementListener, AutoCloseable { /** * Changes the footer of this document. * - * @param footer the new footer + * @param footer the new footer */ void setFooter(HeaderFooter footer); // [L11] diff --git a/openpdf/src/main/java/com/lowagie/text/DocWriter.java b/openpdf/src/main/java/com/lowagie/text/DocWriter.java index fe280de0d..37e223f36 100644 --- a/openpdf/src/main/java/com/lowagie/text/DocWriter.java +++ b/openpdf/src/main/java/com/lowagie/text/DocWriter.java @@ -49,236 +49,276 @@ package com.lowagie.text; +import com.lowagie.text.pdf.OutputStreamCounter; import java.io.BufferedOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Iterator; import java.util.Properties; -import com.lowagie.text.ExceptionConverter; -import com.lowagie.text.pdf.OutputStreamCounter; - /** * An abstract Writer class for documents. - *

+ *

* DocWriter is the abstract class of several writers such - * as PdfWriter and HtmlWriter. - * A DocWriter can be added as a DocListener - * to a certain Document by getting an instance (see method + * as PdfWriter and HtmlWriter. A DocWriter can be added as a + * DocListener to a certain Document by getting an instance (see method * getInstance() in the specific writer-classes). - * Every Element added to the original Document - * will be written to the OutputStream of the listening + * Every Element added to the original Document will be written to the + * OutputStream of the listening * DocWriter. * - * @see Document - * @see DocListener + * @see Document + * @see DocListener */ public abstract class DocWriter implements DocListener { -/** This is some byte that is often used. */ - public static final byte NEWLINE = (byte)'\n'; + /** + * This is some byte that is often used. + */ + public static final byte NEWLINE = (byte) '\n'; -/** This is some byte that is often used. */ - public static final byte TAB = (byte)'\t'; + /** + * This is some byte that is often used. + */ + public static final byte TAB = (byte) '\t'; -/** This is some byte that is often used. */ - public static final byte LT = (byte)'<'; + /** + * This is some byte that is often used. + */ + public static final byte LT = (byte) '<'; -/** This is some byte that is often used. */ - public static final byte SPACE = (byte)' '; + /** + * This is some byte that is often used. + */ + public static final byte SPACE = (byte) ' '; -/** This is some byte that is often used. */ - public static final byte EQUALS = (byte)'='; + /** + * This is some byte that is often used. + */ + public static final byte EQUALS = (byte) '='; -/** This is some byte that is often used. */ - public static final byte QUOTE = (byte)'\"'; + /** + * This is some byte that is often used. + */ + public static final byte QUOTE = (byte) '\"'; -/** This is some byte that is often used. */ - public static final byte GT = (byte)'>'; + /** + * This is some byte that is often used. + */ + public static final byte GT = (byte) '>'; -/** This is some byte that is often used. */ - public static final byte FORWARD = (byte)'/'; + /** + * This is some byte that is often used. + */ + public static final byte FORWARD = (byte) '/'; // membervariables -/** The pageSize. */ + /** + * The pageSize. + */ protected Rectangle pageSize; -/** This is the document that has to be written. */ + /** + * This is the document that has to be written. + */ protected Document document; -/** The outputstream of this writer. */ + /** + * The outputstream of this writer. + */ protected OutputStreamCounter os; -/** Is the writer open for writing? */ + /** + * Is the writer open for writing? + */ protected boolean open = false; -/** Do we have to pause all writing actions? */ + /** + * Do we have to pause all writing actions? + */ protected boolean pause = false; - -/** Closes the stream on document close */ + + /** + * Closes the stream on document close + */ protected boolean closeStream = true; // constructor - - protected DocWriter() { + + protected DocWriter() { } -/** - * Constructs a DocWriter. - * - * @param document The Document that has to be written - * @param os The OutputStream the writer has to write to. - */ + /** + * Constructs a DocWriter. + * + * @param document The Document that has to be written + * @param os The OutputStream the writer has to write to. + */ - protected DocWriter(Document document, OutputStream os) { + protected DocWriter(Document document, OutputStream os) { this.document = document; this.os = new OutputStreamCounter(new BufferedOutputStream(os)); } // implementation of the DocListener methods -/** - * Signals that an Element was added to the Document. - *

- * This method should be overridden in the specific DocWriter classes - * derived from this abstract class. - * - * @param element A high level object to add - * @return false - * @throws DocumentException when a document isn't open yet, or has been closed - */ + /** + * Converts a String into a Byte array according to the ISO-8859-1 codepage. + * + * @param text the text to be converted + * @return the conversion result + */ + + public static final byte[] getISOBytes(String text) { + if (text == null) { + return null; + } + int len = text.length(); + byte[] b = new byte[len]; + for (int k = 0; k < len; ++k) { + b[k] = (byte) text.charAt(k); + } + return b; + } + + /** + * Signals that an Element was added to the Document. + *

+ * This method should be overridden in the specific DocWriter classes derived from this abstract + * class. + * + * @param element A high level object to add + * @return false + * @throws DocumentException when a document isn't open yet, or has been closed + */ public boolean add(Element element) throws DocumentException { return false; } -/** - * Signals that the Document was opened. - */ + /** + * Signals that the Document was opened. + */ public void open() { open = true; } -/** - * Sets the pagesize. - * - * @param pageSize the new pagesize - * @return a boolean - */ + /** + * Sets the pagesize. + * + * @param pageSize the new pagesize + * @return a boolean + */ public boolean setPageSize(Rectangle pageSize) { this.pageSize = pageSize; return true; } -/** - * Sets the margins. - *

- * This does nothing. Has to be overridden if needed. - * - * @param marginLeft the margin on the left - * @param marginRight the margin on the right - * @param marginTop the margin on the top - * @param marginBottom the margin on the bottom - * @return false - */ + /** + * Sets the margins. + *

+ * This does nothing. Has to be overridden if needed. + * + * @param marginLeft the margin on the left + * @param marginRight the margin on the right + * @param marginTop the margin on the top + * @param marginBottom the margin on the bottom + * @return false + */ public boolean setMargins(float marginLeft, float marginRight, float marginTop, float marginBottom) { return false; } -/** - * Signals that an new page has to be started. - *

- * This does nothing. Has to be overridden if needed. - * - * @return true if the page was added, false if not. - */ + /** + * Signals that an new page has to be started. + *

+ * This does nothing. Has to be overridden if needed. + * + * @return true if the page was added, false if not. + */ public boolean newPage() { return open; } -/** - * Changes the header of this document. - *

- * This method should be overridden in the specific DocWriter classes - * derived from this abstract class if they actually support the use of - * headers. - * - * @param header the new header - */ + /** + * Changes the header of this document. + *

+ * This method should be overridden in the specific DocWriter classes derived from this abstract class + * if they actually support the use of headers. + * + * @param header the new header + */ public void setHeader(HeaderFooter header) { } -/** - * Resets the header of this document. - *

- * This method should be overridden in the specific DocWriter classes - * derived from this abstract class if they actually support the use of - * headers. - */ + /** + * Resets the header of this document. + *

+ * This method should be overridden in the specific DocWriter classes derived from this abstract class + * if they actually support the use of headers. + */ public void resetHeader() { } -/** - * Changes the footer of this document. - *

- * This method should be overridden in the specific DocWriter classes - * derived from this abstract class if they actually support the use of - * footers. - * - * @param footer the new footer - */ + /** + * Changes the footer of this document. + *

+ * This method should be overridden in the specific DocWriter classes derived from this abstract class + * if they actually support the use of footers. + * + * @param footer the new footer + */ public void setFooter(HeaderFooter footer) { } -/** - * Resets the footer of this document. - *

- * This method should be overridden in the specific DocWriter classes - * derived from this abstract class if they actually support the use of - * footers. - */ + /** + * Resets the footer of this document. + *

+ * This method should be overridden in the specific DocWriter classes derived from this abstract class + * if they actually support the use of footers. + */ public void resetFooter() { } -/** - * Sets the page number to 0. - *

- * This method should be overridden in the specific DocWriter classes - * derived from this abstract class if they actually support the use of - * pagenumbers. - */ + /** + * Sets the page number to 0. + *

+ * This method should be overridden in the specific DocWriter classes derived from this abstract class + * if they actually support the use of pagenumbers. + */ public void resetPageCount() { } -/** - * Sets the page number. - *

- * This method should be overridden in the specific DocWriter classes - * derived from this abstract class if they actually support the use of - * pagenumbers. - * - * @param pageN the new page number - */ + /** + * Sets the page number. + *

+ * This method should be overridden in the specific DocWriter classes derived from this abstract class + * if they actually support the use of pagenumbers. + * + * @param pageN the new page number + */ public void setPageCount(int pageN) { } -/** - * Signals that the Document was closed and that no other - * Elements will be added. - */ + // methods + + /** + * Signals that the Document was closed and that no other + * Elements will be added. + */ public void close() { if (!open) { @@ -287,89 +327,69 @@ public void close() { open = false; try { os.flush(); - if (closeStream) + if (closeStream) { os.close(); - } - catch(IOException ioe) { + } + } catch (IOException ioe) { throw new ExceptionConverter(ioe); } } - // methods - -/** Converts a String into a Byte array - * according to the ISO-8859-1 codepage. - * @param text the text to be converted - * @return the conversion result - */ - - public static final byte[] getISOBytes(String text) - { - if (text == null) - return null; - int len = text.length(); - byte[] b = new byte[len]; - for (int k = 0; k < len; ++k) - b[k] = (byte)text.charAt(k); - return b; - } - -/** - * Let the writer know that all writing has to be paused. - */ + /** + * Let the writer know that all writing has to be paused. + */ public void pause() { pause = true; } - + /** * Checks if writing is paused. * - * @return true if writing temporarily has to be paused, false otherwise. + * @return true if writing temporarily has to be paused, false otherwise. */ - + public boolean isPaused() { return pause; } -/** - * Let the writer know that writing may be resumed. - */ + /** + * Let the writer know that writing may be resumed. + */ public void resume() { pause = false; } -/** - * Flushes the BufferedOutputStream. - */ + /** + * Flushes the BufferedOutputStream. + */ public void flush() { try { os.flush(); - } - catch(IOException ioe) { + } catch (IOException ioe) { throw new ExceptionConverter(ioe); } } -/** - * Writes a String to the OutputStream. - * - * @param string the String to write - * @throws IOException if there is any error - */ + /** + * Writes a String to the OutputStream. + * + * @param string the String to write + * @throws IOException if there is any error + */ protected void write(String string) throws IOException { os.write(getISOBytes(string)); } -/** - * Writes a number of tabs. - * - * @param indent the number of tabs to add - * @throws IOException if there is any error - */ + /** + * Writes a number of tabs. + * + * @param indent the number of tabs to add + * @throws IOException if there is any error + */ protected void addTabs(int indent) throws IOException { os.write(NEWLINE); @@ -378,16 +398,16 @@ protected void addTabs(int indent) throws IOException { } } -/** - * Writes a key-value pair to the outputstream. - * - * @param key the name of an attribute - * @param value the value of an attribute - * @throws IOException if there is any error - */ + /** + * Writes a key-value pair to the outputstream. + * + * @param key the name of an attribute + * @param value the value of an attribute + * @throws IOException if there is any error + */ protected void write(String key, String value) - throws IOException { + throws IOException { os.write(SPACE); write(key); os.write(EQUALS); @@ -396,56 +416,60 @@ protected void write(String key, String value) os.write(QUOTE); } -/** - * Writes a starttag to the outputstream. - * - * @param tag the name of the tag - * @throws IOException if there is any error - */ + /** + * Writes a starttag to the outputstream. + * + * @param tag the name of the tag + * @throws IOException if there is any error + */ protected void writeStart(String tag) - throws IOException { + throws IOException { os.write(LT); write(tag); } -/** - * Writes an endtag to the outputstream. - * - * @param tag the name of the tag - * @throws IOException if there is any error - */ + /** + * Writes an endtag to the outputstream. + * + * @param tag the name of the tag + * @throws IOException if there is any error + */ protected void writeEnd(String tag) - throws IOException { + throws IOException { os.write(LT); os.write(FORWARD); write(tag); os.write(GT); } -/** - * Writes an endtag to the outputstream. - * @throws IOException if there is any error - */ + /** + * Writes an endtag to the outputstream. + * + * @throws IOException if there is any error + */ protected void writeEnd() - throws IOException { + throws IOException { os.write(SPACE); os.write(FORWARD); os.write(GT); } -/** - * Writes the markup attributes of the specified MarkupAttributes - * object to the OutputStream. - * @param markup a Properties collection to write. - * @return true, if writing the markup attributes succeeded - * @throws IOException if there is any error - */ + /** + * Writes the markup attributes of the specified MarkupAttributes object to the + * OutputStream. + * + * @param markup a Properties collection to write. + * @return true, if writing the markup attributes succeeded + * @throws IOException if there is any error + */ protected boolean writeMarkupAttributes(Properties markup) - throws IOException { - if (markup == null) return false; + throws IOException { + if (markup == null) { + return false; + } Iterator attributeIterator = markup.keySet().iterator(); String name; while (attributeIterator.hasNext()) { @@ -456,35 +480,37 @@ protected boolean writeMarkupAttributes(Properties markup) return true; } - /** Checks if the stream is to be closed on document close - * @return true if the stream is closed on document close + /** + * Checks if the stream is to be closed on document close * + * @return true if the stream is closed on document close */ public boolean isCloseStream() { return closeStream; } - - /** Sets the close state of the stream after document close - * @param closeStream true if the stream is closed on document close + + /** + * Sets the close state of the stream after document close * + * @param closeStream true if the stream is closed on document close */ public void setCloseStream(boolean closeStream) { this.closeStream = closeStream; } - + /** * @see com.lowagie.text.DocListener#setMarginMirroring(boolean) */ public boolean setMarginMirroring(boolean MarginMirroring) { return false; } - + /** * @see com.lowagie.text.DocListener#setMarginMirroring(boolean) - * @since 2.1.6 + * @since 2.1.6 */ public boolean setMarginMirroringTopBottom(boolean MarginMirroring) { return false; } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/Document.java b/openpdf/src/main/java/com/lowagie/text/Document.java index 8d44e9a2b..aaeebbf74 100644 --- a/openpdf/src/main/java/com/lowagie/text/Document.java +++ b/openpdf/src/main/java/com/lowagie/text/Document.java @@ -52,7 +52,6 @@ import com.lowagie.text.error_messages.MessageLocalization; import com.lowagie.text.pdf.FopGlyphProcessor; import com.lowagie.text.pdf.PdfDate; - import java.io.IOException; import java.io.InputStream; import java.text.SimpleDateFormat; @@ -64,16 +63,15 @@ /** * A generic Document class. - *

- * All kinds of Text-elements can be added to a HTMLDocument. - * The Document signals all the listeners when an element has - * been added. - *

+ *

+ * All kinds of Text-elements can be added to a HTMLDocument. The Document signals all the + * listeners when an element has been added. + *

* Remark: *

    - *
  1. Once a document is created you can add some meta information. - *
  2. You can also set the headers/footers. - *
  3. You have to open the document before you can write content. + *
  4. Once a document is created you can add some meta information. + *
  5. You can also set the headers/footers. + *
  6. You have to open the document before you can write content. *
  7. You can only write content (no more meta-formation!) once a document is * opened. *
  8. When you change the header/footer on a certain page, this will be @@ -85,134 +83,129 @@ * * 
    // creation of the document with a certain size and certain margins
  * Document document = new Document(PageSize.A4, 50, 50, 50, 50);
- *  try { 
- *   // creation of the different writers 
- *   HtmlWriter.getInstance(document , System.out);
- *   PdfWriter.getInstance(document , new FileOutputStream("text.pdf"));
- *   // we add some meta information to the document
- *   document.addAuthor("Bruno Lowagie"); 
- *   document.addSubject("This is the result of a Test."); 
- *   // we open the document for writing
- *   document.open(); 
- *   document.add(new Paragraph("Hello world"));
- *  } catch(DocumentException de) {
- *   System.err.println(de.getMessage());
- *  }
- *  document.close();
+ *  try {
+ * // creation of the different writers HtmlWriter.getInstance(document , System.out);
+ * PdfWriter.getInstance(document , new FileOutputStream("text.pdf")); // we add some meta information
+ * to the document
+ * document.addAuthor("Bruno Lowagie"); 
+ * document.addSubject("This is the result of a Test."); 
+ * // we open the document for writing
+ * document.open(); 
+ * document.add(new Paragraph("Hello world"));
+ * } catch(DocumentException de) { System.err.println(de.getMessage()); }
+ * document.close();
  *
    - * + * * */ public class Document implements DocListener { - + // membervariables private static final String VERSION_PROPERTIES = "com/lowagie/text/version.properties"; private static final String OPENPDF = "OpenPDF"; private static final String RELEASE; private static final String OPENPDF_VERSION; + /** + * Allows the pdf documents to be produced without compression for debugging purposes. + */ + public static boolean compress = true; + /** + * When true the file access is not done through a memory mapped file. Use it if the file is too big to be mapped in + * your address space. + */ + public static boolean plainRandomAccess = false; + /** + * Scales the WMF font size. The default value is 0.86. + */ + public static float wmfFontCorrection = 0.86f; static { RELEASE = getVersionNumber(); OPENPDF_VERSION = OPENPDF + " " + RELEASE; } - private static String getVersionNumber() { - String releaseVersion = "UNKNOWN"; - try (InputStream input = Document.class.getClassLoader() - .getResourceAsStream(VERSION_PROPERTIES)) { - if (input != null) { - Properties prop = new Properties(); - prop.load(input); - releaseVersion = prop.getProperty("bundleVersion", releaseVersion); - } - } catch (IOException ignored) { - // ignore this and leave the default - } - return releaseVersion; - } /** - * Allows the pdf documents to be produced without compression for debugging - * purposes. + * Is the document open or not? */ - public static boolean compress = true; - + protected boolean open; /** - * When true the file access is not done through a memory mapped file. Use it if the file - * is too big to be mapped in your address space. + * Has the document already been closed? */ - public static boolean plainRandomAccess = false; - - /** Scales the WMF font size. The default value is 0.86. */ - public static float wmfFontCorrection = 0.86f; - - /** The DocListener. */ - private List listeners = new ArrayList<>(); - - /** Is the document open or not? */ - protected boolean open; - - /** Has the document already been closed? */ protected boolean close; - - // membervariables concerning the layout - - /** The size of the page. */ + /** + * The size of the page. + */ protected Rectangle pageSize; - - /** margin in x direction starting from the left */ + /** + * margin in x direction starting from the left + */ protected float marginLeft = 0; - - /** margin in x direction starting from the right */ + + // membervariables concerning the layout + /** + * margin in x direction starting from the right + */ protected float marginRight = 0; - - /** margin in y direction starting from the top */ + /** + * margin in y direction starting from the top + */ protected float marginTop = 0; - - /** margin in y direction starting from the bottom */ + /** + * margin in y direction starting from the bottom + */ protected float marginBottom = 0; - - /** mirroring of the left/right margins */ + /** + * mirroring of the left/right margins + */ protected boolean marginMirroring = false; - /** * mirroring of the top/bottom margins - * @since 2.1.6 + * + * @since 2.1.6 */ protected boolean marginMirroringTopBottom = false; - - /** Content of JavaScript onLoad function */ + /** + * Content of JavaScript onLoad function + */ protected String javaScript_onLoad = null; - - /** Content of JavaScript onUnLoad function */ + /** + * Content of JavaScript onUnLoad function + */ protected String javaScript_onUnLoad = null; - - /** Style class in HTML body tag */ + /** + * Style class in HTML body tag + */ protected String htmlStyleClass = null; - - // headers, footers - - /** Current pagenumber */ + /** + * Current pagenumber + */ protected int pageN = 0; - - /** This is the textual part of a Page; it can contain a header */ + /** + * This is the textual part of a Page; it can contain a header + */ protected HeaderFooter header = null; - - /** This is the textual part of the footer */ + + // headers, footers + /** + * This is the textual part of the footer + */ protected HeaderFooter footer = null; - - /** This is a chapter number in case ChapterAutoNumber is used. */ + /** + * This is a chapter number in case ChapterAutoNumber is used. + */ protected int chapternumber = 0; - /** - * Text rendering options, including the default language of the document and a flag - * to enable font glyph substitution (if FOP is available) - * + * Text rendering options, including the default language of the document and a flag to enable font glyph + * substitution (if FOP is available) + * * @since 3.1.15 */ TextRenderingOptions textRenderingOptions = new TextRenderingOptions(); - - // constructor + /** + * The DocListener. + */ + private List listeners = new ArrayList<>(); /** * Constructs a new Document -object with the default page size as PageSize.A4 . @@ -221,11 +214,12 @@ public Document() { this(PageSize.A4); } + // constructor + /** * Constructs a new Document -object using the given rectangle as page size and default margin of 36. * - * @param pageSize - * the pageSize + * @param pageSize the pageSize */ public Document(Rectangle pageSize) { this(pageSize, 36, 36, 36, 36); @@ -234,16 +228,11 @@ public Document(Rectangle pageSize) { /** * Constructs a new Document -object. * - * @param pageSize - * the pageSize - * @param marginLeft - * the margin on the left - * @param marginRight - * the margin on the right - * @param marginTop - * the margin on the top - * @param marginBottom - * the margin on the bottom + * @param pageSize the pageSize + * @param marginLeft the margin on the left + * @param marginRight the margin on the right + * @param marginTop the margin on the top + * @param marginBottom the margin on the bottom */ public Document(Rectangle pageSize, float marginLeft, float marginRight, float marginTop, float marginBottom) { @@ -253,14 +242,59 @@ public Document(Rectangle pageSize, float marginLeft, float marginRight, this.marginTop = marginTop; this.marginBottom = marginBottom; } - + + private static String getVersionNumber() { + String releaseVersion = "UNKNOWN"; + try (InputStream input = Document.class.getClassLoader() + .getResourceAsStream(VERSION_PROPERTIES)) { + if (input != null) { + Properties prop = new Properties(); + prop.load(input); + releaseVersion = prop.getProperty("bundleVersion", releaseVersion); + } + } catch (IOException ignored) { + // ignore this and leave the default + } + return releaseVersion; + } + // listener methods + /** + * Gets the product name. + * + * @return the product name + * @since 2.1.6 + */ + public static String getProduct() { + return OPENPDF; + } + + /** + * Gets the release number. + * + * @return the product name + * @since 2.1.6 + */ + public static String getRelease() { + return RELEASE; + } + + // methods implementing the DocListener interface + + /** + * Gets the iText version. + * + * @return iText version + */ + public static String getVersion() { + return OPENPDF_VERSION; + } + /** * Adds a DocListener to the Document. * - * @param listener - * the new DocListener. + * @param listener the new DocListener. */ public void addDocListener(DocListener listener) { listeners.add(listener); @@ -269,55 +303,51 @@ public void addDocListener(DocListener listener) { /** * Removes a DocListener from the Document. * - * @param listener - * the DocListener that has to be removed. + * @param listener the DocListener that has to be removed. */ public void removeDocListener(DocListener listener) { listeners.remove(listener); } - - // methods implementing the DocListener interface /** * Adds an Element to the Document. * - * @param element - * the Element to add + * @param element the Element to add * @return true if the element was added, false - * if not - * @throws DocumentException - * when a document isn't open yet, or has been closed + * if not + * @throws DocumentException when a document isn't open yet, or has been closed */ public boolean add(Element element) throws DocumentException { if (close) { - throw new DocumentException(MessageLocalization.getComposedMessage("the.document.has.been.closed.you.can.t.add.any.elements")); + throw new DocumentException( + MessageLocalization.getComposedMessage("the.document.has.been.closed.you.can.t.add.any.elements")); } if (!open && element.isContent()) { - throw new DocumentException(MessageLocalization.getComposedMessage("the.document.is.not.open.yet.you.can.only.add.meta.information")); + throw new DocumentException(MessageLocalization.getComposedMessage( + "the.document.is.not.open.yet.you.can.only.add.meta.information")); } boolean success = false; if (element instanceof ChapterAutoNumber) { - chapternumber = ((ChapterAutoNumber)element).setAutomaticNumber(chapternumber); + chapternumber = ((ChapterAutoNumber) element).setAutomaticNumber(chapternumber); } for (DocListener listener : listeners) { success |= listener.add(element); } if (element instanceof LargeElement) { - LargeElement e = (LargeElement)element; - if (!e.isComplete()) + LargeElement e = (LargeElement) element; + if (!e.isComplete()) { e.flushContent(); + } } return success; } /** * Opens the document. - *

    - * Once the document is opened, you can't write any meta-information anymore. - * If you change the header/footer after opening the document, the change will be effective - * starting from the second page. - * You have to open the document before you can begin to add content to the body of the - * document. + *

    + * Once the document is opened, you can't write any meta-information anymore. If you change the header/footer after + * opening the document, the change will be effective starting from the second page. You have to open the document + * before you can begin to add content to the body of the document. */ public void open() { if (!close) { @@ -334,11 +364,10 @@ public void open() { /** * Sets the pagesize. *

    - * This change will be effective starting from the next page. If you want to change the page size of - * the first page, you need to set it before opening the document. + * This change will be effective starting from the next page. If you want to change the page size of the first page, + * you need to set it before opening the document. * - * @param pageSize - * the new pagesize + * @param pageSize the new pagesize * @return a boolean */ public boolean setPageSize(Rectangle pageSize) { @@ -352,8 +381,8 @@ public boolean setPageSize(Rectangle pageSize) { /** * Sets the margins. *

    - * This change will be effective starting from the next page. If you want to change margins on - * the first page, you need to set it before opening the document. + * This change will be effective starting from the next page. If you want to change margins on the first page, you + * need to set it before opening the document. * * @param marginLeft the margin on the left * @param marginRight the margin on the right @@ -373,13 +402,13 @@ public boolean setMargins(float marginLeft, float marginRight, } return true; } - + /** - * Signals to all listeners, that a new page has to be started. - * New pages can only be added on already opened and not yet closed documents. + * Signals to all listeners, that a new page has to be started. New pages can only be added on already opened and + * not yet closed documents. * * @return true if the page was added, false - * if not. + * if not. */ public boolean newPage() { if (!open || close) { @@ -394,8 +423,8 @@ public boolean newPage() { /** * Changes the header of this document. *

    - * This change will be effective starting from the next page. If you want to have a header on - * the first page, you need to set it before opening the document. + * This change will be effective starting from the next page. If you want to have a header on the first page, you + * need to set it before opening the document. * * @param header the new header */ @@ -421,8 +450,8 @@ public void resetHeader() { /** * Changes the footer of this document. *

    - * This change will be effective starting from the next page. If you want to have a footer on - * the first page, you need to set it before opening the document. + * This change will be effective starting from the next page. If you want to have a footer on the first page, you + * need to set it before opening the document. * * @param footer the new footer */ @@ -457,6 +486,8 @@ public void resetPageCount() { } } + // methods concerning the header or some meta information + /** * Sets the page number. *

    @@ -485,8 +516,8 @@ public int getPageNumber() { /** * Closes the document. *

    - * Once all the content has been written in the body, you have to close the - * body. After that nothing can be written to the body anymore. + * Once all the content has been written in the body, you have to close the body. After that nothing can be written + * to the body anymore. */ @Override public void close() { @@ -499,11 +530,9 @@ public void close() { } } - // methods concerning the header or some meta information - /** * Adds a user defined header to the document. - *

    + *

    * Shortcut method to call: add(new Header(name, content)) * * @param name the name of the header @@ -520,12 +549,12 @@ public boolean addHeader(String name, String content) { /** * Adds the title to a Document. - *

    + *

    * In case of a PDF this will be visible in the document properties panel. - *

    + *

    * In case of a HTML file this will be visible as the title meta tag in the * HEAD part of the file. - *

    + *

    * Shortcut method to call: add(new Meta(Element.TITLE, title)) * * @param title the title @@ -541,9 +570,9 @@ public boolean addTitle(String title) { /** * Adds the subject to a Document. - *

    + *

    * In case of a PDF this will be visible in the document properties panel. - *

    + *

    * In case of a HTML file this will be visible as the subject meta tag in the * HEAD part of the file. * @@ -560,9 +589,9 @@ public boolean addSubject(String subject) { /** * Adds the keywords to a Document. - *

    + *

    * In case of a PDF this will be visible in the document properties panel. - *

    + *

    * In case of a HTML file this will be visible as the keywords meta tag in the * HEAD part of the file. * @@ -579,9 +608,9 @@ public boolean addKeywords(String keywords) { /** * Adds the author to a Document. - *

    + *

    * In case of a PDF this will be visible in the document properties panel. - *

    + *

    * In case of a HTML file this will be visible as the author meta tag in the * HEAD part of the file. * @@ -595,17 +624,16 @@ public boolean addAuthor(String author) { throw new ExceptionConverter(de); } } - + /** * Adds the creator to a Document. - *

    + *

    * In case of a PDF this will be visible in the document properties panel. - *

    + *

    * In case of a HTML file this will be visible as comment in the HEAD part of the file. * - * @param creator - * the name of the creator - * @return true if successful, false otherwise + * @param creator the name of the creator + * @return true if successful, false otherwise */ public boolean addCreator(String creator) { try { @@ -614,15 +642,15 @@ public boolean addCreator(String creator) { throw new ExceptionConverter(de); } } - + /** * Adds the producer to a Document. - *

    + *

    * In case of a PDF this will be visible in the document properties panel. - *

    + *

    * In case of a HTML file this will be visible as comment in the HEAD part of the file. * - * @return true if successful, false otherwise + * @return true if successful, false otherwise */ public boolean addProducer() { return this.addProducer(getVersion()); @@ -630,12 +658,12 @@ public boolean addProducer() { /** * Adds the provided value as the producer to a Document. - *

    + *

    * The default producer is OpenPDF XX.YY.ZZ where XX.YY.ZZ is the version of the OpenPDF * library used to produce the document - *

    + *

    * In case of a PDF this will be visible in the document properties panel. - *

    + *

    * In case of a HTML file this will be visible as comment in the HEAD part of the file. * * @param producer new producer line value @@ -647,9 +675,9 @@ public boolean addProducer(final String producer) { /** * Adds the current date and time to a Document. - *

    + *

    * In case of a PDF this will be visible in the document properties panel. - *

    + *

    * In case of a HTML file this will be visible as comment in the HEAD part of the file. * * @return true if successful, false otherwise @@ -665,24 +693,25 @@ public boolean addCreationDate() { } } + // methods to get the layout of the document. + /** * Adds the current date and time to a Document. * - * @return true if successful, false otherwise + * @return true if successful, false otherwise */ public boolean addCreationDate(PdfDate date) { try { return add(new Meta(Element.CREATIONDATE, date.toString())); - } - catch (DocumentException de) { + } catch (DocumentException de) { throw new ExceptionConverter(de); } } - + /** * Adds the current date and time to a Document. * - * @return true if successful, false otherwise + * @return true if successful, false otherwise */ public boolean addModificationDate() { try { @@ -691,271 +720,231 @@ public boolean addModificationDate() { throw new ExceptionConverter(de); } } - + /** * Adds the current date and time to a Document. * - * @return true if successful, false otherwise + * @return true if successful, false otherwise */ public boolean addModificationDate(PdfDate date) { try { return add(new Meta(Element.MODIFICATIONDATE, date.toString())); - } - catch (DocumentException de) { + } catch (DocumentException de) { throw new ExceptionConverter(de); } } - - // methods to get the layout of the document. - + /** - * Returns the left margin. - * - * @return the left margin - */ - + * Returns the left margin. + * + * @return the left margin + */ + public float leftMargin() { return marginLeft; } - + /** - * Return the right margin. - * - * @return the right margin - */ - + * Return the right margin. + * + * @return the right margin + */ + public float rightMargin() { return marginRight; } - + /** - * Returns the top margin. - * - * @return the top margin - */ - + * Returns the top margin. + * + * @return the top margin + */ + public float topMargin() { return marginTop; } - + /** - * Returns the bottom margin. - * - * @return the bottom margin - */ - + * Returns the bottom margin. + * + * @return the bottom margin + */ + public float bottomMargin() { return marginBottom; } - + /** - * Returns the lower left x-coordinate. - * - * @return the lower left x-coordinate - */ - + * Returns the lower left x-coordinate. + * + * @return the lower left x-coordinate + */ + public float left() { return pageSize.getLeft(marginLeft); } - + /** - * Returns the upper right x-coordinate. - * - * @return the upper right x-coordinate - */ - + * Returns the upper right x-coordinate. + * + * @return the upper right x-coordinate + */ + public float right() { return pageSize.getRight(marginRight); } - + /** - * Returns the upper right y-coordinate. - * - * @return the upper right y-coordinate - */ - + * Returns the upper right y-coordinate. + * + * @return the upper right y-coordinate + */ + public float top() { return pageSize.getTop(marginTop); } - + /** - * Returns the lower left y-coordinate. - * - * @return the lower left y-coordinate - */ - + * Returns the lower left y-coordinate. + * + * @return the lower left y-coordinate + */ + public float bottom() { return pageSize.getBottom(marginBottom); } - + /** - * Returns the lower left x-coordinate considering a given margin. - * - * @param margin - * a margin - * @return the lower left x-coordinate - */ - + * Returns the lower left x-coordinate considering a given margin. + * + * @param margin a margin + * @return the lower left x-coordinate + */ + public float left(float margin) { return pageSize.getLeft(marginLeft + margin); } - + /** - * Returns the upper right x-coordinate, considering a given margin. - * - * @param margin - * a margin - * @return the upper right x-coordinate - */ - + * Returns the upper right x-coordinate, considering a given margin. + * + * @param margin a margin + * @return the upper right x-coordinate + */ + public float right(float margin) { return pageSize.getRight(marginRight + margin); } - + /** - * Returns the upper right y-coordinate, considering a given margin. - * - * @param margin - * a margin - * @return the upper right y-coordinate - */ - + * Returns the upper right y-coordinate, considering a given margin. + * + * @param margin a margin + * @return the upper right y-coordinate + */ + public float top(float margin) { return pageSize.getTop(marginTop + margin); } - + /** - * Returns the lower left y-coordinate, considering a given margin. - * - * @param margin - * a margin - * @return the lower left y-coordinate - */ - + * Returns the lower left y-coordinate, considering a given margin. + * + * @param margin a margin + * @return the lower left y-coordinate + */ + public float bottom(float margin) { return pageSize.getBottom(marginBottom + margin); } - + /** - * Gets the pagesize. - * - * @return the page size - */ - + * Gets the pagesize. + * + * @return the page size + */ + public Rectangle getPageSize() { return this.pageSize; } - + /** * Checks if the document is open. - * + * * @return true if the document is open - */ + */ public boolean isOpen() { return open; } /** - * Gets the product name. + * Gets the JavaScript onLoad command. * - * @return the product name - * @since 2.1.6 + * @return the JavaScript onLoad command */ - public static String getProduct() { - return OPENPDF; - } - /** - * Gets the release number. - * - * @return the product name - * @since 2.1.6 - */ - public static String getRelease() { - return RELEASE; + public String getJavaScript_onLoad() { + return this.javaScript_onLoad; } /** - * Gets the iText version. + * Adds a JavaScript onLoad function to the HTML body tag * - * @return iText version + * @param code the JavaScript code to be executed on load of the HTML page */ - public static String getVersion() { - return OPENPDF_VERSION; - } - /** - * Adds a JavaScript onLoad function to the HTML body tag - * - * @param code - * the JavaScript code to be executed on load of the HTML page - */ - public void setJavaScript_onLoad(String code) { this.javaScript_onLoad = code; } /** - * Gets the JavaScript onLoad command. - * - * @return the JavaScript onLoad command - */ + * Gets the JavaScript onUnLoad command. + * + * @return the JavaScript onUnLoad command + */ - public String getJavaScript_onLoad() { - return this.javaScript_onLoad; + public String getJavaScript_onUnLoad() { + return this.javaScript_onUnLoad; } /** - * Adds a JavaScript onUnLoad function to the HTML body tag - * - * @param code - * the JavaScript code to be executed on unload of the HTML page - */ - + * Adds a JavaScript onUnLoad function to the HTML body tag + * + * @param code the JavaScript code to be executed on unload of the HTML page + */ + public void setJavaScript_onUnLoad(String code) { this.javaScript_onUnLoad = code; } /** - * Gets the JavaScript onUnLoad command. - * - * @return the JavaScript onUnLoad command - */ + * Gets the style class of the HTML body tag + * + * @return the style class of the HTML body tag + */ - public String getJavaScript_onUnLoad() { - return this.javaScript_onUnLoad; + public String getHtmlStyleClass() { + return this.htmlStyleClass; } /** - * Adds a style class to the HTML body tag - * - * @param htmlStyleClass - * the style class for the HTML body tag - */ - + * Adds a style class to the HTML body tag + * + * @param htmlStyleClass the style class for the HTML body tag + */ + public void setHtmlStyleClass(String htmlStyleClass) { this.htmlStyleClass = htmlStyleClass; } - /** - * Gets the style class of the HTML body tag - * - * @return the style class of the HTML body tag - */ - - public String getHtmlStyleClass() { - return this.htmlStyleClass; - } - /** * Set the margin mirroring. It will mirror right/left margins for odd/even pages. *

    * Note: it will not work with {@link Table}. - * - * @param marginMirroring - * true to mirror the margins + * + * @param marginMirroring true to mirror the margins * @return always true - */ + */ public boolean setMarginMirroring(boolean marginMirroring) { this.marginMirroring = marginMirroring; for (DocListener listener : listeners) { @@ -963,17 +952,16 @@ public boolean setMarginMirroring(boolean marginMirroring) { } return true; } - + /** * Set the margin mirroring. It will mirror top/bottom margins for odd/even pages. *

    * Note: it will not work with {@link Table}. - * - * @param marginMirroringTopBottom - * true to mirror the margins + * + * @param marginMirroringTopBottom true to mirror the margins * @return always true - * @since 2.1.6 - */ + * @since 2.1.6 + */ public boolean setMarginMirroringTopBottom(boolean marginMirroringTopBottom) { this.marginMirroringTopBottom = marginMirroringTopBottom; for (DocListener listener : listeners) { @@ -981,80 +969,80 @@ public boolean setMarginMirroringTopBottom(boolean marginMirroringTopBottom) { } return true; } - + /** * Gets the margin mirroring flag. - * + * * @return the margin mirroring flag - */ + */ public boolean isMarginMirroring() { return marginMirroring; } /** - * The new document language. - * This language is used in FopGlyphProcessor to determine which glyphs are to be substituted. - *

    + * The default language of the document. Can be set to values like "en_US". This language is used in + * FopGlyphProcessor to determine which glyphs are to be substituted. + *

    + * The default "dflt" means that all glyphs which can be replaced will be substituted. + * + * @return the current document language + */ + public String getDocumentLanguage() { + return textRenderingOptions.getDocumentLanguage(); + } + + /** + * The new document language. This language is used in FopGlyphProcessor to determine which glyphs are to be + * substituted. + *

    * The default "dflt" means that all glyphs which can be replaced will be substituted. * * @param documentLanguage the wanted language */ public void setDocumentLanguage(String documentLanguage) { - textRenderingOptions.setDocumentLanguage(documentLanguage); + textRenderingOptions.setDocumentLanguage(documentLanguage); } /** - * The default language of the document. Can be set to values like "en_US". This language is used in - * FopGlyphProcessor to determine which glyphs are to be substituted. - *

    - * The default "dflt" means that all glyphs which can be replaced will be substituted. + * Returns the glyph substitution enabled flag. * - * @return the current document language + * @return the glyph substitution enabled flag + * @see #setGlyphSubstitutionEnabled(boolean) */ - public String getDocumentLanguage() { - return textRenderingOptions.getDocumentLanguage(); + public boolean isGlyphSubstitutionEnabled() { + return textRenderingOptions.isGlyphSubstitutionEnabled(); } /** * Set a flag that determine whether glyph substion is enabled when FOP is available. - * + * * @param glyphSubstitutionEnabled the glyph substitution enabled flag * @see FopGlyphProcessor * @see #setDocumentLanguage(String) */ - public void setGlyphSubstitutionEnabled(boolean glyphSubstitutionEnabled) { - textRenderingOptions.setGlyphSubstitutionEnabled(glyphSubstitutionEnabled); - } - - /** - * Returns the glyph substitution enabled flag. - * - * @return the glyph substitution enabled flag - * @see #setGlyphSubstitutionEnabled(boolean) - */ - public boolean isGlyphSubstitutionEnabled() { - return textRenderingOptions.isGlyphSubstitutionEnabled(); - } - - /** - * Sets the text rendering options. - * - * @param textRenderingOptions the text rendering options - * @see #setDocumentLanguage(String) - * @see Document#setGlyphSubstitutionEnabled(boolean) - */ - public void setTextRenderingOptions(TextRenderingOptions textRenderingOptions) { - this.textRenderingOptions = textRenderingOptions == null ? new TextRenderingOptions() : textRenderingOptions; + public void setGlyphSubstitutionEnabled(boolean glyphSubstitutionEnabled) { + textRenderingOptions.setGlyphSubstitutionEnabled(glyphSubstitutionEnabled); } - + /** * Gets the text rendering options. - * + * * @return the text rendering options * @see #getDocumentLanguage() * @see #isGlyphSubstitutionEnabled() */ public TextRenderingOptions getTextRenderingOptions() { - return textRenderingOptions; + return textRenderingOptions; + } + + /** + * Sets the text rendering options. + * + * @param textRenderingOptions the text rendering options + * @see #setDocumentLanguage(String) + * @see Document#setGlyphSubstitutionEnabled(boolean) + */ + public void setTextRenderingOptions(TextRenderingOptions textRenderingOptions) { + this.textRenderingOptions = textRenderingOptions == null ? new TextRenderingOptions() : textRenderingOptions; } } diff --git a/openpdf/src/main/java/com/lowagie/text/DocumentException.java b/openpdf/src/main/java/com/lowagie/text/DocumentException.java index 5b2ba2caf..58fcd8fd9 100644 --- a/openpdf/src/main/java/com/lowagie/text/DocumentException.java +++ b/openpdf/src/main/java/com/lowagie/text/DocumentException.java @@ -53,38 +53,41 @@ /** * Signals that an error has occurred in a Document. * - * @see BadElementException - * @see Document - * @see DocWriter - * @see DocListener + * @see BadElementException + * @see Document + * @see DocWriter + * @see DocListener */ public class DocumentException extends RuntimeException { - - /** A serial version UID */ + + /** + * A serial version UID + */ private static final long serialVersionUID = -2191131489390840739L; /** * Creates a Document exception. + * * @param ex an exception that has to be turned into a DocumentException */ public DocumentException(Exception ex) { super(ex); } - + // constructors - + /** * Constructs a DocumentException without a message. */ public DocumentException() { super(); } - + /** * Constructs a DocumentException with a message. * - * @param message a message describing the exception + * @param message a message describing the exception */ public DocumentException(String message) { super(message); diff --git a/openpdf/src/main/java/com/lowagie/text/Element.java b/openpdf/src/main/java/com/lowagie/text/Element.java index ab87e9b08..ba4e120e2 100644 --- a/openpdf/src/main/java/com/lowagie/text/Element.java +++ b/openpdf/src/main/java/com/lowagie/text/Element.java @@ -53,7 +53,7 @@ /** * Interface for a text element. - *

    + *

    * Remark: I looked at the interface javax.swing.text.Element, but I decided to write my own text-classes. * * @see Anchor @@ -78,151 +78,208 @@ public interface Element { // static membervariables (meta information) - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int HEADER = 0; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int TITLE = 1; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int SUBJECT = 2; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int KEYWORDS = 3; - /** This is a possible type of Element . */ + /** + * This is a possible type of Element . + */ public static final int AUTHOR = 4; - /** This is a possible type of Element . */ + /** + * This is a possible type of Element . + */ public static final int PRODUCER = 5; - /** This is a possible type of Element . */ + /** + * This is a possible type of Element . + */ public static final int CREATIONDATE = 6; - /** This is a possible type of Element . */ + /** + * This is a possible type of Element . + */ public static final int CREATOR = 7; - - /** This is a possible type of Element . */ + + /** + * This is a possible type of Element . + */ public static final int MODIFICATIONDATE = 8; // static membervariables (content) - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int CHUNK = 10; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int PHRASE = 11; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int PARAGRAPH = 12; - /** This is a possible type of Element */ + /** + * This is a possible type of Element + */ public static final int SECTION = 13; - /** This is a possible type of Element */ + /** + * This is a possible type of Element + */ public static final int LIST = 14; - /** This is a possible type of Element */ + /** + * This is a possible type of Element + */ public static final int LISTITEM = 15; - /** This is a possible type of Element */ + /** + * This is a possible type of Element + */ public static final int CHAPTER = 16; - /** This is a possible type of Element */ + /** + * This is a possible type of Element + */ public static final int ANCHOR = 17; // static membervariables (tables) - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int CELL = 20; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int ROW = 21; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int TABLE = 22; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int PTABLE = 23; // static membervariables (annotations) - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int ANNOTATION = 29; // static membervariables (geometric figures) - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int RECTANGLE = 30; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int JPEG = 32; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int JPEG2000 = 33; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int IMGRAW = 34; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int IMGTEMPLATE = 35; /** * This is a possible type of Element. - * @since 2.1.5 + * + * @since 2.1.5 */ public static final int JBIG2 = 36; - /** This is a possible type of Element. */ + /** + * This is a possible type of Element. + */ public static final int MULTI_COLUMN_TEXT = 40; - - /** This is a possible type of Element. */ + + /** + * This is a possible type of Element. + */ public static final int MARKED = 50; - /** This is a possible type of Element. + /** + * This is a possible type of Element. + * * @since 2.1.2 */ public static final int YMARK = 55; - /** This is a possible type of Element. + /** + * This is a possible type of Element. */ public static final int FOOTNOTE = 56; // static membervariables (alignment) /** - * A possible value for paragraph alignment. This specifies that the text is - * aligned to the left indent and extra whitespace should be placed on the - * right. + * A possible value for paragraph alignment. This specifies that the text is aligned to the left indent and extra + * whitespace should be placed on the right. */ public static final int ALIGN_UNDEFINED = -1; /** - * A possible value for paragraph alignment. This specifies that the text is - * aligned to the left indent and extra whitespace should be placed on the - * right. + * A possible value for paragraph alignment. This specifies that the text is aligned to the left indent and extra + * whitespace should be placed on the right. */ public static final int ALIGN_LEFT = 0; /** - * A possible value for paragraph alignment. This specifies that the text is - * aligned to the center and extra whitespace should be placed equally on - * the left and right. + * A possible value for paragraph alignment. This specifies that the text is aligned to the center and extra + * whitespace should be placed equally on the left and right. */ public static final int ALIGN_CENTER = 1; /** - * A possible value for paragraph alignment. This specifies that the text is - * aligned to the right indent and extra whitespace should be placed on the - * left. + * A possible value for paragraph alignment. This specifies that the text is aligned to the right indent and extra + * whitespace should be placed on the left. */ public static final int ALIGN_RIGHT = 2; /** - * A possible value for paragraph alignment. This specifies that extra - * whitespace should be spread out through the rows of the paragraph with - * the text lined up with the left and right indent except on the last line - * which should be aligned to the left. + * A possible value for paragraph alignment. This specifies that extra whitespace should be spread out through the + * rows of the paragraph with the text lined up with the left and right indent except on the last line which should + * be aligned to the left. */ public static final int ALIGN_JUSTIFIED = 3; @@ -272,38 +329,33 @@ public interface Element { public static final int CCITTG3_2D = 0x102; /** - * A flag indicating whether 1-bits are to be interpreted as black pixels - * and 0-bits as white pixels, + * A flag indicating whether 1-bits are to be interpreted as black pixels and 0-bits as white pixels, */ public static final int CCITT_BLACKIS1 = 1; /** - * A flag indicating whether the filter expects extra 0-bits before each - * encoded line so that the line begins on a byte boundary. + * A flag indicating whether the filter expects extra 0-bits before each encoded line so that the line begins on a + * byte boundary. */ public static final int CCITT_ENCODEDBYTEALIGN = 2; /** - * A flag indicating whether end-of-line bit patterns are required to be - * present in the encoding. + * A flag indicating whether end-of-line bit patterns are required to be present in the encoding. */ public static final int CCITT_ENDOFLINE = 4; /** - * A flag indicating whether the filter expects the encoded data to be - * terminated by an end-of-block pattern, overriding the Rows parameter. The - * use of this flag will set the key /EndOfBlock to false. + * A flag indicating whether the filter expects the encoded data to be terminated by an end-of-block pattern, + * overriding the Rows parameter. The use of this flag will set the key /EndOfBlock to false. */ public static final int CCITT_ENDOFBLOCK = 8; // methods /** - * Processes the element by adding it (or the different parts) to an - * ElementListener. - * - * @param listener - * an ElementListener + * Processes the element by adding it (or the different parts) to an ElementListener. + * + * @param listener an ElementListener * @return true if the element was processed successfully */ @@ -311,32 +363,33 @@ public interface Element { /** * Gets the type of the text element. - * + * * @return a type */ public int type(); /** - * Checks if this element is a content object. - * If not, it's a metadata object. - * @since iText 2.0.8 - * @return true if this is a 'content' element; false if this is a 'metadata' element + * Checks if this element is a content object. If not, it's a metadata object. + * + * @return true if this is a 'content' element; false if this is a 'metadata' element + * @since iText 2.0.8 */ public boolean isContent(); - + /** * Checks if this element is nestable. - * @since iText 2.0.8 - * @return true if this element can be nested inside other elements. + * + * @return true if this element can be nested inside other elements. + * @since iText 2.0.8 */ public boolean isNestable(); - + /** * Gets all the chunks in this element. - * + * * @return an ArrayList */ @@ -344,7 +397,7 @@ public interface Element { /** * Gets the content of the text element. - * + * * @return a type */ diff --git a/openpdf/src/main/java/com/lowagie/text/ElementListener.java b/openpdf/src/main/java/com/lowagie/text/ElementListener.java index ae5ff13b1..32e387d5d 100644 --- a/openpdf/src/main/java/com/lowagie/text/ElementListener.java +++ b/openpdf/src/main/java/com/lowagie/text/ElementListener.java @@ -52,23 +52,23 @@ import java.util.EventListener; /** - * A class that implements ElementListener will perform some - * actions when an Element is added. + * A class that implements ElementListener will perform some actions when an Element is + * added. * - * @see DocListener + * @see DocListener */ public interface ElementListener extends EventListener { - + // methods - -/** - * Signals that an Element was added to the Document. - * - * @param element a high level object - * @return true if the element was added, false if not. - * @throws DocumentException when a document isn't open yet, or has been closed - */ -boolean add(Element element) throws DocumentException; // [L0] + /** + * Signals that an Element was added to the Document. + * + * @param element a high level object + * @return true if the element was added, false if not. + * @throws DocumentException when a document isn't open yet, or has been closed + */ + + boolean add(Element element) throws DocumentException; // [L0] } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/ElementTags.java b/openpdf/src/main/java/com/lowagie/text/ElementTags.java index 4f1ef6333..b77499096 100644 --- a/openpdf/src/main/java/com/lowagie/text/ElementTags.java +++ b/openpdf/src/main/java/com/lowagie/text/ElementTags.java @@ -41,10 +41,10 @@ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more * details. - * + * * Contributions by: * Lubos Strapko - * + * * If you didn't download this code from the following link, you should check if * you aren't using an obsolete version: * https://github.com/LibrePDF/OpenPDF @@ -59,409 +59,657 @@ */ public class ElementTags { - - /** the root tag. */ + + /** + * the root tag. + */ public static final String ITEXT = "itext"; - - /** attribute of the root and annotation tag (also a special tag within a chapter or section) */ + + /** + * attribute of the root and annotation tag (also a special tag within a chapter or section) + */ public static final String TITLE = "title"; - - /** attribute of the root tag */ + + /** + * attribute of the root tag + */ public static final String SUBJECT = "subject"; - - /** attribute of the root tag */ + + /** + * attribute of the root tag + */ public static final String KEYWORDS = "keywords"; - - /** attribute of the root tag */ + + /** + * attribute of the root tag + */ public static final String AUTHOR = "author"; - - /** attribute of the root tag */ + + /** + * attribute of the root tag + */ public static final String CREATIONDATE = "creationdate"; - - /** attribute of the root tag */ + + /** + * attribute of the root tag + */ public static final String PRODUCER = "producer"; - + // Chapters and Sections - - /** the chapter tag */ + + /** + * the chapter tag + */ public static final String CHAPTER = "chapter"; - - /** the section tag */ + + /** + * the section tag + */ public static final String SECTION = "section"; - - /** attribute of section/chapter tag */ + + /** + * attribute of section/chapter tag + */ public static final String NUMBERDEPTH = "numberdepth"; - - /** attribute of section/chapter tag */ + + /** + * attribute of section/chapter tag + */ public static final String DEPTH = "depth"; - - /** attribute of section/chapter tag */ + + /** + * attribute of section/chapter tag + */ public static final String NUMBER = "number"; - - /** attribute of section/chapter tag */ + + /** + * attribute of section/chapter tag + */ public static final String INDENT = "indent"; - - /** attribute of chapter/section/paragraph/table/cell tag */ + + /** + * attribute of chapter/section/paragraph/table/cell tag + */ public static final String LEFT = "left"; - - /** attribute of chapter/section/paragraph/table/cell tag */ + + /** + * attribute of chapter/section/paragraph/table/cell tag + */ public static final String RIGHT = "right"; - + // Phrases, Anchors, Lists and Paragraphs - - /** the phrase tag */ + + /** + * the phrase tag + */ public static final String PHRASE = "phrase"; - - /** the anchor tag */ + + /** + * the anchor tag + */ public static final String ANCHOR = "anchor"; - - /** the list tag */ + + /** + * the list tag + */ public static final String LIST = "list"; - - /** the listitem tag */ + + /** + * the listitem tag + */ public static final String LISTITEM = "listitem"; - - /** the paragraph tag */ + + /** + * the paragraph tag + */ public static final String PARAGRAPH = "paragraph"; - - /** attribute of phrase/paragraph/cell tag */ + + /** + * attribute of phrase/paragraph/cell tag + */ public static final String LEADING = "leading"; - - /** attribute of paragraph/image/table tag */ + + /** + * attribute of paragraph/image/table tag + */ public static final String ALIGN = "align"; - - /** attribute of paragraph */ + + /** + * attribute of paragraph + */ public static final String KEEPTOGETHER = "keeptogether"; - - /** attribute of anchor tag */ + + /** + * attribute of anchor tag + */ public static final String NAME = "name"; - - /** attribute of anchor tag */ + + /** + * attribute of anchor tag + */ public static final String REFERENCE = "reference"; - - /** attribute of list tag */ + + /** + * attribute of list tag + */ public static final String LISTSYMBOL = "listsymbol"; - - /** attribute of list tag */ + + /** + * attribute of list tag + */ public static final String NUMBERED = "numbered"; - - /** attribute of the list tag */ + + /** + * attribute of the list tag + */ public static final String LETTERED = "lettered"; - /** attribute of list tag */ + /** + * attribute of list tag + */ public static final String FIRST = "first"; - - /** attribute of list tag */ + + /** + * attribute of list tag + */ public static final String SYMBOLINDENT = "symbolindent"; - - /** attribute of list tag */ + + /** + * attribute of list tag + */ public static final String INDENTATIONLEFT = "indentationleft"; - - /** attribute of list tag */ + + /** + * attribute of list tag + */ public static final String INDENTATIONRIGHT = "indentationright"; - + // Chunks - - /** the chunk tag */ + + /** + * the chunk tag + */ public static final String IGNORE = "ignore"; - - /** the chunk tag */ + + /** + * the chunk tag + */ public static final String ENTITY = "entity"; - - /** the chunk tag */ + + /** + * the chunk tag + */ public static final String ID = "id"; - - /** the chunk tag */ + + /** + * the chunk tag + */ public static final String CHUNK = "chunk"; - - /** attribute of the chunk tag */ + + /** + * attribute of the chunk tag + */ public static final String ENCODING = "encoding"; - - /** attribute of the chunk tag */ + + /** + * attribute of the chunk tag + */ public static final String EMBEDDED = "embedded"; - - /** attribute of the chunk/table/cell tag */ + + /** + * attribute of the chunk/table/cell tag + */ public static final String COLOR = "color"; - - /** attribute of the chunk/table/cell tag */ + + /** + * attribute of the chunk/table/cell tag + */ public static final String RED = "red"; - - /** attribute of the chunk/table/cell tag */ + + /** + * attribute of the chunk/table/cell tag + */ public static final String GREEN = "green"; - - /** attribute of the chunk/table/cell tag */ + + /** + * attribute of the chunk/table/cell tag + */ public static final String BLUE = "blue"; - - /** attribute of the chunk tag */ + + /** + * attribute of the chunk tag + */ public static final String SUBSUPSCRIPT = Chunk.SUBSUPSCRIPT.toLowerCase(Locale.ROOT); - - /** attribute of the chunk tag */ + + /** + * attribute of the chunk tag + */ public static final String LOCALGOTO = Chunk.LOCALGOTO.toLowerCase(Locale.ROOT); - - /** attribute of the chunk tag */ + + /** + * attribute of the chunk tag + */ public static final String REMOTEGOTO = Chunk.REMOTEGOTO.toLowerCase(Locale.ROOT); - - /** attribute of the chunk tag */ + + /** + * attribute of the chunk tag + */ public static final String LOCALDESTINATION = Chunk.LOCALDESTINATION.toLowerCase(Locale.ROOT); - - /** attribute of the chunk tag */ + + /** + * attribute of the chunk tag + */ public static final String GENERICTAG = Chunk.GENERICTAG.toLowerCase(Locale.ROOT); - + // tables/cells - - /** the table tag */ + + /** + * the table tag + */ public static final String TABLE = "table"; - - /** the cell tag */ + + /** + * the cell tag + */ public static final String ROW = "row"; - - /** the cell tag */ + + /** + * the cell tag + */ public static final String CELL = "cell"; - - /** attribute of the table tag */ + + /** + * attribute of the table tag + */ public static final String COLUMNS = "columns"; - - /** attribute of the table tag */ + + /** + * attribute of the table tag + */ public static final String LASTHEADERROW = "lastHeaderRow"; - - /** attribute of the table tag */ + + /** + * attribute of the table tag + */ public static final String CELLPADDING = "cellpadding"; - - /** attribute of the table tag */ + + /** + * attribute of the table tag + */ public static final String CELLSPACING = "cellspacing"; - - /** attribute of the table tag */ + + /** + * attribute of the table tag + */ public static final String OFFSET = "offset"; - - /** attribute of the table tag */ + + /** + * attribute of the table tag + */ public static final String WIDTHS = "widths"; - - /** attribute of the table tag */ + + /** + * attribute of the table tag + */ public static final String TABLEFITSPAGE = "tablefitspage"; - - /** attribute of the table tag */ + + /** + * attribute of the table tag + */ public static final String CELLSFITPAGE = "cellsfitpage"; - /** attribute of the table tag */ + /** + * attribute of the table tag + */ public static final String CONVERT2PDFP = "convert2pdfp"; - - /** attribute of the cell tag */ + + /** + * attribute of the cell tag + */ public static final String HORIZONTALALIGN = "horizontalalign"; - - /** attribute of the cell tag */ + + /** + * attribute of the cell tag + */ public static final String VERTICALALIGN = "verticalalign"; - - /** attribute of the cell tag */ + + /** + * attribute of the cell tag + */ public static final String COLSPAN = "colspan"; - - /** attribute of the cell tag */ + + /** + * attribute of the cell tag + */ public static final String ROWSPAN = "rowspan"; - - /** attribute of the cell tag */ + + /** + * attribute of the cell tag + */ public static final String HEADER = "header"; - - /** attribute of the cell tag */ + + /** + * attribute of the cell tag + */ public static final String NOWRAP = "nowrap"; - - /** attribute of the table/cell tag */ + + /** + * attribute of the table/cell tag + */ public static final String BORDERWIDTH = "borderwidth"; - - /** attribute of the table/cell tag */ + + /** + * attribute of the table/cell tag + */ public static final String TOP = "top"; - - /** attribute of the table/cell tag */ + + /** + * attribute of the table/cell tag + */ public static final String BOTTOM = "bottom"; - - /** attribute of the table/cell tag */ + + /** + * attribute of the table/cell tag + */ public static final String WIDTH = "width"; - - /** attribute of the table/cell tag */ + + /** + * attribute of the table/cell tag + */ public static final String BORDERCOLOR = "bordercolor"; - - /** attribute of the table/cell tag */ + + /** + * attribute of the table/cell tag + */ public static final String BACKGROUNDCOLOR = "backgroundcolor"; - - /** attribute of the table/cell tag */ + + /** + * attribute of the table/cell tag + */ public static final String BGRED = "bgred"; - - /** attribute of the table/cell tag */ + + /** + * attribute of the table/cell tag + */ public static final String BGGREEN = "bggreen"; - - /** attribute of the table/cell tag */ + + /** + * attribute of the table/cell tag + */ public static final String BGBLUE = "bgblue"; - - /** attribute of the table/cell tag */ + + /** + * attribute of the table/cell tag + */ public static final String GRAYFILL = "grayfill"; - + // Misc - - /** the image tag */ + + /** + * the image tag + */ public static final String IMAGE = "image"; - - /** attribute of the image and annotation tag */ + + /** + * attribute of the image and annotation tag + */ public static final String URL = "url"; - - /** attribute of the image tag */ + + /** + * attribute of the image tag + */ public static final String UNDERLYING = "underlying"; - - /** attribute of the image tag */ + + /** + * attribute of the image tag + */ public static final String TEXTWRAP = "textwrap"; - - /** attribute of the image tag */ + + /** + * attribute of the image tag + */ public static final String ALT = "alt"; - - /** attribute of the image tag */ + + /** + * attribute of the image tag + */ public static final String ABSOLUTEX = "absolutex"; - - /** attribute of the image tag */ + + /** + * attribute of the image tag + */ public static final String ABSOLUTEY = "absolutey"; - - /** attribute of the image tag */ + + /** + * attribute of the image tag + */ public static final String PLAINWIDTH = "plainwidth"; - - /** attribute of the image tag */ + + /** + * attribute of the image tag + */ public static final String PLAINHEIGHT = "plainheight"; - - /** attribute of the image tag */ + + /** + * attribute of the image tag + */ public static final String SCALEDWIDTH = "scaledwidth"; - - /** attribute of the image tag */ + + /** + * attribute of the image tag + */ public static final String SCALEDHEIGHT = "scaledheight"; - - /** attribute of the image tag */ - public static final String ROTATION = "rotation"; - - /** the newpage tag */ + + /** + * attribute of the image tag + */ + public static final String ROTATION = "rotation"; + + /** + * the newpage tag + */ public static final String NEWPAGE = "newpage"; - - /** the newpage tag */ + + /** + * the newpage tag + */ public static final String NEWLINE = "newline"; - - /** the annotation tag */ + + /** + * the annotation tag + */ public static final String ANNOTATION = "annotation"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String FILE = "file"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String DESTINATION = "destination"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String PAGE = "page"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String NAMED = "named"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String APPLICATION = "application"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String PARAMETERS = "parameters"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String OPERATION = "operation"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String DEFAULTDIR = "defaultdir"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String LLX = "llx"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String LLY = "lly"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String URX = "urx"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String URY = "ury"; - - /** attribute of the annotation tag */ + + /** + * attribute of the annotation tag + */ public static final String CONTENT = "content"; - + // alignment attribute values - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String ALIGN_LEFT = "Left"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String ALIGN_CENTER = "Center"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String ALIGN_RIGHT = "Right"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String ALIGN_JUSTIFIED = "Justify"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String ALIGN_JUSTIFIED_ALL = "JustifyAll"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String ALIGN_TOP = "Top"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String ALIGN_MIDDLE = "Middle"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String ALIGN_BOTTOM = "Bottom"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String ALIGN_BASELINE = "Baseline"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String DEFAULT = "Default"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String UNKNOWN = "unknown"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String FONT = "font"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String SIZE = "size"; - - /** the possible value of an alignment attribute */ + + /** + * the possible value of an alignment attribute + */ public static final String STYLE = "fontstyle"; - - /** the possible value of a tag */ + + /** + * the possible value of a tag + */ public static final String HORIZONTALRULE = "horizontalrule"; - /** the possible value of a tag */ - public static final String PAGE_SIZE = "pagesize"; + /** + * the possible value of a tag + */ + public static final String PAGE_SIZE = "pagesize"; + + /** + * the possible value of a tag + */ + public static final String ORIENTATION = "orientation"; - /** the possible value of a tag */ - public static final String ORIENTATION = "orientation"; - - /** a possible list attribute */ + /** + * a possible list attribute + */ public static final String ALIGN_INDENTATION_ITEMS = "alignindent"; - - /** a possible list attribute */ + + /** + * a possible list attribute + */ public static final String AUTO_INDENT_ITEMS = "autoindent"; - - /** a possible list attribute */ + + /** + * a possible list attribute + */ public static final String LOWERCASE = "lowercase"; - /** - * a possible list attribute - * @since 2.1.3 - */ - public static final String FACE = "face"; - - /** attribute of the image or iframe tag - * @since 2.1.3 - */ - public static final String SRC = "src"; - - + /** + * a possible list attribute + * + * @since 2.1.3 + */ + public static final String FACE = "face"; + + /** + * attribute of the image or iframe tag + * + * @since 2.1.3 + */ + public static final String SRC = "src"; + // methods - + /** * Translates the alignment value to a String value. * - * @param alignment the alignment value - * @return the translated value + * @param alignment the alignment value + * @return the translated value */ public static String getAlignment(int alignment) { - switch(alignment) { + switch (alignment) { case Element.ALIGN_LEFT: return ALIGN_LEFT; case Element.ALIGN_CENTER: @@ -479,19 +727,21 @@ public static String getAlignment(int alignment) { return ALIGN_BOTTOM; case Element.ALIGN_BASELINE: return ALIGN_BASELINE; - default: - return DEFAULT; + default: + return DEFAULT; } } - + /** - * Translates a String value to an alignment value. - * (written by Norman Richards, integrated into iText by Bruno) - * @param alignment a String (one of the ALIGN_ constants of this class) - * @return an alignment value (one of the ALIGN_ constants of the Element interface) + * Translates a String value to an alignment value. (written by Norman Richards, integrated into iText by Bruno) + * + * @param alignment a String (one of the ALIGN_ constants of this class) + * @return an alignment value (one of the ALIGN_ constants of the Element interface) */ public static int alignmentValue(String alignment) { - if (alignment == null) return Element.ALIGN_UNDEFINED; + if (alignment == null) { + return Element.ALIGN_UNDEFINED; + } if (ALIGN_CENTER.equalsIgnoreCase(alignment)) { return Element.ALIGN_CENTER; } diff --git a/openpdf/src/main/java/com/lowagie/text/ExceptionConverter.java b/openpdf/src/main/java/com/lowagie/text/ExceptionConverter.java index 6e3bcfbd0..2c7092639 100644 --- a/openpdf/src/main/java/com/lowagie/text/ExceptionConverter.java +++ b/openpdf/src/main/java/com/lowagie/text/ExceptionConverter.java @@ -54,34 +54,37 @@ /** * The OpenPDF project has permission from the author to use this class under a LGPL/MPL license on 2018-08-06: - * + *

    * Hi Andreas, - * + *

    * you have my permission to use my code with your license. - * + *

    * Regards - * - * - * Heinz - * -- - * Dr Heinz M. Kabutz (PhD CompSci) + *

    + *

    + * Heinz -- Dr Heinz M. Kabutz (PhD CompSci) */ package com.lowagie.text; /** - * The ExceptionConverter changes a checked exception into an - * unchecked exception. + * The ExceptionConverter changes a checked exception into an unchecked exception. */ public class ExceptionConverter extends RuntimeException { + private static final long serialVersionUID = 8657630363395849399L; - /** we keep a handle to the wrapped exception */ + /** + * we keep a handle to the wrapped exception + */ private Exception ex; - /** prefix for the exception */ + /** + * prefix for the exception + */ private String prefix; /** * Construct a RuntimeException based on another Exception + * * @param ex the exception that has to be turned into a RuntimeException */ public ExceptionConverter(Exception ex) { @@ -90,11 +93,11 @@ public ExceptionConverter(Exception ex) { } /** - * Convert an Exception into an unchecked exception. Return the exception if it is - * already an unchecked exception or return an ExceptionConverter wrapper otherwise + * Convert an Exception into an unchecked exception. Return the exception if it is already an unchecked exception or + * return an ExceptionConverter wrapper otherwise * * @param ex the exception to convert - * @return an unchecked exception + * @return an unchecked exception * @since 2.1.6 */ public static final RuntimeException convertException(Exception ex) { @@ -105,7 +108,8 @@ public static final RuntimeException convertException(Exception ex) { } /** - * and allow the user of ExceptionConverter to get a handle to it. + * and allow the user of ExceptionConverter to get a handle to it. + * * @return the original exception */ public Exception getException() { @@ -113,7 +117,8 @@ public Exception getException() { } /** - * We print the message of the checked exception + * We print the message of the checked exception + * * @return message of the original exception */ public String getMessage() { @@ -122,6 +127,7 @@ public String getMessage() { /** * and make sure we also produce a localized version + * * @return localized version of the message */ public String getLocalizedMessage() { @@ -129,21 +135,24 @@ public String getLocalizedMessage() { } /** - * The toString() is changed to be prefixed with ExceptionConverter + * The toString() is changed to be prefixed with ExceptionConverter + * * @return String version of the exception */ public String toString() { return prefix + ex; } - /** we have to override this as well */ + /** + * we have to override this as well + */ public void printStackTrace() { printStackTrace(System.err); } /** - * here we prefix, with printStream.print(), not printStream.println(), the stack - * trace with "ExceptionConverter:" + * here we prefix, with printStream.print(), not printStream.println(), the stack trace with "ExceptionConverter:" + * * @param printStream printStream */ public void printStackTrace(java.io.PrintStream printStream) { @@ -154,7 +163,8 @@ public void printStackTrace(java.io.PrintStream printStream) { } /** - * Again, we prefix the stack trace with "ExceptionConverter:" + * Again, we prefix the stack trace with "ExceptionConverter:" + * * @param printWriter printWriter */ public void printStackTrace(java.io.PrintWriter printWriter) { @@ -165,9 +175,9 @@ public void printStackTrace(java.io.PrintWriter printWriter) { } /** - * requests to fill in the stack trace we will have to ignore. - * We can't throw an exception here, because this method - * is called by the constructor of Throwable + * requests to fill in the stack trace we will have to ignore. We can't throw an exception here, because this method + * is called by the constructor of Throwable + * * @return a Throwable */ public synchronized Throwable fillInStackTrace() { diff --git a/openpdf/src/main/java/com/lowagie/text/Font.java b/openpdf/src/main/java/com/lowagie/text/Font.java index 012e0fa0f..fd1779c14 100644 --- a/openpdf/src/main/java/com/lowagie/text/Font.java +++ b/openpdf/src/main/java/com/lowagie/text/Font.java @@ -290,6 +290,88 @@ public Font() { // implementation of the Comparable interface + /** + * Translates a String -value of a certain family into the index that is used for this family in this + * class. + * + * @param family A String representing a certain font-family + * @return the corresponding index + */ + public static int getFamilyIndex(String family) { + if (family.equalsIgnoreCase(FontFactory.COURIER)) { + return COURIER; + } + if (family.equalsIgnoreCase(FontFactory.HELVETICA)) { + return HELVETICA; + } + if (family.equalsIgnoreCase(FontFactory.TIMES_ROMAN)) { + return TIMES_ROMAN; + } + if (family.equalsIgnoreCase(FontFactory.SYMBOL)) { + return SYMBOL; + } + if (family.equalsIgnoreCase(FontFactory.ZAPFDINGBATS)) { + return ZAPFDINGBATS; + } + return UNDEFINED; + } + + // FAMILY + + /** + * Returns the font-style, if the font is already styled.
    + * 

    +     * For example:
+     * font: Helvetica - style: normal
+     * font: Helvetica-Bold - style: bold
+     *
    + * + * @param fontName the name of the Font + * @return the styles of an already styled font. + */ + public static int getFontStyleFromName(final String fontName) { + String lowerCaseFontName = fontName.toLowerCase(Locale.ROOT); + + int fontStyle = Font.NORMAL; + if (lowerCaseFontName.contains("bold")) { + fontStyle |= Font.BOLD; + } + if (lowerCaseFontName.contains("italic") || lowerCaseFontName.contains("oblique")) { + fontStyle |= Font.ITALIC; + } + return fontStyle; + } + + /** + * Translates a String -value of a certain style into the index value is used for this style in this + * class. + * + * @param style A String + * @return the corresponding value + */ + public static int getStyleValue(String style) { + int s = 0; + if (style.contains(Markup.CSS_VALUE_NORMAL)) { + s |= NORMAL; + } + if (style.contains(Markup.CSS_VALUE_BOLD)) { + s |= BOLD; + } + if (style.contains(Markup.CSS_VALUE_ITALIC)) { + s |= ITALIC; + } + if (style.contains(Markup.CSS_VALUE_OBLIQUE)) { + s |= ITALIC; + } + if (style.contains(Markup.CSS_VALUE_UNDERLINE)) { + s |= UNDERLINE; + } + if (style.contains(Markup.CSS_VALUE_LINETHROUGH)) { + s |= STRIKETHRU; + } + return s; + } + /** * Compares this Font with another * @@ -333,8 +415,6 @@ public int compareTo(Object object) { } } - // FAMILY - /** * Gets the family of this font. * @@ -344,6 +424,18 @@ public int getFamily() { return family; } + // SIZE + + /** + * Sets the family using a String ("Courier", "Helvetica", "Times New Roman", "Symbol" or + * "ZapfDingbats"). + * + * @param family A String representing a certain font-family. + */ + public void setFamily(String family) { + this.family = getFamilyIndex(family); + } + /** * Gets the familyname as a String. * @@ -382,51 +474,24 @@ public String getFamilyname() { } /** - * Sets the family using a String ("Courier", "Helvetica", "Times New Roman", "Symbol" or - * "ZapfDingbats"). + * Gets the size of this font. * - * @param family A String representing a certain font-family. + * @return a size */ - public void setFamily(String family) { - this.family = getFamilyIndex(family); + public float getSize() { + return size; } /** - * Translates a String -value of a certain family into the index that is used for this family in this - * class. + * Sets the size. * - * @param family A String representing a certain font-family - * @return the corresponding index + * @param size The new size of the font. */ - public static int getFamilyIndex(String family) { - if (family.equalsIgnoreCase(FontFactory.COURIER)) { - return COURIER; - } - if (family.equalsIgnoreCase(FontFactory.HELVETICA)) { - return HELVETICA; - } - if (family.equalsIgnoreCase(FontFactory.TIMES_ROMAN)) { - return TIMES_ROMAN; - } - if (family.equalsIgnoreCase(FontFactory.SYMBOL)) { - return SYMBOL; - } - if (family.equalsIgnoreCase(FontFactory.ZAPFDINGBATS)) { - return ZAPFDINGBATS; - } - return UNDEFINED; + public void setSize(float size) { + this.size = size; } - // SIZE - - /** - * Gets the size of this font. - * - * @return a size - */ - public float getSize() { - return size; - } + // STYLE /** * Gets the size that can be used with the calculated BaseFont @@ -454,23 +519,34 @@ public float getCalculatedLeading(float linespacing) { } /** - * Sets the size. + * Gets the style of this font. * - * @param size The new size of the font. + * @return a size */ - public void setSize(float size) { - this.size = size; + public int getStyle() { + return style; } - // STYLE + /** + * Sets the style. + * + * @param style the style. + */ + public void setStyle(int style) { + this.style = style; + } /** - * Gets the style of this font. + * Sets the style using a String containing one of more of the following values: normal, bold, italic, + * underline, strike. * - * @return a size + * @param style A String representing a certain style. */ - public int getStyle() { - return style; + public void setStyle(String style) { + if (this.style == UNDEFINED) { + this.style = NORMAL; + } + this.style |= getStyleValue(style); } /** @@ -516,30 +592,6 @@ public int getBaseFontStyle() { return style; } - /** - * Returns the font-style, if the font is already styled.
    - * 
    -     * For example:
-     * font: Helvetica - style: normal
-     * font: Helvetica-Bold - style: bold
-     *
    - * - * @param fontName the name of the Font - * @return the styles of an already styled font. - */ - public static int getFontStyleFromName(final String fontName) { - String lowerCaseFontName = fontName.toLowerCase(Locale.ROOT); - - int fontStyle = Font.NORMAL; - if (lowerCaseFontName.contains("bold")) { - fontStyle |= Font.BOLD; - } - if (lowerCaseFontName.contains("italic") || lowerCaseFontName.contains("oblique")) { - fontStyle |= Font.ITALIC; - } - return fontStyle; - } - /** * checks if this font is Bold. * @@ -588,58 +640,6 @@ public boolean isStrikethru() { return (style & STRIKETHRU) == STRIKETHRU; } - /** - * Sets the style. - * - * @param style the style. - */ - public void setStyle(int style) { - this.style = style; - } - - /** - * Sets the style using a String containing one of more of the following values: normal, bold, italic, - * underline, strike. - * - * @param style A String representing a certain style. - */ - public void setStyle(String style) { - if (this.style == UNDEFINED) { - this.style = NORMAL; - } - this.style |= getStyleValue(style); - } - - /** - * Translates a String -value of a certain style into the index value is used for this style in this - * class. - * - * @param style A String - * @return the corresponding value - */ - public static int getStyleValue(String style) { - int s = 0; - if (style.contains(Markup.CSS_VALUE_NORMAL)) { - s |= NORMAL; - } - if (style.contains(Markup.CSS_VALUE_BOLD)) { - s |= BOLD; - } - if (style.contains(Markup.CSS_VALUE_ITALIC)) { - s |= ITALIC; - } - if (style.contains(Markup.CSS_VALUE_OBLIQUE)) { - s |= ITALIC; - } - if (style.contains(Markup.CSS_VALUE_UNDERLINE)) { - s |= UNDERLINE; - } - if (style.contains(Markup.CSS_VALUE_LINETHROUGH)) { - s |= STRIKETHRU; - } - return s; - } - // COLOR /** diff --git a/openpdf/src/main/java/com/lowagie/text/FontFactory.java b/openpdf/src/main/java/com/lowagie/text/FontFactory.java index 1f8fe506f..e118ebb4c 100755 --- a/openpdf/src/main/java/com/lowagie/text/FontFactory.java +++ b/openpdf/src/main/java/com/lowagie/text/FontFactory.java @@ -50,329 +50,355 @@ package com.lowagie.text; +import com.lowagie.text.error_messages.MessageLocalization; +import com.lowagie.text.pdf.BaseFont; import java.awt.Color; import java.util.Properties; import java.util.Set; -import com.lowagie.text.error_messages.MessageLocalization; -import com.lowagie.text.pdf.BaseFont; - /** - * If you are using True Type fonts, you can declare the paths of the different ttf- and ttc-files - * to this static class first and then create fonts in your code using one of the static getFont-method - * without having to enter a path as parameter. + * If you are using True Type fonts, you can declare the paths of the different ttf- and ttc-files to this static class + * first and then create fonts in your code using one of the static getFont-method without having to enter a path as + * parameter. * - * @author Bruno Lowagie + * @author Bruno Lowagie */ public final class FontFactory { - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String COURIER = BaseFont.COURIER; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String COURIER_BOLD = BaseFont.COURIER_BOLD; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String COURIER_OBLIQUE = BaseFont.COURIER_OBLIQUE; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String COURIER_BOLDOBLIQUE = BaseFont.COURIER_BOLDOBLIQUE; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String HELVETICA = BaseFont.HELVETICA; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String HELVETICA_BOLD = BaseFont.HELVETICA_BOLD; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String HELVETICA_OBLIQUE = BaseFont.HELVETICA_OBLIQUE; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String HELVETICA_BOLDOBLIQUE = BaseFont.HELVETICA_BOLDOBLIQUE; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String SYMBOL = BaseFont.SYMBOL; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String TIMES = "Times"; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String TIMES_ROMAN = BaseFont.TIMES_ROMAN; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String TIMES_BOLD = BaseFont.TIMES_BOLD; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String TIMES_ITALIC = BaseFont.TIMES_ITALIC; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String TIMES_BOLDITALIC = BaseFont.TIMES_BOLDITALIC; - -/** This is a possible value of a base 14 type 1 font */ + + /** + * This is a possible value of a base 14 type 1 font + */ public static final String ZAPFDINGBATS = BaseFont.ZAPFDINGBATS; - - private static FontFactoryImp fontImp = new FontFactoryImp(); - -/** This is the default encoding to use. */ + /** + * This is the default encoding to use. + */ public static String defaultEncoding = BaseFont.WINANSI; - -/** This is the default value of the embedded variable. */ + /** + * This is the default value of the embedded variable. + */ public static boolean defaultEmbedding = BaseFont.NOT_EMBEDDED; - -/** Creates new FontFactory */ + private static FontFactoryImp fontImp = new FontFactoryImp(); + + /** + * Creates new FontFactory + */ private FontFactory() { } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param embedded true if the font is to be embedded in the PDF - * @param size the size of this font - * @param style the style of this font - * @param color the Color of this font. - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param embedded true if the font is to be embedded in the PDF + * @param size the size of this font + * @param style the style of this font + * @param color the Color of this font. + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, String encoding, boolean embedded, float size, int style, Color color) { return fontImp.getFont(fontname, encoding, embedded, size, style, color); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param embedded true if the font is to be embedded in the PDF - * @param size the size of this font - * @param style the style of this font - * @param color the Color of this font. - * @param cached true if the font comes from the cache or is added to - * the cache if new, false if the font is always created new - * @return the Font constructed based on the parameters - */ - - public static Font getFont(String fontname, String encoding, boolean embedded, float size, int style, Color color, boolean cached) { + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param embedded true if the font is to be embedded in the PDF + * @param size the size of this font + * @param style the style of this font + * @param color the Color of this font. + * @param cached true if the font comes from the cache or is added to the cache if new, false if the font is + * always created new + * @return the Font constructed based on the parameters + */ + + public static Font getFont(String fontname, String encoding, boolean embedded, float size, int style, Color color, + boolean cached) { return fontImp.getFont(fontname, encoding, embedded, size, style, color, cached); } - -/** - * Constructs a Font-object. - * - * @param attributes the attributes of a Font object. - * @return the Font constructed based on the attributes - */ - + + /** + * Constructs a Font-object. + * + * @param attributes the attributes of a Font object. + * @return the Font constructed based on the attributes + */ + public static Font getFont(Properties attributes) { fontImp.defaultEmbedding = defaultEmbedding; fontImp.defaultEncoding = defaultEncoding; return fontImp.getFont(attributes); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param embedded true if the font is to be embedded in the PDF - * @param size the size of this font - * @param style the style of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param embedded true if the font is to be embedded in the PDF + * @param size the size of this font + * @param style the style of this font + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, String encoding, boolean embedded, float size, int style) { return getFont(fontname, encoding, embedded, size, style, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param embedded true if the font is to be embedded in the PDF - * @param size the size of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param embedded true if the font is to be embedded in the PDF + * @param size the size of this font + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, String encoding, boolean embedded, float size) { return getFont(fontname, encoding, embedded, size, Font.UNDEFINED, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param embedded true if the font is to be embedded in the PDF - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param embedded true if the font is to be embedded in the PDF + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, String encoding, boolean embedded) { return getFont(fontname, encoding, embedded, Font.UNDEFINED, Font.UNDEFINED, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param size the size of this font - * @param style the style of this font - * @param color the Color of this font. - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param size the size of this font + * @param style the style of this font + * @param color the Color of this font. + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, String encoding, float size, int style, Color color) { return getFont(fontname, encoding, defaultEmbedding, size, style, color); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param size the size of this font - * @param style the style of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param size the size of this font + * @param style the style of this font + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, String encoding, float size, int style) { return getFont(fontname, encoding, defaultEmbedding, size, style, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param size the size of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param size the size of this font + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, String encoding, float size) { return getFont(fontname, encoding, defaultEmbedding, size, Font.UNDEFINED, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, String encoding) { return getFont(fontname, encoding, defaultEmbedding, Font.UNDEFINED, Font.UNDEFINED, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param size the size of this font - * @param style the style of this font - * @param color the Color of this font. - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param size the size of this font + * @param style the style of this font + * @param color the Color of this font. + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, float size, int style, Color color) { return getFont(fontname, defaultEncoding, defaultEmbedding, size, style, color); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param size the size of this font - * @param color the Color of this font. - * @return the Font constructed based on the parameters - * @since 2.1.0 - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param size the size of this font + * @param color the Color of this font. + * @return the Font constructed based on the parameters + * @since 2.1.0 + */ + public static Font getFont(String fontname, float size, Color color) { return getFont(fontname, defaultEncoding, defaultEmbedding, size, Font.UNDEFINED, color); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param size the size of this font - * @param style the style of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param size the size of this font + * @param style the style of this font + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, float size, int style) { return getFont(fontname, defaultEncoding, defaultEmbedding, size, style, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param size the size of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param size the size of this font + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname, float size) { return getFont(fontname, defaultEncoding, defaultEmbedding, size, Font.UNDEFINED, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @return the Font constructed based on the parameters + */ + public static Font getFont(String fontname) { return getFont(fontname, defaultEncoding, defaultEmbedding, Font.UNDEFINED, Font.UNDEFINED, null); } - + /** - * Register a font by giving explicitly the font family and name. - * @param familyName the font family - * @param fullName the font name - * @param path the font path + * Register a ttf- or a ttc-file. + * + * @param path the path to a ttf- or ttc-file */ - public void registerFamily(String familyName, String fullName, String path) { - fontImp.registerFamily(familyName, fullName, path); - } - -/** - * Register a ttf- or a ttc-file. - * - * @param path the path to a ttf- or ttc-file - */ - + public static void register(String path) { register(path, null); } - -/** - * Register a font file and use an alias for the font contained in it. - * - * @param path the path to a font file - * @param alias the alias you want to use for the font - */ - + + /** + * Register a font file and use an alias for the font contained in it. + * + * @param path the path to a font file + * @param alias the alias you want to use for the font + */ + public static void register(String path, String alias) { fontImp.register(path, alias); } - /** Register all the fonts in a directory. + /** + * Register all the fonts in a directory. + * * @param dir the directory * @return the number of fonts registered - */ + */ public static int registerDirectory(String dir) { return fontImp.registerDirectory(dir); } /** * Register all the fonts in a directory and possibly its subdirectories. - * @param dir the directory + * + * @param dir the directory * @param scanSubdirectories recursively scan subdirectories if true * @return the number of fonts registered * @since 2.1.2 @@ -381,68 +407,86 @@ public static int registerDirectory(String dir, boolean scanSubdirectories) { return fontImp.registerDirectory(dir, scanSubdirectories); } - /** Register fonts in some probable directories. It usually works in Windows, - * Linux and Solaris. + /** + * Register fonts in some probable directories. It usually works in Windows, Linux and Solaris. + * * @return the number of fonts registered - */ + */ public static int registerDirectories() { return fontImp.registerDirectories(); } -/** - * Gets a set of registered fontnames. - * @return a set of registered fonts - */ + /** + * Gets a set of registered fontnames. + * + * @return a set of registered fonts + */ -public static Set getRegisteredFonts() { + public static Set getRegisteredFonts() { return fontImp.getRegisteredFonts(); } - -/** - * Gets a set of registered fontnames. - * @return a set of registered font families - */ -public static Set getRegisteredFamilies() { + /** + * Gets a set of registered fontnames. + * + * @return a set of registered font families + */ + + public static Set getRegisteredFamilies() { return fontImp.getRegisteredFamilies(); } - -/** - * Gets a set of registered fontnames. - * @param fontname of a font that may or may not be registered - * @return true if a given font is registered - */ - + + /** + * Gets a set of registered fontnames. + * + * @param fontname of a font that may or may not be registered + * @return true if a given font is registered + */ + public static boolean contains(String fontname) { return fontImp.isRegistered(fontname); } - -/** - * Checks if a certain font is registered. - * - * @param fontname the name of the font that has to be checked. - * @return true if the font is found - */ - + + /** + * Checks if a certain font is registered. + * + * @param fontname the name of the font that has to be checked. + * @return true if the font is found + */ + public static boolean isRegistered(String fontname) { return fontImp.isRegistered(fontname); } - + /** * Gets the font factory implementation. + * * @return the font factory implementation - */ + */ public static FontFactoryImp getFontImp() { return fontImp; } - + /** * Sets the font factory implementation. + * * @param fontImp the font factory implementation - */ + */ public static void setFontImp(FontFactoryImp fontImp) { - if (fontImp == null) + if (fontImp == null) { throw new NullPointerException(MessageLocalization.getComposedMessage("fontfactoryimp.cannot.be.null")); + } FontFactory.fontImp = fontImp; } + + /** + * Register a font by giving explicitly the font family and name. + * + * @param familyName the font family + * @param fullName the font name + * @param path the font path + */ + public void registerFamily(String familyName, String fullName, String path) { + fontImp.registerFamily(familyName, fullName, path); + } } diff --git a/openpdf/src/main/java/com/lowagie/text/FontFactoryImp.java b/openpdf/src/main/java/com/lowagie/text/FontFactoryImp.java index 6d322f607..bc2566aa4 100644 --- a/openpdf/src/main/java/com/lowagie/text/FontFactoryImp.java +++ b/openpdf/src/main/java/com/lowagie/text/FontFactoryImp.java @@ -75,18 +75,16 @@ public class FontFactoryImp implements FontProvider { - /** - * This is a map of postscriptfontnames of True Type fonts and the path of their ttf- or ttc-file. - */ - private final Map trueTypeFonts = new HashMap<>(); - private static final String[] TTFamilyOrder = { "3", "1", "1033", "3", "0", "1033", "1", "0", "0", "0", "3", "0" }; - + /** + * This is a map of postscriptfontnames of True Type fonts and the path of their ttf- or ttc-file. + */ + private final Map trueTypeFonts = new HashMap<>(); /** * This is a map of fontfamilies. */ @@ -153,35 +151,34 @@ public FontFactoryImp() { tmp.add(FontFactory.ZAPFDINGBATS); fontFamilies.put(FontFactory.ZAPFDINGBATS.toLowerCase(Locale.ROOT), tmp); } - + /** * Constructs a Font-object. * - * @param fontName the name of the font - * @param encoding the encoding of the font - * @param embedded true if the font is to be embedded in the PDF - * @param size the size of this font - * @param style the style of this font - * @param color the Color of this font. + * @param fontName the name of the font + * @param encoding the encoding of the font + * @param embedded true if the font is to be embedded in the PDF + * @param size the size of this font + * @param style the style of this font + * @param color the Color of this font. * @return the Font constructed based on the parameters */ public Font getFont(String fontName, String encoding, boolean embedded, float size, int style, Color color) { return getFont(fontName, encoding, embedded, size, style, color, true); } - - - + + /** * Constructs a Font-object. * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param embedded true if the font is to be embedded in the PDF - * @param size the size of this font - * @param style the style of this font - * @param color the Color of this font. - * @param cached true if the font comes from the cache or is added to - * the cache if new, false if the font is always created new + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param embedded true if the font is to be embedded in the PDF + * @param size the size of this font + * @param style the style of this font + * @param color the Color of this font. + * @param cached true if the font comes from the cache or is added to the cache if new, false if the font is + * always created new * @return the Font constructed based on the parameters */ public Font getFont(String fontname, String encoding, boolean embedded, float size, int style, @@ -225,12 +222,13 @@ public Font getFont(String fontname, String encoding, boolean embedded, float si // the font is a true type font or an unknown font fontname = trueTypeFonts.get(lowerCaseFontname); // the font is not registered as truetype font - if (fontname == null) return new Font(Font.UNDEFINED, size, style, color); + if (fontname == null) { + return new Font(Font.UNDEFINED, size, style, color); + } // the font is registered as truetype font basefont = BaseFont.createFont(fontname, encoding, embedded, cached, null, null); } - } - catch(DocumentException de) { + } catch (DocumentException de) { // this shouldn't happen throw new ExceptionConverter(de); } catch (IOException | NullPointerException ioe) { @@ -242,13 +240,13 @@ public Font getFont(String fontname, String encoding, boolean embedded, float si return new Font(basefont, size, style, color); } -/** - * Constructs a Font-object. - * - * @param attributes the attributes of a Font object. - * @return the Font constructed based on the attributes - */ - + /** + * Constructs a Font-object. + * + * @param attributes the attributes of a Font object. + * @return the Font constructed based on the attributes + */ + public Font getFont(Properties attributes) { String fontname = null; String encoding = defaultEncoding; @@ -261,8 +259,7 @@ public Font getFont(Properties attributes) { Properties styleAttributes = Markup.parseAttributes(value); if (styleAttributes.isEmpty()) { attributes.put(Markup.HTML_ATTR_STYLE, value); - } - else { + } else { fontname = styleAttributes.getProperty(Markup.CSS_KEY_FONTFAMILY); if (fontname != null) { String tmp; @@ -270,8 +267,7 @@ public Font getFont(Properties attributes) { tmp = fontname.substring(0, fontname.indexOf(',')); if (isRegistered(tmp)) { fontname = tmp; - } - else { + } else { fontname = fontname.substring(fontname.indexOf(',') + 1); } } @@ -289,7 +285,7 @@ public Font getFont(Properties attributes) { color = Markup.decodeColor(value); } attributes.putAll(styleAttributes); - for (Enumeration e = styleAttributes.keys(); e.hasMoreElements();) { + for (Enumeration e = styleAttributes.keys(); e.hasMoreElements(); ) { Object o = e.nextElement(); attributes.put(o, styleAttributes.get(o)); } @@ -320,12 +316,17 @@ public Font getFont(Properties attributes) { int red = 0; int green = 0; int blue = 0; - if (r != null) red = Integer.parseInt(r); - if (g != null) green = Integer.parseInt(g); - if (b != null) blue = Integer.parseInt(b); + if (r != null) { + red = Integer.parseInt(r); + } + if (g != null) { + green = Integer.parseInt(g); + } + if (b != null) { + blue = Integer.parseInt(b); + } color = new Color(red, green, blue); - } - else if ((value = attributes.getProperty(ElementTags.COLOR)) != null) { + } else if ((value = attributes.getProperty(ElementTags.COLOR)) != null) { color = Markup.decodeColor(value); } if (fontname == null) { @@ -333,177 +334,179 @@ else if ((value = attributes.getProperty(ElementTags.COLOR)) != null) { } return getFont(fontname, encoding, embedded, size, style, color); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param embedded true if the font is to be embedded in the PDF - * @param size the size of this font - * @param style the style of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param embedded true if the font is to be embedded in the PDF + * @param size the size of this font + * @param style the style of this font + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname, String encoding, boolean embedded, float size, int style) { return getFont(fontname, encoding, embedded, size, style, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param embedded true if the font is to be embedded in the PDF - * @param size the size of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param embedded true if the font is to be embedded in the PDF + * @param size the size of this font + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname, String encoding, boolean embedded, float size) { return getFont(fontname, encoding, embedded, size, Font.UNDEFINED, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param embedded true if the font is to be embedded in the PDF - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param embedded true if the font is to be embedded in the PDF + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname, String encoding, boolean embedded) { return getFont(fontname, encoding, embedded, Font.UNDEFINED, Font.UNDEFINED, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param size the size of this font - * @param style the style of this font - * @param color the Color of this font. - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param size the size of this font + * @param style the style of this font + * @param color the Color of this font. + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname, String encoding, float size, int style, Color color) { return getFont(fontname, encoding, defaultEmbedding, size, style, color); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param size the size of this font - * @param style the style of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param size the size of this font + * @param style the style of this font + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname, String encoding, float size, int style) { return getFont(fontname, encoding, defaultEmbedding, size, style, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @param size the size of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @param size the size of this font + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname, String encoding, float size) { return getFont(fontname, encoding, defaultEmbedding, size, Font.UNDEFINED, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param size the size of this font - * @param color the Color of this font. - * @return the Font constructed based on the parameters - * @since 2.1.0 - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param size the size of this font + * @param color the Color of this font. + * @return the Font constructed based on the parameters + * @since 2.1.0 + */ + public Font getFont(String fontname, float size, Color color) { return getFont(fontname, defaultEncoding, defaultEmbedding, size, Font.UNDEFINED, color); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param encoding the encoding of the font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param encoding the encoding of the font + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname, String encoding) { return getFont(fontname, encoding, defaultEmbedding, Font.UNDEFINED, Font.UNDEFINED, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param size the size of this font - * @param style the style of this font - * @param color the Color of this font. - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param size the size of this font + * @param style the style of this font + * @param color the Color of this font. + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname, float size, int style, Color color) { return getFont(fontname, defaultEncoding, defaultEmbedding, size, style, color); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param size the size of this font - * @param style the style of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param size the size of this font + * @param style the style of this font + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname, float size, int style) { return getFont(fontname, defaultEncoding, defaultEmbedding, size, style, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @param size the size of this font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @param size the size of this font + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname, float size) { return getFont(fontname, defaultEncoding, defaultEmbedding, size, Font.UNDEFINED, null); } - -/** - * Constructs a Font-object. - * - * @param fontname the name of the font - * @return the Font constructed based on the parameters - */ - + + /** + * Constructs a Font-object. + * + * @param fontname the name of the font + * @return the Font constructed based on the parameters + */ + public Font getFont(String fontname) { return getFont(fontname, defaultEncoding, defaultEmbedding, Font.UNDEFINED, Font.UNDEFINED, null); } - + /** * Register a font by giving explicitly the font family and name. + * * @param familyName the font family - * @param fullName the font name - * @param path the font path + * @param fullName the font name + * @param path the font path */ public void registerFamily(String familyName, String fullName, String path) { - if (path != null) + if (path != null) { trueTypeFonts.put(fullName, path); + } lock.writeLock().lock(); try { @@ -522,46 +525,48 @@ public void registerFamily(String familyName, String fullName, String path) { break; } } - if (!inserted) + if (!inserted) { tmp.add(fullName); + } } } finally { lock.writeLock().unlock(); } } - -/** - * Register a ttf- or a ttc-file. - * - * @param path the path to a ttf- or ttc-file - */ - + + /** + * Register a ttf- or a ttc-file. + * + * @param path the path to a ttf- or ttc-file + */ + public void register(String path) { register(path, null); } - -/** - * Register a font file and use an alias for the font contained in it. - * - * @param path the path to a font file - * @param alias the alias you want to use for the font - */ - + + /** + * Register a font file and use an alias for the font contained in it. + * + * @param path the path to a font file + * @param alias the alias you want to use for the font + */ + public void register(String path, String alias) { try { - if (path.toLowerCase().endsWith(".ttf") || path.toLowerCase().endsWith(".otf") || path.toLowerCase().indexOf(".ttc,") > 0) { + if (path.toLowerCase().endsWith(".ttf") || path.toLowerCase().endsWith(".otf") + || path.toLowerCase().indexOf(".ttc,") > 0) { Object[] allNames = BaseFont.getAllFontNames(path, BaseFont.WINANSI, null); trueTypeFonts.put(((String) allNames[0]).toLowerCase(), path); if (alias != null) { trueTypeFonts.put(alias.toLowerCase(), path); } // register all the font names with all the locales - String[][] names = (String[][])allNames[2]; //full name + String[][] names = (String[][]) allNames[2]; //full name for (String[] name1 : names) { trueTypeFonts.put(name1[3].toLowerCase(), path); } String familyName = null; - names = (String[][])allNames[1]; //family name + names = (String[][]) allNames[1]; //family name for (int k = 0; k < TTFamilyOrder.length; k += 3) { for (String[] name : names) { if (name.length == 4 && TTFamilyOrder.length > k + 2 @@ -576,7 +581,7 @@ public void register(String path, String alias) { } if (familyName != null) { String lastName = ""; - names = (String[][])allNames[2]; //full name + names = (String[][]) allNames[2]; //full name for (String[] name : names) { for (int k = 0; k < TTFamilyOrder.length; k += 3) { if (name.length == 4 && TTFamilyOrder.length > k + 2 @@ -584,8 +589,9 @@ public void register(String path, String alias) { && TTFamilyOrder[k + 1].equals(name[1]) && TTFamilyOrder[k + 2].equals(name[2])) { String fullName = name[3]; - if (fullName.equals(lastName)) + if (fullName.equals(lastName)) { continue; + } lastName = fullName; registerFamily(familyName, fullName, path); break; @@ -593,16 +599,15 @@ public void register(String path, String alias) { } } } - } - else if (path.toLowerCase().endsWith(".ttc")) { - if (alias != null) + } else if (path.toLowerCase().endsWith(".ttc")) { + if (alias != null) { System.err.println("class FontFactory: You can't define an alias for a true type collection."); + } String[] names = BaseFont.enumerateTTCNames(path); for (int i = 0; i < names.length; i++) { register(path + "," + i); } - } - else if (path.toLowerCase().endsWith(".afm") || path.toLowerCase().endsWith(".pfm")) { + } else if (path.toLowerCase().endsWith(".afm") || path.toLowerCase().endsWith(".pfm")) { BaseFont bf = BaseFont.createFont(path, BaseFont.CP1252, false); String fullName = bf.getFullFontName()[0][3].toLowerCase(); String familyName = bf.getFamilyFontName()[0][3].toLowerCase(); @@ -611,24 +616,26 @@ else if (path.toLowerCase().endsWith(".afm") || path.toLowerCase().endsWith(".pf trueTypeFonts.put(psName, path); trueTypeFonts.put(fullName, path); } - } - catch(DocumentException | IOException de) { + } catch (DocumentException | IOException de) { // this shouldn't happen throw new ExceptionConverter(de); } } - /** Register all the fonts in a directory. + /** + * Register all the fonts in a directory. + * * @param dir the directory * @return the number of fonts registered - */ + */ public int registerDirectory(String dir) { return registerDirectory(dir, false); } /** * Register all the fonts in a directory and possibly its subdirectories. - * @param dir the directory + * + * @param dir the directory * @param scanSubdirectories recursively scan subdirectories if true * @return the number of fonts registered * @since 2.1.2 @@ -637,11 +644,13 @@ public int registerDirectory(String dir, boolean scanSubdirectories) { int count = 0; try { File file = new File(dir); - if (!file.exists() || !file.isDirectory()) + if (!file.exists() || !file.isDirectory()) { return 0; + } String[] files = file.list(); - if (files == null) + if (files == null) { return 0; + } for (String file1 : files) { try { file = new File(dir, file1); @@ -671,17 +680,17 @@ public int registerDirectory(String dir, boolean scanSubdirectories) { //empty on purpose } } - } - catch (Exception e) { + } catch (Exception e) { //empty on purpose } return count; } - /** Register fonts in some probable directories. It usually works in Windows, - * Linux and Solaris. + /** + * Register fonts in some probable directories. It usually works in Windows, Linux and Solaris. + * * @return the number of fonts registered - */ + */ public int registerDirectories() { int count = 0; count += registerDirectory("c:/windows/fonts"); @@ -698,41 +707,43 @@ public int registerDirectories() { return count; } -/** - * Gets a set of registered fontnames. - * @return a set of registered fonts - */ + /** + * Gets a set of registered fontnames. + * + * @return a set of registered fonts + */ -public Set getRegisteredFonts() { + public Set getRegisteredFonts() { return Utilities.getKeySet(trueTypeFonts); } - -/** - * Gets a set of registered fontnames. - * @return a set of registered font families - */ -public Set getRegisteredFamilies() { + /** + * Gets a set of registered fontnames. + * + * @return a set of registered font families + */ + + public Set getRegisteredFamilies() { return Utilities.getKeySet(fontFamilies); } - -/** - * Checks if a certain font is registered. - * - * @param fontName the name of the font that has to be checked. - * @return true if the font is found - */ + + /** + * Checks if a certain font is registered. + * + * @param fontName the name of the font that has to be checked. + * @return true if the font is found + */ public boolean isRegistered(String fontName) { return trueTypeFonts.containsKey(fontName.toLowerCase()); } - -/** - * Get a registered font path. - * - * @param fontname the name of the font to get. - * @return the font path if found or null - */ + + /** + * Get a registered font path. + * + * @param fontname the name of the font to get. + * @return the font path if found or null + */ public Object getFontPath(String fontname) { - return trueTypeFonts.get(fontname.toLowerCase()); - } + return trueTypeFonts.get(fontname.toLowerCase()); + } } diff --git a/openpdf/src/main/java/com/lowagie/text/FontProvider.java b/openpdf/src/main/java/com/lowagie/text/FontProvider.java index e6422b388..c5474f9d9 100644 --- a/openpdf/src/main/java/com/lowagie/text/FontProvider.java +++ b/openpdf/src/main/java/com/lowagie/text/FontProvider.java @@ -50,12 +50,12 @@ import java.awt.Color; /** - * These two methods are used by FactoryProperties (for HTMLWorker). - * It's implemented by FontFactoryImp. + * These two methods are used by FactoryProperties (for HTMLWorker). It's implemented by FontFactoryImp. * * @since iText 5.0 */ public interface FontProvider { + /** * Checks if a certain font is registered. * diff --git a/openpdf/src/main/java/com/lowagie/text/Footnote.java b/openpdf/src/main/java/com/lowagie/text/Footnote.java index 63d4458fe..22c7ab42b 100644 --- a/openpdf/src/main/java/com/lowagie/text/Footnote.java +++ b/openpdf/src/main/java/com/lowagie/text/Footnote.java @@ -51,91 +51,91 @@ import java.util.HashMap; /** - * A Footnote is a little note that can be added at the bottom of a - * page. + * A Footnote is a little note that can be added at the bottom of a page. * * @see Element * @see Anchor */ public class Footnote extends Phrase { - // membervariables - /** - * This is a possible footnote type. - */ - public static final int TEXT = 0; - - /** - * This is a possible attribute. - */ - public static final String CONTENT = "content"; - - /** - * This is a possible attribute. - */ - public static final String FONT = "font"; - - /** - * This is a possible attribute. - */ - public static final String DESTINATION = "destination"; - - /** - * This is a possible attribute. - */ - public static final String PAGE = "page"; - - /** - * This is a possible attribute. - */ - public static final String NAMED = "named"; - - /** - * This is the type of footnote. - */ - protected int footnoteType; - - /** - * This is the title of the Annotation. - */ - protected HashMap footnoteAttributes = new HashMap(); - - public Footnote() { - super(); - } - - public Footnote(Chunk chunk) { - super(chunk); - } - - public Footnote(String text, Font font) { - super(text, font); - } - - public Footnote(String text) { - super(text); - } - - // implementation of the Element-methods - /** - * Gets the type of the text element. - *

    - * - * @return a type - */ - @Override - public int type() { - return Element.FOOTNOTE; - } - - /** - * Returns the type of this Annotation. - *

    - * - * @return a type - */ - public int footnoteType() { - return footnoteType; - } + // membervariables + /** + * This is a possible footnote type. + */ + public static final int TEXT = 0; + + /** + * This is a possible attribute. + */ + public static final String CONTENT = "content"; + + /** + * This is a possible attribute. + */ + public static final String FONT = "font"; + + /** + * This is a possible attribute. + */ + public static final String DESTINATION = "destination"; + + /** + * This is a possible attribute. + */ + public static final String PAGE = "page"; + + /** + * This is a possible attribute. + */ + public static final String NAMED = "named"; + + /** + * This is the type of footnote. + */ + protected int footnoteType; + + /** + * This is the title of the Annotation. + */ + protected HashMap footnoteAttributes = new HashMap(); + + public Footnote() { + super(); + } + + public Footnote(Chunk chunk) { + super(chunk); + } + + public Footnote(String text, Font font) { + super(text, font); + } + + public Footnote(String text) { + super(text); + } + + // implementation of the Element-methods + + /** + * Gets the type of the text element. + *

    + * + * @return a type + */ + @Override + public int type() { + return Element.FOOTNOTE; + } + + /** + * Returns the type of this Annotation. + *

    + * + * @return a type + */ + public int footnoteType() { + return footnoteType; + } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/GreekList.java b/openpdf/src/main/java/com/lowagie/text/GreekList.java index 3bd8b155e..840a36632 100644 --- a/openpdf/src/main/java/com/lowagie/text/GreekList.java +++ b/openpdf/src/main/java/com/lowagie/text/GreekList.java @@ -49,16 +49,15 @@ import com.lowagie.text.factories.GreekAlphabetFactory; /** - * * A special-version of LIST which use greek-letters. - * + * * @see com.lowagie.text.List */ public class GreekList extends List { // constructors - + /** * Initialization */ @@ -69,8 +68,8 @@ public GreekList() { /** * Initialization - * - * @param symbolIndent indent + * + * @param symbolIndent indent */ public GreekList(int symbolIndent) { super(true, symbolIndent); @@ -78,9 +77,10 @@ public GreekList(int symbolIndent) { } /** - * Initialization - * @param greeklower greek-char in lowercase - * @param symbolIndent indent + * Initialization + * + * @param greeklower greek-char in lowercase + * @param symbolIndent indent */ public GreekList(boolean greeklower, int symbolIndent) { super(true, symbolIndent); @@ -89,7 +89,7 @@ public GreekList(boolean greeklower, int symbolIndent) { } // helper method - + /** * change the font to SYMBOL */ @@ -99,11 +99,11 @@ protected void setGreekFont() { } // overridden methods - + /** * Adds an Element to the List. * - * @param o the element to add. + * @param o the element to add. * @return true if adding the element succeeded */ @Override @@ -129,7 +129,7 @@ public boolean add(Element o) { /** * Adds a String to the List. * - * @param s the string to add. + * @param s the string to add. * @return true if adding the string succeeded */ @Override diff --git a/openpdf/src/main/java/com/lowagie/text/Header.java b/openpdf/src/main/java/com/lowagie/text/Header.java index 1f70aeb71..561af0a02 100644 --- a/openpdf/src/main/java/com/lowagie/text/Header.java +++ b/openpdf/src/main/java/com/lowagie/text/Header.java @@ -50,45 +50,46 @@ package com.lowagie.text; /** - * This is an Element that contains - * some user defined meta information about the document. - *

    + * This is an Element that contains some user defined meta information about the document. + *

    * Example: * 

      * Header header = new Header("inspired by", "William Shakespeare");
  *
    * - * @see Element - * @see Meta + * @see Element + * @see Meta */ public class Header extends Meta { - + // membervariables - - /** This is the content of this chunk of text. */ + + /** + * This is the content of this chunk of text. + */ private StringBuffer name; - + // constructors - + /** * Constructs a Meta. * - * @param name the name of the meta-information - * @param content the content + * @param name the name of the meta-information + * @param content the content */ - + public Header(String name, String content) { super(Element.HEADER, content); this.name = new StringBuffer(name); } - + // methods to retrieve information /** * Returns the name of the meta information. * - * @return a String + * @return a String */ public String getName() { return name.toString(); diff --git a/openpdf/src/main/java/com/lowagie/text/HeaderFooter.java b/openpdf/src/main/java/com/lowagie/text/HeaderFooter.java index 3b7709124..f5620cbbd 100644 --- a/openpdf/src/main/java/com/lowagie/text/HeaderFooter.java +++ b/openpdf/src/main/java/com/lowagie/text/HeaderFooter.java @@ -61,8 +61,7 @@ * 
      * HeaderFooter header = new HeaderFooter(new Phrase("This is a header."), false);
  * HeaderFooter footer = new HeaderFooter(new Phrase("This is page "), new Phrase("."));
- * document.setHeader(header);
- * document.setFooter(footer);
+ * document.setHeader(header); document.setFooter(footer);
  *
    * * diff --git a/openpdf/src/main/java/com/lowagie/text/Image.java b/openpdf/src/main/java/com/lowagie/text/Image.java index d9a4f8339..2636c5aad 100644 --- a/openpdf/src/main/java/com/lowagie/text/Image.java +++ b/openpdf/src/main/java/com/lowagie/text/Image.java @@ -49,17 +49,7 @@ package com.lowagie.text; -import java.awt.Graphics2D; -import java.awt.color.ICC_Profile; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Constructor; -import java.net.MalformedURLException; -import java.net.URL; import com.lowagie.text.error_messages.MessageLocalization; - -import com.lowagie.text.ExceptionConverter; import com.lowagie.text.pdf.PRIndirectReference; import com.lowagie.text.pdf.PdfArray; import com.lowagie.text.pdf.PdfContentByte; @@ -74,11 +64,19 @@ import com.lowagie.text.pdf.PdfTemplate; import com.lowagie.text.pdf.PdfWriter; import com.lowagie.text.pdf.codec.CCITTG4Encoder; +import java.awt.Graphics2D; +import java.awt.color.ICC_Profile; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Constructor; +import java.net.MalformedURLException; +import java.net.URL; /** - * An Image is the representation of a graphic element (JPEG, PNG - * or GIF) that has to be inserted into the document + * An Image is the representation of a graphic element (JPEG, PNG or GIF) that has to be inserted into the + * document * * @see Element * @see Rectangle @@ -88,145 +86,318 @@ public abstract class Image extends Rectangle { // static final membervariables - /** this is a kind of image alignment. */ + /** + * this is a kind of image alignment. + */ public static final int DEFAULT = 0; - /** this is a kind of image alignment. */ + /** + * this is a kind of image alignment. + */ public static final int RIGHT = 2; - /** this is a kind of image alignment. */ + /** + * this is a kind of image alignment. + */ public static final int LEFT = 0; - /** this is a kind of image alignment. */ + /** + * this is a kind of image alignment. + */ public static final int MIDDLE = 1; - /** this is a kind of image alignment. */ + /** + * this is a kind of image alignment. + */ public static final int TEXTWRAP = 4; - /** this is a kind of image alignment. */ + /** + * this is a kind of image alignment. + */ public static final int UNDERLYING = 8; - /** This represents a coordinate in the transformation matrix. */ + /** + * This represents a coordinate in the transformation matrix. + */ public static final int AX = 0; - /** This represents a coordinate in the transformation matrix. */ + /** + * This represents a coordinate in the transformation matrix. + */ public static final int AY = 1; - /** This represents a coordinate in the transformation matrix. */ + /** + * This represents a coordinate in the transformation matrix. + */ public static final int BX = 2; - /** This represents a coordinate in the transformation matrix. */ + /** + * This represents a coordinate in the transformation matrix. + */ public static final int BY = 3; - /** This represents a coordinate in the transformation matrix. */ + /** + * This represents a coordinate in the transformation matrix. + */ public static final int CX = 4; - /** This represents a coordinate in the transformation matrix. */ + /** + * This represents a coordinate in the transformation matrix. + */ public static final int CY = 5; - /** This represents a coordinate in the transformation matrix. */ + /** + * This represents a coordinate in the transformation matrix. + */ public static final int DX = 6; - /** This represents a coordinate in the transformation matrix. */ + /** + * This represents a coordinate in the transformation matrix. + */ public static final int DY = 7; - /** type of image */ + /** + * type of image + */ public static final int ORIGINAL_NONE = 0; - /** type of image */ + /** + * type of image + */ public static final int ORIGINAL_JPEG = 1; - /** type of image */ + /** + * type of image + */ public static final int ORIGINAL_PNG = 2; - /** type of image */ + /** + * type of image + */ public static final int ORIGINAL_GIF = 3; - /** type of image */ + /** + * type of image + */ public static final int ORIGINAL_BMP = 4; - /** type of image */ + /** + * type of image + */ public static final int ORIGINAL_TIFF = 5; - /** type of image */ + /** + * type of image + */ public static final int ORIGINAL_WMF = 6; - /** type of image */ + /** + * type of image + */ public static final int ORIGINAL_PS = 7; - /** type of image */ + /** + * type of image + */ public static final int ORIGINAL_JPEG2000 = 8; /** * type of image - * @since 2.1.5 + * + * @since 2.1.5 */ public static final int ORIGINAL_JBIG2 = 9; // member variables - - /** The image type. */ + public static final int[] PNGID = {137, 80, 78, 71, 13, 10, 26, 10}; + /** + * a static that is used for attributing a unique id to each image. + */ + static long serialId = 0; + /** + * The image type. + */ protected int type; - - /** The URL of the image. */ + /** + * The URL of the image. + */ protected URL url; - /** * The raw data of the image. */ protected byte[] rawData; - - /** The bits per component of the raw image. It also flags a CCITT image. */ + /** + * The bits per component of the raw image. It also flags a CCITT image. + */ protected int bpc = 1; - /** * The template to be treated as an image. */ protected PdfTemplate[] template = new PdfTemplate[1]; - - /** The alignment of the Image. */ + /** + * The alignment of the Image. + */ protected int alignment; - - /** Text that can be shown instead of the image. */ + /** + * Text that can be shown instead of the image. + */ protected String alt; - - /** This is the absolute X-position of the image. */ + /** + * This is the absolute X-position of the image. + */ protected float absoluteX = Float.NaN; - - /** This is the absolute Y-position of the image. */ + /** + * This is the absolute Y-position of the image. + */ protected float absoluteY = Float.NaN; - - /** This is the width of the image without rotation. */ + /** + * This is the width of the image without rotation. + */ protected float plainWidth; - - /** This is the width of the image without rotation. */ + /** + * This is the width of the image without rotation. + */ protected float plainHeight; - - /** This is the scaled width of the image taking rotation into account. */ + /** + * This is the scaled width of the image taking rotation into account. + */ protected float scaledWidth; - - /** This is the original height of the image taking rotation into account. */ + /** + * This is the original height of the image taking rotation into account. + */ protected float scaledHeight; - /** * The compression level of the content streams. - * @since 2.1.3 + * + * @since 2.1.3 */ protected int compressionLevel = PdfStream.DEFAULT_COMPRESSION; - /** an iText attributed unique id for this image. */ + // image from file or URL + /** + * an iText attributed unique id for this image. + */ protected Long mySerialId = getSerialId(); + /** + * This is the rotation of the image in radians. + */ + protected float rotationRadians; + /** + * the indentation to the left. + */ + protected float indentationLeft = 0; + /** + * the indentation to the right. + */ + protected float indentationRight = 0; + /** + * The spacing before the image. + */ + protected float spacingBefore; + /** + * The spacing after the image. + */ + protected float spacingAfter; + /** + * if the annotation is not null the image will be clickable. + */ + protected Annotation annotation = null; + /** + * Optional Content layer to which we want this Image to belong. + */ + protected PdfOCG layer; + /** + * Holds value of property interpolation. + */ + protected boolean interpolation; - public static final int[] PNGID = {137, 80, 78, 71, 13, 10, 26, 10}; + // images from a PdfTemplate + /** + * Holds value of property originalType. + */ + protected int originalType = ORIGINAL_NONE; + // images from a java.awt.Image + /** + * Holds value of property originalData. + */ + protected byte[] originalData; + /** + * Holds value of property deflated. + */ + protected boolean deflated = false; + /** + * Holds value of property dpiX. + */ + protected int dpiX = 0; + /** + * Holds value of property dpiY. + */ + protected int dpiY = 0; - // image from file or URL + // image from indirect reference + /** + * this is the colorspace of a jpeg-image. + */ + protected int colorspace = -1; + /** + * Image color inversion + */ + protected boolean invert = false; + /** + * ICC Profile attached + */ + protected ICC_Profile profile = null; + /** + * Is this image a mask? + */ + protected boolean mask = false; + + // copy constructor + /** + * The image that serves as a mask for this image. + */ + protected Image imageMask; + /** + * this is the transparency information of the raw image + */ + protected int[] transparency; + + // implementation of the Element interface + /** + * Holds value of property directReference. An image is embedded into a PDF as an Image XObject. This object is + * referenced by a PdfIndirectReference object. + */ + private PdfIndirectReference directReference; + /** + * Holds value of property initialRotation. + */ + private float initialRotation; + + // checking the type of Image + /** + * Holds value of property widthPercentage. + */ + private float widthPercentage = 100; + /** + * Holds value of property XYRatio. + */ + private float XYRatio = 0; + /** + * a dictionary with additional information + */ + private PdfDictionary additional = null; + + // getters and setters + /** + * Holds value of property smask. + */ + private boolean smask; /** * Constructs an Image -object, using an url . * - * @param url - * the URL where the image can be found. + * @param url the URL where the image can be found. */ public Image(URL url) { super(0, 0); @@ -235,6 +406,58 @@ public Image(URL url) { rotationRadians = 0; } + /** + * Constructs an Image -object, using an url . + * + * @param image another Image object. + */ + protected Image(Image image) { + super(image); + this.type = image.type; + this.url = image.url; + this.rawData = image.rawData; + this.bpc = image.bpc; + this.template = image.template; + this.alignment = image.alignment; + this.alt = image.alt; + this.absoluteX = image.absoluteX; + this.absoluteY = image.absoluteY; + this.plainWidth = image.plainWidth; + this.plainHeight = image.plainHeight; + this.scaledWidth = image.scaledWidth; + this.scaledHeight = image.scaledHeight; + this.mySerialId = image.mySerialId; + + this.directReference = image.directReference; + + this.rotationRadians = image.rotationRadians; + this.initialRotation = image.initialRotation; + this.indentationLeft = image.indentationLeft; + this.indentationRight = image.indentationRight; + this.spacingBefore = image.spacingBefore; + this.spacingAfter = image.spacingAfter; + + this.widthPercentage = image.widthPercentage; + this.annotation = image.annotation; + this.layer = image.layer; + this.interpolation = image.interpolation; + this.originalType = image.originalType; + this.originalData = image.originalData; + this.deflated = image.deflated; + this.dpiX = image.dpiX; + this.dpiY = image.dpiY; + this.XYRatio = image.XYRatio; + + this.colorspace = image.colorspace; + this.invert = image.invert; + this.profile = image.profile; + this.additional = image.additional; + this.mask = image.mask; + this.imageMask = image.imageMask; + this.smask = image.smask; + this.transparency = image.transparency; + } + /** * Gets an instance of an Image. * @@ -296,8 +519,8 @@ public static Image getInstance(URL url) throws BadElementException, img = ImageLoader.getTiffImage(url); return img; } - if ( c1 == 0x97 && c2 == 'J' && c3 == 'B' && c4 == '2' && - c5 == '\r' && c6 == '\n' && c7 == 0x1a && c8 == '\n' ) { + if (c1 == 0x97 && c2 == 'J' && c3 == 'B' && c4 == '2' && + c5 == '\r' && c6 == '\n' && c7 == 0x1a && c8 == '\n') { throw new IOException(url.toString() + " is not a recognized imageformat. JBIG2 support has been removed."); } @@ -319,9 +542,9 @@ public static Image getInstance(URL url) throws BadElementException, * * @param filename a filename * @return an object of type Gif,Jpeg or - * Png - * @throws BadElementException if error in creating {@link ImgWMF#ImgWMF(byte[]) ImgWMF} - * @throws IOException if image is not recognized + * Png + * @throws BadElementException if error in creating {@link ImgWMF#ImgWMF(byte[]) ImgWMF} + * @throws IOException if image is not recognized */ public static Image getInstance(String filename) throws BadElementException, IOException { @@ -333,8 +556,8 @@ public static Image getInstance(String filename) * * @param imgb raw image date * @return an Image object - * @throws BadElementException if error in creating {@link ImgWMF#ImgWMF(byte[]) ImgWMF} - * @throws IOException if image is not recognized + * @throws BadElementException if error in creating {@link ImgWMF#ImgWMF(byte[]) ImgWMF} + * @throws IOException if image is not recognized */ public static Image getInstance(byte[] imgb) throws BadElementException, IOException { @@ -374,18 +597,20 @@ public static Image getInstance(byte[] imgb) throws BadElementException, || (c1 == 'I' && c2 == 'I' && c3 == 42 && c4 == 0)) { return ImageLoader.getTiffImage(imgb); } - if ( c1 == 0x97 && c2 == 'J' && c3 == 'B' && c4 == '2' ) { + if (c1 == 0x97 && c2 == 'J' && c3 == 'B' && c4 == '2') { is = new java.io.ByteArrayInputStream(imgb); is.skip(4); int c5 = is.read(); int c6 = is.read(); int c7 = is.read(); int c8 = is.read(); - if ( c5 == '\r' && c6 == '\n' && c7 == 0x1a && c8 == '\n' ) { - throw new IOException(MessageLocalization.getComposedMessage("the.byte.array.is.not.a.recognized.imageformat")); + if (c5 == '\r' && c6 == '\n' && c7 == 0x1a && c8 == '\n') { + throw new IOException( + MessageLocalization.getComposedMessage("the.byte.array.is.not.a.recognized.imageformat")); } } - throw new IOException(MessageLocalization.getComposedMessage("the.byte.array.is.not.a.recognized.imageformat")); + throw new IOException( + MessageLocalization.getComposedMessage("the.byte.array.is.not.a.recognized.imageformat")); } finally { if (is != null) { is.close(); @@ -396,22 +621,16 @@ public static Image getInstance(byte[] imgb) throws BadElementException, /** * Gets an instance of an Image in raw mode. * - * @param width - * the width of the image in pixels - * @param height - * the height of the image in pixels - * @param components - * 1,3 or 4 for GrayScale, RGB and CMYK - * @param data - * the image data - * @param bpc - * bits per component + * @param width the width of the image in pixels + * @param height the height of the image in pixels + * @param components 1,3 or 4 for GrayScale, RGB and CMYK + * @param data the image data + * @param bpc bits per component * @return an object of type ImgRaw - * @throws BadElementException - * on error + * @throws BadElementException on error */ public static Image getInstance(int width, int height, int components, - int bpc, byte[] data) throws BadElementException { + int bpc, byte[] data) throws BadElementException { return Image.getInstance(width, height, components, bpc, data, null); } @@ -431,28 +650,17 @@ public static Image getInstance(int width, int height, byte[] data, byte[] globa } /** - * Creates an Image with CCITT G3 or G4 compression. It assumes that the - * data bytes are already compressed. - * - * @param width - * the exact width of the image - * @param height - * the exact height of the image - * @param reverseBits - * reverses the bits in data. Bit 0 is swapped - * with bit 7 and so on - * @param typeCCITT - * the type of compression in data. It can be - * CCITTG4, CCITTG31D, CCITTG32D - * @param parameters - * parameters associated with this stream. Possible values are - * CCITT_BLACKIS1, CCITT_ENCODEDBYTEALIGN, CCITT_ENDOFLINE and - * CCITT_ENDOFBLOCK or a combination of them - * @param data - * the image data + * Creates an Image with CCITT G3 or G4 compression. It assumes that the data bytes are already compressed. + * + * @param width the exact width of the image + * @param height the exact height of the image + * @param reverseBits reverses the bits in data. Bit 0 is swapped with bit 7 and so on + * @param typeCCITT the type of compression in data. It can be CCITTG4, CCITTG31D, CCITTG32D + * @param parameters parameters associated with this stream. Possible values are CCITT_BLACKIS1, + * CCITT_ENCODEDBYTEALIGN, CCITT_ENDOFLINE and CCITT_ENDOFBLOCK or a combination of them + * @param data the image data * @return an Image object - * @throws BadElementException - * on error + * @throws BadElementException on error */ public static Image getInstance(int width, int height, boolean reverseBits, int typeCCITT, int parameters, byte[] data) @@ -462,37 +670,26 @@ public static Image getInstance(int width, int height, boolean reverseBits, } /** - * Creates an Image with CCITT G3 or G4 compression. It assumes that the - * data bytes are already compressed. - * - * @param width - * the exact width of the image - * @param height - * the exact height of the image - * @param reverseBits - * reverses the bits in data. Bit 0 is swapped - * with bit 7 and so on - * @param typeCCITT - * the type of compression in data. It can be - * CCITTG4, CCITTG31D, CCITTG32D - * @param parameters - * parameters associated with this stream. Possible values are - * CCITT_BLACKIS1, CCITT_ENCODEDBYTEALIGN, CCITT_ENDOFLINE and - * CCITT_ENDOFBLOCK or a combination of them - * @param data - * the image data - * @param transparency - * transparency information in the Mask format of the image - * dictionary + * Creates an Image with CCITT G3 or G4 compression. It assumes that the data bytes are already compressed. + * + * @param width the exact width of the image + * @param height the exact height of the image + * @param reverseBits reverses the bits in data. Bit 0 is swapped with bit 7 and so on + * @param typeCCITT the type of compression in data. It can be CCITTG4, CCITTG31D, CCITTG32D + * @param parameters parameters associated with this stream. Possible values are CCITT_BLACKIS1, + * CCITT_ENCODEDBYTEALIGN, CCITT_ENDOFLINE and CCITT_ENDOFBLOCK or a combination of them + * @param data the image data + * @param transparency transparency information in the Mask format of the image dictionary * @return an Image object - * @throws BadElementException - * on error + * @throws BadElementException on error */ public static Image getInstance(int width, int height, boolean reverseBits, - int typeCCITT, int parameters, byte[] data, int[] transparency) + int typeCCITT, int parameters, byte[] data, int[] transparency) throws BadElementException { - if (transparency != null && transparency.length != 2) - throw new BadElementException(MessageLocalization.getComposedMessage("transparency.length.must.be.equal.to.2.with.ccitt.images")); + if (transparency != null && transparency.length != 2) { + throw new BadElementException( + MessageLocalization.getComposedMessage("transparency.length.must.be.equal.to.2.with.ccitt.images")); + } Image img = new ImgCCITT(width, height, reverseBits, typeCCITT, parameters, data); img.transparency = transparency; @@ -502,28 +699,22 @@ public static Image getInstance(int width, int height, boolean reverseBits, /** * Gets an instance of an Image in raw mode. * - * @param width - * the width of the image in pixels - * @param height - * the height of the image in pixels - * @param components - * 1,3 or 4 for GrayScale, RGB and CMYK - * @param data - * the image data - * @param bpc - * bits per component - * @param transparency - * transparency information in the Mask format of the image - * dictionary + * @param width the width of the image in pixels + * @param height the height of the image in pixels + * @param components 1,3 or 4 for GrayScale, RGB and CMYK + * @param data the image data + * @param bpc bits per component + * @param transparency transparency information in the Mask format of the image dictionary * @return an object of type ImgRaw - * @throws BadElementException - * on error + * @throws BadElementException on error */ public static Image getInstance(int width, int height, int components, - int bpc, byte[] data, int[] transparency) + int bpc, byte[] data, int[] transparency) throws BadElementException { - if (transparency != null && transparency.length != components * 2) - throw new BadElementException(MessageLocalization.getComposedMessage("transparency.length.must.be.equal.to.componentes.2")); + if (transparency != null && transparency.length != components * 2) { + throw new BadElementException( + MessageLocalization.getComposedMessage("transparency.length.must.be.equal.to.componentes.2")); + } if (components == 1 && bpc == 1) { byte[] g4 = CCITTG4Encoder.compress(data, width, height); return Image.getInstance(width, height, false, Image.CCITTG4, @@ -534,8 +725,6 @@ public static Image getInstance(int width, int height, int components, return img; } - // images from a PdfTemplate - /** * gets an instance of an Image * @@ -548,31 +737,23 @@ public static Image getInstance(PdfTemplate template) return new ImgTemplate(template); } - // images from a java.awt.Image - /** * Gets an instance of an Image from a java.awt.Image. * - * @param image - * the java.awt.Image to convert - * @param color - * if different from null the transparency pixels - * are replaced by this color - * @param forceBW - * if true the image is treated as black and white + * @param image the java.awt.Image to convert + * @param color if different from null the transparency pixels are replaced by this color + * @param forceBW if true the image is treated as black and white * @return an object of type ImgRaw - * @throws BadElementException - * on error - * @throws IOException - * on error + * @throws BadElementException on error + * @throws IOException on error */ public static Image getInstance(java.awt.Image image, java.awt.Color color, boolean forceBW) throws BadElementException, IOException { - if(image instanceof BufferedImage){ + if (image instanceof BufferedImage) { BufferedImage bi = (BufferedImage) image; - if(bi.getType() == BufferedImage.TYPE_BYTE_BINARY && bi.getColorModel().getNumColorComponents() <= 2) { - forceBW=true; + if (bi.getType() == BufferedImage.TYPE_BYTE_BINARY && bi.getColorModel().getNumColorComponents() <= 2) { + forceBW = true; } } @@ -581,7 +762,8 @@ public static Image getInstance(java.awt.Image image, java.awt.Color color, try { pg.grabPixels(); } catch (InterruptedException e) { - throw new IOException(MessageLocalization.getComposedMessage("java.awt.image.interrupted.waiting.for.pixels")); + throw new IOException( + MessageLocalization.getComposedMessage("java.awt.image.interrupted.waiting.for.pixels")); } if ((pg.getStatus() & java.awt.image.ImageObserver.ABORT) != 0) { throw new IOException(MessageLocalization.getComposedMessage("java.awt.image.fetch.aborted.or.errored")); @@ -608,11 +790,13 @@ public static Image getInstance(java.awt.Image image, java.awt.Color color, for (int j = 0; j < size; j++) { int alpha = (pixels[j] >> 24) & 0xff; if (alpha < 250) { - if (transColor == 1) + if (transColor == 1) { currByte |= cbyte; + } } else { - if ((pixels[j] & 0x888) != 0) + if ((pixels[j] & 0x888) != 0) { currByte |= cbyte; + } } cbyte >>= 1; if (cbyte == 0 || wMarker + 1 >= w) { @@ -621,8 +805,9 @@ public static Image getInstance(java.awt.Image image, java.awt.Color color, currByte = 0; } ++wMarker; - if (wMarker >= w) + if (wMarker >= w) { wMarker = 0; + } } } else { for (int j = 0; j < size; j++) { @@ -634,8 +819,9 @@ public static Image getInstance(java.awt.Image image, java.awt.Color color, transparency[0] = transparency[1] = ((pixels[j] & 0x888) != 0) ? 0xff : 0; } } - if ((pixels[j] & 0x888) != 0) + if ((pixels[j] & 0x888) != 0) { currByte |= cbyte; + } cbyte >>= 1; if (cbyte == 0 || wMarker + 1 >= w) { pixelsByte[index++] = (byte) currByte; @@ -643,8 +829,9 @@ public static Image getInstance(java.awt.Image image, java.awt.Color color, currByte = 0; } ++wMarker; - if (wMarker >= w) + if (wMarker >= w) { wMarker = 0; + } } } return Image.getInstance(w, h, 1, 1, pixelsByte, transparency); @@ -709,10 +896,11 @@ public static Image getInstance(java.awt.Image image, java.awt.Color color, pixelsByte[index++] = (byte) ((pixels[j] >> 8) & 0xff); pixelsByte[index++] = (byte) ((pixels[j]) & 0xff); } - if (shades) + if (shades) { transparency = null; - else + } else { smask = null; + } } Image img = Image.getInstance(w, h, 3, 8, pixelsByte, transparency); if (smask != null) { @@ -731,16 +919,11 @@ public static Image getInstance(java.awt.Image image, java.awt.Color color, /** * Gets an instance of an Image from a java.awt.Image. * - * @param image - * the java.awt.Image to convert - * @param color - * if different from null the transparency pixels - * are replaced by this color + * @param image the java.awt.Image to convert + * @param color if different from null the transparency pixels are replaced by this color * @return an object of type ImgRaw - * @throws BadElementException - * on error - * @throws IOException - * on error + * @throws BadElementException on error + * @throws IOException on error */ public static Image getInstance(java.awt.Image image, java.awt.Color color) throws BadElementException, IOException { @@ -748,8 +931,7 @@ public static Image getInstance(java.awt.Image image, java.awt.Color color) } /** - * Gets an instance of a Image from a java.awt.Image. - * The image is added as a JPEG with a user defined quality. + * Gets an instance of a Image from a java.awt.Image. The image is added as a JPEG with a user defined quality. * * @param writer the PdfWriter object to which the image will be added * @param awtImage the java.awt.Image to convert @@ -758,13 +940,15 @@ public static Image getInstance(java.awt.Image image, java.awt.Color color) * @throws BadElementException on error * @throws IOException on error */ - public static Image getInstance(PdfWriter writer, java.awt.Image awtImage, float quality) throws BadElementException, IOException { + public static Image getInstance(PdfWriter writer, java.awt.Image awtImage, float quality) + throws BadElementException, IOException { return getInstance(new PdfContentByte(writer), awtImage, quality); } + // width and height + /** - * Gets an instance of a Image from a java.awt.Image. - * The image is added as a JPEG with a user defined quality. + * Gets an instance of a Image from a java.awt.Image. The image is added as a JPEG with a user defined quality. * * @param cb the PdfContentByte object to which the image will be added * @param awtImage the java.awt.Image to convert @@ -773,72 +957,50 @@ public static Image getInstance(PdfWriter writer, java.awt.Image awtImage, float * @throws BadElementException on error * @throws IOException on error */ - public static Image getInstance(PdfContentByte cb, java.awt.Image awtImage, float quality) throws BadElementException, IOException { - java.awt.image.PixelGrabber pg = new java.awt.image.PixelGrabber(awtImage, - 0, 0, -1, -1, true); - try { - pg.grabPixels(); - } catch (InterruptedException e) { - throw new IOException(MessageLocalization.getComposedMessage("java.awt.image.interrupted.waiting.for.pixels")); - } - if ((pg.getStatus() & java.awt.image.ImageObserver.ABORT) != 0) { - throw new IOException(MessageLocalization.getComposedMessage("java.awt.image.fetch.aborted.or.errored")); - } - int w = pg.getWidth(); - int h = pg.getHeight(); - PdfTemplate tp = cb.createTemplate(w, h); - Graphics2D g2d = tp.createGraphics(w, h, true, quality); - g2d.drawImage(awtImage, 0, 0, null); - g2d.dispose(); - return getInstance(tp); - } - - // image from indirect reference - - /** - * Holds value of property directReference. - * An image is embedded into a PDF as an Image XObject. - * This object is referenced by a PdfIndirectReference object. - */ - private PdfIndirectReference directReference; - - /** - * Getter for property directReference. - * @return Value of property directReference. - */ - public PdfIndirectReference getDirectReference() { - return this.directReference; - } - - /** - * Setter for property directReference. - * @param directReference New value of property directReference. - */ - public void setDirectReference(PdfIndirectReference directReference) { - this.directReference = directReference; + public static Image getInstance(PdfContentByte cb, java.awt.Image awtImage, float quality) + throws BadElementException, IOException { + java.awt.image.PixelGrabber pg = new java.awt.image.PixelGrabber(awtImage, + 0, 0, -1, -1, true); + try { + pg.grabPixels(); + } catch (InterruptedException e) { + throw new IOException( + MessageLocalization.getComposedMessage("java.awt.image.interrupted.waiting.for.pixels")); + } + if ((pg.getStatus() & java.awt.image.ImageObserver.ABORT) != 0) { + throw new IOException(MessageLocalization.getComposedMessage("java.awt.image.fetch.aborted.or.errored")); + } + int w = pg.getWidth(); + int h = pg.getHeight(); + PdfTemplate tp = cb.createTemplate(w, h); + Graphics2D g2d = tp.createGraphics(w, h, true, quality); + g2d.drawImage(awtImage, 0, 0, null); + g2d.dispose(); + return getInstance(tp); } /** * Reuses an existing image. + * * @param ref the reference to the image dictionary - * @throws BadElementException on error * @return the image + * @throws BadElementException on error */ public static Image getInstance(PRIndirectReference ref) throws BadElementException { - PdfDictionary dic = (PdfDictionary)PdfReader.getPdfObjectRelease(ref); - int width = ((PdfNumber)PdfReader.getPdfObjectRelease(dic.get(PdfName.WIDTH))).intValue(); - int height = ((PdfNumber)PdfReader.getPdfObjectRelease(dic.get(PdfName.HEIGHT))).intValue(); + PdfDictionary dic = (PdfDictionary) PdfReader.getPdfObjectRelease(ref); + int width = ((PdfNumber) PdfReader.getPdfObjectRelease(dic.get(PdfName.WIDTH))).intValue(); + int height = ((PdfNumber) PdfReader.getPdfObjectRelease(dic.get(PdfName.HEIGHT))).intValue(); Image imask = null; PdfObject obj = dic.get(PdfName.SMASK); if (obj != null && obj.isIndirect()) { - imask = getInstance((PRIndirectReference)obj); - } - else { + imask = getInstance((PRIndirectReference) obj); + } else { obj = dic.get(PdfName.MASK); if (obj != null && obj.isIndirect()) { PdfObject obj2 = PdfReader.getPdfObjectRelease(obj); - if (obj2 instanceof PdfDictionary) - imask = getInstance((PRIndirectReference)obj); + if (obj2 instanceof PdfDictionary) { + imask = getInstance((PRIndirectReference) obj); + } } } Image img = new ImgRaw(width, height, 1, 1, null); @@ -847,71 +1009,16 @@ public static Image getInstance(PRIndirectReference ref) throws BadElementExcept return img; } - // copy constructor - - /** - * Constructs an Image -object, using an url . - * - * @param image - * another Image object. - */ - protected Image(Image image) { - super(image); - this.type = image.type; - this.url = image.url; - this.rawData = image.rawData; - this.bpc = image.bpc; - this.template = image.template; - this.alignment = image.alignment; - this.alt = image.alt; - this.absoluteX = image.absoluteX; - this.absoluteY = image.absoluteY; - this.plainWidth = image.plainWidth; - this.plainHeight = image.plainHeight; - this.scaledWidth = image.scaledWidth; - this.scaledHeight = image.scaledHeight; - this.mySerialId = image.mySerialId; - - this.directReference = image.directReference; - - this.rotationRadians = image.rotationRadians; - this.initialRotation = image.initialRotation; - this.indentationLeft = image.indentationLeft; - this.indentationRight = image.indentationRight; - this.spacingBefore = image.spacingBefore; - this.spacingAfter = image.spacingAfter; - - this.widthPercentage = image.widthPercentage; - this.annotation = image.annotation; - this.layer = image.layer; - this.interpolation = image.interpolation; - this.originalType = image.originalType; - this.originalData = image.originalData; - this.deflated = image.deflated; - this.dpiX = image.dpiX; - this.dpiY = image.dpiY; - this.XYRatio = image.XYRatio; - - this.colorspace = image.colorspace; - this.invert = image.invert; - this.profile = image.profile; - this.additional = image.additional; - this.mask = image.mask; - this.imageMask = image.imageMask; - this.smask = image.smask; - this.transparency = image.transparency; - } - /** * gets an instance of an Image * - * @param image - * an Image object + * @param image an Image object * @return a new Image object */ public static Image getInstance(Image image) { - if (image == null) + if (image == null) { return null; + } try { Class cs = image.getClass(); Constructor constructor = cs.getDeclaredConstructor(Image.class); @@ -921,7 +1028,33 @@ public static Image getInstance(Image image) { } } - // implementation of the Element interface + /** + * Creates a new serial id. + * + * @return a new serial id + */ + static protected synchronized Long getSerialId() { + ++serialId; + return serialId; + } + + /** + * Getter for property directReference. + * + * @return Value of property directReference. + */ + public PdfIndirectReference getDirectReference() { + return this.directReference; + } + + /** + * Setter for property directReference. + * + * @param directReference New value of property directReference. + */ + public void setDirectReference(PdfIndirectReference directReference) { + this.directReference = directReference; + } /** * Returns the type. @@ -935,17 +1068,14 @@ public int type() { /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return true; } - // checking the type of Image - /** - * Returns true if the image is a Jpeg - * -object. + * Returns true if the image is a Jpeg -object. * * @return a boolean */ @@ -955,8 +1085,7 @@ public boolean isJpeg() { } /** - * Returns true if the image is a ImgRaw - * -object. + * Returns true if the image is a ImgRaw -object. * * @return a boolean */ @@ -966,8 +1095,7 @@ public boolean isImgRaw() { } /** - * Returns true if the image is an ImgTemplate - * -object. + * Returns true if the image is an ImgTemplate -object. * * @return a boolean */ @@ -976,11 +1104,10 @@ public boolean isImgTemplate() { return type == IMGTEMPLATE; } - // getters and setters + // serial stamping /** - * Gets the String -representation of the reference to the - * image. + * Gets the String -representation of the reference to the image. * * @return a String */ @@ -992,8 +1119,7 @@ public URL getUrl() { /** * Sets the url of the image * - * @param url - * the url of the image + * @param url the url of the image */ public void setUrl(URL url) { this.url = url; @@ -1001,7 +1127,7 @@ public void setUrl(URL url) { /** * Gets the raw data for the image. - *

    + *

    * Remark: this only makes sense for Images of the type RawImage * . * @@ -1011,9 +1137,11 @@ public byte[] getRawData() { return rawData; } + // rotation, note that the superclass also has a rotation value. + /** * Gets the bpc for the image. - *

    + *

    * Remark: this only makes sense for Images of the type RawImage * . * @@ -1025,7 +1153,7 @@ public int getBpc() { /** * Gets the template to be used as an image. - *

    + *

    * Remark: this only makes sense for Images of the type ImgTemplate * . * @@ -1038,8 +1166,7 @@ public PdfTemplate getTemplateData() { /** * Sets data from a PdfTemplate * - * @param template - * the template with the content + * @param template the template with the content */ public void setTemplateData(PdfTemplate template) { this.template[0] = template; @@ -1057,8 +1184,7 @@ public int getAlignment() { /** * Sets the alignment for the image. * - * @param alignment - * the alignment + * @param alignment the alignment */ public void setAlignment(int alignment) { @@ -1078,14 +1204,15 @@ public String getAlt() { /** * Sets the alternative information for the image. * - * @param alt - * the alternative information + * @param alt the alternative information */ public void setAlt(String alt) { this.alt = alt; } + // indentations + /** * Sets the absolute position of the Image. * @@ -1099,8 +1226,7 @@ public void setAbsolutePosition(float absoluteX, float absoluteY) { } /** - * Checks if the Images has to be added at an absolute X - * position. + * Checks if the Images has to be added at an absolute X position. * * @return a boolean */ @@ -1118,8 +1244,7 @@ public float getAbsoluteX() { } /** - * Checks if the Images has to be added at an absolute - * position. + * Checks if the Images has to be added at an absolute position. * * @return a boolean */ @@ -1136,8 +1261,6 @@ public float getAbsoluteY() { return absoluteY; } - // width and height - /** * Gets the scaled width of the image. * @@ -1177,10 +1300,8 @@ public float getPlainHeight() { /** * Scale the image to an absolute width and an absolute height. * - * @param newWidth - * the new width - * @param newHeight - * the new height + * @param newWidth the new width + * @param newHeight the new height */ public void scaleAbsolute(float newWidth, float newHeight) { plainWidth = newWidth; @@ -1194,8 +1315,7 @@ public void scaleAbsolute(float newWidth, float newHeight) { /** * Scale the image to an absolute width. * - * @param newWidth - * the new width + * @param newWidth the new width */ public void scaleAbsoluteWidth(float newWidth) { plainWidth = newWidth; @@ -1208,8 +1328,7 @@ public void scaleAbsoluteWidth(float newWidth) { /** * Scale the image to an absolute height. * - * @param newHeight - * the new height + * @param newHeight the new height */ public void scaleAbsoluteHeight(float newHeight) { plainHeight = newHeight; @@ -1219,11 +1338,12 @@ public void scaleAbsoluteHeight(float newHeight) { setWidthPercentage(0); } + // widthpercentage (for the moment only used in ColumnText) + /** * Scale the image to a certain percentage. * - * @param percent - * the scaling percentage + * @param percent the scaling percentage */ public void scalePercent(float percent) { scalePercent(percent, percent); @@ -1232,10 +1352,8 @@ public void scalePercent(float percent) { /** * Scale the width and height of an image to a certain percentage. * - * @param percentX - * the scaling percentage of the width - * @param percentY - * the scaling percentage of the height + * @param percentX the scaling percentage of the width + * @param percentY the scaling percentage of the height */ public void scalePercent(float percentX, float percentY) { plainWidth = (getWidth() * percentX) / 100f; @@ -1249,10 +1367,8 @@ public void scalePercent(float percentX, float percentY) { /** * Scales the image so that it fits a certain width and height. * - * @param fitWidth - * the width to fit - * @param fitHeight - * the height to fit + * @param fitWidth the width to fit + * @param fitHeight the height to fit */ public void scaleToFit(float fitWidth, float fitHeight) { scalePercent(100); @@ -1262,6 +1378,8 @@ public void scaleToFit(float fitWidth, float fitHeight) { setWidthPercentage(0); } + // annotation + /** * Returns the transformation matrix of the image. * @@ -1299,21 +1417,6 @@ public float[] matrix() { return matrix; } - // serial stamping - - /** a static that is used for attributing a unique id to each image. */ - static long serialId = 0; - - /** - * Creates a new serial id. - * - * @return a new serial id - */ - static protected synchronized Long getSerialId() { - ++serialId; - return serialId; - } - /** * Returns a serial id for the Image (reuse the same image more than once) * @@ -1323,16 +1426,9 @@ public Long getMySerialId() { return mySerialId; } - // rotation, note that the superclass also has a rotation value. - - /** This is the rotation of the image in radians. */ - protected float rotationRadians; - - /** Holds value of property initialRotation. */ - private float initialRotation; - /** * Gets the current image rotation in radians. + * * @return the current image rotation in radians */ public float getImageRotation() { @@ -1344,11 +1440,12 @@ public float getImageRotation() { return rot; } + // Optional Content + /** * Sets the rotation of the image in radians. * - * @param r - * rotation in radians + * @param r rotation in radians */ public void setRotation(float r) { float d = 2.0F * (float) Math.PI; @@ -1364,8 +1461,7 @@ public void setRotation(float r) { /** * Sets the rotation of the image in degrees. * - * @param deg - * rotation in degrees + * @param deg rotation in degrees */ public void setRotationDegrees(float deg) { float d = (float) Math.PI; @@ -1374,15 +1470,18 @@ public void setRotationDegrees(float deg) { /** * Getter for property initialRotation. + * * @return Value of property initialRotation. */ public float getInitialRotation() { return this.initialRotation; } + // interpolation + /** - * Some image formats, like TIFF may present the images rotated that have - * to be compensated. + * Some image formats, like TIFF may present the images rotated that have to be compensated. + * * @param initialRotation New value of property initialRotation. */ public void setInitialRotation(float initialRotation) { @@ -1391,20 +1490,6 @@ public void setInitialRotation(float initialRotation) { setRotation(old_rot); } - // indentations - - /** the indentation to the left. */ - protected float indentationLeft = 0; - - /** the indentation to the right. */ - protected float indentationRight = 0; - - /** The spacing before the image. */ - protected float spacingBefore; - - /** The spacing after the image. */ - protected float spacingAfter; - /** * Gets the left indentation. * @@ -1423,6 +1508,8 @@ public void setIndentationLeft(float f) { indentationLeft = f; } + // original type and data + /** * Gets the right indentation. * @@ -1453,8 +1540,7 @@ public float getSpacingBefore() { /** * Sets the spacing before this image. * - * @param spacing - * the new spacing + * @param spacing the new spacing */ public void setSpacingBefore(float spacing) { @@ -1473,20 +1559,14 @@ public float getSpacingAfter() { /** * Sets the spacing after this image. * - * @param spacing - * the new spacing + * @param spacing the new spacing */ public void setSpacingAfter(float spacing) { this.spacingAfter = spacing; } - // widthpercentage (for the moment only used in ColumnText) - - /** - * Holds value of property widthPercentage. - */ - private float widthPercentage = 100; + // the following values are only set for specific types of images. /** * Getter for property widthPercentage. @@ -1500,28 +1580,12 @@ public float getWidthPercentage() { /** * Setter for property widthPercentage. * - * @param widthPercentage - * New value of property widthPercentage. + * @param widthPercentage New value of property widthPercentage. */ public void setWidthPercentage(float widthPercentage) { this.widthPercentage = widthPercentage; } - // annotation - - /** if the annotation is not null the image will be clickable. */ - protected Annotation annotation = null; - - /** - * Sets the annotation of this Image. - * - * @param annotation - * the annotation - */ - public void setAnnotation(Annotation annotation) { - this.annotation = annotation; - } - /** * Gets the annotation. * @@ -1531,16 +1595,21 @@ public Annotation getAnnotation() { return annotation; } - // Optional Content + // DPI info - /** Optional Content layer to which we want this Image to belong. */ - protected PdfOCG layer; + /** + * Sets the annotation of this Image. + * + * @param annotation the annotation + */ + public void setAnnotation(Annotation annotation) { + this.annotation = annotation; + } /** * Gets the layer this image belongs to. * - * @return the layer this image belongs to or null for no - * layer defined + * @return the layer this image belongs to or null for no layer defined */ public PdfOCG getLayer() { return layer; @@ -1549,18 +1618,12 @@ public PdfOCG getLayer() { /** * Sets the layer this image belongs to. * - * @param layer - * the layer this image belongs to + * @param layer the layer this image belongs to */ public void setLayer(PdfOCG layer) { this.layer = layer; } - // interpolation - - /** Holds value of property interpolation. */ - protected boolean interpolation; - /** * Getter for property interpolation. * @@ -1571,29 +1634,21 @@ public boolean isInterpolation() { } /** - * Sets the image interpolation. Image interpolation attempts to produce a - * smooth transition between adjacent sample values. + * Sets the image interpolation. Image interpolation attempts to produce a smooth transition between adjacent sample + * values. * - * @param interpolation - * New value of property interpolation. + * @param interpolation New value of property interpolation. */ public void setInterpolation(boolean interpolation) { this.interpolation = interpolation; } - // original type and data - - /** Holds value of property originalType. */ - protected int originalType = ORIGINAL_NONE; - - /** Holds value of property originalData. */ - protected byte[] originalData; + // XY Ratio /** * Getter for property originalType. * * @return Value of property originalType. - * */ public int getOriginalType() { return this.originalType; @@ -1602,9 +1657,7 @@ public int getOriginalType() { /** * Setter for property originalType. * - * @param originalType - * New value of property originalType. - * + * @param originalType New value of property originalType. */ public void setOriginalType(int originalType) { this.originalType = originalType; @@ -1614,33 +1667,26 @@ public void setOriginalType(int originalType) { * Getter for property originalData. * * @return Value of property originalData. - * */ public byte[] getOriginalData() { return this.originalData; } + // color, colorspaces and transparency + /** * Setter for property originalData. * - * @param originalData - * New value of property originalData. - * + * @param originalData New value of property originalData. */ public void setOriginalData(byte[] originalData) { this.originalData = originalData; } - // the following values are only set for specific types of images. - - /** Holds value of property deflated. */ - protected boolean deflated = false; - /** * Getter for property deflated. * * @return Value of property deflated. - * */ public boolean isDeflated() { return this.deflated; @@ -1649,21 +1695,12 @@ public boolean isDeflated() { /** * Setter for property deflated. * - * @param deflated - * New value of property deflated. + * @param deflated New value of property deflated. */ public void setDeflated(boolean deflated) { this.deflated = deflated; } - // DPI info - - /** Holds value of property dpiX. */ - protected int dpiX = 0; - - /** Holds value of property dpiY. */ - protected int dpiY = 0; - /** * Gets the dots-per-inch in the X direction. Returns 0 if not available. * @@ -1685,21 +1722,14 @@ public int getDpiY() { /** * Sets the dots per inch value * - * @param dpiX - * dpi for x coordinates - * @param dpiY - * dpi for y coordinates + * @param dpiX dpi for x coordinates + * @param dpiY dpi for y coordinates */ public void setDpi(int dpiX, int dpiY) { this.dpiX = dpiX; this.dpiY = dpiY; } - // XY Ratio - - /** Holds value of property XYRatio. */ - private float XYRatio = 0; - /** * Gets the X/Y pixel dimensionless aspect ratio. * @@ -1712,21 +1742,15 @@ public float getXYRatio() { /** * Sets the X/Y pixel dimensionless aspect ratio. * - * @param XYRatio - * the X/Y pixel dimensionless aspect ratio + * @param XYRatio the X/Y pixel dimensionless aspect ratio */ public void setXYRatio(float XYRatio) { this.XYRatio = XYRatio; } - // color, colorspaces and transparency - - /** this is the colorspace of a jpeg-image. */ - protected int colorspace = -1; - /** * Gets the colorspace for the image. - *

    + *

    * Remark: this only makes sense for Images of the type Jpeg. * * @return a colorspace value @@ -1735,9 +1759,6 @@ public int getColorspace() { return colorspace; } - /** Image color inversion */ - protected boolean invert = false; - /** * Getter for the inverted value * @@ -1750,21 +1771,16 @@ public boolean isInverted() { /** * Sets inverted true or false * - * @param invert - * true or false + * @param invert true or false */ public void setInverted(boolean invert) { this.invert = invert; } - /** ICC Profile attached */ - protected ICC_Profile profile = null; - /** * Tags this image with an ICC profile. * - * @param profile - * the profile + * @param profile the profile */ public void tagICC(ICC_Profile profile) { this.profile = profile; @@ -1788,9 +1804,6 @@ public ICC_Profile getICCProfile() { return profile; } - /** a dictionary with additional information */ - private PdfDictionary additional = null; - /** * Getter for the dictionary with additional information. * @@ -1803,8 +1816,7 @@ public PdfDictionary getAdditional() { /** * Sets the /Colorspace key. * - * @param additional - * a PdfDictionary with additional information. + * @param additional a PdfDictionary with additional information. */ public void setAdditional(PdfDictionary additional) { this.additional = additional; @@ -1814,16 +1826,18 @@ public void setAdditional(PdfDictionary additional) { * Replaces CalRGB and CalGray colorspaces with DeviceRGB and DeviceGray. */ public void simplifyColorspace() { - if (additional == null) + if (additional == null) { return; + } PdfArray value = additional.getAsArray(PdfName.COLORSPACE); - if (value == null) + if (value == null) { return; + } PdfObject cs = simplifyColorspace(value); PdfObject newValue; - if (cs.isName()) + if (cs.isName()) { newValue = cs; - else { + } else { newValue = value; PdfName first = value.getAsName(0); if (PdfName.INDEXED.equals(first)) { @@ -1842,26 +1856,19 @@ public void simplifyColorspace() { * Gets a PDF Name from an array or returns the object that was passed. */ private PdfObject simplifyColorspace(PdfArray obj) { - if (obj == null) + if (obj == null) { return obj; + } PdfName first = obj.getAsName(0); - if (PdfName.CALGRAY.equals(first)) + if (PdfName.CALGRAY.equals(first)) { return PdfName.DEVICEGRAY; - else if (PdfName.CALRGB.equals(first)) + } else if (PdfName.CALRGB.equals(first)) { return PdfName.DEVICERGB; - else + } else { return obj; + } } - /** Is this image a mask? */ - protected boolean mask = false; - - /** The image that serves as a mask for this image. */ - protected Image imageMask; - - /** Holds value of property smask. */ - private boolean smask; - /** * Returns true if this Image is a mask. * @@ -1874,25 +1881,25 @@ public boolean isMask() { /** * Make this Image a mask. * - * @throws DocumentException - * if this Image can not be a mask + * @throws DocumentException if this Image can not be a mask */ public void makeMask() throws DocumentException { - if (!isMaskCandidate()) + if (!isMaskCandidate()) { throw new DocumentException(MessageLocalization.getComposedMessage("this.image.can.not.be.an.image.mask")); + } mask = true; } /** - * Returns true if this Image has the - * requisites to be a mask. + * Returns true if this Image has the requisites to be a mask. * * @return true if this Image can be a mask */ public boolean isMaskCandidate() { if (type == IMGRAW) { - if (bpc > 0xff) + if (bpc > 0xff) { return true; + } } return colorspace == 1; } @@ -1909,16 +1916,18 @@ public Image getImageMask() { /** * Sets the explicit masking. * - * @param mask - * the mask to be applied - * @throws DocumentException - * on error + * @param mask the mask to be applied + * @throws DocumentException on error */ public void setImageMask(Image mask) throws DocumentException { - if (this.mask) - throw new DocumentException(MessageLocalization.getComposedMessage("an.image.mask.cannot.contain.another.image.mask")); - if (!mask.mask) - throw new DocumentException(MessageLocalization.getComposedMessage("the.image.mask.is.not.a.mask.did.you.do.makemask")); + if (this.mask) { + throw new DocumentException( + MessageLocalization.getComposedMessage("an.image.mask.cannot.contain.another.image.mask")); + } + if (!mask.mask) { + throw new DocumentException( + MessageLocalization.getComposedMessage("the.image.mask.is.not.a.mask.did.you.do.makemask")); + } imageMask = mask; smask = (mask.bpc > 1 && mask.bpc <= 8); } @@ -1927,7 +1936,6 @@ public void setImageMask(Image mask) throws DocumentException { * Getter for property smask. * * @return Value of property smask. - * */ public boolean isSmask() { return this.smask; @@ -1936,18 +1944,12 @@ public boolean isSmask() { /** * Setter for property smask. * - * @param smask - * New value of property smask. + * @param smask New value of property smask. */ public void setSmask(boolean smask) { this.smask = smask; } - /** - * this is the transparency information of the raw image - */ - protected int[] transparency; - /** * Returns the transparency. * @@ -1961,8 +1963,7 @@ public int[] getTransparency() { /** * Sets the transparency values * - * @param transparency - * the transparency values + * @param transparency the transparency values */ public void setTransparency(int[] transparency) { this.transparency = transparency; @@ -1971,8 +1972,9 @@ public void setTransparency(int[] transparency) { /** * Returns the compression level used for images written as a compressed stream. + * * @return the compression level (0 = best speed, 9 = best compression, -1 is default) - * @since 2.1.3 + * @since 2.1.3 */ public int getCompressionLevel() { return compressionLevel; @@ -1980,13 +1982,15 @@ public int getCompressionLevel() { /** * Sets the compression level to be used if the image is written as a compressed stream. + * * @param compressionLevel a value between 0 (best speed) and 9 (best compression) - * @since 2.1.3 + * @since 2.1.3 */ public void setCompressionLevel(int compressionLevel) { - if (compressionLevel < PdfStream.NO_COMPRESSION || compressionLevel > PdfStream.BEST_COMPRESSION) + if (compressionLevel < PdfStream.NO_COMPRESSION || compressionLevel > PdfStream.BEST_COMPRESSION) { this.compressionLevel = PdfStream.DEFAULT_COMPRESSION; - else + } else { this.compressionLevel = compressionLevel; + } } } diff --git a/openpdf/src/main/java/com/lowagie/text/ImageLoader.java b/openpdf/src/main/java/com/lowagie/text/ImageLoader.java index 9ba90db93..fd959c275 100644 --- a/openpdf/src/main/java/com/lowagie/text/ImageLoader.java +++ b/openpdf/src/main/java/com/lowagie/text/ImageLoader.java @@ -45,19 +45,19 @@ package com.lowagie.text; -import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.net.URL; +import javax.imageio.ImageIO; /** * Loads image files such as PNG, JPEG, GIF, TIFF and BMP. - * + *

    * TODO: The goal of this class is to use Java ImageIO to parse images and metadata, * and embed the image in the PDF in the best way (the compressed image format, not the raw pixels). - * - * + *

    + *

    * We don't want to maintain our own image codecs. * * @author Andreas Rosdal @@ -162,7 +162,7 @@ public static Image getBmpImage(byte[] imageData) { /** * Creates an Image from an array of tiff image bytes. - * + * * @param imageData bytes of the tiff image * @return an objet of type Image */ @@ -179,7 +179,6 @@ public static Image getTiffImage(byte[] imageData) { /** * Creates an Image from a JPEG image file in a byte array. * - * * @param imageData bytes of the image * @return an object of type Image */ diff --git a/openpdf/src/main/java/com/lowagie/text/ImgCCITT.java b/openpdf/src/main/java/com/lowagie/text/ImgCCITT.java index c428bd1cc..06fd9fb9f 100755 --- a/openpdf/src/main/java/com/lowagie/text/ImgCCITT.java +++ b/openpdf/src/main/java/com/lowagie/text/ImgCCITT.java @@ -50,16 +50,15 @@ package com.lowagie.text; -import java.net.URL; import com.lowagie.text.error_messages.MessageLocalization; +import java.net.URL; /** * CCITT Image data that has to be inserted into the document * - * @see Element - * @see Image - * - * @author Paulo Soares + * @author Paulo Soares + * @see Element + * @see Image */ public class ImgCCITT extends Image { @@ -68,26 +67,29 @@ public class ImgCCITT extends Image { super(image); } - /** Creates an Image with CCITT compression. + /** + * Creates an Image with CCITT compression. * - * @param width the exact width of the image - * @param height the exact height of the image - * @param reverseBits reverses the bits in data. - * Bit 0 is swapped with bit 7 and so on. - * @param typeCCITT the type of compression in data. It can be - * CCITTG4, CCITTG31D, CCITTG32D - * @param parameters parameters associated with this stream. Possible values are - * CCITT_BLACKIS1, CCITT_ENCODEDBYTEALIGN, CCITT_ENDOFLINE and CCITT_ENDOFBLOCK or a - * combination of them - * @param data the image data + * @param width the exact width of the image + * @param height the exact height of the image + * @param reverseBits reverses the bits in data. Bit 0 is swapped with bit 7 and so on. + * @param typeCCITT the type of compression in data. It can be CCITTG4, CCITTG31D, CCITTG32D + * @param parameters parameters associated with this stream. Possible values are CCITT_BLACKIS1, + * CCITT_ENCODEDBYTEALIGN, CCITT_ENDOFLINE and CCITT_ENDOFBLOCK or a combination of them + * @param data the image data * @throws BadElementException on error */ - public ImgCCITT(int width, int height, boolean reverseBits, int typeCCITT, int parameters, byte[] data) throws BadElementException{ - super((URL)null); - if (typeCCITT != CCITTG4 && typeCCITT != CCITTG3_1D && typeCCITT != CCITTG3_2D) - throw new BadElementException(MessageLocalization.getComposedMessage("the.ccitt.compression.type.must.be.ccittg4.ccittg3.1d.or.ccittg3.2d")); - if (reverseBits) throw new BadElementException("Reversing bits is not supported"); + public ImgCCITT(int width, int height, boolean reverseBits, int typeCCITT, int parameters, byte[] data) + throws BadElementException { + super((URL) null); + if (typeCCITT != CCITTG4 && typeCCITT != CCITTG3_1D && typeCCITT != CCITTG3_2D) { + throw new BadElementException(MessageLocalization.getComposedMessage( + "the.ccitt.compression.type.must.be.ccittg4.ccittg3.1d.or.ccittg3.2d")); + } + if (reverseBits) { + throw new BadElementException("Reversing bits is not supported"); + } type = IMGRAW; scaledHeight = height; setTop(scaledHeight); diff --git a/openpdf/src/main/java/com/lowagie/text/ImgJBIG2.java b/openpdf/src/main/java/com/lowagie/text/ImgJBIG2.java index 527ddf609..4d7fcf05d 100644 --- a/openpdf/src/main/java/com/lowagie/text/ImgJBIG2.java +++ b/openpdf/src/main/java/com/lowagie/text/ImgJBIG2.java @@ -54,18 +54,24 @@ /** * Support for JBIG2 images. + * * @since 2.1.5 */ public class ImgJBIG2 extends Image { - - /** JBIG2 globals */ - private byte[] global; - /** A unique hash */ - private byte[] globalHash; - + + /** + * JBIG2 globals + */ + private byte[] global; + /** + * A unique hash + */ + private byte[] globalHash; + /** * Copy contstructor. - * @param image another Image + * + * @param image another Image */ ImgJBIG2(Image image) { super(image); @@ -80,10 +86,11 @@ public ImgJBIG2() { /** * Actual constructor for ImgJBIG2 images. - * @param width the width of the image - * @param height the height of the image - * @param data the raw image data - * @param globals JBIG2 globals + * + * @param width the width of the image + * @param height the height of the image + * @param data the raw image data + * @param globals JBIG2 globals */ public ImgJBIG2(int width, int height, byte[] data, byte[] globals) { super((URL) null); @@ -98,7 +105,7 @@ public ImgJBIG2(int width, int height, byte[] data, byte[] globals) { rawData = data; plainWidth = getWidth(); plainHeight = getHeight(); - if ( globals != null ) { + if (globals != null) { this.global = globals; MessageDigest md; try { @@ -108,21 +115,23 @@ public ImgJBIG2(int width, int height, byte[] data, byte[] globals) { } catch (Exception e) { //ignore } - + } } - + /** * Getter for the JBIG2 global data. - * @return an array of bytes + * + * @return an array of bytes */ public byte[] getGlobalBytes() { return this.global; } - + /** * Getter for the unique hash. - * @return an array of bytes + * + * @return an array of bytes */ public byte[] getGlobalHash() { return this.globalHash; diff --git a/openpdf/src/main/java/com/lowagie/text/ImgRaw.java b/openpdf/src/main/java/com/lowagie/text/ImgRaw.java index 97c55316b..69188288d 100644 --- a/openpdf/src/main/java/com/lowagie/text/ImgRaw.java +++ b/openpdf/src/main/java/com/lowagie/text/ImgRaw.java @@ -50,16 +50,15 @@ package com.lowagie.text; -import java.net.URL; import com.lowagie.text.error_messages.MessageLocalization; +import java.net.URL; /** * Raw Image data that has to be inserted into the document * - * @see Element - * @see Image - * - * @author Paulo Soares + * @author Paulo Soares + * @see Element + * @see Image */ public class ImgRaw extends Image { @@ -68,27 +67,31 @@ public class ImgRaw extends Image { super(image); } -/** Creates an Image in raw mode. - * - * @param width the exact width of the image - * @param height the exact height of the image - * @param components 1,3 or 4 for GrayScale, RGB and CMYK - * @param bpc bits per component. Must be 1,2,4 or 8 - * @param data the image data - * @throws BadElementException on error - */ - - public ImgRaw(int width, int height, int components, int bpc, byte[] data) throws BadElementException{ - super((URL)null); + /** + * Creates an Image in raw mode. + * + * @param width the exact width of the image + * @param height the exact height of the image + * @param components 1,3 or 4 for GrayScale, RGB and CMYK + * @param bpc bits per component. Must be 1,2,4 or 8 + * @param data the image data + * @throws BadElementException on error + */ + + public ImgRaw(int width, int height, int components, int bpc, byte[] data) throws BadElementException { + super((URL) null); type = IMGRAW; scaledHeight = height; setTop(scaledHeight); scaledWidth = width; setRight(scaledWidth); - if (components != 1 && components != 3 && components != 4) + if (components != 1 && components != 3 && components != 4) { throw new BadElementException(MessageLocalization.getComposedMessage("components.must.be.1.3.or.4")); - if (bpc != 1 && bpc != 2 && bpc != 4 && bpc != 8) - throw new BadElementException(MessageLocalization.getComposedMessage("bits.per.component.must.be.1.2.4.or.8")); + } + if (bpc != 1 && bpc != 2 && bpc != 4 && bpc != 8) { + throw new BadElementException( + MessageLocalization.getComposedMessage("bits.per.component.must.be.1.2.4.or.8")); + } colorspace = components; this.bpc = bpc; rawData = data; diff --git a/openpdf/src/main/java/com/lowagie/text/ImgTemplate.java b/openpdf/src/main/java/com/lowagie/text/ImgTemplate.java index 3a1c82842..0a2533a30 100644 --- a/openpdf/src/main/java/com/lowagie/text/ImgTemplate.java +++ b/openpdf/src/main/java/com/lowagie/text/ImgTemplate.java @@ -49,37 +49,39 @@ package com.lowagie.text; -import java.net.URL; import com.lowagie.text.error_messages.MessageLocalization; - import com.lowagie.text.pdf.PdfTemplate; +import java.net.URL; /** * PdfTemplate that has to be inserted into the document * - * @see Element - * @see Image - * - * @author Paulo Soares + * @author Paulo Soares + * @see Element + * @see Image */ public class ImgTemplate extends Image { - + ImgTemplate(Image image) { super(image); } - - /** Creates an Image from a PdfTemplate. + + /** + * Creates an Image from a PdfTemplate. * * @param template the PdfTemplate * @throws BadElementException on error */ - public ImgTemplate(PdfTemplate template) throws BadElementException{ - super((URL)null); - if (template == null) + public ImgTemplate(PdfTemplate template) throws BadElementException { + super((URL) null); + if (template == null) { throw new BadElementException(MessageLocalization.getComposedMessage("the.template.can.not.be.null")); - if (template.getType() == PdfTemplate.TYPE_PATTERN) - throw new BadElementException(MessageLocalization.getComposedMessage("a.pattern.can.not.be.used.as.a.template.to.create.an.image")); + } + if (template.getType() == PdfTemplate.TYPE_PATTERN) { + throw new BadElementException(MessageLocalization.getComposedMessage( + "a.pattern.can.not.be.used.as.a.template.to.create.an.image")); + } type = IMGTEMPLATE; scaledHeight = template.getHeight(); setTop(scaledHeight); @@ -89,5 +91,5 @@ public ImgTemplate(PdfTemplate template) throws BadElementException{ plainWidth = getWidth(); plainHeight = getHeight(); } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/ImgWMF.java b/openpdf/src/main/java/com/lowagie/text/ImgWMF.java index 0a0090eb1..96ea3debe 100755 --- a/openpdf/src/main/java/com/lowagie/text/ImgWMF.java +++ b/openpdf/src/main/java/com/lowagie/text/ImgWMF.java @@ -50,96 +50,95 @@ package com.lowagie.text; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; import com.lowagie.text.error_messages.MessageLocalization; - import com.lowagie.text.pdf.PdfTemplate; import com.lowagie.text.pdf.codec.wmf.InputMeta; import com.lowagie.text.pdf.codec.wmf.MetaDo; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; /** - * An ImgWMF is the representation of a windows metafile - * that has to be inserted into the document + * An ImgWMF is the representation of a windows metafile that has to be inserted into the document * - * @see Element - * @see Image + * @see Element + * @see Image */ public class ImgWMF extends Image { - + // Constructors - + ImgWMF(Image image) { super(image); } - + /** * Constructs an ImgWMF-object, using an url. * * @param url the URL where the image can be found * @throws BadElementException on error - * @throws IOException on error + * @throws IOException on error */ - + public ImgWMF(URL url) throws BadElementException, IOException { super(url); processParameters(); } - + /** * Constructs an ImgWMF-object, using a filename. * * @param filename a String-representation of the file that contains the image. - * @throws BadElementException on error + * @throws BadElementException on error * @throws MalformedURLException on error - * @throws IOException on error + * @throws IOException on error */ - + public ImgWMF(String filename) throws BadElementException, IOException { this(Utilities.toURL(filename)); } - + /** * Constructs an ImgWMF-object from memory. * * @param img the memory image * @throws BadElementException on error - * @throws IOException on error + * @throws IOException on error */ - + public ImgWMF(byte[] img) throws BadElementException, IOException { - super((URL)null); + super((URL) null); rawData = img; originalData = img; processParameters(); } - -/** - * This method checks if the image is a valid WMF and processes some parameters. - * @throws BadElementException - * @throws IOException - */ - + + /** + * This method checks if the image is a valid WMF and processes some parameters. + * + * @throws BadElementException + * @throws IOException + */ + private void processParameters() throws BadElementException, IOException { type = IMGTEMPLATE; originalType = ORIGINAL_WMF; InputStream is = null; try { String errorID; - if (rawData == null){ + if (rawData == null) { is = url.openStream(); errorID = url.toString(); - } - else{ + } else { is = new java.io.ByteArrayInputStream(rawData); errorID = "Byte array"; } InputMeta in = new InputMeta(is); - if (in.readInt() != 0x9AC6CDD7) { - throw new BadElementException(MessageLocalization.getComposedMessage("1.is.not.a.valid.placeable.windows.metafile", errorID)); + if (in.readInt() != 0x9AC6CDD7) { + throw new BadElementException( + MessageLocalization.getComposedMessage("1.is.not.a.valid.placeable.windows.metafile", errorID)); } in.readWord(); int left = in.readShort(); @@ -149,12 +148,11 @@ private void processParameters() throws BadElementException, IOException { int inch = in.readWord(); dpiX = 72; dpiY = 72; - scaledHeight = (float)(bottom - top) / inch * 72f; + scaledHeight = (float) (bottom - top) / inch * 72f; setTop(scaledHeight); - scaledWidth = (float)(right - left) / inch * 72f; + scaledWidth = (float) (right - left) / inch * 72f; setRight(scaledWidth); - } - finally { + } finally { if (is != null) { is.close(); } @@ -162,28 +160,28 @@ private void processParameters() throws BadElementException, IOException { plainHeight = getHeight(); } } - - /** Reads the WMF into a template. + + /** + * Reads the WMF into a template. + * * @param template the template to read to - * @throws IOException on error + * @throws IOException on error * @throws DocumentException on error - */ + */ public void readWMF(PdfTemplate template) throws IOException, DocumentException { setTemplateData(template); template.setWidth(getWidth()); template.setHeight(getHeight()); InputStream is = null; try { - if (rawData == null){ + if (rawData == null) { is = url.openStream(); - } - else{ + } else { is = new java.io.ByteArrayInputStream(rawData); } MetaDo meta = new MetaDo(is, template); meta.readAll(); - } - finally { + } finally { if (is != null) { is.close(); } diff --git a/openpdf/src/main/java/com/lowagie/text/Jpeg.java b/openpdf/src/main/java/com/lowagie/text/Jpeg.java index 3517f8957..b26c88afc 100644 --- a/openpdf/src/main/java/com/lowagie/text/Jpeg.java +++ b/openpdf/src/main/java/com/lowagie/text/Jpeg.java @@ -49,62 +49,80 @@ package com.lowagie.text; +import com.lowagie.text.error_messages.MessageLocalization; import java.awt.color.ICC_Profile; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.nio.charset.StandardCharsets; -import com.lowagie.text.error_messages.MessageLocalization; - /** - * An Jpeg is the representation of a graphic element (JPEG) - * that has to be inserted into the document + * An Jpeg is the representation of a graphic element (JPEG) that has to be inserted into the document * - * @see Element - * @see Image + * @see Element + * @see Image */ public class Jpeg extends Image { - + // public static final membervariables - - /** This is a type of marker. */ + + /** + * This is a type of marker. + */ public static final int NOT_A_MARKER = -1; - - /** This is a type of marker. */ + + /** + * This is a type of marker. + */ public static final int VALID_MARKER = 0; - - /** Acceptable Jpeg markers. */ + + /** + * Acceptable Jpeg markers. + */ public static final int[] VALID_MARKERS = {0xC0, 0xC1, 0xC2}; - - /** This is a type of marker. */ + + /** + * This is a type of marker. + */ public static final int UNSUPPORTED_MARKER = 1; - - /** Unsupported Jpeg markers. */ + + /** + * Unsupported Jpeg markers. + */ public static final int[] UNSUPPORTED_MARKERS = {0xC3, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCD, 0xCE, 0xCF}; - - /** This is a type of marker. */ + + /** + * This is a type of marker. + */ public static final int NOPARAM_MARKER = 2; - - /** Jpeg markers without additional parameters. */ + + /** + * Jpeg markers without additional parameters. + */ public static final int[] NOPARAM_MARKERS = {0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0x01}; - - /** Marker value */ + + /** + * Marker value + */ public static final int M_APP0 = 0xE0; - /** Marker value */ + /** + * Marker value + */ public static final int M_APP2 = 0xE2; - /** Marker value */ + /** + * Marker value + */ public static final int M_APPE = 0xEE; /** * sequence that is used in all Jpeg files */ public static final byte[] JFIF_ID = {0x4A, 0x46, 0x49, 0x46, 0x00}; - + private byte[][] icc; // Constructors - + Jpeg(Image image) { super(image); } @@ -114,7 +132,7 @@ public class Jpeg extends Image { * * @param url the URL where the image can be found * @throws BadElementException on error - * @throws IOException on error + * @throws IOException on error */ public Jpeg(URL url) throws BadElementException, IOException { super(url); @@ -126,7 +144,7 @@ public Jpeg(URL url) throws BadElementException, IOException { * * @param img the memory image * @throws BadElementException on error - * @throws IOException on error + * @throws IOException on error */ public Jpeg(byte[] img) throws BadElementException, IOException { super((URL) null); @@ -142,14 +160,14 @@ public Jpeg(byte[] img) throws BadElementException, IOException { * @param width the width you want the image to have * @param height the height you want the image to have * @throws BadElementException on error - * @throws IOException on error + * @throws IOException on error */ public Jpeg(byte[] img, float width, float height) throws BadElementException, IOException { this(img); scaledWidth = width; scaledHeight = height; } - + // private static methods /** @@ -187,12 +205,12 @@ private static int marker(int marker) { } return NOT_A_MARKER; } - + // private methods - + /** * This method checks if the image is a valid JPEG and processes some parameters. - * + *

    * TODO: Use Apache Commons Imaging to parse these parameters instead. * * @throws BadElementException @@ -204,23 +222,24 @@ private void processParameters() throws BadElementException, IOException { InputStream is = null; try { String errorID; - if (rawData == null){ + if (rawData == null) { is = url.openStream(); errorID = url.toString(); - } - else{ + } else { is = new java.io.ByteArrayInputStream(rawData); errorID = "Byte array"; } - if (is.read() != 0xFF || is.read() != 0xD8) { - throw new BadElementException(MessageLocalization.getComposedMessage("1.is.not.a.valid.jpeg.file", errorID)); + if (is.read() != 0xFF || is.read() != 0xD8) { + throw new BadElementException( + MessageLocalization.getComposedMessage("1.is.not.a.valid.jpeg.file", errorID)); } boolean firstPass = true; int len; while (true) { int v = is.read(); - if (v < 0) + if (v < 0) { throw new IOException(MessageLocalization.getComposedMessage("premature.eof.while.reading.jpg")); + } if (v == 0xFF) { int marker = is.read(); if (firstPass && marker == M_APP0) { @@ -232,8 +251,10 @@ private void processParameters() throws BadElementException, IOException { } byte[] bcomp = new byte[JFIF_ID.length]; int r = is.read(bcomp); - if (r != bcomp.length) - throw new BadElementException(MessageLocalization.getComposedMessage("1.corrupted.jfif.marker", errorID)); + if (r != bcomp.length) { + throw new BadElementException( + MessageLocalization.getComposedMessage("1.corrupted.jfif.marker", errorID)); + } boolean found = true; for (int k = 0; k < bcomp.length; ++k) { if (bcomp[k] != JFIF_ID[k]) { @@ -252,10 +273,9 @@ private void processParameters() throws BadElementException, IOException { if (units == 1) { dpiX = dx; dpiY = dy; - } - else if (units == 2) { - dpiX = (int)(dx * 2.54f + 0.5f); - dpiY = (int)(dy * 2.54f + 0.5f); + } else if (units == 2) { + dpiX = (int) (dx * 2.54f + 0.5f); + dpiY = (int) (dy * 2.54f + 0.5f); } Utilities.skip(is, len - 2 - bcomp.length - 7); continue; @@ -264,7 +284,7 @@ else if (units == 2) { len = getShort(is) - 2; byte[] byteappe = new byte[len]; for (int k = 0; k < len; ++k) { - byteappe[k] = (byte)is.read(); + byteappe[k] = (byte) is.read(); } if (byteappe.length >= 12) { String appe = new String(byteappe, 0, 5, StandardCharsets.ISO_8859_1); @@ -278,7 +298,7 @@ else if (units == 2) { len = getShort(is) - 2; byte[] byteapp2 = new byte[len]; for (int k = 0; k < len; ++k) { - byteapp2[k] = (byte)is.read(); + byteapp2[k] = (byte) is.read(); } if (byteapp2.length >= 14) { String app2 = new String(byteapp2, 0, 11, StandardCharsets.ISO_8859_1); @@ -286,12 +306,15 @@ else if (units == 2) { int order = byteapp2[12] & 0xff; int count = byteapp2[13] & 0xff; // some jpeg producers don't know how to count to 1 - if (order < 1) + if (order < 1) { order = 1; - if (count < 1) + } + if (count < 1) { count = 1; - if (icc == null) + } + if (icc == null) { icc = new byte[count][]; + } icc[order - 1] = byteapp2; } } @@ -302,7 +325,9 @@ else if (units == 2) { if (markertype == VALID_MARKER) { Utilities.skip(is, 2); if (is.read() != 0x08) { - throw new BadElementException(MessageLocalization.getComposedMessage("1.must.have.8.bits.per.component", errorID)); + throw new BadElementException( + MessageLocalization.getComposedMessage("1.must.have.8.bits.per.component", + errorID)); } scaledHeight = getShort(is); setTop(scaledHeight); @@ -311,17 +336,16 @@ else if (units == 2) { colorspace = is.read(); bpc = 8; break; - } - else if (markertype == UNSUPPORTED_MARKER) { - throw new BadElementException(MessageLocalization.getComposedMessage("1.unsupported.jpeg.marker.2", errorID, String.valueOf(marker))); - } - else if (markertype != NOPARAM_MARKER) { + } else if (markertype == UNSUPPORTED_MARKER) { + throw new BadElementException( + MessageLocalization.getComposedMessage("1.unsupported.jpeg.marker.2", errorID, + String.valueOf(marker))); + } else if (markertype != NOPARAM_MARKER) { Utilities.skip(is, getShort(is) - 2); } } } - } - finally { + } finally { if (is != null) { is.close(); } @@ -346,8 +370,7 @@ else if (markertype != NOPARAM_MARKER) { try { ICC_Profile icc_prof = ICC_Profile.getInstance(ficc); tagICC(icc_prof); - } - catch(IllegalArgumentException e) { + } catch (IllegalArgumentException e) { // ignore ICC profile if it's invalid. } icc = null; diff --git a/openpdf/src/main/java/com/lowagie/text/Jpeg2000.java b/openpdf/src/main/java/com/lowagie/text/Jpeg2000.java index 28fb0812b..22c06210a 100644 --- a/openpdf/src/main/java/com/lowagie/text/Jpeg2000.java +++ b/openpdf/src/main/java/com/lowagie/text/Jpeg2000.java @@ -49,22 +49,21 @@ package com.lowagie.text; +import com.lowagie.text.error_messages.MessageLocalization; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import com.lowagie.text.error_messages.MessageLocalization; /** - * An Jpeg2000 is the representation of a graphic element (JPEG) - * that has to be inserted into the document + * An Jpeg2000 is the representation of a graphic element (JPEG) that has to be inserted into the document * * @see Element * @see Image */ public class Jpeg2000 extends Image { - + // public static final membervariables - + public static final int JP2_JP = 0x6a502020; public static final int JP2_IHDR = 0x69686472; public static final int JPIP_JPIP = 0x6a706970; @@ -81,9 +80,9 @@ public class Jpeg2000 extends Image { InputStream inp; int boxLength; int boxType; - + // Constructors - + Jpeg2000(Image image) { super(image); } @@ -93,7 +92,7 @@ public class Jpeg2000 extends Image { * * @param url the URL where the image can be found * @throws BadElementException on error - * @throws IOException on error + * @throws IOException on error */ public Jpeg2000(URL url) throws BadElementException, IOException { super(url); @@ -108,7 +107,7 @@ public Jpeg2000(URL url) throws BadElementException, IOException { * @throws IOException on error */ public Jpeg2000(byte[] img) throws BadElementException, IOException { - super((URL)null); + super((URL) null); rawData = img; originalData = img; processParameters(); @@ -120,15 +119,15 @@ public Jpeg2000(byte[] img) throws BadElementException, IOException { * @param img the memory image. * @param width the width you want the image to have * @param height the height you want the image to have - * @throws BadElementException on error - * @throws IOException on error + * @throws BadElementException on error + * @throws IOException on error */ public Jpeg2000(byte[] img, float width, float height) throws BadElementException, IOException { this(img); scaledWidth = width; scaledHeight = height; } - + private int cio_read(int n) throws IOException { int v = 0; for (int i = n - 1; i >= 0; i--) { @@ -136,25 +135,27 @@ private int cio_read(int n) throws IOException { } return v; } - + public void jp2_read_boxhdr() throws IOException { boxLength = cio_read(4); boxType = cio_read(4); if (boxLength == 1) { if (cio_read(4) != 0) { - throw new IOException(MessageLocalization.getComposedMessage("cannot.handle.box.sizes.higher.than.2.32")); + throw new IOException( + MessageLocalization.getComposedMessage("cannot.handle.box.sizes.higher.than.2.32")); } boxLength = cio_read(4); - if (boxLength == 0) + if (boxLength == 0) { throw new IOException(MessageLocalization.getComposedMessage("unsupported.box.size.eq.eq.0")); - } - else if (boxLength == 0) { + } + } else if (boxLength == 0) { throw new IOException(MessageLocalization.getComposedMessage("unsupported.box.size.eq.eq.0")); } } - + /** * This method checks if the image is a valid JPEG and processes some parameters. + * * @throws IOException on error */ private void processParameters() throws IOException { @@ -163,11 +164,10 @@ private void processParameters() throws IOException { inp = null; try { String errorID; - if (rawData == null){ + if (rawData == null) { inp = url.openStream(); errorID = url.toString(); - } - else{ + } else { inp = new java.io.ByteArrayInputStream(rawData); errorID = "Byte array"; } @@ -195,7 +195,7 @@ private void processParameters() throws IOException { Utilities.skip(inp, boxLength - 8); jp2_read_boxhdr(); } - } while(JP2_JP2H != boxType); + } while (JP2_JP2H != boxType); jp2_read_boxhdr(); if (JP2_IHDR != boxType) { throw new IOException(MessageLocalization.getComposedMessage("expected.ihdr.marker")); @@ -205,8 +205,7 @@ private void processParameters() throws IOException { scaledWidth = cio_read(4); setRight(scaledWidth); bpc = -1; - } - else if (boxLength == 0xff4fff51) { + } else if (boxLength == 0xff4fff51) { Utilities.skip(inp, 4); int x1 = cio_read(4); int y1 = cio_read(4); @@ -219,14 +218,15 @@ else if (boxLength == 0xff4fff51) { setTop(scaledHeight); scaledWidth = x1 - x0; setRight(scaledWidth); - } - else { + } else { throw new IOException(MessageLocalization.getComposedMessage("not.a.valid.jpeg2000.file")); } - } - finally { + } finally { if (inp != null) { - try{inp.close();}catch(Exception e){} + try { + inp.close(); + } catch (Exception e) { + } inp = null; } } diff --git a/openpdf/src/main/java/com/lowagie/text/LargeElement.java b/openpdf/src/main/java/com/lowagie/text/LargeElement.java index 1864ac465..f00f5a620 100644 --- a/openpdf/src/main/java/com/lowagie/text/LargeElement.java +++ b/openpdf/src/main/java/com/lowagie/text/LargeElement.java @@ -50,34 +50,33 @@ package com.lowagie.text; /** - * Interface implemented by Element objects that can potentially consume - * a lot of memory. Objects implementing the LargeElement interface can - * be added to a Document more than once. If you have invoked setComplete(false), - * they will be added partially and the content that was added will be - * removed until you've invoked setComplete(true); - * @since iText 2.0.8 + * Interface implemented by Element objects that can potentially consume a lot of memory. Objects implementing the + * LargeElement interface can be added to a Document more than once. If you have invoked setComplete(false), they will + * be added partially and the content that was added will be removed until you've invoked setComplete(true); + * + * @since iText 2.0.8 */ public interface LargeElement extends Element { - - /** - * If you invoke setComplete(false), you indicate that the content - * of the object isn't complete yet; it can be added to the document - * partially, but more will follow. If you invoke setComplete(true), - * you indicate that you won't add any more data to the object. - * @since iText 2.0.8 - * @param complete false if you'll be adding more data after - * adding the object to the document. - */ - void setComplete(boolean complete); - + /** * Indicates if the element is complete or not. - * @since iText 2.0.8 - * @return indicates if the element is complete according to the user. + * + * @return indicates if the element is complete according to the user. + * @since iText 2.0.8 */ boolean isComplete(); - + + /** + * If you invoke setComplete(false), you indicate that the content of the object isn't complete yet; it can be added + * to the document partially, but more will follow. If you invoke setComplete(true), you indicate that you won't add + * any more data to the object. + * + * @param complete false if you'll be adding more data after adding the object to the document. + * @since iText 2.0.8 + */ + void setComplete(boolean complete); + /** * Flushes the content that has been added. */ diff --git a/openpdf/src/main/java/com/lowagie/text/List.java b/openpdf/src/main/java/com/lowagie/text/List.java index 79fc8e1e8..99e14c8c1 100644 --- a/openpdf/src/main/java/com/lowagie/text/List.java +++ b/openpdf/src/main/java/com/lowagie/text/List.java @@ -49,33 +49,33 @@ package com.lowagie.text; -import java.util.ArrayList; - import com.lowagie.text.factories.RomanAlphabetFactory; +import java.util.ArrayList; /** * A List contains several ListItems. - *

    + *

    * Example 1: * 

      * List list = new List(true, 20);
  * list.add(new ListItem("First line"));
- * list.add(new ListItem("The second line is longer to see what happens once the end of the line is reached. Will it start on a new line?"));
+ * list.add(new ListItem("The second line is longer to see what happens once the end of the line is reached.
+ * Will it start on a new line?"));
  * list.add(new ListItem("Third line"));
  *
    - * + *

    * The result of this code looks like this: - *

      - *
    1. - * First line - *
      2. - *
    2. - * The second line is longer to see what happens once the end of the line is reached. Will it start on a new line? - *
      3. - *
    3. - * Third line - *
      4. - *
    + *
      + *
    1. + * First line + *
      2. + *
    2. + * The second line is longer to see what happens once the end of the line is reached. Will it start on a new line? + *
      3. + *
    3. + * Third line + *
      4. + *
    * * Example 2: * 
    @@ -83,103 +83,144 @@
  * overview.add(new ListItem("This is an item"));
  * overview.add("This is another item");
  *
    - * + *

    * The result of this code looks like this: - *

      - *
    • - * This is an item - *
      • - *
    • - * This is another item - *
      • - *
    + *
      + *
    • + * This is an item + *
      • + *
    • + * This is another item + *
      • + *
    * - * @see Element - * @see ListItem + * @see Element + * @see ListItem */ public class List implements TextElementArray { - + // constants - - /** a possible value for the numbered parameter */ + + /** + * a possible value for the numbered parameter + */ public static final boolean ORDERED = true; - /** a possible value for the numbered parameter */ + /** + * a possible value for the numbered parameter + */ public static final boolean UNORDERED = false; - /** a possible value for the lettered parameter */ + /** + * a possible value for the lettered parameter + */ public static final boolean NUMERICAL = false; - /** a possible value for the lettered parameter */ + /** + * a possible value for the lettered parameter + */ public static final boolean ALPHABETICAL = true; - /** a possible value for the lettered parameter */ + /** + * a possible value for the lettered parameter + */ public static final boolean UPPERCASE = false; - /** a possible value for the lettered parameter */ + /** + * a possible value for the lettered parameter + */ public static final boolean LOWERCASE = true; - + // member variables - - /** This is the ArrayList containing the different ListItems. */ + + /** + * This is the ArrayList containing the different ListItems. + */ protected java.util.List list = new ArrayList<>(); - - /** Indicates if the list has to be numbered. */ + + /** + * Indicates if the list has to be numbered. + */ protected boolean numbered = false; - /** Indicates if the listsymbols are numerical or alphabetical. */ + /** + * Indicates if the listsymbols are numerical or alphabetical. + */ protected boolean lettered = false; - /** Indicates if the listsymbols are lowercase or uppercase. */ + /** + * Indicates if the listsymbols are lowercase or uppercase. + */ protected boolean lowercase = false; - /** Indicates if the indentation has to be set automatically. */ + /** + * Indicates if the indentation has to be set automatically. + */ protected boolean autoindent = false; - /** Indicates if the indentation of all the items has to be aligned. */ + /** + * Indicates if the indentation of all the items has to be aligned. + */ protected boolean alignindent = false; - - /** This variable indicates the first number of a numbered list. */ + + /** + * This variable indicates the first number of a numbered list. + */ protected int first = 1; - /** This is the listsymbol of a list that is not numbered. */ + /** + * This is the listsymbol of a list that is not numbered. + */ protected Chunk symbol = new Chunk("- "); /** * In case you are using numbered/lettered lists, this String is added before the number/letter. - * @since iText 2.1.1 + * + * @since iText 2.1.1 */ protected String preSymbol = ""; /** - * In case you are using numbered/lettered lists, this String is added after the number/letter. - * @since iText 2.1.1 + * In case you are using numbered/lettered lists, this String is added after the number/letter. + * + * @since iText 2.1.1 */ protected String postSymbol = ". "; - - /** The indentation of this list on the left side. */ + + /** + * The indentation of this list on the left side. + */ protected float indentationLeft = 0; - /** The indentation of this list on the right side. */ + /** + * The indentation of this list on the right side. + */ protected float indentationRight = 0; - /** The indentation of the listitems. */ + /** + * The indentation of the listitems. + */ protected float symbolIndent = 0; - + // constructors - /** Constructs a List. */ + /** + * Constructs a List. + */ public List() { this(false, false); } - + /** * Constructs a List with a specific symbol indentation. - * @param symbolIndent the symbol indentation - * @since iText 2.0.8 + * + * @param symbolIndent the symbol indentation + * @since iText 2.0.8 */ public List(float symbolIndent) { this.symbolIndent = symbolIndent; } - + /** * Constructs a List. - * @param numbered a boolean + * + * @param numbered a boolean */ public List(boolean numbered) { - this(numbered, false); + this(numbered, false); } - + /** * Constructs a List. - * @param numbered a boolean + * + * @param numbered a boolean * @param lettered has the list to be 'numbered' with letters */ public List(boolean numbered, boolean lettered) { @@ -188,25 +229,25 @@ public List(boolean numbered, boolean lettered) { this.autoindent = true; this.alignindent = true; } - + /** * Constructs a List. - *

    - * Remark: the parameter symbolIndent is important for instance when - * generating PDF-documents; it indicates the indentation of the listsymbol. - * It is not important for HTML-documents. + *

    + * Remark: the parameter symbolIndent is important for instance when generating PDF-documents; it + * indicates the indentation of the listsymbol. It is not important for HTML-documents. * - * @param numbered a boolean - * @param symbolIndent the indentation that has to be used for the listsymbol + * @param numbered a boolean + * @param symbolIndent the indentation that has to be used for the listsymbol */ public List(boolean numbered, float symbolIndent) { this(numbered, false, symbolIndent); } - + /** * Creates a list - * @param numbered has the list to be numbered? - * @param lettered has the list to be 'numbered' with letters + * + * @param numbered has the list to be numbered? + * @param lettered has the list to be 'numbered' with letters * @param symbolIndent the indentation of the symbol */ public List(boolean numbered, boolean lettered, float symbolIndent) { @@ -214,15 +255,15 @@ public List(boolean numbered, boolean lettered, float symbolIndent) { this.lettered = lettered; this.symbolIndent = symbolIndent; } - + // implementation of the Element-methods - + /** * Processes the element by adding it (or the different parts) to an * ElementListener. * - * @param listener an ElementListener - * @return true if the element was processed successfully + * @param listener an ElementListener + * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { try { @@ -230,25 +271,24 @@ public boolean process(ElementListener listener) { listener.add((Element) o); } return true; - } - catch(DocumentException de) { + } catch (DocumentException de) { return false; } } - + /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return Element.LIST; } - + /** * Gets all the chunks in this element. * - * @return an ArrayList + * @return an ArrayList */ public ArrayList getChunks() { ArrayList tmp = new ArrayList<>(); @@ -257,13 +297,13 @@ public ArrayList getChunks() { } return tmp; } - + // methods to set the membervariables - + /** * Adds an Element to the List. * - * @param o the element to add. + * @param o the element to add. * @return true if adding the element succeeded */ public boolean add(Element o) { @@ -272,14 +312,14 @@ public boolean add(Element o) { if (numbered || lettered) { Chunk chunk = new Chunk(preSymbol, symbol.getFont()); int index = first + list.size(); - if ( lettered ) + if (lettered) { chunk.append(RomanAlphabetFactory.getString(index, lowercase)); - else + } else { chunk.append(String.valueOf(index)); + } chunk.append(postSymbol); item.setListSymbol(chunk); - } - else { + } else { item.setListSymbol(symbol); } item.setIndentationLeft(symbolIndent, autoindent); @@ -292,7 +332,7 @@ public boolean add(Element o) { /** * Adds a nested List to the List. * - * @param nested the nested list to add. + * @param nested the nested list to add. * @return true if adding the nested list succeeded */ public boolean add(List nested) { @@ -304,7 +344,7 @@ public boolean add(List nested) { /** * Adds a String to the List. * - * @param s the string to add. + * @param s the string to add. * @return true if adding the string succeeded */ public boolean add(String s) { @@ -312,8 +352,10 @@ public boolean add(String s) { } // extra methods - - /** Makes sure all the items in the list have the same indentation. */ + + /** + * Makes sure all the items in the list have the same indentation. + */ public void normalizeIndentation() { float max = 0; Element o; @@ -330,112 +372,42 @@ public void normalizeIndentation() { } } } - - // setters - - /** - * @param numbered the numbered to set - */ - public void setNumbered(boolean numbered) { - this.numbered = numbered; - } - /** - * @param lettered the lettered to set - */ - public void setLettered(boolean lettered) { - this.lettered = lettered; - } - - /** - * @param uppercase the uppercase to set - */ - public void setLowercase(boolean uppercase) { - this.lowercase = uppercase; - } + // setters - /** - * @param autoindent the autoindent to set - */ - public void setAutoindent(boolean autoindent) { - this.autoindent = autoindent; - } - /** - * @param alignindent the alignindent to set - */ - public void setAlignindent(boolean alignindent) { - this.alignindent = alignindent; - } - - /** - * Sets the number that has to come first in the list. - * - * @param first a number - */ - public void setFirst(int first) { - this.first = first; - } - /** * Sets the listsymbol. * - * @param symbol a Chunk + * @param symbol a Chunk */ public void setListSymbol(Chunk symbol) { this.symbol = symbol; } - + /** * Sets the listsymbol. - *

    + *

    * This is a shortcut for setListSymbol(Chunk symbol). * - * @param symbol a String + * @param symbol a String */ public void setListSymbol(String symbol) { this.symbol = new Chunk(symbol); } - - /** - * Sets the indentation of this paragraph on the left side. - * - * @param indentation the new indentation - */ - public void setIndentationLeft(float indentation) { - this.indentationLeft = indentation; - } - - /** - * Sets the indentation of this paragraph on the right side. - * - * @param indentation the new indentation - */ - public void setIndentationRight(float indentation) { - this.indentationRight = indentation; - } - /** - * @param symbolIndent the symbolIndent to set - */ - public void setSymbolIndent(float symbolIndent) { - this.symbolIndent = symbolIndent; - } - - // methods to retrieve information - /** * Gets all the items in the list. * - * @return an ArrayList containing ListItems. + * @return an ArrayList containing ListItems. */ public java.util.List getItems() { return list; } - + /** * Gets the size of the list. * - * @return a size + * @return a size */ public int size() { return list.size(); @@ -443,7 +415,7 @@ public int size() { /** * Returns true if the list is empty. - * + * * @return true if the list is empty */ public boolean isEmpty() { @@ -453,7 +425,7 @@ public boolean isEmpty() { /** * Gets the leading of the first listitem. * - * @return a leading + * @return a leading */ public float getTotalLeading() { if (list.size() < 1) { @@ -462,60 +434,113 @@ public float getTotalLeading() { ListItem item = (ListItem) list.get(0); return item.getTotalLeading(); } - - // getters - + /** * Checks if the list is numbered. - * @return true if the list is numbered, false otherwise. + * + * @return true if the list is numbered, false otherwise. */ - + public boolean isNumbered() { return numbered; } + /** + * @param numbered the numbered to set + */ + public void setNumbered(boolean numbered) { + this.numbered = numbered; + } + /** * Checks if the list is lettered. - * @return true if the list is lettered, false otherwise. + * + * @return true if the list is lettered, false otherwise. */ public boolean isLettered() { return lettered; } + /** + * @param lettered the lettered to set + */ + public void setLettered(boolean lettered) { + this.lettered = lettered; + } + /** * Checks if the list lettering is lowercase. - * @return true if it is lowercase, false otherwise. + * + * @return true if it is lowercase, false otherwise. */ public boolean isLowercase() { return lowercase; } - + + // methods to retrieve information + + /** + * @param uppercase the uppercase to set + */ + public void setLowercase(boolean uppercase) { + this.lowercase = uppercase; + } + /** * Checks if the indentation of list items is done automatically. + * * @return the autoindent */ public boolean isAutoindent() { return autoindent; } - + + /** + * @param autoindent the autoindent to set + */ + public void setAutoindent(boolean autoindent) { + this.autoindent = autoindent; + } + /** * Checks if all the listitems should be aligned. + * * @return the alignindent */ public boolean isAlignindent() { return alignindent; } + // getters + + /** + * @param alignindent the alignindent to set + */ + public void setAlignindent(boolean alignindent) { + this.alignindent = alignindent; + } + /** * Gets the first number . + * * @return a number */ public int getFirst() { return first; } + /** + * Sets the number that has to come first in the list. + * + * @param first a number + */ + public void setFirst(int first) { + this.first = first; + } + /** * Gets the Chunk containing the symbol. + * * @return a Chunk with a symbol */ public Chunk getSymbol() { @@ -524,30 +549,59 @@ public Chunk getSymbol() { /** * Gets the indentation of this paragraph on the left side. - * @return the indentation + * + * @return the indentation */ public float getIndentationLeft() { return indentationLeft; } + /** + * Sets the indentation of this paragraph on the left side. + * + * @param indentation the new indentation + */ + public void setIndentationLeft(float indentation) { + this.indentationLeft = indentation; + } + /** * Gets the indentation of this paragraph on the right side. - * @return the indentation + * + * @return the indentation */ public float getIndentationRight() { return indentationRight; } + /** + * Sets the indentation of this paragraph on the right side. + * + * @param indentation the new indentation + */ + public void setIndentationRight(float indentation) { + this.indentationRight = indentation; + } + /** * Gets the symbol indentation. + * * @return the symbol indentation */ public float getSymbolIndent() { return symbolIndent; } + + /** + * @param symbolIndent the symbolIndent to set + */ + public void setSymbolIndent(float symbolIndent) { + this.symbolIndent = symbolIndent; + } + /** * @see com.lowagie.text.Element#isContent() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isContent() { return true; @@ -555,7 +609,7 @@ public boolean isContent() { /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return true; @@ -563,8 +617,9 @@ public boolean isNestable() { /** * Returns the String that is after a number or letter in the list symbol. - * @return the String that is after a number or letter in the list symbol - * @since iText 2.1.1 + * + * @return the String that is after a number or letter in the list symbol + * @since iText 2.1.1 */ public String getPostSymbol() { return postSymbol; @@ -572,8 +627,9 @@ public String getPostSymbol() { /** * Sets the String that has to be added after a number or letter in the list symbol. - * @since iText 2.1.1 - * @param postSymbol the String that has to be added after a number or letter in the list symbol. + * + * @param postSymbol the String that has to be added after a number or letter in the list symbol. + * @since iText 2.1.1 */ public void setPostSymbol(String postSymbol) { this.postSymbol = postSymbol; @@ -581,8 +637,9 @@ public void setPostSymbol(String postSymbol) { /** * Returns the String that is before a number or letter in the list symbol. - * @return the String that is before a number or letter in the list symbol - * @since iText 2.1.1 + * + * @return the String that is before a number or letter in the list symbol + * @since iText 2.1.1 */ public String getPreSymbol() { return preSymbol; @@ -590,8 +647,9 @@ public String getPreSymbol() { /** * Sets the String that has to be added before a number or letter in the list symbol. - * @since iText 2.1.1 - * @param preSymbol the String that has to be added before a number or letter in the list symbol. + * + * @param preSymbol the String that has to be added before a number or letter in the list symbol. + * @since iText 2.1.1 */ public void setPreSymbol(String preSymbol) { this.preSymbol = preSymbol; diff --git a/openpdf/src/main/java/com/lowagie/text/ListItem.java b/openpdf/src/main/java/com/lowagie/text/ListItem.java index a97318d2d..b952ee8cd 100644 --- a/openpdf/src/main/java/com/lowagie/text/ListItem.java +++ b/openpdf/src/main/java/com/lowagie/text/ListItem.java @@ -50,207 +50,200 @@ package com.lowagie.text; /** - * A ListItem is a Paragraph - * that can be added to a List. - *

    + * A ListItem is a Paragraph that can be added to a List. + *

    * Example 1: * 

    - * List list = new List(true, 20);
- * list.add(new ListItem("First line"));
- * list.add(new ListItem("The second line is longer to see what happens once the end of the line is reached. Will it start on a new line?"));
- * list.add(new ListItem("Third line"));
+ * List list = new List(true, 20); list.add(new ListItem("First line")); list.add(new
+ * ListItem("The second line is longer to see what happens once the end of the line is reached. Will it start on a new
+ * line?")); list.add(new ListItem("Third line"));
  *
    - * + *

    * The result of this code looks like this: - *

      - *
    1. - * First line - *
      2. - *
    2. - * The second line is longer to see what happens once the end of the line is reached. Will it start on a new line? - *
      3. - *
    3. - * Third line - *
      4. - *
    + *
      + *
    1. + * First line + *
      2. + *
    2. + * The second line is longer to see what happens once the end of the line is reached. Will it start on a new line? + *
      3. + *
    3. + * Third line + *
      4. + *
    * * Example 2: * 
    - * List overview = new List(false, 10);
- * overview.add(new ListItem("This is an item"));
+ * List overview = new List(false, 10); overview.add(new ListItem("This is an item"));
  * overview.add("This is another item");
  *
    - * + *

    * The result of this code looks like this: - *

      - *
    • - * This is an item - *
      • - *
    • - * This is another item - *
      • - *
    + *
      + *
    • + * This is an item + *
      • + *
    • + * This is another item + *
      • + *
    * - * @see Element + * @see Element * @see List - * @see Paragraph + * @see Paragraph */ public class ListItem extends Paragraph { - + // constants private static final long serialVersionUID = 1970670787169329006L; - + // member variables - + /** * this is the symbol that will precede the listitem. - * @since 5.0 used to be private + * + * @since 5.0 used to be private */ protected Chunk symbol; - + // constructors - + /** * Constructs a ListItem. */ public ListItem() { super(); } - + /** * Constructs a ListItem with a certain leading. * - * @param leading the leading - */ + * @param leading the leading + */ public ListItem(float leading) { super(leading); } - + /** * Constructs a ListItem with a certain Chunk. * - * @param chunk a Chunk + * @param chunk a Chunk */ public ListItem(Chunk chunk) { super(chunk); } - + /** * Constructs a ListItem with a certain String. * - * @param string a String + * @param string a String */ public ListItem(String string) { super(string); } - + /** - * Constructs a ListItem with a certain String - * and a certain Font. + * Constructs a ListItem with a certain String and a certain Font. * - * @param string a String - * @param font a String + * @param string a String + * @param font a String */ public ListItem(String string, Font font) { super(string, font); } - + /** - * Constructs a ListItem with a certain Chunk - * and a certain leading. + * Constructs a ListItem with a certain Chunk and a certain leading. * - * @param leading the leading - * @param chunk a Chunk + * @param leading the leading + * @param chunk a Chunk */ public ListItem(float leading, Chunk chunk) { super(leading, chunk); } - + /** - * Constructs a ListItem with a certain String - * and a certain leading. + * Constructs a ListItem with a certain String and a certain leading. * - * @param leading the leading - * @param string a String + * @param leading the leading + * @param string a String */ public ListItem(float leading, String string) { super(leading, string); } - + /** - * Constructs a ListItem with a certain leading, String - * and Font. + * Constructs a ListItem with a certain leading, String and Font. * - * @param leading the leading - * @param string a String - * @param font a Font + * @param leading the leading + * @param string a String + * @param font a Font */ public ListItem(float leading, String string, Font font) { super(leading, string, font); } - + /** * Constructs a ListItem with a certain Phrase. * - * @param phrase a Phrase + * @param phrase a Phrase */ public ListItem(Phrase phrase) { super(phrase); } - + // implementation of the Element-methods - + /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return Element.LISTITEM; } - + // methods - - /** - * Sets the listsymbol. - * - * @param symbol a Chunk - */ - public void setListSymbol(Chunk symbol) { - if (this.symbol == null) { - this.symbol = symbol; - if (this.symbol.getFont().isStandardFont()) { - this.symbol.setFont(font); - } - } - } /** * Sets the indentation of this paragraph on the left side. * * @param indentation the new indentation - * @param autoindent if auto indentation, if set as true - * indentation will not be used + * @param autoindent if auto indentation, if set as true + * indentation will not be used */ public void setIndentationLeft(float indentation, boolean autoindent) { if (autoindent) { setIndentationLeft(getListSymbol().getWidthPoint()); - } - else { + } else { setIndentationLeft(indentation); } } - - // methods to retrieve information /** * Returns the listsymbol. * - * @return a Chunk + * @return a Chunk */ public Chunk getListSymbol() { return symbol; } + // methods to retrieve information + + /** + * Sets the listsymbol. + * + * @param symbol a Chunk + */ + public void setListSymbol(Chunk symbol) { + if (this.symbol == null) { + this.symbol = symbol; + if (this.symbol.getFont().isStandardFont()) { + this.symbol.setFont(font); + } + } + } + } diff --git a/openpdf/src/main/java/com/lowagie/text/MarkedObject.java b/openpdf/src/main/java/com/lowagie/text/MarkedObject.java index ccd78e16e..47cda6486 100644 --- a/openpdf/src/main/java/com/lowagie/text/MarkedObject.java +++ b/openpdf/src/main/java/com/lowagie/text/MarkedObject.java @@ -53,28 +53,31 @@ import java.util.Properties; /** - * Wrapper that allows to add properties to 'basic building block' objects. - * Before iText 1.5 every 'basic building block' implemented the MarkupAttributes interface. - * By setting attributes, you could add markup to the corresponding XML and/or HTML tag. - * This functionality was hardly used by anyone, so it was removed, and replaced by - * the MarkedObject functionality. + * Wrapper that allows to add properties to 'basic building block' objects. Before iText 1.5 every 'basic building + * block' implemented the MarkupAttributes interface. By setting attributes, you could add markup to the corresponding + * XML and/or HTML tag. This functionality was hardly used by anyone, so it was removed, and replaced by the + * MarkedObject functionality. */ public class MarkedObject implements Element { - /** The element that is wrapped in a MarkedObject. */ + /** + * The element that is wrapped in a MarkedObject. + */ protected Element element; - /** Contains extra markupAttributes */ + /** + * Contains extra markupAttributes + */ protected Properties markupAttributes = new Properties(); - + /** * This constructor is for internal use only. */ protected MarkedObject() { element = null; } - + /** * Creates a MarkedObject. * @@ -83,11 +86,11 @@ protected MarkedObject() { public MarkedObject(Element element) { this.element = element; } - + /** * Gets all the chunks in this element. * - * @return an ArrayList + * @return an ArrayList */ public ArrayList getChunks() { return element.getChunks(); @@ -97,30 +100,29 @@ public ArrayList getChunks() { * Processes the element by adding it (or the different parts) to an * ElementListener. * - * @param listener an ElementListener + * @param listener an ElementListener * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { try { return listener.add(element); - } - catch(DocumentException de) { + } catch (DocumentException de) { return false; } } - + /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return MARKED; } - + /** * @see com.lowagie.text.Element#isContent() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isContent() { return true; @@ -128,7 +130,7 @@ public boolean isContent() { /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return true; @@ -136,16 +138,17 @@ public boolean isNestable() { /** * Getter for the markup attributes. + * * @return the markupAttributes */ public Properties getMarkupAttributes() { return markupAttributes; } - + /** * Adds one markup attribute. * - * @param key attribute's key + * @param key attribute's key * @param value attribute's value */ public void setMarkupAttribute(String key, String value) { diff --git a/openpdf/src/main/java/com/lowagie/text/MarkedSection.java b/openpdf/src/main/java/com/lowagie/text/MarkedSection.java index 4736dfc8b..4d1634b61 100644 --- a/openpdf/src/main/java/com/lowagie/text/MarkedSection.java +++ b/openpdf/src/main/java/com/lowagie/text/MarkedSection.java @@ -52,21 +52,23 @@ import java.util.Collection; /** - * Wrapper that allows to add properties to a Chapter/Section object. - * Before iText 1.5 every 'basic building block' implemented the MarkupAttributes interface. - * By setting attributes, you could add markup to the corresponding XML and/or HTML tag. - * This functionality was hardly used by anyone, so it was removed, and replaced by - * the MarkedObject functionality. + * Wrapper that allows to add properties to a Chapter/Section object. Before iText 1.5 every 'basic building block' + * implemented the MarkupAttributes interface. By setting attributes, you could add markup to the corresponding XML + * and/or HTML tag. This functionality was hardly used by anyone, so it was removed, and replaced by the MarkedObject + * functionality. */ public class MarkedSection extends MarkedObject { - /** This is the title of this section. */ + /** + * This is the title of this section. + */ protected MarkedObject title = null; - + /** * Creates a MarkedObject with a Section or Chapter object. - * @param section the marked section + * + * @param section the marked section */ public MarkedSection(Section section) { super(); @@ -76,36 +78,38 @@ public MarkedSection(Section section) { } this.element = section; } - + /** - * Adds a Paragraph, List or Table - * to this Section. + * Adds a Paragraph, List or Table to this Section. * - * @param index index at which the specified element is to be inserted - * @param o an object of type Paragraph, List or Table= - * @throws ClassCastException if the object is not a Paragraph, List or Table + * @param index index at which the specified element is to be inserted + * @param o an object of type Paragraph, List or Table= + * @throws ClassCastException if the object is not a Paragraph, List or + * Table */ public void add(int index, Element o) { - ((Section)element).add(index, o); + ((Section) element).add(index, o); } - + /** - * Adds a Paragraph, List, Table or another Section - * to this Section. + * Adds a Paragraph, List, Table or another Section to this + * Section. * - * @param o an object of type Paragraph, List, Table or another Section - * @return a boolean - * @throws ClassCastException if the object is not a Paragraph, List, Table or Section - */ + * @param o an object of type Paragraph, List, Table or another + * Section + * @return a boolean + * @throws ClassCastException if the object is not a Paragraph, List, Table + * or Section + */ public boolean add(Element o) { - return ((Section)element).add(o); + return ((Section) element).add(o); } /** * Processes the element by adding it (or the different parts) to an * ElementListener. * - * @param listener an ElementListener + * @param listener an ElementListener * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { @@ -116,165 +120,171 @@ public boolean process(ElementListener listener) { listener.add(element); } return true; - } - catch(DocumentException de) { + } catch (DocumentException de) { return false; } } - + /** - * Adds a collection of Elements - * to this Section. + * Adds a collection of Elements to this Section. * - * @param collection a collection of Paragraphs, Lists and/or Tables - * @return true if the action succeeded, false if not. - * @throws ClassCastException if one of the objects isn't a Paragraph, List, Table - */ + * @param collection a collection of Paragraphs, Lists and/or Tables + * @return true if the action succeeded, false if not. + * @throws ClassCastException if one of the objects isn't a Paragraph, List, + * Table + */ public boolean addAll(Collection collection) { - return ((Section)element).addAll(collection); + return ((Section) element).addAll(collection); } - + /** * Creates a Section, adds it to this Section and returns it. * - * @param indentation the indentation of the new section - * @param numberDepth the numberDepth of the section - * @return a new Section object - */ + * @param indentation the indentation of the new section + * @param numberDepth the numberDepth of the section + * @return a new Section object + */ public MarkedSection addSection(float indentation, int numberDepth) { - MarkedSection section = ((Section)element).addMarkedSection(); + MarkedSection section = ((Section) element).addMarkedSection(); section.setIndentation(indentation); section.setNumberDepth(numberDepth); return section; } - + /** * Creates a Section, adds it to this Section and returns it. * - * @param indentation the indentation of the new section - * @return a new Section object + * @param indentation the indentation of the new section + * @return a new Section object */ public MarkedSection addSection(float indentation) { - MarkedSection section = ((Section)element).addMarkedSection(); + MarkedSection section = ((Section) element).addMarkedSection(); section.setIndentation(indentation); return section; } - + /** * Creates a Section, add it to this Section and returns it. * - * @param numberDepth the numberDepth of the section - * @return a new Section object + * @param numberDepth the numberDepth of the section + * @return a new Section object */ public MarkedSection addSection(int numberDepth) { - MarkedSection section = ((Section)element).addMarkedSection(); + MarkedSection section = ((Section) element).addMarkedSection(); section.setNumberDepth(numberDepth); return section; } - + /** * Creates a Section, adds it to this Section and returns it. * - * @return a new Section object + * @return a new Section object */ public MarkedSection addSection() { - return ((Section)element).addMarkedSection(); + return ((Section) element).addMarkedSection(); } - + // public methods - - /** - * Sets the title of this section. - * - * @param title the new title - */ - public void setTitle(MarkedObject title) { - if (title.element instanceof Paragraph) - this.title = title; - } /** * Gets the title of this MarkedSection. - * @return a MarkObject with a Paragraph containing the title of a Section - * @since iText 2.0.8 + * + * @return a MarkObject with a Paragraph containing the title of a Section + * @since iText 2.0.8 */ public MarkedObject getTitle() { - Paragraph result = Section.constructTitle((Paragraph)title.element, ((Section)element).numbers, ((Section)element).numberDepth, ((Section)element).numberStyle); + Paragraph result = Section.constructTitle((Paragraph) title.element, ((Section) element).numbers, + ((Section) element).numberDepth, ((Section) element).numberStyle); MarkedObject mo = new MarkedObject(result); mo.markupAttributes = title.markupAttributes; return mo; } - + + /** + * Sets the title of this section. + * + * @param title the new title + */ + public void setTitle(MarkedObject title) { + if (title.element instanceof Paragraph) { + this.title = title; + } + } + /** * Sets the depth of the sectionnumbers that will be shown preceding the title. - *

    - * If the numberdepth is 0, the sections will not be numbered. If the numberdepth - * is 1, the section will be numbered with their own number. If the numberdepth is - * higher (for instance {@literal x > 1}), the numbers of {@literal x - 1} parents will be shown. + *

    + * If the numberdepth is 0, the sections will not be numbered. If the numberdepth is 1, the section will be numbered + * with their own number. If the numberdepth is higher (for instance {@literal x > 1}), the numbers of + * {@literal x - 1} parents will be shown. * - * @param numberDepth the new numberDepth + * @param numberDepth the new numberDepth */ public void setNumberDepth(int numberDepth) { - ((Section)element).setNumberDepth(numberDepth); + ((Section) element).setNumberDepth(numberDepth); } - + /** * Sets the indentation of this Section on the left side. * - * @param indentation the indentation + * @param indentation the indentation */ public void setIndentationLeft(float indentation) { - ((Section)element).setIndentationLeft(indentation); + ((Section) element).setIndentationLeft(indentation); } - + /** * Sets the indentation of this Section on the right side. * - * @param indentation the indentation - */ + * @param indentation the indentation + */ public void setIndentationRight(float indentation) { - ((Section)element).setIndentationRight(indentation); + ((Section) element).setIndentationRight(indentation); } - + /** * Sets the indentation of the content of this Section. * - * @param indentation the indentation + * @param indentation the indentation */ public void setIndentation(float indentation) { - ((Section)element).setIndentation(indentation); + ((Section) element).setIndentation(indentation); } - - /** Setter for property bookmarkOpen. - * @param bookmarkOpen false if the bookmark children are not - * visible. + + /** + * Setter for property bookmarkOpen. + * + * @param bookmarkOpen false if the bookmark children are not visible. */ public void setBookmarkOpen(boolean bookmarkOpen) { - ((Section)element).setBookmarkOpen(bookmarkOpen); + ((Section) element).setBookmarkOpen(bookmarkOpen); } - + /** * Setter for property triggerNewPage. + * * @param triggerNewPage true if a new page has to be triggered. */ public void setTriggerNewPage(boolean triggerNewPage) { - ((Section)element).setTriggerNewPage(triggerNewPage); + ((Section) element).setTriggerNewPage(triggerNewPage); } - + /** - * Sets the bookmark title. The bookmark title is the same as the section title but - * can be changed with this method. + * Sets the bookmark title. The bookmark title is the same as the section title but can be changed with this + * method. + * * @param bookmarkTitle the bookmark title - */ + */ public void setBookmarkTitle(String bookmarkTitle) { - ((Section)element).setBookmarkTitle(bookmarkTitle); + ((Section) element).setBookmarkTitle(bookmarkTitle); } /** * Adds a new page to the section. - * @since 2.1.1 + * + * @since 2.1.1 */ public void newPage() { - ((Section)element).newPage(); + ((Section) element).newPage(); } } diff --git a/openpdf/src/main/java/com/lowagie/text/Meta.java b/openpdf/src/main/java/com/lowagie/text/Meta.java index 394b1760d..e03b2c1e8 100644 --- a/openpdf/src/main/java/com/lowagie/text/Meta.java +++ b/openpdf/src/main/java/com/lowagie/text/Meta.java @@ -52,122 +52,152 @@ import java.util.ArrayList; /** - * This is an Element that contains - * some meta information about the document. - *

    - * An object of type Meta can not be constructed by the user. - * User defined meta information should be placed in a Header-object. + * This is an Element that contains some meta information about the document. + *

    + * An object of type Meta can not be constructed by the user. User defined meta information should be + * placed in a Header-object. * Meta is reserved for: Subject, Keywords, Author, Title, Producer * and Creationdate information. * - * @see Element - * @see Header + * @see Element + * @see Header */ public class Meta implements Element { - + // membervariables - - /** This is the type of Meta-information this object contains. */ + + /** + * This is the type of Meta-information this object contains. + */ private int type; - - /** This is the content of the Meta-information. */ + + /** + * This is the content of the Meta-information. + */ private StringBuffer content; - + // constructors - + /** * Constructs a Meta. * - * @param type the type of meta-information - * @param content the content + * @param type the type of meta-information + * @param content the content */ Meta(int type, String content) { this.type = type; this.content = new StringBuffer(content); } - + /** * Constructs a Meta. * - * @param tag the tagname of the meta-information - * @param content the content + * @param tag the tagname of the meta-information + * @param content the content */ public Meta(String tag, String content) { this.type = Meta.getType(tag); this.content = new StringBuffer(content); } - + // implementation of the Element-methods - + + /** + * Returns the name of the meta information. + * + * @param tag iText tag for meta information + * @return the Element value corresponding with the given tag + */ + public static int getType(String tag) { + if (ElementTags.SUBJECT.equals(tag)) { + return Element.SUBJECT; + } + if (ElementTags.KEYWORDS.equals(tag)) { + return Element.KEYWORDS; + } + if (ElementTags.AUTHOR.equals(tag)) { + return Element.AUTHOR; + } + if (ElementTags.TITLE.equals(tag)) { + return Element.TITLE; + } + if (ElementTags.PRODUCER.equals(tag)) { + return Element.PRODUCER; + } + if (ElementTags.CREATIONDATE.equals(tag)) { + return Element.CREATIONDATE; + } + return Element.HEADER; + } + /** * Processes the element by adding it (or the different parts) to a * ElementListener. * - * @param listener the ElementListener - * @return true if the element was processed successfully + * @param listener the ElementListener + * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { try { return listener.add(this); - } - catch(DocumentException de) { + } catch (DocumentException de) { return false; } } - + /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return type; } - + /** * Gets all the chunks in this element. * - * @return an ArrayList + * @return an ArrayList */ public ArrayList getChunks() { return new ArrayList<>(); } - + /** * @see com.lowagie.text.Element#isContent() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isContent() { return false; } + // methods + /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return false; } - - // methods - + + // methods to retrieve information + /** * appends some text to this Meta. * - * @param string a String - * @return a StringBuffer + * @param string a String + * @return a StringBuffer */ public StringBuffer append(String string) { return content.append(string); } - - // methods to retrieve information /** * Returns the content of the meta information. * - * @return a String + * @return a String */ public String getContent() { return content.toString(); @@ -176,9 +206,9 @@ public String getContent() { /** * Returns the name of the meta information. * - * @return a String + * @return a String */ - + public String getName() { switch (type) { case Element.SUBJECT: @@ -193,37 +223,9 @@ public String getName() { return ElementTags.PRODUCER; case Element.CREATIONDATE: return ElementTags.CREATIONDATE; - default: - return ElementTags.UNKNOWN; - } - } - - /** - * Returns the name of the meta information. - * - * @param tag iText tag for meta information - * @return the Element value corresponding with the given tag - */ - public static int getType(String tag) { - if (ElementTags.SUBJECT.equals(tag)) { - return Element.SUBJECT; - } - if (ElementTags.KEYWORDS.equals(tag)) { - return Element.KEYWORDS; + default: + return ElementTags.UNKNOWN; } - if (ElementTags.AUTHOR.equals(tag)) { - return Element.AUTHOR; - } - if (ElementTags.TITLE.equals(tag)) { - return Element.TITLE; - } - if (ElementTags.PRODUCER.equals(tag)) { - return Element.PRODUCER; - } - if (ElementTags.CREATIONDATE.equals(tag)) { - return Element.CREATIONDATE; - } - return Element.HEADER; } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/PageSize.java b/openpdf/src/main/java/com/lowagie/text/PageSize.java index 7f0fed422..30365fd3d 100644 --- a/openpdf/src/main/java/com/lowagie/text/PageSize.java +++ b/openpdf/src/main/java/com/lowagie/text/PageSize.java @@ -50,178 +50,281 @@ package com.lowagie.text; -import java.lang.reflect.Field; import com.lowagie.text.error_messages.MessageLocalization; +import java.lang.reflect.Field; /** * The PageSize-object contains a number of rectangles representing the most common paper sizes. * - * @see Rectangle + * @see Rectangle */ public class PageSize { - + // membervariables - - /** This is the letter format */ - public static final Rectangle LETTER = new RectangleReadOnly(612,792); - - /** This is the note format */ - public static final Rectangle NOTE = new RectangleReadOnly(540,720); - - /** This is the legal format */ - public static final Rectangle LEGAL = new RectangleReadOnly(612,1008); - - /** This is the tabloid format */ - public static final Rectangle TABLOID = new RectangleReadOnly(792,1224); - - /** This is the executive format */ - public static final Rectangle EXECUTIVE = new RectangleReadOnly(522,756); - - /** This is the postcard format */ - public static final Rectangle POSTCARD = new RectangleReadOnly(283,416); - - /** This is the a0 format */ - public static final Rectangle A0 = new RectangleReadOnly(2384,3370); - - /** This is the a1 format */ - public static final Rectangle A1 = new RectangleReadOnly(1684,2384); - - /** This is the a2 format */ - public static final Rectangle A2 = new RectangleReadOnly(1191,1684); - - /** This is the a3 format */ - public static final Rectangle A3 = new RectangleReadOnly(842,1191); - - /** This is the a4 format */ - public static final Rectangle A4 = new RectangleReadOnly(595,842); - - /** This is the a5 format */ - public static final Rectangle A5 = new RectangleReadOnly(420,595); - - /** This is the a6 format */ - public static final Rectangle A6 = new RectangleReadOnly(297,420); - - /** This is the a7 format */ - public static final Rectangle A7 = new RectangleReadOnly(210,297); - - /** This is the a8 format */ - public static final Rectangle A8 = new RectangleReadOnly(148,210); - - /** This is the a9 format */ - public static final Rectangle A9 = new RectangleReadOnly(105,148); - - /** This is the a10 format */ - public static final Rectangle A10 = new RectangleReadOnly(73,105); - - /** This is the b0 format */ - public static final Rectangle B0 = new RectangleReadOnly(2834,4008); - - /** This is the b1 format */ - public static final Rectangle B1 = new RectangleReadOnly(2004,2834); - - /** This is the b2 format */ - public static final Rectangle B2 = new RectangleReadOnly(1417,2004); - - /** This is the b3 format */ - public static final Rectangle B3 = new RectangleReadOnly(1000,1417); - - /** This is the b4 format */ - public static final Rectangle B4 = new RectangleReadOnly(708,1000); - - /** This is the b5 format */ - public static final Rectangle B5 = new RectangleReadOnly(498,708); - - /** This is the b6 format */ - public static final Rectangle B6 = new RectangleReadOnly(354,498); - - /** This is the b7 format */ - public static final Rectangle B7 = new RectangleReadOnly(249,354); - - /** This is the b8 format */ - public static final Rectangle B8 = new RectangleReadOnly(175,249); - - /** This is the b9 format */ - public static final Rectangle B9 = new RectangleReadOnly(124,175); - - /** This is the b10 format */ - public static final Rectangle B10 = new RectangleReadOnly(87,124); - - /** This is the archE format */ - public static final Rectangle ARCH_E = new RectangleReadOnly(2592,3456); - - /** This is the archD format */ - public static final Rectangle ARCH_D = new RectangleReadOnly(1728,2592); - - /** This is the archC format */ - public static final Rectangle ARCH_C = new RectangleReadOnly(1296,1728); - - /** This is the archB format */ - public static final Rectangle ARCH_B = new RectangleReadOnly(864,1296); - - /** This is the archA format */ - public static final Rectangle ARCH_A = new RectangleReadOnly(648,864); - - /** This is the American Foolscap format */ - public static final Rectangle FLSA = new RectangleReadOnly(612,936); - - /** This is the European Foolscap format */ - public static final Rectangle FLSE = new RectangleReadOnly(648,936); - - /** This is the halfletter format */ - public static final Rectangle HALFLETTER = new RectangleReadOnly(396,612); - - /** This is the 11x17 format */ - public static final Rectangle _11X17 = new RectangleReadOnly(792,1224); - - /** This is the ISO 7810 ID-1 format (85.60 x 53.98 mm or 3.370 x 2.125 inch) */ - public static final Rectangle ID_1 = new RectangleReadOnly(242.65f,153); - - /** This is the ISO 7810 ID-2 format (A7 rotated) */ - public static final Rectangle ID_2 = new RectangleReadOnly(297,210); - - /** This is the ISO 7810 ID-3 format (B7 rotated) */ - public static final Rectangle ID_3 = new RectangleReadOnly(354,249); - - /** This is the ledger format */ - public static final Rectangle LEDGER = new RectangleReadOnly(1224,792); - - /** This is the Crown Quarto format */ - public static final Rectangle CROWN_QUARTO = new RectangleReadOnly(535,697); - - /** This is the Large Crown Quarto format */ - public static final Rectangle LARGE_CROWN_QUARTO = new RectangleReadOnly(569,731); - - /** This is the Demy Quarto format. */ - public static final Rectangle DEMY_QUARTO = new RectangleReadOnly(620,782); - - /** This is the Royal Quarto format. */ - public static final Rectangle ROYAL_QUARTO = new RectangleReadOnly(671,884); - - /** This is the Crown Octavo format */ - public static final Rectangle CROWN_OCTAVO = new RectangleReadOnly(348,527); - - /** This is the Large Crown Octavo format */ - public static final Rectangle LARGE_CROWN_OCTAVO = new RectangleReadOnly(365,561); - - /** This is the Demy Octavo format */ - public static final Rectangle DEMY_OCTAVO = new RectangleReadOnly(391,612); - - /** This is the Royal Octavo format. */ - public static final Rectangle ROYAL_OCTAVO = new RectangleReadOnly(442,663); - - /** This is the small paperback format. */ - public static final Rectangle SMALL_PAPERBACK = new RectangleReadOnly(314,504); - - /** This is the Pengiun small paperback format. */ - public static final Rectangle PENGUIN_SMALL_PAPERBACK = new RectangleReadOnly(314,513); - - /** This is the Penguin large paperback format. */ - public static final Rectangle PENGUIN_LARGE_PAPERBACK = new RectangleReadOnly(365,561); - - /** - * This method returns a Rectangle based on a String. - * Possible values are the the names of a constant in this class + + /** + * This is the letter format + */ + public static final Rectangle LETTER = new RectangleReadOnly(612, 792); + + /** + * This is the note format + */ + public static final Rectangle NOTE = new RectangleReadOnly(540, 720); + + /** + * This is the legal format + */ + public static final Rectangle LEGAL = new RectangleReadOnly(612, 1008); + + /** + * This is the tabloid format + */ + public static final Rectangle TABLOID = new RectangleReadOnly(792, 1224); + + /** + * This is the executive format + */ + public static final Rectangle EXECUTIVE = new RectangleReadOnly(522, 756); + + /** + * This is the postcard format + */ + public static final Rectangle POSTCARD = new RectangleReadOnly(283, 416); + + /** + * This is the a0 format + */ + public static final Rectangle A0 = new RectangleReadOnly(2384, 3370); + + /** + * This is the a1 format + */ + public static final Rectangle A1 = new RectangleReadOnly(1684, 2384); + + /** + * This is the a2 format + */ + public static final Rectangle A2 = new RectangleReadOnly(1191, 1684); + + /** + * This is the a3 format + */ + public static final Rectangle A3 = new RectangleReadOnly(842, 1191); + + /** + * This is the a4 format + */ + public static final Rectangle A4 = new RectangleReadOnly(595, 842); + + /** + * This is the a5 format + */ + public static final Rectangle A5 = new RectangleReadOnly(420, 595); + + /** + * This is the a6 format + */ + public static final Rectangle A6 = new RectangleReadOnly(297, 420); + + /** + * This is the a7 format + */ + public static final Rectangle A7 = new RectangleReadOnly(210, 297); + + /** + * This is the a8 format + */ + public static final Rectangle A8 = new RectangleReadOnly(148, 210); + + /** + * This is the a9 format + */ + public static final Rectangle A9 = new RectangleReadOnly(105, 148); + + /** + * This is the a10 format + */ + public static final Rectangle A10 = new RectangleReadOnly(73, 105); + + /** + * This is the b0 format + */ + public static final Rectangle B0 = new RectangleReadOnly(2834, 4008); + + /** + * This is the b1 format + */ + public static final Rectangle B1 = new RectangleReadOnly(2004, 2834); + + /** + * This is the b2 format + */ + public static final Rectangle B2 = new RectangleReadOnly(1417, 2004); + + /** + * This is the b3 format + */ + public static final Rectangle B3 = new RectangleReadOnly(1000, 1417); + + /** + * This is the b4 format + */ + public static final Rectangle B4 = new RectangleReadOnly(708, 1000); + + /** + * This is the b5 format + */ + public static final Rectangle B5 = new RectangleReadOnly(498, 708); + + /** + * This is the b6 format + */ + public static final Rectangle B6 = new RectangleReadOnly(354, 498); + + /** + * This is the b7 format + */ + public static final Rectangle B7 = new RectangleReadOnly(249, 354); + + /** + * This is the b8 format + */ + public static final Rectangle B8 = new RectangleReadOnly(175, 249); + + /** + * This is the b9 format + */ + public static final Rectangle B9 = new RectangleReadOnly(124, 175); + + /** + * This is the b10 format + */ + public static final Rectangle B10 = new RectangleReadOnly(87, 124); + + /** + * This is the archE format + */ + public static final Rectangle ARCH_E = new RectangleReadOnly(2592, 3456); + + /** + * This is the archD format + */ + public static final Rectangle ARCH_D = new RectangleReadOnly(1728, 2592); + + /** + * This is the archC format + */ + public static final Rectangle ARCH_C = new RectangleReadOnly(1296, 1728); + + /** + * This is the archB format + */ + public static final Rectangle ARCH_B = new RectangleReadOnly(864, 1296); + + /** + * This is the archA format + */ + public static final Rectangle ARCH_A = new RectangleReadOnly(648, 864); + + /** + * This is the American Foolscap format + */ + public static final Rectangle FLSA = new RectangleReadOnly(612, 936); + + /** + * This is the European Foolscap format + */ + public static final Rectangle FLSE = new RectangleReadOnly(648, 936); + + /** + * This is the halfletter format + */ + public static final Rectangle HALFLETTER = new RectangleReadOnly(396, 612); + + /** + * This is the 11x17 format + */ + public static final Rectangle _11X17 = new RectangleReadOnly(792, 1224); + + /** + * This is the ISO 7810 ID-1 format (85.60 x 53.98 mm or 3.370 x 2.125 inch) + */ + public static final Rectangle ID_1 = new RectangleReadOnly(242.65f, 153); + + /** + * This is the ISO 7810 ID-2 format (A7 rotated) + */ + public static final Rectangle ID_2 = new RectangleReadOnly(297, 210); + + /** + * This is the ISO 7810 ID-3 format (B7 rotated) + */ + public static final Rectangle ID_3 = new RectangleReadOnly(354, 249); + + /** + * This is the ledger format + */ + public static final Rectangle LEDGER = new RectangleReadOnly(1224, 792); + + /** + * This is the Crown Quarto format + */ + public static final Rectangle CROWN_QUARTO = new RectangleReadOnly(535, 697); + + /** + * This is the Large Crown Quarto format + */ + public static final Rectangle LARGE_CROWN_QUARTO = new RectangleReadOnly(569, 731); + + /** + * This is the Demy Quarto format. + */ + public static final Rectangle DEMY_QUARTO = new RectangleReadOnly(620, 782); + + /** + * This is the Royal Quarto format. + */ + public static final Rectangle ROYAL_QUARTO = new RectangleReadOnly(671, 884); + + /** + * This is the Crown Octavo format + */ + public static final Rectangle CROWN_OCTAVO = new RectangleReadOnly(348, 527); + + /** + * This is the Large Crown Octavo format + */ + public static final Rectangle LARGE_CROWN_OCTAVO = new RectangleReadOnly(365, 561); + + /** + * This is the Demy Octavo format + */ + public static final Rectangle DEMY_OCTAVO = new RectangleReadOnly(391, 612); + + /** + * This is the Royal Octavo format. + */ + public static final Rectangle ROYAL_OCTAVO = new RectangleReadOnly(442, 663); + + /** + * This is the small paperback format. + */ + public static final Rectangle SMALL_PAPERBACK = new RectangleReadOnly(314, 504); + + /** + * This is the Pengiun small paperback format. + */ + public static final Rectangle PENGUIN_SMALL_PAPERBACK = new RectangleReadOnly(314, 513); + + /** + * This is the Penguin large paperback format. + */ + public static final Rectangle PENGUIN_LARGE_PAPERBACK = new RectangleReadOnly(365, 561); + + /** + * This method returns a Rectangle based on a String. Possible values are the the names of a constant in this class * (for instance "A4", "LETTER",...) or a value like "595 842" * * @param name name of the page size, possible values LETTER NOTE @@ -238,27 +341,27 @@ public class PageSize { * CROWN_OCTAVO LARGE_CROWN_OCTAVO DEMY_OCTAVO * ROYAL_OCTAVO SMALL_PAPERBACK PENGUIN_SMALL_PAPERBACK * PENGUIN_LARGE_PAPERBACK - * * @return an object of type {@link Rectangle} */ - public static Rectangle getRectangle(String name) { + public static Rectangle getRectangle(String name) { name = name.trim().toUpperCase(); int pos = name.indexOf(' '); if (pos == -1) { - try { + try { Field field = PageSize.class.getDeclaredField(name.toUpperCase()); return (Rectangle) field.get(null); } catch (Exception e) { throw new RuntimeException(MessageLocalization.getComposedMessage("can.t.find.page.size.1", name)); } - } - else { + } else { try { String width = name.substring(0, pos); String height = name.substring(pos + 1); return new Rectangle(Float.parseFloat(width), Float.parseFloat(height)); - } catch(Exception e) { - throw new RuntimeException(MessageLocalization.getComposedMessage("1.is.not.a.valid.page.size.format.2", name, e.getMessage())); + } catch (Exception e) { + throw new RuntimeException( + MessageLocalization.getComposedMessage("1.is.not.a.valid.page.size.format.2", name, + e.getMessage())); } } } diff --git a/openpdf/src/main/java/com/lowagie/text/Paragraph.java b/openpdf/src/main/java/com/lowagie/text/Paragraph.java index ad2ed02b3..d190f6f5b 100644 --- a/openpdf/src/main/java/com/lowagie/text/Paragraph.java +++ b/openpdf/src/main/java/com/lowagie/text/Paragraph.java @@ -53,152 +53,163 @@ /** * A Paragraph is a series of Chunks and/or Phrases. - *

    - * A Paragraph has the same qualities of a Phrase, but also - * some additional layout-parameters: + *

    + * A Paragraph has the same qualities of a Phrase, but also some additional + * layout-parameters: *

      *
    • the indentation *
    • the alignment of the text *
    - * + *

    * Example: * 

      * Paragraph p = new Paragraph("This is a paragraph",
- *               FontFactory.getFont(FontFactory.HELVETICA, 18, Font.BOLDITALIC, new Color(0, 0, 255)));
+ * FontFactory.getFont(FontFactory.HELVETICA, 18, Font.BOLDITALIC, new Color(0, 0, 255)));
  *
    * - * @see Element - * @see Phrase - * @see ListItem + * @see Element + * @see Phrase + * @see ListItem */ public class Paragraph extends Phrase { - + // constants private static final long serialVersionUID = 7852314969733375514L; - + // membervariables - - /** The alignment of the text. */ + + /** + * The alignment of the text. + */ protected int alignment = Element.ALIGN_UNDEFINED; - /** The base run direction of paragraph */ + /** + * The base run direction of paragraph + */ protected int runDirection = PdfWriter.RUN_DIRECTION_DEFAULT; - - /** The text leading that is multiplied by the biggest font size in the line. */ + + /** + * The text leading that is multiplied by the biggest font size in the line. + */ protected float multipliedLeading = 0; - - /** The indentation of this paragraph on the left side. */ + + /** + * The indentation of this paragraph on the left side. + */ protected float indentationLeft; - - /** The indentation of this paragraph on the right side. */ + + /** + * The indentation of this paragraph on the right side. + */ protected float indentationRight; - - /** Holds value of property firstLineIndent. */ - private float firstLineIndent = 0; - - /** The spacing before the paragraph. */ + /** + * The spacing before the paragraph. + */ protected float spacingBefore; - - /** The spacing after the paragraph. */ + /** + * The spacing after the paragraph. + */ protected float spacingAfter; - - /** Holds value of property extraParagraphSpace. */ - private float extraParagraphSpace = 0; - - /** Does the paragraph has to be kept together on 1 page. */ + /** + * Does the paragraph has to be kept together on 1 page. + */ protected boolean keeptogether = false; - + /** + * Holds value of property firstLineIndent. + */ + private float firstLineIndent = 0; + /** + * Holds value of property extraParagraphSpace. + */ + private float extraParagraphSpace = 0; + // constructors - + /** * Constructs a Paragraph. */ public Paragraph() { super(); } - + /** * Constructs a Paragraph with a certain leading. * - * @param leading the leading + * @param leading the leading */ public Paragraph(float leading) { super(leading); } - + /** * Constructs a Paragraph with a certain Chunk. * - * @param chunk a Chunk - */ + * @param chunk a Chunk + */ public Paragraph(Chunk chunk) { super(chunk); } - + /** - * Constructs a Paragraph with a certain Chunk - * and a certain leading. + * Constructs a Paragraph with a certain Chunk and a certain leading. * - * @param leading the leading - * @param chunk a Chunk - */ + * @param leading the leading + * @param chunk a Chunk + */ public Paragraph(float leading, Chunk chunk) { super(leading, chunk); } - + /** * Constructs a Paragraph with a certain String. * - * @param string a String + * @param string a String */ public Paragraph(String string) { super(string); } - + /** - * Constructs a Paragraph with a certain String - * and a certain Font. + * Constructs a Paragraph with a certain String and a certain Font. * - * @param string a String - * @param font a Font + * @param string a String + * @param font a Font */ public Paragraph(String string, Font font) { super(string, font); } - + /** - * Constructs a Paragraph with a certain String - * and a certain leading. + * Constructs a Paragraph with a certain String and a certain leading. * - * @param leading the leading - * @param string a String + * @param leading the leading + * @param string a String */ public Paragraph(float leading, String string) { super(leading, string); } - + /** - * Constructs a Paragraph with a certain leading, String - * and Font. + * Constructs a Paragraph with a certain leading, String and Font. * - * @param leading the leading - * @param string a String - * @param font a Font + * @param leading the leading + * @param string a String + * @param font a Font */ public Paragraph(float leading, String string, Font font) { super(leading, string, font); } - + /** * Constructs a Paragraph with a certain Phrase. * - * @param phrase a Phrase - */ + * @param phrase a Phrase + */ public Paragraph(Phrase phrase) { super(phrase); if (phrase instanceof Paragraph) { - Paragraph p = (Paragraph)phrase; + Paragraph p = (Paragraph) phrase; setAlignment(p.alignment); setLeading(phrase.getLeading(), p.multipliedLeading); setIndentationLeft(p.getIndentationLeft()); @@ -207,27 +218,27 @@ public Paragraph(Phrase phrase) { setSpacingAfter(p.getSpacingAfter()); setSpacingBefore(p.getSpacingBefore()); setExtraParagraphSpace(p.getExtraParagraphSpace()); - setRunDirection(p.getRunDirection()); + setRunDirection(p.getRunDirection()); } } - + // implementation of the Element-methods - + /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return Element.PARAGRAPH; } - + // methods - + /** * Adds an Object to the Paragraph. * - * @param o object the object to add. + * @param o object the object to add. * @return true is adding the object succeeded */ public boolean add(Element o) { @@ -236,62 +247,25 @@ public boolean add(Element o) { list.setIndentationLeft(list.getIndentationLeft() + indentationLeft); list.setIndentationRight(indentationRight); return super.add(list); - } - else if (o instanceof Image) { + } else if (o instanceof Image) { super.addSpecial(o); return true; - } - else if (o instanceof Paragraph) { + } else if (o instanceof Paragraph) { super.add(o); java.util.List chunks = getChunks(); if (!chunks.isEmpty()) { Chunk tmp = ((Chunk) chunks.get(chunks.size() - 1)); super.add(new Chunk("\n", tmp.getFont())); - } - else { + } else { super.add(Chunk.NEWLINE); } return true; } return super.add(o); } - + // setting the membervariables - - /** - * Sets the alignment of this paragraph. - * - * @param alignment the new alignment - */ - public void setAlignment(int alignment) { - this.alignment = alignment; - } - - /** - * Sets the alignment of this paragraph. - * - * @param alignment the new alignment as a String - */ - public void setAlignment(String alignment) { - if (ElementTags.ALIGN_CENTER.equalsIgnoreCase(alignment)) { - this.alignment = Element.ALIGN_CENTER; - return; - } - if (ElementTags.ALIGN_RIGHT.equalsIgnoreCase(alignment)) { - this.alignment = Element.ALIGN_RIGHT; - return; - } - if (ElementTags.ALIGN_JUSTIFIED.equalsIgnoreCase(alignment)) { - this.alignment = Element.ALIGN_JUSTIFIED; - return; - } - if (ElementTags.ALIGN_JUSTIFIED_ALL.equalsIgnoreCase(alignment)) { - this.alignment = Element.ALIGN_JUSTIFIED_ALL; - return; - } - this.alignment = Element.ALIGN_LEFT; - } - + /** * @see com.lowagie.text.Phrase#setLeading(float) */ @@ -299,117 +273,104 @@ public void setLeading(float fixedLeading) { this.leading = fixedLeading; this.multipliedLeading = 0; } - - /** - * Sets the variable leading. The resultant leading will be - * multipliedLeading*maxFontSize where maxFontSize is the - * size of the biggest font in the line. - * @param multipliedLeading the variable leading - */ - public void setMultipliedLeading(float multipliedLeading) { - this.leading = 0; - this.multipliedLeading = multipliedLeading; - } - + /** - * Sets the leading fixed and variable. The resultant leading will be - * fixedLeading+multipliedLeading*maxFontSize where maxFontSize is the - * size of the biggest font in the line. - * @param fixedLeading the fixed leading + * Sets the leading fixed and variable. The resultant leading will be fixedLeading+multipliedLeading*maxFontSize + * where maxFontSize is the size of the biggest font in the line. + * + * @param fixedLeading the fixed leading * @param multipliedLeading the variable leading */ public void setLeading(float fixedLeading, float multipliedLeading) { this.leading = fixedLeading; this.multipliedLeading = multipliedLeading; } - + /** - * Sets the indentation of this paragraph on the left side. + * Checks if this paragraph has to be kept together on one page. * - * @param indentation the new indentation + * @return true if the paragraph may not be split over 2 pages. */ - public void setIndentationLeft(float indentation) { - this.indentationLeft = indentation; + public boolean getKeepTogether() { + return keeptogether; } - + /** - * Sets the indentation of this paragraph on the right side. + * Indicates that the paragraph has to be kept together on one page. * - * @param indentation the new indentation - */ - public void setIndentationRight(float indentation) { - this.indentationRight = indentation; - } - - /** - * Setter for property firstLineIndent. - * @param firstLineIndent New value of property firstLineIndent. + * @param keeptogether true of the paragraph may not be split over 2 pages */ - public void setFirstLineIndent(float firstLineIndent) { - this.firstLineIndent = firstLineIndent; + public void setKeepTogether(boolean keeptogether) { + this.keeptogether = keeptogether; } - + /** - * Sets the spacing before this paragraph. + * Gets the alignment of this paragraph. * - * @param spacing the new spacing + * @return alignment */ - public void setSpacingBefore(float spacing) { - this.spacingBefore = spacing; + public int getAlignment() { + return alignment; } - + /** - * Sets the spacing after this paragraph. + * Sets the alignment of this paragraph. * - * @param spacing the new spacing + * @param alignment the new alignment */ - public void setSpacingAfter(float spacing) { - this.spacingAfter = spacing; + public void setAlignment(int alignment) { + this.alignment = alignment; } - + /** - * Indicates that the paragraph has to be kept together on one page. + * Sets the alignment of this paragraph. * - * @param keeptogether true of the paragraph may not be split over 2 pages + * @param alignment the new alignment as a String */ - public void setKeepTogether(boolean keeptogether) { - this.keeptogether = keeptogether; + public void setAlignment(String alignment) { + if (ElementTags.ALIGN_CENTER.equalsIgnoreCase(alignment)) { + this.alignment = Element.ALIGN_CENTER; + return; + } + if (ElementTags.ALIGN_RIGHT.equalsIgnoreCase(alignment)) { + this.alignment = Element.ALIGN_RIGHT; + return; + } + if (ElementTags.ALIGN_JUSTIFIED.equalsIgnoreCase(alignment)) { + this.alignment = Element.ALIGN_JUSTIFIED; + return; + } + if (ElementTags.ALIGN_JUSTIFIED_ALL.equalsIgnoreCase(alignment)) { + this.alignment = Element.ALIGN_JUSTIFIED_ALL; + return; + } + this.alignment = Element.ALIGN_LEFT; } - + /** - * Checks if this paragraph has to be kept together on one page. + * Gets the variable leading * - * @return true if the paragraph may not be split over 2 pages. + * @return the leading */ - public boolean getKeepTogether() { - return keeptogether; + public float getMultipliedLeading() { + return multipliedLeading; } - // methods to retrieve information - /** - * Gets the alignment of this paragraph. + * Sets the variable leading. The resultant leading will be multipliedLeading*maxFontSize where maxFontSize is the + * size of the biggest font in the line. * - * @return alignment - */ - public int getAlignment() { - return alignment; - } - - /** - * Gets the variable leading - * @return the leading + * @param multipliedLeading the variable leading */ - public float getMultipliedLeading() { - return multipliedLeading; + public void setMultipliedLeading(float multipliedLeading) { + this.leading = 0; + this.multipliedLeading = multipliedLeading; } - + /** - * Gets the total leading. - * This method is based on the assumption that the - * font of the Paragraph is the font of all the elements - * that make part of the paragraph. This isn't necessarily - * true. + * Gets the total leading. This method is based on the assumption that the font of the Paragraph is the font of all + * the elements that make part of the paragraph. This isn't necessarily true. + * * @return the total leading (fixed and multiplied) */ public float getTotalLeading() { @@ -424,57 +385,109 @@ public float getTotalLeading() { /** * Gets the indentation of this paragraph on the left side. * - * @return the indentation + * @return the indentation */ public float getIndentationLeft() { return indentationLeft; } + /** + * Sets the indentation of this paragraph on the left side. + * + * @param indentation the new indentation + */ + public void setIndentationLeft(float indentation) { + this.indentationLeft = indentation; + } + + // methods to retrieve information + /** * Gets the indentation of this paragraph on the right side. * - * @return the indentation + * @return the indentation */ public float getIndentationRight() { return indentationRight; } - + + /** + * Sets the indentation of this paragraph on the right side. + * + * @param indentation the new indentation + */ + public void setIndentationRight(float indentation) { + this.indentationRight = indentation; + } + /** * Getter for property firstLineIndent. + * * @return Value of property firstLineIndent. */ public float getFirstLineIndent() { return this.firstLineIndent; } - + + /** + * Setter for property firstLineIndent. + * + * @param firstLineIndent New value of property firstLineIndent. + */ + public void setFirstLineIndent(float firstLineIndent) { + this.firstLineIndent = firstLineIndent; + } + /** * Gets the spacing before this paragraph. - * @return the spacing - * @since 2.1.5 + * + * @return the spacing + * @since 2.1.5 */ public float getSpacingBefore() { return spacingBefore; - } - + } + + /** + * Sets the spacing before this paragraph. + * + * @param spacing the new spacing + */ + public void setSpacingBefore(float spacing) { + this.spacingBefore = spacing; + } + /** * Gets the spacing after this paragraph. - * @return the spacing - * @since 2.1.5 + * + * @return the spacing + * @since 2.1.5 */ public float getSpacingAfter() { return spacingAfter; - } - + } + + /** + * Sets the spacing after this paragraph. + * + * @param spacing the new spacing + */ + public void setSpacingAfter(float spacing) { + this.spacingAfter = spacing; + } + /** * Getter for property extraParagraphSpace. + * * @return Value of property extraParagraphSpace. */ public float getExtraParagraphSpace() { return this.extraParagraphSpace; } - + /** * Setter for property extraParagraphSpace. + * * @param extraParagraphSpace New value of property extraParagraphSpace. */ public void setExtraParagraphSpace(float extraParagraphSpace) { diff --git a/openpdf/src/main/java/com/lowagie/text/Phrase.java b/openpdf/src/main/java/com/lowagie/text/Phrase.java index 12a704bb1..f39c93ad0 100644 --- a/openpdf/src/main/java/com/lowagie/text/Phrase.java +++ b/openpdf/src/main/java/com/lowagie/text/Phrase.java @@ -49,21 +49,18 @@ package com.lowagie.text; -import java.util.ArrayList; -import java.util.Collection; - import com.lowagie.text.error_messages.MessageLocalization; - import com.lowagie.text.pdf.HyphenationEvent; +import java.util.ArrayList; +import java.util.Collection; /** * A Phrase is a series of Chunks. - *

    - * A Phrase has a main Font, but some chunks - * within the phrase can have a Font that differs from the - * main Font. All the Chunks in a Phrase - * have the same leading. - *

    + *

    + * A Phrase has a main Font, but some chunks within the phrase can have a Font + * that differs from the main Font. All the Chunks in a Phrase have the same + * leading. + *

    * Example: * 

      * // When no parameters are passed, the default leading = 16
@@ -72,15 +69,17 @@
  * // In this example the leading is passed as a parameter
  * Phrase phrase2 = new Phrase(16, "this is a phrase with leading 16");
  * // When a Font is passed (explicitly or embedded in a chunk), the default leading = 1.5 * size of the font
- * Phrase phrase3 = new Phrase("this is a phrase with a red, normal font Courier, size 12", FontFactory.getFont(FontFactory.COURIER, 12, Font.NORMAL, new Color(255, 0, 0)));
+ * Phrase phrase3 = new Phrase("this is a phrase with a red, normal font Courier, size 12",
+ * FontFactory.getFont(FontFactory.COURIER, 12, Font.NORMAL, new Color(255, 0, 0)));
  * Phrase phrase4 = new Phrase(new Chunk("this is a phrase"));
- * Phrase phrase5 = new Phrase(18, new Chunk("this is a phrase", FontFactory.getFont(FontFactory.HELVETICA, 16, Font.BOLD, new Color(255, 0, 0)));
+ * Phrase phrase5 = new Phrase(18, new Chunk("this is a phrase", FontFactory.getFont(FontFactory.HELVETICA, 16,
+ * Font.BOLD, new Color(255, 0, 0)));
  *
    * - * @see Element - * @see Chunk - * @see Paragraph - * @see Anchor + * @see Element + * @see Chunk + * @see Paragraph + * @see Anchor */ public class Phrase extends ArrayList implements TextElementArray { @@ -89,14 +88,20 @@ public class Phrase extends ArrayList implements TextElementArray { private static final long serialVersionUID = 2643594602455068231L; // membervariables - /** This is the leading of this phrase. */ + /** + * This is the leading of this phrase. + */ protected float leading = Float.NaN; - /** This is the font of this phrase. */ + /** + * This is the font of this phrase. + */ protected Font font; - /** Null, unless the Phrase has to be hyphenated. - * @since 2.1.2 + /** + * Null, unless the Phrase has to be hyphenated. + * + * @since 2.1.2 */ protected HyphenationEvent hyphenation = null; @@ -125,7 +130,7 @@ public Phrase(Phrase phrase) { /** * Constructs a Phrase with a certain leading. * - * @param leading the leading + * @param leading the leading */ public Phrase(float leading) { this.leading = leading; @@ -135,7 +140,7 @@ public Phrase(float leading) { /** * Constructs a Phrase with a certain Chunk. * - * @param chunk a Chunk + * @param chunk a Chunk */ public Phrase(Chunk chunk) { super.add(chunk); @@ -144,11 +149,10 @@ public Phrase(Chunk chunk) { } /** - * Constructs a Phrase with a certain Chunk - * and a certain leading. + * Constructs a Phrase with a certain Chunk and a certain leading. * - * @param leading the leading - * @param chunk a Chunk + * @param leading the leading + * @param chunk a Chunk */ public Phrase(float leading, Chunk chunk) { this.leading = leading; @@ -160,7 +164,7 @@ public Phrase(float leading, Chunk chunk) { /** * Constructs a Phrase with a certain String. * - * @param string a String + * @param string a String */ public Phrase(String string) { this(Float.NaN, string, new Font()); @@ -169,8 +173,8 @@ public Phrase(String string) { /** * Constructs a Phrase with a certain String and a certain Font. * - * @param string a String - * @param font a Font + * @param string a String + * @param font a Font */ public Phrase(String string, Font font) { this(Float.NaN, string, font); @@ -179,20 +183,20 @@ public Phrase(String string, Font font) { /** * Constructs a Phrase with a certain leading and a certain String. * - * @param leading the leading - * @param string a String + * @param leading the leading + * @param string a String */ public Phrase(float leading, String string) { this(leading, string, new Font()); } /** - * Constructs a Phrase with a certain leading, a certain String - * and a certain Font. + * Constructs a Phrase with a certain leading, a certain String and a certain + * Font. * - * @param leading the leading - * @param string a String - * @param font a Font + * @param leading the leading + * @param string a String + * @param font a Font */ public Phrase(float leading, String string, Font font) { this.leading = leading; @@ -205,12 +209,78 @@ public Phrase(float leading, String string, Font font) { // implementation of the Element-methods + /** + * Constructs a Phrase that can be used in the static getInstance() method. + * + * @param dummy a dummy parameter + */ + private Phrase(boolean dummy) { + } + + /** + * Gets a special kind of Phrase that changes some characters into corresponding symbols. + * + * @param string input + * @return a newly constructed Phrase + */ + public static final Phrase getInstance(String string) { + return getInstance(16, string, new Font()); + } + + /** + * Gets a special kind of Phrase that changes some characters into corresponding symbols. + * + * @param leading leading spaces + * @param string input + * @return a newly constructed Phrase + */ + public static final Phrase getInstance(int leading, String string) { + return getInstance(leading, string, new Font()); + } + + /** + * Gets a special kind of Phrase that changes some characters into corresponding symbols. + * + * @param leading leading spaces + * @param string input + * @param font font to be used + * @return a newly constructed Phrase + */ + public static final Phrase getInstance(int leading, String string, Font font) { + Phrase p = new Phrase(true); + p.setLeading(leading); + p.font = font; + if (font.getFamily() != Font.SYMBOL && font.getFamily() != Font.ZAPFDINGBATS && font.getBaseFont() == null) { + int index; + while ((index = SpecialSymbol.index(string)) > -1) { + if (index > 0) { + String firstPart = string.substring(0, index); + p.add(new Chunk(firstPart, font)); + string = string.substring(index); + } + Font symbol = new Font(Font.SYMBOL, font.getSize(), font.getStyle(), font.getColor()); + StringBuilder buf = new StringBuilder(); + buf.append(SpecialSymbol.getCorrespondingSymbol(string.charAt(0))); + string = string.substring(1); + while (SpecialSymbol.index(string) == 0) { + buf.append(SpecialSymbol.getCorrespondingSymbol(string.charAt(0))); + string = string.substring(1); + } + p.add(new Chunk(buf.toString(), symbol)); + } + } + if (string != null && string.length() != 0) { + p.add(new Chunk(string, font)); + } + return p; + } + /** * Processes the element by adding it (or the different parts) to an * ElementListener. * - * @param listener an ElementListener - * @return true if the element was processed successfully + * @param listener an ElementListener + * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { try { @@ -218,16 +288,17 @@ public boolean process(ElementListener listener) { listener.add((Element) o); } return true; - } - catch(DocumentException de) { + } catch (DocumentException de) { return false; } } + // overriding some of the ArrayList-methods + /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return Element.PHRASE; @@ -236,7 +307,7 @@ public int type() { /** * Gets all the chunks in this element. * - * @return an ArrayList + * @return an ArrayList */ public ArrayList getChunks() { ArrayList tmp = new ArrayList<>(); @@ -248,7 +319,7 @@ public ArrayList getChunks() { /** * @see com.lowagie.text.Element#isContent() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isContent() { return true; @@ -256,24 +327,24 @@ public boolean isContent() { /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return true; } - // overriding some of the ArrayList-methods - /** - * Adds a Chunk, an Anchor or another Phrase - * to this Phrase. + * Adds a Chunk, an Anchor or another Phrase to this Phrase. * - * @param index index at which the specified element is to be inserted - * @param element an object of type Chunk, Anchor or Phrase - * @throws ClassCastException when you try to add something that isn't a Chunk, Anchor or Phrase + * @param index index at which the specified element is to be inserted + * @param element an object of type Chunk, Anchor or Phrase + * @throws ClassCastException when you try to add something that isn't a Chunk, Anchor or + * Phrase */ public void add(int index, Element element) { - if (element == null) return; + if (element == null) { + return; + } try { if (element.type() == Element.CHUNK) { Chunk chunk = (Chunk) element; @@ -284,43 +355,48 @@ public void add(int index, Element element) { chunk.setHyphenation(hyphenation); } super.add(index, chunk); - } - else if (element.type() == Element.PHRASE || - element.type() == Element.ANCHOR || - element.type() == Element.ANNOTATION || - element.type() == Element.TABLE || // line added by David Freels - element.type() == Element.YMARK || - element.type() == Element.MARKED) { + } else if (element.type() == Element.PHRASE || + element.type() == Element.ANCHOR || + element.type() == Element.ANNOTATION || + element.type() == Element.TABLE || // line added by David Freels + element.type() == Element.YMARK || + element.type() == Element.MARKED) { super.add(index, element); - } - else { + } else { throw new ClassCastException(String.valueOf(element.type())); } - } - catch(ClassCastException cce) { - throw new ClassCastException(MessageLocalization.getComposedMessage("insertion.of.illegal.element.1", cce.getMessage())); + } catch (ClassCastException cce) { + throw new ClassCastException( + MessageLocalization.getComposedMessage("insertion.of.illegal.element.1", cce.getMessage())); } } /** - * Adds a Chunk, Anchor or another Phrase - * to this Phrase. + * Adds a Chunk, Anchor or another Phrase to this Phrase. * - * @param o an object of type Chunk, Anchor or Phrase - * @return a boolean - * @throws ClassCastException when you try to add something that isn't a Chunk, Anchor or Phrase + * @param o an object of type Chunk, Anchor or Phrase + * @return a boolean + * @throws ClassCastException when you try to add something that isn't a Chunk, Anchor or + * Phrase */ public boolean add(String o) { - if (o == null) return false; + if (o == null) { + return false; + } return super.add(new Chunk(o, font)); } + + // other methods that change the member variables + public boolean add(Element element) { - if (element == null) return false; + if (element == null) { + return false; + } if (element instanceof RtfElementInterface) { return super.add(element); } try { - switch(element.type()) { + switch (element.type()) { case Element.CHUNK: return addChunk((Chunk) element); case Element.PHRASE: @@ -347,22 +423,22 @@ public boolean add(Element element) { case Element.LIST: case Element.YMARK: return super.add(element); - default: - throw new ClassCastException(String.valueOf(element.type())); + default: + throw new ClassCastException(String.valueOf(element.type())); } - } - catch(ClassCastException cce) { - throw new ClassCastException(MessageLocalization.getComposedMessage("insertion.of.illegal.element.1", cce.getMessage())); + } catch (ClassCastException cce) { + throw new ClassCastException( + MessageLocalization.getComposedMessage("insertion.of.illegal.element.1", cce.getMessage())); } } /** - * Adds a collection of Chunks - * to this Phrase. + * Adds a collection of Chunks to this Phrase. * - * @param collection a collection of Chunks, Anchors and Phrases. - * @return true if the action succeeded, false if not. - * @throws ClassCastException when you try to add something that isn't a Chunk, Anchor or Phrase + * @param collection a collection of Chunks, Anchors and Phrases. + * @return true if the action succeeded, false if not. + * @throws ClassCastException when you try to add something that isn't a Chunk, Anchor or + * Phrase */ public boolean addAll(Collection collection) { for (Element o : collection) { @@ -371,11 +447,13 @@ public boolean addAll(Collection collection) { return true; } + // methods to retrieve information + /** * Adds a Chunk. *

    - * This method is a hack to solve a problem I had with phrases that were split between chunks - * in the wrong place. + * This method is a hack to solve a problem I had with phrases that were split between chunks in the wrong place. + * * @param chunk a Chunk to add to the Phrase * @return true if adding the Chunk succeeded */ @@ -396,8 +474,7 @@ protected boolean addChunk(Chunk chunk) { previous.append(c); return true; } - } - catch(ClassCastException cce) { + } catch (ClassCastException cce) { } } Chunk newChunk = new Chunk(c, f); @@ -411,38 +488,16 @@ protected boolean addChunk(Chunk chunk) { /** * Adds a Object to the Paragraph. * - * @param object the object to add. + * @param object the object to add. */ protected void addSpecial(Object object) { super.add((Element) object); } - // other methods that change the member variables - - /** - * Sets the leading of this phrase. - * - * @param leading the new leading - */ - - public void setLeading(float leading) { - this.leading = leading; - } - - /** - * Sets the main font of this phrase. - * @param font the new font - */ - public void setFont(Font font) { - this.font = font; - } - - // methods to retrieve information - /** * Gets the leading of this phrase. * - * @return the linespacing + * @return the linespacing */ public float getLeading() { if (Float.isNaN(leading) && font != null) { @@ -451,10 +506,20 @@ public float getLeading() { return leading; } + /** + * Sets the leading of this phrase. + * + * @param leading the new leading + */ + + public void setLeading(float leading) { + this.leading = leading; + } + /** * Checks you if the leading of this phrase is defined. * - * @return true if the leading is defined + * @return true if the leading is defined */ public boolean hasLeading() { return !Float.isNaN(leading); @@ -463,16 +528,27 @@ public boolean hasLeading() { /** * Gets the font of the first Chunk that appears in this Phrase. * - * @return a Font + * @return a Font */ public Font getFont() { return font; } /** - * Returns the content as a String object. - * This method differs from toString because toString will return an ArrayList - * with the toString value of the Chunks in this Phrase. + * Sets the main font of this phrase. + * + * @param font the new font + */ + public void setFont(Font font) { + this.font = font; + } + + // kept for historical reasons; people should use FontSelector + // eligible for deprecation, but the methods are mentioned in the book p277. + + /** + * Returns the content as a String object. This method differs from toString because toString will return an + * ArrayList with the toString value of the Chunks in this Phrase. * * @return an String */ @@ -487,25 +563,26 @@ public String getContent() { /** * Checks is this Phrase contains no or 1 empty Chunk. * - * @return false if the Phrase + * @return false if the Phrase * contains more than one or more non-emptyChunks. */ public boolean isEmpty() { - switch(size()) { + switch (size()) { case 0: return true; case 1: Element element = get(0); return element.type() == Element.CHUNK && ((Chunk) element).isEmpty(); default: - return false; + return false; } } /** * Getter for the hyphenation settings. - * @return a HyphenationEvent - * @since 2.1.2 + * + * @return a HyphenationEvent + * @since 2.1.2 */ public HyphenationEvent getHyphenation() { return hyphenation; @@ -513,76 +590,12 @@ public HyphenationEvent getHyphenation() { /** * Setter for the hyphenation. - * @param hyphenation a HyphenationEvent instance - * @since 2.1.2 + * + * @param hyphenation a HyphenationEvent instance + * @since 2.1.2 */ public void setHyphenation(HyphenationEvent hyphenation) { this.hyphenation = hyphenation; } - // kept for historical reasons; people should use FontSelector - // eligible for deprecation, but the methods are mentioned in the book p277. - - /** - * Constructs a Phrase that can be used in the static getInstance() method. - * @param dummy a dummy parameter - */ - private Phrase(boolean dummy) { - } - - /** - * Gets a special kind of Phrase that changes some characters into corresponding symbols. - * @param string input - * @return a newly constructed Phrase - */ - public static final Phrase getInstance(String string) { - return getInstance(16, string, new Font()); - } - - /** - * Gets a special kind of Phrase that changes some characters into corresponding symbols. - * @param leading leading spaces - * @param string input - * @return a newly constructed Phrase - */ - public static final Phrase getInstance(int leading, String string) { - return getInstance(leading, string, new Font()); - } - - /** - * Gets a special kind of Phrase that changes some characters into corresponding symbols. - * @param leading leading spaces - * @param string input - * @param font font to be used - * @return a newly constructed Phrase - */ - public static final Phrase getInstance(int leading, String string, Font font) { - Phrase p = new Phrase(true); - p.setLeading(leading); - p.font = font; - if (font.getFamily() != Font.SYMBOL && font.getFamily() != Font.ZAPFDINGBATS && font.getBaseFont() == null) { - int index; - while((index = SpecialSymbol.index(string)) > -1) { - if (index > 0) { - String firstPart = string.substring(0, index); - p.add(new Chunk(firstPart, font)); - string = string.substring(index); - } - Font symbol = new Font(Font.SYMBOL, font.getSize(), font.getStyle(), font.getColor()); - StringBuilder buf = new StringBuilder(); - buf.append(SpecialSymbol.getCorrespondingSymbol(string.charAt(0))); - string = string.substring(1); - while (SpecialSymbol.index(string) == 0) { - buf.append(SpecialSymbol.getCorrespondingSymbol(string.charAt(0))); - string = string.substring(1); - } - p.add(new Chunk(buf.toString(), symbol)); - } - } - if (string != null && string.length() != 0) { - p.add(new Chunk(string, font)); - } - return p; - } - } diff --git a/openpdf/src/main/java/com/lowagie/text/Rectangle.java b/openpdf/src/main/java/com/lowagie/text/Rectangle.java index cbec8b867..bbb176864 100644 --- a/openpdf/src/main/java/com/lowagie/text/Rectangle.java +++ b/openpdf/src/main/java/com/lowagie/text/Rectangle.java @@ -54,13 +54,11 @@ /** * A Rectangle is the representation of a geometric figure. - * - * Rectangles support constant width borders using - * {@link #setBorderWidth(float)}and {@link #setBorder(int)}. They also support - * borders that vary in width/color on each side using methods like - * {@link #setBorderWidthLeft(float)}or + *

    + * Rectangles support constant width borders using {@link #setBorderWidth(float)}and {@link #setBorder(int)}. They also + * support borders that vary in width/color on each side using methods like {@link #setBorderWidthLeft(float)}or * {@link #setBorderColorLeft(java.awt.Color)}. - * + * * @see Element * @see Table * @see Cell @@ -68,924 +66,947 @@ */ public class Rectangle implements Element { - // CONSTANTS: + // CONSTANTS: + + /** + * This is the value that will be used as undefined . + */ + public static final int UNDEFINED = -1; + + /** + * This represents one side of the border of the Rectangle. + */ + public static final int TOP = 1; + + /** + * This represents one side of the border of the Rectangle. + */ + public static final int BOTTOM = 2; + + /** + * This represents one side of the border of the Rectangle. + */ + public static final int LEFT = 4; + + /** + * This represents one side of the border of the Rectangle. + */ + public static final int RIGHT = 8; + + /** + * This represents a rectangle without borders. + */ + public static final int NO_BORDER = 0; + + /** + * This represents a type of border. + */ + public static final int BOX = TOP + BOTTOM + LEFT + RIGHT; + + // MEMBER VARIABLES: + + /** + * the lower left x-coordinate. + */ + protected float llx; + + /** + * the lower left y-coordinate. + */ + protected float lly; + + /** + * the upper right x-coordinate. + */ + protected float urx; + + /** + * the upper right y-coordinate. + */ + protected float ury; + + /** + * the offset relative to a certain top. + */ + protected float offsetToTop; + + /** + * The rotation of the Rectangle + */ + protected int rotation = 0; + + /** + * This is the color of the background of this rectangle. + */ + protected Color backgroundColor = null; + + /** + * This represents the status of the 4 sides of the rectangle. + */ + protected int border = UNDEFINED; + + /** + * Whether variable width/color borders are used. + */ + protected boolean useVariableBorders = false; + + /** + * This is the width of the border around this rectangle. + */ + protected float borderWidth = UNDEFINED; + + /** + * The width of the left border of this rectangle. + */ + protected float borderWidthLeft = UNDEFINED; + + /** + * The width of the right border of this rectangle. + */ + protected float borderWidthRight = UNDEFINED; + + /** + * The width of the top border of this rectangle. + */ + protected float borderWidthTop = UNDEFINED; + + /** + * The width of the bottom border of this rectangle. + */ + protected float borderWidthBottom = UNDEFINED; + + /** + * The color of the border of this rectangle. + */ + protected Color borderColor = null; + + /** + * The color of the left border of this rectangle. + */ + protected Color borderColorLeft = null; + + /** + * The color of the right border of this rectangle. + */ + protected Color borderColorRight = null; + + /** + * The color of the top border of this rectangle. + */ + protected Color borderColorTop = null; + + /** + * The color of the bottom border of this rectangle. + */ + protected Color borderColorBottom = null; + + // CONSTRUCTORS: + + /** + * Constructs a Rectangle -object. + * + * @param llx lower left x + * @param lly lower left y + * @param urx upper right x + * @param ury upper right y + */ + public Rectangle(float llx, float lly, float urx, float ury) { + this.llx = llx; + this.lly = lly; + this.urx = urx; + this.ury = ury; + } + + /** + * Constructs a Rectangle -object starting from the origin (0, 0). + * + * @param urx upper right x + * @param ury upper right y + */ + public Rectangle(float urx, float ury) { + this(0, 0, urx, ury); + } + + // OJO... Modificacion de + // flopez------------------------------------------------- + + /** + * Constructs a Rectangle -object. + * + * @param llx lower left x + * @param lly lower left y + * @param urx upper right x + * @param ury upper right y + * @param rotation 0, 90, 180, or 270 grades + */ + public Rectangle(float llx, float lly, float urx, float ury, int rotation) { + this(llx, lly, urx, ury); + setRotation(rotation); + } + + /** + * Constructs a Rectangle -object starting from the origin (0, 0). + * + * @param urx upper right x + * @param ury upper right y + * @param rotation 0, 90, 180, or 270 grades + */ + public Rectangle(float urx, float ury, int rotation) { + this(0, 0, urx, ury); + setRotation(rotation); + } + + /** + * Constructs a Rectangle -object. + * + * @param rect another Rectangle + */ + public Rectangle(Rectangle rect) { + this(rect.llx, rect.lly, rect.urx, rect.ury); + cloneNonPositionParameters(rect); + } + + // ****************************************************************************** + + /** + * Processes the element by adding it (or the different parts) to an + * ElementListener. + * + * @param listener an ElementListener + * @return true if the element was processed successfully + */ + @Override + public boolean process(ElementListener listener) { + try { + return listener.add(this); + } catch (DocumentException de) { + return false; + } + } + + // IMPLEMENTATION OF THE ELEMENT INTERFACE:e + + /** + * Gets the type of the text element. + * + * @return a type + */ + @Override + public int type() { + return Element.RECTANGLE; + } + + /** + * Gets all the chunks in this element. + * + * @return an ArrayList + */ + @Override + public ArrayList getChunks() { + return new ArrayList<>(); + } + + /** + * @see com.lowagie.text.Element#isContent() + * @since iText 2.0.8 + */ + @Override + public boolean isContent() { + return true; + } - /** This is the value that will be used as undefined . */ - public static final int UNDEFINED = -1; + /** + * @see com.lowagie.text.Element#isNestable() + * @since iText 2.0.8 + */ + @Override + public boolean isNestable() { + return false; + } - /** This represents one side of the border of the Rectangle. */ - public static final int TOP = 1; + /** + * Returns the lower left x-coordinate. + * + * @return the lower left x-coordinate + */ + public float getLeft() { + return llx; + } - /** This represents one side of the border of the Rectangle. */ - public static final int BOTTOM = 2; + // METHODS TO GET/SET THE DIMENSIONS: - /** This represents one side of the border of the Rectangle. */ - public static final int LEFT = 4; + /** + * Sets the lower left x-coordinate. + * + * @param llx the new value + */ + public void setLeft(float llx) { + this.llx = llx; + } - /** This represents one side of the border of the Rectangle. */ - public static final int RIGHT = 8; + /** + * Returns the lower left x-coordinate, considering a given margin. + * + * @param margin a margin + * @return the lower left x-coordinate + */ + public float getLeft(float margin) { + return llx + margin; + } - /** This represents a rectangle without borders. */ - public static final int NO_BORDER = 0; + /** + * Returns the upper right x-coordinate. + * + * @return the upper right x-coordinate + */ + public float getRight() { + return urx; + } - /** This represents a type of border. */ - public static final int BOX = TOP + BOTTOM + LEFT + RIGHT; + /** + * Sets the upper right x-coordinate. + * + * @param urx the new value + */ + public void setRight(float urx) { + this.urx = urx; + } - // MEMBER VARIABLES: + /** + * Returns the upper right x-coordinate, considering a given margin. + * + * @param margin a margin + * @return the upper right x-coordinate + */ + public float getRight(float margin) { + return urx - margin; + } - /** the lower left x-coordinate. */ - protected float llx; + /** + * Returns the width of the rectangle. + * + * @return the width + */ + public float getWidth() { + return urx - llx; + } + + /** + * Returns the upper right y-coordinate. + * + * @return the upper right y-coordinate + */ + public float getTop() { + return ury; + } + + /** + * Sets the upper right y-coordinate. + * + * @param ury the new value + */ + public void setTop(float ury) { + this.ury = ury; + } + + /** + * Returns the upper right y-coordinate, considering a given margin. + * + * @param margin a margin + * @return the upper right y-coordinate + */ + public float getTop(float margin) { + return ury - margin; + } - /** the lower left y-coordinate. */ - protected float lly; - - /** the upper right x-coordinate. */ - protected float urx; - - /** the upper right y-coordinate. */ - protected float ury; - - /** the offset relative to a certain top. */ - protected float offsetToTop; - - /** The rotation of the Rectangle */ - protected int rotation = 0; - - /** This is the color of the background of this rectangle. */ - protected Color backgroundColor = null; - - /** This represents the status of the 4 sides of the rectangle. */ - protected int border = UNDEFINED; - - /** Whether variable width/color borders are used. */ - protected boolean useVariableBorders = false; - - /** This is the width of the border around this rectangle. */ - protected float borderWidth = UNDEFINED; - - /** The width of the left border of this rectangle. */ - protected float borderWidthLeft = UNDEFINED; - - /** The width of the right border of this rectangle. */ - protected float borderWidthRight = UNDEFINED; - - /** The width of the top border of this rectangle. */ - protected float borderWidthTop = UNDEFINED; - - /** The width of the bottom border of this rectangle. */ - protected float borderWidthBottom = UNDEFINED; - - /** The color of the border of this rectangle. */ - protected Color borderColor = null; - - /** The color of the left border of this rectangle. */ - protected Color borderColorLeft = null; - - /** The color of the right border of this rectangle. */ - protected Color borderColorRight = null; - - /** The color of the top border of this rectangle. */ - protected Color borderColorTop = null; - - /** The color of the bottom border of this rectangle. */ - protected Color borderColorBottom = null; - - // CONSTRUCTORS: - - /** - * Constructs a Rectangle -object. - * - * @param llx - * lower left x - * @param lly - * lower left y - * @param urx - * upper right x - * @param ury - * upper right y - */ - public Rectangle(float llx, float lly, float urx, float ury) { - this.llx = llx; - this.lly = lly; - this.urx = urx; - this.ury = ury; - } - - /** - * Constructs a Rectangle -object starting from the origin (0, - * 0). - * - * @param urx - * upper right x - * @param ury - * upper right y - */ - public Rectangle(float urx, float ury) { - this(0, 0, urx, ury); - } - - // OJO... Modificacion de - // flopez------------------------------------------------- - /** - * Constructs a Rectangle -object. - * - * @param llx - * lower left x - * @param lly - * lower left y - * @param urx - * upper right x - * @param ury - * upper right y - * @param rotation - * 0, 90, 180, or 270 grades - */ - public Rectangle(float llx, float lly, float urx, float ury, int rotation) { - this(llx, lly, urx, ury); - setRotation(rotation); - } - - /** - * Constructs a Rectangle -object starting from the origin (0, - * 0). - * - * @param urx - * upper right x - * @param ury - * upper right y - * @param rotation - * 0, 90, 180, or 270 grades - */ - public Rectangle(float urx, float ury, int rotation) { - this(0, 0, urx, ury); - setRotation(rotation); - } - - /** - * Sets the rotation of the rectangle. Valid values are 0, 90, 180, and 270. - * - * @param rotation - * the new rotation value - * @since iText 5.0.6 - */ - public void setRotation(final int rotation) { - int mod = rotation % 360; - if ((mod == 90) || (mod == 180) || (mod == 270)) { - this.rotation = mod; - } else { - this.rotation = 0; - } - } - - // ****************************************************************************** - - /** - * Constructs a Rectangle -object. - * - * @param rect - * another Rectangle - */ - public Rectangle(Rectangle rect) { - this(rect.llx, rect.lly, rect.urx, rect.ury); - cloneNonPositionParameters(rect); - } - - // IMPLEMENTATION OF THE ELEMENT INTERFACE:e - - /** - * Processes the element by adding it (or the different parts) to an - * ElementListener. - * - * @param listener - * an ElementListener - * @return true if the element was processed successfully - */ - @Override - public boolean process(ElementListener listener) { - try { - return listener.add(this); - } catch (DocumentException de) { - return false; - } - } - - /** - * Gets the type of the text element. - * - * @return a type - */ - @Override - public int type() { - return Element.RECTANGLE; - } - - /** - * Gets all the chunks in this element. - * - * @return an ArrayList - */ - @Override - public ArrayList getChunks() { - return new ArrayList<>(); - } - - /** - * @see com.lowagie.text.Element#isContent() - * @since iText 2.0.8 - */ - @Override - public boolean isContent() { - return true; - } - - /** - * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 - */ - @Override - public boolean isNestable() { - return false; - } - - // METHODS TO GET/SET THE DIMENSIONS: - - /** - * Sets the lower left x-coordinate. - * - * @param llx - * the new value - */ - public void setLeft(float llx) { - this.llx = llx; - } - - /** - * Returns the lower left x-coordinate. - * - * @return the lower left x-coordinate - */ - public float getLeft() { - return llx; - } - - /** - * Returns the lower left x-coordinate, considering a given margin. - * - * @param margin - * a margin - * @return the lower left x-coordinate - */ - public float getLeft(float margin) { - return llx + margin; - } - - /** - * Sets the upper right x-coordinate. - * - * @param urx - * the new value - */ - public void setRight(float urx) { - this.urx = urx; - } - - /** - * Returns the upper right x-coordinate. - * - * @return the upper right x-coordinate - */ - public float getRight() { - return urx; - } - - /** - * Returns the upper right x-coordinate, considering a given margin. - * - * @param margin - * a margin - * @return the upper right x-coordinate - */ - public float getRight(float margin) { - return urx - margin; - } - - /** - * Returns the width of the rectangle. - * - * @return the width - */ - public float getWidth() { - return urx - llx; - } - - /** - * Sets the upper right y-coordinate. - * - * @param ury - * the new value - */ - public void setTop(float ury) { - this.ury = ury; - } - - /** - * Returns the upper right y-coordinate. - * - * @return the upper right y-coordinate - */ - public float getTop() { - return ury; - } - - /** - * Returns the upper right y-coordinate, considering a given margin. - * - * @param margin - * a margin - * @return the upper right y-coordinate - */ - public float getTop(float margin) { - return ury - margin; - } - - /** - * Gets offset relative to top. - * - * @return offset relative to top - */ - public float getRelativeTop(){ - return offsetToTop; - } - - /** - * Sets offset relative to top. - * - * @param offsetToTop the new offset - */ - public void setRelativeTop(float offsetToTop){ - this.offsetToTop = offsetToTop; - } - /** - * Sets the lower left y-coordinate. - * - * @param lly - * the new value - */ - public void setBottom(float lly) { - this.lly = lly; - } - - /** - * Returns the lower left y-coordinate. - * - * @return the lower left y-coordinate - */ - public float getBottom() { - return lly; - } - - /** - * Returns the lower left y-coordinate, considering a given margin. - * - * @param margin - * a margin - * @return the lower left y-coordinate - */ - public float getBottom(float margin) { - return lly + margin; - } - - /** - * Returns the height of the rectangle. - * - * @return the height - */ - public float getHeight() { - return ury - lly; - } - - /** - * Normalizes the rectangle. Switches lower left with upper right if - * necessary. - */ - public void normalize() { - if (llx > urx) { - float a = llx; - llx = urx; - urx = a; - } - if (lly > ury) { - float a = lly; - lly = ury; - ury = a; - } - } - - // METHODS TO GET/SET THE ROTATION: - - /** - * Gets the rotation of the rectangle - * - * @return a rotation value - */ - public int getRotation() { - return rotation; - } - - /** - * Rotates the rectangle. Swaps the values of llx and lly and of urx and ury. - * - * @return the rotated Rectangle - */ - public Rectangle rotate() { - Rectangle rect = new Rectangle(lly, llx, ury, urx); - rect.rotation = rotation + 90; - rect.rotation %= 360; - return rect; - } - - // METHODS TO GET/SET THE BACKGROUND COLOR: - - /** - * Gets the backgroundcolor. - * - * @return a Color - */ - public Color getBackgroundColor() { - return backgroundColor; - } - - /** - * Sets the backgroundcolor of the rectangle. - * - * @param backgroundColor - * a Color - */ - - public void setBackgroundColor(Color backgroundColor) { - this.backgroundColor = backgroundColor; - } - - /** - * Gets the grayscale. - * - * @return the grayscale color of the background or 0 if the background has no - * grayscale color. - */ - public float getGrayFill() { - if (backgroundColor instanceof GrayColor) - return ((GrayColor) backgroundColor).getGray(); - return 0; - } - - /** - * Sets the the background color to a grayscale value. - * - * @param value - * the new grayscale value - */ - public void setGrayFill(float value) { - backgroundColor = new GrayColor(value); - } - - // METHODS TO GET/SET THE BORDER: - - /** - * Returns the exact type of the border. - * - * @return a value - */ - public int getBorder() { - return border; - } - - /** - * Indicates whether some type of border is set. - * - * @return a boolean - */ - public boolean hasBorders() { - switch (border) { - case UNDEFINED: - case NO_BORDER: - return false; - default: - return borderWidth > 0 || borderWidthLeft > 0 || borderWidthRight > 0 - || borderWidthTop > 0 || borderWidthBottom > 0; - } - } - - /** - * Indicates whether the specified type of border is set. - * - * @param type - * the type of border - * @return a boolean - */ - public boolean hasBorder(int type) { - if (border == UNDEFINED) - return false; - return (border & type) == type; - } - - /** - * Enables/Disables the border on the specified sides. The border is specified - * as an integer bitwise combination of the constants: - * LEFT, RIGHT, TOP, BOTTOM. - * - * @see #enableBorderSide(int) - * @see #disableBorderSide(int) - * @param border - * the new value - */ - public void setBorder(int border) { - this.border = border; - } - - /** - * Indicates whether variable width borders are being used. Returns true if - * setBorderWidthLeft, setBorderWidthRight, - * setBorderWidthTop, or setBorderWidthBottom has been called. - * - * @return true if variable width borders are in use - */ - public boolean isUseVariableBorders() { - return useVariableBorders; - } - - /** - * Sets a parameter indicating if the rectangle has variable borders - * - * @param useVariableBorders - * indication if the rectangle has variable borders - */ - public void setUseVariableBorders(boolean useVariableBorders) { - this.useVariableBorders = useVariableBorders; - } - - /** - * Enables the border on the specified side. - * - * @param side - * the side to enable. One of LEFT, RIGHT, TOP, BOTTOM - */ - public void enableBorderSide(int side) { - if (border == UNDEFINED) - border = 0; - border |= side; - } - - /** - * Disables the border on the specified side. - * - * @param side - * the side to disable. One of LEFT, RIGHT, TOP, BOTTOM - */ - public void disableBorderSide(int side) { - if (border == UNDEFINED) - border = 0; - border &= ~side; - } - - // METHODS TO GET/SET THE BORDER WIDTH: - - /** - * Gets the borderwidth. - * - * @return a value - */ - public float getBorderWidth() { - return borderWidth; - } - - /** - * Sets the borderwidth of the table. - * - * @param borderWidth - * the new value - */ - public void setBorderWidth(float borderWidth) { - this.borderWidth = borderWidth; - } - - /** - * Helper function returning the border width of a specific side. - * - * @param variableWidthValue - * a variable width (could be undefined) - * @param side - * the border you want to check - * @return the variableWidthValue if not undefined, otherwise the borderWidth - */ - private float getVariableBorderWidth(float variableWidthValue, int side) { - if ((border & side) != 0) - return variableWidthValue != UNDEFINED ? variableWidthValue : borderWidth; - return 0; - } - - /** - * Helper function updating the border flag for a side based on the specified - * width. A width of 0 will disable the border on that side. Any other width - * enables it. - * - * @param width - * width of border - * @param side - * border side constant - */ - private void updateBorderBasedOnWidth(float width, int side) { - useVariableBorders = true; - if (width > 0) - enableBorderSide(side); - else - disableBorderSide(side); - } - - /** - * Gets the width of the left border. - * - * @return a width - */ - public float getBorderWidthLeft() { - return getVariableBorderWidth(borderWidthLeft, LEFT); - } - - /** - * Sets the width of the left border. - * - * @param borderWidthLeft - * a width - */ - public void setBorderWidthLeft(float borderWidthLeft) { - this.borderWidthLeft = borderWidthLeft; - updateBorderBasedOnWidth(borderWidthLeft, LEFT); - } - - /** - * Gets the width of the right border. - * - * @return a width - */ - public float getBorderWidthRight() { - return getVariableBorderWidth(borderWidthRight, RIGHT); - } - - /** - * Sets the width of the right border. - * - * @param borderWidthRight - * a width - */ - public void setBorderWidthRight(float borderWidthRight) { - this.borderWidthRight = borderWidthRight; - updateBorderBasedOnWidth(borderWidthRight, RIGHT); - } - - /** - * Gets the width of the top border. - * - * @return a width - */ - public float getBorderWidthTop() { - return getVariableBorderWidth(borderWidthTop, TOP); - } - - /** - * Sets the width of the top border. - * - * @param borderWidthTop - * a width - */ - public void setBorderWidthTop(float borderWidthTop) { - this.borderWidthTop = borderWidthTop; - updateBorderBasedOnWidth(borderWidthTop, TOP); - } - - /** - * Gets the width of the bottom border. - * - * @return a width - */ - public float getBorderWidthBottom() { - return getVariableBorderWidth(borderWidthBottom, BOTTOM); - } - - /** - * Sets the width of the bottom border. - * - * @param borderWidthBottom - * a width - */ - public void setBorderWidthBottom(float borderWidthBottom) { - this.borderWidthBottom = borderWidthBottom; - updateBorderBasedOnWidth(borderWidthBottom, BOTTOM); - } - - // METHODS TO GET/SET THE BORDER COLOR: - - /** - * Gets the color of the border. - * - * @return a Color - */ - public Color getBorderColor() { - return borderColor; - } - - /** - * Sets the color of the border. - * - * @param borderColor - * a Color - */ - public void setBorderColor(Color borderColor) { - this.borderColor = borderColor; - } - - /** - * Gets the color of the left border. - * - * @return a Color - */ - public Color getBorderColorLeft() { - if (borderColorLeft == null) - return borderColor; - return borderColorLeft; - } - - /** - * Sets the color of the left border. - * - * @param borderColorLeft - * a Color - */ - public void setBorderColorLeft(Color borderColorLeft) { - this.borderColorLeft = borderColorLeft; - } - - /** - * Gets the color of the right border. - * - * @return a Color - */ - public Color getBorderColorRight() { - if (borderColorRight == null) - return borderColor; - return borderColorRight; - } - - /** - * Sets the color of the right border. - * - * @param borderColorRight - * a Color - */ - public void setBorderColorRight(Color borderColorRight) { - this.borderColorRight = borderColorRight; - } - - /** - * Gets the color of the top border. - * - * @return a Color - */ - public Color getBorderColorTop() { - if (borderColorTop == null) - return borderColor; - return borderColorTop; - } - - /** - * Sets the color of the top border. - * - * @param borderColorTop - * a Color - */ - public void setBorderColorTop(Color borderColorTop) { - this.borderColorTop = borderColorTop; - } - - /** - * Gets the color of the bottom border. - * - * @return a Color - */ - public Color getBorderColorBottom() { - if (borderColorBottom == null) - return borderColor; - return borderColorBottom; - } - - /** - * Sets the color of the bottom border. - * - * @param borderColorBottom - * a Color - */ - public void setBorderColorBottom(Color borderColorBottom) { - this.borderColorBottom = borderColorBottom; - } - - // SPECIAL METHODS: - - /** - * Gets a Rectangle that is altered to fit on the page. - * - * @param top - * the top position - * @param bottom - * the bottom position - * @return a Rectangle - */ - public Rectangle rectangle(float top, float bottom) { - Rectangle tmp = new Rectangle(this); - if (getTop() > top) { - tmp.setTop(top); - tmp.disableBorderSide(TOP); - } - if (getBottom() < bottom) { - tmp.setBottom(bottom); - tmp.disableBorderSide(BOTTOM); - } - return tmp; - } - - /** - * Copies each of the parameters, except the position, from a - * Rectangle object - * - * @param rect - * Rectangle to copy from - */ - public void cloneNonPositionParameters(Rectangle rect) { - this.rotation = rect.rotation; - this.backgroundColor = rect.backgroundColor; - this.border = rect.border; - this.useVariableBorders = rect.useVariableBorders; - this.borderWidth = rect.borderWidth; - this.borderWidthLeft = rect.borderWidthLeft; - this.borderWidthRight = rect.borderWidthRight; - this.borderWidthTop = rect.borderWidthTop; - this.borderWidthBottom = rect.borderWidthBottom; - this.borderColor = rect.borderColor; - this.borderColorLeft = rect.borderColorLeft; - this.borderColorRight = rect.borderColorRight; - this.borderColorTop = rect.borderColorTop; - this.borderColorBottom = rect.borderColorBottom; - } - - /** - * Copies each of the parameters, except the position, from a - * Rectangle object if the value is set there - * - * @param rect - * Rectangle to copy from - */ - public void softCloneNonPositionParameters(Rectangle rect) { - if (rect.rotation != 0) - this.rotation = rect.rotation; - if (rect.backgroundColor != null) - this.backgroundColor = rect.backgroundColor; - if (rect.border != UNDEFINED) - this.border = rect.border; - if (useVariableBorders) - this.useVariableBorders = rect.useVariableBorders; - if (rect.borderWidth != UNDEFINED) - this.borderWidth = rect.borderWidth; - if (rect.borderWidthLeft != UNDEFINED) - this.borderWidthLeft = rect.borderWidthLeft; - if (rect.borderWidthRight != UNDEFINED) - this.borderWidthRight = rect.borderWidthRight; - if (rect.borderWidthTop != UNDEFINED) - this.borderWidthTop = rect.borderWidthTop; - if (rect.borderWidthBottom != UNDEFINED) - this.borderWidthBottom = rect.borderWidthBottom; - if (rect.borderColor != null) - this.borderColor = rect.borderColor; - if (rect.borderColorLeft != null) - this.borderColorLeft = rect.borderColorLeft; - if (rect.borderColorRight != null) - this.borderColorRight = rect.borderColorRight; - if (rect.borderColorTop != null) - this.borderColorTop = rect.borderColorTop; - if (rect.borderColorBottom != null) - this.borderColorBottom = rect.borderColorBottom; - } - - /** - * @return a String representation of the rectangle - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - StringBuilder buf = new StringBuilder("Rectangle: "); - buf.append(getWidth()); - buf.append('x'); - buf.append(getHeight()); - buf.append(" (rot: "); - buf.append(rotation); - buf.append(" degrees)"); - return buf.toString(); - } + /** + * Gets offset relative to top. + * + * @return offset relative to top + */ + public float getRelativeTop() { + return offsetToTop; + } + + /** + * Sets offset relative to top. + * + * @param offsetToTop the new offset + */ + public void setRelativeTop(float offsetToTop) { + this.offsetToTop = offsetToTop; + } + + /** + * Returns the lower left y-coordinate. + * + * @return the lower left y-coordinate + */ + public float getBottom() { + return lly; + } + + /** + * Sets the lower left y-coordinate. + * + * @param lly the new value + */ + public void setBottom(float lly) { + this.lly = lly; + } + + /** + * Returns the lower left y-coordinate, considering a given margin. + * + * @param margin a margin + * @return the lower left y-coordinate + */ + public float getBottom(float margin) { + return lly + margin; + } + + /** + * Returns the height of the rectangle. + * + * @return the height + */ + public float getHeight() { + return ury - lly; + } + + /** + * Normalizes the rectangle. Switches lower left with upper right if necessary. + */ + public void normalize() { + if (llx > urx) { + float a = llx; + llx = urx; + urx = a; + } + if (lly > ury) { + float a = lly; + lly = ury; + ury = a; + } + } + + /** + * Gets the rotation of the rectangle + * + * @return a rotation value + */ + public int getRotation() { + return rotation; + } + + // METHODS TO GET/SET THE ROTATION: + + /** + * Sets the rotation of the rectangle. Valid values are 0, 90, 180, and 270. + * + * @param rotation the new rotation value + * @since iText 5.0.6 + */ + public void setRotation(final int rotation) { + int mod = rotation % 360; + if ((mod == 90) || (mod == 180) || (mod == 270)) { + this.rotation = mod; + } else { + this.rotation = 0; + } + } + + /** + * Rotates the rectangle. Swaps the values of llx and lly and of urx and ury. + * + * @return the rotated Rectangle + */ + public Rectangle rotate() { + Rectangle rect = new Rectangle(lly, llx, ury, urx); + rect.rotation = rotation + 90; + rect.rotation %= 360; + return rect; + } + + // METHODS TO GET/SET THE BACKGROUND COLOR: + + /** + * Gets the backgroundcolor. + * + * @return a Color + */ + public Color getBackgroundColor() { + return backgroundColor; + } + + /** + * Sets the backgroundcolor of the rectangle. + * + * @param backgroundColor a Color + */ + + public void setBackgroundColor(Color backgroundColor) { + this.backgroundColor = backgroundColor; + } + + /** + * Gets the grayscale. + * + * @return the grayscale color of the background or 0 if the background has no grayscale color. + */ + public float getGrayFill() { + if (backgroundColor instanceof GrayColor) { + return ((GrayColor) backgroundColor).getGray(); + } + return 0; + } + + /** + * Sets the the background color to a grayscale value. + * + * @param value the new grayscale value + */ + public void setGrayFill(float value) { + backgroundColor = new GrayColor(value); + } + + // METHODS TO GET/SET THE BORDER: + + /** + * Returns the exact type of the border. + * + * @return a value + */ + public int getBorder() { + return border; + } + + /** + * Enables/Disables the border on the specified sides. The border is specified as an integer bitwise combination of + * the constants: + * LEFT, RIGHT, TOP, BOTTOM. + * + * @param border the new value + * @see #enableBorderSide(int) + * @see #disableBorderSide(int) + */ + public void setBorder(int border) { + this.border = border; + } + + /** + * Indicates whether some type of border is set. + * + * @return a boolean + */ + public boolean hasBorders() { + switch (border) { + case UNDEFINED: + case NO_BORDER: + return false; + default: + return borderWidth > 0 || borderWidthLeft > 0 || borderWidthRight > 0 + || borderWidthTop > 0 || borderWidthBottom > 0; + } + } + + /** + * Indicates whether the specified type of border is set. + * + * @param type the type of border + * @return a boolean + */ + public boolean hasBorder(int type) { + if (border == UNDEFINED) { + return false; + } + return (border & type) == type; + } + + /** + * Indicates whether variable width borders are being used. Returns true if + * setBorderWidthLeft, setBorderWidthRight, + * setBorderWidthTop, or setBorderWidthBottom has been called. + * + * @return true if variable width borders are in use + */ + public boolean isUseVariableBorders() { + return useVariableBorders; + } + + /** + * Sets a parameter indicating if the rectangle has variable borders + * + * @param useVariableBorders indication if the rectangle has variable borders + */ + public void setUseVariableBorders(boolean useVariableBorders) { + this.useVariableBorders = useVariableBorders; + } + + /** + * Enables the border on the specified side. + * + * @param side the side to enable. One of LEFT, RIGHT, TOP, BOTTOM + */ + public void enableBorderSide(int side) { + if (border == UNDEFINED) { + border = 0; + } + border |= side; + } + + /** + * Disables the border on the specified side. + * + * @param side the side to disable. One of LEFT, RIGHT, TOP, BOTTOM + */ + public void disableBorderSide(int side) { + if (border == UNDEFINED) { + border = 0; + } + border &= ~side; + } + + // METHODS TO GET/SET THE BORDER WIDTH: + + /** + * Gets the borderwidth. + * + * @return a value + */ + public float getBorderWidth() { + return borderWidth; + } + + /** + * Sets the borderwidth of the table. + * + * @param borderWidth the new value + */ + public void setBorderWidth(float borderWidth) { + this.borderWidth = borderWidth; + } + + /** + * Helper function returning the border width of a specific side. + * + * @param variableWidthValue a variable width (could be undefined) + * @param side the border you want to check + * @return the variableWidthValue if not undefined, otherwise the borderWidth + */ + private float getVariableBorderWidth(float variableWidthValue, int side) { + if ((border & side) != 0) { + return variableWidthValue != UNDEFINED ? variableWidthValue : borderWidth; + } + return 0; + } + + /** + * Helper function updating the border flag for a side based on the specified width. A width of 0 will disable the + * border on that side. Any other width enables it. + * + * @param width width of border + * @param side border side constant + */ + private void updateBorderBasedOnWidth(float width, int side) { + useVariableBorders = true; + if (width > 0) { + enableBorderSide(side); + } else { + disableBorderSide(side); + } + } + + /** + * Gets the width of the left border. + * + * @return a width + */ + public float getBorderWidthLeft() { + return getVariableBorderWidth(borderWidthLeft, LEFT); + } + + /** + * Sets the width of the left border. + * + * @param borderWidthLeft a width + */ + public void setBorderWidthLeft(float borderWidthLeft) { + this.borderWidthLeft = borderWidthLeft; + updateBorderBasedOnWidth(borderWidthLeft, LEFT); + } + + /** + * Gets the width of the right border. + * + * @return a width + */ + public float getBorderWidthRight() { + return getVariableBorderWidth(borderWidthRight, RIGHT); + } + + /** + * Sets the width of the right border. + * + * @param borderWidthRight a width + */ + public void setBorderWidthRight(float borderWidthRight) { + this.borderWidthRight = borderWidthRight; + updateBorderBasedOnWidth(borderWidthRight, RIGHT); + } + + /** + * Gets the width of the top border. + * + * @return a width + */ + public float getBorderWidthTop() { + return getVariableBorderWidth(borderWidthTop, TOP); + } + + /** + * Sets the width of the top border. + * + * @param borderWidthTop a width + */ + public void setBorderWidthTop(float borderWidthTop) { + this.borderWidthTop = borderWidthTop; + updateBorderBasedOnWidth(borderWidthTop, TOP); + } + + /** + * Gets the width of the bottom border. + * + * @return a width + */ + public float getBorderWidthBottom() { + return getVariableBorderWidth(borderWidthBottom, BOTTOM); + } + + /** + * Sets the width of the bottom border. + * + * @param borderWidthBottom a width + */ + public void setBorderWidthBottom(float borderWidthBottom) { + this.borderWidthBottom = borderWidthBottom; + updateBorderBasedOnWidth(borderWidthBottom, BOTTOM); + } + + // METHODS TO GET/SET THE BORDER COLOR: + + /** + * Gets the color of the border. + * + * @return a Color + */ + public Color getBorderColor() { + return borderColor; + } + + /** + * Sets the color of the border. + * + * @param borderColor a Color + */ + public void setBorderColor(Color borderColor) { + this.borderColor = borderColor; + } + + /** + * Gets the color of the left border. + * + * @return a Color + */ + public Color getBorderColorLeft() { + if (borderColorLeft == null) { + return borderColor; + } + return borderColorLeft; + } + + /** + * Sets the color of the left border. + * + * @param borderColorLeft a Color + */ + public void setBorderColorLeft(Color borderColorLeft) { + this.borderColorLeft = borderColorLeft; + } + + /** + * Gets the color of the right border. + * + * @return a Color + */ + public Color getBorderColorRight() { + if (borderColorRight == null) { + return borderColor; + } + return borderColorRight; + } + + /** + * Sets the color of the right border. + * + * @param borderColorRight a Color + */ + public void setBorderColorRight(Color borderColorRight) { + this.borderColorRight = borderColorRight; + } + + /** + * Gets the color of the top border. + * + * @return a Color + */ + public Color getBorderColorTop() { + if (borderColorTop == null) { + return borderColor; + } + return borderColorTop; + } + + /** + * Sets the color of the top border. + * + * @param borderColorTop a Color + */ + public void setBorderColorTop(Color borderColorTop) { + this.borderColorTop = borderColorTop; + } + + /** + * Gets the color of the bottom border. + * + * @return a Color + */ + public Color getBorderColorBottom() { + if (borderColorBottom == null) { + return borderColor; + } + return borderColorBottom; + } + + /** + * Sets the color of the bottom border. + * + * @param borderColorBottom a Color + */ + public void setBorderColorBottom(Color borderColorBottom) { + this.borderColorBottom = borderColorBottom; + } + + // SPECIAL METHODS: + + /** + * Gets a Rectangle that is altered to fit on the page. + * + * @param top the top position + * @param bottom the bottom position + * @return a Rectangle + */ + public Rectangle rectangle(float top, float bottom) { + Rectangle tmp = new Rectangle(this); + if (getTop() > top) { + tmp.setTop(top); + tmp.disableBorderSide(TOP); + } + if (getBottom() < bottom) { + tmp.setBottom(bottom); + tmp.disableBorderSide(BOTTOM); + } + return tmp; + } + + /** + * Copies each of the parameters, except the position, from a + * Rectangle object + * + * @param rect Rectangle to copy from + */ + public void cloneNonPositionParameters(Rectangle rect) { + this.rotation = rect.rotation; + this.backgroundColor = rect.backgroundColor; + this.border = rect.border; + this.useVariableBorders = rect.useVariableBorders; + this.borderWidth = rect.borderWidth; + this.borderWidthLeft = rect.borderWidthLeft; + this.borderWidthRight = rect.borderWidthRight; + this.borderWidthTop = rect.borderWidthTop; + this.borderWidthBottom = rect.borderWidthBottom; + this.borderColor = rect.borderColor; + this.borderColorLeft = rect.borderColorLeft; + this.borderColorRight = rect.borderColorRight; + this.borderColorTop = rect.borderColorTop; + this.borderColorBottom = rect.borderColorBottom; + } + + /** + * Copies each of the parameters, except the position, from a + * Rectangle object if the value is set there + * + * @param rect Rectangle to copy from + */ + public void softCloneNonPositionParameters(Rectangle rect) { + if (rect.rotation != 0) { + this.rotation = rect.rotation; + } + if (rect.backgroundColor != null) { + this.backgroundColor = rect.backgroundColor; + } + if (rect.border != UNDEFINED) { + this.border = rect.border; + } + if (useVariableBorders) { + this.useVariableBorders = rect.useVariableBorders; + } + if (rect.borderWidth != UNDEFINED) { + this.borderWidth = rect.borderWidth; + } + if (rect.borderWidthLeft != UNDEFINED) { + this.borderWidthLeft = rect.borderWidthLeft; + } + if (rect.borderWidthRight != UNDEFINED) { + this.borderWidthRight = rect.borderWidthRight; + } + if (rect.borderWidthTop != UNDEFINED) { + this.borderWidthTop = rect.borderWidthTop; + } + if (rect.borderWidthBottom != UNDEFINED) { + this.borderWidthBottom = rect.borderWidthBottom; + } + if (rect.borderColor != null) { + this.borderColor = rect.borderColor; + } + if (rect.borderColorLeft != null) { + this.borderColorLeft = rect.borderColorLeft; + } + if (rect.borderColorRight != null) { + this.borderColorRight = rect.borderColorRight; + } + if (rect.borderColorTop != null) { + this.borderColorTop = rect.borderColorTop; + } + if (rect.borderColorBottom != null) { + this.borderColorBottom = rect.borderColorBottom; + } + } + + /** + * @return a String representation of the rectangle + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder buf = new StringBuilder("Rectangle: "); + buf.append(getWidth()); + buf.append('x'); + buf.append(getHeight()); + buf.append(" (rot: "); + buf.append(rotation); + buf.append(" degrees)"); + return buf.toString(); + } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/RectangleReadOnly.java b/openpdf/src/main/java/com/lowagie/text/RectangleReadOnly.java index ccae52243..e15434d05 100644 --- a/openpdf/src/main/java/com/lowagie/text/RectangleReadOnly.java +++ b/openpdf/src/main/java/com/lowagie/text/RectangleReadOnly.java @@ -49,18 +49,15 @@ package com.lowagie.text; -import java.awt.Color; import com.lowagie.text.error_messages.MessageLocalization; +import java.awt.Color; /** - * A RectangleReadOnly is the representation of a geometric figure. - * It's the same as a Rectangle but immutable. - * Rectangles support constant width borders using - * {@link #setBorderWidth(float)}and {@link #setBorder(int)}. - * They also support borders that vary in width/color on each side using - * methods like {@link #setBorderWidthLeft(float)}or - * {@link #setBorderColorLeft(java.awt.Color)}. - * + * A RectangleReadOnly is the representation of a geometric figure. It's the same as a + * Rectangle but immutable. Rectangles support constant width borders using + * {@link #setBorderWidth(float)}and {@link #setBorder(int)}. They also support borders that vary in width/color on each + * side using methods like {@link #setBorderWidthLeft(float)}or {@link #setBorderColorLeft(java.awt.Color)}. + * * @see Element * @see Table * @see Cell @@ -74,22 +71,21 @@ public class RectangleReadOnly extends Rectangle { /** * Constructs a RectangleReadOnly -object. - * - * @param llx lower left x - * @param lly lower left y - * @param urx upper right x - * @param ury upper right y + * + * @param llx lower left x + * @param lly lower left y + * @param urx upper right x + * @param ury upper right y */ public RectangleReadOnly(float llx, float lly, float urx, float ury) { super(llx, lly, urx, ury); } /** - * Constructs a RectangleReadOnly -object starting from the origin - * (0, 0). - * - * @param urx upper right x - * @param ury upper right y + * Constructs a RectangleReadOnly -object starting from the origin (0, 0). + * + * @param urx upper right x + * @param ury upper right y */ public RectangleReadOnly(float urx, float ury) { super(0, 0, urx, ury); @@ -97,8 +93,8 @@ public RectangleReadOnly(float urx, float ury) { /** * Constructs a RectangleReadOnly -object. - * - * @param rect another Rectangle + * + * @param rect another Rectangle */ public RectangleReadOnly(Rectangle rect) { super(rect.llx, rect.lly, rect.urx, rect.ury); @@ -106,18 +102,19 @@ public RectangleReadOnly(Rectangle rect) { } /** - * Throws an error because of the read only nature of this object. + * Throws an error because of the read only nature of this object. */ private void throwReadOnlyError() { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("rectanglereadonly.this.rectangle.is.read.only")); + throw new UnsupportedOperationException( + MessageLocalization.getComposedMessage("rectanglereadonly.this.rectangle.is.read.only")); } - + // OVERWRITE METHODS SETTING THE DIMENSIONS: /** * Sets the lower left x-coordinate. - * - * @param llx the new value + * + * @param llx the new value */ public void setLeft(float llx) { throwReadOnlyError(); @@ -125,8 +122,8 @@ public void setLeft(float llx) { /** * Sets the upper right x-coordinate. - * - * @param urx the new value + * + * @param urx the new value */ public void setRight(float urx) { @@ -135,8 +132,8 @@ public void setRight(float urx) { /** * Sets the upper right y-coordinate. - * - * @param ury the new value + * + * @param ury the new value */ public void setTop(float ury) { throwReadOnlyError(); @@ -144,16 +141,15 @@ public void setTop(float ury) { /** * Sets the lower left y-coordinate. - * - * @param lly the new value + * + * @param lly the new value */ public void setBottom(float lly) { throwReadOnlyError(); } /** - * Normalizes the rectangle. - * Switches lower left with upper right if necessary. + * Normalizes the rectangle. Switches lower left with upper right if necessary. */ public void normalize() { throwReadOnlyError(); @@ -163,8 +159,8 @@ public void normalize() { /** * Sets the backgroundcolor of the rectangle. - * - * @param value the new value + * + * @param value the new value */ public void setBackgroundColor(Color value) { throwReadOnlyError(); @@ -172,32 +168,31 @@ public void setBackgroundColor(Color value) { /** * Sets the grayscale of the rectangle. - * - * @param value the new value + * + * @param value the new value */ public void setGrayFill(float value) { throwReadOnlyError(); } - + // OVERWRITE METHODS SETTING THE BORDER: /** - * Enables/Disables the border on the specified sides. - * The border is specified as an integer bitwise combination of + * Enables/Disables the border on the specified sides. The border is specified as an integer bitwise combination of * the constants: LEFT, RIGHT, TOP, BOTTOM. - * + * + * @param border the new value * @see #enableBorderSide(int) * @see #disableBorderSide(int) - * @param border the new value */ public void setBorder(int border) { throwReadOnlyError(); } - + /** * Sets a parameter indicating if the rectangle has variable borders - * - * @param useVariableBorders indication if the rectangle has variable borders + * + * @param useVariableBorders indication if the rectangle has variable borders */ public void setUseVariableBorders(boolean useVariableBorders) { throwReadOnlyError(); @@ -205,9 +200,8 @@ public void setUseVariableBorders(boolean useVariableBorders) { /** * Enables the border on the specified side. - * - * @param side the side to enable. - * One of LEFT, RIGHT, TOP, BOTTOM + * + * @param side the side to enable. One of LEFT, RIGHT, TOP, BOTTOM */ public void enableBorderSide(int side) { throwReadOnlyError(); @@ -215,9 +209,8 @@ public void enableBorderSide(int side) { /** * Disables the border on the specified side. - * - * @param side the side to disable. - * One of LEFT, RIGHT, TOP, BOTTOM + * + * @param side the side to disable. One of LEFT, RIGHT, TOP, BOTTOM */ public void disableBorderSide(int side) { throwReadOnlyError(); @@ -227,8 +220,8 @@ public void disableBorderSide(int side) { /** * Sets the borderwidth of the table. - * - * @param borderWidth the new value + * + * @param borderWidth the new value */ public void setBorderWidth(float borderWidth) { @@ -237,8 +230,8 @@ public void setBorderWidth(float borderWidth) { /** * Sets the width of the left border - * - * @param borderWidthLeft a width + * + * @param borderWidthLeft a width */ public void setBorderWidthLeft(float borderWidthLeft) { throwReadOnlyError(); @@ -246,8 +239,8 @@ public void setBorderWidthLeft(float borderWidthLeft) { /** * Sets the width of the right border - * - * @param borderWidthRight a width + * + * @param borderWidthRight a width */ public void setBorderWidthRight(float borderWidthRight) { throwReadOnlyError(); @@ -255,8 +248,8 @@ public void setBorderWidthRight(float borderWidthRight) { /** * Sets the width of the top border - * - * @param borderWidthTop a width + * + * @param borderWidthTop a width */ public void setBorderWidthTop(float borderWidthTop) { throwReadOnlyError(); @@ -264,8 +257,8 @@ public void setBorderWidthTop(float borderWidthTop) { /** * Sets the width of the bottom border - * - * @param borderWidthBottom a width + * + * @param borderWidthBottom a width */ public void setBorderWidthBottom(float borderWidthBottom) { throwReadOnlyError(); @@ -275,18 +268,18 @@ public void setBorderWidthBottom(float borderWidthBottom) { /** * Sets the color of the border. - * - * @param borderColor a Color + * + * @param borderColor a Color */ public void setBorderColor(Color borderColor) { throwReadOnlyError(); } - + /** * Sets the color of the left border. - * - * @param borderColorLeft a Color + * + * @param borderColorLeft a Color */ public void setBorderColorLeft(Color borderColorLeft) { throwReadOnlyError(); @@ -294,8 +287,8 @@ public void setBorderColorLeft(Color borderColorLeft) { /** * Sets the color of the right border - * - * @param borderColorRight a Color + * + * @param borderColorRight a Color */ public void setBorderColorRight(Color borderColorRight) { throwReadOnlyError(); @@ -303,8 +296,8 @@ public void setBorderColorRight(Color borderColorRight) { /** * Sets the color of the top border. - * - * @param borderColorTop a Color + * + * @param borderColorTop a Color */ public void setBorderColorTop(Color borderColorTop) { throwReadOnlyError(); @@ -312,8 +305,8 @@ public void setBorderColorTop(Color borderColorTop) { /** * Sets the color of the bottom border. - * - * @param borderColorBottom a Color + * + * @param borderColorBottom a Color */ public void setBorderColorBottom(Color borderColorBottom) { throwReadOnlyError(); @@ -324,8 +317,8 @@ public void setBorderColorBottom(Color borderColorBottom) { /** * Copies each of the parameters, except the position, from a * Rectangle object - * - * @param rect Rectangle to copy from + * + * @param rect Rectangle to copy from */ public void cloneNonPositionParameters(Rectangle rect) { throwReadOnlyError(); @@ -334,15 +327,15 @@ public void cloneNonPositionParameters(Rectangle rect) { /** * Copies each of the parameters, except the position, from a * Rectangle object if the value is set there. - * - * @param rect Rectangle to copy from + * + * @param rect Rectangle to copy from */ public void softCloneNonPositionParameters(Rectangle rect) { throwReadOnlyError(); } - + /** - * @return String version of the most important rectangle properties + * @return String version of the most important rectangle properties * @see java.lang.Object#toString() */ public String toString() { diff --git a/openpdf/src/main/java/com/lowagie/text/RomanList.java b/openpdf/src/main/java/com/lowagie/text/RomanList.java index e395775f5..ee237f24b 100644 --- a/openpdf/src/main/java/com/lowagie/text/RomanList.java +++ b/openpdf/src/main/java/com/lowagie/text/RomanList.java @@ -49,16 +49,15 @@ import com.lowagie.text.factories.RomanNumberFactory; /** - * * A special-version of LIST which use roman-letters. - * + * * @see com.lowagie.text.List */ public class RomanList extends List { // constructors - + /** * Initialization */ @@ -68,17 +67,18 @@ public RomanList() { /** * Initialization - * - * @param symbolIndent indent + * + * @param symbolIndent indent */ public RomanList(int symbolIndent) { super(true, symbolIndent); } /** - * Initialization - * @param lowercase roman-char in lowercase - * @param symbolIndent indent + * Initialization + * + * @param lowercase roman-char in lowercase + * @param symbolIndent indent */ public RomanList(boolean lowercase, int symbolIndent) { super(true, symbolIndent); @@ -86,11 +86,11 @@ public RomanList(boolean lowercase, int symbolIndent) { } // overridden methods - + /** * Adds an Element to the List. * - * @param o the element to add. + * @param o the element to add. * @return true if adding the element succeeded */ @Override @@ -117,7 +117,7 @@ public boolean add(Element o) { /** * Adds a String to the List. * - * @param s the string to add. + * @param s the string to add. * @return true if adding the string succeeded */ @Override diff --git a/openpdf/src/main/java/com/lowagie/text/Row.java b/openpdf/src/main/java/com/lowagie/text/Row.java index b4528fe92..8549ed3d4 100644 --- a/openpdf/src/main/java/com/lowagie/text/Row.java +++ b/openpdf/src/main/java/com/lowagie/text/Row.java @@ -52,60 +52,73 @@ import com.lowagie.text.alignment.HorizontalAlignment; import com.lowagie.text.alignment.WithHorizontalAlignment; -import java.util.ArrayList; import com.lowagie.text.error_messages.MessageLocalization; +import java.util.ArrayList; /** - * A Row is part of a Table - * and contains some Cells. - *

    - * All Rows are constructed by a Table-object. - * You don't have to construct any Row yourself. - * In fact you can't construct a Row outside the package. - *

    - * Since a Cell can span several rows and/or columns - * a row can contain reserved space without any content. + * A Row is part of a Table and contains some Cells. + *

    + * All Rows are constructed by a Table-object. You don't have to construct any + * Row yourself. In fact you can't construct a Row outside the package. + *

    + * Since a Cell can span several rows and/or columns a row can contain reserved space without any content. * - * @see Element - * @see Cell - * @see Table + * @see Element + * @see Cell + * @see Table */ public class Row implements Element, WithHorizontalAlignment { - + // constants - - /** id of a null element in a Row*/ + + /** + * id of a null element in a Row + */ public static final int NULL = 0; - - /** id of the Cell element in a Row*/ + + /** + * id of the Cell element in a Row + */ public static final int CELL = 1; - - /** id of the Table element in a Row*/ + + /** + * id of the Table element in a Row + */ public static final int TABLE = 2; - + // member variables - - /** This is the number of columns in the Row. */ + + /** + * This is the number of columns in the Row. + */ protected int columns; - - /** This is a valid position the Row. */ + + /** + * This is a valid position the Row. + */ protected int currentColumn; - - /** This is the array that keeps track of reserved cells. */ + + /** + * This is the array that keeps track of reserved cells. + */ protected boolean[] reserved; - - /** This is the array of Objects (Cell or Table). */ + + /** + * This is the array of Objects (Cell or Table). + */ protected TableRectangle[] cells; - - /** This is the vertical alignment. */ + + /** + * This is the vertical alignment. + */ protected int horizontalAlignment; - + // constructors - + /** * Constructs a Row with a certain number of columns. * - * @param columns a number of columns + * @param columns a number of columns */ protected Row(int columns) { this.columns = columns; @@ -113,46 +126,45 @@ protected Row(int columns) { cells = new TableRectangle[columns]; currentColumn = 0; } - + // implementation of the Element-methods - + /** * Processes the element by adding it (or the different parts) to a * ElementListener. * - * @param listener an ElementListener - * @return true if the element was processed successfully + * @param listener an ElementListener + * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { try { return listener.add(this); - } - catch(DocumentException de) { + } catch (DocumentException de) { return false; } } - + /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return Element.ROW; } - + /** * Gets all the chunks in this element. * - * @return an ArrayList + * @return an ArrayList */ public ArrayList getChunks() { return new ArrayList<>(); } - + /** * @see com.lowagie.text.Element#isContent() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isContent() { return true; @@ -160,28 +172,28 @@ public boolean isContent() { /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return false; } - + // method to delete a column - + /** - * Returns a Row that is a copy of this Row - * in which a certain column has been deleted. + * Returns a Row that is a copy of this Row in which a certain column has been deleted. * - * @param column the number of the column to delete - */ + * @param column the number of the column to delete + */ void deleteColumn(int column) { if ((column >= columns) || (column < 0)) { - throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("getcell.at.illegal.index.1", column)); + throw new IndexOutOfBoundsException( + MessageLocalization.getComposedMessage("getcell.at.illegal.index.1", column)); } columns--; boolean[] newReserved = new boolean[columns]; TableRectangle[] newCells = new Cell[columns]; - + for (int i = 0; i < column; i++) { newReserved[i] = reserved[i]; newCells[i] = cells[i]; @@ -200,86 +212,99 @@ void deleteColumn(int column) { reserved = newReserved; cells = newCells; } - + // methods - + /** * Adds a Cell to the Row. * - * @param element the element to add (currently only Cells and Tables supported) - * @return the column position the Cell was added, - * or -1 if the element couldn't be added. + * @param element the element to add (currently only Cells and Tables supported) + * @return the column position the Cell was added, or -1 if the element + * couldn't be added. */ int addElement(TableRectangle element) { return addElement(element, currentColumn); } - + /** * Adds an element to the Row at the position given. * - * @param element the element to add. (currently only Cells and Tables supported - * @param column the position where to add the cell. - * @return the column position the Cell was added, - * or -1 if the Cell couldn't be added. + * @param element the element to add. (currently only Cells and Tables supported + * @param column the position where to add the cell. + * @return the column position the Cell was added, or -1 if the Cell couldn't + * be added. */ int addElement(TableRectangle element, int column) { - if (element == null) throw new NullPointerException(MessageLocalization.getComposedMessage("addcell.null.argument")); - if ((column < 0) || (column > columns)) throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("addcell.illegal.column.argument")); - if ( !((getObjectID(element) == CELL) || (getObjectID(element) == TABLE)) ) throw new IllegalArgumentException(MessageLocalization.getComposedMessage("addcell.only.cells.or.tables.allowed")); - - int lColspan = ( (element instanceof Cell) ? ((Cell) element).getColspan() : 1); - + if (element == null) { + throw new NullPointerException(MessageLocalization.getComposedMessage("addcell.null.argument")); + } + if ((column < 0) || (column > columns)) { + throw new IndexOutOfBoundsException( + MessageLocalization.getComposedMessage("addcell.illegal.column.argument")); + } + if (!((getObjectID(element) == CELL) || (getObjectID(element) == TABLE))) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("addcell.only.cells.or.tables.allowed")); + } + + int lColspan = ((element instanceof Cell) ? ((Cell) element).getColspan() : 1); + if (!reserve(column, lColspan)) { return -1; } - + cells[column] = element; currentColumn += lColspan - 1; - + return column; } - + /** * Puts Cell to the Row at the position given, doesn't reserve colspan. * - * @param aElement the cell to add. - * @param column the position where to add the cell. + * @param aElement the cell to add. + * @param column the position where to add the cell. */ void setElement(TableRectangle aElement, int column) { - if (reserved[column]) throw new IllegalArgumentException(MessageLocalization.getComposedMessage("setelement.position.already.taken")); - + if (reserved[column]) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("setelement.position.already.taken")); + } + cells[column] = aElement; if (aElement != null) { reserved[column] = true; } } - + /** * Reserves a Cell in the Row. * - * @param column the column that has to be reserved. - * @return true if the column was reserved, false if not. + * @param column the column that has to be reserved. + * @return true if the column was reserved, false if not. */ boolean reserve(int column) { return reserve(column, 1); } - - + + /** * Reserves a Cell in the Row. * - * @param column the column that has to be reserved. - * @param size the number of columns - * @return true if the column was reserved, false if not. + * @param column the column that has to be reserved. + * @param size the number of columns + * @return true if the column was reserved, false if not. */ boolean reserve(int column, int size) { - if ((column < 0) || ((column + size) > columns)) throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("reserve.incorrect.column.size")); - - for(int i=column; i < column + size; i++) - { + if ((column < 0) || ((column + size) > columns)) { + throw new IndexOutOfBoundsException( + MessageLocalization.getComposedMessage("reserve.incorrect.column.size")); + } + + for (int i = column; i < column + size; i++) { if (reserved[i]) { // undo reserve - for(int j=i; j >= column; j--) { + for (int j = i; j >= column; j--) { reserved[j] = false; } return false; @@ -288,64 +313,75 @@ boolean reserve(int column, int size) { } return true; } - + // methods to retrieve information - + /** - * Returns true/false when this position in the Row has been reserved, either filled or through a colspan of an Element. + * Returns true/false when this position in the Row has been reserved, either filled or through a + * colspan of an Element. * - * @param column the column. - * @return true if the column was reserved, false if not. + * @param column the column. + * @return true if the column was reserved, false if not. */ boolean isReserved(int column) { return reserved[column]; } - + /** * Returns the type-id of the element in a Row. * - * @param column the column of which you'd like to know the type + * @param column the column of which you'd like to know the type * @return the type-id of the element in the row */ int getElementID(int column) { - if (cells[column] == null) return NULL; - else if (cells[column] instanceof Cell) return CELL; - else if (cells[column] instanceof Table) return TABLE; - + if (cells[column] == null) { + return NULL; + } else if (cells[column] instanceof Cell) { + return CELL; + } else if (cells[column] instanceof Table) { + return TABLE; + } + return -1; } - + /** * Returns the type-id of an Object. * - * @param element the object of which you'd like to know the type-id, -1 if invalid + * @param element the object of which you'd like to know the type-id, -1 if invalid * @return the type-id of an object */ int getObjectID(Object element) { - if (element == null) return NULL; - else if (element instanceof Cell) return CELL; - else if (element instanceof Table) return TABLE; + if (element == null) { + return NULL; + } else if (element instanceof Cell) { + return CELL; + } else if (element instanceof Table) { + return TABLE; + } return -1; } - + /** * Gets a Cell or Table from a certain column. * - * @param column the column the Cell/Table is in. - * @return the Cell,Table or Object if the column was - * reserved or null if empty. + * @param column the column the Cell/Table is in. + * @return the Cell,Table or Object if the column was reserved or null if + * empty. */ public TableRectangle getCell(int column) { if ((column < 0) || (column > columns)) { - throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("getcell.at.illegal.index.1.max.is.2", String.valueOf(column), String.valueOf(columns))); + throw new IndexOutOfBoundsException( + MessageLocalization.getComposedMessage("getcell.at.illegal.index.1.max.is.2", + String.valueOf(column), String.valueOf(columns))); } return cells[column]; } - + /** * Checks if the row is empty. * - * @return true if none of the columns is reserved. + * @return true if none of the columns is reserved. */ public boolean isEmpty() { for (int i = 0; i < columns; i++) { @@ -355,20 +391,20 @@ public boolean isEmpty() { } return true; } - + /** * Gets the number of columns. * - * @return a value + * @return a value */ public int getColumns() { return columns; } - + /** * Gets the horizontal alignment. * - * @return a value + * @return a value */ public int getHorizontalAlignment() { return horizontalAlignment; diff --git a/openpdf/src/main/java/com/lowagie/text/RtfElementInterface.java b/openpdf/src/main/java/com/lowagie/text/RtfElementInterface.java index 2f30e18ec..4b89440be 100644 --- a/openpdf/src/main/java/com/lowagie/text/RtfElementInterface.java +++ b/openpdf/src/main/java/com/lowagie/text/RtfElementInterface.java @@ -50,9 +50,9 @@ package com.lowagie.text; /** - * The RTF jar depends on the iText jar, but the iText jar may not - * depend on the RTF jar. This interface offers a temporary solution - * until we find a more elegant way to solve this. + * The RTF jar depends on the iText jar, but the iText jar may not depend on the RTF jar. This interface offers a + * temporary solution until we find a more elegant way to solve this. + * * @since 2.1.0 */ public interface RtfElementInterface { diff --git a/openpdf/src/main/java/com/lowagie/text/Section.java b/openpdf/src/main/java/com/lowagie/text/Section.java index 30d41962c..1ad2c5e4d 100644 --- a/openpdf/src/main/java/com/lowagie/text/Section.java +++ b/openpdf/src/main/java/com/lowagie/text/Section.java @@ -50,32 +50,32 @@ package com.lowagie.text; +import com.lowagie.text.error_messages.MessageLocalization; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import com.lowagie.text.error_messages.MessageLocalization; /** - * A Section is a part of a Document containing - * other Sections, Paragraphs, List - * and/or Tables. - *

    - * Remark: you can not construct a Section yourself. - * You will have to ask an instance of Section to the + * A Section is a part of a Document containing other Sections, + * Paragraphs, List and/or Tables. + *

    + * Remark: you can not construct a Section yourself. You will have to ask an instance of + * Section to the * Chapter or Section to which you want to * add the new Section. - *

    + *

    * Example: * 

    - * Paragraph title2 = new Paragraph("This is Chapter 2", FontFactory.getFont(FontFactory.HELVETICA, 18, Font.BOLDITALIC, new Color(0, 0, 255)));
- * Chapter chapter2 = new Chapter(title2, 2);
- * Paragraph someText = new Paragraph("This is some text");
- * chapter2.add(someText);
- * Paragraph title21 = new Paragraph("This is Section 1 in Chapter 2", FontFactory.getFont(FontFactory.HELVETICA, 16, Font.BOLD, new Color(255, 0, 0)));
+ * Paragraph title2 = new Paragraph("This is Chapter 2", FontFactory.getFont(FontFactory.HELVETICA, 18, Font.BOLDITALIC,
+ * new Color(0, 0, 255))); Chapter chapter2 = new Chapter(title2, 2); Paragraph someText = new Paragraph("This is some
+ * text"); chapter2.add(someText); Paragraph title21 = new Paragraph("This is Section 1 in Chapter 2",
+ * FontFactory.getFont(FontFactory.HELVETICA, 16, Font.BOLD, new Color(255, 0, 0)));
  * Section section1 = chapter2.addSection(title21);
- * Paragraph someSectionText = new Paragraph("This is some silly paragraph in a chapter and/or section. It contains some text to test the functionality of Chapters and Section.");
+ * Paragraph someSectionText = new Paragraph("This is some silly paragraph in a chapter and/or section. It contains some
+ * text to test the functionality of Chapters and Section.");
  * section1.add(someSectionText);
- * Paragraph title211 = new Paragraph("This is SubSection 1 in Section 1 in Chapter 2", FontFactory.getFont(FontFactory.HELVETICA, 14, Font.BOLD, new Color(255, 0, 0)));
+ * Paragraph title211 = new Paragraph("This is SubSection 1 in Section 1 in Chapter 2",
+ * FontFactory.getFont(FontFactory.HELVETICA, 14, Font.BOLD, new Color(255, 0, 0)));
  * Section section11 = section1.addSection(40, title211, 2);
  * section11.add(someSectionText);
  *
    @@ -85,103 +85,164 @@ public class Section extends ArrayList implements TextElementArray, Lar // constant /** * A possible number style. The default number style: "1.2.3." - * @since iText 2.0.8 + * + * @since iText 2.0.8 */ public static final int NUMBERSTYLE_DOTTED = 0; /** * A possible number style. For instance: "1.2.3" - * @since iText 2.0.8 + * + * @since iText 2.0.8 */ public static final int NUMBERSTYLE_DOTTED_WITHOUT_FINAL_DOT = 1; - - /** A serial version uid. */ + + /** + * A serial version uid. + */ private static final long serialVersionUID = 3324172577544748043L; // member variables - - /** The title of this section. */ + + /** + * The title of this section. + */ protected Paragraph title; - - /** The bookmark title if different from the content title */ + + /** + * The bookmark title if different from the content title + */ protected String bookmarkTitle; - /** The number of sectionnumbers that has to be shown before the section title. */ + /** + * The number of sectionnumbers that has to be shown before the section title. + */ protected int numberDepth; - + /** * The style for sectionnumbers. - * @since iText 2.0.8 + * + * @since iText 2.0.8 */ protected int numberStyle = NUMBERSTYLE_DOTTED; - - /** The indentation of this section on the left side. */ + + /** + * The indentation of this section on the left side. + */ protected float indentationLeft; - - /** The indentation of this section on the right side. */ + + /** + * The indentation of this section on the right side. + */ protected float indentationRight; - - /** The additional indentation of the content of this section. */ + + /** + * The additional indentation of the content of this section. + */ protected float indentation; - - /** false if the bookmark children are not visible */ + + /** + * false if the bookmark children are not visible + */ protected boolean bookmarkOpen = true; - - /** true if the section has to trigger a new page */ + + /** + * true if the section has to trigger a new page + */ protected boolean triggerNewPage = false; - - /** This is the number of subsections. */ + + /** + * This is the number of subsections. + */ protected int subsections = 0; - - /** This is the complete list of sectionnumbers of this section and the parents of this section. */ + + /** + * This is the complete list of sectionnumbers of this section and the parents of this section. + */ protected java.util.List numbers = null; - + /** * Indicates if the Section will be complete once added to the document. - * @since iText 2.0.8 + * + * @since iText 2.0.8 */ protected boolean complete = true; - + /** * Indicates if the Section was added completely to the document. - * @since iText 2.0.8 + * + * @since iText 2.0.8 */ protected boolean addedCompletely = false; - + /** * Indicates if this is the first time the section was added. - * @since iText 2.0.8 + * + * @since iText 2.0.8 */ protected boolean notAddedYet = true; - + // constructors - + /** * Constructs a new Section. - */ + */ protected Section() { title = new Paragraph(); numberDepth = 1; } - + /** * Constructs a new Section. * - * @param title a Paragraph - * @param numberDepth the numberDepth + * @param title a Paragraph + * @param numberDepth the numberDepth */ protected Section(Paragraph title, int numberDepth) { this.numberDepth = numberDepth; this.title = title; } - + // implementation of the Element-methods - + + /** + * Constructs a Paragraph that will be used as title for a Section or Chapter. + * + * @param title the title of the section + * @param numbers a list of sectionnumbers + * @param numberDepth how many numbers have to be shown + * @param numberStyle the numbering style + * @return a Paragraph object + * @since iText 2.0.8 + */ + public static Paragraph constructTitle(Paragraph title, java.util.List numbers, int numberDepth, + int numberStyle) { + if (title == null) { + return null; + } + + int depth = Math.min(numbers.size(), numberDepth); + if (depth < 1) { + return title; + } + StringBuilder buf = new StringBuilder(" "); + for (int i = 0; i < depth; i++) { + buf.insert(0, "."); + buf.insert(0, numbers.get(i).intValue()); + } + if (numberStyle == NUMBERSTYLE_DOTTED_WITHOUT_FINAL_DOT) { + buf.deleteCharAt(buf.length() - 2); + } + Paragraph result = new Paragraph(title); + result.add(0, new Chunk(buf.toString(), title.getFont())); + return result; + } + /** * Processes the element by adding it (or the different parts) to an * ElementListener. * - * @param listener the ElementListener - * @return true if the element was processed successfully + * @param listener the ElementListener + * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { try { @@ -191,45 +252,44 @@ public boolean process(ElementListener listener) { listener.add(element); } return true; - } - catch(DocumentException de) { + } catch (DocumentException de) { return false; } } - + /** * Gets the type of the text element. * - * @return a type - */ + * @return a type + */ public int type() { return Element.SECTION; } - + /** * Checks if this object is a Chapter. * - * @return true if it is a Chapter, - * false if it is a Section. + * @return true if it is a Chapter, + * false if it is a Section. */ public boolean isChapter() { return type() == Element.CHAPTER; } - + /** * Checks if this object is a Section. * - * @return true if it is a Section, - * false if it is a Chapter. + * @return true if it is a Section, + * false if it is a Chapter. */ public boolean isSection() { return type() == Element.SECTION; } - + /** * Gets all the chunks in this element. * - * @return an ArrayList + * @return an ArrayList */ public ArrayList getChunks() { ArrayList tmp = new ArrayList<>(); @@ -238,62 +298,66 @@ public ArrayList getChunks() { } return tmp; } - + /** * @see com.lowagie.text.Element#isContent() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isContent() { return true; } + // overriding some of the ArrayList-methods + /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return false; } - - // overriding some of the ArrayList-methods - + /** - * Adds a Paragraph, List or Table - * to this Section. + * Adds a Paragraph, List or Table to this Section. * - * @param index index at which the specified element is to be inserted - * @param o an object of type Paragraph, List or Table= - * @throws ClassCastException if the object is not a Paragraph, List or Table + * @param index index at which the specified element is to be inserted + * @param o an object of type Paragraph, List or Table= + * @throws ClassCastException if the object is not a Paragraph, List or + * Table */ public void add(int index, Element o) { if (isAddedCompletely()) { - throw new IllegalStateException(MessageLocalization.getComposedMessage("this.largeelement.has.already.been.added.to.the.document")); + throw new IllegalStateException( + MessageLocalization.getComposedMessage("this.largeelement.has.already.been.added.to.the.document")); } try { Element element = o; if (element.isNestable()) { super.add(index, element); + } else { + throw new ClassCastException(MessageLocalization.getComposedMessage("you.can.t.add.a.1.to.a.section", + element.getClass().getName())); } - else { - throw new ClassCastException(MessageLocalization.getComposedMessage("you.can.t.add.a.1.to.a.section", element.getClass().getName())); - } - } - catch(ClassCastException cce) { - throw new ClassCastException(MessageLocalization.getComposedMessage("insertion.of.illegal.element.1", cce.getMessage())); + } catch (ClassCastException cce) { + throw new ClassCastException( + MessageLocalization.getComposedMessage("insertion.of.illegal.element.1", cce.getMessage())); } } - + /** - * Adds a Paragraph, List, Table or another Section - * to this Section. + * Adds a Paragraph, List, Table or another Section to this + * Section. * - * @param o an object of type Paragraph, List, Table or another Section - * @return a boolean - * @throws ClassCastException if the object is not a Paragraph, List, Table or Section + * @param o an object of type Paragraph, List, Table or another + * Section + * @return a boolean + * @throws ClassCastException if the object is not a Paragraph, List, Table + * or Section */ public boolean add(Element o) { if (isAddedCompletely()) { - throw new IllegalStateException(MessageLocalization.getComposedMessage("this.largeelement.has.already.been.added.to.the.document")); + throw new IllegalStateException( + MessageLocalization.getComposedMessage("this.largeelement.has.already.been.added.to.the.document")); } try { Element element = o; @@ -301,32 +365,32 @@ public boolean add(Element o) { Section section = (Section) o; section.setNumbers(++subsections, numbers); return super.add(section); - } - else if (o instanceof MarkedSection && ((MarkedObject)o).element.type() == Element.SECTION) { - MarkedSection mo = (MarkedSection)o; - Section section = (Section)mo.element; + } else if (o instanceof MarkedSection && ((MarkedObject) o).element.type() == Element.SECTION) { + MarkedSection mo = (MarkedSection) o; + Section section = (Section) mo.element; section.setNumbers(++subsections, numbers); return super.add(mo); - } - else if (element.isNestable()) { + } else if (element.isNestable()) { return super.add(o); + } else { + throw new ClassCastException(MessageLocalization.getComposedMessage("you.can.t.add.a.1.to.a.section", + element.getClass().getName())); } - else { - throw new ClassCastException(MessageLocalization.getComposedMessage("you.can.t.add.a.1.to.a.section", element.getClass().getName())); - } - } - catch(ClassCastException cce) { - throw new ClassCastException(MessageLocalization.getComposedMessage("insertion.of.illegal.element.1", cce.getMessage())); + } catch (ClassCastException cce) { + throw new ClassCastException( + MessageLocalization.getComposedMessage("insertion.of.illegal.element.1", cce.getMessage())); } } - + + // methods that return a Section + /** - * Adds a collection of Elements - * to this Section. + * Adds a collection of Elements to this Section. * - * @param collection a collection of Paragraphs, Lists and/or Tables - * @return true if the action succeeded, false if not. - * @throws ClassCastException if one of the objects isn't a Paragraph, List, Table + * @param collection a collection of Paragraphs, Lists and/or Tables + * @return true if the action succeeded, false if not. + * @throws ClassCastException if one of the objects isn't a Paragraph, List, + * Table */ public boolean addAll(Collection collection) { for (Element o : collection) { @@ -334,49 +398,48 @@ public boolean addAll(Collection collection) { } return true; } - - // methods that return a Section - + /** * Creates a Section, adds it to this Section and returns it. * - * @param indentation the indentation of the new section - * @param title the title of the new section - * @param numberDepth the numberDepth of the section - * @return a new Section object + * @param indentation the indentation of the new section + * @param title the title of the new section + * @param numberDepth the numberDepth of the section + * @return a new Section object */ public Section addSection(float indentation, Paragraph title, int numberDepth) { if (isAddedCompletely()) { - throw new IllegalStateException(MessageLocalization.getComposedMessage("this.largeelement.has.already.been.added.to.the.document")); + throw new IllegalStateException( + MessageLocalization.getComposedMessage("this.largeelement.has.already.been.added.to.the.document")); } Section section = new Section(title, numberDepth); section.setIndentation(indentation); add(section); return section; } - + /** * Creates a Section, adds it to this Section and returns it. * - * @param indentation the indentation of the new section - * @param title the title of the new section - * @return a new Section object + * @param indentation the indentation of the new section + * @param title the title of the new section + * @return a new Section object */ public Section addSection(float indentation, Paragraph title) { return addSection(indentation, title, numberDepth + 1); } - + /** * Creates a Section, add it to this Section and returns it. * - * @param title the title of the new section - * @param numberDepth the numberDepth of the section - * @return a new Section object + * @param title the title of the new section + * @param numberDepth the numberDepth of the section + * @return a new Section object */ public Section addSection(Paragraph title, int numberDepth) { return addSection(0, title, numberDepth); } - + /** * Adds a marked section. For use in class MarkedSection only! * @@ -387,144 +450,101 @@ public MarkedSection addMarkedSection() { add(section); return section; } - + /** * Creates a Section, adds it to this Section and returns it. * - * @param title the title of the new section - * @return a new Section object + * @param title the title of the new section + * @return a new Section object */ public Section addSection(Paragraph title) { return addSection(0, title, numberDepth + 1); } - + /** * Adds a Section to this Section and returns it. * - * @param indentation the indentation of the new section - * @param title the title of the new section - * @param numberDepth the numberDepth of the section - * @return a new Section object + * @param indentation the indentation of the new section + * @param title the title of the new section + * @param numberDepth the numberDepth of the section + * @return a new Section object */ public Section addSection(float indentation, String title, int numberDepth) { return addSection(indentation, new Paragraph(title), numberDepth); } - + /** * Adds a Section to this Section and returns it. * - * @param title the title of the new section - * @param numberDepth the numberDepth of the section - * @return a new Section object + * @param title the title of the new section + * @param numberDepth the numberDepth of the section + * @return a new Section object */ public Section addSection(String title, int numberDepth) { return addSection(new Paragraph(title), numberDepth); } - + /** * Adds a Section to this Section and returns it. * - * @param indentation the indentation of the new section - * @param title the title of the new section - * @return a new Section object + * @param indentation the indentation of the new section + * @param title the title of the new section + * @return a new Section object */ public Section addSection(float indentation, String title) { return addSection(indentation, new Paragraph(title)); } - + + // public methods + /** * Adds a Section to this Section and returns it. * - * @param title the title of the new section - * @return a new Section object + * @param title the title of the new section + * @return a new Section object */ public Section addSection(String title) { return addSection(new Paragraph(title)); } - - // public methods - - /** - * Sets the title of this section. - * - * @param title the new title - */ - public void setTitle(Paragraph title) { - this.title = title; - } /** * Returns the title, preceded by a certain number of sectionnumbers. * - * @return a Paragraph + * @return a Paragraph */ public Paragraph getTitle() { return constructTitle(title, numbers, numberDepth, numberStyle); } - - /** - * Constructs a Paragraph that will be used as title for a Section or Chapter. - * @param title the title of the section - * @param numbers a list of sectionnumbers - * @param numberDepth how many numbers have to be shown - * @param numberStyle the numbering style - * @return a Paragraph object - * @since iText 2.0.8 - */ - public static Paragraph constructTitle(Paragraph title, java.util.List numbers, int numberDepth, int numberStyle) { - if (title == null) { - return null; - } - int depth = Math.min(numbers.size(), numberDepth); - if (depth < 1) { - return title; - } - StringBuilder buf = new StringBuilder(" "); - for (int i = 0; i < depth; i++) { - buf.insert(0, "."); - buf.insert(0, numbers.get(i).intValue()); - } - if (numberStyle == NUMBERSTYLE_DOTTED_WITHOUT_FINAL_DOT) { - buf.deleteCharAt(buf.length() - 2); - } - Paragraph result = new Paragraph(title); - result.add(0, new Chunk(buf.toString(), title.getFont())); - return result; - } - /** - * Sets the depth of the sectionnumbers that will be shown preceding the title. - *

    - * If the numberdepth is 0, the sections will not be numbered. If the numberdepth - * is 1, the section will be numbered with their own number. If the numberdepth is - * higher (for instance {@literal x > 1}), the numbers of {@literal x - 1} parents will be shown. + * Sets the title of this section. * - * @param numberDepth the new numberDepth + * @param title the new title */ - public void setNumberDepth(int numberDepth) { - this.numberDepth = numberDepth; + public void setTitle(Paragraph title) { + this.title = title; } - + /** * Returns the numberdepth of this Section. * - * @return the numberdepth + * @return the numberdepth */ public int getNumberDepth() { return numberDepth; } /** - * Sets the style for numbering sections. - * Possible values are NUMBERSTYLE_DOTTED: 1.2.3. (the default) - * or NUMBERSTYLE_DOTTED_WITHOUT_FINAL_DOT: 1.2.3 + * Sets the depth of the sectionnumbers that will be shown preceding the title. + *

    + * If the numberdepth is 0, the sections will not be numbered. If the numberdepth is 1, the section will be numbered + * with their own number. If the numberdepth is higher (for instance {@literal x > 1}), the numbers of + * {@literal x - 1} parents will be shown. * - * @param numberStyle {@link Section#numberStyle} - * @since iText 2.0.8 + * @param numberDepth the new numberDepth */ - public void setNumberStyle(int numberStyle) { - this.numberStyle = numberStyle; + public void setNumberDepth(int numberDepth) { + this.numberDepth = numberDepth; } /** @@ -536,113 +556,131 @@ public void setNumberStyle(int numberStyle) { public int getNumberStyle() { return numberStyle; } - + /** - * Sets the indentation of this Section on the left side. + * Sets the style for numbering sections. Possible values are NUMBERSTYLE_DOTTED: 1.2.3. (the default) or + * NUMBERSTYLE_DOTTED_WITHOUT_FINAL_DOT: 1.2.3 * - * @param indentation the indentation + * @param numberStyle {@link Section#numberStyle} + * @since iText 2.0.8 */ - public void setIndentationLeft(float indentation) { - indentationLeft = indentation; + public void setNumberStyle(int numberStyle) { + this.numberStyle = numberStyle; } /** * Returns the indentation of this Section on the left side. * - * @return the indentation + * @return the indentation */ public float getIndentationLeft() { return indentationLeft; } - + /** - * Sets the indentation of this Section on the right side. + * Sets the indentation of this Section on the left side. * - * @param indentation the indentation + * @param indentation the indentation */ - public void setIndentationRight(float indentation) { - indentationRight = indentation; + public void setIndentationLeft(float indentation) { + indentationLeft = indentation; } /** * Returns the indentation of this Section on the right side. * - * @return the indentation + * @return the indentation */ public float getIndentationRight() { return indentationRight; } - + /** - * Sets the indentation of the content of this Section. + * Sets the indentation of this Section on the right side. * - * @param indentation the indentation + * @param indentation the indentation */ - public void setIndentation(float indentation) { - this.indentation = indentation; + public void setIndentationRight(float indentation) { + indentationRight = indentation; } /** * Returns the indentation of the content of this Section. * - * @return the indentation + * @return the indentation */ public float getIndentation() { return indentation; } - - /** Setter for property bookmarkOpen. - * @param bookmarkOpen false if the bookmark children are not - * visible. + + /** + * Sets the indentation of the content of this Section. + * + * @param indentation the indentation */ - public void setBookmarkOpen(boolean bookmarkOpen) { - this.bookmarkOpen = bookmarkOpen; + public void setIndentation(float indentation) { + this.indentation = indentation; } - + /** * Getter for property bookmarkOpen. + * * @return Value of property bookmarkOpen. */ public boolean isBookmarkOpen() { return bookmarkOpen; } - + /** - * Setter for property triggerNewPage. - * @param triggerNewPage true if a new page has to be triggered. + * Setter for property bookmarkOpen. + * + * @param bookmarkOpen false if the bookmark children are not visible. */ - public void setTriggerNewPage(boolean triggerNewPage) { - this.triggerNewPage = triggerNewPage; + public void setBookmarkOpen(boolean bookmarkOpen) { + this.bookmarkOpen = bookmarkOpen; } /** * Getter for property bookmarkOpen. + * * @return Value of property triggerNewPage. */ public boolean isTriggerNewPage() { return triggerNewPage && notAddedYet; } - + /** - * Sets the bookmark title. The bookmark title is the same as the section title but - * can be changed with this method. - * @param bookmarkTitle the bookmark title - */ - public void setBookmarkTitle(String bookmarkTitle) { - this.bookmarkTitle = bookmarkTitle; + * Setter for property triggerNewPage. + * + * @param triggerNewPage true if a new page has to be triggered. + */ + public void setTriggerNewPage(boolean triggerNewPage) { + this.triggerNewPage = triggerNewPage; } /** * Gets the bookmark title. + * * @return the bookmark title - */ + */ public Paragraph getBookmarkTitle() { - if (bookmarkTitle == null) + if (bookmarkTitle == null) { return getTitle(); - else + } else { return new Paragraph(bookmarkTitle); + } } - + + /** + * Sets the bookmark title. The bookmark title is the same as the section title but can be changed with this + * method. + * + * @param bookmarkTitle the bookmark title + */ + public void setBookmarkTitle(String bookmarkTitle) { + this.bookmarkTitle = bookmarkTitle; + } + /** * Changes the Chapter number. * @@ -662,19 +700,19 @@ public void setChapterNumber(int number) { /** * Returns the depth of this section. * - * @return the depth + * @return the depth */ public int getDepth() { return numbers.size(); } - + // private methods - + /** * Sets the number of this section. * - * @param number the number of this section - * @param numbers an ArrayList, containing the numbers of the Parent + * @param number the number of this section + * @param numbers an ArrayList, containing the numbers of the Parent */ private void setNumbers(int number, java.util.List numbers) { this.numbers = new ArrayList<>(); @@ -684,58 +722,56 @@ private void setNumbers(int number, java.util.List numbers) { /** * Indicates if this is the first time the section is added. - * @since iText2.0.8 - * @return true if the section wasn't added yet + * + * @return true if the section wasn't added yet + * @since iText2.0.8 */ public boolean isNotAddedYet() { return notAddedYet; } /** - * Sets the indication if the section was already added to - * the document. - * @since iText2.0.8 + * Sets the indication if the section was already added to the document. + * * @param notAddedYet {@link Section#notAddedYet} + * @since iText2.0.8 */ public void setNotAddedYet(boolean notAddedYet) { this.notAddedYet = notAddedYet; } - + /** - * * @return boolean, true if section is added completely, else false - * @since iText 2.0.8 + * @since iText 2.0.8 */ protected boolean isAddedCompletely() { return addedCompletely; } - + /** - * * @param addedCompletely {@link Section#addedCompletely} - * @since iText 2.0.8 + * @since iText 2.0.8 */ protected void setAddedCompletely(boolean addedCompletely) { this.addedCompletely = addedCompletely; } - + /** - * @since iText 2.0.8 * @see com.lowagie.text.LargeElement#flushContent() + * @since iText 2.0.8 */ public void flushContent() { setNotAddedYet(false); title = null; Element element; for (Iterator i = iterator(); i.hasNext(); ) { - element = (Element)i.next(); + element = (Element) i.next(); if (element instanceof Section) { - Section s = (Section)element; + Section s = (Section) element; if (!s.isComplete() && size() == 1) { s.flushContent(); return; - } - else { + } else { s.setAddedCompletely(true); } } @@ -744,16 +780,16 @@ public void flushContent() { } /** - * @since iText 2.0.8 * @see com.lowagie.text.LargeElement#isComplete() + * @since iText 2.0.8 */ public boolean isComplete() { return complete; } /** - * @since iText 2.0.8 * @see com.lowagie.text.LargeElement#setComplete(boolean) + * @since iText 2.0.8 */ public void setComplete(boolean complete) { this.complete = complete; @@ -761,7 +797,8 @@ public void setComplete(boolean complete) { /** * Adds a new page to the section. - * @since 2.1.1 + * + * @since 2.1.1 */ public void newPage() { this.add(Chunk.NEXTPAGE); diff --git a/openpdf/src/main/java/com/lowagie/text/SimpleCell.java b/openpdf/src/main/java/com/lowagie/text/SimpleCell.java index eca85ff7f..e7d32ee60 100644 --- a/openpdf/src/main/java/com/lowagie/text/SimpleCell.java +++ b/openpdf/src/main/java/com/lowagie/text/SimpleCell.java @@ -60,65 +60,101 @@ /** - * Rectangle that can be used for Cells. - * This Rectangle is padded and knows how to draw itself in a PdfPTable or PdfPcellEvent. + * Rectangle that can be used for Cells. This Rectangle is padded and knows how to draw itself in a PdfPTable or + * PdfPcellEvent. */ public class SimpleCell extends Rectangle implements PdfPCellEvent, TextElementArray { // constants - /** the CellAttributes object represents a row. */ + /** + * the CellAttributes object represents a row. + */ public static final boolean ROW = true; - /** the CellAttributes object represents a cell. */ + /** + * the CellAttributes object represents a cell. + */ public static final boolean CELL = false; - + // member variables - /** the content of the Cell. */ + /** + * Indicates that the largest ascender height should be used to determine the height of the first line. Note that + * this only has an effect when rendered to PDF. Setting this to true can help with vertical alignment problems. + */ + protected boolean useAscender = false; + /** + * Indicates that the largest descender height should be added to the height of the last line (so characters like y + * don't dip into the border). Note that this only has an effect when rendered to PDF. + */ + protected boolean useDescender = false; + /** + * Adjusts the cell contents to compensate for border widths. Note that this only has an effect when rendered to + * PDF. + */ + protected boolean useBorderPadding; + /** + * the content of the Cell. + */ private java.util.List content = new ArrayList<>(); - /** the width of the Cell. */ + /** + * the width of the Cell. + */ private float width = 0f; - /** the widthpercentage of the Cell. */ + /** + * the widthpercentage of the Cell. + */ private float widthpercentage = 0f; - /** an extra spacing variable */ + /** + * an extra spacing variable + */ private float spacing_left = Float.NaN; - /** an extra spacing variable */ + /** + * an extra spacing variable + */ private float spacing_right = Float.NaN; - /** an extra spacing variable */ + /** + * an extra spacing variable + */ private float spacing_top = Float.NaN; - /** an extra spacing variable */ + /** + * an extra spacing variable + */ private float spacing_bottom = Float.NaN; - /** an extra padding variable */ + /** + * an extra padding variable + */ private float padding_left = Float.NaN; - /** an extra padding variable */ + /** + * an extra padding variable + */ private float padding_right = Float.NaN; - /** an extra padding variable */ + /** + * an extra padding variable + */ private float padding_top = Float.NaN; - /** an extra padding variable */ + /** + * an extra padding variable + */ private float padding_bottom = Float.NaN; - /** the colspan of a Cell */ + /** + * the colspan of a Cell + */ private int colspan = 1; - /** horizontal alignment inside the Cell. */ + /** + * horizontal alignment inside the Cell. + */ private int horizontalAlignment = Element.ALIGN_UNDEFINED; - /** vertical alignment inside the Cell. */ + /** + * vertical alignment inside the Cell. + */ private int verticalAlignment = Element.ALIGN_UNDEFINED; - /** indicates if these are the attributes of a single Cell (false) or a group of Cells (true). */ - private boolean cellgroup = false; - /** Indicates that the largest ascender height should be used to determine the - * height of the first line. Note that this only has an effect when rendered - * to PDF. Setting this to true can help with vertical alignment problems. */ - protected boolean useAscender = false; - /** Indicates that the largest descender height should be added to the height of - * the last line (so characters like y don't dip into the border). Note that - * this only has an effect when rendered to PDF. */ - protected boolean useDescender = false; /** - * Adjusts the cell contents to compensate for border widths. Note that - * this only has an effect when rendered to PDF. + * indicates if these are the attributes of a single Cell (false) or a group of Cells (true). */ - protected boolean useBorderPadding; - + private boolean cellgroup = false; + /** - * A CellAttributes object is always constructed without any dimensions. - * Dimensions are defined after creation. + * A CellAttributes object is always constructed without any dimensions. Dimensions are defined after creation. + * * @param row only true if the CellAttributes object represents a row. */ public SimpleCell(boolean row) { @@ -126,24 +162,26 @@ public SimpleCell(boolean row) { cellgroup = row; setBorder(BOX); } - + /** * Adds content to this object. - * @param element an object of type {@link Element} - * that you want to add to the cell + * + * @param element an object of type {@link Element} that you want to add to the cell * @throws BadElementException on error */ public void addElement(Element element) throws BadElementException { if (cellgroup) { if (element instanceof SimpleCell) { - if(((SimpleCell)element).isCellgroup()) { - throw new BadElementException(MessageLocalization.getComposedMessage("you.can.t.add.one.row.to.another.row")); + if (((SimpleCell) element).isCellgroup()) { + throw new BadElementException( + MessageLocalization.getComposedMessage("you.can.t.add.one.row.to.another.row")); } content.add(element); return; - } - else { - throw new BadElementException(MessageLocalization.getComposedMessage("you.can.only.add.cells.to.rows.no.objects.of.type.1", element.getClass().getName())); + } else { + throw new BadElementException( + MessageLocalization.getComposedMessage("you.can.only.add.cells.to.rows.no.objects.of.type.1", + element.getClass().getName())); } } if (element.type() == Element.PARAGRAPH @@ -158,17 +196,17 @@ public void addElement(Element element) throws BadElementException { || element.type() == Element.IMGRAW || element.type() == Element.IMGTEMPLATE) { content.add(element); - } - else { - throw new BadElementException(MessageLocalization.getComposedMessage("you.can.t.add.an.element.of.type.1.to.a.simplecell", element.getClass().getName())); + } else { + throw new BadElementException( + MessageLocalization.getComposedMessage("you.can.t.add.an.element.of.type.1.to.a.simplecell", + element.getClass().getName())); } } /** * Creates a Cell with these attributes. * - * @param rowAttributes an object of type {@link SimpleCell} - * whose attributes are to be used to create new cell + * @param rowAttributes an object of type {@link SimpleCell} whose attributes are to be used to create new cell * @return a cell based on these attributes. * @throws BadElementException on error */ @@ -195,8 +233,7 @@ public Cell createCell(SimpleCell rowAttributes) throws BadElementException { /** * Creates a PdfPCell with these attributes. * - * @param rowAttributes an object of type {@link SimpleCell} - * whose attributes are to be used to create new cell + * @param rowAttributes an object of type {@link SimpleCell} whose attributes are to be used to create new cell * @return a PdfPCell based on these attributes. */ public PdfPCell createPdfPCell(SimpleCell rowAttributes) { @@ -216,36 +253,57 @@ public PdfPCell createPdfPCell(SimpleCell rowAttributes) { cell.setUseBorderPadding(rowAttributes.useBorderPadding); cell.setUseDescender(rowAttributes.useDescender); cell.setColspan(colspan); - if (horizontalAlignment != Element.ALIGN_UNDEFINED) + if (horizontalAlignment != Element.ALIGN_UNDEFINED) { cell.setHorizontalAlignment(horizontalAlignment); - if (verticalAlignment != Element.ALIGN_UNDEFINED) + } + if (verticalAlignment != Element.ALIGN_UNDEFINED) { cell.setVerticalAlignment(verticalAlignment); - if (useAscender) + } + if (useAscender) { cell.setUseAscender(useAscender); - if (useBorderPadding) + } + if (useBorderPadding) { cell.setUseBorderPadding(useBorderPadding); - if (useDescender) + } + if (useDescender) { cell.setUseDescender(useDescender); + } float p; float sp_left = spacing_left; - if (Float.isNaN(sp_left)) sp_left = 0f; + if (Float.isNaN(sp_left)) { + sp_left = 0f; + } float sp_right = spacing_right; - if (Float.isNaN(sp_right)) sp_right = 0f; + if (Float.isNaN(sp_right)) { + sp_right = 0f; + } float sp_top = spacing_top; - if (Float.isNaN(sp_top)) sp_top = 0f; + if (Float.isNaN(sp_top)) { + sp_top = 0f; + } float sp_bottom = spacing_bottom; - if (Float.isNaN(sp_bottom)) sp_bottom = 0f; + if (Float.isNaN(sp_bottom)) { + sp_bottom = 0f; + } p = padding_left; - if (Float.isNaN(p)) p = 0f; + if (Float.isNaN(p)) { + p = 0f; + } cell.setPaddingLeft(p + sp_left); p = padding_right; - if (Float.isNaN(p)) p = 0f; + if (Float.isNaN(p)) { + p = 0f; + } cell.setPaddingRight(p + sp_right); p = padding_top; - if (Float.isNaN(p)) p = 0f; + if (Float.isNaN(p)) { + p = 0f; + } cell.setPaddingTop(p + sp_top); p = padding_bottom; - if (Float.isNaN(p)) p = 0f; + if (Float.isNaN(p)) { + p = 0f; + } cell.setPaddingBottom(p + sp_bottom); Element element; for (Object o : content) { @@ -256,25 +314,37 @@ public PdfPCell createPdfPCell(SimpleCell rowAttributes) { } /** - * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell, com.lowagie.text.Rectangle, com.lowagie.text.pdf.PdfContentByte[]) + * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell, com.lowagie.text.Rectangle, + * com.lowagie.text.pdf.PdfContentByte[]) */ public void cellLayout(PdfPCell cell, Rectangle position, PdfContentByte[] canvases) { float sp_left = spacing_left; - if (Float.isNaN(sp_left)) sp_left = 0f; + if (Float.isNaN(sp_left)) { + sp_left = 0f; + } float sp_right = spacing_right; - if (Float.isNaN(sp_right)) sp_right = 0f; + if (Float.isNaN(sp_right)) { + sp_right = 0f; + } float sp_top = spacing_top; - if (Float.isNaN(sp_top)) sp_top = 0f; + if (Float.isNaN(sp_top)) { + sp_top = 0f; + } float sp_bottom = spacing_bottom; - if (Float.isNaN(sp_bottom)) sp_bottom = 0f; - Rectangle rect = new Rectangle(position.getLeft(sp_left), position.getBottom(sp_bottom), position.getRight(sp_right), position.getTop(sp_top)); + if (Float.isNaN(sp_bottom)) { + sp_bottom = 0f; + } + Rectangle rect = new Rectangle(position.getLeft(sp_left), position.getBottom(sp_bottom), + position.getRight(sp_right), position.getTop(sp_top)); rect.cloneNonPositionParameters(this); canvases[PdfPTable.BACKGROUNDCANVAS].rectangle(rect); rect.setBackgroundColor(null); canvases[PdfPTable.LINECANVAS].rectangle(rect); } - - /** Sets the padding parameters if they are undefined. + + /** + * Sets the padding parameters if they are undefined. + * * @param padding padding that will be set */ public void setPadding(float padding) { @@ -291,227 +361,257 @@ public void setPadding(float padding) { setPadding_bottom(padding); } } - + /** * @return Returns the colspan. */ public int getColspan() { return colspan; } + /** * @param colspan The colspan to set. */ public void setColspan(int colspan) { - if (colspan > 0) this.colspan = colspan; + if (colspan > 0) { + this.colspan = colspan; + } } + /** * @return Returns the padding_bottom. */ public float getPadding_bottom() { return padding_bottom; } + /** * @param padding_bottom The padding_bottom to set. */ public void setPadding_bottom(float padding_bottom) { this.padding_bottom = padding_bottom; } + /** * @return Returns the padding_left. */ public float getPadding_left() { return padding_left; } + /** * @param padding_left The padding_left to set. */ public void setPadding_left(float padding_left) { this.padding_left = padding_left; } + /** * @return Returns the padding_right. */ public float getPadding_right() { return padding_right; } + /** * @param padding_right The padding_right to set. */ public void setPadding_right(float padding_right) { this.padding_right = padding_right; } + /** * @return Returns the padding_top. */ public float getPadding_top() { return padding_top; } + /** * @param padding_top The padding_top to set. */ public void setPadding_top(float padding_top) { this.padding_top = padding_top; } + /** * @return Returns the spacing. */ public float getSpacing_left() { return spacing_left; } + + /** + * @param spacing The spacing to set. + */ + public void setSpacing_left(float spacing) { + this.spacing_left = spacing; + } + /** * @return Returns the spacing. */ public float getSpacing_right() { return spacing_right; } + /** - * @return Returns the spacing. + * @param spacing The spacing to set. */ - public float getSpacing_top() { - return spacing_top; + public void setSpacing_right(float spacing) { + this.spacing_right = spacing; } + /** * @return Returns the spacing. */ - public float getSpacing_bottom() { - return spacing_bottom; + public float getSpacing_top() { + return spacing_top; } - + /** * @param spacing The spacing to set. */ - public void setSpacing(float spacing) { - this.spacing_left = spacing; - this.spacing_right = spacing; + public void setSpacing_top(float spacing) { this.spacing_top = spacing; - this.spacing_bottom = spacing; } - + /** - * @param spacing The spacing to set. + * @return Returns the spacing. */ - public void setSpacing_left(float spacing) { - this.spacing_left = spacing; + public float getSpacing_bottom() { + return spacing_bottom; } - + /** * @param spacing The spacing to set. */ - public void setSpacing_right(float spacing) { - this.spacing_right = spacing; + public void setSpacing_bottom(float spacing) { + this.spacing_bottom = spacing; } - + /** * @param spacing The spacing to set. */ - public void setSpacing_top(float spacing) { + public void setSpacing(float spacing) { + this.spacing_left = spacing; + this.spacing_right = spacing; this.spacing_top = spacing; - } - - /** - * @param spacing The spacing to set. - */ - public void setSpacing_bottom(float spacing) { this.spacing_bottom = spacing; } - + /** * @return Returns the cellgroup. */ public boolean isCellgroup() { return cellgroup; } + /** * @param cellgroup The cellgroup to set. */ public void setCellgroup(boolean cellgroup) { this.cellgroup = cellgroup; } + /** * @return Returns the horizontal alignment. */ public int getHorizontalAlignment() { return horizontalAlignment; } + /** * @param horizontalAlignment The horizontalAlignment to set. */ public void setHorizontalAlignment(int horizontalAlignment) { this.horizontalAlignment = horizontalAlignment; } + /** * @return Returns the vertical alignment. */ public int getVerticalAlignment() { return verticalAlignment; } + /** * @param verticalAlignment The verticalAligment to set. */ public void setVerticalAlignment(int verticalAlignment) { this.verticalAlignment = verticalAlignment; } + /** * @return Returns the width. */ public float getWidth() { return width; } + /** * @param width The width to set. */ public void setWidth(float width) { this.width = width; } + /** * @return Returns the widthpercentage. */ public float getWidthpercentage() { return widthpercentage; } + /** * @param widthpercentage The widthpercentage to set. */ public void setWidthpercentage(float widthpercentage) { this.widthpercentage = widthpercentage; } + /** * @return Returns the useAscender. */ public boolean isUseAscender() { return useAscender; } + /** * @param useAscender The useAscender to set. */ public void setUseAscender(boolean useAscender) { this.useAscender = useAscender; } + /** * @return Returns the useBorderPadding. */ public boolean isUseBorderPadding() { return useBorderPadding; } + /** * @param useBorderPadding The useBorderPadding to set. */ public void setUseBorderPadding(boolean useBorderPadding) { this.useBorderPadding = useBorderPadding; } + /** * @return Returns the useDescender. */ public boolean isUseDescender() { return useDescender; } + /** * @param useDescender The useDescender to set. */ public void setUseDescender(boolean useDescender) { this.useDescender = useDescender; } - + /** * @return Returns the content. */ @@ -526,14 +626,13 @@ public boolean add(Element o) { try { addElement(o); return true; - } - catch(ClassCastException e) { + } catch (ClassCastException e) { return false; - } - catch(BadElementException e) { + } catch (BadElementException e) { throw new ExceptionConverter(e); } } + /** * @see com.lowagie.text.Element#type() */ diff --git a/openpdf/src/main/java/com/lowagie/text/SimpleTable.java b/openpdf/src/main/java/com/lowagie/text/SimpleTable.java index 1a76e3e92..18cd0efba 100644 --- a/openpdf/src/main/java/com/lowagie/text/SimpleTable.java +++ b/openpdf/src/main/java/com/lowagie/text/SimpleTable.java @@ -58,27 +58,38 @@ /** - * Rectangle that can be used for Cells. - * This Rectangle is padded and knows how to draw itself in a PdfPTable or PdfPcellEvent. + * Rectangle that can be used for Cells. This Rectangle is padded and knows how to draw itself in a PdfPTable or + * PdfPcellEvent. */ public class SimpleTable extends Rectangle implements PdfPTableEvent, TextElementArray { - /** the content of a Table. */ + /** + * the content of a Table. + */ private java.util.List content = new ArrayList<>(); - /** the width of the Table. */ + /** + * the width of the Table. + */ private float width = 0f; - /** the widthpercentage of the Table. */ + /** + * the widthpercentage of the Table. + */ private float widthpercentage = 0f; - /** the spacing of the Cells. */ + /** + * the spacing of the Cells. + */ private float cellspacing; - /** the padding of the Cells. */ + /** + * the padding of the Cells. + */ private float cellpadding; - /** the alignment of the table. */ + /** + * the alignment of the table. + */ private int alignment; - + /** - * A RectangleCell is always constructed without any dimensions. - * Dimensions are defined after creation. + * A RectangleCell is always constructed without any dimensions. Dimensions are defined after creation. */ public SimpleTable() { super(0f, 0f, 0f, 0f); @@ -89,13 +100,13 @@ public SimpleTable() { /** * Adds content to this object. * - * @param element an object of type {@link SimpleCell} - * that will be added in the table + * @param element an object of type {@link SimpleCell} that will be added in the table * @throws BadElementException on error */ public void addElement(SimpleCell element) throws BadElementException { - if(!element.isCellgroup()) { - throw new BadElementException(MessageLocalization.getComposedMessage("you.can.t.add.cells.to.a.table.directly.add.them.to.a.row.first")); + if (!element.isCellgroup()) { + throw new BadElementException(MessageLocalization.getComposedMessage( + "you.can.t.add.cells.to.a.table.directly.add.them.to.a.row.first")); } content.add(element); } @@ -107,8 +118,11 @@ public void addElement(SimpleCell element) throws BadElementException { * @throws BadElementException on error */ public Table createTable() throws BadElementException { - if (content.isEmpty()) throw new BadElementException(MessageLocalization.getComposedMessage("trying.to.create.a.table.without.rows")); - SimpleCell row = (SimpleCell)content.get(0); + if (content.isEmpty()) { + throw new BadElementException( + MessageLocalization.getComposedMessage("trying.to.create.a.table.without.rows")); + } + SimpleCell row = (SimpleCell) content.get(0); SimpleCell cell; int columns = 0; for (Object o2 : row.getContent()) { @@ -131,14 +145,18 @@ public Table createTable() throws BadElementException { cell = (SimpleCell) o; table.addCell(cell.createCell(row)); if (cell.getColspan() == 1) { - if (cell.getWidth() > 0) widths[pos] = cell.getWidth(); - if (cell.getWidthpercentage() > 0) widthpercentages[pos] = cell.getWidthpercentage(); + if (cell.getWidth() > 0) { + widths[pos] = cell.getWidth(); + } + if (cell.getWidthpercentage() > 0) { + widthpercentages[pos] = cell.getWidthpercentage(); + } } pos += cell.getColspan(); } } float sumWidths = 0f; - for(int i = 0; i < columns; i++) { + for (int i = 0; i < columns; i++) { if (widths[i] == 0) { sumWidths = 0; break; @@ -149,9 +167,8 @@ public Table createTable() throws BadElementException { table.setWidth(sumWidths); table.setLocked(true); table.setWidths(widths); - } - else { - for(int i = 0; i < columns; i++) { + } else { + for (int i = 0; i < columns; i++) { if (widthpercentages[i] == 0) { sumWidths = 0; break; @@ -165,8 +182,7 @@ public Table createTable() throws BadElementException { if (width > 0) { table.setWidth(width); table.setLocked(true); - } - else if (widthpercentage > 0) { + } else if (widthpercentage > 0) { table.setWidth(widthpercentage); } return table; @@ -179,8 +195,11 @@ else if (widthpercentage > 0) { * @throws DocumentException on error */ public PdfPTable createPdfPTable() throws DocumentException { - if (content.isEmpty()) throw new BadElementException(MessageLocalization.getComposedMessage("trying.to.create.a.table.without.rows")); - SimpleCell row = (SimpleCell)content.get(0); + if (content.isEmpty()) { + throw new BadElementException( + MessageLocalization.getComposedMessage("trying.to.create.a.table.without.rows")); + } + SimpleCell row = (SimpleCell) content.get(0); SimpleCell cell; int columns = 0; for (Object o2 : row.getContent()) { @@ -213,14 +232,18 @@ public PdfPTable createPdfPTable() throws DocumentException { cell.setPadding(cellpadding); table.addCell(cell.createPdfPCell(row)); if (cell.getColspan() == 1) { - if (cell.getWidth() > 0) widths[pos] = cell.getWidth(); - if (cell.getWidthpercentage() > 0) widthpercentages[pos] = cell.getWidthpercentage(); + if (cell.getWidth() > 0) { + widths[pos] = cell.getWidth(); + } + if (cell.getWidthpercentage() > 0) { + widthpercentages[pos] = cell.getWidthpercentage(); + } } pos += cell.getColspan(); } } float sumWidths = 0f; - for(int i = 0; i < columns; i++) { + for (int i = 0; i < columns; i++) { if (widths[i] == 0) { sumWidths = 0; break; @@ -230,9 +253,8 @@ public PdfPTable createPdfPTable() throws DocumentException { if (sumWidths > 0) { table.setTotalWidth(sumWidths); table.setWidths(widths); - } - else { - for(int i = 0; i < columns; i++) { + } else { + for (int i = 0; i < columns; i++) { if (widthpercentages[i] == 0) { sumWidths = 0; break; @@ -251,11 +273,13 @@ public PdfPTable createPdfPTable() throws DocumentException { } return table; } - + /** - * @see com.lowagie.text.pdf.PdfPTableEvent#tableLayout(com.lowagie.text.pdf.PdfPTable, float[][], float[], int, int, com.lowagie.text.pdf.PdfContentByte[]) - */ - public void tableLayout(PdfPTable table, float[][] widths, float[] heights, int headerRows, int rowStart, PdfContentByte[] canvases) { + * @see com.lowagie.text.pdf.PdfPTableEvent#tableLayout(com.lowagie.text.pdf.PdfPTable, float[][], float[], int, + * int, com.lowagie.text.pdf.PdfContentByte[]) + */ + public void tableLayout(PdfPTable table, float[][] widths, float[] heights, int headerRows, int rowStart, + PdfContentByte[] canvases) { float[] width = widths[0]; Rectangle rect = new Rectangle(width[0], heights[heights.length - 1], width[width.length - 1], heights[0]); rect.cloneNonPositionParameters(this); @@ -266,68 +290,77 @@ public void tableLayout(PdfPTable table, float[][] widths, float[] heights, int rect.setBackgroundColor(null); canvases[PdfPTable.LINECANVAS].rectangle(rect); } - + /** * @return Returns the cellpadding. */ public float getCellpadding() { return cellpadding; } + /** * @param cellpadding The cellpadding to set. */ public void setCellpadding(float cellpadding) { this.cellpadding = cellpadding; } + /** * @return Returns the cellspacing. */ public float getCellspacing() { return cellspacing; } + /** * @param cellspacing The cellspacing to set. */ public void setCellspacing(float cellspacing) { this.cellspacing = cellspacing; } - + /** * @return Returns the alignment. */ public int getAlignment() { return alignment; } + /** * @param alignment The alignment to set. */ public void setAlignment(int alignment) { this.alignment = alignment; } + /** * @return Returns the width. */ public float getWidth() { return width; } + /** * @param width The width to set. */ public void setWidth(float width) { this.width = width; } + /** * @return Returns the widthpercentage. */ public float getWidthpercentage() { return widthpercentage; } + /** * @param widthpercentage The widthpercentage to set. */ public void setWidthpercentage(float widthpercentage) { this.widthpercentage = widthpercentage; } + /** * @see com.lowagie.text.Element#type() */ @@ -337,7 +370,7 @@ public int type() { /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return true; @@ -348,13 +381,11 @@ public boolean isNestable() { */ public boolean add(Element o) { try { - addElement((SimpleCell)o); + addElement((SimpleCell) o); return true; - } - catch(ClassCastException e) { + } catch (ClassCastException e) { return false; - } - catch(BadElementException e) { + } catch (BadElementException e) { throw new ExceptionConverter(e); } } diff --git a/openpdf/src/main/java/com/lowagie/text/SpecialSymbol.java b/openpdf/src/main/java/com/lowagie/text/SpecialSymbol.java index d8a7155ef..0386b0691 100644 --- a/openpdf/src/main/java/com/lowagie/text/SpecialSymbol.java +++ b/openpdf/src/main/java/com/lowagie/text/SpecialSymbol.java @@ -51,25 +51,24 @@ /** * This class contains the symbols that correspond with special symbols. - *

    - * When you construct a Phrase with Phrase.getInstance using a String, - * this String can contain special Symbols. These are characters with an int value - * between 913 and 937 (except 930) and between 945 and 969. With this class the value of the - * corresponding character of the Font Symbol, can be retrieved. + *

    + * When you construct a Phrase with Phrase.getInstance using a String, this + * String can contain special Symbols. These are characters with an int value between 913 and 937 (except + * 930) and between 945 and 969. With this class the value of the corresponding character of the Font Symbol, can be + * retrieved. * - * @see Phrase - * - * @author Bruno Lowagie - * @author Evelyne De Cordier + * @author Bruno Lowagie + * @author Evelyne De Cordier + * @see Phrase */ public class SpecialSymbol { - + /** * Returns the first occurrence of a special symbol in a String. * - * @param string a String - * @return an index of -1 if no special symbol was found + * @param string a String + * @return an index of -1 if no special symbol was found */ public static int index(String string) { int length = string.length(); @@ -80,10 +79,11 @@ public static int index(String string) { } return -1; } - + /** * Gets a chunk with a symbol character. - * @param c a character that has to be changed into a symbol + * + * @param c a character that has to be changed into a symbol * @param font Font if there is no SYMBOL character corresponding with c * @return a SYMBOL version of a character */ @@ -96,15 +96,15 @@ public static Chunk get(char c, Font font) { String s = String.valueOf(greek); return new Chunk(s, symbol); } - + /** * Looks for the corresponding symbol in the font Symbol. * - * @param c the original ASCII-char - * @return the corresponding symbol in font Symbol + * @param c the original ASCII-char + * @return the corresponding symbol in font Symbol */ public static char getCorrespondingSymbol(char c) { - switch(c) { + switch (c) { case 913: return 'A'; // ALFA case 914: @@ -203,8 +203,8 @@ public static char getCorrespondingSymbol(char c) { return 'y'; // psi case 969: return 'w'; // omega - default: - return ' '; + default: + return ' '; } } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/SplitCharacter.java b/openpdf/src/main/java/com/lowagie/text/SplitCharacter.java index d9faa355a..dfc2ec1cd 100755 --- a/openpdf/src/main/java/com/lowagie/text/SplitCharacter.java +++ b/openpdf/src/main/java/com/lowagie/text/SplitCharacter.java @@ -51,16 +51,17 @@ import com.lowagie.text.pdf.PdfChunk; -/** Interface for customizing the split character. +/** + * Interface for customizing the split character. * * @author Paulo Soares (psoares@consiste.pt) */ public interface SplitCharacter { - + /** - * Returns true if the character can split a line. The splitting implementation - * is free to look ahead or look behind characters to make a decision. + * Returns true if the character can split a line. The splitting implementation is free to look ahead + * or look behind characters to make a decision. *

    * The default implementation is: *

    @@ -82,14 +83,16 @@ public interface SplitCharacter { * || (c >= 0xff61 && c < 0xffa0)); * } * } - * @param start the lower limit of cc inclusive + * + * @param start the lower limit of cc inclusive * @param current the pointer to the character in cc - * @param end the upper limit of cc exclusive - * @param cc an array of characters at least end sized - * @param ck an array of PdfChunk. The main use is to be able to call - * {@link PdfChunk#getUnicodeEquivalent(int)}. It may be null - * or shorter than end. If null no conversion takes place. - * If shorter than end the last element is used + * @param end the upper limit of cc exclusive + * @param cc an array of characters at least end sized + * @param ck an array of PdfChunk. The main use is to be able to call + * {@link PdfChunk#getUnicodeEquivalent(int)}. It may be null or shorter than + * end. If null no conversion takes place. If shorter than + * end + * the last element is used * @return true if the character(s) can split a line */ boolean isSplitCharacter(int start, int current, int end, char[] cc, PdfChunk[] ck); diff --git a/openpdf/src/main/java/com/lowagie/text/Table.java b/openpdf/src/main/java/com/lowagie/text/Table.java index e805887dc..8ee72d907 100644 --- a/openpdf/src/main/java/com/lowagie/text/Table.java +++ b/openpdf/src/main/java/com/lowagie/text/Table.java @@ -66,185 +66,193 @@ /** - * A Table is a Rectangle that contains Cells, - * ordered in some kind of matrix. - *

    - * Tables that span multiple pages are cut into different parts automatically. - * If you want a table header to be repeated on every page, you may not forget to - * mark the end of the header section by using the method endHeaders(). - *

    - * The matrix of a table is not necessarily an m x n-matrix. It can contain holes - * or cells that are bigger than the unit. Believe me or not, but it took some serious - * thinking to make this as user friendly as possible. I hope you will find the result - * quite simple (I love simple solutions, especially for complex problems). - * I didn't want it to be something as complex as the Java GridBagLayout. - *

    + * A Table is a Rectangle that contains Cells, ordered in some kind of matrix. + *

    + * Tables that span multiple pages are cut into different parts automatically. If you want a table header to be repeated + * on every page, you may not forget to mark the end of the header section by using the method + * endHeaders(). + *

    + * The matrix of a table is not necessarily an m x n-matrix. It can contain holes or cells that are bigger than the + * unit. Believe me or not, but it took some serious thinking to make this as user friendly as possible. I hope you will + * find the result quite simple (I love simple solutions, especially for complex problems). I didn't want it to be + * something as complex as the Java GridBagLayout. + *

    * Example: * 

    - * // Remark: You MUST know the number of columns when constructing a Table.
- * //         The number of rows is not important.
+ * // Remark: You MUST know the number of columns when constructing a Table. //         The number of rows is not
+ * important.
  * Table table = new Table(3);
  * table.setBorderWidth(1);
  * table.setBorderColor(new Color(0, 0, 255));
  * table.setPadding(5);
  * table.setSpacing(5);
- * Cell cell = new Cell("header");
- * cell.setHeader(true);
- * cell.setColspan(3);
+ * Cell cell = new Cell("header"); cell.setHeader(true); cell.setColspan(3);
  * table.addCell(cell);
  * table.endHeaders();
- * cell = new Cell("example cell with colspan 1 and rowspan 2");
- * cell.setRowspan(2);
- * cell.setBorderColor(new Color(255, 0, 0));
+ * cell = new Cell("example cell with colspan 1 and rowspan 2"); cell.setRowspan(2); cell.setBorderColor(new Color(255,
+ * 0, 0));
  * table.addCell(cell);
  * table.addCell("1.1");
  * table.addCell("2.1");
  * table.addCell("1.2");
  * table.addCell("2.2");
  * table.addCell("cell test1");
- * cell = new Cell("big cell");
- * cell.setRowspan(2);
- * cell.setColspan(2);
+ * cell = new Cell("big cell"); cell.setRowspan(2); cell.setColspan(2);
  * table.addCell(cell);
  * table.addCell("cell test2");
  *
    * The result of this code is a table: - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
    the result of the code above
    - * header - *
    - * example cell with colspan 1 and rowspan 2 - * - * 1.1 - * - * 2.1 - *
    - * 1.2 - * - * 2.2 - *
    - * cell test1 - * - * big cell - *
    - * cell test2 - *
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    the result of the code above
    + * header + *
    + * example cell with colspan 1 and rowspan 2 + * + * 1.1 + * + * 2.1 + *
    + * 1.2 + * + * 2.2 + *
    + * cell test1 + * + * big cell + *
    + * cell test2 + *
    * - * @see Rectangle - * @see Element - * @see Row - * @see Cell + * @see Rectangle + * @see Element + * @see Row + * @see Cell */ public class Table extends TableRectangle implements LargeElement, WithHorizontalAlignment { - + // membervariables - - /** This is the number of columns in the Table. */ + + /** + * Boolean to automatically fill empty cells before a table is rendered (takes CPU so may be set to false in case of + * certainty) + */ + protected boolean autoFillEmptyCells = false; + /** + * if you want to generate tables the old way, set this value to false. + */ + protected boolean convert2pdfptable = false; + /** + * Indicates if this is the first time the section was added. + * + * @since iText 2.0.8 + */ + protected boolean notAddedYet = true; + /** + * Indicates if the PdfPTable is complete once added to the document. + * + * @since iText 2.0.8 + */ + protected boolean complete = true; + /** + * If true this table may not be split over two pages. + */ + boolean tableFitsPage = false; + /** + * If true cells may not be split over two pages. + */ + boolean cellsFitPage = false; + /** + * This is the offset of the table. + */ + float offset = Float.NaN; + /** + * This is the number of columns in the Table. + */ private int columns; - - /** This is the list of Rows. */ + /** + * This is the list of Rows. + */ private ArrayList rows = new ArrayList<>(); - - /** The current Position in the table. */ + /** + * The current Position in the table. + */ private Point curPosition = new Point(0, 0); - - /** This Empty Cell contains the DEFAULT layout of each Cell added with the method addCell(String content). */ + /** + * This Empty Cell contains the DEFAULT layout of each Cell added with the method addCell(String content). + */ private Cell defaultCell = new Cell(true); - - /** This is the number of the last row of the table headers. */ + /** + * This is the number of the last row of the table headers. + */ private int lastHeaderRow = -1; - - /** This is the horizontal alignment. */ + /** + * This is the horizontal alignment. + */ private int alignment = Element.ALIGN_CENTER; - - /** This is cellpadding. */ + /** + * This is cellpadding. + */ private float cellpadding; - - /** This is cellspacing. */ + /** + * This is cellspacing. + */ private float cellspacing; - - /** This is the width of the table (in percent of the available space). */ + /** + * This is the width of the table (in percent of the available space). + */ private float width = 80; - - /** Is the width a percentage (false) or an absolute width (true)? */ - private boolean locked = false; - - /** This is an array containing the widths (in percentages) of every column. */ - private float[] widths; - - /** Boolean to track if a table was inserted (to avoid unnecessary computations afterwards) */ - private boolean mTableInserted = false; - /** - * Boolean to automatically fill empty cells before a table is rendered - * (takes CPU so may be set to false in case of certainty) + * Is the width a percentage (false) or an absolute width (true)? */ - protected boolean autoFillEmptyCells = false; - - /** If true this table may not be split over two pages. */ - boolean tableFitsPage = false; - - /** If true cells may not be split over two pages. */ - boolean cellsFitPage = false; - - /** This is the offset of the table. */ - float offset = Float.NaN; - - /** if you want to generate tables the old way, set this value to false. */ - protected boolean convert2pdfptable = false; - + private boolean locked = false; /** - * Indicates if this is the first time the section was added. - * @since iText 2.0.8 + * This is an array containing the widths (in percentages) of every column. */ - protected boolean notAddedYet = true; - + private float[] widths; /** - * Indicates if the PdfPTable is complete once added to the document. - * @since iText 2.0.8 + * Boolean to track if a table was inserted (to avoid unnecessary computations afterwards) */ - protected boolean complete = true; - + private boolean mTableInserted = false; + // constructors - + /** * Constructs a Table with a certain number of columns. * - * @param columns The number of columns in the table - * @throws BadElementException if the creator was called with less than 1 column + * @param columns The number of columns in the table + * @throws BadElementException if the creator was called with less than 1 column */ public Table(int columns) throws BadElementException { this(columns, 1); } - + /** - * Constructs a Table with a certain number of columns - * and a certain number of Rows. + * Constructs a Table with a certain number of columns and a certain number of Rows. * - * @param columns The number of columns in the table - * @param rows The number of rows - * @throws BadElementException if the creator was called with less than 1 column + * @param columns The number of columns in the table + * @param rows The number of rows + * @throws BadElementException if the creator was called with less than 1 column */ public Table(int columns, int rows) throws BadElementException { // a Rectangle is create with BY DEFAULT a border with a width of 1 @@ -252,19 +260,20 @@ public Table(int columns, int rows) throws BadElementException { setBorder(BOX); setBorderWidth(1); defaultCell.setBorder(BOX); - + // a table should have at least 1 column if (columns <= 0) { - throw new BadElementException(MessageLocalization.getComposedMessage("a.table.should.have.at.least.1.column")); + throw new BadElementException( + MessageLocalization.getComposedMessage("a.table.should.have.at.least.1.column")); } this.columns = columns; - + // a certain number of rows are created for (int i = 0; i < rows; i++) { this.rows.add(new Row(columns)); } curPosition = new Point(0, 0); - + // the DEFAULT widths are calculated widths = new float[columns]; float width = 100f / columns; @@ -272,12 +281,11 @@ public Table(int columns, int rows) throws BadElementException { widths[i] = width; } } - + /** * Copy constructor (shallow copy). * - * @param t ab object of {@link Table} - * new table will created from a shallow copy of this + * @param t ab object of {@link Table} new table will created from a shallow copy of this */ public Table(Table t) { super(0, 0, 0, 0); @@ -298,93 +306,93 @@ public Table(Table t) { this.offset = t.offset; this.convert2pdfptable = t.convert2pdfptable; } - + // implementation of the Element-methods - + /** * Processes the element by adding it (or the different parts) to an * ElementListener. * - * @param listener an ElementListener + * @param listener an ElementListener * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { try { return listener.add(this); - } - catch(DocumentException de) { + } catch (DocumentException de) { return false; } } - + /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { return Element.TABLE; } - + /** * Gets all the chunks in this element. * - * @return an ArrayList + * @return an ArrayList */ - + public ArrayList getChunks() { return new ArrayList<>(); } /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return true; } - + // getters and setters /** * Gets the number of columns. * - * @return a value + * @return a value */ public int getColumns() { return columns; } - + /** * Gets the number of rows in this Table. * - * @return the number of rows in this Table + * @return the number of rows in this Table */ public int size() { return rows.size(); } - + /** * Gets the dimension of this table * - * @return dimension + * @return dimension */ public Dimension getDimension() { return new Dimension(columns, size()); } - + /** * Gets the default layout of the Table. + * * @return a cell with all the defaults * @since 2.0.7 */ public Cell getDefaultCell() { return defaultCell; } - + /** - * Sets the default layout of the Table to - * the provided Cell + * Sets the default layout of the Table to the provided Cell + * * @param value a cell with all the defaults * @since 2.0.7 */ @@ -394,26 +402,26 @@ public void setDefaultCell(Cell value) { /** * Gets the last number of the rows that contain headers. - * + * * @return a rownumber */ public int getLastHeaderRow() { return this.lastHeaderRow; } - + /** * Sets the horizontal alignment. * - * @param value the new value + * @param value the new value */ public void setLastHeaderRow(int value) { lastHeaderRow = value; } - + /** * Marks the last row of the table headers. * - * @return the number of the last row of the table headers + * @return the number of the last row of the table headers */ public int endHeaders() { lastHeaderRow = curPosition.x - 1; @@ -423,7 +431,7 @@ public int endHeaders() { /** * Gets the horizontal alignment. * - * @return a value + * @return a value */ public int getAlignment() { return alignment; @@ -441,16 +449,16 @@ public void setHorizontalAlignment(final HorizontalAlignment alignment) { /** * Gets the cellpadding. * - * @return a value + * @return a value */ public float getPadding() { return cellpadding; } - + /** * Sets the cellpadding. * - * @param value the new value + * @param value the new value */ public void setPadding(float value) { cellpadding = value; @@ -459,28 +467,28 @@ public void setPadding(float value) { /** * Gets the cellspacing. * - * @return a value + * @return a value */ public float getSpacing() { return cellspacing; } - + /** * Sets the cellspacing. * - * @param value the new value + * @param value the new value */ public void setSpacing(float value) { cellspacing = value; } - + /** - * Enables/disables automatic insertion of empty cells before table is rendered. (default = false) - * As some people may want to create a table, fill only a couple of the cells and don't bother with - * investigating which empty ones need to be added, this default behavior may be very welcome. - * Disabling is recommended to increase speed. (empty cells should be added through extra code then) + * Enables/disables automatic insertion of empty cells before table is rendered. (default = false) As some people + * may want to create a table, fill only a couple of the cells and don't bother with investigating which empty ones + * need to be added, this default behavior may be very welcome. Disabling is recommended to increase speed. (empty + * cells should be added through extra code then) * - * @param aDoAutoFill enable/disable autofill + * @param aDoAutoFill enable/disable autofill */ public void setAutoFillEmptyCells(boolean aDoAutoFill) { autoFillEmptyCells = aDoAutoFill; @@ -489,21 +497,21 @@ public void setAutoFillEmptyCells(boolean aDoAutoFill) { /** * Gets the table width (a percentage). * - * @return the table width + * @return the table width */ public float getWidth() { return width; } - + /** * Sets the width of this table (in percentage of the available space). * - * @param width the width + * @param width the width */ public void setWidth(float width) { this.width = width; } - + /** * @return the locked */ @@ -521,7 +529,7 @@ public void setLocked(boolean locked) { /** * Gets the proportional widths of the columns in this Table. * - * @return the proportional widths of the columns in this Table + * @return the proportional widths of the columns in this Table */ public float[] getProportionalWidths() { return widths; @@ -530,17 +538,15 @@ public float[] getProportionalWidths() { /** * Sets the widths of the different columns (percentages). *

    - * You can give up relative values of borderwidths. - * The sum of these values will be considered 100%. - * The values will be recalculated as percentages of this sum. + * You can give up relative values of borderwidths. The sum of these values will be considered 100%. The values will + * be recalculated as percentages of this sum. *

    * example: * 

          * float[] widths = {2, 1, 1};
      * table.setWidths(widths)
      *
    - * The widths will be: a width of 50% for the first column, - * 25% for the second and third column. + * The widths will be: a width of 50% for the first column, 25% for the second and third column. * * @param widths an array with values * @throws BadElementException on error @@ -549,13 +555,13 @@ public void setWidths(float[] widths) throws BadElementException { if (widths.length != columns) { throw new BadElementException(MessageLocalization.getComposedMessage("wrong.number.of.columns")); } - + // The sum of all values is 100% float hundredPercent = 0; for (int i = 0; i < columns; i++) { hundredPercent += widths[i]; } - + // The different percentages are calculated float width; this.widths[columns - 1] = 100; @@ -569,17 +575,17 @@ public void setWidths(float[] widths) throws BadElementException { /** * Sets the widths of the different columns (percentages). *

    - * You can give up relative values of borderwidths. - * The sum of these values will be considered 100%. - * The values will be recalculated as percentages of this sum. + * You can give up relative values of borderwidths. The sum of these values will be considered 100%. The values will + * be recalculated as percentages of this sum. * * @param widths an array with values * @throws DocumentException on error */ public void setWidths(int[] widths) throws DocumentException { float[] tb = new float[widths.length]; - for (int k = 0; k < widths.length; ++k) + for (int k = 0; k < widths.length; ++k) { tb[k] = widths[k]; + } setWidths(tb); } @@ -594,76 +600,79 @@ public boolean isTableFitsPage() { /** * Allows you to control when a page break occurs. - *

    - * When a table doesn't fit a page, it is split in two parts. - * If you want to avoid this, you should set the tableFitsPage value to true. + *

    + * When a table doesn't fit a page, it is split in two parts. If you want to avoid this, you should set the + * tableFitsPage value to true. * - * @param fitPage enter true if you don't want to split cells + * @param fitPage enter true if you don't want to split cells */ public void setTableFitsPage(boolean fitPage) { this.tableFitsPage = fitPage; - if (fitPage) setCellsFitPage(true); + if (fitPage) { + setCellsFitPage(true); + } } - + /** * Checks if the cells of this Table have to fit a page. * - * @return true if the cells may not be split + * @return true if the cells may not be split */ public boolean isCellsFitPage() { return cellsFitPage; } - + /** * Allows you to control when a page break occurs. - *

    - * When a cell doesn't fit a page, it is split in two parts. - * If you want to avoid this, you should set the cellsFitPage value to true. + *

    + * When a cell doesn't fit a page, it is split in two parts. If you want to avoid this, you should set the + * cellsFitPage value to true. * - * @param fitPage enter true if you don't want to split cells + * @param fitPage enter true if you don't want to split cells */ public void setCellsFitPage(boolean fitPage) { this.cellsFitPage = fitPage; } - + /** - * Sets the offset of this table. - * - * Normally a newline is added before you add a Table object. - * This newline uses the current leading. - * If you want to control the space between the table and the previous - * element yourself, you have to set the offset of this table. + * Gets the offset of this table. * - * @param offset the space between this table and the previous object. + * @return the space between this table and the previous element. */ - public void setOffset(float offset) { - this.offset = offset; + public float getOffset() { + return offset; } - + /** - * Gets the offset of this table. + * Sets the offset of this table. + *

    + * Normally a newline is added before you add a Table object. This newline uses the current leading. If you want to + * control the space between the table and the previous element yourself, you have to set the offset of this table. * - * @return the space between this table and the previous element. + * @param offset the space between this table and the previous object. */ - public float getOffset() { - return offset; + public void setOffset(float offset) { + this.offset = offset; } - + /** * Method to check if the Table should be converted to a PdfPTable or not. + * * @return false if the table should be handled the old fashioned way. */ public boolean isConvert2pdfptable() { return convert2pdfptable; } + /** * If set to true, iText will try to convert the Table to a PdfPTable. + * * @param convert2pdfptable true if you want iText to try to convert the Table to a PdfPTable */ public void setConvert2pdfptable(boolean convert2pdfptable) { this.convert2pdfptable = convert2pdfptable; } - + // methods to add content to the table /** @@ -675,7 +684,7 @@ public void setConvert2pdfptable(boolean convert2pdfptable) { * @throws BadElementException on error */ public void addCell(Cell aCell, int row, int column) throws BadElementException { - addCell(aCell, new Point(row,column)); + addCell(aCell, new Point(row, column)); } /** @@ -686,57 +695,74 @@ public void addCell(Cell aCell, int row, int column) throws BadElementException * @throws BadElementException on error */ public void addCell(Cell aCell, Point aLocation) throws BadElementException { - if (aCell == null) throw new NullPointerException(MessageLocalization.getComposedMessage("addcell.cell.has.null.value")); - if (aLocation == null) throw new NullPointerException(MessageLocalization.getComposedMessage("addcell.point.has.null.value")); - if (aCell.isTable()) insertTable((Table)aCell.getElements().next(), aLocation); - - if (aLocation.x < 0) throw new BadElementException(MessageLocalization.getComposedMessage("row.coordinate.of.location.must.be.gt.eq.0")); - if ((aLocation.y <= 0) && (aLocation.y > columns)) throw new BadElementException(MessageLocalization.getComposedMessage("column.coordinate.of.location.must.be.gt.eq.0.and.lt.nr.of.columns")); - if (!isValidLocation(aCell, aLocation)) throw new BadElementException(MessageLocalization.getComposedMessage("adding.a.cell.at.the.location.1.2.with.a.colspan.of.3.and.a.rowspan.of.4.is.illegal.beyond.boundaries.overlapping", - String.valueOf(aLocation.x), String.valueOf(aLocation.y), String.valueOf(aCell.getColspan()), String.valueOf(aCell.getRowspan()))); - - if (aCell.getBorder() == UNDEFINED) aCell.setBorder(defaultCell.getBorder()); + if (aCell == null) { + throw new NullPointerException(MessageLocalization.getComposedMessage("addcell.cell.has.null.value")); + } + if (aLocation == null) { + throw new NullPointerException(MessageLocalization.getComposedMessage("addcell.point.has.null.value")); + } + if (aCell.isTable()) { + insertTable((Table) aCell.getElements().next(), aLocation); + } + + if (aLocation.x < 0) { + throw new BadElementException( + MessageLocalization.getComposedMessage("row.coordinate.of.location.must.be.gt.eq.0")); + } + if ((aLocation.y <= 0) && (aLocation.y > columns)) { + throw new BadElementException(MessageLocalization.getComposedMessage( + "column.coordinate.of.location.must.be.gt.eq.0.and.lt.nr.of.columns")); + } + if (!isValidLocation(aCell, aLocation)) { + throw new BadElementException(MessageLocalization.getComposedMessage( + "adding.a.cell.at.the.location.1.2.with.a.colspan.of.3.and.a.rowspan.of.4.is.illegal.beyond.boundaries.overlapping", + String.valueOf(aLocation.x), String.valueOf(aLocation.y), String.valueOf(aCell.getColspan()), + String.valueOf(aCell.getRowspan()))); + } + + if (aCell.getBorder() == UNDEFINED) { + aCell.setBorder(defaultCell.getBorder()); + } aCell.fill(); placeCell(rows, aCell, aLocation); setCurrentLocationToNextValidPosition(aLocation); } - + /** * Adds a Cell to the Table. * - * @param cell a Cell + * @param cell a Cell */ public void addCell(Cell cell) { try { addCell(cell, curPosition); - } - catch(BadElementException bee) { + } catch (BadElementException bee) { // don't add the cell } } - + /** * Adds a Cell to the Table. - *

    - * This is a shortcut for addCell(Cell cell). - * The Phrase will be converted to a Cell. + *

    + * This is a shortcut for addCell(Cell cell). The Phrase will be converted to a + * Cell. * - * @param content a Phrase - * @throws BadElementException this should never happen + * @param content a Phrase + * @throws BadElementException this should never happen */ public void addCell(Phrase content) throws BadElementException { addCell(content, curPosition); } - + /** * Adds a Cell to the Table. - *

    - * This is a shortcut for addCell(Cell cell, Point location). - * The Phrase will be converted to a Cell. + *

    + * This is a shortcut for addCell(Cell cell, Point location). The Phrase will be converted + * to a Cell. * - * @param content a Phrase - * @param location a Point - * @throws BadElementException this should never happen + * @param content a Phrase + * @param location a Point + * @throws BadElementException this should never happen */ public void addCell(Phrase content, Point location) throws BadElementException { Cell cell = new Cell(content); @@ -754,104 +780,114 @@ public void addCell(Phrase content, Point location) throws BadElementException { cell.setRowspan(defaultCell.getRowspan()); addCell(cell, location); } - + /** * Adds a Cell to the Table. - *

    - * This is a shortcut for addCell(Cell cell). - * The String will be converted to a Cell. + *

    + * This is a shortcut for addCell(Cell cell). The String will be converted to a + * Cell. * - * @param content a String - * @throws BadElementException this should never happen + * @param content a String + * @throws BadElementException this should never happen */ - + public void addCell(String content) throws BadElementException { addCell(new Phrase(content), curPosition); } - + /** * Adds a Cell to the Table. - *

    - * This is a shortcut for addCell(Cell cell, Point location). - * The String will be converted to a Cell. + *

    + * This is a shortcut for addCell(Cell cell, Point location). The String will be converted + * to a Cell. * - * @param content a String - * @param location a Point - * @throws BadElementException this should never happen + * @param content a String + * @param location a Point + * @throws BadElementException this should never happen */ public void addCell(String content, Point location) throws BadElementException { addCell(new Phrase(content), location); } - + /** - * To put a table within the existing table at the current position - * generateTable will of course re-arrange the widths of the columns. + * To put a table within the existing table at the current position generateTable will of course re-arrange the + * widths of the columns. * - * @param aTable the table you want to insert + * @param aTable the table you want to insert */ public void insertTable(Table aTable) { - if (aTable == null) throw new NullPointerException(MessageLocalization.getComposedMessage("inserttable.table.has.null.value")); + if (aTable == null) { + throw new NullPointerException(MessageLocalization.getComposedMessage("inserttable.table.has.null.value")); + } insertTable(aTable, curPosition); } - + /** - * To put a table within the existing table at the given position - * generateTable will of course re-arrange the widths of the columns. + * To put a table within the existing table at the given position generateTable will of course re-arrange the widths + * of the columns. * - * @param aTable The Table to add - * @param row The row where the Cell will be added - * @param column The column where the Cell will be added + * @param aTable The Table to add + * @param row The row where the Cell will be added + * @param column The column where the Cell will be added */ public void insertTable(Table aTable, int row, int column) { - if (aTable == null) throw new NullPointerException(MessageLocalization.getComposedMessage("inserttable.table.has.null.value")); + if (aTable == null) { + throw new NullPointerException(MessageLocalization.getComposedMessage("inserttable.table.has.null.value")); + } insertTable(aTable, new Point(row, column)); } - + /** - * To put a table within the existing table at the given position - * generateTable will of course re-arrange the widths of the columns. + * To put a table within the existing table at the given position generateTable will of course re-arrange the widths + * of the columns. * - * @param aTable the table you want to insert - * @param aLocation a Point + * @param aTable the table you want to insert + * @param aLocation a Point */ public void insertTable(Table aTable, Point aLocation) { - - if (aTable == null) throw new NullPointerException(MessageLocalization.getComposedMessage("inserttable.table.has.null.value")); - if (aLocation == null) throw new NullPointerException(MessageLocalization.getComposedMessage("inserttable.point.has.null.value")); + + if (aTable == null) { + throw new NullPointerException(MessageLocalization.getComposedMessage("inserttable.table.has.null.value")); + } + if (aLocation == null) { + throw new NullPointerException(MessageLocalization.getComposedMessage("inserttable.point.has.null.value")); + } mTableInserted = true; aTable.complete(); - + if (aLocation.y > columns) { - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("inserttable.wrong.columnposition.1.of.location.max.eq.2", String.valueOf(aLocation.y), String.valueOf(columns))); + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("inserttable.wrong.columnposition.1.of.location.max.eq.2", + String.valueOf(aLocation.y), String.valueOf(columns))); } - + int rowCount = aLocation.x + 1 - rows.size(); int i = 0; - if ( rowCount > 0 ) { //create new rows ? + if (rowCount > 0) { //create new rows ? for (; i < rowCount; i++) { rows.add(new Row(columns)); } } - - rows.get(aLocation.x).setElement(aTable,aLocation.y); - + + rows.get(aLocation.x).setElement(aTable, aLocation.y); + setCurrentLocationToNextValidPosition(aLocation); } - + /** * Gives you the possibility to add columns. * - * @param aColumns the number of columns to add + * @param aColumns the number of columns to add */ public void addColumns(int aColumns) { ArrayList newRows = new ArrayList<>(rows.size()); - + int newColumns = columns + aColumns; Row row; for (int i = 0; i < rows.size(); i++) { row = new Row(newColumns); for (int j = 0; j < columns; j++) { - row.setElement(rows.get(i).getCell(j) ,j); + row.setElement(rows.get(i).getCell(j), j); } for (int j = columns; j < newColumns && i < curPosition.x; j++) { row.setElement(null, j); @@ -859,20 +895,20 @@ public void addColumns(int aColumns) { newRows.add(row); } // applied 1 column-fix; last column needs to have a width of 0 - float [] newWidths = new float[newColumns]; + float[] newWidths = new float[newColumns]; System.arraycopy(widths, 0, newWidths, 0, columns); - for (int j = columns; j < newColumns ; j++) { + for (int j = columns; j < newColumns; j++) { newWidths[j] = 0; } columns = newColumns; widths = newWidths; rows = newRows; } - + /** * Deletes a column in this table. * - * @param column the number of the column that has to be deleted + * @param column the number of the column that has to be deleted * @throws BadElementException on error */ public void deleteColumn(int column) throws BadElementException { @@ -890,28 +926,27 @@ public void deleteColumn(int column) throws BadElementException { rows.set(i, row); } if (column == columns) { - curPosition.setLocation(curPosition.x+1, 0); + curPosition.setLocation(curPosition.x + 1, 0); } } /** * Deletes a row. * - * @param row the number of the row to delete - * @return boolean true if the row was deleted; false if not + * @param row the number of the row to delete + * @return boolean true if the row was deleted; false if not */ public boolean deleteRow(int row) { if (row < 0 || row >= rows.size()) { return false; } rows.remove(row); - curPosition.setLocation(curPosition.x-1, curPosition.y); + curPosition.setLocation(curPosition.x - 1, curPosition.y); return true; } - + /** - * Deletes all rows in this table. - * (contributed by dperezcar@fcc.es) + * Deletes all rows in this table. (contributed by dperezcar@fcc.es) */ public void deleteAllRows() { rows.clear(); @@ -919,16 +954,16 @@ public void deleteAllRows() { curPosition.setLocation(0, 0); lastHeaderRow = -1; } - + /** * Deletes the last row in this table. * - * @return boolean true if the row was deleted; false if not + * @return boolean true if the row was deleted; false if not */ public boolean deleteLastRow() { return deleteRow(rows.size() - 1); } - + /** * Will fill empty cells with valid blank Cells */ @@ -941,12 +976,11 @@ public void complete() { fillEmptyMatrixCells(); } } - + // private helper classes /** - * returns the element at the position row, column - * (Cast to Cell or Table) + * returns the element at the position row, column (Cast to Cell or Table) * * @param row row number * @param column column number @@ -956,66 +990,64 @@ public void complete() { public TableRectangle getElement(int row, int column) { return rows.get(row).getCell(column); } - + /** * Integrates all added tables and recalculates column widths. */ private void mergeInsertedTables() { int i, j; - float [] lNewWidths; - int [] lDummyWidths = new int[columns]; // to keep track in how many new cols this one will be split + float[] lNewWidths; + int[] lDummyWidths = new int[columns]; // to keep track in how many new cols this one will be split float[][] lDummyColumnWidths = new float[columns][]; // bugfix Tony Copping - int [] lDummyHeights = new int[rows.size()]; // to keep track in how many new rows this one will be split + int[] lDummyHeights = new int[rows.size()]; // to keep track in how many new rows this one will be split ArrayList newRows; - boolean isTable=false; - int lTotalRows = 0, lTotalColumns = 0; + boolean isTable = false; + int lTotalRows = 0, lTotalColumns = 0; int lNewMaxRows, lNewMaxColumns; - + Table lDummyTable; - + // first we'll add new columns when needed // check one column at a time, find maximum needed nr of cols // Search internal tables and find one with max columns - for (j=0; j < columns; j++) { + for (j = 0; j < columns; j++) { lNewMaxColumns = 1; // value to hold in how many columns the current one will be split - float [] tmpWidths = null; - for (i=0; i < rows.size(); i++) { + float[] tmpWidths = null; + for (i = 0; i < rows.size(); i++) { if (rows.get(i).getCell(j) instanceof Table) { - isTable=true; + isTable = true; lDummyTable = ((Table) rows.get(i).getCell(j)); - if( tmpWidths == null) { + if (tmpWidths == null) { tmpWidths = lDummyTable.widths; - lNewMaxColumns=tmpWidths.length; - } - else { + lNewMaxColumns = tmpWidths.length; + } else { int cols = lDummyTable.getDimension().width; - float [] tmpWidthsN = new float[ cols * tmpWidths.length]; - float tpW=0, btW=0, totW=0; - int tpI=0, btI=0, totI=0; - tpW+=tmpWidths[0]; - btW+=lDummyTable.widths[0]; - while( tpItpW) { - tmpWidthsN[totI] = tpW-totW; + float[] tmpWidthsN = new float[cols * tmpWidths.length]; + float tpW = 0, btW = 0, totW = 0; + int tpI = 0, btI = 0, totI = 0; + tpW += tmpWidths[0]; + btW += lDummyTable.widths[0]; + while (tpI < tmpWidths.length && btI < cols) { + if (btW > tpW) { + tmpWidthsN[totI] = tpW - totW; tpI++; - if(tpI lNewMaxColumns ) { @@ -1040,48 +1072,47 @@ else if(btI lNewMaxRows ) { + if (lDummyTable.getDimension().height > lNewMaxRows) { lNewMaxRows = lDummyTable.getDimension().height; } } } lTotalRows += lNewMaxRows; - lDummyHeights [i] = lNewMaxRows; + lDummyHeights[i] = lNewMaxRows; } - - if ( (lTotalColumns != columns) || (lTotalRows != rows.size()) || isTable) // NO ADJUSTMENT + + if ((lTotalColumns != columns) || (lTotalRows != rows.size()) || isTable) // NO ADJUSTMENT { // ** WIDTH // set correct width for new columns // divide width over new nr of columns // Take new max columns of internal table and work out widths for each col - lNewWidths = new float [lTotalColumns]; + lNewWidths = new float[lTotalColumns]; int lDummy = 0; - for (int tel=0; tel < widths.length;tel++) { - if ( lDummyWidths[tel] != 1) { + for (int tel = 0; tel < widths.length; tel++) { + if (lDummyWidths[tel] != 1) { // divide for (int tel2 = 0; tel2 < lDummyWidths[tel]; tel2++) { // lNewWidths[lDummy] = widths[tel] / lDummyWidths[tel]; lNewWidths[lDummy] = widths[tel] * lDummyColumnWidths[tel][tel2] / 100f; // bugfix Tony Copping lDummy++; } - } - else { + } else { lNewWidths[lDummy] = widths[tel]; lDummy++; } } - + // ** FILL OUR NEW TABLE // generate new table // set new widths @@ -1092,139 +1123,143 @@ else if(btICell's to empty/null spaces. */ private void fillEmptyMatrixCells() { try { - for (int i=0; i < rows.size(); i++) { - for (int j=0; j < columns; j++) { + for (int i = 0; i < rows.size(); i++) { + for (int j = 0; j < columns; j++) { if (!rows.get(i).isReserved(j)) { addCell(defaultCell, new Point(i, j)); } } } - } - catch(BadElementException bee) { + } catch (BadElementException bee) { throw new ExceptionConverter(bee); } } - + /** * check if Cell 'fits' the table. - *

    + *

    *

    • rowspan/colspan not beyond borders - *
    • spanned cell don't overlap existing cells
    + *
  9. spanned cell don't overlap existing cells * - * @param aCell the cell that has to be checked - * @param aLocation the location where the cell has to be placed + * @param aCell the cell that has to be checked + * @param aLocation the location where the cell has to be placed * @return true if the location was valid */ private boolean isValidLocation(Cell aCell, Point aLocation) { // rowspan not beyond last column - if ( aLocation.x < rows.size() ) // if false : new location is already at new, not-yet-created area so no check + if (aLocation.x + < rows.size()) // if false : new location is already at new, not-yet-created area so no check { if ((aLocation.y + aCell.getColspan()) > columns) { return false; } - - int difx = ((rows.size() - aLocation.x) > aCell.getRowspan()) ? aCell.getRowspan() : rows.size() - aLocation.x; - int dify = ((columns - aLocation.y) > aCell.getColspan()) ? aCell.getColspan() : columns - aLocation.y; + + int difx = + ((rows.size() - aLocation.x) > aCell.getRowspan()) ? aCell.getRowspan() : rows.size() - aLocation.x; + int dify = ((columns - aLocation.y) > aCell.getColspan()) ? aCell.getColspan() : columns - aLocation.y; // no other content at cells targeted by rowspan/colspan - for (int i=aLocation.x; i < (aLocation.x + difx); i++) { - for (int j=aLocation.y; j < (aLocation.y + dify); j++) { + for (int i = aLocation.x; i < (aLocation.x + difx); i++) { + for (int j = aLocation.y; j < (aLocation.y + dify); j++) { if (rows.get(i).isReserved(j)) { return false; } } } - } - else { + } else { return (aLocation.y + aCell.getColspan()) <= columns; } - + return true; } - + /** * Sets the unset cell properties to be the table defaults. * * @param aCell The cell to set to table defaults as necessary. */ private void assumeTableDefaults(Cell aCell) { - + if (aCell.getBorder() == Rectangle.UNDEFINED) { aCell.setBorder(defaultCell.getBorder()); } @@ -1248,75 +1283,75 @@ private void assumeTableDefaults(Cell aCell) { aCell.setVerticalAlignment(of.orElse(VerticalAlignment.UNDEFINED)); } } - + /** * Inserts a Cell in a cell-array and reserves cells defined by row-/colspan. * - * @param someRows some rows - * @param aCell the cell that has to be inserted - * @param aPosition the position where the cell has to be placed + * @param someRows some rows + * @param aCell the cell that has to be inserted + * @param aPosition the position where the cell has to be placed */ private void placeCell(ArrayList someRows, Cell aCell, Point aPosition) { int i; Row row; int rowCount = aPosition.x + aCell.getRowspan() - someRows.size(); assumeTableDefaults(aCell); - if ( (aPosition.x + aCell.getRowspan()) > someRows.size() ) { + if ((aPosition.x + aCell.getRowspan()) > someRows.size()) { for (i = 0; i < rowCount; i++) { row = new Row(columns); someRows.add(row); } } - + // reserve cell in rows below - for (i = aPosition.x + 1; i < (aPosition.x + aCell.getRowspan()); i++) { - if ( !someRows.get(i).reserve(aPosition.y, aCell.getColspan())) { - + for (i = aPosition.x + 1; i < (aPosition.x + aCell.getRowspan()); i++) { + if (!someRows.get(i).reserve(aPosition.y, aCell.getColspan())) { + // should be impossible to come here :-) throw new RuntimeException(MessageLocalization.getComposedMessage("addcell.error.in.reserve")); } } row = someRows.get(aPosition.x); row.addElement(aCell, aPosition.y); - + } - + /** - * Sets current col/row to valid(empty) pos after addCell/Table + * Sets current col/row to valid(empty) pos after addCell/Table + * * @param aLocation a location in the Table */ - private void setCurrentLocationToNextValidPosition(Point aLocation) { + private void setCurrentLocationToNextValidPosition(Point aLocation) { // set latest location to next valid position int i, j; i = aLocation.x; j = aLocation.y; do { - if ( (j + 1) == columns ) { // goto next row + if ((j + 1) == columns) { // goto next row i++; j = 0; - } - else { + } else { j++; } } while ( - (i < rows.size()) && (j < columns) && (rows.get(i).isReserved(j)) + (i < rows.size()) && (j < columns) && (rows.get(i).isReserved(j)) ); curPosition = new Point(i, j); } - + // public helper methods - + /** * Gets an array with the positions of the borders between every column. - *

    - * This method translates the widths expressed in percentages into the - * x-coordinate of the borders of the columns on a real document. + *

    + * This method translates the widths expressed in percentages into the x-coordinate of the borders of the columns on + * a real document. * - * @param left this is the position of the first border at the left (cellpadding not included) - * @param totalWidth this is the space between the first border at the left - * and the last border at the right (cellpadding not included) - * @return an array with border positions + * @param left this is the position of the first border at the left (cellpadding not included) + * @param totalWidth this is the space between the first border at the left and the last border at the right + * (cellpadding not included) + * @return an array with border positions */ public float[] getWidths(float left, float totalWidth) { // for x columns, there are x+1 borders @@ -1324,12 +1359,11 @@ public float[] getWidths(float left, float totalWidth) { float wPercentage; if (locked) { wPercentage = 100 * width / totalWidth; - } - else { + } else { wPercentage = width; } // the border at the left is calculated - switch(alignment) { + switch (alignment) { case Element.ALIGN_LEFT: w[0] = left; break; @@ -1350,11 +1384,11 @@ public float[] getWidths(float left, float totalWidth) { w[columns] = w[0] + totalWidth; return w; } - + /** * Gets an Iterator of all the Rows. * - * @return an Iterator + * @return an Iterator */ public Iterator iterator() { return rows.iterator(); @@ -1374,8 +1408,9 @@ public PdfPTable createPdfPTable() throws BadElementException { complete(); PdfPTable pdfptable = new PdfPTable(widths); pdfptable.setComplete(complete); - if (isNotAddedYet()) + if (isNotAddedYet()) { pdfptable.setSkipFirstHeader(true); + } SimpleTable t_evt = new SimpleTable(); t_evt.cloneNonPositionParameters(this); t_evt.setCellspacing(cellspacing); @@ -1390,8 +1425,7 @@ public PdfPTable createPdfPTable() throws BadElementException { if (locked) { pdfptable.setTotalWidth(width); pdfptable.setLockedWidth(true); - } - else { + } else { pdfptable.setWidthPercentage(width); } Row row; @@ -1402,17 +1436,15 @@ public PdfPTable createPdfPTable() throws BadElementException { for (int i = 0; i < row.getColumns(); i++) { if ((cell = row.getCell(i)) != null) { if (cell instanceof Table) { - pcell = new PdfPCell(((Table)cell).createPdfPTable()); - } - else if (cell instanceof Cell) { - pcell = ((Cell)cell).createPdfPCell(); + pcell = new PdfPCell(((Table) cell).createPdfPTable()); + } else if (cell instanceof Cell) { + pcell = ((Cell) cell).createPdfPCell(); pcell.setPadding(cellpadding + cellspacing / 2f); SimpleCell c_evt = new SimpleCell(SimpleCell.CELL); - c_evt.cloneNonPositionParameters((Cell)cell); + c_evt.cloneNonPositionParameters((Cell) cell); c_evt.setSpacing(cellspacing * 2f); pcell.setCellEvent(c_evt); - } - else { + } else { pcell = new PdfPCell(); } pdfptable.addCell(pcell); @@ -1424,28 +1456,29 @@ else if (cell instanceof Cell) { /** * Indicates if this is the first time the section is added. - * @since iText2.0.8 - * @return true if the section wasn't added yet + * + * @return true if the section wasn't added yet + * @since iText2.0.8 */ public boolean isNotAddedYet() { return notAddedYet; } /** - * Sets the indication if the section was already added to - * the document. - * @since iText2.0.8 + * Sets the indication if the section was already added to the document. + * * @param notAddedYet {@link Table#notAddedYet} + * @since iText2.0.8 */ public void setNotAddedYet(boolean notAddedYet) { this.notAddedYet = notAddedYet; } - + /** - * @since iText 2.0.8 * @see com.lowagie.text.LargeElement#flushContent() + * @since iText 2.0.8 */ - public void flushContent() { + public void flushContent() { this.setNotAddedYet(false); ArrayList headerRows = new ArrayList<>(); for (int i = 0; i < getLastHeaderRow() + 1; i++) { @@ -1455,16 +1488,16 @@ public void flushContent() { } /** - * @since iText 2.0.8 * @see com.lowagie.text.LargeElement#isComplete() + * @since iText 2.0.8 */ public boolean isComplete() { return complete; } /** - * @since iText 2.0.8 * @see com.lowagie.text.LargeElement#setComplete(boolean) + * @since iText 2.0.8 */ public void setComplete(boolean complete) { this.complete = complete; diff --git a/openpdf/src/main/java/com/lowagie/text/TableRectangle.java b/openpdf/src/main/java/com/lowagie/text/TableRectangle.java index 26557eca6..49d4b6708 100644 --- a/openpdf/src/main/java/com/lowagie/text/TableRectangle.java +++ b/openpdf/src/main/java/com/lowagie/text/TableRectangle.java @@ -1,6 +1,7 @@ package com.lowagie.text; public class TableRectangle extends Rectangle { + public TableRectangle(float llx, float lly, float urx, float ury) { super(llx, lly, urx, ury); } diff --git a/openpdf/src/main/java/com/lowagie/text/TextElementArray.java b/openpdf/src/main/java/com/lowagie/text/TextElementArray.java index b7945fd37..bb5fe2f39 100644 --- a/openpdf/src/main/java/com/lowagie/text/TextElementArray.java +++ b/openpdf/src/main/java/com/lowagie/text/TextElementArray.java @@ -52,22 +52,22 @@ /** * Interface for a text element to which other objects can be added. * - * @see Phrase - * @see Paragraph - * @see Section - * @see ListItem - * @see Chapter - * @see Anchor - * @see Cell + * @see Phrase + * @see Paragraph + * @see Section + * @see ListItem + * @see Chapter + * @see Anchor + * @see Cell */ public interface TextElementArray extends Element { - - /** - * Adds an object to the TextElementArray. - * - * @param o an object that has to be added - * @return true if the addition succeeded; false otherwise - */ - boolean add(Element o); + + /** + * Adds an object to the TextElementArray. + * + * @param o an object that has to be added + * @return true if the addition succeeded; false otherwise + */ + boolean add(Element o); } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/TextRenderingOptions.java b/openpdf/src/main/java/com/lowagie/text/TextRenderingOptions.java index d5164805d..feff50087 100644 --- a/openpdf/src/main/java/com/lowagie/text/TextRenderingOptions.java +++ b/openpdf/src/main/java/com/lowagie/text/TextRenderingOptions.java @@ -3,84 +3,82 @@ import com.lowagie.text.pdf.FopGlyphProcessor; /** - * Text rendering options, including the default language of the document and a flag - * to enable font glyph substitution (if FOP is available). - * + * Text rendering options, including the default language of the document and a flag to enable font glyph substitution + * (if FOP is available). + * * @author Lucian Chirita (lucianc@users.sourceforge.net) * @see Document#setTextRenderingOptions(TextRenderingOptions) * @since 3.1.15 */ public class TextRenderingOptions { - public static final String DOCUMENT_LANGUAGE_DEFAULT = "dflt"; - + public static final String DOCUMENT_LANGUAGE_DEFAULT = "dflt"; + /** - * The default language of the document. Can be set to values like "en_US". - * This language is used in {@link FopGlyphProcessor} to determine which glyphs are to be substituted. - * The default "dflt" means that all glyphs which can be replaced will be substituted. - * + * The default language of the document. Can be set to values like "en_US". This language is used in + * {@link FopGlyphProcessor} to determine which glyphs are to be substituted. The default "dflt" means that all + * glyphs which can be replaced will be substituted. */ - private String documentLanguage; - - private boolean glyphSubstitutionEnabled; + private String documentLanguage; - /** - * Creates a text rendering options instance with the default options: glyph substitution enabled - * and "dflt" as document language. - */ - public TextRenderingOptions() { - this(DOCUMENT_LANGUAGE_DEFAULT, true); - } + private boolean glyphSubstitutionEnabled; - /** - * Creates a text rendering options instance. - * - * @param documentLanguage the wanted language - * @param glyphSubstitutionEnabled whether glyph substitution is enabled - */ - public TextRenderingOptions(String documentLanguage, boolean glyphSubstitutionEnabled) { - this.documentLanguage = documentLanguage; - this.glyphSubstitutionEnabled = glyphSubstitutionEnabled; - } + /** + * Creates a text rendering options instance with the default options: glyph substitution enabled and "dflt" as + * document language. + */ + public TextRenderingOptions() { + this(DOCUMENT_LANGUAGE_DEFAULT, true); + } - /** - * Sets the default language of the document. - * - * @param documentLanguage the document language - * @see #getDocumentLanguage() - */ - public void setDocumentLanguage(String documentLanguage) { - this.documentLanguage = documentLanguage; - } + /** + * Creates a text rendering options instance. + * + * @param documentLanguage the wanted language + * @param glyphSubstitutionEnabled whether glyph substitution is enabled + */ + public TextRenderingOptions(String documentLanguage, boolean glyphSubstitutionEnabled) { + this.documentLanguage = documentLanguage; + this.glyphSubstitutionEnabled = glyphSubstitutionEnabled; + } /** * The default language of the document. Can be set to values like "en_US". This language is used in * FopGlyphProcessor to determine which glyphs are to be substituted. - *

    + *

    * The default "dflt" means that all glyphs which can be replaced will be substituted. * * @return the current document language */ - public String getDocumentLanguage() { - return documentLanguage; - } + public String getDocumentLanguage() { + return documentLanguage; + } + + /** + * Sets the default language of the document. + * + * @param documentLanguage the document language + * @see #getDocumentLanguage() + */ + public void setDocumentLanguage(String documentLanguage) { + this.documentLanguage = documentLanguage; + } - /** - * Sets the font glyph substitution enabled flag. - * - * @param glyphSubstitutionEnabled whether glyph substitution is enabled - */ - public void setGlyphSubstitutionEnabled(boolean glyphSubstitutionEnabled) { - this.glyphSubstitutionEnabled = glyphSubstitutionEnabled; - } + /** + * Returns the glyph substitution enabled flag. + * + * @return the glyph substitution enabled flag #see {@link Document#setGlyphSubstitutionEnabled(boolean)} + */ + public boolean isGlyphSubstitutionEnabled() { + return glyphSubstitutionEnabled; + } - /** - * Returns the glyph substitution enabled flag. - * - * @return the glyph substitution enabled flag - * #see {@link Document#setGlyphSubstitutionEnabled(boolean)} - */ - public boolean isGlyphSubstitutionEnabled() { - return glyphSubstitutionEnabled; - } + /** + * Sets the font glyph substitution enabled flag. + * + * @param glyphSubstitutionEnabled whether glyph substitution is enabled + */ + public void setGlyphSubstitutionEnabled(boolean glyphSubstitutionEnabled) { + this.glyphSubstitutionEnabled = glyphSubstitutionEnabled; + } } diff --git a/openpdf/src/main/java/com/lowagie/text/Utilities.java b/openpdf/src/main/java/com/lowagie/text/Utilities.java index e7dfc922c..33be7320d 100644 --- a/openpdf/src/main/java/com/lowagie/text/Utilities.java +++ b/openpdf/src/main/java/com/lowagie/text/Utilities.java @@ -61,17 +61,15 @@ import java.util.Set; /** - * A collection of convenience methods that were present in many different iText - * classes. + * A collection of convenience methods that were present in many different iText classes. */ public class Utilities { /** * Gets the keys of a Hashtable - * - * @param table - * a Hashtable + * + * @param table a Hashtable * @return the keyset of a Hashtable (or an empty set if table is null) */ public static Set getKeySet(Map table) { @@ -80,11 +78,9 @@ public static Set getKeySet(Map table) { /** * Utility method to extend an array. - * - * @param original - * the original array or null - * @param item - * the item to be added to the array + * + * @param original the original array or null + * @param item the item to be added to the array * @return a new array with the item appended */ public static Object[][] addToArray(Object[][] original, Object[] item) { @@ -102,8 +98,9 @@ public static Object[][] addToArray(Object[][] original, Object[] item) { /** * Checks for a true/false value of a key in a Properties object. + * * @param attributes properties - * @param key key + * @param key key * @return a true/false value of a key in a Properties object */ public static boolean checkTrueOrFalse(Properties attributes, String key) { @@ -112,9 +109,10 @@ public static boolean checkTrueOrFalse(Properties attributes, String key) { /** * Unescapes an URL. All the "%xx" are replaced by the 'xx' hex char value. + * * @param src the url to unescape * @return the unescaped value - */ + */ public static String unEscapeURL(String src) { StringBuilder bf = new StringBuilder(); char[] s = src.toCharArray(); @@ -131,38 +129,35 @@ public static String unEscapeURL(String src) { bf.append(c); continue; } - bf.append((char)(a0 * 16 + a1)); + bf.append((char) (a0 * 16 + a1)); k += 2; - } - else + } else { bf.append(c); + } } return bf.toString(); } /** * This method makes a valid URL from a given filename. - *

    - * This method makes the conversion of this library from the JAVA 2 platform - * to a JDK1.1.x-version easier. - * - * @param filename - * a given filename + *

    + * This method makes the conversion of this library from the JAVA 2 platform to a JDK1.1.x-version easier. + * + * @param filename a given filename * @return a valid URL * @throws MalformedURLException if url is not valid */ public static URL toURL(String filename) throws MalformedURLException { try { return new URL(filename); - } - catch (Exception e) { + } catch (Exception e) { return new File(filename).toURI().toURL(); } } /** - * This method is an alternative for the InputStream.skip() - * -method that doesn't seem to work properly for big values of size + * This method is an alternative for the InputStream.skip() -method that doesn't seem to work properly + * for big values of size * . * * @param is the InputStream @@ -173,17 +168,19 @@ static public void skip(InputStream is, int size) throws IOException { long n; while (size > 0) { n = is.skip(size); - if (n <= 0) + if (n <= 0) { break; + } size -= n; } } - + /** * Measurement conversion from millimeters to points. - * @param value a value in millimeters - * @return a value in points - * @since 2.1.2 + * + * @param value a value in millimeters + * @return a value in points + * @since 2.1.2 */ public static float millimetersToPoints(float value) { return inchesToPoints(millimetersToInches(value)); @@ -191,9 +188,10 @@ public static float millimetersToPoints(float value) { /** * Measurement conversion from millimeters to inches. - * @param value a value in millimeters - * @return a value in inches - * @since 2.1.2 + * + * @param value a value in millimeters + * @return a value in inches + * @since 2.1.2 */ public static float millimetersToInches(float value) { return value / 25.4f; @@ -201,9 +199,10 @@ public static float millimetersToInches(float value) { /** * Measurement conversion from points to millimeters. - * @param value a value in points - * @return a value in millimeters - * @since 2.1.2 + * + * @param value a value in points + * @return a value in millimeters + * @since 2.1.2 */ public static float pointsToMillimeters(float value) { return inchesToMillimeters(pointsToInches(value)); @@ -211,9 +210,10 @@ public static float pointsToMillimeters(float value) { /** * Measurement conversion from points to inches. - * @param value a value in points - * @return a value in inches - * @since 2.1.2 + * + * @param value a value in points + * @return a value in inches + * @since 2.1.2 */ public static float pointsToInches(float value) { return value / 72f; @@ -221,9 +221,10 @@ public static float pointsToInches(float value) { /** * Measurement conversion from inches to millimeters. - * @param value a value in inches - * @return a value in millimeters - * @since 2.1.2 + * + * @param value a value in inches + * @return a value in millimeters + * @since 2.1.2 */ public static float inchesToMillimeters(float value) { return value * 25.4f; @@ -231,118 +232,127 @@ public static float inchesToMillimeters(float value) { /** * Measurement conversion from inches to points. - * @param value a value in inches - * @return a value in points - * @since 2.1.2 + * + * @param value a value in inches + * @return a value in points + * @since 2.1.2 */ public static float inchesToPoints(float value) { return value * 72f; } - + /** - * Check if the value of a character belongs to a certain interval - * that indicates it's the higher part of a surrogate pair. - * @param c the character - * @return true if the character belongs to the interval - * @since 2.1.2 + * Check if the value of a character belongs to a certain interval that indicates it's the higher part of a + * surrogate pair. + * + * @param c the character + * @return true if the character belongs to the interval + * @since 2.1.2 */ public static boolean isSurrogateHigh(char c) { return c >= '\ud800' && c <= '\udbff'; } /** - * Check if the value of a character belongs to a certain interval - * that indicates it's the lower part of a surrogate pair. - * @param c the character - * @return true if the character belongs to the interval - * @since 2.1.2 + * Check if the value of a character belongs to a certain interval that indicates it's the lower part of a surrogate + * pair. + * + * @param c the character + * @return true if the character belongs to the interval + * @since 2.1.2 */ public static boolean isSurrogateLow(char c) { return c >= '\udc00' && c <= '\udfff'; } /** - * Checks if two subsequent characters in a String are - * are the higher and the lower character in a surrogate - * pair (and therefore eligible for conversion to a UTF 32 character). - * @param text the String with the high and low surrogate characters - * @param idx the index of the 'high' character in the pair - * @return true if the characters are surrogate pairs - * @since 2.1.2 + * Checks if two subsequent characters in a String are are the higher and the lower character in a surrogate pair + * (and therefore eligible for conversion to a UTF 32 character). + * + * @param text the String with the high and low surrogate characters + * @param idx the index of the 'high' character in the pair + * @return true if the characters are surrogate pairs + * @since 2.1.2 */ public static boolean isSurrogatePair(String text, int idx) { - if (idx < 0 || idx > text.length() - 2) + if (idx < 0 || idx > text.length() - 2) { return false; + } return isSurrogateHigh(text.charAt(idx)) && isSurrogateLow(text.charAt(idx + 1)); } /** - * Checks if two subsequent characters in a character array are - * are the higher and the lower character in a surrogate - * pair (and therefore eligible for conversion to a UTF 32 character). - * @param text the character array with the high and low surrogate characters - * @param idx the index of the 'high' character in the pair - * @return true if the characters are surrogate pairs - * @since 2.1.2 + * Checks if two subsequent characters in a character array are are the higher and the lower character in a + * surrogate pair (and therefore eligible for conversion to a UTF 32 character). + * + * @param text the character array with the high and low surrogate characters + * @param idx the index of the 'high' character in the pair + * @return true if the characters are surrogate pairs + * @since 2.1.2 */ public static boolean isSurrogatePair(char[] text, int idx) { - if (idx < 0 || idx > text.length - 2) + if (idx < 0 || idx > text.length - 2) { return false; + } return isSurrogateHigh(text[idx]) && isSurrogateLow(text[idx + 1]); } /** - * Returns the code point of a UTF32 character corresponding with - * a high and a low surrogate value. - * @param highSurrogate the high surrogate value - * @param lowSurrogate the low surrogate value - * @return a code point value - * @since 2.1.2 + * Returns the code point of a UTF32 character corresponding with a high and a low surrogate value. + * + * @param highSurrogate the high surrogate value + * @param lowSurrogate the low surrogate value + * @return a code point value + * @since 2.1.2 */ public static int convertToUtf32(char highSurrogate, char lowSurrogate) { - return (((highSurrogate - 0xd800) * 0x400) + (lowSurrogate - 0xdc00)) + 0x10000; + return (((highSurrogate - 0xd800) * 0x400) + (lowSurrogate - 0xdc00)) + 0x10000; } /** * Converts a unicode character in a character array to a UTF 32 code point value. - * @param text a character array that has the unicode character(s) - * @param idx the index of the 'high' character - * @return the code point value - * @since 2.1.2 + * + * @param text a character array that has the unicode character(s) + * @param idx the index of the 'high' character + * @return the code point value + * @since 2.1.2 */ public static int convertToUtf32(char[] text, int idx) { - return (((text[idx] - 0xd800) * 0x400) + (text[idx + 1] - 0xdc00)) + 0x10000; + return (((text[idx] - 0xd800) * 0x400) + (text[idx + 1] - 0xdc00)) + 0x10000; } /** * Converts a unicode character in a String to a UTF32 code point value - * @param text a String that has the unicode character(s) - * @param idx the index of the 'high' character - * @return the codepoint value - * @since 2.1.2 + * + * @param text a String that has the unicode character(s) + * @param idx the index of the 'high' character + * @return the codepoint value + * @since 2.1.2 */ public static int convertToUtf32(String text, int idx) { - return (((text.charAt(idx) - 0xd800) * 0x400) + (text.charAt(idx + 1) - 0xdc00)) + 0x10000; + return (((text.charAt(idx) - 0xd800) * 0x400) + (text.charAt(idx + 1) - 0xdc00)) + 0x10000; } /** * Converts a UTF32 code point value to a String with the corresponding character(s). - * @param codePoint a Unicode value - * @return the corresponding characters in a String - * @since 2.1.2 + * + * @param codePoint a Unicode value + * @return the corresponding characters in a String + * @since 2.1.2 */ public static String convertFromUtf32(int codePoint) { - if (codePoint < 0x10000) - return Character.toString((char)codePoint); + if (codePoint < 0x10000) { + return Character.toString((char) codePoint); + } codePoint -= 0x10000; - return new String(new char[]{(char)((codePoint / 0x400) + 0xd800), (char)((codePoint % 0x400) + 0xdc00)}); + return new String(new char[]{(char) ((codePoint / 0x400) + 0xd800), (char) ((codePoint % 0x400) + 0xdc00)}); } /** * Reads an input stream to a byte array. - * + *

    * Similar as IOUtils.toByteArray. - * + *

    * By evernat on Github. * * @param is input stream diff --git a/openpdf/src/main/java/com/lowagie/text/ZapfDingbatsList.java b/openpdf/src/main/java/com/lowagie/text/ZapfDingbatsList.java index 9507f9866..97c5d29ff 100644 --- a/openpdf/src/main/java/com/lowagie/text/ZapfDingbatsList.java +++ b/openpdf/src/main/java/com/lowagie/text/ZapfDingbatsList.java @@ -47,11 +47,10 @@ package com.lowagie.text; /** - * * A special-version of LIST which use zapfdingbats-letters. - * - * @see com.lowagie.text.List + * * @author Michael Niedermair and Bruno Lowagie + * @see com.lowagie.text.List */ public class ZapfDingbatsList extends List { @@ -63,7 +62,7 @@ public class ZapfDingbatsList extends List { /** * Creates a ZapfDingbatsList - * + * * @param zn a char-number */ public ZapfDingbatsList(int zn) { @@ -76,9 +75,9 @@ public ZapfDingbatsList(int zn) { /** * Creates a ZapfDingbatsList - * - * @param zn a char-number - * @param symbolIndent indent + * + * @param zn a char-number + * @param symbolIndent indent */ public ZapfDingbatsList(int zn, int symbolIndent) { super(true, symbolIndent); @@ -89,26 +88,27 @@ public ZapfDingbatsList(int zn, int symbolIndent) { } /** - * set the char-number - * @param zn a char-number + * get the char-number + * + * @return char-number */ - public void setCharNumber(int zn) { - this.zn = zn; + public int getCharNumber() { + return zn; } /** - * get the char-number + * set the char-number * - * @return char-number + * @param zn a char-number */ - public int getCharNumber() { - return zn; + public void setCharNumber(int zn) { + this.zn = zn; } /** * Adds an Element to the List. * - * @param o the element to add. + * @param o the element to add. * @return true if adding the element succeeded */ @Override @@ -116,7 +116,7 @@ public boolean add(Element o) { if (o instanceof ListItem) { ListItem item = (ListItem) o; Chunk chunk = new Chunk(preSymbol, symbol.getFont()); - chunk.append(String.valueOf((char)zn)); + chunk.append(String.valueOf((char) zn)); chunk.append(postSymbol); item.setListSymbol(chunk); item.setIndentationLeft(symbolIndent, autoindent); @@ -134,7 +134,7 @@ public boolean add(Element o) { /** * Adds a String to the List. * - * @param s the string to add. + * @param s the string to add. * @return true if adding the string succeeded */ @Override diff --git a/openpdf/src/main/java/com/lowagie/text/ZapfDingbatsNumberList.java b/openpdf/src/main/java/com/lowagie/text/ZapfDingbatsNumberList.java index 9f3dbf4cb..29b888b58 100644 --- a/openpdf/src/main/java/com/lowagie/text/ZapfDingbatsNumberList.java +++ b/openpdf/src/main/java/com/lowagie/text/ZapfDingbatsNumberList.java @@ -47,11 +47,10 @@ package com.lowagie.text; /** - * * A special-version of LIST which use zapfdingbats-numbers (1..10). - * - * @see com.lowagie.text.List + * * @author Michael Niedermair and Bruno Lowagie + * @see com.lowagie.text.List */ public class ZapfDingbatsNumberList extends List { @@ -63,6 +62,7 @@ public class ZapfDingbatsNumberList extends List { /** * Creates a ZapdDingbatsNumberList + * * @param type the type of list */ public ZapfDingbatsNumberList(int type) { @@ -75,8 +75,9 @@ public ZapfDingbatsNumberList(int type) { /** * Creates a ZapdDingbatsNumberList - * @param type the type of list - * @param symbolIndent indent + * + * @param type the type of list + * @param symbolIndent indent */ public ZapfDingbatsNumberList(int type, int symbolIndent) { super(true, symbolIndent); @@ -87,27 +88,27 @@ public ZapfDingbatsNumberList(int type, int symbolIndent) { } /** - * set the type - * - * @param type {@link ZapfDingbatsNumberList#type} + * get the type + * + * @return char-number */ - public void setType(int type) { - this.type = type; + public int getType() { + return type; } /** - * get the type + * set the type * - * @return char-number + * @param type {@link ZapfDingbatsNumberList#type} */ - public int getType() { - return type; + public void setType(int type) { + this.type = type; } /** * Adds an Element to the List. * - * @param o the element to add. + * @param o the element to add. * @return true if adding the element succeeded */ @Override @@ -115,18 +116,18 @@ public boolean add(Element o) { if (o instanceof ListItem) { ListItem item = (ListItem) o; Chunk chunk = new Chunk(preSymbol, symbol.getFont()); - switch (type ) { + switch (type) { case 0: - chunk.append(String.valueOf((char)(first + list.size() + 171))); + chunk.append(String.valueOf((char) (first + list.size() + 171))); break; case 1: - chunk.append(String.valueOf((char)(first + list.size() + 181))); + chunk.append(String.valueOf((char) (first + list.size() + 181))); break; case 2: - chunk.append(String.valueOf((char)(first + list.size() + 191))); + chunk.append(String.valueOf((char) (first + list.size() + 191))); break; default: - chunk.append(String.valueOf((char)(first + list.size() + 201))); + chunk.append(String.valueOf((char) (first + list.size() + 201))); } chunk.append(postSymbol); item.setListSymbol(chunk); @@ -145,7 +146,7 @@ public boolean add(Element o) { /** * Adds a String to the List. * - * @param s the string to add. + * @param s the string to add. * @return true if adding the string succeeded */ @Override diff --git a/openpdf/src/main/java/com/lowagie/text/alignment/HorizontalAlignment.java b/openpdf/src/main/java/com/lowagie/text/alignment/HorizontalAlignment.java index efdbaf447..78bfebc73 100644 --- a/openpdf/src/main/java/com/lowagie/text/alignment/HorizontalAlignment.java +++ b/openpdf/src/main/java/com/lowagie/text/alignment/HorizontalAlignment.java @@ -26,25 +26,21 @@ public enum HorizontalAlignment { this.id = id; } - public int getId() { - return id; - } - /** - * Constructs {@link HorizontalAlignment} instance from passed unique alignment {@code id}. - * - * @param id Alignment unique ID - * @see Element#ALIGN_UNDEFINED - * @see Element#ALIGN_LEFT - * @see Element#ALIGN_CENTER - * @see Element#ALIGN_RIGHT - * @see Element#ALIGN_JUSTIFIED - * @see Element#ALIGN_JUSTIFIED_ALL - * @return {@link Optional} containing alignment instance. If {@code id} is not recognized, - * {@link Optional#empty()} will be returned - */ + * Constructs {@link HorizontalAlignment} instance from passed unique alignment {@code id}. + * + * @param id Alignment unique ID + * @return {@link Optional} containing alignment instance. If {@code id} is not recognized, {@link Optional#empty()} + * will be returned + * @see Element#ALIGN_UNDEFINED + * @see Element#ALIGN_LEFT + * @see Element#ALIGN_CENTER + * @see Element#ALIGN_RIGHT + * @see Element#ALIGN_JUSTIFIED + * @see Element#ALIGN_JUSTIFIED_ALL + */ public static Optional of(final int id) { - for (final HorizontalAlignment alignment: values()) { + for (final HorizontalAlignment alignment : values()) { if (alignment.id == id) { return Optional.of(alignment); } @@ -52,5 +48,9 @@ public static Optional of(final int id) { return Optional.empty(); } + + public int getId() { + return id; + } } diff --git a/openpdf/src/main/java/com/lowagie/text/alignment/VerticalAlignment.java b/openpdf/src/main/java/com/lowagie/text/alignment/VerticalAlignment.java index f603ae2e4..4183cb1ab 100644 --- a/openpdf/src/main/java/com/lowagie/text/alignment/VerticalAlignment.java +++ b/openpdf/src/main/java/com/lowagie/text/alignment/VerticalAlignment.java @@ -25,24 +25,20 @@ public enum VerticalAlignment { this.id = id; } - public int getId() { - return id; - } - /** - * Constructs {@link VerticalAlignment} instance from passed unique alignment {@code id}. - * - * @param id Alignment unique ID - * @see Element#ALIGN_UNDEFINED - * @see Element#ALIGN_TOP - * @see Element#ALIGN_MIDDLE - * @see Element#ALIGN_BOTTOM - * @see Element#ALIGN_BASELINE - * @return {@link Optional} containing alignment instance. If {@code id} is not recognized, - * {@link Optional#empty()} will be returned - */ + * Constructs {@link VerticalAlignment} instance from passed unique alignment {@code id}. + * + * @param id Alignment unique ID + * @return {@link Optional} containing alignment instance. If {@code id} is not recognized, {@link Optional#empty()} + * will be returned + * @see Element#ALIGN_UNDEFINED + * @see Element#ALIGN_TOP + * @see Element#ALIGN_MIDDLE + * @see Element#ALIGN_BOTTOM + * @see Element#ALIGN_BASELINE + */ public static Optional of(final int id) { - for (final VerticalAlignment alignment: values()) { + for (final VerticalAlignment alignment : values()) { if (alignment.id == id) { return Optional.of(alignment); } @@ -50,4 +46,8 @@ public static Optional of(final int id) { return Optional.empty(); } + + public int getId() { + return id; + } } diff --git a/openpdf/src/main/java/com/lowagie/text/alignment/WithHorizontalAlignment.java b/openpdf/src/main/java/com/lowagie/text/alignment/WithHorizontalAlignment.java index 053ddb74a..ef024c82c 100644 --- a/openpdf/src/main/java/com/lowagie/text/alignment/WithHorizontalAlignment.java +++ b/openpdf/src/main/java/com/lowagie/text/alignment/WithHorizontalAlignment.java @@ -9,9 +9,9 @@ public interface WithHorizontalAlignment { /** - * Sets horizontal alignment mode. - * - * @param alignment New alignment mode. If null, current alignment must be left unchanged - */ + * Sets horizontal alignment mode. + * + * @param alignment New alignment mode. If null, current alignment must be left unchanged + */ void setHorizontalAlignment(final HorizontalAlignment alignment); } diff --git a/openpdf/src/main/java/com/lowagie/text/alignment/WithVerticalAlignment.java b/openpdf/src/main/java/com/lowagie/text/alignment/WithVerticalAlignment.java index b662870db..2b16d1cd1 100644 --- a/openpdf/src/main/java/com/lowagie/text/alignment/WithVerticalAlignment.java +++ b/openpdf/src/main/java/com/lowagie/text/alignment/WithVerticalAlignment.java @@ -9,9 +9,9 @@ public interface WithVerticalAlignment { /** - * Sets vertical alignment mode. - * - * @param alignment New alignment mode. If null, current alignment must be left unchanged - */ + * Sets vertical alignment mode. + * + * @param alignment New alignment mode. If null, current alignment must be left unchanged + */ void setVerticalAlignment(final VerticalAlignment alignment); } diff --git a/openpdf/src/main/java/com/lowagie/text/error_messages/MessageLocalization.java b/openpdf/src/main/java/com/lowagie/text/error_messages/MessageLocalization.java index c137dfaab..ea188fead 100644 --- a/openpdf/src/main/java/com/lowagie/text/error_messages/MessageLocalization.java +++ b/openpdf/src/main/java/com/lowagie/text/error_messages/MessageLocalization.java @@ -48,6 +48,7 @@ */ package com.lowagie.text.error_messages; +import com.lowagie.text.pdf.BaseFont; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -58,22 +59,18 @@ import java.util.Map; import java.util.Set; -import com.lowagie.text.pdf.BaseFont; - /** - * Localizes error messages. The messages are located in the package - * com.lowagie.text.error_messages in the form language_country.lng. - * The internal file encoding is UTF-8 without any escape chars, it's not a - * normal property file. See en.lng for more information on the internal format. + * Localizes error messages. The messages are located in the package com.lowagie.text.error_messages in the form + * language_country.lng. The internal file encoding is UTF-8 without any escape chars, it's not a normal property file. + * See en.lng for more information on the internal format. + * * @author Paulo Soares (psoares@glintt.com) */ public final class MessageLocalization { + + private static final String BASE_PATH = "com/lowagie/text/error_messages/"; private static Map defaultLanguage = new HashMap<>(); private static Map currentLanguage; - private static final String BASE_PATH = "com/lowagie/text/error_messages/"; - - private MessageLocalization() { - } static { try { @@ -81,12 +78,17 @@ private MessageLocalization() { } catch (Exception ex) { // do nothing } - if (defaultLanguage == null) + if (defaultLanguage == null) { defaultLanguage = new HashMap<>(); + } + } + + private MessageLocalization() { } /** * Get a message without parameters. + * * @param key the key to the message * @return the message */ @@ -95,18 +97,21 @@ public static String getMessage(String key) { String val; if (cl != null) { val = cl.get(key); - if (val != null) + if (val != null) { return val; + } } cl = defaultLanguage; val = cl.get(key); - if (val != null) + if (val != null) { return val; + } return "No message found for " + key; } /** * Get a message without parameters. + * * @param key the key to the message * @return the message */ @@ -115,10 +120,10 @@ public static String getComposedMessage(String key) { } /** - * Get a message with one parameter. The parameter will replace the string - * "{1}" found in the message. + * Get a message with one parameter. The parameter will replace the string "{1}" found in the message. + * * @param key the key to the message - * @param p1 the parameter + * @param p1 the parameter * @return the message */ public static String getComposedMessage(String key, Object p1) { @@ -126,10 +131,10 @@ public static String getComposedMessage(String key, Object p1) { } /** - * Get a message with one parameter. The parameter will replace the string - * "{1}" found in the message. + * Get a message with one parameter. The parameter will replace the string "{1}" found in the message. + * * @param key the key to the message - * @param p1 the parameter + * @param p1 the parameter * @return the message */ public static String getComposedMessage(String key, int p1) { @@ -137,11 +142,11 @@ public static String getComposedMessage(String key, int p1) { } /** - * Get a message with one parameter. The parameter will replace the string - * "{1}", "{2}" found in the message. + * Get a message with one parameter. The parameter will replace the string "{1}", "{2}" found in the message. + * * @param key the key to the message - * @param p1 the parameter - * @param p2 the parameter + * @param p1 the parameter + * @param p2 the parameter * @return the message */ public static String getComposedMessage(String key, Object p1, Object p2) { @@ -149,12 +154,13 @@ public static String getComposedMessage(String key, Object p1, Object p2) { } /** - * Get a message with one parameter. The parameter will replace the string - * "{1}", "{2}", "{3}" found in the message. + * Get a message with one parameter. The parameter will replace the string "{1}", "{2}", "{3}" found in the + * message. + * * @param key the key to the message - * @param p1 the parameter - * @param p2 the parameter - * @param p3 the parameter + * @param p1 the parameter + * @param p2 the parameter + * @param p3 the parameter * @return the message */ public static String getComposedMessage(String key, Object p1, Object p2, Object p3) { @@ -162,13 +168,14 @@ public static String getComposedMessage(String key, Object p1, Object p2, Object } /** - * Get a message with two parameters. The parameters will replace the strings - * "{1}", "{2}", "{3}", "{4}" found in the message. + * Get a message with two parameters. The parameters will replace the strings "{1}", "{2}", "{3}", "{4}" found in + * the message. + * * @param key the key to the message - * @param p1 the parameter - * @param p2 the parameter - * @param p3 the parameter - * @param p4 the parameter + * @param p1 the parameter + * @param p2 the parameter + * @param p3 the parameter + * @param p4 the parameter * @return the message */ public static String getComposedMessage(String key, Object p1, Object p2, Object p3, Object p4) { @@ -189,24 +196,26 @@ public static String getComposedMessage(String key, Object p1, Object p2, Object } /** - * Sets the language to be used globally for the error messages. The language - * is a two letter lowercase country designation like "en" or "pt". The country - * is an optional two letter uppercase code like "US" or "PT". + * Sets the language to be used globally for the error messages. The language is a two letter lowercase country + * designation like "en" or "pt". The country is an optional two letter uppercase code like "US" or "PT". + * * @param language the language - * @param country the country + * @param country the country * @return true if the language was found, false otherwise * @throws IOException on error */ public static boolean setLanguage(String language, String country) throws IOException { Map lang = getLanguageMessages(language, country); - if (lang == null) + if (lang == null) { return false; + } currentLanguage = lang; return true; } /** * Sets the error messages directly from a Reader. + * * @param r the Reader * @throws IOException on error */ @@ -215,28 +224,32 @@ public static void setMessages(Reader r) throws IOException { } private static Map getLanguageMessages(String language, String country) throws IOException { - if (language == null) + if (language == null) { throw new IllegalArgumentException("The language cannot be null."); + } InputStream is = null; try { String file; - if (country != null) + if (country != null) { file = language + "_" + country + ".lng"; - else + } else { file = language + ".lng"; + } is = BaseFont.getResourceStream(BASE_PATH + file, MessageLocalization.class.getClassLoader()); - if (is != null) + if (is != null) { return readLanguageStream(is); - if (country == null) + } + if (country == null) { return null; + } file = language + ".lng"; is = BaseFont.getResourceStream(BASE_PATH + file, MessageLocalization.class.getClassLoader()); - if (is != null) + if (is != null) { return readLanguageStream(is); - else + } else { return null; - } - finally { + } + } finally { try { if (is != null) { is.close(); diff --git a/openpdf/src/main/java/com/lowagie/text/exceptions/BadPasswordException.java b/openpdf/src/main/java/com/lowagie/text/exceptions/BadPasswordException.java index f0a8af619..0f4bf0a33 100644 --- a/openpdf/src/main/java/com/lowagie/text/exceptions/BadPasswordException.java +++ b/openpdf/src/main/java/com/lowagie/text/exceptions/BadPasswordException.java @@ -52,18 +52,22 @@ import java.io.IOException; /** - * Typed exception used when opening an existing PDF document. - * Gets thrown when the document isn't a valid PDF document. + * Typed exception used when opening an existing PDF document. Gets thrown when the document isn't a valid PDF + * document. + * * @since 2.1.5 It was written for iText 2.0.8, but moved to another package */ public class BadPasswordException extends IOException { - /** Serial Version UID. */ + /** + * Serial Version UID. + */ private static final long serialVersionUID = -4333706268155063964L; /** * Creates an exception saying the user password was incorrect. - * @param message The message to give to the user + * + * @param message The message to give to the user */ public BadPasswordException(String message) { super(message); diff --git a/openpdf/src/main/java/com/lowagie/text/exceptions/IllegalPdfSyntaxException.java b/openpdf/src/main/java/com/lowagie/text/exceptions/IllegalPdfSyntaxException.java index a07f5abbb..cf93c2ec9 100644 --- a/openpdf/src/main/java/com/lowagie/text/exceptions/IllegalPdfSyntaxException.java +++ b/openpdf/src/main/java/com/lowagie/text/exceptions/IllegalPdfSyntaxException.java @@ -51,16 +51,20 @@ /** * Typed exception used when creating PDF syntax that isn't valid. + * * @since 2.1.6 */ public class IllegalPdfSyntaxException extends IllegalArgumentException { - /** Serial version ID */ + /** + * Serial version ID + */ private static final long serialVersionUID = -643024246596031671L; /** * Creates an exception saying the PDF syntax isn't correct. - * @param message some extra info about the exception + * + * @param message some extra info about the exception */ public IllegalPdfSyntaxException(String message) { super(message); diff --git a/openpdf/src/main/java/com/lowagie/text/exceptions/InvalidPdfException.java b/openpdf/src/main/java/com/lowagie/text/exceptions/InvalidPdfException.java index 52f269979..9243ae7be 100644 --- a/openpdf/src/main/java/com/lowagie/text/exceptions/InvalidPdfException.java +++ b/openpdf/src/main/java/com/lowagie/text/exceptions/InvalidPdfException.java @@ -52,18 +52,22 @@ import java.io.IOException; /** - * Typed exception used when opening an existing PDF document. - * Gets thrown when the document isn't a valid PDF document. + * Typed exception used when opening an existing PDF document. Gets thrown when the document isn't a valid PDF + * document. + * * @since 2.1.5 */ public class InvalidPdfException extends IOException { - /** a serial version UID */ + /** + * a serial version UID + */ private static final long serialVersionUID = -2319614911517026938L; /** * Creates an instance of a NoPdfException. - * @param message the reason why the document isn't a PDF document according to iText. + * + * @param message the reason why the document isn't a PDF document according to iText. */ public InvalidPdfException(String message) { super(message); diff --git a/openpdf/src/main/java/com/lowagie/text/exceptions/UnsupportedPdfException.java b/openpdf/src/main/java/com/lowagie/text/exceptions/UnsupportedPdfException.java index 3798a3c64..a20cb1742 100644 --- a/openpdf/src/main/java/com/lowagie/text/exceptions/UnsupportedPdfException.java +++ b/openpdf/src/main/java/com/lowagie/text/exceptions/UnsupportedPdfException.java @@ -48,23 +48,26 @@ */ package com.lowagie.text.exceptions; + /** - * Typed exception used when opening an existing PDF document. - * Gets thrown when the document isn't a valid PDF document according to iText, - * but it's different from the InvalidPdfException in the sense that it may - * be an iText limitation (most of the times it isn't but you might have - * bumped into something that has been added to the PDF specs, but that isn't - * supported in iText yet). + * Typed exception used when opening an existing PDF document. Gets thrown when the document isn't a valid PDF document + * according to iText, but it's different from the InvalidPdfException in the sense that it may be an iText limitation + * (most of the times it isn't but you might have bumped into something that has been added to the PDF specs, but that + * isn't supported in iText yet). + * * @since 2.1.5 */ public class UnsupportedPdfException extends InvalidPdfException { - /** a serial version UID */ + /** + * a serial version UID + */ private static final long serialVersionUID = 2180764250839096628L; /** * Creates an instance of an UnsupportedPdfException. - * @param message the reason why the document isn't a PDF document according to iText. + * + * @param message the reason why the document isn't a PDF document according to iText. */ public UnsupportedPdfException(String message) { super(message); diff --git a/openpdf/src/main/java/com/lowagie/text/factories/ElementFactory.java b/openpdf/src/main/java/com/lowagie/text/factories/ElementFactory.java index 6c64c9702..13e354f90 100644 --- a/openpdf/src/main/java/com/lowagie/text/factories/ElementFactory.java +++ b/openpdf/src/main/java/com/lowagie/text/factories/ElementFactory.java @@ -41,7 +41,7 @@ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more * details. - * + * * Contributions by: * Lubos Strapko * @@ -51,17 +51,6 @@ */ package com.lowagie.text.factories; -import java.awt.Color; -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.Properties; -import java.util.StringTokenizer; - -import com.lowagie.text.alignment.HorizontalAlignment; -import com.lowagie.text.alignment.VerticalAlignment; -import com.lowagie.text.error_messages.MessageLocalization; - import com.lowagie.text.Anchor; import com.lowagie.text.Annotation; import com.lowagie.text.BadElementException; @@ -69,7 +58,7 @@ import com.lowagie.text.ChapterAutoNumber; import com.lowagie.text.Chunk; import com.lowagie.text.ElementTags; - +import com.lowagie.text.ExceptionConverter; import com.lowagie.text.FontFactory; import com.lowagie.text.Image; import com.lowagie.text.List; @@ -80,8 +69,16 @@ import com.lowagie.text.Section; import com.lowagie.text.Table; import com.lowagie.text.Utilities; -import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.alignment.HorizontalAlignment; +import com.lowagie.text.alignment.VerticalAlignment; +import com.lowagie.text.error_messages.MessageLocalization; import com.lowagie.text.html.Markup; +import java.awt.Color; +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.Properties; +import java.util.StringTokenizer; /** * This class is able to create Element objects based on a list of properties. @@ -90,7 +87,8 @@ public class ElementFactory { /** * Creates a Chunk object based on a list of properties. - * @param attributes The properties to base the parameters on + * + * @param attributes The properties to base the parameters on * @return a Chunk */ public static Chunk getChunk(Properties attributes) { @@ -147,7 +145,8 @@ public static Chunk getChunk(Properties attributes) { /** * Creates a Phrase object based on a list of properties. - * @param attributes The properties to base the parameters on + * + * @param attributes The properties to base the parameters on * @return a Phrase */ public static Phrase getPhrase(Properties attributes) { @@ -176,7 +175,8 @@ public static Phrase getPhrase(Properties attributes) { /** * Creates an Anchor object based on a list of properties. - * @param attributes The properties to base the parameters on + * + * @param attributes The properties to base the parameters on * @return an Anchor */ public static Anchor getAnchor(Properties attributes) { @@ -195,7 +195,8 @@ public static Anchor getAnchor(Properties attributes) { /** * Creates a Paragraph object based on a list of properties. - * @param attributes The properties to base the parameters on + * + * @param attributes The properties to base the parameters on * @return a Paragraph */ public static Paragraph getParagraph(Properties attributes) { @@ -218,7 +219,8 @@ public static Paragraph getParagraph(Properties attributes) { /** * Creates a ListItem object based on a list of properties. - * @param attributes The properties to base the parameters on + * + * @param attributes The properties to base the parameters on * @return a ListItem */ public static ListItem getListItem(Properties attributes) { @@ -228,7 +230,8 @@ public static ListItem getListItem(Properties attributes) { /** * Creates a List object based on a list of properties. - * @param attributes The properties to base the parameters on + * + * @param attributes The properties to base the parameters on * @return the List */ public static List getList(Properties attributes) { @@ -284,7 +287,8 @@ public static List getList(Properties attributes) { /** * Creates a Cell object based on a list of properties. - * @param attributes The properties to base the parameters on + * + * @param attributes The properties to base the parameters on * @return a Cell */ public static Cell getCell(Properties attributes) { @@ -293,7 +297,8 @@ public static Cell getCell(Properties attributes) { try { if (attributes.getProperty(ElementTags.HORIZONTALALIGN) != null) { - final HorizontalAlignment horizontalAlignment = HorizontalAlignment.valueOf(attributes.getProperty(ElementTags.HORIZONTALALIGN)); + final HorizontalAlignment horizontalAlignment = HorizontalAlignment.valueOf( + attributes.getProperty(ElementTags.HORIZONTALALIGN)); cell.setHorizontalAlignment(horizontalAlignment); } else { cell.setHorizontalAlignment(HorizontalAlignment.UNDEFINED); @@ -303,7 +308,8 @@ public static Cell getCell(Properties attributes) { } try { if (attributes.getProperty(ElementTags.VERTICALALIGN) != null) { - final VerticalAlignment verticalAlignment = VerticalAlignment.valueOf(attributes.getProperty(ElementTags.VERTICALALIGN)); + final VerticalAlignment verticalAlignment = VerticalAlignment.valueOf( + attributes.getProperty(ElementTags.VERTICALALIGN)); cell.setVerticalAlignment(verticalAlignment); } else { cell.setVerticalAlignment(VerticalAlignment.UNDEFINED); @@ -339,7 +345,8 @@ public static Cell getCell(Properties attributes) { /** * Creates an Table object based on a list of properties. - * @param attributes The properties to base the parameters on + * + * @param attributes The properties to base the parameters on * @return a Table */ public static Table getTable(Properties attributes) { @@ -401,11 +408,11 @@ public static Table getTable(Properties attributes) { } value = attributes.getProperty(ElementTags.WIDTH); if (value != null) { - if (value.endsWith("%")) + if (value.endsWith("%")) { table.setWidth(Float.parseFloat(value.substring(0, value .length() - 1) + "f")); - else { + } else { table.setWidth(Float.parseFloat(value + "f")); table.setLocked(true); } @@ -426,8 +433,9 @@ public static Table getTable(Properties attributes) { /** * Sets some Rectangle properties (for a Cell, Table,...). - * @param rect The Rectangle to set the properties to - * @param attributes The properties to base the parameters on + * + * @param rect The Rectangle to set the properties to + * @param attributes The properties to base the parameters on */ private static void setRectangleProperties(Rectangle rect, Properties attributes) { @@ -458,12 +466,15 @@ private static void setRectangleProperties(Rectangle rect, int red = 0; int green = 0; int blue = 0; - if (r != null) + if (r != null) { red = Integer.parseInt(r); - if (g != null) + } + if (g != null) { green = Integer.parseInt(g); - if (b != null) + } + if (b != null) { blue = Integer.parseInt(b); + } rect.setBorderColor(new Color(red, green, blue)); } else { rect.setBorderColor(Markup.decodeColor(attributes @@ -477,12 +488,15 @@ private static void setRectangleProperties(Rectangle rect, int red = 0; int green = 0; int blue = 0; - if (r != null) + if (r != null) { red = Integer.parseInt(r); - if (g != null) + } + if (g != null) { green = Integer.parseInt(g); - if (b != null) + } + if (b != null) { blue = Integer.parseInt(b); + } rect.setBackgroundColor(new Color(red, green, blue)); } else if (value != null) { rect.setBackgroundColor(Markup.decodeColor(value)); @@ -496,7 +510,8 @@ private static void setRectangleProperties(Rectangle rect, /** * Creates a ChapterAutoNumber object based on a list of properties. - * @param attributes The properties to base the parameters on + * + * @param attributes The properties to base the parameters on * @return a Chapter */ public static ChapterAutoNumber getChapter(Properties attributes) { @@ -507,8 +522,9 @@ public static ChapterAutoNumber getChapter(Properties attributes) { /** * Creates a Section object based on a list of properties. - * @param attributes The attributes to base the parameters on - * @param parent The parent Section to add a Section to + * + * @param attributes The attributes to base the parameters on + * @param parent The parent Section to add a Section to * @return a Section */ public static Section getSection(Section parent, Properties attributes) { @@ -519,8 +535,9 @@ public static Section getSection(Section parent, Properties attributes) { /** * Helper method to create a Chapter/Section object. - * @param attributes The attributes to base the parameters on - * @param section The part of the document to set the parameters to + * + * @param attributes The attributes to base the parameters on + * @param section The part of the document to set the parameters to */ private static void setSectionParameters(Section section, Properties attributes) { @@ -545,36 +562,41 @@ private static void setSectionParameters(Section section, /** * Creates an Image object based on a list of properties. - * @param attributes The properties to base the Image on + * + * @param attributes The properties to base the Image on * @return an Image - * @throws IOException thrown if an I/O problem occurs - * @throws BadElementException the exception thrown when the Element doesn't have the right form + * @throws IOException thrown if an I/O problem occurs + * @throws BadElementException the exception thrown when the Element doesn't have the right form */ public static Image getImage(Properties attributes) throws BadElementException, IOException { String value; value = attributes.getProperty(ElementTags.URL); - if (value == null) + if (value == null) { throw new MalformedURLException(MessageLocalization.getComposedMessage("the.url.of.the.image.is.missing")); + } Image image = Image.getInstance(value); value = attributes.getProperty(ElementTags.ALIGN); int align = 0; if (value != null) { - if (ElementTags.ALIGN_LEFT.equalsIgnoreCase(value)) + if (ElementTags.ALIGN_LEFT.equalsIgnoreCase(value)) { align |= Image.LEFT; - else if (ElementTags.ALIGN_RIGHT.equalsIgnoreCase(value)) + } else if (ElementTags.ALIGN_RIGHT.equalsIgnoreCase(value)) { align |= Image.RIGHT; - else if (ElementTags.ALIGN_MIDDLE.equalsIgnoreCase(value)) + } else if (ElementTags.ALIGN_MIDDLE.equalsIgnoreCase(value)) { align |= Image.MIDDLE; + } } if ("true".equalsIgnoreCase(attributes - .getProperty(ElementTags.UNDERLYING))) + .getProperty(ElementTags.UNDERLYING))) { align |= Image.UNDERLYING; + } if ("true".equalsIgnoreCase(attributes - .getProperty(ElementTags.TEXTWRAP))) + .getProperty(ElementTags.TEXTWRAP))) { align |= Image.TEXTWRAP; + } image.setAlignment(align); value = attributes.getProperty(ElementTags.ALT); @@ -605,7 +627,8 @@ else if (ElementTags.ALIGN_MIDDLE.equalsIgnoreCase(value)) /** * Creates an Annotation object based on a list of properties. - * @param attributes The properties to base the Annotation on + * + * @param attributes The properties to base the Annotation on * @return an Annotation */ public static Annotation getAnnotation(Properties attributes) { diff --git a/openpdf/src/main/java/com/lowagie/text/factories/GreekAlphabetFactory.java b/openpdf/src/main/java/com/lowagie/text/factories/GreekAlphabetFactory.java index 2b6ac732b..855c7c0d3 100644 --- a/openpdf/src/main/java/com/lowagie/text/factories/GreekAlphabetFactory.java +++ b/openpdf/src/main/java/com/lowagie/text/factories/GreekAlphabetFactory.java @@ -51,18 +51,18 @@ import com.lowagie.text.SpecialSymbol; /** - * This class can produce String combinations representing a number built with - * Greek letters (from alpha to omega, then alpha alpha, alpha beta, alpha gamma). - * We are aware of the fact that the original Greek numbering is different; - * See http://www.cogsci.indiana.edu/farg/harry/lan/grknum.htm#ancient - * but this isn't implemented yet; the main reason being the fact that we - * need a font that has the obsolete Greek characters qoppa and sampi. + * This class can produce String combinations representing a number built with Greek letters (from alpha to omega, then + * alpha alpha, alpha beta, alpha gamma). We are aware of the fact that the original Greek numbering is different; See + * http://www.cogsci.indiana.edu/farg/harry/lan/grknum.htm#ancient but this isn't implemented yet; the main reason being + * the fact that we need a font that has the obsolete Greek characters qoppa and sampi. * * @since 2.0.7 (was called GreekNumberFactory in earlier versions) */ public class GreekAlphabetFactory { + /** * Changes an int into a lower case Greek letter combination. + * * @param index the original number * @return the letter combination */ @@ -72,6 +72,7 @@ public static final String getString(int index) { /** * Changes an int into a lower case Greek letter combination. + * * @param index the original number * @return the letter combination */ @@ -81,6 +82,7 @@ public static final String getLowerCaseString(int index) { /** * Changes an int into a upper case Greek letter combination. + * * @param index the original number * @return the letter combination */ @@ -90,34 +92,39 @@ public static final String getUpperCaseString(int index) { /** * Changes an int into a Greek letter combination. - * @param index the original number + * + * @param index the original number * @param lowercase true for lowercase, false for uppercase * @return the letter combination */ public static final String getString(int index, boolean lowercase) { - if (index < 1) return ""; + if (index < 1) { + return ""; + } index--; int bytes = 1; int start = 0; int symbols = 24; - while(index >= symbols + start) { - bytes++; - start += symbols; - symbols *= 24; - } + while (index >= symbols + start) { + bytes++; + start += symbols; + symbols *= 24; + } - int c = index - start; - char[] value = new char[bytes]; - while(bytes > 0) { - bytes--; - value[bytes] = (char)(c % 24); - if (value[bytes] > 16) value[bytes]++; - value[bytes] += (lowercase ? 945 : 913); - value[bytes] = SpecialSymbol.getCorrespondingSymbol(value[bytes]); - c /= 24; - } + int c = index - start; + char[] value = new char[bytes]; + while (bytes > 0) { + bytes--; + value[bytes] = (char) (c % 24); + if (value[bytes] > 16) { + value[bytes]++; + } + value[bytes] += (lowercase ? 945 : 913); + value[bytes] = SpecialSymbol.getCorrespondingSymbol(value[bytes]); + c /= 24; + } - return String.valueOf(value); + return String.valueOf(value); } } diff --git a/openpdf/src/main/java/com/lowagie/text/factories/RomanAlphabetFactory.java b/openpdf/src/main/java/com/lowagie/text/factories/RomanAlphabetFactory.java index e21215314..de41ccacb 100644 --- a/openpdf/src/main/java/com/lowagie/text/factories/RomanAlphabetFactory.java +++ b/openpdf/src/main/java/com/lowagie/text/factories/RomanAlphabetFactory.java @@ -52,27 +52,29 @@ import com.lowagie.text.error_messages.MessageLocalization; /** - * This class can produce String combinations representing a number. - * "a" to "z" represent 1 to 26, "AA" represents 27, "AB" represents 28, - * and so on; "ZZ" is followed by "AAA". + * This class can produce String combinations representing a number. "a" to "z" represent 1 to 26, "AA" represents 27, + * "AB" represents 28, and so on; "ZZ" is followed by "AAA". */ public class RomanAlphabetFactory { /** - * Translates a positive integer (not equal to zero) - * into a String using the letters 'a' to 'z'; - * 1 = a, 2 = b, ..., 26 = z, 27 = aa, 28 = ab,... + * Translates a positive integer (not equal to zero) into a String using the letters 'a' to 'z'; 1 = a, 2 = b, ..., + * 26 = z, 27 = aa, 28 = ab,... + * * @param index the integer to translate * @return the lowercase String representing the integer */ public static final String getString(int index) { - if (index < 1) throw new NumberFormatException(MessageLocalization.getComposedMessage("you.can.t.translate.a.negative.number.into.an.alphabetical.value")); + if (index < 1) { + throw new NumberFormatException(MessageLocalization.getComposedMessage( + "you.can.t.translate.a.negative.number.into.an.alphabetical.value")); + } index--; int bytes = 1; int start = 0; int symbols = 26; - while(index >= symbols + start) { + while (index >= symbols + start) { bytes++; start += symbols; symbols *= 26; @@ -80,8 +82,8 @@ public static final String getString(int index) { int c = index - start; char[] value = new char[bytes]; - while(bytes > 0) { - value[--bytes] = (char)( 'a' + (c % 26)); + while (bytes > 0) { + value[--bytes] = (char) ('a' + (c % 26)); c /= 26; } @@ -89,9 +91,9 @@ public static final String getString(int index) { } /** - * Translates a positive integer (not equal to zero) - * into a String using the letters 'a' to 'z'; - * 1 = a, 2 = b, ..., 26 = z, 27 = aa, 28 = ab,... + * Translates a positive integer (not equal to zero) into a String using the letters 'a' to 'z'; 1 = a, 2 = b, ..., + * 26 = z, 27 = aa, 28 = ab,... + * * @param index the number to translate * @return the lowercase String representing the integer */ @@ -100,9 +102,9 @@ public static final String getLowerCaseString(int index) { } /** - * Translates a positive integer (not equal to zero) - * into a String using the letters 'A' to 'Z'; - * 1 = A, 2 = B, ..., 26 = Z, 27 = AA, 28 = AB,... + * Translates a positive integer (not equal to zero) into a String using the letters 'A' to 'Z'; 1 = A, 2 = B, ..., + * 26 = Z, 27 = AA, 28 = AB,... + * * @param index the number to translate * @return the uppercase String representing the integer */ @@ -112,18 +114,17 @@ public static final String getUpperCaseString(int index) { /** - * Translates a positive integer (not equal to zero) - * into a String using the letters 'a' to 'z' - * (a = 1, b = 2, ..., z = 26, aa = 27, ab = 28,...). - * @param index the number to translate + * Translates a positive integer (not equal to zero) into a String using the letters 'a' to 'z' (a = 1, b = 2, ..., + * z = 26, aa = 27, ab = 28,...). + * + * @param index the number to translate * @param lowercase true for lowercase, false for uppercase * @return the lowercase String representing the integer */ public static final String getString(int index, boolean lowercase) { if (lowercase) { return getLowerCaseString(index); - } - else { + } else { return getUpperCaseString(index); } } diff --git a/openpdf/src/main/java/com/lowagie/text/factories/RomanNumberFactory.java b/openpdf/src/main/java/com/lowagie/text/factories/RomanNumberFactory.java index dde7b62ad..0ef1230f6 100644 --- a/openpdf/src/main/java/com/lowagie/text/factories/RomanNumberFactory.java +++ b/openpdf/src/main/java/com/lowagie/text/factories/RomanNumberFactory.java @@ -47,52 +47,28 @@ * https://github.com/LibrePDF/OpenPDF */ package com.lowagie.text.factories; + /** * This class can produce String combinations representing a roman number. */ public class RomanNumberFactory { - /** - * Helper class for Roman Digits - */ - private static class RomanDigit { - - /** part of a roman number */ - public char digit; - - /** value of the roman digit */ - public int value; - - /** can the digit be used as a prefix */ - public boolean pre; - - /** - * Constructs a roman digit - * @param digit the roman digit - * @param value the value - * @param pre can it be used as a prefix - */ - RomanDigit(char digit, int value, boolean pre) { - this.digit = digit; - this.value = value; - this.pre = pre; - } - } /** * Array with Roman digits. */ private static final RomanDigit[] roman = { - new RomanDigit('m', 1000, false), - new RomanDigit('d', 500, false), - new RomanDigit('c', 100, true), - new RomanDigit('l', 50, false), - new RomanDigit('x', 10, true), - new RomanDigit('v', 5, false), - new RomanDigit('i', 1, true) + new RomanDigit('m', 1000, false), + new RomanDigit('d', 500, false), + new RomanDigit('c', 100, true), + new RomanDigit('l', 50, false), + new RomanDigit('x', 10, true), + new RomanDigit('v', 5, false), + new RomanDigit('i', 1, true) }; /** * Changes an int into a lower case roman number. + * * @param index the original number * @return the roman number (lower case) */ @@ -130,7 +106,8 @@ public static String getString(int index) { } // look for the next digit that can be used in a special way int j = pos; - while (!roman[++j].pre); + while (!roman[++j].pre) + ; // does the special notation apply? if (index + roman[j].value >= dig.value) { @@ -144,6 +121,7 @@ public static String getString(int index) { /** * Changes an int into a lower case roman number. + * * @param index the original number * @return the roman number (lower case) */ @@ -153,6 +131,7 @@ public static String getLowerCaseString(int index) { /** * Changes an int into an upper case roman number. + * * @param index the original number * @return the roman number (lower case) */ @@ -162,16 +141,50 @@ public static String getUpperCaseString(int index) { /** * Changes an int into a roman number. - * @param index the original number + * + * @param index the original number * @param lowercase true for lowercase, false for uppercase * @return the roman number (lower case) */ public static String getString(int index, boolean lowercase) { if (lowercase) { return getLowerCaseString(index); - } - else { + } else { return getUpperCaseString(index); } } + + /** + * Helper class for Roman Digits + */ + private static class RomanDigit { + + /** + * part of a roman number + */ + public char digit; + + /** + * value of the roman digit + */ + public int value; + + /** + * can the digit be used as a prefix + */ + public boolean pre; + + /** + * Constructs a roman digit + * + * @param digit the roman digit + * @param value the value + * @param pre can it be used as a prefix + */ + RomanDigit(char digit, int value, boolean pre) { + this.digit = digit; + this.value = value; + this.pre = pre; + } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/html/FontSize.java b/openpdf/src/main/java/com/lowagie/text/html/FontSize.java index b6ddad93b..d905d9587 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/FontSize.java +++ b/openpdf/src/main/java/com/lowagie/text/html/FontSize.java @@ -31,18 +31,6 @@ public enum FontSize { this.relative = relative; } - public String getTextValue() { - return textValue; - } - - public float getScale() { - return scale; - } - - public boolean isRelative() { - return relative; - } - public static FontSize parse(String text) { if (text == null || text.isEmpty() || !Character.isLetter(text.charAt(0))) { return null; @@ -54,4 +42,16 @@ public static FontSize parse(String text) { } return null; } + + public String getTextValue() { + return textValue; + } + + public float getScale() { + return scale; + } + + public boolean isRelative() { + return relative; + } } diff --git a/openpdf/src/main/java/com/lowagie/text/html/HtmlEncoder.java b/openpdf/src/main/java/com/lowagie/text/html/HtmlEncoder.java index aece96f9a..16fef80c5 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/HtmlEncoder.java +++ b/openpdf/src/main/java/com/lowagie/text/html/HtmlEncoder.java @@ -50,7 +50,6 @@ package com.lowagie.text.html; import com.lowagie.text.Element; - import java.awt.Color; /** @@ -72,13 +71,13 @@ * (with xxx = the value of the character) * *

    - * Example: + * Example: *

    * 
      * String htmlPresentation = HtmlEncoder.encode("Marie-Thérèse Sørensen");
  *
    *

    - * for more info: see O'Reilly; "HTML: The Definitive Guide" (page 164) + * for more info: see O'Reilly; "HTML: The Definitive Guide" (page 164) *

    * * @author mario.maccarini@ugent.be @@ -119,7 +118,6 @@ public final class HtmlEncoder { } } - // constructors /** diff --git a/openpdf/src/main/java/com/lowagie/text/html/HtmlParser.java b/openpdf/src/main/java/com/lowagie/text/html/HtmlParser.java index 5ed646f8a..f7fcf80c6 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/HtmlParser.java +++ b/openpdf/src/main/java/com/lowagie/text/html/HtmlParser.java @@ -52,12 +52,11 @@ import com.lowagie.text.DocListener; import com.lowagie.text.ExceptionConverter; import com.lowagie.text.xml.XmlParser; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - import java.io.IOException; import java.io.InputStream; import java.io.Reader; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; /** * This class can be used to parse some HTML files. diff --git a/openpdf/src/main/java/com/lowagie/text/html/HtmlPeer.java b/openpdf/src/main/java/com/lowagie/text/html/HtmlPeer.java index ed839e38e..a2996cae9 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/HtmlPeer.java +++ b/openpdf/src/main/java/com/lowagie/text/html/HtmlPeer.java @@ -49,12 +49,10 @@ package com.lowagie.text.html; -import java.util.Properties; - -import org.xml.sax.Attributes; - import com.lowagie.text.ElementTags; import com.lowagie.text.xml.XmlPeer; +import java.util.Properties; +import org.xml.sax.Attributes; /** * This interface is implemented by the peer of all the iText objects. @@ -64,11 +62,9 @@ public class HtmlPeer extends XmlPeer { /** * Creates a XmlPeer. - * - * @param name - * the iText name of the tag - * @param alias - * the Html name of the tag + * + * @param name the iText name of the tag + * @param alias the Html name of the tag */ public HtmlPeer(String name, String alias) { @@ -77,11 +73,9 @@ public HtmlPeer(String name, String alias) { /** * Sets an alias for an attribute. - * - * @param name - * the iText tagname - * @param alias - * the custom tagname + * + * @param name the iText tagname + * @param alias the custom tagname */ public void addAlias(String name, String alias) { diff --git a/openpdf/src/main/java/com/lowagie/text/html/HtmlTagMap.java b/openpdf/src/main/java/com/lowagie/text/html/HtmlTagMap.java index c2090d61a..4a86531ee 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/HtmlTagMap.java +++ b/openpdf/src/main/java/com/lowagie/text/html/HtmlTagMap.java @@ -44,7 +44,7 @@ * * Contributions by: * Lubos Strapko - * + * * If you didn't download this code from the following link, you should check if * you aren't using an obsolete version: * https://github.com/LibrePDF/OpenPDF @@ -52,10 +52,9 @@ package com.lowagie.text.html; -import java.util.HashMap; - import com.lowagie.text.ElementTags; import com.lowagie.text.FontFactory; +import java.util.HashMap; /** * The Tags-class maps several XHTML-tags to iText-objects. @@ -232,6 +231,7 @@ public HtmlTagMap() { /** * Checks if this is the root tag. + * * @param tag a tagvalue * @return true if tag is HTML or html */ @@ -242,6 +242,7 @@ public static boolean isHtml(String tag) { /** * Checks if this is the head tag. + * * @param tag a tagvalue * @return true if tag is HEAD or head */ @@ -252,6 +253,7 @@ public static boolean isHead(String tag) { /** * Checks if this is the meta tag. + * * @param tag a tagvalue * @return true if tag is META or meta */ @@ -262,6 +264,7 @@ public static boolean isMeta(String tag) { /** * Checks if this is the link tag. + * * @param tag a tagvalue * @return true if tag is LINK or link */ @@ -272,6 +275,7 @@ public static boolean isLink(String tag) { /** * Checks if this is the title tag. + * * @param tag a tagvalue * @return true if tag is TITLE or title */ @@ -282,6 +286,7 @@ public static boolean isTitle(String tag) { /** * Checks if this is the root tag. + * * @param tag a tagvalue * @return true if tag is BODY or body */ @@ -292,6 +297,7 @@ public static boolean isBody(String tag) { /** * Checks if this is a special tag. + * * @param tag a tagvalue * @return true if tag is a HTML, HEAD, META, LINK or BODY tag (case insensitive) */ diff --git a/openpdf/src/main/java/com/lowagie/text/html/HtmlWriter.java b/openpdf/src/main/java/com/lowagie/text/html/HtmlWriter.java index a0925df34..24fc18e54 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/HtmlWriter.java +++ b/openpdf/src/main/java/com/lowagie/text/html/HtmlWriter.java @@ -49,6 +49,8 @@ package com.lowagie.text.html; +import static com.lowagie.text.error_messages.MessageLocalization.getComposedMessage; + import com.lowagie.text.Anchor; import com.lowagie.text.Annotation; import com.lowagie.text.BadElementException; @@ -76,7 +78,6 @@ import com.lowagie.text.SimpleTable; import com.lowagie.text.Table; import com.lowagie.text.pdf.BaseFont; - import java.io.IOException; import java.io.OutputStream; import java.util.Date; @@ -87,32 +88,24 @@ import java.util.Properties; import java.util.Stack; -import static com.lowagie.text.error_messages.MessageLocalization.getComposedMessage; - /** * A DocWriter class for HTML. *

    - * An HtmlWriter can be added as a DocListener - * to a certain Document by getting an instance. - * Every Element added to the original Document - * will be written to the OutputStream of this HtmlWriter. + * An HtmlWriter can be added as a DocListener to a certain Document by getting + * an instance. Every Element added to the original Document will be written to the + * OutputStream of this HtmlWriter. *

    * Example: * 

    - * // creation of the document with a certain size and certain margins
- * Document document = new Document(PageSize.A4, 50, 50, 50, 50);
- * try {
- * // this will write HTML to the Standard OutputStream
+ * // creation of the document with a certain size and certain margins Document document = new Document(PageSize.A4, 50,
+ * 50, 50, 50); try { // this will write HTML to the Standard OutputStream
  * HtmlWriter.getInstance(document, System.out);
  * // this will write HTML to a file called text.html
  * HtmlWriter.getInstance(document, new FileOutputStream("text.html"));
  * // this will write HTML to for instance the OutputStream of a HttpServletResponse-object
  * HtmlWriter.getInstance(document, response.getOutputStream());
- * }
- * catch(DocumentException de) {
- * System.err.println(de.getMessage());
- * }
- * // this will close the document and all the OutputStreams listening to it
+ * } catch(DocumentException de) { System.err.println(de.getMessage()); } // this will close the document and all the
+ * OutputStreams listening to it
  * document.close();
  *
    */ @@ -250,7 +243,8 @@ public boolean add(Element element) throws DocumentException { return false; } if (open && !element.isContent()) { - throw new DocumentException(getComposedMessage("the.document.is.open.you.can.only.add.elements.with.content")); + throw new DocumentException( + getComposedMessage("the.document.is.open.you.can.only.add.elements.with.content")); } try { switch (element.type()) { @@ -459,7 +453,8 @@ protected void writeLink(Header header) throws IOException { } /** - * Writes a JavaScript section or, if the markup attribute HtmlTags.URL is set, a JavaScript reference in the header. + * Writes a JavaScript section or, if the markup attribute HtmlTags.URL is set, a JavaScript reference in the + * header. * * @param header the element that has to be written * @throws IOException on error @@ -541,11 +536,9 @@ public boolean isOtherFont(Font font) { /** * Sets the basepath for images. *

    - * This is especially useful if you add images using a file, - * rather than an URL. In PDF there is no problem, since - * the images are added inline, but in HTML it is sometimes - * necessary to use a relative path or a special path to some - * images directory. + * This is especially useful if you add images using a file, rather than an URL. In PDF there is no problem, since + * the images are added inline, but in HTML it is sometimes necessary to use a relative path or a special path to + * some images directory. * * @param imagepath the new imagepath */ @@ -625,7 +618,9 @@ protected void write(Element element, int indent) throws IOException { return; } - if (chunk.isEmpty()) return; + if (chunk.isEmpty()) { + return; + } Map attributes = chunk.getChunkAttributes(); if (attributes != null && attributes.get(Chunk.NEWPAGE) != null) { return; @@ -672,8 +667,9 @@ protected void write(Element element, int indent) throws IOException { case Element.PHRASE: { Phrase phrase = (Phrase) element; styleAttributes = new Properties(); - if (phrase.hasLeading()) + if (phrase.hasLeading()) { styleAttributes.setProperty(Markup.CSS_KEY_LINEHEIGHT, phrase.getLeading() + "pt"); + } // start tag addTabs(indent); @@ -695,8 +691,9 @@ protected void write(Element element, int indent) throws IOException { case Element.ANCHOR: { Anchor anchor = (Anchor) element; styleAttributes = new Properties(); - if (anchor.hasLeading()) + if (anchor.hasLeading()) { styleAttributes.setProperty(Markup.CSS_KEY_LINEHEIGHT, anchor.getLeading() + "pt"); + } // start tag addTabs(indent); @@ -724,8 +721,9 @@ protected void write(Element element, int indent) throws IOException { case Element.PARAGRAPH: { Paragraph paragraph = (Paragraph) element; styleAttributes = new Properties(); - if (paragraph.hasLeading()) + if (paragraph.hasLeading()) { styleAttributes.setProperty(Markup.CSS_KEY_LINEHEIGHT, paragraph.getTotalLeading() + "pt"); + } // start tag addTabs(indent); writeStart(HtmlTags.DIV); @@ -780,8 +778,9 @@ protected void write(Element element, int indent) throws IOException { case Element.LISTITEM: { ListItem listItem = (ListItem) element; styleAttributes = new Properties(); - if (listItem.hasLeading()) + if (listItem.hasLeading()) { styleAttributes.setProperty(Markup.CSS_KEY_LINEHEIGHT, listItem.getTotalLeading() + "pt"); + } // start tag addTabs(indent); @@ -991,8 +990,9 @@ protected void writeSection(Section section, int indent) throws IOException { depth = 5; } Properties styleAttributes = new Properties(); - if (section.getTitle().hasLeading()) + if (section.getTitle().hasLeading()) { styleAttributes.setProperty(Markup.CSS_KEY_LINEHEIGHT, section.getTitle().getTotalLeading() + "pt"); + } // start tag addTabs(indent); writeStart(HtmlTags.H[depth]); @@ -1054,13 +1054,15 @@ protected void write(Font font, Properties styleAttributes) throws IOException { if (bf != null) { String ps = bf.getPostscriptFontName().toLowerCase(); if (ps.contains("bold")) { - if (fontstyle == Font.UNDEFINED) + if (fontstyle == Font.UNDEFINED) { fontstyle = 0; + } fontstyle |= Font.BOLD; } if (ps.contains("italic") || ps.contains("oblique")) { - if (fontstyle == Font.UNDEFINED) + if (fontstyle == Font.UNDEFINED) { fontstyle = 0; + } fontstyle |= Font.ITALIC; } } diff --git a/openpdf/src/main/java/com/lowagie/text/html/Markup.java b/openpdf/src/main/java/com/lowagie/text/html/Markup.java index eca8bdee8..04f6fa918 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/Markup.java +++ b/openpdf/src/main/java/com/lowagie/text/html/Markup.java @@ -305,7 +305,9 @@ public class Markup { // CSS values - /** the CSS tag for background style */ + /** + * the CSS tag for background style + */ public static final String CSS_KEY_BG = "background"; /** @@ -621,7 +623,7 @@ public static Properties parseAttributes(String string) { * @return the String stripped of its comment section */ public static String removeComment(String string, String startComment, - String endComment) { + String endComment) { StringBuilder result = new StringBuilder(); int pos = 0; int end = endComment.length(); diff --git a/openpdf/src/main/java/com/lowagie/text/html/SAXmyHtmlHandler.java b/openpdf/src/main/java/com/lowagie/text/html/SAXmyHtmlHandler.java index b5e6cbb4b..d33c93e94 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/SAXmyHtmlHandler.java +++ b/openpdf/src/main/java/com/lowagie/text/html/SAXmyHtmlHandler.java @@ -49,14 +49,13 @@ package com.lowagie.text.html; -import java.util.Properties; - import com.lowagie.text.DocListener; import com.lowagie.text.DocumentException; import com.lowagie.text.ElementTags; import com.lowagie.text.ExceptionConverter; import com.lowagie.text.pdf.BaseFont; import com.lowagie.text.xml.SAXiTextHandler; +import java.util.Properties; import org.xml.sax.Attributes; /** @@ -77,8 +76,8 @@ public class SAXmyHtmlHandler extends SAXiTextHandler // SAXmyHandler private boolean tableBorder = false; /** - * Constructs a new SAXiTextHandler that will translate all the events - * triggered by the parser to actions on the Document-object. + * Constructs a new SAXiTextHandler that will translate all the events triggered by the parser to actions on the + * Document-object. * * @param document this is the document on which events must be triggered */ @@ -87,8 +86,8 @@ public SAXmyHtmlHandler(DocListener document) { } /** - * Constructs a new SAXiTextHandler that will translate all the events - * triggered by the parser to actions on the Document-object. + * Constructs a new SAXiTextHandler that will translate all the events triggered by the parser to actions on the + * Document-object. * * @param document this is the document on which events must be triggered * @param htmlTags a tagmap translating HTML tags to iText tags @@ -102,11 +101,11 @@ public SAXmyHtmlHandler(DocListener document, HtmlTagMap htmlTags, BaseFont bf) } /** - * Constructs a new SAXiTextHandler that will translate all the events - * triggered by the parser to actions on the Document-object. + * Constructs a new SAXiTextHandler that will translate all the events triggered by the parser to actions on the + * Document-object. * * @param document this is the document on which events must be triggered - * @param bf the base class for the supported fonts + * @param bf the base class for the supported fonts */ public SAXmyHtmlHandler(DocListener document, BaseFont bf) { this(document, new HtmlTagMap(), bf); @@ -116,8 +115,8 @@ public SAXmyHtmlHandler(DocListener document, BaseFont bf) { * This method gets called when a start tag is encountered. * * @param uri the Uniform Resource Identifier - * @param localName the local name (without prefix), or the empty string if - * Namespace processing is not being performed. + * @param localName the local name (without prefix), or the empty string if Namespace processing is not being + * performed. * @param name the name of the tag that is encountered * @param attrs the list of attributes */ @@ -145,10 +144,11 @@ public void startElement(String uri, String localName, String name, Attributes a if (attrs != null) { for (int i = 0; i < attrs.getLength(); i++) { String attribute = attrs.getQName(i); - if (attribute.equalsIgnoreCase(HtmlTags.CONTENT)) + if (attribute.equalsIgnoreCase(HtmlTags.CONTENT)) { content = attrs.getValue(i); - else if (attribute.equalsIgnoreCase(HtmlTags.NAME)) + } else if (attribute.equalsIgnoreCase(HtmlTags.NAME)) { meta = attrs.getValue(i); + } } } if (meta != null && content != null) { @@ -211,8 +211,8 @@ else if (attribute.equalsIgnoreCase(HtmlTags.NAME)) * This method gets called when an end tag is encountered. * * @param uri the Uniform Resource Identifier - * @param localName the local name (without prefix), or the empty string if - * Namespace processing is not being performed. + * @param localName the local name (without prefix), or the empty string if Namespace processing is not being + * performed. * @param name the name of the tag that ends */ @Override diff --git a/openpdf/src/main/java/com/lowagie/text/html/WebColors.java b/openpdf/src/main/java/com/lowagie/text/html/WebColors.java index 614cd3936..8d0aee6ce 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/WebColors.java +++ b/openpdf/src/main/java/com/lowagie/text/html/WebColors.java @@ -49,192 +49,190 @@ package com.lowagie.text.html; +import com.lowagie.text.error_messages.MessageLocalization; import java.awt.Color; import java.util.HashMap; import java.util.Locale; import java.util.StringTokenizer; -import com.lowagie.text.error_messages.MessageLocalization; /** - * This class is a HashMap that contains the names of colors as a key and the - * corresponding Color as value. (Source: Wikipedia - * http://en.wikipedia.org/wiki/Web_colors ) - * - * CSS4 Implementation based on: - * https://developer.mozilla.org/en-US/docs/Web/CSS/color_value - * + * This class is a HashMap that contains the names of colors as a key and the corresponding Color as value. (Source: + * Wikipedia http://en.wikipedia.org/wiki/Web_colors ) + *

    + * CSS4 Implementation based on: https://developer.mozilla.org/en-US/docs/Web/CSS/color_value + * * @author blowagie */ public class WebColors extends HashMap { - - private static final long serialVersionUID = 3542523100813372896L; - /** HashMap containing all the names and corresponding color values. */ + + /** + * HashMap containing all the names and corresponding color values. + */ public static final WebColors NAMES = new WebColors(); + private static final long serialVersionUID = 3542523100813372896L; + static { - NAMES.put("aliceblue", new int[] { 0xf0, 0xf8, 0xff, 0xff }); - NAMES.put("antiquewhite", new int[] { 0xfa, 0xeb, 0xd7, 0xff }); - NAMES.put("aqua", new int[] { 0x00, 0xff, 0xff, 0xff }); - NAMES.put("aquamarine", new int[] { 0x7f, 0xff, 0xd4, 0xff }); - NAMES.put("azure", new int[] { 0xf0, 0xff, 0xff, 0xff }); - NAMES.put("beige", new int[] { 0xf5, 0xf5, 0xdc, 0xff }); - NAMES.put("bisque", new int[] { 0xff, 0xe4, 0xc4, 0xff }); - NAMES.put("black", new int[] { 0x00, 0x00, 0x00, 0xff }); - NAMES.put("blanchedalmond", new int[] { 0xff, 0xeb, 0xcd, 0xff }); - NAMES.put("blue", new int[] { 0x00, 0x00, 0xff, 0xff }); - NAMES.put("blueviolet", new int[] { 0x8a, 0x2b, 0xe2, 0xff }); - NAMES.put("brown", new int[] { 0xa5, 0x2a, 0x2a, 0xff }); - NAMES.put("burlywood", new int[] { 0xde, 0xb8, 0x87, 0xff }); - NAMES.put("cadetblue", new int[] { 0x5f, 0x9e, 0xa0, 0xff }); - NAMES.put("chartreuse", new int[] { 0x7f, 0xff, 0x00, 0xff }); - NAMES.put("chocolate", new int[] { 0xd2, 0x69, 0x1e, 0xff }); - NAMES.put("coral", new int[] { 0xff, 0x7f, 0x50, 0xff }); - NAMES.put("cornflowerblue", new int[] { 0x64, 0x95, 0xed, 0xff }); - NAMES.put("cornsilk", new int[] { 0xff, 0xf8, 0xdc, 0xff }); - NAMES.put("crimson", new int[] { 0xdc, 0x14, 0x3c, 0xff }); - NAMES.put("cyan", new int[] { 0x00, 0xff, 0xff, 0xff }); - NAMES.put("darkblue", new int[] { 0x00, 0x00, 0x8b, 0xff }); - NAMES.put("darkcyan", new int[] { 0x00, 0x8b, 0x8b, 0xff }); - NAMES.put("darkgoldenrod", new int[] { 0xb8, 0x86, 0x0b, 0xff }); - NAMES.put("darkgray", new int[] { 0xa9, 0xa9, 0xa9, 0xff }); - NAMES.put("darkgreen", new int[] { 0x00, 0x64, 0x00, 0xff }); - NAMES.put("darkkhaki", new int[] { 0xbd, 0xb7, 0x6b, 0xff }); - NAMES.put("darkmagenta", new int[] { 0x8b, 0x00, 0x8b, 0xff }); - NAMES.put("darkolivegreen", new int[] { 0x55, 0x6b, 0x2f, 0xff }); - NAMES.put("darkorange", new int[] { 0xff, 0x8c, 0x00, 0xff }); - NAMES.put("darkorchid", new int[] { 0x99, 0x32, 0xcc, 0xff }); - NAMES.put("darkred", new int[] { 0x8b, 0x00, 0x00, 0xff }); - NAMES.put("darksalmon", new int[] { 0xe9, 0x96, 0x7a, 0xff }); - NAMES.put("darkseagreen", new int[] { 0x8f, 0xbc, 0x8f, 0xff }); - NAMES.put("darkslateblue", new int[] { 0x48, 0x3d, 0x8b, 0xff }); - NAMES.put("darkslategray", new int[] { 0x2f, 0x4f, 0x4f, 0xff }); - NAMES.put("darkslategrey", new int[] { 0x2f, 0x4f, 0x4f, 0xff }); - NAMES.put("darkturquoise", new int[] { 0x00, 0xce, 0xd1, 0xff }); - NAMES.put("darkviolet", new int[] { 0x94, 0x00, 0xd3, 0xff }); - NAMES.put("deeppink", new int[] { 0xff, 0x14, 0x93, 0xff }); - NAMES.put("deepskyblue", new int[] { 0x00, 0xbf, 0xff, 0xff }); - NAMES.put("dimgray", new int[] { 0x69, 0x69, 0x69, 0xff }); - NAMES.put("dimgrey", new int[] { 0x69, 0x69, 0x69, 0xff }); - NAMES.put("dodgerblue", new int[] { 0x1e, 0x90, 0xff, 0xff }); - NAMES.put("firebrick", new int[] { 0xb2, 0x22, 0x22, 0xff }); - NAMES.put("floralwhite", new int[] { 0xff, 0xfa, 0xf0, 0xff }); - NAMES.put("forestgreen", new int[] { 0x22, 0x8b, 0x22, 0xff }); - NAMES.put("fuchsia", new int[] { 0xff, 0x00, 0xff, 0xff }); - NAMES.put("gainsboro", new int[] { 0xdc, 0xdc, 0xdc, 0xff }); - NAMES.put("ghostwhite", new int[] { 0xf8, 0xf8, 0xff, 0xff }); - NAMES.put("gold", new int[] { 0xff, 0xd7, 0x00, 0xff }); - NAMES.put("goldenrod", new int[] { 0xda, 0xa5, 0x20, 0xff }); - NAMES.put("gray", new int[] { 0x80, 0x80, 0x80, 0xff }); - NAMES.put("green", new int[] { 0x00, 0x80, 0x00, 0xff }); - NAMES.put("greenyellow", new int[] { 0xad, 0xff, 0x2f, 0xff }); - NAMES.put("honeydew", new int[] { 0xf0, 0xff, 0xf0, 0xff }); - NAMES.put("hotpink", new int[] { 0xff, 0x69, 0xb4, 0xff }); - NAMES.put("indianred", new int[] { 0xcd, 0x5c, 0x5c, 0xff }); - NAMES.put("indigo", new int[] { 0x4b, 0x00, 0x82, 0xff }); - NAMES.put("ivory", new int[] { 0xff, 0xff, 0xf0, 0xff }); - NAMES.put("khaki", new int[] { 0xf0, 0xe6, 0x8c, 0xff }); - NAMES.put("lavender", new int[] { 0xe6, 0xe6, 0xfa, 0xff }); - NAMES.put("lavenderblush", new int[] { 0xff, 0xf0, 0xf5, 0xff }); - NAMES.put("lawngreen", new int[] { 0x7c, 0xfc, 0x00, 0xff }); - NAMES.put("lemonchiffon", new int[] { 0xff, 0xfa, 0xcd, 0xff }); - NAMES.put("lightblue", new int[] { 0xad, 0xd8, 0xe6, 0xff }); - NAMES.put("lightcoral", new int[] { 0xf0, 0x80, 0x80, 0xff }); - NAMES.put("lightcyan", new int[] { 0xe0, 0xff, 0xff, 0xff }); - NAMES.put("lightgoldenrodyellow", new int[] { 0xfa, 0xfa, 0xd2, 0xff }); - NAMES.put("lightgray", new int[] { 0xd3, 0xd3, 0xd3, 0xff }); - NAMES.put("lightgreen", new int[] { 0x90, 0xee, 0x90, 0xff }); - NAMES.put("lightgrey", new int[] { 0xd3, 0xd3, 0xd3, 0xff }); - NAMES.put("lightpink", new int[] { 0xff, 0xb6, 0xc1, 0xff }); - NAMES.put("lightsalmon", new int[] { 0xff, 0xa0, 0x7a, 0xff }); - NAMES.put("lightseagreen", new int[] { 0x20, 0xb2, 0xaa, 0xff }); - NAMES.put("lightskyblue", new int[] { 0x87, 0xce, 0xfa, 0xff }); - NAMES.put("lightslategray", new int[] { 0x77, 0x88, 0x99, 0xff }); - NAMES.put("lightslategrey", new int[] { 0x77, 0x88, 0x99, 0xff }); - NAMES.put("lightsteelblue", new int[] { 0xb0, 0xc4, 0xde, 0xff }); - NAMES.put("lightyellow", new int[] { 0xff, 0xff, 0xe0, 0xff }); - NAMES.put("lime", new int[] { 0x00, 0xff, 0x00, 0xff }); - NAMES.put("limegreen", new int[] { 0x32, 0xcd, 0x32, 0xff }); - NAMES.put("linen", new int[] { 0xfa, 0xf0, 0xe6, 0xff }); - NAMES.put("magenta", new int[] { 0xff, 0x00, 0xff, 0xff }); - NAMES.put("maroon", new int[] { 0x80, 0x00, 0x00, 0xff }); - NAMES.put("mediumaquamarine", new int[] { 0x66, 0xcd, 0xaa, 0xff }); - NAMES.put("mediumblue", new int[] { 0x00, 0x00, 0xcd, 0xff }); - NAMES.put("mediumorchid", new int[] { 0xba, 0x55, 0xd3, 0xff }); - NAMES.put("mediumpurple", new int[] { 0x93, 0x70, 0xdb, 0xff }); - NAMES.put("mediumseagreen", new int[] { 0x3c, 0xb3, 0x71, 0xff }); - NAMES.put("mediumslateblue", new int[] { 0x7b, 0x68, 0xee, 0xff }); - NAMES.put("mediumspringgreen", new int[] { 0x00, 0xfa, 0x9a, 0xff }); - NAMES.put("mediumturquoise", new int[] { 0x48, 0xd1, 0xcc, 0xff }); - NAMES.put("mediumvioletred", new int[] { 0xc7, 0x15, 0x85, 0xff }); - NAMES.put("midnightblue", new int[] { 0x19, 0x19, 0x70, 0xff }); - NAMES.put("mintcream", new int[] { 0xf5, 0xff, 0xfa, 0xff }); - NAMES.put("mistyrose", new int[] { 0xff, 0xe4, 0xe1, 0xff }); - NAMES.put("moccasin", new int[] { 0xff, 0xe4, 0xb5, 0xff }); - NAMES.put("navajowhite", new int[] { 0xff, 0xde, 0xad, 0xff }); - NAMES.put("navy", new int[] { 0x00, 0x00, 0x80, 0xff }); - NAMES.put("oldlace", new int[] { 0xfd, 0xf5, 0xe6, 0xff }); - NAMES.put("olive", new int[] { 0x80, 0x80, 0x00, 0xff }); - NAMES.put("olivedrab", new int[] { 0x6b, 0x8e, 0x23, 0xff }); - NAMES.put("orange", new int[] { 0xff, 0xa5, 0x00, 0xff }); - NAMES.put("orangered", new int[] { 0xff, 0x45, 0x00, 0xff }); - NAMES.put("orchid", new int[] { 0xda, 0x70, 0xd6, 0xff }); - NAMES.put("palegoldenrod", new int[] { 0xee, 0xe8, 0xaa, 0xff }); - NAMES.put("palegreen", new int[] { 0x98, 0xfb, 0x98, 0xff }); - NAMES.put("paleturquoise", new int[] { 0xaf, 0xee, 0xee, 0xff }); - NAMES.put("palevioletred", new int[] { 0xdb, 0x70, 0x93, 0xff }); - NAMES.put("papayawhip", new int[] { 0xff, 0xef, 0xd5, 0xff }); - NAMES.put("peachpuff", new int[] { 0xff, 0xda, 0xb9, 0xff }); - NAMES.put("peru", new int[] { 0xcd, 0x85, 0x3f, 0xff }); - NAMES.put("pink", new int[] { 0xff, 0xc0, 0xcb, 0xff }); - NAMES.put("plum", new int[] { 0xdd, 0xa0, 0xdd, 0xff }); - NAMES.put("powderblue", new int[] { 0xb0, 0xe0, 0xe6, 0xff }); - NAMES.put("purple", new int[] { 0x80, 0x00, 0x80, 0xff }); - NAMES.put("rebeccapurple", new int[] {0x66, 0x33, 0x99, 0xff }); - NAMES.put("red", new int[] { 0xff, 0x00, 0x00, 0xff }); - NAMES.put("rosybrown", new int[] { 0xbc, 0x8f, 0x8f, 0xff }); - NAMES.put("royalblue", new int[] { 0x41, 0x69, 0xe1, 0xff }); - NAMES.put("saddlebrown", new int[] { 0x8b, 0x45, 0x13, 0xff }); - NAMES.put("salmon", new int[] { 0xfa, 0x80, 0x72, 0xff }); - NAMES.put("sandybrown", new int[] { 0xf4, 0xa4, 0x60, 0xff }); - NAMES.put("seagreen", new int[] { 0x2e, 0x8b, 0x57, 0xff }); - NAMES.put("seashell", new int[] { 0xff, 0xf5, 0xee, 0xff }); - NAMES.put("sienna", new int[] { 0xa0, 0x52, 0x2d, 0xff }); - NAMES.put("silver", new int[] { 0xc0, 0xc0, 0xc0, 0xff }); - NAMES.put("skyblue", new int[] { 0x87, 0xce, 0xeb, 0xff }); - NAMES.put("slateblue", new int[] { 0x6a, 0x5a, 0xcd, 0xff }); - NAMES.put("slategray", new int[] { 0x70, 0x80, 0x90, 0xff }); - NAMES.put("slategrey", new int[] { 0x70, 0x80, 0x90, 0xff }); - NAMES.put("snow", new int[] { 0xff, 0xfa, 0xfa, 0xff }); - NAMES.put("springgreen", new int[] { 0x00, 0xff, 0x7f, 0xff }); - NAMES.put("steelblue", new int[] { 0x46, 0x82, 0xb4, 0xff }); - NAMES.put("tan", new int[] { 0xd2, 0xb4, 0x8c, 0xff }); - NAMES.put("transparent", new int[] { 0x00, 0x00, 0x00, 0x00 }); - NAMES.put("teal", new int[] { 0x00, 0x80, 0x80, 0xff }); - NAMES.put("thistle", new int[] { 0xd8, 0xbf, 0xd8, 0xff }); - NAMES.put("tomato", new int[] { 0xff, 0x63, 0x47, 0xff }); - NAMES.put("turquoise", new int[] { 0x40, 0xe0, 0xd0, 0xff }); - NAMES.put("violet", new int[] { 0xee, 0x82, 0xee, 0xff }); - NAMES.put("wheat", new int[] { 0xf5, 0xde, 0xb3, 0xff }); - NAMES.put("white", new int[] { 0xff, 0xff, 0xff, 0xff }); - NAMES.put("whitesmoke", new int[] { 0xf5, 0xf5, 0xf5, 0xff }); - NAMES.put("yellow", new int[] { 0xff, 0xff, 0x00, 0xff }); - NAMES.put("yellowgreen", new int[] { 0x9, 0xacd, 0x32, 0xff }); + NAMES.put("aliceblue", new int[]{0xf0, 0xf8, 0xff, 0xff}); + NAMES.put("antiquewhite", new int[]{0xfa, 0xeb, 0xd7, 0xff}); + NAMES.put("aqua", new int[]{0x00, 0xff, 0xff, 0xff}); + NAMES.put("aquamarine", new int[]{0x7f, 0xff, 0xd4, 0xff}); + NAMES.put("azure", new int[]{0xf0, 0xff, 0xff, 0xff}); + NAMES.put("beige", new int[]{0xf5, 0xf5, 0xdc, 0xff}); + NAMES.put("bisque", new int[]{0xff, 0xe4, 0xc4, 0xff}); + NAMES.put("black", new int[]{0x00, 0x00, 0x00, 0xff}); + NAMES.put("blanchedalmond", new int[]{0xff, 0xeb, 0xcd, 0xff}); + NAMES.put("blue", new int[]{0x00, 0x00, 0xff, 0xff}); + NAMES.put("blueviolet", new int[]{0x8a, 0x2b, 0xe2, 0xff}); + NAMES.put("brown", new int[]{0xa5, 0x2a, 0x2a, 0xff}); + NAMES.put("burlywood", new int[]{0xde, 0xb8, 0x87, 0xff}); + NAMES.put("cadetblue", new int[]{0x5f, 0x9e, 0xa0, 0xff}); + NAMES.put("chartreuse", new int[]{0x7f, 0xff, 0x00, 0xff}); + NAMES.put("chocolate", new int[]{0xd2, 0x69, 0x1e, 0xff}); + NAMES.put("coral", new int[]{0xff, 0x7f, 0x50, 0xff}); + NAMES.put("cornflowerblue", new int[]{0x64, 0x95, 0xed, 0xff}); + NAMES.put("cornsilk", new int[]{0xff, 0xf8, 0xdc, 0xff}); + NAMES.put("crimson", new int[]{0xdc, 0x14, 0x3c, 0xff}); + NAMES.put("cyan", new int[]{0x00, 0xff, 0xff, 0xff}); + NAMES.put("darkblue", new int[]{0x00, 0x00, 0x8b, 0xff}); + NAMES.put("darkcyan", new int[]{0x00, 0x8b, 0x8b, 0xff}); + NAMES.put("darkgoldenrod", new int[]{0xb8, 0x86, 0x0b, 0xff}); + NAMES.put("darkgray", new int[]{0xa9, 0xa9, 0xa9, 0xff}); + NAMES.put("darkgreen", new int[]{0x00, 0x64, 0x00, 0xff}); + NAMES.put("darkkhaki", new int[]{0xbd, 0xb7, 0x6b, 0xff}); + NAMES.put("darkmagenta", new int[]{0x8b, 0x00, 0x8b, 0xff}); + NAMES.put("darkolivegreen", new int[]{0x55, 0x6b, 0x2f, 0xff}); + NAMES.put("darkorange", new int[]{0xff, 0x8c, 0x00, 0xff}); + NAMES.put("darkorchid", new int[]{0x99, 0x32, 0xcc, 0xff}); + NAMES.put("darkred", new int[]{0x8b, 0x00, 0x00, 0xff}); + NAMES.put("darksalmon", new int[]{0xe9, 0x96, 0x7a, 0xff}); + NAMES.put("darkseagreen", new int[]{0x8f, 0xbc, 0x8f, 0xff}); + NAMES.put("darkslateblue", new int[]{0x48, 0x3d, 0x8b, 0xff}); + NAMES.put("darkslategray", new int[]{0x2f, 0x4f, 0x4f, 0xff}); + NAMES.put("darkslategrey", new int[]{0x2f, 0x4f, 0x4f, 0xff}); + NAMES.put("darkturquoise", new int[]{0x00, 0xce, 0xd1, 0xff}); + NAMES.put("darkviolet", new int[]{0x94, 0x00, 0xd3, 0xff}); + NAMES.put("deeppink", new int[]{0xff, 0x14, 0x93, 0xff}); + NAMES.put("deepskyblue", new int[]{0x00, 0xbf, 0xff, 0xff}); + NAMES.put("dimgray", new int[]{0x69, 0x69, 0x69, 0xff}); + NAMES.put("dimgrey", new int[]{0x69, 0x69, 0x69, 0xff}); + NAMES.put("dodgerblue", new int[]{0x1e, 0x90, 0xff, 0xff}); + NAMES.put("firebrick", new int[]{0xb2, 0x22, 0x22, 0xff}); + NAMES.put("floralwhite", new int[]{0xff, 0xfa, 0xf0, 0xff}); + NAMES.put("forestgreen", new int[]{0x22, 0x8b, 0x22, 0xff}); + NAMES.put("fuchsia", new int[]{0xff, 0x00, 0xff, 0xff}); + NAMES.put("gainsboro", new int[]{0xdc, 0xdc, 0xdc, 0xff}); + NAMES.put("ghostwhite", new int[]{0xf8, 0xf8, 0xff, 0xff}); + NAMES.put("gold", new int[]{0xff, 0xd7, 0x00, 0xff}); + NAMES.put("goldenrod", new int[]{0xda, 0xa5, 0x20, 0xff}); + NAMES.put("gray", new int[]{0x80, 0x80, 0x80, 0xff}); + NAMES.put("green", new int[]{0x00, 0x80, 0x00, 0xff}); + NAMES.put("greenyellow", new int[]{0xad, 0xff, 0x2f, 0xff}); + NAMES.put("honeydew", new int[]{0xf0, 0xff, 0xf0, 0xff}); + NAMES.put("hotpink", new int[]{0xff, 0x69, 0xb4, 0xff}); + NAMES.put("indianred", new int[]{0xcd, 0x5c, 0x5c, 0xff}); + NAMES.put("indigo", new int[]{0x4b, 0x00, 0x82, 0xff}); + NAMES.put("ivory", new int[]{0xff, 0xff, 0xf0, 0xff}); + NAMES.put("khaki", new int[]{0xf0, 0xe6, 0x8c, 0xff}); + NAMES.put("lavender", new int[]{0xe6, 0xe6, 0xfa, 0xff}); + NAMES.put("lavenderblush", new int[]{0xff, 0xf0, 0xf5, 0xff}); + NAMES.put("lawngreen", new int[]{0x7c, 0xfc, 0x00, 0xff}); + NAMES.put("lemonchiffon", new int[]{0xff, 0xfa, 0xcd, 0xff}); + NAMES.put("lightblue", new int[]{0xad, 0xd8, 0xe6, 0xff}); + NAMES.put("lightcoral", new int[]{0xf0, 0x80, 0x80, 0xff}); + NAMES.put("lightcyan", new int[]{0xe0, 0xff, 0xff, 0xff}); + NAMES.put("lightgoldenrodyellow", new int[]{0xfa, 0xfa, 0xd2, 0xff}); + NAMES.put("lightgray", new int[]{0xd3, 0xd3, 0xd3, 0xff}); + NAMES.put("lightgreen", new int[]{0x90, 0xee, 0x90, 0xff}); + NAMES.put("lightgrey", new int[]{0xd3, 0xd3, 0xd3, 0xff}); + NAMES.put("lightpink", new int[]{0xff, 0xb6, 0xc1, 0xff}); + NAMES.put("lightsalmon", new int[]{0xff, 0xa0, 0x7a, 0xff}); + NAMES.put("lightseagreen", new int[]{0x20, 0xb2, 0xaa, 0xff}); + NAMES.put("lightskyblue", new int[]{0x87, 0xce, 0xfa, 0xff}); + NAMES.put("lightslategray", new int[]{0x77, 0x88, 0x99, 0xff}); + NAMES.put("lightslategrey", new int[]{0x77, 0x88, 0x99, 0xff}); + NAMES.put("lightsteelblue", new int[]{0xb0, 0xc4, 0xde, 0xff}); + NAMES.put("lightyellow", new int[]{0xff, 0xff, 0xe0, 0xff}); + NAMES.put("lime", new int[]{0x00, 0xff, 0x00, 0xff}); + NAMES.put("limegreen", new int[]{0x32, 0xcd, 0x32, 0xff}); + NAMES.put("linen", new int[]{0xfa, 0xf0, 0xe6, 0xff}); + NAMES.put("magenta", new int[]{0xff, 0x00, 0xff, 0xff}); + NAMES.put("maroon", new int[]{0x80, 0x00, 0x00, 0xff}); + NAMES.put("mediumaquamarine", new int[]{0x66, 0xcd, 0xaa, 0xff}); + NAMES.put("mediumblue", new int[]{0x00, 0x00, 0xcd, 0xff}); + NAMES.put("mediumorchid", new int[]{0xba, 0x55, 0xd3, 0xff}); + NAMES.put("mediumpurple", new int[]{0x93, 0x70, 0xdb, 0xff}); + NAMES.put("mediumseagreen", new int[]{0x3c, 0xb3, 0x71, 0xff}); + NAMES.put("mediumslateblue", new int[]{0x7b, 0x68, 0xee, 0xff}); + NAMES.put("mediumspringgreen", new int[]{0x00, 0xfa, 0x9a, 0xff}); + NAMES.put("mediumturquoise", new int[]{0x48, 0xd1, 0xcc, 0xff}); + NAMES.put("mediumvioletred", new int[]{0xc7, 0x15, 0x85, 0xff}); + NAMES.put("midnightblue", new int[]{0x19, 0x19, 0x70, 0xff}); + NAMES.put("mintcream", new int[]{0xf5, 0xff, 0xfa, 0xff}); + NAMES.put("mistyrose", new int[]{0xff, 0xe4, 0xe1, 0xff}); + NAMES.put("moccasin", new int[]{0xff, 0xe4, 0xb5, 0xff}); + NAMES.put("navajowhite", new int[]{0xff, 0xde, 0xad, 0xff}); + NAMES.put("navy", new int[]{0x00, 0x00, 0x80, 0xff}); + NAMES.put("oldlace", new int[]{0xfd, 0xf5, 0xe6, 0xff}); + NAMES.put("olive", new int[]{0x80, 0x80, 0x00, 0xff}); + NAMES.put("olivedrab", new int[]{0x6b, 0x8e, 0x23, 0xff}); + NAMES.put("orange", new int[]{0xff, 0xa5, 0x00, 0xff}); + NAMES.put("orangered", new int[]{0xff, 0x45, 0x00, 0xff}); + NAMES.put("orchid", new int[]{0xda, 0x70, 0xd6, 0xff}); + NAMES.put("palegoldenrod", new int[]{0xee, 0xe8, 0xaa, 0xff}); + NAMES.put("palegreen", new int[]{0x98, 0xfb, 0x98, 0xff}); + NAMES.put("paleturquoise", new int[]{0xaf, 0xee, 0xee, 0xff}); + NAMES.put("palevioletred", new int[]{0xdb, 0x70, 0x93, 0xff}); + NAMES.put("papayawhip", new int[]{0xff, 0xef, 0xd5, 0xff}); + NAMES.put("peachpuff", new int[]{0xff, 0xda, 0xb9, 0xff}); + NAMES.put("peru", new int[]{0xcd, 0x85, 0x3f, 0xff}); + NAMES.put("pink", new int[]{0xff, 0xc0, 0xcb, 0xff}); + NAMES.put("plum", new int[]{0xdd, 0xa0, 0xdd, 0xff}); + NAMES.put("powderblue", new int[]{0xb0, 0xe0, 0xe6, 0xff}); + NAMES.put("purple", new int[]{0x80, 0x00, 0x80, 0xff}); + NAMES.put("rebeccapurple", new int[]{0x66, 0x33, 0x99, 0xff}); + NAMES.put("red", new int[]{0xff, 0x00, 0x00, 0xff}); + NAMES.put("rosybrown", new int[]{0xbc, 0x8f, 0x8f, 0xff}); + NAMES.put("royalblue", new int[]{0x41, 0x69, 0xe1, 0xff}); + NAMES.put("saddlebrown", new int[]{0x8b, 0x45, 0x13, 0xff}); + NAMES.put("salmon", new int[]{0xfa, 0x80, 0x72, 0xff}); + NAMES.put("sandybrown", new int[]{0xf4, 0xa4, 0x60, 0xff}); + NAMES.put("seagreen", new int[]{0x2e, 0x8b, 0x57, 0xff}); + NAMES.put("seashell", new int[]{0xff, 0xf5, 0xee, 0xff}); + NAMES.put("sienna", new int[]{0xa0, 0x52, 0x2d, 0xff}); + NAMES.put("silver", new int[]{0xc0, 0xc0, 0xc0, 0xff}); + NAMES.put("skyblue", new int[]{0x87, 0xce, 0xeb, 0xff}); + NAMES.put("slateblue", new int[]{0x6a, 0x5a, 0xcd, 0xff}); + NAMES.put("slategray", new int[]{0x70, 0x80, 0x90, 0xff}); + NAMES.put("slategrey", new int[]{0x70, 0x80, 0x90, 0xff}); + NAMES.put("snow", new int[]{0xff, 0xfa, 0xfa, 0xff}); + NAMES.put("springgreen", new int[]{0x00, 0xff, 0x7f, 0xff}); + NAMES.put("steelblue", new int[]{0x46, 0x82, 0xb4, 0xff}); + NAMES.put("tan", new int[]{0xd2, 0xb4, 0x8c, 0xff}); + NAMES.put("transparent", new int[]{0x00, 0x00, 0x00, 0x00}); + NAMES.put("teal", new int[]{0x00, 0x80, 0x80, 0xff}); + NAMES.put("thistle", new int[]{0xd8, 0xbf, 0xd8, 0xff}); + NAMES.put("tomato", new int[]{0xff, 0x63, 0x47, 0xff}); + NAMES.put("turquoise", new int[]{0x40, 0xe0, 0xd0, 0xff}); + NAMES.put("violet", new int[]{0xee, 0x82, 0xee, 0xff}); + NAMES.put("wheat", new int[]{0xf5, 0xde, 0xb3, 0xff}); + NAMES.put("white", new int[]{0xff, 0xff, 0xff, 0xff}); + NAMES.put("whitesmoke", new int[]{0xf5, 0xf5, 0xf5, 0xff}); + NAMES.put("yellow", new int[]{0xff, 0xff, 0x00, 0xff}); + NAMES.put("yellowgreen", new int[]{0x9, 0xacd, 0x32, 0xff}); } /** * Gives you a Color based on a name. - * - * @param name the css color name to convert. - * You can use CSS4 color values - *

      - *
    • a name such as black, violet, cornflowerblue
      • - *
    • #RGB, #RRGGBB, #RGBA or #RRGGBBAA
      • - *
    • rgb(R, G, B) rgb(R,G,B,A) or rgba(R,G,B) or rgba(R,G,B,A)
      • - *
    • hsl(H, S, L) hsl(H,S,L,A) or hslq(H,S,L) or hsla(H,S,L,A)
      • - *
    - * + * + * @param name the css color name to convert. You can use CSS4 color values + *
      + *
    • a name such as black, violet, cornflowerblue
      • + *
    • #RGB, #RRGGBB, #RGBA or #RRGGBBAA
      • + *
    • rgb(R, G, B) rgb(R,G,B,A) or rgba(R,G,B) or rgba(R,G,B,A)
      • + *
    • hsl(H, S, L) hsl(H,S,L,A) or hslq(H,S,L) or hsla(H,S,L,A)
      • + *
    * @return the corresponding Color object - * @throws IllegalArgumentException - * if the String isn't a know representation of a color. + * @throws IllegalArgumentException if the String isn't a know representation of a color. */ public static Color getRGBColor(String name) throws IllegalArgumentException { if (name == null) { @@ -244,27 +242,24 @@ public static Color getRGBColor(String name) throws IllegalArgumentException { if ("".equals(colorName)) { throw new IllegalArgumentException("name must not be empty"); } - - + if (colorName.startsWith("#")) { return getRGBFromHex(colorName); - } - else if (name.startsWith("rgb")) { + } else if (name.startsWith("rgb")) { return getRGBFromRGB(colorName); - } - else if (name.startsWith("hsl")) { + } else if (name.startsWith("hsl")) { return getRGBFromHSL(colorName); - } - else { + } else { return getRGBFromName(colorName); } } private static Color getRGBFromHex(String colorName) { - + int length = colorName.length(); if (!colorName.matches("^#[a-f0-9]{3,8}$") || !(length == 4 || length == 5 || length == 7 || length == 9)) { - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("unknown.color.format.must.be.rgb.or.rrggbb")); + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("unknown.color.format.must.be.rgb.or.rrggbb")); } String rgb = colorName.substring(1); if (length == 4 || length == 5) { @@ -274,8 +269,8 @@ private static Color getRGBFromHex(String colorName) { } rgb = sb.toString(); } - - int[] c = { 0, 0, 0, 0xff }; + + int[] c = {0, 0, 0, 0xff}; c[0] = Integer.parseInt(rgb.substring(0, 2), 16); c[1] = Integer.parseInt(rgb.substring(2, 4), 16); c[2] = Integer.parseInt(rgb.substring(4, 6), 16); @@ -285,32 +280,29 @@ private static Color getRGBFromHex(String colorName) { } return new Color(c[0], c[1], c[2], c[3]); } - + private static Color getRGBFromRGB(String colorName) { - int[] c = { 0, 0, 0, 0xff }; - + int[] c = {0, 0, 0, 0xff}; + String rgb = ""; if (colorName.startsWith("rgba")) { rgb = colorName.substring(4); - } - else { + } else { rgb = colorName.substring(3); } - + StringTokenizer tok = new StringTokenizer(rgb, "()/, \t\r\n\f"); - + for (int k = 0; k < 3; k++) { String v = tok.nextToken(); if (v.endsWith("%")) { c[k] = getFromPercent(v, 255); - } - else { + } else { c[k] = (int) Double.parseDouble(v); } if (c[k] < 0) { c[k] = 0; - } - else if (c[k] > 255) { + } else if (c[k] > 255) { c[k] = 255; } } @@ -319,14 +311,13 @@ else if (c[k] > 255) { String v = tok.nextToken(); if (v.endsWith("%")) { c[3] = getFromPercent(v, 255); - } - else { - c[3] = (int) (Double.parseDouble(v) * 255 ); + } else { + c[3] = (int) (Double.parseDouble(v) * 255); } } return new Color(c[0], c[1], c[2], c[3]); } - + private static int getFromPercent(String v, int max) { double percent = Double.parseDouble(v.substring(0, v.length() - 1)); double result = percent * max / 100; @@ -347,8 +338,7 @@ private static Color getRGBFromHSL(String colorName) { String hsl = ""; if (colorName.startsWith("hsla")) { hsl = colorName.substring(4); - } - else { + } else { hsl = colorName.substring(3); } StringTokenizer tok = new StringTokenizer(hsl, "()/, \t\r\n\f"); @@ -368,7 +358,8 @@ private static Color getRGBFromHSL(String colorName) { if (tok.hasMoreElements()) { alpha = tok.nextToken(); } - if (hue.isEmpty() || saturation.isEmpty() || lightness.isEmpty() || !saturation.endsWith("%") || !lightness.endsWith("%")) { + if (hue.isEmpty() || saturation.isEmpty() || lightness.isEmpty() || !saturation.endsWith("%") + || !lightness.endsWith("%")) { throw new IllegalArgumentException("Not a valid hsl color:" + colorName); } float hueDegrees = Double.valueOf(toDegrees(hue)).floatValue(); @@ -377,17 +368,16 @@ private static Color getRGBFromHSL(String colorName) { int alp = 255; if (alpha.endsWith("%")) { alp = getFromPercent(alpha, 255); - } - else { - alp = (int) (Double.parseDouble(alpha) * 255 ); + } else { + alp = (int) (Double.parseDouble(alpha) * 255); } int[] rgb = hsl2rgb(hueDegrees, sat / 100.0f, light / 100.0f); - + return new Color(rgb[0], rgb[1], rgb[2], alp); - - + + } - + // H (hue) is an of the color circle given in degs, rads, grads, or turns private static double toDegrees(String hueString) { if (hueString.endsWith("deg")) { @@ -398,7 +388,7 @@ private static double toDegrees(String hueString) { double radians = Double.parseDouble(hueString.substring(0, hueString.length() - 3)); double degrees = Math.toDegrees(radians); return degrees % 360; - + } if (hueString.endsWith("grad")) { double gradians = Double.parseDouble(hueString.substring(0, hueString.length() - 4)); @@ -417,9 +407,10 @@ private static double toDegrees(String hueString) { /** * Convert from hsl to rgb - * @param hue Hue angle in degrees + * + * @param hue Hue angle in degrees * @param saturation saturation (0 to 1) - * @param lightness lightness (0 to 1) + * @param lightness lightness (0 to 1) * @return int[] rgb */ private static int[] hsl2rgb(float hue, float saturation, float lightness) { @@ -432,7 +423,8 @@ private static int[] hsl2rgb(float hue, float saturation, float lightness) { } else { float h = (float) hue / 360; - float q = (lightness < 0.5) ? (lightness * (1 + saturation)) : ((lightness + saturation) - (lightness * saturation)); + float q = (lightness < 0.5) ? (lightness * (1 + saturation)) + : ((lightness + saturation) - (lightness * saturation)); float p = 2 * lightness - q; r = (256 * hue2rgb(p, q, h + (1.0f / 3))); @@ -453,13 +445,13 @@ private static float hue2rgb(float p, float q, float t) { if (t > 1f) { t -= 1; } - if (t < 1f/6f) { + if (t < 1f / 6f) { return (p + (q - p) * 6f * t); } - if (t < 1f/2f) { + if (t < 1f / 2f) { return q; } - if (t < 2f/3f) { + if (t < 2f / 3f) { return (p + (q - p) * ((2.0f / 3f) - t) * 6); } return p; diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ALink.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ALink.java index f5095aa89..3ff0ea91f 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ALink.java +++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ALink.java @@ -50,9 +50,9 @@ import com.lowagie.text.Paragraph; /** - * - * @author psoares + * @author psoares */ public interface ALink { + boolean process(Paragraph current, ChainedProperties cprops); } diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ChainedProperties.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ChainedProperties.java index e09d07838..20067ac29 100755 --- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ChainedProperties.java +++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ChainedProperties.java @@ -79,8 +79,8 @@ public String getProperty(String key) { * Try find property by its name * * @param key property name - * @return {@link Optional} containing the value or {@link Optional#empty()} if there is no value or - * it equals {@code null} + * @return {@link Optional} containing the value or {@link Optional#empty()} if there is no value or it equals + * {@code null} */ public Optional findProperty(String key) { for (int k = chain.size() - 1; k >= 0; --k) { @@ -109,8 +109,9 @@ public boolean hasProperty(String key) { for (int k = chain.size() - 1; k >= 0; --k) { Object[] obj = (Object[]) chain.get(k); HashMap prop = (HashMap) obj[1]; - if (prop.containsKey(key)) + if (prop.containsKey(key)) { return true; + } } return false; } @@ -144,10 +145,11 @@ public void addToChain(String key, Map prop) { s = 0; } } - if (s < 0) + if (s < 0) { s = 0; - else if (s >= fontSizes.length) + } else if (s >= fontSizes.length) { s = fontSizes.length - 1; + } prop.put(ElementTags.SIZE, Integer.toString(fontSizes[s])); } } diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java index 222d9b777..210939c27 100755 --- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java +++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java @@ -181,8 +181,8 @@ public static HyphenationEvent getHyphenation(HashMap props) { } /** - * Gets a HyphenationEvent based on a String. - * For instance "en_UK,3,2" returns new HyphenationAuto("en", "UK", 3, 2); + * Gets a HyphenationEvent based on a String. For instance "en_UK,3,2" returns new HyphenationAuto("en", "UK", 3, + * 2); * * @param s a String, for instance "en_UK,2,2" * @return a HyphenationEvent @@ -219,11 +219,13 @@ public static HyphenationEvent getHyphenation(String s) { return new HyphenationAuto(lang, country, leftMin, rightMin); } - @Deprecated // this method is nor called anywhere. But it is public so theoretically it could be called by consumers of OpenPdf, but why? + @Deprecated + // this method is nor called anywhere. But it is public so theoretically it could be called by consumers of OpenPdf, but why? public static void insertStyle(Map h) { String style = h.get("style"); - if (style == null) + if (style == null) { return; + } Properties prop = Markup.parseAttributes(style); for (Object o : prop.keySet()) { String key = (String) o; @@ -238,21 +240,24 @@ public static void insertStyle(Map h) { break; case Markup.CSS_KEY_FONTSTYLE: { String ss = prop.getProperty(key).trim().toLowerCase(); - if (ss.equals("italic") || ss.equals("oblique")) + if (ss.equals("italic") || ss.equals("oblique")) { h.put("i", null); + } break; } case Markup.CSS_KEY_FONTWEIGHT: { String ss = prop.getProperty(key).trim().toLowerCase(); if (ss.equals("bold") || ss.equals("700") || ss.equals("800") - || ss.equals("900")) + || ss.equals("900")) { h.put("b", null); + } break; } case Markup.CSS_KEY_TEXTDECORATION: { String ss = prop.getProperty(key).trim().toLowerCase(); - if (ss.equals(Markup.CSS_VALUE_UNDERLINE)) + if (ss.equals(Markup.CSS_VALUE_UNDERLINE)) { h.put("u", null); + } break; } case Markup.CSS_KEY_COLOR: @@ -289,14 +294,15 @@ public static void insertStyle(Map h) { /** * New method contributed by Lubos Strapko * - * @param h a Map + * @param h a Map * @param cprops the ChainedProperties * @since 2.1.3 */ public static void insertStyle(Map h, ChainedProperties cprops) { String style = h.get("style"); - if (style == null) + if (style == null) { return; + } Properties prop = Markup.parseAttributes(style); for (Object o : prop.keySet()) { String key = (String) o; @@ -306,8 +312,9 @@ public static void insertStyle(Map h, ChainedProperties cprops) break; case Markup.CSS_KEY_FONTSIZE: { float actualFontSize = parseLength(cprops.getProperty(ElementTags.SIZE), Markup.DEFAULT_FONT_SIZE); - if (actualFontSize <= 0f) + if (actualFontSize <= 0f) { actualFontSize = Markup.DEFAULT_FONT_SIZE; + } h.put(ElementTags.SIZE, parseLength(prop .getProperty(key), actualFontSize) + "pt"); @@ -315,21 +322,24 @@ public static void insertStyle(Map h, ChainedProperties cprops) } case Markup.CSS_KEY_FONTSTYLE: { String ss = prop.getProperty(key).trim().toLowerCase(); - if (ss.equals("italic") || ss.equals("oblique")) + if (ss.equals("italic") || ss.equals("oblique")) { h.put("i", null); + } break; } case Markup.CSS_KEY_FONTWEIGHT: { String ss = prop.getProperty(key).trim().toLowerCase(); if (ss.equals("bold") || ss.equals("700") || ss.equals("800") - || ss.equals("900")) + || ss.equals("900")) { h.put("b", null); + } break; } case Markup.CSS_KEY_TEXTDECORATION: { String ss = prop.getProperty(key).trim().toLowerCase(); - if (ss.equals(Markup.CSS_VALUE_UNDERLINE)) + if (ss.equals(Markup.CSS_VALUE_UNDERLINE)) { h.put("u", null); + } break; } case Markup.CSS_KEY_BGCOLOR: { @@ -337,7 +347,7 @@ public static void insertStyle(Map h, ChainedProperties cprops) break; } case Markup.CSS_KEY_BG: { - for(String attribute: prop.getProperty(key).split(" ")) { + for (String attribute : prop.getProperty(key).split(" ")) { Color c = Markup.decodeColor(attribute.trim()); if (c != null) { h.put(Markup.CSS_KEY_BGCOLOR, attribute.trim()); @@ -353,8 +363,9 @@ public static void insertStyle(Map h, ChainedProperties cprops) String ss = prop.getProperty(key).trim(); float actualFontSize = parseLength(cprops.getProperty(ElementTags.SIZE), Markup.DEFAULT_FONT_SIZE); - if (actualFontSize <= 0f) + if (actualFontSize <= 0f) { actualFontSize = Markup.DEFAULT_FONT_SIZE; + } float v = parseLength(prop.getProperty(key), actualFontSize); if (ss.endsWith("%")) { h.put("leading", "0," + (v / 100)); @@ -410,23 +421,30 @@ public Font getFont(ChainedProperties props) { StringTokenizer tokenizer = new StringTokenizer(face, ","); while (tokenizer.hasMoreTokens()) { face = tokenizer.nextToken().trim(); - if (face.startsWith("\"")) + if (face.startsWith("\"")) { face = face.substring(1); - if (face.endsWith("\"")) + } + if (face.endsWith("\"")) { face = face.substring(0, face.length() - 1); - if (fontImp.isRegistered(face)) + } + if (fontImp.isRegistered(face)) { break; + } } } int style = 0; - if (props.hasProperty(HtmlTags.I)) + if (props.hasProperty(HtmlTags.I)) { style |= Font.ITALIC; - if (props.hasProperty(HtmlTags.B)) + } + if (props.hasProperty(HtmlTags.B)) { style |= Font.BOLD; - if (props.hasProperty(HtmlTags.U)) + } + if (props.hasProperty(HtmlTags.U)) { style |= Font.UNDERLINE; - if (props.hasProperty(HtmlTags.S)) + } + if (props.hasProperty(HtmlTags.S)) { style |= Font.STRIKETHRU; + } float size = props.findProperty(ElementTags.SIZE) .flatMap(NumberUtilities::parseFloat) diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/HTMLWorker.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/HTMLWorker.java index 6b0675fc2..51bdf6c9f 100755 --- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/HTMLWorker.java +++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/HTMLWorker.java @@ -87,14 +87,16 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener { - public static final String tagsSupportedString = "ol ul li a pre font span br p div body table td th tr i b u sub sup em strong s strike" - + " h1 h2 h3 h4 h5 h6 img hr"; + public static final String tagsSupportedString = + "ol ul li a pre font span br p div body table td th tr i b u sub sup em strong s strike" + + " h1 h2 h3 h4 h5 h6 img hr"; public static final Map tagsSupported = new HashMap<>(); static { StringTokenizer tok = new StringTokenizer(tagsSupportedString); - while (tok.hasMoreTokens()) + while (tok.hasMoreTokens()) { tagsSupported.put(tok.nextToken(), null); + } } protected ArrayList objectList; @@ -154,10 +156,12 @@ public Map getInterfaceProps() { public void setInterfaceProps(Map interfaceProps) { this.interfaceProps = interfaceProps; FontProvider ff = null; - if (interfaceProps != null) + if (interfaceProps != null) { ff = (FontProvider) interfaceProps.get("font_factory"); - if (ff != null) + } + if (ff != null) { factoryProperties.setFontImp(ff); + } } public void parse(Reader reader) throws IOException { @@ -226,8 +230,9 @@ public void startElement(String tag, Map style) { if (addLeadingBreak) { // Not a new paragraph int numChunks = currentParagraph.getChunks().size(); if (numChunks == 0 || - ((Chunk) (currentParagraph.getChunks().get(numChunks - 1))).getContent().endsWith("\n")) + ((Chunk) (currentParagraph.getChunks().get(numChunks - 1))).getContent().endsWith("\n")) { addLeadingBreak = false; + } } String align = style.get("align"); int hrAlign = Element.ALIGN_CENTER; @@ -243,9 +248,12 @@ public void startElement(String tag, Map style) { float hrWidth = 1; if (width != null) { float tmpWidth = parseLength(width, Markup.DEFAULT_FONT_SIZE); - if (tmpWidth > 0) hrWidth = tmpWidth; - if (!width.endsWith("%")) + if (tmpWidth > 0) { + hrWidth = tmpWidth; + } + if (!width.endsWith("%")) { hrWidth = 100; // Treat a pixel width as 100% for now. + } } String size = style.get("size"); float hrSize = 1; @@ -258,7 +266,8 @@ public void startElement(String tag, Map style) { if (addLeadingBreak) { currentParagraph.add(Chunk.NEWLINE); } - currentParagraph.add(new LineSeparator(hrSize, hrWidth, null, hrAlign, currentParagraph.getLeading() / 2)); + currentParagraph.add( + new LineSeparator(hrSize, hrWidth, null, hrAlign, currentParagraph.getLeading() / 2)); currentParagraph.add(Chunk.NEWLINE); return; } @@ -297,15 +306,15 @@ public void startElement(String tag, Map style) { } } if (img == null) { - if (src.startsWith("data:image/")) { // base64 embedded image - int pos = src.indexOf("base64,"); - img = Image.getInstance(Base64.getDecoder().decode(src.substring(pos + 7))); - } else { - if (!src.startsWith("http")) { - String path = cprops.getOrDefault("image_path", ""); - src = new File(path, src).getPath(); - } - img = Image.getInstance(src); + if (src.startsWith("data:image/")) { // base64 embedded image + int pos = src.indexOf("base64,"); + img = Image.getInstance(Base64.getDecoder().decode(src.substring(pos + 7))); + } else { + if (!src.startsWith("http")) { + String path = cprops.getOrDefault("image_path", ""); + src = new File(path, src).getPath(); + } + img = Image.getInstance(src); } } String align = style.get("align"); @@ -322,8 +331,9 @@ public void startElement(String tag, Map style) { float actualFontSize = parseLength(cprops.getProperty(ElementTags.SIZE), Markup.DEFAULT_FONT_SIZE); - if (actualFontSize <= 0f) + if (actualFontSize <= 0f) { actualFontSize = Markup.DEFAULT_FONT_SIZE; + } float widthInPoints = parseLength(width, actualFontSize); float heightInPoints = parseLength(height, actualFontSize); if (widthInPoints > 0 && heightInPoints > 0) { @@ -341,20 +351,23 @@ public void startElement(String tag, Map style) { if (align != null) { endElement("p"); int ralign = Image.MIDDLE; - if (align.equalsIgnoreCase("left")) + if (align.equalsIgnoreCase("left")) { ralign = Image.LEFT; - else if (align.equalsIgnoreCase("right")) + } else if (align.equalsIgnoreCase("right")) { ralign = Image.RIGHT; + } img.setAlignment(ralign); Img i = null; boolean skip = false; if (interfaceProps != null) { i = (Img) interfaceProps.get("img_interface"); - if (i != null) + if (i != null) { skip = i.process(img, (HashMap) style, cprops, document); + } } - if (!skip) + if (!skip) { document.add(img); + } cprops.removeChain(tag); } else { cprops.removeChain(tag); @@ -377,8 +390,9 @@ else if (align.equalsIgnoreCase("right")) return; } if (tag.equals(HtmlTags.UNORDEREDLIST)) { - if (pendingLI) + if (pendingLI) { endElement(HtmlTags.LISTITEM); + } skipText = true; cprops.addToChain(tag, style); com.lowagie.text.List list = new com.lowagie.text.List(false); @@ -392,8 +406,9 @@ else if (align.equalsIgnoreCase("right")) return; } if (tag.equals(HtmlTags.ORDEREDLIST)) { - if (pendingLI) + if (pendingLI) { endElement(HtmlTags.LISTITEM); + } skipText = true; cprops.addToChain(tag, style); com.lowagie.text.List list = new com.lowagie.text.List(true); @@ -406,8 +421,9 @@ else if (align.equalsIgnoreCase("right")) return; } if (tag.equals(HtmlTags.LISTITEM)) { - if (pendingLI) + if (pendingLI) { endElement(HtmlTags.LISTITEM); + } skipText = false; pendingLI = true; cprops.addToChain(tag, style); @@ -428,16 +444,18 @@ else if (align.equalsIgnoreCase("right")) return; } if (tag.equals("tr")) { - if (pendingTR) + if (pendingTR) { endElement("tr"); + } skipText = true; pendingTR = true; cprops.addToChain("tr", style); return; } if (tag.equals("td") || tag.equals("th")) { - if (pendingTD) + if (pendingTD) { endElement(tag); + } skipText = false; pendingTD = true; cprops.addToChain("td", style); @@ -459,8 +477,9 @@ else if (align.equalsIgnoreCase("right")) } public void endElement(String tag) { - if (!tagsSupported.containsKey(tag)) + if (!tagsSupported.containsKey(tag)) { return; + } try { String follow = FactoryProperties.followTags.get(tag); if (follow != null) { @@ -478,8 +497,9 @@ public void endElement(String tag) { boolean skip = false; if (interfaceProps != null) { ALink i = (ALink) interfaceProps.get("alink_interface"); - if (i != null) + if (i != null) { skip = i.process(currentParagraph, cprops); + } } if (!skip) { cprops.findProperty("href").ifPresent(href -> { @@ -502,9 +522,9 @@ public void endElement(String tag) { return; } if (currentParagraph != null) { - if (stack.empty()) + if (stack.empty()) { document.add(currentParagraph); - else { + } else { Object obj = stack.pop(); if (obj instanceof TextElementArray) { TextElementArray current = (TextElementArray) obj; @@ -516,12 +536,14 @@ public void endElement(String tag) { currentParagraph = null; if (tag.equals(HtmlTags.UNORDEREDLIST) || tag.equals(HtmlTags.ORDEREDLIST)) { - if (pendingLI) + if (pendingLI) { endElement(HtmlTags.LISTITEM); + } skipText = false; cprops.removeChain(tag); - if (stack.empty()) + if (stack.empty()) { return; + } Object obj = stack.pop(); if (!(obj instanceof com.lowagie.text.List)) { stack.push(obj); @@ -543,8 +565,9 @@ public void endElement(String tag) { pendingLI = false; skipText = true; cprops.removeChain(tag); - if (stack.empty()) + if (stack.empty()) { return; + } Object obj = stack.pop(); if (!(obj instanceof ListItem)) { stack.push(obj); @@ -562,9 +585,10 @@ public void endElement(String tag) { ListItem item = (ListItem) obj; ((com.lowagie.text.List) list).add(item); List cks = item.getChunks(); - if (!cks.isEmpty()) + if (!cks.isEmpty()) { item.getListSymbol() .setFont(((Chunk) cks.get(0)).getFont()); + } stack.push(list); return; } @@ -587,16 +611,18 @@ public void endElement(String tag) { return; } if (tag.equals("table")) { - if (pendingTR) + if (pendingTR) { endElement("tr"); + } cprops.removeChain("table"); IncTable table = (IncTable) stack.pop(); PdfPTable tb = table.buildTable(); tb.setSplitRows(true); - if (stack.empty()) + if (stack.empty()) { document.add(tb); - else + } else { ((TextElementArray) stack.peek()).add(tb); + } boolean[] state = (boolean[]) tableState.pop(); pendingTR = state[0]; pendingTD = state[1]; @@ -604,8 +630,9 @@ public void endElement(String tag) { return; } if (tag.equals("tr")) { - if (pendingTD) + if (pendingTD) { endElement("td"); + } pendingTR = false; cprops.removeChain("tr"); List cells = new ArrayList<>(); @@ -638,8 +665,9 @@ public void endElement(String tag) { } public void text(String str) { - if (skipText) + if (skipText) { return; + } String content = str; if (isPRE) { if (currentParagraph == null) { @@ -732,7 +760,7 @@ public boolean setMarginMirroringTopBottom(boolean marginMirroring) { } public boolean setMargins(float marginLeft, float marginRight, - float marginTop, float marginBottom) { + float marginTop, float marginBottom) { return true; } diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ImageProvider.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ImageProvider.java index 6f5b5b055..d029acdc9 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ImageProvider.java +++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ImageProvider.java @@ -50,9 +50,9 @@ import com.lowagie.text.DocListener; import com.lowagie.text.Image; - import java.util.HashMap; public interface ImageProvider { + Image getImage(String src, HashMap h, ChainedProperties cprops, DocListener doc); } diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/Img.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/Img.java index 69a450286..07791c83b 100644 --- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/Img.java +++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/Img.java @@ -47,15 +47,14 @@ package com.lowagie.text.html.simpleparser; -import java.util.HashMap; - import com.lowagie.text.DocListener; import com.lowagie.text.Image; +import java.util.HashMap; /** - * - * @author psoares + * @author psoares */ public interface Img { + boolean process(Image img, HashMap h, ChainedProperties cprops, DocListener doc); } diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/IncCell.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/IncCell.java index 2501ba866..db50251e4 100755 --- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/IncCell.java +++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/IncCell.java @@ -68,7 +68,8 @@ public class IncCell implements TextElementArray { /** * Creates a new instance of IncCell - * @param tag the tag + * + * @param tag the tag * @param props the ChainedProperties */ public IncCell(String tag, ChainedProperties props) { @@ -93,10 +94,11 @@ public IncCell(String tag, ChainedProperties props) { cell.setHorizontalAlignment(Element.ALIGN_CENTER); } else if ("right".equalsIgnoreCase(align)) { cell.setHorizontalAlignment(Element.ALIGN_RIGHT); - } else if ("left".equalsIgnoreCase(align)) + } else if ("left".equalsIgnoreCase(align)) { cell.setHorizontalAlignment(Element.ALIGN_LEFT); - else if ("justify".equalsIgnoreCase(align)) + } else if ("justify".equalsIgnoreCase(align)) { cell.setHorizontalAlignment(Element.ALIGN_JUSTIFIED); + } }); props.findProperty("valign") diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/IncTable.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/IncTable.java index a2d4370df..11e0568ea 100755 --- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/IncTable.java +++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/IncTable.java @@ -49,7 +49,6 @@ import com.lowagie.text.pdf.PdfPCell; import com.lowagie.text.pdf.PdfPTable; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -57,10 +56,10 @@ import java.util.Map; /** - * - * @author psoares + * @author psoares */ public class IncTable { + private Map props = new HashMap<>(); private List> rows = new ArrayList<>(); private List cols; @@ -68,20 +67,22 @@ public class IncTable { public IncTable(Map props) { this.props.putAll(props); } - + public void addCol(PdfPCell cell) { - if (cols == null) + if (cols == null) { cols = new ArrayList<>(); + } cols.add(cell); } - + public void addCols(List ncols) { - if (cols == null) + if (cols == null) { cols = new ArrayList<>(ncols); - else + } else { cols.addAll(ncols); + } } - + public void endRow() { if (cols != null) { Collections.reverse(cols); @@ -89,26 +90,27 @@ public void endRow() { cols = null; } } - + public List> getTableRows() { return rows; } - + public PdfPTable buildTable() { - if (rows.isEmpty()) + if (rows.isEmpty()) { return new PdfPTable(1); + } int ncol = 0; for (PdfPCell pCell : rows.get(0)) { ncol += pCell.getColspan(); } PdfPTable table = new PdfPTable(ncol); String width = props.get("width"); - if (width == null) + if (width == null) { table.setWidthPercentage(100); - else { - if (width.endsWith("%")) + } else { + if (width.endsWith("%")) { table.setWidthPercentage(Float.parseFloat(width.substring(0, width.length() - 1))); - else { + } else { table.setTotalWidth(Float.parseFloat(width)); table.setLockedWidth(true); } diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/StyleSheet.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/StyleSheet.java index 09e9d6ba7..09e8b5d77 100755 --- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/StyleSheet.java +++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/StyleSheet.java @@ -50,11 +50,10 @@ package com.lowagie.text.html.simpleparser; +import com.lowagie.text.html.Markup; import java.util.HashMap; import java.util.Map; -import com.lowagie.text.html.Markup; - public class StyleSheet { private final Map> classMap = new HashMap<>(); @@ -68,11 +67,13 @@ public void applyStyle(String tag, Map props) { props.putAll(temp); } String cm = props.get(Markup.HTML_ATTR_CSS_CLASS); - if (cm == null) + if (cm == null) { return; + } map = classMap.get(cm.toLowerCase()); - if (map == null) + if (map == null) { return; + } props.remove(Markup.HTML_ATTR_CSS_CLASS); Map temp = new HashMap<>(map); temp.putAll(props); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/AcroFields.java b/openpdf/src/main/java/com/lowagie/text/pdf/AcroFields.java index 4e3984e8d..2797fc4ea 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/AcroFields.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/AcroFields.java @@ -53,7 +53,6 @@ import com.lowagie.text.Image; import com.lowagie.text.Rectangle; import com.lowagie.text.error_messages.MessageLocalization; - import java.awt.Color; import java.io.IOException; import java.io.InputStream; @@ -74,3071 +73,3077 @@ */ public class AcroFields { - PdfReader reader; - PdfWriter writer; - private Map fields; - private int topFirst; - private Map sigNames; - private HashMap sigTypes; - private boolean append; - public static final int DA_FONT = 0; - public static final int DA_SIZE = 1; - public static final int DA_COLOR = 2; - private final Map extensionFonts = new HashMap<>(); - private XfaForm xfa; - - /** - * A field type invalid or not found. - */ - public static final int FIELD_TYPE_NONE = 0; - - /** - * A field type. - */ - public static final int FIELD_TYPE_PUSHBUTTON = 1; - - /** - * A field type. - */ - public static final int FIELD_TYPE_CHECKBOX = 2; - - /** - * A field type. - */ - public static final int FIELD_TYPE_RADIOBUTTON = 3; - - /** - * A field type. - */ - public static final int FIELD_TYPE_TEXT = 4; - - /** - * A field type. - */ - public static final int FIELD_TYPE_LIST = 5; - - /** - * A field type. - */ - public static final int FIELD_TYPE_COMBO = 6; - - /** - * A field type. - */ - public static final int FIELD_TYPE_SIGNATURE = 7; - - private boolean lastWasString; - - /** - * Holds value of property generateAppearances. - */ - private boolean generateAppearances = true; - - private final Map localFonts = new HashMap<>(); - - private float extraMarginLeft; - private float extraMarginTop; - private List substitutionFonts; - - AcroFields(PdfReader reader, PdfWriter writer) { - this.reader = reader; - this.writer = writer; - try { - xfa = new XfaForm(reader); - } catch (Exception e) { - throw new ExceptionConverter(e); - } - if (writer instanceof PdfStamperImp) { - append = ((PdfStamperImp) writer).isAppend(); - } - fill(); - } - - void fill() { - fields = new HashMap<>(); - PdfDictionary top = (PdfDictionary) PdfReader.getPdfObjectReleaseNullConverting(reader.getCatalog().get(PdfName.ACROFORM)); - if (top == null) { - return; - } - PdfArray arrfds = (PdfArray) PdfReader.getPdfObjectRelease(top.get(PdfName.FIELDS)); - if (arrfds == null || arrfds.size() == 0) { - return; - } - for (int k = 1; k <= reader.getNumberOfPages(); ++k) { - PdfDictionary page = reader.getPageNRelease(k); - Object o = PdfReader.getPdfObjectRelease(page.get(PdfName.ANNOTS), page); - PdfArray annots = (o instanceof PdfArray) ? (PdfArray) o : null; - if (annots == null) { - continue; - } - for (int j = 0; j < annots.size(); ++j) { - PdfDictionary annot = annots.getAsDict(j); - if (annot == null) { - PdfReader.releaseLastXrefPartial(annots.getAsIndirectObject(j)); - continue; - } - if (!PdfName.WIDGET.equals(annot.getAsName(PdfName.SUBTYPE))) { - PdfReader.releaseLastXrefPartial(annots.getAsIndirectObject(j)); - continue; - } - PdfDictionary widget = annot; - PdfDictionary dic = new PdfDictionary(); - dic.putAll(annot); - String name = ""; - PdfDictionary value = null; - PdfObject lastV = null; - int lastIDRNumber = -1; - PdfIndirectReference indirectObject = annots.getAsIndirectObject(j); - if (indirectObject != null) { - lastIDRNumber = indirectObject.getNumber(); - } - PdfIndirectReference parentRef=null; - - while (annot != null) { - dic.mergeDifferent(annot); - PdfString t = annot.getAsString(PdfName.T); - if (t != null) { - name = t.toUnicodeString() + "." + name; - } - if (lastV == null && annot.get(PdfName.V) != null) { - lastV = PdfReader.getPdfObjectRelease(annot.get(PdfName.V)); - } - if (value == null && t != null) { - value = annot; - if (annot.get(PdfName.V) == null && lastV != null) { - value.put(PdfName.V, lastV); - } - } - int parentIDRNumber = -1; - PdfIndirectReference asIndirectObject = annot.getAsIndirectObject(PdfName.PARENT); - if (asIndirectObject != null) { - parentIDRNumber = asIndirectObject.getNumber(); - parentRef=asIndirectObject; - } - if (parentIDRNumber != -1 && lastIDRNumber != parentIDRNumber) { - annot = annot.getAsDict(PdfName.PARENT); - lastIDRNumber = parentIDRNumber; - } else { - annot = null; - } - } - if (name.length() > 0) { - name = name.substring(0, name.length() - 1); + public static final int DA_FONT = 0; + public static final int DA_SIZE = 1; + public static final int DA_COLOR = 2; + /** + * A field type invalid or not found. + */ + public static final int FIELD_TYPE_NONE = 0; + /** + * A field type. + */ + public static final int FIELD_TYPE_PUSHBUTTON = 1; + /** + * A field type. + */ + public static final int FIELD_TYPE_CHECKBOX = 2; + /** + * A field type. + */ + public static final int FIELD_TYPE_RADIOBUTTON = 3; + /** + * A field type. + */ + public static final int FIELD_TYPE_TEXT = 4; + /** + * A field type. + */ + public static final int FIELD_TYPE_LIST = 5; + /** + * A field type. + */ + public static final int FIELD_TYPE_COMBO = 6; + /** + * A field type. + */ + public static final int FIELD_TYPE_SIGNATURE = 7; + private static final HashMap stdFieldFontNames = new HashMap<>(); + private static final PdfName[] buttonRemove = {PdfName.MK, PdfName.F, PdfName.FF, PdfName.Q, PdfName.BS, + PdfName.BORDER}; + + static { + stdFieldFontNames.put("CoBO", new String[]{"Courier-BoldOblique"}); + stdFieldFontNames.put("CoBo", new String[]{"Courier-Bold"}); + stdFieldFontNames.put("CoOb", new String[]{"Courier-Oblique"}); + stdFieldFontNames.put("Cour", new String[]{"Courier"}); + stdFieldFontNames.put("HeBO", new String[]{"Helvetica-BoldOblique"}); + stdFieldFontNames.put("HeBo", new String[]{"Helvetica-Bold"}); + stdFieldFontNames.put("HeOb", new String[]{"Helvetica-Oblique"}); + stdFieldFontNames.put("Helv", new String[]{"Helvetica"}); + stdFieldFontNames.put("Symb", new String[]{"Symbol"}); + stdFieldFontNames.put("TiBI", new String[]{"Times-BoldItalic"}); + stdFieldFontNames.put("TiBo", new String[]{"Times-Bold"}); + stdFieldFontNames.put("TiIt", new String[]{"Times-Italic"}); + stdFieldFontNames.put("TiRo", new String[]{"Times-Roman"}); + stdFieldFontNames.put("ZaDb", new String[]{"ZapfDingbats"}); + stdFieldFontNames.put("HySm", new String[]{"HYSMyeongJo-Medium", "UniKS-UCS2-H"}); + stdFieldFontNames.put("HyGo", new String[]{"HYGoThic-Medium", "UniKS-UCS2-H"}); + stdFieldFontNames.put("KaGo", new String[]{"HeiseiKakuGo-W5", "UniKS-UCS2-H"}); + stdFieldFontNames.put("KaMi", new String[]{"HeiseiMin-W3", "UniJIS-UCS2-H"}); + stdFieldFontNames.put("MHei", new String[]{"MHei-Medium", "UniCNS-UCS2-H"}); + stdFieldFontNames.put("MSun", new String[]{"MSung-Light", "UniCNS-UCS2-H"}); + stdFieldFontNames.put("STSo", new String[]{"STSong-Light", "UniGB-UCS2-H"}); + } + + private final Map extensionFonts = new HashMap<>(); + private final Map localFonts = new HashMap<>(); + PdfReader reader; + PdfWriter writer; + private Map fields; + private int topFirst; + private Map sigNames; + private HashMap sigTypes; + private boolean append; + private XfaForm xfa; + private boolean lastWasString; + /** + * Holds value of property generateAppearances. + */ + private boolean generateAppearances = true; + private float extraMarginLeft; + private float extraMarginTop; + private List substitutionFonts; + /** + * Holds value of property totalRevisions. + */ + private int totalRevisions; + /** + * Holds value of property fieldCache. + * + * @since 2.1.5 this used to be a HashMap + */ + private Map fieldCache; + + AcroFields(PdfReader reader, PdfWriter writer) { + this.reader = reader; + this.writer = writer; + try { + xfa = new XfaForm(reader); + } catch (Exception e) { + throw new ExceptionConverter(e); + } + if (writer instanceof PdfStamperImp) { + append = ((PdfStamperImp) writer).isAppend(); + } + fill(); + } + + public static Object[] splitDAelements(String da) { + try { + PRTokeniser tk = new PRTokeniser(PdfEncodings.convertToBytes(da, null)); + List stack = new ArrayList<>(); + Object[] ret = new Object[3]; + while (tk.nextToken()) { + if (tk.getTokenType() == PRTokeniser.TK_COMMENT) { + continue; + } + if (tk.getTokenType() == PRTokeniser.TK_OTHER) { + String operator = tk.getStringValue(); + switch (operator) { + case "Tf": + if (stack.size() >= 2) { + ret[DA_FONT] = stack.get(stack.size() - 2); + ret[DA_SIZE] = Float.parseFloat(stack.get(stack.size() - 1)); + } + break; + case "g": + if (stack.size() >= 1) { + float gray = Float.parseFloat(stack.get(stack.size() - 1)); + if (gray != 0) { + ret[DA_COLOR] = new GrayColor(gray); + } + } + break; + case "rg": + if (stack.size() >= 3) { + float red = Float.parseFloat(stack.get(stack.size() - 3)); + float green = Float.parseFloat(stack.get(stack.size() - 2)); + float blue = Float.parseFloat(stack.get(stack.size() - 1)); + ret[DA_COLOR] = new Color(red, green, blue); + } + break; + case "k": + if (stack.size() >= 4) { + float cyan = Float.parseFloat(stack.get(stack.size() - 4)); + float magenta = Float.parseFloat(stack.get(stack.size() - 3)); + float yellow = Float.parseFloat(stack.get(stack.size() - 2)); + float black = Float.parseFloat(stack.get(stack.size() - 1)); + ret[DA_COLOR] = new CMYKColor(cyan, magenta, yellow, black); + } + break; + } + stack.clear(); + } else { + stack.add(tk.getStringValue()); + } + } + return ret; + } catch (IOException ioe) { + throw new ExceptionConverter(ioe); + } + } + + /** + * Parses and converts colors from PDF to standard AWT Colors. + * + * @param pdfColor an array of colors + * @return AWT-Color + */ + public static Color parseColor(PdfArray pdfColor) { + + //Check for no color -> thus transparent + if (pdfColor != null && !pdfColor.isEmpty()) { + if (pdfColor.size() == 1) { + PdfNumber grey = pdfColor.getAsNumber(0); + if (grey != null) { + return new GrayColor(grey.floatValue()); + } + } else if (pdfColor.size() == 3) { + PdfNumber red = pdfColor.getAsNumber(0); + PdfNumber green = pdfColor.getAsNumber(1); + PdfNumber blue = pdfColor.getAsNumber(2); + + if (red != null && green != null && blue != null) { + return new Color(red.floatValue(), green.floatValue(), blue.floatValue()); + } + } else if (pdfColor.size() == 4) { + PdfNumber c = pdfColor.getAsNumber(0); + PdfNumber m = pdfColor.getAsNumber(1); + PdfNumber y = pdfColor.getAsNumber(2); + PdfNumber k = pdfColor.getAsNumber(3); + + if (c != null && m != null && y != null && k != null) { + return new CMYKColor(c.floatValue(), m.floatValue(), y.floatValue(), k.floatValue()); + } + } else { + throw new RuntimeException( + "Error extracting color: " + pdfColor + " since the color array is too long: " + + pdfColor.length()); + } + } + return null; + } + + void fill() { + fields = new HashMap<>(); + PdfDictionary top = (PdfDictionary) PdfReader.getPdfObjectReleaseNullConverting( + reader.getCatalog().get(PdfName.ACROFORM)); + if (top == null) { + return; + } + PdfArray arrfds = (PdfArray) PdfReader.getPdfObjectRelease(top.get(PdfName.FIELDS)); + if (arrfds == null || arrfds.size() == 0) { + return; + } + for (int k = 1; k <= reader.getNumberOfPages(); ++k) { + PdfDictionary page = reader.getPageNRelease(k); + Object o = PdfReader.getPdfObjectRelease(page.get(PdfName.ANNOTS), page); + PdfArray annots = (o instanceof PdfArray) ? (PdfArray) o : null; + if (annots == null) { + continue; + } + for (int j = 0; j < annots.size(); ++j) { + PdfDictionary annot = annots.getAsDict(j); + if (annot == null) { + PdfReader.releaseLastXrefPartial(annots.getAsIndirectObject(j)); + continue; + } + if (!PdfName.WIDGET.equals(annot.getAsName(PdfName.SUBTYPE))) { + PdfReader.releaseLastXrefPartial(annots.getAsIndirectObject(j)); + continue; + } + PdfDictionary widget = annot; + PdfDictionary dic = new PdfDictionary(); + dic.putAll(annot); + String name = ""; + PdfDictionary value = null; + PdfObject lastV = null; + int lastIDRNumber = -1; + PdfIndirectReference indirectObject = annots.getAsIndirectObject(j); + if (indirectObject != null) { + lastIDRNumber = indirectObject.getNumber(); + } + PdfIndirectReference parentRef = null; + + while (annot != null) { + dic.mergeDifferent(annot); + PdfString t = annot.getAsString(PdfName.T); + if (t != null) { + name = t.toUnicodeString() + "." + name; + } + if (lastV == null && annot.get(PdfName.V) != null) { + lastV = PdfReader.getPdfObjectRelease(annot.get(PdfName.V)); + } + if (value == null && t != null) { + value = annot; + if (annot.get(PdfName.V) == null && lastV != null) { + value.put(PdfName.V, lastV); + } + } + int parentIDRNumber = -1; + PdfIndirectReference asIndirectObject = annot.getAsIndirectObject(PdfName.PARENT); + if (asIndirectObject != null) { + parentIDRNumber = asIndirectObject.getNumber(); + parentRef = asIndirectObject; + } + if (parentIDRNumber != -1 && lastIDRNumber != parentIDRNumber) { + annot = annot.getAsDict(PdfName.PARENT); + lastIDRNumber = parentIDRNumber; + } else { + annot = null; + } + } + if (name.length() > 0) { + name = name.substring(0, name.length() - 1); + } + Item item = fields.get(name); + if (item == null) { + if (parentRef == null) { + //when there is no /Parent ref the item reference will be used + parentRef = indirectObject; + } + item = new Item(parentRef); + fields.put(name, item); + } + if (value == null) { + item.addValue(widget); + } else { + item.addValue(value); + } + item.addWidget(widget); + item.addWidgetRef(annots.getAsIndirectObject(j)); // must be a reference + dic.mergeDifferent(top); + item.addMerged(dic); + item.addPage(k); + item.addTabOrder(j); + } + } + // some tools produce invisible signatures without an entry in the page annotation array + // look for a single level annotation + PdfNumber sigFlags = top.getAsNumber(PdfName.SIGFLAGS); + if (sigFlags == null || (sigFlags.intValue() & 1) != 1) { + return; + } + for (int j = 0; j < arrfds.size(); ++j) { + PdfDictionary annot = arrfds.getAsDict(j); + PdfIndirectReference annotRef = arrfds.getAsIndirectObject(j); + if (annot == null) { + PdfReader.releaseLastXrefPartial(annotRef); + continue; + } + if (!PdfName.WIDGET.equals(annot.getAsName(PdfName.SUBTYPE))) { + PdfReader.releaseLastXrefPartial(arrfds.getAsIndirectObject(j)); + continue; + } + PdfArray kids = (PdfArray) PdfReader.getPdfObjectRelease(annot.get(PdfName.KIDS)); + if (kids != null) { + continue; + } + PdfDictionary dic = new PdfDictionary(); + dic.putAll(annot); + PdfString t = annot.getAsString(PdfName.T); + if (t == null) { + continue; + } + String name = t.toUnicodeString(); + if (fields.containsKey(name)) { + continue; + } + Item item = new Item(annotRef); + fields.put(name, item); + item.addValue(dic); + item.addWidget(dic); + item.addWidgetRef(arrfds.getAsIndirectObject(j)); // must be a reference + item.addMerged(dic); + item.addPage(-1); + item.addTabOrder(-1); + } + } + + /** + * Gets the list of appearance names. Use it to get the names allowed with radio and checkbox fields. If the /Opt + * key exists the values will also be included. The name 'Off' may also be valid even if not returned in the list. + * + * @param fieldName the fully qualified field name + * @return the list of names or null if the field does not exist + */ + public String[] getAppearanceStates(String fieldName) { + Item fd = fields.get(fieldName); + if (fd == null) { + return null; + } + Map names = new HashMap<>(); + PdfDictionary vals = fd.getValue(0); + PdfString stringOpt = vals.getAsString(PdfName.OPT); + if (stringOpt != null) { + names.put(stringOpt.toUnicodeString(), null); + } else { + PdfArray arrayOpt = vals.getAsArray(PdfName.OPT); + if (arrayOpt != null) { + for (int k = 0; k < arrayOpt.size(); ++k) { + PdfString valStr = arrayOpt.getAsString(k); + if (valStr != null) { + names.put(valStr.toUnicodeString(), null); + } + } + } + } + for (int k = 0; k < fd.size(); ++k) { + PdfDictionary dic = fd.getWidget(k); + dic = dic.getAsDict(PdfName.AP); + if (dic == null) { + continue; + } + dic = dic.getAsDict(PdfName.N); + if (dic == null) { + continue; + } + for (Object o : dic.getKeys()) { + String name = PdfName.decodeName(o.toString()); + names.put(name, null); + } + } + String[] out = new String[names.size()]; + return names.keySet().toArray(out); + } + + /** + * Returns the names of the N-appearance dictionaries + * + * @param fieldName name of the form field + * @param idx widget index + * @return String[] of appearance names or null if the field can not be found + */ + public String[] getAppearanceNames(String fieldName, int idx) { + Item fd = (Item) this.fields.get(fieldName); + if (fd == null) { + return null; + } + ArrayList names = new ArrayList(); + + PdfDictionary dic = fd.getWidget(idx); + dic = dic.getAsDict(PdfName.AP); + if (dic != null) { + dic = dic.getAsDict(PdfName.N); + if (dic != null) { + + Iterator it = dic.getKeys().iterator(); + while (it.hasNext()) { + String name = PdfName.decodeName(((PdfName) it.next()).toString()); + if (!names.contains(name)) { + names.add(name); + } + } + } + } + return names.toArray(new String[names.size()]); + } + + private String[] getListOption(String fieldName, int idx) { + Item fd = getFieldItem(fieldName); + if (fd == null) { + return null; + } + PdfArray ar = fd.getMerged(0).getAsArray(PdfName.OPT); + if (ar == null) { + return null; + } + String[] ret = new String[ar.size()]; + for (int k = 0; k < ar.size(); ++k) { + PdfObject obj = ar.getDirectObject(k); + try { + if (obj.isArray()) { + obj = ((PdfArray) obj).getDirectObject(idx); + } + if (obj.isString()) { + ret[k] = ((PdfString) obj).toUnicodeString(); + } else { + ret[k] = obj.toString(); + } + } catch (Exception e) { + ret[k] = ""; + } + } + return ret; + } + + /** + * Gets the list of export option values from fields of type list or combo. If the field doesn't exist or the field + * type is not list or combo it will return + * null. + * + * @param fieldName the field name + * @return the list of export option values from fields of type list or combo + */ + public String[] getListOptionExport(String fieldName) { + return getListOption(fieldName, 0); + } + + /** + * Gets the list of display option values from fields of type list or combo. If the field doesn't exist or the field + * type is not list or combo it will return + * null. + * + * @param fieldName the field name + * @return the list of export option values from fields of type list or combo + */ + public String[] getListOptionDisplay(String fieldName) { + return getListOption(fieldName, 1); + } + + /** + * Sets the option list for fields of type list or combo. One of exportValues or + * displayValues may be + * null but not both. This method will only set the list but will not set the value or appearance. For + * that, calling + * setField() is required. + *

    + * An example: + *

    + * 
    +     * PdfReader pdf = new PdfReader("input.pdf"); PdfStamper stp = new PdfStamper(pdf, new
+     * FileOutputStream("output.pdf")); AcroFields af = stp.getAcroFields(); af.setListOption("ComboBox", new
+     * String[]{"a", "b", "c"}, new String[]{"first", "second", "third"}); af.setField("ComboBox", "b"); stp.close();
+     *
    + * + * @param fieldName the field name + * @param exportValues the export values + * @param displayValues the display values + * @return true if the operation succeeded, false otherwise + */ + public boolean setListOption(String fieldName, String[] exportValues, String[] displayValues) { + if (exportValues == null && displayValues == null) { + return false; + } + if (exportValues != null && displayValues != null && exportValues.length != displayValues.length) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("the.export.and.the.display.array.must.have.the.same.size")); + } + int ftype = getFieldType(fieldName); + if (ftype != FIELD_TYPE_COMBO && ftype != FIELD_TYPE_LIST) { + return false; + } + Item fd = fields.get(fieldName); + String[] sing = null; + if (exportValues == null) { + sing = displayValues; + } else if (displayValues == null) { + sing = exportValues; + } + PdfArray opt = new PdfArray(); + if (sing != null) { + for (String s : sing) { + opt.add(new PdfString(s, PdfObject.TEXT_UNICODE)); + } + } else { + for (int k = 0; k < exportValues.length; ++k) { + PdfArray a = new PdfArray(); + a.add(new PdfString(exportValues[k], PdfObject.TEXT_UNICODE)); + a.add(new PdfString(displayValues[k], PdfObject.TEXT_UNICODE)); + opt.add(a); + } + } + fd.writeToAll(PdfName.OPT, opt, Item.WRITE_VALUE | Item.WRITE_MERGED); + return true; + } + + /** + * Gets the field type. The type can be one of: FIELD_TYPE_PUSHBUTTON, + * FIELD_TYPE_CHECKBOX, FIELD_TYPE_RADIOBUTTON, + * FIELD_TYPE_TEXT, FIELD_TYPE_LIST, + * FIELD_TYPE_COMBO or FIELD_TYPE_SIGNATURE. + * + *

    If the field does not exist or is invalid it returns + * FIELD_TYPE_NONE. + * + * @param fieldName the field name + * @return the field type + */ + public int getFieldType(String fieldName) { + Item fd = getFieldItem(fieldName); + if (fd == null) { + return FIELD_TYPE_NONE; + } + PdfDictionary merged = fd.getMerged(0); + PdfName type = merged.getAsName(PdfName.FT); + if (type == null) { + return FIELD_TYPE_NONE; + } + int ff = 0; + PdfNumber ffo = merged.getAsNumber(PdfName.FF); + if (ffo != null) { + ff = ffo.intValue(); + } + if (PdfName.BTN.equals(type)) { + if ((ff & PdfFormField.FF_PUSHBUTTON) != 0) { + return FIELD_TYPE_PUSHBUTTON; + } + if ((ff & PdfFormField.FF_RADIO) != 0) { + return FIELD_TYPE_RADIOBUTTON; + } else { + return FIELD_TYPE_CHECKBOX; + } + } else if (PdfName.TX.equals(type)) { + return FIELD_TYPE_TEXT; + } else if (PdfName.CH.equals(type)) { + if ((ff & PdfFormField.FF_COMBO) != 0) { + return FIELD_TYPE_COMBO; + } else { + return FIELD_TYPE_LIST; + } + } else if (PdfName.SIG.equals(type)) { + return FIELD_TYPE_SIGNATURE; + } + return FIELD_TYPE_NONE; + } + + /** + * Export the fields as a FDF. + * + * @param writer the FDF writer + */ + public void exportAsFdf(FdfWriter writer) { + for (Map.Entry entry : fields.entrySet()) { + Item item = entry.getValue(); + String name = entry.getKey(); + PdfObject v = item.getMerged(0).get(PdfName.V); + if (v == null) { + continue; + } + String value = getField(name); + if (lastWasString) { + writer.setFieldAsString(name, value); + } else { + writer.setFieldAsName(name, value); + } + } + } + + /** + * Renames a field. Only the last part of the name can be renamed. For example, if the original field is "ab.cd.ef" + * only the "ef" part can be renamed. + * + * @param oldName the old field name + * @param newName the new field name + * @return true if the renaming was successful, false + * otherwise + */ + public boolean renameField(String oldName, String newName) { + int idx1 = oldName.lastIndexOf('.') + 1; + int idx2 = newName.lastIndexOf('.') + 1; + if (idx1 != idx2) { + return false; + } + if (!oldName.substring(0, idx1).equals(newName.substring(0, idx2))) { + return false; + } + if (fields.containsKey(newName)) { + return false; + } + Item item = fields.get(oldName); + if (item == null) { + return false; + } + newName = newName.substring(idx2); + PdfString ss = new PdfString(newName, PdfObject.TEXT_UNICODE); + + item.writeToAll(PdfName.T, ss, Item.WRITE_VALUE | Item.WRITE_MERGED); + item.markUsed(this, Item.WRITE_VALUE); + + fields.remove(oldName); + fields.put(newName, item); + + return true; + } + + public void decodeGenericDictionary(PdfDictionary merged, BaseField tx) throws DocumentException { + int flags = 0; + // the text size and color + PdfString da = merged.getAsString(PdfName.DA); + if (da != null) { + Object[] dab = splitDAelements(da.toUnicodeString()); + if (dab[DA_SIZE] != null) { + tx.setFontSize((Float) dab[DA_SIZE]); + } + if (dab[DA_COLOR] != null) { + tx.setTextColor((Color) dab[DA_COLOR]); + } + if (dab[DA_FONT] != null) { + PdfDictionary dr = merged.getAsDict(PdfName.DR); + if (dr != null) { + PdfDictionary font = dr.getAsDict(PdfName.FONT); + if (font != null) { + PdfObject po = font.get(new PdfName((String) dab[DA_FONT])); + if (po != null && po.type() == PdfObject.INDIRECT) { + PRIndirectReference por = (PRIndirectReference) po; + adjustFontEncoding(dr, por); + BaseFont bp = new DocumentFont(por); + tx.setFont(bp); + Integer porkey = por.getNumber(); + BaseFont porf = extensionFonts.get(porkey); + if (porf == null) { + if (!extensionFonts.containsKey(porkey)) { + PdfDictionary fo = (PdfDictionary) PdfReader.getPdfObject(po); + PdfDictionary fd = fo.getAsDict(PdfName.FONTDESCRIPTOR); + if (fd != null) { + PRStream prs = (PRStream) PdfReader.getPdfObject(fd.get(PdfName.FONTFILE2)); + if (prs == null) { + prs = (PRStream) PdfReader.getPdfObject(fd.get(PdfName.FONTFILE3)); + } + if (prs == null) { + extensionFonts.put(porkey, null); + } else { + try { + porf = BaseFont.createFont("font.ttf", BaseFont.IDENTITY_H, true, false, + PdfReader.getStreamBytes(prs), null); + } catch (Exception ignored) { + } + extensionFonts.put(porkey, porf); + } + } + } + } + if (tx instanceof TextField) { + ((TextField) tx).setExtensionFont(porf); + } + } else { + BaseFont bf = localFonts.get(dab[DA_FONT]); + if (bf == null) { + String[] fn = stdFieldFontNames.get(dab[DA_FONT]); + if (fn != null) { + try { + String enc = "winansi"; + if (fn.length > 1) { + enc = fn[1]; + } + bf = BaseFont.createFont(fn[0], enc, false); + tx.setFont(bf); + } catch (Exception e) { + // empty + } + } + } else { + tx.setFont(bf); + } + } + } + } + } + } + //rotation, border and background color + PdfDictionary mk = merged.getAsDict(PdfName.MK); + if (mk != null) { + PdfArray ar = mk.getAsArray(PdfName.BC); + Color border = getMKColor(ar); + tx.setBorderColor(border); + if (border != null) { + tx.setBorderWidth(1); + } + ar = mk.getAsArray(PdfName.BG); + tx.setBackgroundColor(getMKColor(ar)); + PdfNumber rotation = mk.getAsNumber(PdfName.R); + if (rotation != null) { + tx.setRotation(rotation.intValue()); + } + } + //flags + PdfNumber nfl = merged.getAsNumber(PdfName.F); + flags = 0; + tx.setVisibility(BaseField.VISIBLE_BUT_DOES_NOT_PRINT); + if (nfl != null) { + flags = nfl.intValue(); + if ((flags & PdfFormField.FLAGS_PRINT) != 0 && (flags & PdfFormField.FLAGS_HIDDEN) != 0) { + tx.setVisibility(BaseField.HIDDEN); + } else if ((flags & PdfFormField.FLAGS_PRINT) != 0 && (flags & PdfFormField.FLAGS_NOVIEW) != 0) { + tx.setVisibility(BaseField.HIDDEN_BUT_PRINTABLE); + } else if ((flags & PdfFormField.FLAGS_PRINT) != 0) { + tx.setVisibility(BaseField.VISIBLE); + } + } + //multiline + nfl = merged.getAsNumber(PdfName.FF); + flags = 0; + if (nfl != null) { + flags = nfl.intValue(); + } + tx.setOptions(flags); + if ((flags & PdfFormField.FF_COMB) != 0) { + PdfNumber maxLen = merged.getAsNumber(PdfName.MAXLEN); + int len = 0; + if (maxLen != null) { + len = maxLen.intValue(); + } + tx.setMaxCharacterLength(len); + } + //alignment + nfl = merged.getAsNumber(PdfName.Q); + if (nfl != null) { + if (nfl.intValue() == PdfFormField.Q_CENTER) { + tx.setAlignment(Element.ALIGN_CENTER); + } else if (nfl.intValue() == PdfFormField.Q_RIGHT) { + tx.setAlignment(Element.ALIGN_RIGHT); + } + } + //border styles + PdfDictionary bs = merged.getAsDict(PdfName.BS); + if (bs != null) { + PdfNumber w = bs.getAsNumber(PdfName.W); + if (w != null) { + tx.setBorderWidth(w.floatValue()); + } + PdfName s = bs.getAsName(PdfName.S); + if (PdfName.D.equals(s)) { + tx.setBorderStyle(PdfBorderDictionary.STYLE_DASHED); + } else if (PdfName.B.equals(s)) { + tx.setBorderStyle(PdfBorderDictionary.STYLE_BEVELED); + } else if (PdfName.I.equals(s)) { + tx.setBorderStyle(PdfBorderDictionary.STYLE_INSET); + } else if (PdfName.U.equals(s)) { + tx.setBorderStyle(PdfBorderDictionary.STYLE_UNDERLINE); + } + } else { + PdfArray bd = merged.getAsArray(PdfName.BORDER); + if (bd != null) { + if (bd.size() >= 3) { + tx.setBorderWidth(bd.getAsNumber(2).floatValue()); + } + if (bd.size() >= 4) { + tx.setBorderStyle(PdfBorderDictionary.STYLE_DASHED); + } + } + } + } + + PdfAppearance getAppearance(PdfDictionary merged, String[] values, String fieldName) + throws IOException, DocumentException { + topFirst = 0; + String text = (values.length > 0) ? values[0] : null; + + TextField tx = null; + if (fieldCache == null || !fieldCache.containsKey(fieldName)) { + tx = new TextField(writer, null, null); + tx.setExtraMargin(extraMarginLeft, extraMarginTop); + tx.setBorderWidth(0); + tx.setSubstitutionFontList(substitutionFonts); + decodeGenericDictionary(merged, tx); + //rect + PdfArray rect = merged.getAsArray(PdfName.RECT); + Rectangle box = PdfReader.getNormalizedRectangle(rect); + if (tx.getRotation() == 90 || tx.getRotation() == 270) { + box = box.rotate(); + } + tx.setBox(box); + if (fieldCache != null) { + fieldCache.put(fieldName, tx); + } + } else { + tx = (TextField) fieldCache.get(fieldName); + tx.setWriter(writer); + } + PdfName fieldType = merged.getAsName(PdfName.FT); + if (PdfName.TX.equals(fieldType)) { + if (values.length > 0 && values[0] != null) { + tx.setText(values[0]); + } + return tx.getAppearance(); + } + if (!PdfName.CH.equals(fieldType)) { + throw new DocumentException(MessageLocalization.getComposedMessage( + "an.appearance.was.requested.without.a.variable.text.field")); + } + PdfArray opt = merged.getAsArray(PdfName.OPT); + int flags = 0; + PdfNumber nfl = merged.getAsNumber(PdfName.FF); + if (nfl != null) { + flags = nfl.intValue(); + } + if ((flags & PdfFormField.FF_COMBO) != 0 && opt == null) { + tx.setText(text); + return tx.getAppearance(); + } + if (opt != null) { + String[] choices = new String[opt.size()]; + String[] choicesExp = new String[opt.size()]; + for (int k = 0; k < opt.size(); ++k) { + PdfObject obj = opt.getPdfObject(k); + if (obj.isString()) { + choices[k] = choicesExp[k] = ((PdfString) obj).toUnicodeString(); + } else { + PdfArray a = (PdfArray) obj; + choicesExp[k] = a.getAsString(0).toUnicodeString(); + choices[k] = a.getAsString(1).toUnicodeString(); + } + } + if ((flags & PdfFormField.FF_COMBO) != 0) { + for (int k = 0; k < choices.length; ++k) { + if (text != null && text.equals(choicesExp[k])) { + text = choices[k]; + break; + } + } + tx.setText(text); + return tx.getAppearance(); + } + List indexes = new ArrayList<>(); + for (int k = 0; k < choicesExp.length; ++k) { + for (String val : values) { + if (val != null && val.equals(choicesExp[k])) { + indexes.add(k); + break; + } + } + } + tx.setChoices(choices); + tx.setChoiceExports(choicesExp); + tx.setChoiceSelections(indexes); + } + PdfAppearance app = tx.getListAppearance(); + topFirst = tx.getTopFirst(); + return app; + } + + /** + * Set font encoding from DR-structure if font doesn't have this info itself + */ + private void adjustFontEncoding(PdfDictionary dr, PRIndirectReference por) { + PdfDictionary drEncoding = dr.getAsDict(PdfName.ENCODING); + if (drEncoding != null) { + PdfDictionary fontDict = (PdfDictionary) PdfReader.getPdfObject(por); + if (fontDict != null && fontDict.get(PdfName.ENCODING) == null) { + for (PdfName key : drEncoding.getKeys()) { + fontDict.put(PdfName.ENCODING, drEncoding.get(key)); + } + } + } + } + + PdfAppearance getAppearance(PdfDictionary merged, String text, String fieldName) + throws IOException, DocumentException { + String[] valueArr = new String[1]; + valueArr[0] = text; + return getAppearance(merged, valueArr, fieldName); + } + + Color getMKColor(PdfArray ar) { + if (ar == null) { + return null; + } + switch (ar.size()) { + case 1: + return new GrayColor(ar.getAsNumber(0).floatValue()); + case 3: + return new Color(ExtendedColor.normalize(ar.getAsNumber(0).floatValue()), + ExtendedColor.normalize(ar.getAsNumber(1).floatValue()), + ExtendedColor.normalize(ar.getAsNumber(2).floatValue())); + case 4: + return new CMYKColor(ar.getAsNumber(0).floatValue(), ar.getAsNumber(1).floatValue(), + ar.getAsNumber(2).floatValue(), + ar.getAsNumber(3).floatValue()); + default: + return null; + } + } + + /** + * Gets the field value. + * + * @param name the fully qualified field name + * @return the field value + */ + public String getField(String name) { + if (xfa.isXfaPresent()) { + name = xfa.findFieldName(name, this); + if (name == null) { + return null; + } + name = XfaForm.Xml2Som.getShortName(name); + return XfaForm.getNodeText(xfa.findDatasetsNode(name)); + } + Item item = fields.get(name); + if (item == null) { + return null; + } + lastWasString = false; + PdfDictionary mergedDict = item.getMerged(0); + + // Jose A. Rodriguez posted a fix to the mailing list (May 11, 2009) + // explaining that the value can also be a stream value + // the fix was made against an old iText version. Bruno adapted it. + PdfObject v = PdfReader.getPdfObject(mergedDict.get(PdfName.V)); + if (v == null) { + if (this.getFieldType(name) == AcroFields.FIELD_TYPE_CHECKBOX) { + return "Off"; + } + return ""; + } + if (v instanceof PRStream) { + byte[] valBytes; + try { + valBytes = PdfReader.getStreamBytes((PRStream) v); + return new String(valBytes); + } catch (IOException e) { + throw new ExceptionConverter(e); + } + } + + PdfName type = mergedDict.getAsName(PdfName.FT); + if (PdfName.BTN.equals(type)) { + PdfNumber ff = mergedDict.getAsNumber(PdfName.FF); + int flags = 0; + if (ff != null) { + flags = ff.intValue(); + } + if ((flags & PdfFormField.FF_PUSHBUTTON) != 0) { + return ""; + } + String value = ""; + if (v instanceof PdfName) { + value = PdfName.decodeName(v.toString()); + } else if (v instanceof PdfString) { + value = ((PdfString) v).toUnicodeString(); + } + PdfArray opts = item.getValue(0).getAsArray(PdfName.OPT); + if (opts != null) { + int idx = 0; + try { + idx = Integer.parseInt(value); + PdfString ps = opts.getAsString(idx); + value = ps.toUnicodeString(); + lastWasString = true; + } catch (Exception ignored) { + } + } + return value; + } + if (v instanceof PdfString) { + lastWasString = true; + return ((PdfString) v).toUnicodeString(); + } else if (v instanceof PdfName) { + return PdfName.decodeName(v.toString()); + } else if (v instanceof PdfArray) { + return ((PdfArray) v).toString(); + } else { + return ""; + } + } + + /** + * Gets the field values of a Choice field. + * + * @param name the fully qualified field name + * @return the field value + * @since 2.1.3 + */ + public String[] getListSelection(String name) { + String[] ret; + String s = getField(name); + if (s == null) { + ret = new String[]{}; + } else { + ret = new String[]{s}; + } + Item item = fields.get(name); + if (item == null) { + return ret; + } + //PdfName type = (PdfName)PdfReader.getPdfObject(((PdfDictionary)item.merged.get(0)).get(PdfName.FT)); + //if (!PdfName.CH.equals(type)) { + // return ret; + //} + PdfArray values = item.getMerged(0).getAsArray(PdfName.I); + if (values == null) { + return ret; + } + ret = new String[values.size()]; + String[] options = getListOptionExport(name); + PdfNumber n; + int idx = 0; + for (PdfObject pdfObject : values.getElements()) { + n = (PdfNumber) pdfObject; + ret[idx++] = options[n.intValue()]; + } + return ret; + } + + /** + * Sets a field property. Valid property names are: + * + *

      + *
    • textfont - sets the text font. The value for this entry is a BaseFont.
      + *
    • textcolor - sets the text color. The value for this entry is a java.awt.Color.
      + *
    • textsize - sets the text size. The value for this entry is a Float. + *
    • bgcolor - sets the background color. The value for this entry is a java.awt.Color. + * If null removes the background.
      + *
    • bordercolor - sets the border color. The value for this entry is a java.awt.Color. + * If null removes the border.
      + *
    + * + * @param field the field name + * @param name the property name + * @param value the property value + * @param inst an array of int indexing into AcroField.Item.merged elements to process. + * Set to null to process all + * @return true if the property exists, false otherwise + */ + public boolean setFieldProperty(String field, String name, Object value, int[] inst) { + if (writer == null) { + throw new RuntimeException(MessageLocalization.getComposedMessage("this.acrofields.instance.is.read.only")); + } + try { + Item item = fields.get(field); + if (item == null) { + return false; + } + InstHit hit = new InstHit(inst); + PdfDictionary merged; + PdfString da; + if (name.equalsIgnoreCase("textfont")) { + for (int k = 0; k < item.size(); ++k) { + if (hit.isHit(k)) { + merged = item.getMerged(k); + da = merged.getAsString(PdfName.DA); + PdfDictionary dr = merged.getAsDict(PdfName.DR); + if (da != null && dr != null) { + Object[] dao = splitDAelements(da.toUnicodeString()); + PdfAppearance cb = new PdfAppearance(this.writer); + if (dao[DA_FONT] != null) { + BaseFont bf = (BaseFont) value; + PdfName psn = PdfAppearance.stdFieldFontNames.get(bf.getPostscriptFontName()); + if (psn == null) { + psn = new PdfName(bf.getPostscriptFontName()); + } + PdfDictionary fonts = dr.getAsDict(PdfName.FONT); + if (fonts == null) { + fonts = new PdfDictionary(); + dr.put(PdfName.FONT, fonts); + } + PdfIndirectReference fref = (PdfIndirectReference) fonts.get(psn); + PdfDictionary top = reader.getCatalog().getAsDict(PdfName.ACROFORM); + markUsed(top); + dr = top.getAsDict(PdfName.DR); + if (dr == null) { + dr = new PdfDictionary(); + top.put(PdfName.DR, dr); + } + markUsed(dr); + PdfDictionary fontsTop = dr.getAsDict(PdfName.FONT); + if (fontsTop == null) { + fontsTop = new PdfDictionary(); + dr.put(PdfName.FONT, fontsTop); + } + markUsed(fontsTop); + PdfIndirectReference frefTop = (PdfIndirectReference) fontsTop.get(psn); + if (frefTop != null) { + if (fref == null) { + fonts.put(psn, frefTop); + } + } else if (fref == null) { + FontDetails fd; + if (bf.getFontType() == BaseFont.FONT_TYPE_DOCUMENT) { + fd = new FontDetails(null, ((DocumentFont) bf).getIndirectReference(), bf); + } else { + bf.setSubset(false); + fd = writer.addSimple(bf); + localFonts.put(psn.toString().substring(1), bf); + } + fontsTop.put(psn, fd.getIndirectReference()); + fonts.put(psn, fd.getIndirectReference()); + } + ByteBuffer buf = cb.getInternalBuffer(); + buf.append(psn.getBytes()).append(' ').append((Float) dao[DA_SIZE]).append(" Tf "); + if (dao[DA_COLOR] != null) { + cb.setColorFill((Color) dao[DA_COLOR]); + } + PdfString s = new PdfString(cb.toString()); + item.getMerged(k).put(PdfName.DA, s); + item.getWidget(k).put(PdfName.DA, s); + markUsed(item.getWidget(k)); + } + } + } + } + } else if (name.equalsIgnoreCase("textcolor")) { + for (int k = 0; k < item.size(); ++k) { + if (hit.isHit(k)) { + merged = item.getMerged(k); + da = merged.getAsString(PdfName.DA); + if (da != null) { + Object[] dao = splitDAelements(da.toUnicodeString()); + PdfAppearance cb = new PdfAppearance(this.writer); + if (dao[DA_FONT] != null) { + ByteBuffer buf = cb.getInternalBuffer(); + buf.append(new PdfName((String) dao[DA_FONT]).getBytes()).append(' ') + .append((Float) dao[DA_SIZE]) + .append(" Tf "); + cb.setColorFill((Color) value); + PdfString s = new PdfString(cb.toString()); + item.getMerged(k).put(PdfName.DA, s); + item.getWidget(k).put(PdfName.DA, s); + markUsed(item.getWidget(k)); + } + } + } + } + } else if (name.equalsIgnoreCase("textsize")) { + for (int k = 0; k < item.size(); ++k) { + if (hit.isHit(k)) { + merged = item.getMerged(k); + da = merged.getAsString(PdfName.DA); + if (da != null) { + Object[] dao = splitDAelements(da.toUnicodeString()); + PdfAppearance cb = new PdfAppearance(this.writer); + if (dao[DA_FONT] != null) { + ByteBuffer buf = cb.getInternalBuffer(); + Float fontSize = (float) Font.DEFAULTSIZE; + if (value != null) { + fontSize = (Float) value; + } + buf.append(new PdfName((String) dao[DA_FONT]).getBytes()).append(' ').append(fontSize) + .append(" Tf "); + if (dao[DA_COLOR] != null) { + cb.setColorFill((Color) dao[DA_COLOR]); + } + PdfString s = new PdfString(cb.toString()); + item.getMerged(k).put(PdfName.DA, s); + item.getWidget(k).put(PdfName.DA, s); + markUsed(item.getWidget(k)); + } + } + } + } + } else if (name.equalsIgnoreCase("bgcolor") || name.equalsIgnoreCase("bordercolor")) { + PdfName dname = (name.equalsIgnoreCase("bgcolor") ? PdfName.BG : PdfName.BC); + for (int k = 0; k < item.size(); ++k) { + if (hit.isHit(k)) { + merged = item.getMerged(k); + PdfDictionary mk = merged.getAsDict(PdfName.MK); + if (mk == null) { + if (value == null) { + return true; + } + mk = new PdfDictionary(); + item.getMerged(k).put(PdfName.MK, mk); + item.getWidget(k).put(PdfName.MK, mk); + markUsed(item.getWidget(k)); + } else { + markUsed(mk); + } + if (value == null) { + mk.remove(dname); + } else { + mk.put(dname, PdfFormField.getMKColor((Color) value)); + } + } + } + } else { + return false; + } + return true; + } catch (Exception e) { + throw new ExceptionConverter(e); + } + } + + /** + * Gets a field property. Valid property names are: + *

    + *

      + *
    • textfont - gets the text font. The return value for this entry is a String.
      + *
    • textcolor - gets the text color. The return value for this entry is a java.awt.Color.
      + *
    • textsize - gets the text size. The return value for this entry is a Float. + *
    • textfontsall - gets all available fonts used in the PDF. The return value for this entry is a + * Set<String> with font names. + *
    • bgcolor - gets the background color. The return value for this entry is a java.awt.Color. + *
    • bordercolor - gets the border color. The return value for this entry is a java.awt.Color. + *
    + *

    + * If the property does not exist null is returned. + * + * @param field - the field name + * @param name - the property name + * @param idx - the index of the widget + * @return the above described object or null if the property is not set + */ + public Object getFieldProperty(String field, String name, int idx) { + if (this.reader == null) { + throw new RuntimeException("No reader has been supplied to this AcroFields instance!"); + } + try { + Item item = (Item) this.fields.get(field); + if (item == null) { + return false; + } + + PdfDictionary merged; + PdfString da; + if (name.startsWith("text") && item.size() > idx) { + merged = item.getMerged(idx); + da = merged.getAsString(PdfName.DA); + if (da != null) { + Object[] dao = splitDAelements(da.toUnicodeString()); + if ("textfont".equalsIgnoreCase(name)) { + String fontResourceName = (String) dao[DA_FONT]; + + if (fontResourceName == null) { + return fontResourceName; + } + + // check the resource dict to get the real font name + PdfDictionary dr = merged.getAsDict(PdfName.DR); + // might have to look globally instead? + if (dr == null) { + return fontResourceName; + } + + PdfDictionary fonts = dr.getAsDict(PdfName.FONT); + if (fonts == null) { + return fontResourceName; + } + + PdfName fontResourceId = new PdfName(fontResourceName); + PdfDictionary fontDict = fonts.getAsDict(fontResourceId); + + if (fontDict == null) { + // this is strange normally a font should have been found! + return fontResourceName; + } + + // Do not use "PdfName.Name" since it is deprecated (according to the PDF spec) + PdfName fontName = fontDict.getAsName(PdfName.BASEFONT); + // theoretically we could check the fontdescriptor and get the /FontName but + // BASEFONT is required so it should always be there... + if (fontName == null) { + // this would be strange since BASEFONT is required according to the pdf spec) + return fontResourceName; + } + return PdfName.decodeName(fontName.toString()); + } else if ("textcolor".equalsIgnoreCase(name)) { + return dao[DA_COLOR]; + } else if ("textsize".equalsIgnoreCase(name)) { + return dao[DA_SIZE]; + } else if ("textfontsall".equalsIgnoreCase(name)) { + + HashSet fonts = new HashSet<>(); + + // fetch all fonts + PdfDictionary root = this.reader.getCatalog(); + PdfDictionary acrofields = root.getAsDict(PdfName.ACROFORM); + + PdfDictionary allFieldsDR = acrofields.getAsDict(PdfName.DR); + if (allFieldsDR == null) { + return fonts; + } + + PdfDictionary acroFieldsFonts = allFieldsDR.getAsDict(PdfName.FONT); + if (acroFieldsFonts == null) { + return fonts; + } + + for (PdfName key : acroFieldsFonts.getKeys()) { + PdfDictionary pdfFont = acroFieldsFonts.getAsDict(key); + + PdfName fontName = pdfFont.getAsName(PdfName.BASEFONT); + if (fontName != null) { + fonts.add(PdfName.decodeName(fontName.toString())); + } else { + // Basefont was not found (which is unlikely since required by pdf spec. (so its a + // fallback) + PdfDictionary fontDescriptor = pdfFont.getAsDict(PdfName.FONTDESCRIPTOR); + + if (fontDescriptor != null) { + // the BASEFONT was not set so extract the /FontName key + PdfString fontname = fontDescriptor.getAsString(PdfName.FONTNAME); + if (fontname != null) { + fonts.add(PdfName.decodeName(fontname.toString())); + } + } + } + } + return fonts; + } + throw new RuntimeException("Unknown property: " + name); + } + return null; + } else if ("bgcolor".equalsIgnoreCase(name) || "bordercolor".equalsIgnoreCase(name)) { + PdfName dname = ("bgcolor".equalsIgnoreCase(name) ? PdfName.BG : PdfName.BC); + merged = item.getMerged(idx); + PdfDictionary mk = merged.getAsDict(PdfName.MK); + if (mk == null) { + return null; + } else { + PdfArray color = mk.getAsArray(dname); + return parseColor(color); + } + } else { + throw new RuntimeException("Unknown property: " + name); + } + } catch (Exception e) { + throw new ExceptionConverter(e); + } + } + + /** + * Sets a field property. Valid property names are: + * + *

      + *
    • flags - a set of flags specifying various characteristics of the field's widget annotation. + * The value of this entry replaces that of the F entry in the form's corresponding annotation dictionary.
      + *
    • setflags - a set of flags to be set (turned on) in the F entry of the form's corresponding + * widget annotation dictionary. Bits equal to 1 cause the corresponding bits in F to be set to 1.
      + *
    • clrflags - a set of flags to be cleared (turned off) in the F entry of the form's corresponding + * widget annotation dictionary. Bits equal to 1 cause the corresponding bits in F to be set to 0.
      + *
    • fflags - a set of flags specifying various characteristics of the field. The value + * of this entry replaces that of the Ff entry in the form's corresponding field dictionary.
      + *
    • setfflags - a set of flags to be set (turned on) in the Ff entry of the form's corresponding + * field dictionary. Bits equal to 1 cause the corresponding bits in Ff to be set to 1.
      + *
    • clrfflags - a set of flags to be cleared (turned off) in the Ff entry of the form's corresponding + * field dictionary. Bits equal to 1 cause the corresponding bits in Ff to be set to 0.
      + *
    + * + * @param field the field name + * @param name the property name + * @param value the property value + * @param inst an array of int indexing into AcroField.Item.merged elements to process. + * Set to null to process all + * @return true if the property exists, false otherwise + */ + public boolean setFieldProperty(String field, String name, int value, int[] inst) { + return this.setFieldProperty(this.fields.get(field), name, value, inst); + } + + /** + * Sets a field property. Valid property names are: + * + *
      + *
    • flags - a set of flags specifying various characteristics of the field's widget annotation. + * The value of this entry replaces that of the F entry in the form's corresponding annotation dictionary.
      + *
    • setflags - a set of flags to be set (turned on) in the F entry of the form's corresponding + * widget annotation dictionary. Bits equal to 1 cause the corresponding bits in F to be set to 1.
      + *
    • clrflags - a set of flags to be cleared (turned off) in the F entry of the form's corresponding + * widget annotation dictionary. Bits equal to 1 cause the corresponding bits in F to be set to 0.
      + *
    • fflags - a set of flags specifying various characteristics of the field. The value + * of this entry replaces that of the Ff entry in the form's corresponding field dictionary.
      + *
    • setfflags - a set of flags to be set (turned on) in the Ff entry of the form's corresponding + * field dictionary. Bits equal to 1 cause the corresponding bits in Ff to be set to 1.
      + *
    • clrfflags - a set of flags to be cleared (turned off) in the Ff entry of the form's corresponding + * field dictionary. Bits equal to 1 cause the corresponding bits in Ff to be set to 0.
      + *
    + * + * @param item of the field + * @param name the property name + * @param value the property value + * @param inst an array of int indexing into AcroField.Item.merged elements to process. + * Set to null to process all + * @return true if the property exists, false otherwise + */ + public boolean setFieldProperty(Item item, String name, int value, int[] inst) { + if (writer == null) { + throw new RuntimeException(MessageLocalization.getComposedMessage("this.acrofields.instance.is.read.only")); + } + if (item == null) { + return false; + } + InstHit hit = new InstHit(inst); + if (name.equalsIgnoreCase("flags")) { + PdfNumber num = new PdfNumber(value); + for (int k = 0; k < item.size(); ++k) { + if (hit.isHit(k)) { + item.getMerged(k).put(PdfName.F, num); + item.getWidget(k).put(PdfName.F, num); + markUsed(item.getWidget(k)); + } + } + } else if (name.equalsIgnoreCase("setflags")) { + for (int k = 0; k < item.size(); ++k) { + if (hit.isHit(k)) { + PdfNumber num = item.getWidget(k).getAsNumber(PdfName.F); + int val = 0; + if (num != null) { + val = num.intValue(); + } + num = new PdfNumber(val | value); + item.getMerged(k).put(PdfName.F, num); + item.getWidget(k).put(PdfName.F, num); + markUsed(item.getWidget(k)); + } + } + } else if (name.equalsIgnoreCase("clrflags")) { + for (int k = 0; k < item.size(); ++k) { + if (hit.isHit(k)) { + PdfDictionary widget = item.getWidget(k); + PdfNumber num = widget.getAsNumber(PdfName.F); + int val = 0; + if (num != null) { + val = num.intValue(); + } + num = new PdfNumber(val & (~value)); + item.getMerged(k).put(PdfName.F, num); + widget.put(PdfName.F, num); + markUsed(widget); + } + } + } else if (name.equalsIgnoreCase("fflags")) { + PdfNumber num = new PdfNumber(value); + for (int k = 0; k < item.size(); ++k) { + if (hit.isHit(k)) { + item.getMerged(k).put(PdfName.FF, num); + item.getValue(k).put(PdfName.FF, num); + markUsed(item.getValue(k)); + } + } + } else if (name.equalsIgnoreCase("setfflags")) { + for (int k = 0; k < item.size(); ++k) { + if (hit.isHit(k)) { + PdfDictionary valDict = item.getValue(k); + PdfNumber num = valDict.getAsNumber(PdfName.FF); + int val = 0; + if (num != null) { + val = num.intValue(); + } + num = new PdfNumber(val | value); + item.getMerged(k).put(PdfName.FF, num); + valDict.put(PdfName.FF, num); + markUsed(valDict); + } + } + } else if (name.equalsIgnoreCase("clrfflags")) { + for (int k = 0; k < item.size(); ++k) { + if (hit.isHit(k)) { + PdfDictionary valDict = item.getValue(k); + PdfNumber num = valDict.getAsNumber(PdfName.FF); + int val = 0; + if (num != null) { + val = num.intValue(); + } + num = new PdfNumber(val & (~value)); + item.getMerged(k).put(PdfName.FF, num); + valDict.put(PdfName.FF, num); + markUsed(valDict); + } + } + } else { + return false; + } + return true; + } + + /** + * Merges an XML data structure into this form. + * + * @param n the top node of the data structure + * @throws java.io.IOException on error + * @throws com.lowagie.text.DocumentException o error + */ + public void mergeXfaData(Node n) throws IOException, DocumentException { + XfaForm.Xml2SomDatasets data = new XfaForm.Xml2SomDatasets(n); + for (String name : data.getNamesOrder()) { + String text = XfaForm.getNodeText(data.getNodesByName().get(name)); + setField(name, text); + } + } + + /** + * Sets the fields by FDF merging. + * + * @param fdf the FDF form + * @throws IOException on error + * @throws DocumentException on error + */ + public void setFields(FdfReader fdf) throws IOException, DocumentException { + Map fd = fdf.getAllFields(); + for (String f : fd.keySet()) { + String v = fdf.getFieldValue(f); + if (v != null) { + setField(f, v); + } + } + } + + /** + * Allows merging the fields by a field reader. One use would be to set the fields by XFDF merging. + * + * @param fieldReader The fields to merge. + * @throws IOException on error + * @throws DocumentException on error + */ + public void setFields(XfdfReader fieldReader) throws IOException, DocumentException { + setFields((FieldReader) fieldReader); + } + + /** + * Allows merging the fields by a field reader. One use would be to set the fields by XFDF merging. + * + * @param fieldReader The fields to merge. + * @throws IOException on error + * @throws DocumentException on error + */ + public void setFields(FieldReader fieldReader) throws IOException, DocumentException { + Map fd = fieldReader.getAllFields(); + for (String f : fd.keySet()) { + String v = fieldReader.getFieldValue(f); + if (v != null) { + setField(f, v); + } + List list = fieldReader.getListValues(f); + if (list != null) { + setListSelection(v, list.toArray(new String[0])); + } + } + } + + /** + * Regenerates the field appearance. This is useful when you change a field property, but not its value, for + * instance form.setFieldProperty("f", "bgcolor", Color.BLUE, null); This won't have any effect, unless you use + * regenerateField("f") after changing the property. + * + * @param name the fully qualified field name or the partial name in the case of XFA forms + * @return true if the field was found and changed, + * false otherwise + * @throws IOException on error + * @throws DocumentException on error + */ + public boolean regenerateField(String name) throws IOException, DocumentException { + String value = getField(name); + return setField(name, value, value); + } + + /** + * Sets the field value. + * + * @param name the fully qualified field name or the partial name in the case of XFA forms + * @param value the field value + * @return true if the field was found and changed, + * false otherwise + * @throws IOException on error + * @throws DocumentException on error + */ + public boolean setField(String name, String value) throws IOException, DocumentException { + return setField(name, value, null); + } + + /** + * Sets the field value and the display string. The display string is used to build the appearance in the cases + * where the value is modified by Acrobat with JavaScript and the algorithm is known. + * + * @param name the fully qualified field name or the partial name in the case of XFA forms + * @param value the field value + * @param display the string that is used for the appearance. If null the value parameter + * will be used + * @return true if the field was found and changed, + * false otherwise + * @throws IOException on error + * @throws DocumentException on error + */ + public boolean setField(String name, String value, String display) throws IOException, DocumentException { + if (writer == null) { + throw new DocumentException( + MessageLocalization.getComposedMessage("this.acrofields.instance.is.read.only")); + } + if (xfa.isXfaPresent()) { + name = xfa.findFieldName(name, this); + if (name == null) { + return false; + } + String shortName = XfaForm.Xml2Som.getShortName(name); + Node xn = xfa.findDatasetsNode(shortName); + if (xn == null) { + xn = xfa.getDatasetsSom().insertNode(xfa.getDatasetsNode(), shortName); + } + xfa.setNodeText(xn, value); + } + Item item = fields.get(name); + if (item == null) { + return false; + } + PdfDictionary merged = item.getMerged(0); + PdfName type = merged.getAsName(PdfName.FT); + if (PdfName.TX.equals(type)) { + PdfNumber maxLen = merged.getAsNumber(PdfName.MAXLEN); + int len = 0; + if (maxLen != null) { + len = maxLen.intValue(); + } + if (len > 0) { + value = value.substring(0, Math.min(len, value.length())); + } + } + if (display == null) { + display = value; + } + if (PdfName.TX.equals(type) || PdfName.CH.equals(type)) { + PdfString v = new PdfString(value, PdfObject.TEXT_UNICODE); + for (int idx = 0; idx < item.size(); ++idx) { + PdfDictionary valueDic = item.getValue(idx); + valueDic.put(PdfName.V, v); + valueDic.remove(PdfName.I); + markUsed(valueDic); + merged = item.getMerged(idx); + merged.remove(PdfName.I); + merged.put(PdfName.V, v); + PdfDictionary widget = item.getWidget(idx); + if (generateAppearances) { + PdfAppearance app = getAppearance(merged, display, name); + if (PdfName.CH.equals(type)) { + PdfNumber n = new PdfNumber(topFirst); + widget.put(PdfName.TI, n); + merged.put(PdfName.TI, n); + } + PdfDictionary appDic = widget.getAsDict(PdfName.AP); + if (appDic == null) { + appDic = new PdfDictionary(); + widget.put(PdfName.AP, appDic); + merged.put(PdfName.AP, appDic); + } + appDic.put(PdfName.N, app.getIndirectReference()); + writer.releaseTemplate(app); + } else { + widget.remove(PdfName.AP); + merged.remove(PdfName.AP); + } + markUsed(widget); + } + return true; + } else if (PdfName.BTN.equals(type)) { + PdfNumber ff = item.getMerged(0).getAsNumber(PdfName.FF); + int flags = 0; + if (ff != null) { + flags = ff.intValue(); + } + if ((flags & PdfFormField.FF_PUSHBUTTON) != 0) { + //we'll assume that the value is an image in base64 + Image img; + try { + img = Image.getInstance(Base64.getDecoder().decode(value)); + } catch (Exception e) { + return false; + } + PushbuttonField pb = getNewPushbuttonFromField(name); + pb.setImage(img); + replacePushbuttonField(name, pb.getField()); + return true; + } + PdfName v = new PdfName(value); + List lopt = new ArrayList<>(); + PdfArray opts = item.getValue(0).getAsArray(PdfName.OPT); + if (opts != null) { + for (int k = 0; k < opts.size(); ++k) { + PdfString valStr = opts.getAsString(k); + if (valStr != null) { + lopt.add(valStr.toUnicodeString()); + } else { + lopt.add(null); + } + } + } + int vidx = lopt.indexOf(value); + PdfName vt; + if (vidx >= 0) { + vt = new PdfName(String.valueOf(vidx)); + } else { + vt = v; + } + for (int idx = 0; idx < item.size(); ++idx) { + merged = item.getMerged(idx); + PdfDictionary widget = item.getWidget(idx); + PdfDictionary valDict = item.getValue(idx); + markUsed(item.getValue(idx)); + valDict.put(PdfName.V, vt); + merged.put(PdfName.V, vt); + markUsed(widget); + if (isInAP(widget, vt)) { + merged.put(PdfName.AS, vt); + widget.put(PdfName.AS, vt); + } else { + merged.put(PdfName.AS, PdfName.Off); + widget.put(PdfName.AS, PdfName.Off); + } + } + return true; + } + return false; + } + + /** + * Sets different values in a list selection. No appearance is generated yet; nor does the code check if multiple + * select is allowed. + * + * @param name the name of the field + * @param value an array with values that need to be selected + * @return true only if the field value was changed + * @throws IOException on error + * @throws DocumentException on error + * @since 2.1.4 + */ + public boolean setListSelection(String name, String[] value) throws IOException, DocumentException { + Item item = getFieldItem(name); + if (item == null) { + return false; + } + PdfDictionary merged = item.getMerged(0); + PdfName type = merged.getAsName(PdfName.FT); + if (!PdfName.CH.equals(type)) { + return false; + } + String[] options = getListOptionExport(name); + PdfArray array = new PdfArray(); + for (String s1 : value) { + for (int j = 0; j < options.length; j++) { + if (options[j].equals(s1)) { + array.add(new PdfNumber(j)); + break; + } + } + } + item.writeToAll(PdfName.I, array, Item.WRITE_MERGED | Item.WRITE_VALUE); + + PdfArray vals = new PdfArray(); + for (String s : value) { + vals.add(new PdfString(s)); + } + item.writeToAll(PdfName.V, vals, Item.WRITE_MERGED | Item.WRITE_VALUE); + + PdfAppearance app = getAppearance(merged, value, name); + + PdfDictionary apDic = new PdfDictionary(); + apDic.put(PdfName.N, app.getIndirectReference()); + item.writeToAll(PdfName.AP, apDic, Item.WRITE_MERGED | Item.WRITE_WIDGET); + + writer.releaseTemplate(app); + + item.markUsed(this, Item.WRITE_VALUE | Item.WRITE_WIDGET); + return true; + } + + boolean isInAP(PdfDictionary dic, PdfName check) { + PdfDictionary appDic = dic.getAsDict(PdfName.AP); + if (appDic == null) { + return false; + } + PdfDictionary NDic = appDic.getAsDict(PdfName.N); + return (NDic != null && NDic.get(check) != null); + } + + /** + * Gets all the fields. The fields are keyed by the fully qualified field name and the value is an instance of + * AcroFields.Item. + * + * @return all the fields + */ + public Map getAllFields() { + return fields; + } + + /** + * Gets the field structure. + * + * @param name the name of the field + * @return the field structure or null if the field does not exist + */ + public Item getFieldItem(String name) { + if (xfa.isXfaPresent()) { + name = xfa.findFieldName(name, this); + if (name == null) { + return null; + } + } + return fields.get(name); + } + + /** + * Gets the long XFA translated name. + * + * @param name the name of the field + * @return the long field name + */ + public String getTranslatedFieldName(String name) { + if (xfa.isXfaPresent()) { + String namex = xfa.findFieldName(name, this); + if (namex != null) { + name = namex; + } } - Item item = fields.get(name); + return name; + } + + /** + * Gets the field box positions in the document. The return is an array of float multiple of 5. For + * each of this groups the values are: [page, llx, lly, urx, ury]. The coordinates have the page rotation in + * consideration. + * + * @param name the field name + * @return the positions or null if field does not exist + */ + public float[] getFieldPositions(String name) { + Item item = getFieldItem(name); if (item == null) { - if(parentRef==null) { - //when there is no /Parent ref the item reference will be used - parentRef = indirectObject; - } - item = new Item(parentRef); - fields.put(name, item); + return null; } - if (value == null) { - item.addValue(widget); - } else { - item.addValue(value); - } - item.addWidget(widget); - item.addWidgetRef(annots.getAsIndirectObject(j)); // must be a reference - dic.mergeDifferent(top); - item.addMerged(dic); - item.addPage(k); - item.addTabOrder(j); - } - } - // some tools produce invisible signatures without an entry in the page annotation array - // look for a single level annotation - PdfNumber sigFlags = top.getAsNumber(PdfName.SIGFLAGS); - if (sigFlags == null || (sigFlags.intValue() & 1) != 1) { - return; - } - for (int j = 0; j < arrfds.size(); ++j) { - PdfDictionary annot = arrfds.getAsDict(j); - PdfIndirectReference annotRef = arrfds.getAsIndirectObject(j); - if (annot == null) { - PdfReader.releaseLastXrefPartial(annotRef); - continue; - } - if (!PdfName.WIDGET.equals(annot.getAsName(PdfName.SUBTYPE))) { - PdfReader.releaseLastXrefPartial(arrfds.getAsIndirectObject(j)); - continue; - } - PdfArray kids = (PdfArray) PdfReader.getPdfObjectRelease(annot.get(PdfName.KIDS)); - if (kids != null) { - continue; - } - PdfDictionary dic = new PdfDictionary(); - dic.putAll(annot); - PdfString t = annot.getAsString(PdfName.T); - if (t == null) { - continue; - } - String name = t.toUnicodeString(); - if (fields.containsKey(name)) { - continue; - } - Item item = new Item(annotRef); - fields.put(name, item); - item.addValue(dic); - item.addWidget(dic); - item.addWidgetRef(arrfds.getAsIndirectObject(j)); // must be a reference - item.addMerged(dic); - item.addPage(-1); - item.addTabOrder(-1); - } - } - - /** - * Gets the list of appearance names. Use it to get the names allowed with radio and checkbox fields. If the /Opt key exists the values - * will also be included. The name 'Off' may also be valid even if not returned in the list. - * - * @param fieldName the fully qualified field name - * @return the list of names or null if the field does not exist - */ - public String[] getAppearanceStates(String fieldName) { - Item fd = fields.get(fieldName); - if (fd == null) { - return null; - } - Map names = new HashMap<>(); - PdfDictionary vals = fd.getValue(0); - PdfString stringOpt = vals.getAsString(PdfName.OPT); - if (stringOpt != null) { - names.put(stringOpt.toUnicodeString(), null); - } else { - PdfArray arrayOpt = vals.getAsArray(PdfName.OPT); - if (arrayOpt != null) { - for (int k = 0; k < arrayOpt.size(); ++k) { - PdfString valStr = arrayOpt.getAsString(k); - if (valStr != null) { - names.put(valStr.toUnicodeString(), null); - } - } - } - } - for (int k = 0; k < fd.size(); ++k) { - PdfDictionary dic = fd.getWidget(k); - dic = dic.getAsDict(PdfName.AP); - if (dic == null) { - continue; - } - dic = dic.getAsDict(PdfName.N); - if (dic == null) { - continue; - } - for (Object o : dic.getKeys()) { - String name = PdfName.decodeName(o.toString()); - names.put(name, null); - } - } - String[] out = new String[names.size()]; - return names.keySet().toArray(out); - } - - /** - * Returns the names of the N-appearance dictionaries - * @param fieldName name of the form field - * @param idx widget index - * @return String[] of appearance names or null if the field can not be found - */ - public String[] getAppearanceNames(String fieldName, int idx) { - Item fd = (Item)this.fields.get(fieldName); - if (fd == null) return null; - ArrayList names = new ArrayList(); - - - PdfDictionary dic = fd.getWidget( idx ); - dic = dic.getAsDict(PdfName.AP); - if (dic != null) { - dic = dic.getAsDict(PdfName.N); - if (dic != null) { - - Iterator it = dic.getKeys().iterator(); - while(it.hasNext()) { - String name = PdfName.decodeName(((PdfName)it.next()).toString()); - if(!names.contains(name)){ - names.add(name); - } - } - } - } - return names.toArray(new String[names.size()]); - } - - private String[] getListOption(String fieldName, int idx) { - Item fd = getFieldItem(fieldName); - if (fd == null) { - return null; - } - PdfArray ar = fd.getMerged(0).getAsArray(PdfName.OPT); - if (ar == null) { - return null; - } - String[] ret = new String[ar.size()]; - for (int k = 0; k < ar.size(); ++k) { - PdfObject obj = ar.getDirectObject(k); - try { - if (obj.isArray()) { - obj = ((PdfArray) obj).getDirectObject(idx); - } - if (obj.isString()) { - ret[k] = ((PdfString) obj).toUnicodeString(); - } else { - ret[k] = obj.toString(); - } - } catch (Exception e) { - ret[k] = ""; - } - } - return ret; - } - - /** - * Gets the list of export option values from fields of type list or combo. If the field doesn't exist or the field type is not list or - * combo it will return - * null. - * - * @param fieldName the field name - * @return the list of export option values from fields of type list or combo - */ - public String[] getListOptionExport(String fieldName) { - return getListOption(fieldName, 0); - } - - /** - * Gets the list of display option values from fields of type list or combo. If the field doesn't exist or the field type is not list or - * combo it will return - * null. - * - * @param fieldName the field name - * @return the list of export option values from fields of type list or combo - */ - public String[] getListOptionDisplay(String fieldName) { - return getListOption(fieldName, 1); - } - - /** - * Sets the option list for fields of type list or combo. One of exportValues or displayValues may be - * null but not both. This method will only set the list but will not set the value or appearance. For that, calling - * setField() is required. - *

    - * An example: - *

    - * 
    -   * PdfReader pdf = new PdfReader("input.pdf"); PdfStamper stp = new PdfStamper(pdf, new FileOutputStream("output.pdf")); AcroFields af =
-   * stp.getAcroFields(); af.setListOption("ComboBox", new String[]{"a", "b", "c"}, new String[]{"first", "second", "third"});
-   * af.setField("ComboBox", "b"); stp.close();
-   *
    - * - * @param fieldName the field name - * @param exportValues the export values - * @param displayValues the display values - * @return true if the operation succeeded, false otherwise - */ - public boolean setListOption(String fieldName, String[] exportValues, String[] displayValues) { - if (exportValues == null && displayValues == null) { - return false; - } - if (exportValues != null && displayValues != null && exportValues.length != displayValues.length) { - throw new IllegalArgumentException( - MessageLocalization.getComposedMessage("the.export.and.the.display.array.must.have.the.same.size")); - } - int ftype = getFieldType(fieldName); - if (ftype != FIELD_TYPE_COMBO && ftype != FIELD_TYPE_LIST) { - return false; - } - Item fd = fields.get(fieldName); - String[] sing = null; - if (exportValues == null) { - sing = displayValues; - } else if (displayValues == null) { - sing = exportValues; - } - PdfArray opt = new PdfArray(); - if (sing != null) { - for (String s : sing) { - opt.add(new PdfString(s, PdfObject.TEXT_UNICODE)); - } - } else { - for (int k = 0; k < exportValues.length; ++k) { - PdfArray a = new PdfArray(); - a.add(new PdfString(exportValues[k], PdfObject.TEXT_UNICODE)); - a.add(new PdfString(displayValues[k], PdfObject.TEXT_UNICODE)); - opt.add(a); - } - } - fd.writeToAll(PdfName.OPT, opt, Item.WRITE_VALUE | Item.WRITE_MERGED); - return true; - } - - /** - * Gets the field type. The type can be one of: FIELD_TYPE_PUSHBUTTON, - * FIELD_TYPE_CHECKBOX, FIELD_TYPE_RADIOBUTTON, - * FIELD_TYPE_TEXT, FIELD_TYPE_LIST, - * FIELD_TYPE_COMBO or FIELD_TYPE_SIGNATURE. - * - *

    If the field does not exist or is invalid it returns - * FIELD_TYPE_NONE. - * - * @param fieldName the field name - * @return the field type - */ - public int getFieldType(String fieldName) { - Item fd = getFieldItem(fieldName); - if (fd == null) { - return FIELD_TYPE_NONE; - } - PdfDictionary merged = fd.getMerged(0); - PdfName type = merged.getAsName(PdfName.FT); - if (type == null) { - return FIELD_TYPE_NONE; - } - int ff = 0; - PdfNumber ffo = merged.getAsNumber(PdfName.FF); - if (ffo != null) { - ff = ffo.intValue(); - } - if (PdfName.BTN.equals(type)) { - if ((ff & PdfFormField.FF_PUSHBUTTON) != 0) { - return FIELD_TYPE_PUSHBUTTON; - } - if ((ff & PdfFormField.FF_RADIO) != 0) { - return FIELD_TYPE_RADIOBUTTON; - } else { - return FIELD_TYPE_CHECKBOX; - } - } else if (PdfName.TX.equals(type)) { - return FIELD_TYPE_TEXT; - } else if (PdfName.CH.equals(type)) { - if ((ff & PdfFormField.FF_COMBO) != 0) { - return FIELD_TYPE_COMBO; - } else { - return FIELD_TYPE_LIST; - } - } else if (PdfName.SIG.equals(type)) { - return FIELD_TYPE_SIGNATURE; - } - return FIELD_TYPE_NONE; - } - - /** - * Export the fields as a FDF. - * - * @param writer the FDF writer - */ - public void exportAsFdf(FdfWriter writer) { - for (Map.Entry entry : fields.entrySet()) { - Item item = entry.getValue(); - String name = entry.getKey(); - PdfObject v = item.getMerged(0).get(PdfName.V); - if (v == null) { - continue; - } - String value = getField(name); - if (lastWasString) { - writer.setFieldAsString(name, value); - } else { - writer.setFieldAsName(name, value); - } - } - } - - /** - * Renames a field. Only the last part of the name can be renamed. For example, if the original field is "ab.cd.ef" only the "ef" part can - * be renamed. - * - * @param oldName the old field name - * @param newName the new field name - * @return true if the renaming was successful, false - * otherwise - */ - public boolean renameField(String oldName, String newName) { - int idx1 = oldName.lastIndexOf('.') + 1; - int idx2 = newName.lastIndexOf('.') + 1; - if (idx1 != idx2) { - return false; - } - if (!oldName.substring(0, idx1).equals(newName.substring(0, idx2))) { - return false; - } - if (fields.containsKey(newName)) { - return false; - } - Item item = fields.get(oldName); - if (item == null) { - return false; - } - newName = newName.substring(idx2); - PdfString ss = new PdfString(newName, PdfObject.TEXT_UNICODE); - - item.writeToAll(PdfName.T, ss, Item.WRITE_VALUE | Item.WRITE_MERGED); - item.markUsed(this, Item.WRITE_VALUE); - - fields.remove(oldName); - fields.put(newName, item); - - return true; - } - - public static Object[] splitDAelements(String da) { - try { - PRTokeniser tk = new PRTokeniser(PdfEncodings.convertToBytes(da, null)); - List stack = new ArrayList<>(); - Object[] ret = new Object[3]; - while (tk.nextToken()) { - if (tk.getTokenType() == PRTokeniser.TK_COMMENT) { - continue; - } - if (tk.getTokenType() == PRTokeniser.TK_OTHER) { - String operator = tk.getStringValue(); - switch (operator) { - case "Tf": - if (stack.size() >= 2) { - ret[DA_FONT] = stack.get(stack.size() - 2); - ret[DA_SIZE] = Float.parseFloat(stack.get(stack.size() - 1)); - } - break; - case "g": - if (stack.size() >= 1) { - float gray = Float.parseFloat(stack.get(stack.size() - 1)); - if (gray != 0) { - ret[DA_COLOR] = new GrayColor(gray); - } - } - break; - case "rg": - if (stack.size() >= 3) { - float red = Float.parseFloat(stack.get(stack.size() - 3)); - float green = Float.parseFloat(stack.get(stack.size() - 2)); - float blue = Float.parseFloat(stack.get(stack.size() - 1)); - ret[DA_COLOR] = new Color(red, green, blue); - } - break; - case "k": - if (stack.size() >= 4) { - float cyan = Float.parseFloat(stack.get(stack.size() - 4)); - float magenta = Float.parseFloat(stack.get(stack.size() - 3)); - float yellow = Float.parseFloat(stack.get(stack.size() - 2)); - float black = Float.parseFloat(stack.get(stack.size() - 1)); - ret[DA_COLOR] = new CMYKColor(cyan, magenta, yellow, black); - } - break; - } - stack.clear(); - } else { - stack.add(tk.getStringValue()); - } - } - return ret; - } catch (IOException ioe) { - throw new ExceptionConverter(ioe); - } - } - - public void decodeGenericDictionary(PdfDictionary merged, BaseField tx) throws DocumentException { - int flags = 0; - // the text size and color - PdfString da = merged.getAsString(PdfName.DA); - if (da != null) { - Object[] dab = splitDAelements(da.toUnicodeString()); - if (dab[DA_SIZE] != null) { - tx.setFontSize((Float) dab[DA_SIZE]); - } - if (dab[DA_COLOR] != null) { - tx.setTextColor((Color) dab[DA_COLOR]); - } - if (dab[DA_FONT] != null) { - PdfDictionary dr = merged.getAsDict(PdfName.DR); - if (dr != null) { - PdfDictionary font = dr.getAsDict(PdfName.FONT); - if (font != null) { - PdfObject po = font.get(new PdfName((String) dab[DA_FONT])); - if (po != null && po.type() == PdfObject.INDIRECT) { - PRIndirectReference por = (PRIndirectReference) po; - adjustFontEncoding(dr, por); - BaseFont bp = new DocumentFont(por); - tx.setFont(bp); - Integer porkey = por.getNumber(); - BaseFont porf = extensionFonts.get(porkey); - if (porf == null) { - if (!extensionFonts.containsKey(porkey)) { - PdfDictionary fo = (PdfDictionary) PdfReader.getPdfObject(po); - PdfDictionary fd = fo.getAsDict(PdfName.FONTDESCRIPTOR); - if (fd != null) { - PRStream prs = (PRStream) PdfReader.getPdfObject(fd.get(PdfName.FONTFILE2)); - if (prs == null) { - prs = (PRStream) PdfReader.getPdfObject(fd.get(PdfName.FONTFILE3)); - } - if (prs == null) { - extensionFonts.put(porkey, null); - } else { - try { - porf = BaseFont.createFont("font.ttf", BaseFont.IDENTITY_H, true, false, PdfReader.getStreamBytes(prs), null); - } catch (Exception ignored) { - } - extensionFonts.put(porkey, porf); - } - } + float[] ret = new float[item.size() * 5]; + int ptr = 0; + for (int k = 0; k < item.size(); ++k) { + try { + PdfDictionary wd = item.getWidget(k); + PdfArray rect = wd.getAsArray(PdfName.RECT); + if (rect == null) { + continue; } - } - if (tx instanceof TextField) { - ((TextField) tx).setExtensionFont(porf); - } - } else { - BaseFont bf = localFonts.get(dab[DA_FONT]); - if (bf == null) { - String[] fn = stdFieldFontNames.get(dab[DA_FONT]); - if (fn != null) { - try { - String enc = "winansi"; - if (fn.length > 1) { - enc = fn[1]; + Rectangle r = PdfReader.getNormalizedRectangle(rect); + int page = item.getPage(k); + int rotation = reader.getPageRotation(page); + ret[ptr++] = page; + if (rotation != 0) { + Rectangle pageSize = reader.getPageSize(page); + switch (rotation) { + case 270: + r = new Rectangle( + pageSize.getTop() - r.getBottom(), + r.getLeft(), + pageSize.getTop() - r.getTop(), + r.getRight()); + break; + case 180: + r = new Rectangle( + pageSize.getRight() - r.getLeft(), + pageSize.getTop() - r.getBottom(), + pageSize.getRight() - r.getRight(), + pageSize.getTop() - r.getTop()); + break; + case 90: + r = new Rectangle( + r.getBottom(), + pageSize.getRight() - r.getLeft(), + r.getTop(), + pageSize.getRight() - r.getRight()); + break; } - bf = BaseFont.createFont(fn[0], enc, false); - tx.setFont(bf); - } catch (Exception e) { - // empty - } + r.normalize(); } - } else { - tx.setFont(bf); - } - } - } - } - } - } - //rotation, border and background color - PdfDictionary mk = merged.getAsDict(PdfName.MK); - if (mk != null) { - PdfArray ar = mk.getAsArray(PdfName.BC); - Color border = getMKColor(ar); - tx.setBorderColor(border); - if (border != null) { - tx.setBorderWidth(1); - } - ar = mk.getAsArray(PdfName.BG); - tx.setBackgroundColor(getMKColor(ar)); - PdfNumber rotation = mk.getAsNumber(PdfName.R); - if (rotation != null) { - tx.setRotation(rotation.intValue()); - } - } - //flags - PdfNumber nfl = merged.getAsNumber(PdfName.F); - flags = 0; - tx.setVisibility(BaseField.VISIBLE_BUT_DOES_NOT_PRINT); - if (nfl != null) { - flags = nfl.intValue(); - if ((flags & PdfFormField.FLAGS_PRINT) != 0 && (flags & PdfFormField.FLAGS_HIDDEN) != 0) { - tx.setVisibility(BaseField.HIDDEN); - } else if ((flags & PdfFormField.FLAGS_PRINT) != 0 && (flags & PdfFormField.FLAGS_NOVIEW) != 0) { - tx.setVisibility(BaseField.HIDDEN_BUT_PRINTABLE); - } else if ((flags & PdfFormField.FLAGS_PRINT) != 0) { - tx.setVisibility(BaseField.VISIBLE); - } - } - //multiline - nfl = merged.getAsNumber(PdfName.FF); - flags = 0; - if (nfl != null) { - flags = nfl.intValue(); - } - tx.setOptions(flags); - if ((flags & PdfFormField.FF_COMB) != 0) { - PdfNumber maxLen = merged.getAsNumber(PdfName.MAXLEN); - int len = 0; - if (maxLen != null) { - len = maxLen.intValue(); - } - tx.setMaxCharacterLength(len); - } - //alignment - nfl = merged.getAsNumber(PdfName.Q); - if (nfl != null) { - if (nfl.intValue() == PdfFormField.Q_CENTER) { - tx.setAlignment(Element.ALIGN_CENTER); - } else if (nfl.intValue() == PdfFormField.Q_RIGHT) { - tx.setAlignment(Element.ALIGN_RIGHT); - } - } - //border styles - PdfDictionary bs = merged.getAsDict(PdfName.BS); - if (bs != null) { - PdfNumber w = bs.getAsNumber(PdfName.W); - if (w != null) { - tx.setBorderWidth(w.floatValue()); - } - PdfName s = bs.getAsName(PdfName.S); - if (PdfName.D.equals(s)) { - tx.setBorderStyle(PdfBorderDictionary.STYLE_DASHED); - } else if (PdfName.B.equals(s)) { - tx.setBorderStyle(PdfBorderDictionary.STYLE_BEVELED); - } else if (PdfName.I.equals(s)) { - tx.setBorderStyle(PdfBorderDictionary.STYLE_INSET); - } else if (PdfName.U.equals(s)) { - tx.setBorderStyle(PdfBorderDictionary.STYLE_UNDERLINE); - } - } else { - PdfArray bd = merged.getAsArray(PdfName.BORDER); - if (bd != null) { - if (bd.size() >= 3) { - tx.setBorderWidth(bd.getAsNumber(2).floatValue()); - } - if (bd.size() >= 4) { - tx.setBorderStyle(PdfBorderDictionary.STYLE_DASHED); - } - } - } - } - - PdfAppearance getAppearance(PdfDictionary merged, String[] values, String fieldName) throws IOException, DocumentException { - topFirst = 0; - String text = (values.length > 0) ? values[0] : null; - - TextField tx = null; - if (fieldCache == null || !fieldCache.containsKey(fieldName)) { - tx = new TextField(writer, null, null); - tx.setExtraMargin(extraMarginLeft, extraMarginTop); - tx.setBorderWidth(0); - tx.setSubstitutionFontList(substitutionFonts); - decodeGenericDictionary(merged, tx); - //rect - PdfArray rect = merged.getAsArray(PdfName.RECT); - Rectangle box = PdfReader.getNormalizedRectangle(rect); - if (tx.getRotation() == 90 || tx.getRotation() == 270) { - box = box.rotate(); - } - tx.setBox(box); - if (fieldCache != null) { - fieldCache.put(fieldName, tx); - } - } else { - tx = (TextField) fieldCache.get(fieldName); - tx.setWriter(writer); - } - PdfName fieldType = merged.getAsName(PdfName.FT); - if (PdfName.TX.equals(fieldType)) { - if (values.length > 0 && values[0] != null) { - tx.setText(values[0]); - } - return tx.getAppearance(); - } - if (!PdfName.CH.equals(fieldType)) { - throw new DocumentException(MessageLocalization.getComposedMessage("an.appearance.was.requested.without.a.variable.text.field")); - } - PdfArray opt = merged.getAsArray(PdfName.OPT); - int flags = 0; - PdfNumber nfl = merged.getAsNumber(PdfName.FF); - if (nfl != null) { - flags = nfl.intValue(); - } - if ((flags & PdfFormField.FF_COMBO) != 0 && opt == null) { - tx.setText(text); - return tx.getAppearance(); - } - if (opt != null) { - String[] choices = new String[opt.size()]; - String[] choicesExp = new String[opt.size()]; - for (int k = 0; k < opt.size(); ++k) { - PdfObject obj = opt.getPdfObject(k); - if (obj.isString()) { - choices[k] = choicesExp[k] = ((PdfString) obj).toUnicodeString(); - } else { - PdfArray a = (PdfArray) obj; - choicesExp[k] = a.getAsString(0).toUnicodeString(); - choices[k] = a.getAsString(1).toUnicodeString(); - } - } - if ((flags & PdfFormField.FF_COMBO) != 0) { - for (int k = 0; k < choices.length; ++k) { - if (text != null && text.equals(choicesExp[k])) { - text = choices[k]; - break; - } - } - tx.setText(text); - return tx.getAppearance(); - } - List indexes = new ArrayList<>(); - for (int k = 0; k < choicesExp.length; ++k) { - for (String val : values) { - if (val != null && val.equals(choicesExp[k])) { - indexes.add(k); - break; - } - } - } - tx.setChoices(choices); - tx.setChoiceExports(choicesExp); - tx.setChoiceSelections(indexes); - } - PdfAppearance app = tx.getListAppearance(); - topFirst = tx.getTopFirst(); - return app; - } - - /** Set font encoding from DR-structure if font doesn't have this info itself */ - private void adjustFontEncoding(PdfDictionary dr, PRIndirectReference por) { - PdfDictionary drEncoding = dr.getAsDict(PdfName.ENCODING); - if (drEncoding != null) { - PdfDictionary fontDict = (PdfDictionary) PdfReader.getPdfObject(por); - if (fontDict != null && fontDict.get(PdfName.ENCODING) == null) { - for (PdfName key: drEncoding.getKeys()) { - fontDict.put(PdfName.ENCODING, drEncoding.get(key)); - } - } - } - } - - PdfAppearance getAppearance(PdfDictionary merged, String text, String fieldName) throws IOException, DocumentException { - String[] valueArr = new String[1]; - valueArr[0] = text; - return getAppearance(merged, valueArr, fieldName); - } - - Color getMKColor(PdfArray ar) { - if (ar == null) { - return null; - } - switch (ar.size()) { - case 1: - return new GrayColor(ar.getAsNumber(0).floatValue()); - case 3: - return new Color(ExtendedColor.normalize(ar.getAsNumber(0).floatValue()), ExtendedColor.normalize(ar.getAsNumber(1).floatValue()), - ExtendedColor.normalize(ar.getAsNumber(2).floatValue())); - case 4: - return new CMYKColor(ar.getAsNumber(0).floatValue(), ar.getAsNumber(1).floatValue(), ar.getAsNumber(2).floatValue(), - ar.getAsNumber(3).floatValue()); - default: - return null; + ret[ptr++] = r.getLeft(); + ret[ptr++] = r.getBottom(); + ret[ptr++] = r.getRight(); + ret[ptr++] = r.getTop(); + } catch (Exception e) { + // empty on purpose + } + } + if (ptr < ret.length) { + float[] ret2 = new float[ptr]; + System.arraycopy(ret, 0, ret2, 0, ptr); + return ret2; + } + return ret; } - } - - /** - * Gets the field value. - * - * @param name the fully qualified field name - * @return the field value - */ - public String getField(String name) { - if (xfa.isXfaPresent()) { - name = xfa.findFieldName(name, this); - if (name == null) { - return null; - } - name = XfaForm.Xml2Som.getShortName(name); - return XfaForm.getNodeText(xfa.findDatasetsNode(name)); - } - Item item = fields.get(name); - if (item == null) { - return null; - } - lastWasString = false; - PdfDictionary mergedDict = item.getMerged(0); - - // Jose A. Rodriguez posted a fix to the mailing list (May 11, 2009) - // explaining that the value can also be a stream value - // the fix was made against an old iText version. Bruno adapted it. - PdfObject v = PdfReader.getPdfObject(mergedDict.get(PdfName.V)); - if (v == null) { - if(this.getFieldType(name) == AcroFields.FIELD_TYPE_CHECKBOX){ - return "Off"; - } - return ""; - } - if (v instanceof PRStream) { - byte[] valBytes; - try { - valBytes = PdfReader.getStreamBytes((PRStream) v); - return new String(valBytes); - } catch (IOException e) { - throw new ExceptionConverter(e); - } - } - - PdfName type = mergedDict.getAsName(PdfName.FT); - if (PdfName.BTN.equals(type)) { - PdfNumber ff = mergedDict.getAsNumber(PdfName.FF); - int flags = 0; - if (ff != null) { - flags = ff.intValue(); - } - if ((flags & PdfFormField.FF_PUSHBUTTON) != 0) { - return ""; - } - String value = ""; - if (v instanceof PdfName) { - value = PdfName.decodeName(v.toString()); - } else if (v instanceof PdfString) { - value = ((PdfString) v).toUnicodeString(); - } - PdfArray opts = item.getValue(0).getAsArray(PdfName.OPT); - if (opts != null) { - int idx = 0; - try { - idx = Integer.parseInt(value); - PdfString ps = opts.getAsString(idx); - value = ps.toUnicodeString(); - lastWasString = true; - } catch (Exception ignored) { - } - } - return value; - } - if (v instanceof PdfString) { - lastWasString = true; - return ((PdfString) v).toUnicodeString(); - } else if (v instanceof PdfName) { - return PdfName.decodeName(v.toString()); - } - else if (v instanceof PdfArray) { - return ((PdfArray)v).toString(); - } - else { - return ""; - } - } - - /** - * Gets the field values of a Choice field. - * - * @param name the fully qualified field name - * @return the field value - * @since 2.1.3 - */ - public String[] getListSelection(String name) { - String[] ret; - String s = getField(name); - if (s == null) { - ret = new String[]{}; - } else { - ret = new String[]{s}; - } - Item item = fields.get(name); - if (item == null) { - return ret; - } - //PdfName type = (PdfName)PdfReader.getPdfObject(((PdfDictionary)item.merged.get(0)).get(PdfName.FT)); - //if (!PdfName.CH.equals(type)) { - // return ret; - //} - PdfArray values = item.getMerged(0).getAsArray(PdfName.I); - if (values == null) { - return ret; - } - ret = new String[values.size()]; - String[] options = getListOptionExport(name); - PdfNumber n; - int idx = 0; - for (PdfObject pdfObject : values.getElements()) { - n = (PdfNumber) pdfObject; - ret[idx++] = options[n.intValue()]; - } - return ret; - } - - - /** - * Sets a field property. Valid property names are: - * - *

      - *
    • textfont - sets the text font. The value for this entry is a BaseFont.
      - *
    • textcolor - sets the text color. The value for this entry is a java.awt.Color.
      - *
    • textsize - sets the text size. The value for this entry is a Float. - *
    • bgcolor - sets the background color. The value for this entry is a java.awt.Color. - * If null removes the background.
      - *
    • bordercolor - sets the border color. The value for this entry is a java.awt.Color. - * If null removes the border.
      - *
    - * - * @param field the field name - * @param name the property name - * @param value the property value - * @param inst an array of int indexing into AcroField.Item.merged elements to process. Set to null - * to process all - * @return true if the property exists, false otherwise - */ - public boolean setFieldProperty(String field, String name, Object value, int[] inst) { - if (writer == null) { - throw new RuntimeException(MessageLocalization.getComposedMessage("this.acrofields.instance.is.read.only")); - } - try { - Item item = fields.get(field); - if (item == null) { - return false; - } - InstHit hit = new InstHit(inst); - PdfDictionary merged; - PdfString da; - if (name.equalsIgnoreCase("textfont")) { - for (int k = 0; k < item.size(); ++k) { - if (hit.isHit(k)) { - merged = item.getMerged(k); - da = merged.getAsString(PdfName.DA); - PdfDictionary dr = merged.getAsDict(PdfName.DR); - if (da != null && dr != null) { - Object[] dao = splitDAelements(da.toUnicodeString()); - PdfAppearance cb = new PdfAppearance(this.writer); - if (dao[DA_FONT] != null) { - BaseFont bf = (BaseFont) value; - PdfName psn = PdfAppearance.stdFieldFontNames.get(bf.getPostscriptFontName()); - if (psn == null) { - psn = new PdfName(bf.getPostscriptFontName()); - } - PdfDictionary fonts = dr.getAsDict(PdfName.FONT); - if (fonts == null) { - fonts = new PdfDictionary(); - dr.put(PdfName.FONT, fonts); - } - PdfIndirectReference fref = (PdfIndirectReference) fonts.get(psn); - PdfDictionary top = reader.getCatalog().getAsDict(PdfName.ACROFORM); - markUsed(top); - dr = top.getAsDict(PdfName.DR); - if (dr == null) { - dr = new PdfDictionary(); - top.put(PdfName.DR, dr); - } - markUsed(dr); - PdfDictionary fontsTop = dr.getAsDict(PdfName.FONT); - if (fontsTop == null) { - fontsTop = new PdfDictionary(); - dr.put(PdfName.FONT, fontsTop); - } - markUsed(fontsTop); - PdfIndirectReference frefTop = (PdfIndirectReference) fontsTop.get(psn); - if (frefTop != null) { - if (fref == null) { - fonts.put(psn, frefTop); - } - } else if (fref == null) { - FontDetails fd; - if (bf.getFontType() == BaseFont.FONT_TYPE_DOCUMENT) { - fd = new FontDetails(null, ((DocumentFont) bf).getIndirectReference(), bf); - } else { - bf.setSubset(false); - fd = writer.addSimple(bf); - localFonts.put(psn.toString().substring(1), bf); - } - fontsTop.put(psn, fd.getIndirectReference()); - fonts.put(psn, fd.getIndirectReference()); - } - ByteBuffer buf = cb.getInternalBuffer(); - buf.append(psn.getBytes()).append(' ').append((Float) dao[DA_SIZE]).append(" Tf "); - if (dao[DA_COLOR] != null) { - cb.setColorFill((Color) dao[DA_COLOR]); - } - PdfString s = new PdfString(cb.toString()); - item.getMerged(k).put(PdfName.DA, s); - item.getWidget(k).put(PdfName.DA, s); - markUsed(item.getWidget(k)); - } + + private int removeRefFromArray(PdfArray array, PdfObject refo) { + if (refo == null || !refo.isIndirect()) { + return array.size(); + } + PdfIndirectReference ref = (PdfIndirectReference) refo; + for (int j = 0; j < array.size(); ++j) { + PdfObject obj = array.getPdfObject(j); + if (!obj.isIndirect()) { + continue; + } + if (((PdfIndirectReference) obj).getNumber() == ref.getNumber()) { + array.remove(j--); } - } } - } else if (name.equalsIgnoreCase("textcolor")) { - for (int k = 0; k < item.size(); ++k) { - if (hit.isHit(k)) { - merged = item.getMerged(k); - da = merged.getAsString(PdfName.DA); - if (da != null) { - Object[] dao = splitDAelements(da.toUnicodeString()); - PdfAppearance cb = new PdfAppearance(this.writer); - if (dao[DA_FONT] != null) { - ByteBuffer buf = cb.getInternalBuffer(); - buf.append(new PdfName((String) dao[DA_FONT]).getBytes()).append(' ').append((Float) dao[DA_SIZE]) - .append(" Tf "); - cb.setColorFill((Color) value); - PdfString s = new PdfString(cb.toString()); - item.getMerged(k).put(PdfName.DA, s); - item.getWidget(k).put(PdfName.DA, s); - markUsed(item.getWidget(k)); - } - } - } - } - } else if (name.equalsIgnoreCase("textsize")) { + return array.size(); + } + + /** + * Removes all the fields from page. + * + * @param page the page to remove the fields from + * @return true if any field was removed, false otherwise + */ + public boolean removeFieldsFromPage(int page) { + if (page < 1) { + return false; + } + String[] names = new String[fields.size()]; + fields.keySet().toArray(names); + boolean found = false; + for (String name : names) { + boolean fr = removeField(name, page); + found = (found || fr); + } + return found; + } + + /** + * Removes a field from the document. If page equals -1 all the fields with this + * name are removed from the document otherwise only the fields in + * that particular page are removed. + * + * @param name the field name + * @param page the page to remove the field from or -1 to remove it from all the pages + * @return true if the field exists, false otherwise + */ + public boolean removeField(String name, int page) { + Item item = getFieldItem(name); + if (item == null) { + return false; + } + PdfDictionary acroForm = (PdfDictionary) PdfReader.getPdfObject(reader.getCatalog().get(PdfName.ACROFORM), + reader.getCatalog()); + + if (acroForm == null) { + return false; + } + PdfArray arrayf = acroForm.getAsArray(PdfName.FIELDS); + if (arrayf == null) { + return false; + } for (int k = 0; k < item.size(); ++k) { - if (hit.isHit(k)) { - merged = item.getMerged(k); - da = merged.getAsString(PdfName.DA); - if (da != null) { - Object[] dao = splitDAelements(da.toUnicodeString()); - PdfAppearance cb = new PdfAppearance(this.writer); - if (dao[DA_FONT] != null) { - ByteBuffer buf = cb.getInternalBuffer(); - Float fontSize = (float) Font.DEFAULTSIZE; - if (value != null) { - fontSize = (Float) value; + int pageV = item.getPage(k); + if (page != -1 && page != pageV) { + continue; + } + PdfIndirectReference ref = item.getWidgetRef(k); + PdfDictionary wd = item.getWidget(k); + PdfDictionary pageDic = reader.getPageN(pageV); + PdfArray annots = pageDic.getAsArray(PdfName.ANNOTS); + if (annots != null) { + if (removeRefFromArray(annots, ref) == 0) { + pageDic.remove(PdfName.ANNOTS); + markUsed(pageDic); + } else { + markUsed(annots); } - buf.append(new PdfName((String) dao[DA_FONT]).getBytes()).append(' ').append(fontSize).append(" Tf "); - if (dao[DA_COLOR] != null) { - cb.setColorFill((Color) dao[DA_COLOR]); + } + PdfReader.killIndirect(ref); + PdfIndirectReference kid = ref; + while ((ref = wd.getAsIndirectObject(PdfName.PARENT)) != null) { + wd = wd.getAsDict(PdfName.PARENT); + PdfArray kids = wd.getAsArray(PdfName.KIDS); + if (removeRefFromArray(kids, kid) != 0) { + break; } - PdfString s = new PdfString(cb.toString()); - item.getMerged(k).put(PdfName.DA, s); - item.getWidget(k).put(PdfName.DA, s); - markUsed(item.getWidget(k)); - } + kid = ref; + PdfReader.killIndirect(ref); } - } - } - } else if (name.equalsIgnoreCase("bgcolor") || name.equalsIgnoreCase("bordercolor")) { - PdfName dname = (name.equalsIgnoreCase("bgcolor") ? PdfName.BG : PdfName.BC); - for (int k = 0; k < item.size(); ++k) { - if (hit.isHit(k)) { - merged = item.getMerged(k); - PdfDictionary mk = merged.getAsDict(PdfName.MK); - if (mk == null) { - if (value == null) { - return true; - } - mk = new PdfDictionary(); - item.getMerged(k).put(PdfName.MK, mk); - item.getWidget(k).put(PdfName.MK, mk); - markUsed(item.getWidget(k)); - } else { - markUsed(mk); + if (ref == null) { + removeRefFromArray(arrayf, kid); + markUsed(arrayf); } - if (value == null) { - mk.remove(dname); - } else { - mk.put(dname, PdfFormField.getMKColor((Color) value)); + if (page != -1) { + item.remove(k); + --k; } - } } - } else { - return false; - } - return true; - } catch (Exception e) { - throw new ExceptionConverter(e); - } - } - - /** - * Gets a field property. Valid property names are: - *

    - *

      - *
    • textfont - gets the text font. The return value for this entry is a String.
      - *
    • textcolor - gets the text color. The return value for this entry is a java.awt.Color.
      - *
    • textsize - gets the text size. The return value for this entry is a Float. - *
    • textfontsall - gets all available fonts used in the PDF. The return value for this entry is a - * Set<String> with font names. - *
    • bgcolor - gets the background color. The return value for this entry is a java.awt.Color. - *
    • bordercolor - gets the border color. The return value for this entry is a java.awt.Color. - *
    - * - * If the property does not exist null is returned. - * - * @param field - the field name - * @param name - the property name - * @param idx - the index of the widget - * @return the above described object or null if the property is not set - */ - public Object getFieldProperty(String field, String name, int idx) { - if (this.reader == null) - throw new RuntimeException("No reader has been supplied to this AcroFields instance!"); - try { - Item item = (Item) this.fields.get(field); - if (item == null) - return false; - - PdfDictionary merged; - PdfString da; - if (name.startsWith("text") && item.size() > idx) { - merged = item.getMerged(idx); - da = merged.getAsString(PdfName.DA); - if (da != null) { - Object[] dao = splitDAelements(da.toUnicodeString()); - if ("textfont".equalsIgnoreCase(name)) { - String fontResourceName = (String) dao[DA_FONT]; - - if (fontResourceName == null) { - return fontResourceName; - } - - // check the resource dict to get the real font name - PdfDictionary dr = merged.getAsDict(PdfName.DR); - // might have to look globally instead? - if (dr == null) - return fontResourceName; - - PdfDictionary fonts = dr.getAsDict(PdfName.FONT); - if (fonts == null) - return fontResourceName; - - PdfName fontResourceId = new PdfName(fontResourceName); - PdfDictionary fontDict = fonts.getAsDict(fontResourceId); - - if (fontDict == null) { - // this is strange normally a font should have been found! - return fontResourceName; - } - - // Do not use "PdfName.Name" since it is deprecated (according to the PDF spec) - PdfName fontName = fontDict.getAsName(PdfName.BASEFONT); - // theoretically we could check the fontdescriptor and get the /FontName but - // BASEFONT is required so it should always be there... - if (fontName == null) { - // this would be strange since BASEFONT is required according to the pdf spec) - return fontResourceName; - } - return PdfName.decodeName(fontName.toString()); - } else if ("textcolor".equalsIgnoreCase(name)) { - return dao[DA_COLOR]; - } else if ("textsize".equalsIgnoreCase(name)) { - return dao[DA_SIZE]; - } else if ("textfontsall".equalsIgnoreCase(name)) { - - HashSet fonts = new HashSet<>(); - - // fetch all fonts - PdfDictionary root = this.reader.getCatalog(); - PdfDictionary acrofields = root.getAsDict(PdfName.ACROFORM); - - PdfDictionary allFieldsDR = acrofields.getAsDict(PdfName.DR); - if (allFieldsDR == null) - return fonts; - - PdfDictionary acroFieldsFonts = allFieldsDR.getAsDict(PdfName.FONT); - if (acroFieldsFonts == null) - return fonts; - - for (PdfName key : acroFieldsFonts.getKeys()) { - PdfDictionary pdfFont = acroFieldsFonts.getAsDict(key); - - PdfName fontName = pdfFont.getAsName(PdfName.BASEFONT); - if (fontName != null) { - fonts.add(PdfName.decodeName(fontName.toString())); - } else { - // Basefont was not found (which is unlikely since required by pdf spec. (so its a - // fallback) - PdfDictionary fontDescriptor = pdfFont.getAsDict(PdfName.FONTDESCRIPTOR); - - if (fontDescriptor != null) { - // the BASEFONT was not set so extract the /FontName key - PdfString fontname = fontDescriptor.getAsString(PdfName.FONTNAME); - if (fontname != null) { - fonts.add(PdfName.decodeName(fontname.toString())); - } - } - } - } - return fonts; - } - throw new RuntimeException("Unknown property: " + name); - } - return null; - } else if ("bgcolor".equalsIgnoreCase(name) || "bordercolor".equalsIgnoreCase(name)) { - PdfName dname = ("bgcolor".equalsIgnoreCase(name) ? PdfName.BG : PdfName.BC); - merged = item.getMerged(idx); - PdfDictionary mk = merged.getAsDict(PdfName.MK); - if (mk == null) { - return null; - } else { - PdfArray color = mk.getAsArray(dname); - return parseColor(color); - } - } else { - throw new RuntimeException("Unknown property: " + name); - } - } catch (Exception e) { - throw new ExceptionConverter(e); - } - } - /** - * Parses and converts colors from PDF to standard AWT Colors. - * @param pdfColor an array of colors - * @return AWT-Color - */ - public static Color parseColor(PdfArray pdfColor){ - - //Check for no color -> thus transparent - if(pdfColor!=null && !pdfColor.isEmpty()){ - if(pdfColor.size()==1){ - PdfNumber grey = pdfColor.getAsNumber(0); - if(grey!=null) { - return new GrayColor(grey.floatValue()); - } - } - else if(pdfColor.size()==3){ - PdfNumber red = pdfColor.getAsNumber(0); - PdfNumber green = pdfColor.getAsNumber(1); - PdfNumber blue = pdfColor.getAsNumber(2); - - if(red!=null && green!=null && blue!=null) { - return new Color(red.floatValue(), green.floatValue(), blue.floatValue()); - } - } - else if(pdfColor.size()==4){ - PdfNumber c = pdfColor.getAsNumber(0); - PdfNumber m = pdfColor.getAsNumber(1); - PdfNumber y = pdfColor.getAsNumber(2); - PdfNumber k = pdfColor.getAsNumber(3); - - if(c!=null && m!=null && y!=null && k!=null) { - return new CMYKColor(c.floatValue(), m.floatValue(), y.floatValue(), k.floatValue()); - } - } - else{ - throw new RuntimeException("Error extracting color: "+pdfColor+" since the color array is too long: "+pdfColor.length()); - } - } - return null; - } - - /** - * Sets a field property. Valid property names are: - * - *
      - *
    • flags - a set of flags specifying various characteristics of the field's widget annotation. - * The value of this entry replaces that of the F entry in the form's corresponding annotation dictionary.
      - *
    • setflags - a set of flags to be set (turned on) in the F entry of the form's corresponding - * widget annotation dictionary. Bits equal to 1 cause the corresponding bits in F to be set to 1.
      - *
    • clrflags - a set of flags to be cleared (turned off) in the F entry of the form's corresponding - * widget annotation dictionary. Bits equal to 1 cause the corresponding bits in F to be set to 0.
      - *
    • fflags - a set of flags specifying various characteristics of the field. The value - * of this entry replaces that of the Ff entry in the form's corresponding field dictionary.
      - *
    • setfflags - a set of flags to be set (turned on) in the Ff entry of the form's corresponding - * field dictionary. Bits equal to 1 cause the corresponding bits in Ff to be set to 1.
      - *
    • clrfflags - a set of flags to be cleared (turned off) in the Ff entry of the form's corresponding - * field dictionary. Bits equal to 1 cause the corresponding bits in Ff to be set to 0.
      - *
    - * - * @param field the field name - * @param name the property name - * @param value the property value - * @param inst an array of int indexing into AcroField.Item.merged elements to process. Set to null - * to process all - * @return true if the property exists, false otherwise - */ - public boolean setFieldProperty(String field, String name, int value, int[] inst) { - return this.setFieldProperty(this.fields.get(field), name, value, inst); - } - - /** - * Sets a field property. Valid property names are: - * - *
      - *
    • flags - a set of flags specifying various characteristics of the field's widget annotation. - * The value of this entry replaces that of the F entry in the form's corresponding annotation dictionary.
      - *
    • setflags - a set of flags to be set (turned on) in the F entry of the form's corresponding - * widget annotation dictionary. Bits equal to 1 cause the corresponding bits in F to be set to 1.
      - *
    • clrflags - a set of flags to be cleared (turned off) in the F entry of the form's corresponding - * widget annotation dictionary. Bits equal to 1 cause the corresponding bits in F to be set to 0.
      - *
    • fflags - a set of flags specifying various characteristics of the field. The value - * of this entry replaces that of the Ff entry in the form's corresponding field dictionary.
      - *
    • setfflags - a set of flags to be set (turned on) in the Ff entry of the form's corresponding - * field dictionary. Bits equal to 1 cause the corresponding bits in Ff to be set to 1.
      - *
    • clrfflags - a set of flags to be cleared (turned off) in the Ff entry of the form's corresponding - * field dictionary. Bits equal to 1 cause the corresponding bits in Ff to be set to 0.
      - *
    - * - * @param item of the field - * @param name the property name - * @param value the property value - * @param inst an array of int indexing into AcroField.Item.merged elements to process. Set to null - * to process all - * @return true if the property exists, false otherwise - */ - public boolean setFieldProperty(Item item, String name, int value, int[] inst) { - if (writer == null) { - throw new RuntimeException(MessageLocalization.getComposedMessage("this.acrofields.instance.is.read.only")); - } - if (item == null) { - return false; - } - InstHit hit = new InstHit(inst); - if (name.equalsIgnoreCase("flags")) { - PdfNumber num = new PdfNumber(value); - for (int k = 0; k < item.size(); ++k) { - if (hit.isHit(k)) { - item.getMerged(k).put(PdfName.F, num); - item.getWidget(k).put(PdfName.F, num); - markUsed(item.getWidget(k)); - } - } - } else if (name.equalsIgnoreCase("setflags")) { - for (int k = 0; k < item.size(); ++k) { - if (hit.isHit(k)) { - PdfNumber num = item.getWidget(k).getAsNumber(PdfName.F); - int val = 0; - if (num != null) { - val = num.intValue(); - } - num = new PdfNumber(val | value); - item.getMerged(k).put(PdfName.F, num); - item.getWidget(k).put(PdfName.F, num); - markUsed(item.getWidget(k)); - } - } - } else if (name.equalsIgnoreCase("clrflags")) { - for (int k = 0; k < item.size(); ++k) { - if (hit.isHit(k)) { - PdfDictionary widget = item.getWidget(k); - PdfNumber num = widget.getAsNumber(PdfName.F); - int val = 0; - if (num != null) { - val = num.intValue(); - } - num = new PdfNumber(val & (~value)); - item.getMerged(k).put(PdfName.F, num); - widget.put(PdfName.F, num); - markUsed(widget); - } - } - } else if (name.equalsIgnoreCase("fflags")) { - PdfNumber num = new PdfNumber(value); - for (int k = 0; k < item.size(); ++k) { - if (hit.isHit(k)) { - item.getMerged(k).put(PdfName.FF, num); - item.getValue(k).put(PdfName.FF, num); - markUsed(item.getValue(k)); - } - } - } else if (name.equalsIgnoreCase("setfflags")) { - for (int k = 0; k < item.size(); ++k) { - if (hit.isHit(k)) { - PdfDictionary valDict = item.getValue(k); - PdfNumber num = valDict.getAsNumber(PdfName.FF); - int val = 0; - if (num != null) { - val = num.intValue(); - } - num = new PdfNumber(val | value); - item.getMerged(k).put(PdfName.FF, num); - valDict.put(PdfName.FF, num); - markUsed(valDict); - } - } - } else if (name.equalsIgnoreCase("clrfflags")) { - for (int k = 0; k < item.size(); ++k) { - if (hit.isHit(k)) { - PdfDictionary valDict = item.getValue(k); - PdfNumber num = valDict.getAsNumber(PdfName.FF); - int val = 0; - if (num != null) { - val = num.intValue(); - } - num = new PdfNumber(val & (~value)); - item.getMerged(k).put(PdfName.FF, num); - valDict.put(PdfName.FF, num); - markUsed(valDict); - } - } - } else { - return false; - } - return true; - } - - /** - * Merges an XML data structure into this form. - * - * @param n the top node of the data structure - * @throws java.io.IOException on error - * @throws com.lowagie.text.DocumentException o error - */ - public void mergeXfaData(Node n) throws IOException, DocumentException { - XfaForm.Xml2SomDatasets data = new XfaForm.Xml2SomDatasets(n); - for (String name : data.getNamesOrder()) { - String text = XfaForm.getNodeText(data.getNodesByName().get(name)); - setField(name, text); - } - } - - /** - * Sets the fields by FDF merging. - * - * @param fdf the FDF form - * @throws IOException on error - * @throws DocumentException on error - */ - public void setFields(FdfReader fdf) throws IOException, DocumentException { - Map fd = fdf.getAllFields(); - for (String f : fd.keySet()) { - String v = fdf.getFieldValue(f); - if (v != null) { - setField(f, v); - } - } - } - - /** - * Allows merging the fields by a field reader. One use would be to set the fields by XFDF merging. - * - * @param fieldReader The fields to merge. - * @throws IOException on error - * @throws DocumentException on error - */ - public void setFields(XfdfReader fieldReader) throws IOException, DocumentException { - setFields((FieldReader) fieldReader); - } - - /** - * Allows merging the fields by a field reader. One use would be to set the fields by XFDF merging. - * - * @param fieldReader The fields to merge. - * @throws IOException on error - * @throws DocumentException on error - */ - public void setFields(FieldReader fieldReader) throws IOException, DocumentException { - Map fd = fieldReader.getAllFields(); - for (String f : fd.keySet()) { - String v = fieldReader.getFieldValue(f); - if (v != null) { - setField(f, v); - } - List list = fieldReader.getListValues(f); - if (list != null) { - setListSelection(v, list.toArray(new String[0])); - } - } - } - - /** - * Regenerates the field appearance. This is useful when you change a field property, but not its value, for instance - * form.setFieldProperty("f", "bgcolor", Color.BLUE, null); This won't have any effect, unless you use regenerateField("f") after changing - * the property. - * - * @param name the fully qualified field name or the partial name in the case of XFA forms - * @return true if the field was found and changed, - * false otherwise - * @throws IOException on error - * @throws DocumentException on error - */ - public boolean regenerateField(String name) throws IOException, DocumentException { - String value = getField(name); - return setField(name, value, value); - } - - /** - * Sets the field value. - * - * @param name the fully qualified field name or the partial name in the case of XFA forms - * @param value the field value - * @return true if the field was found and changed, - * false otherwise - * @throws IOException on error - * @throws DocumentException on error - */ - public boolean setField(String name, String value) throws IOException, DocumentException { - return setField(name, value, null); - } - - /** - * Sets the field value and the display string. The display string is used to build the appearance in the cases where the value is - * modified by Acrobat with JavaScript and the algorithm is known. - * - * @param name the fully qualified field name or the partial name in the case of XFA forms - * @param value the field value - * @param display the string that is used for the appearance. If null the value parameter will be used - * @return true if the field was found and changed, - * false otherwise - * @throws IOException on error - * @throws DocumentException on error - */ - public boolean setField(String name, String value, String display) throws IOException, DocumentException { - if (writer == null) { - throw new DocumentException(MessageLocalization.getComposedMessage("this.acrofields.instance.is.read.only")); - } - if (xfa.isXfaPresent()) { - name = xfa.findFieldName(name, this); - if (name == null) { - return false; - } - String shortName = XfaForm.Xml2Som.getShortName(name); - Node xn = xfa.findDatasetsNode(shortName); - if (xn == null) { - xn = xfa.getDatasetsSom().insertNode(xfa.getDatasetsNode(), shortName); - } - xfa.setNodeText(xn, value); - } - Item item = fields.get(name); - if (item == null) { - return false; - } - PdfDictionary merged = item.getMerged(0); - PdfName type = merged.getAsName(PdfName.FT); - if (PdfName.TX.equals(type)) { - PdfNumber maxLen = merged.getAsNumber(PdfName.MAXLEN); - int len = 0; - if (maxLen != null) { - len = maxLen.intValue(); - } - if (len > 0) { - value = value.substring(0, Math.min(len, value.length())); - } - } - if (display == null) { - display = value; - } - if (PdfName.TX.equals(type) || PdfName.CH.equals(type)) { - PdfString v = new PdfString(value, PdfObject.TEXT_UNICODE); - for (int idx = 0; idx < item.size(); ++idx) { - PdfDictionary valueDic = item.getValue(idx); - valueDic.put(PdfName.V, v); - valueDic.remove(PdfName.I); - markUsed(valueDic); - merged = item.getMerged(idx); - merged.remove(PdfName.I); - merged.put(PdfName.V, v); - PdfDictionary widget = item.getWidget(idx); - if (generateAppearances) { - PdfAppearance app = getAppearance(merged, display, name); - if (PdfName.CH.equals(type)) { - PdfNumber n = new PdfNumber(topFirst); - widget.put(PdfName.TI, n); - merged.put(PdfName.TI, n); - } - PdfDictionary appDic = widget.getAsDict(PdfName.AP); - if (appDic == null) { - appDic = new PdfDictionary(); - widget.put(PdfName.AP, appDic); - merged.put(PdfName.AP, appDic); - } - appDic.put(PdfName.N, app.getIndirectReference()); - writer.releaseTemplate(app); - } else { - widget.remove(PdfName.AP); - merged.remove(PdfName.AP); - } - markUsed(widget); - } - return true; - } else if (PdfName.BTN.equals(type)) { - PdfNumber ff = item.getMerged(0).getAsNumber(PdfName.FF); - int flags = 0; - if (ff != null) { - flags = ff.intValue(); - } - if ((flags & PdfFormField.FF_PUSHBUTTON) != 0) { - //we'll assume that the value is an image in base64 - Image img; - try { - img = Image.getInstance(Base64.getDecoder().decode(value)); - } catch (Exception e) { - return false; + if (page == -1 || item.size() == 0) { + fields.remove(name); } - PushbuttonField pb = getNewPushbuttonFromField(name); - pb.setImage(img); - replacePushbuttonField(name, pb.getField()); return true; - } - PdfName v = new PdfName(value); - List lopt = new ArrayList<>(); - PdfArray opts = item.getValue(0).getAsArray(PdfName.OPT); - if (opts != null) { - for (int k = 0; k < opts.size(); ++k) { - PdfString valStr = opts.getAsString(k); - if (valStr != null) { - lopt.add(valStr.toUnicodeString()); - } else { - lopt.add(null); - } - } - } - int vidx = lopt.indexOf(value); - PdfName vt; - if (vidx >= 0) { - vt = new PdfName(String.valueOf(vidx)); - } else { - vt = v; - } - for (int idx = 0; idx < item.size(); ++idx) { - merged = item.getMerged(idx); - PdfDictionary widget = item.getWidget(idx); - PdfDictionary valDict = item.getValue(idx); - markUsed(item.getValue(idx)); - valDict.put(PdfName.V, vt); - merged.put(PdfName.V, vt); - markUsed(widget); - if (isInAP(widget, vt)) { - merged.put(PdfName.AS, vt); - widget.put(PdfName.AS, vt); - } else { - merged.put(PdfName.AS, PdfName.Off); - widget.put(PdfName.AS, PdfName.Off); - } - } - return true; - } - return false; - } - - /** - * Sets different values in a list selection. No appearance is generated yet; nor does the code check if multiple select is allowed. - * - * @param name the name of the field - * @param value an array with values that need to be selected - * @return true only if the field value was changed - * @throws IOException on error - * @throws DocumentException on error - * @since 2.1.4 - */ - public boolean setListSelection(String name, String[] value) throws IOException, DocumentException { - Item item = getFieldItem(name); - if (item == null) { - return false; - } - PdfDictionary merged = item.getMerged(0); - PdfName type = merged.getAsName(PdfName.FT); - if (!PdfName.CH.equals(type)) { - return false; - } - String[] options = getListOptionExport(name); - PdfArray array = new PdfArray(); - for (String s1 : value) { - for (int j = 0; j < options.length; j++) { - if (options[j].equals(s1)) { - array.add(new PdfNumber(j)); - break; - } - } - } - item.writeToAll(PdfName.I, array, Item.WRITE_MERGED | Item.WRITE_VALUE); - - PdfArray vals = new PdfArray(); - for (String s : value) { - vals.add(new PdfString(s)); - } - item.writeToAll(PdfName.V, vals, Item.WRITE_MERGED | Item.WRITE_VALUE); - - PdfAppearance app = getAppearance(merged, value, name); - - PdfDictionary apDic = new PdfDictionary(); - apDic.put(PdfName.N, app.getIndirectReference()); - item.writeToAll(PdfName.AP, apDic, Item.WRITE_MERGED | Item.WRITE_WIDGET); - - writer.releaseTemplate(app); - - item.markUsed(this, Item.WRITE_VALUE | Item.WRITE_WIDGET); - return true; - } - - boolean isInAP(PdfDictionary dic, PdfName check) { - PdfDictionary appDic = dic.getAsDict(PdfName.AP); - if (appDic == null) { - return false; - } - PdfDictionary NDic = appDic.getAsDict(PdfName.N); - return (NDic != null && NDic.get(check) != null); - } - - /** - * Gets all the fields. The fields are keyed by the fully qualified field name and the value is an instance of - * AcroFields.Item. - * - * @return all the fields - */ - public Map getAllFields() { - return fields; - } - - /** - * Gets the field structure. - * - * @param name the name of the field - * @return the field structure or null if the field does not exist - */ - public Item getFieldItem(String name) { - if (xfa.isXfaPresent()) { - name = xfa.findFieldName(name, this); - if (name == null) { - return null; - } - } - return fields.get(name); - } - - /** - * Gets the long XFA translated name. - * - * @param name the name of the field - * @return the long field name - */ - public String getTranslatedFieldName(String name) { - if (xfa.isXfaPresent()) { - String namex = xfa.findFieldName(name, this); - if (namex != null) { - name = namex; - } - } - return name; - } - - /** - * Gets the field box positions in the document. The return is an array of float multiple of 5. For each of this groups the - * values are: [page, llx, lly, urx, ury]. The coordinates have the page rotation in consideration. - * - * @param name the field name - * @return the positions or null if field does not exist - */ - public float[] getFieldPositions(String name) { - Item item = getFieldItem(name); - if (item == null) { - return null; - } - float[] ret = new float[item.size() * 5]; - int ptr = 0; - for (int k = 0; k < item.size(); ++k) { - try { - PdfDictionary wd = item.getWidget(k); - PdfArray rect = wd.getAsArray(PdfName.RECT); - if (rect == null) { - continue; - } - Rectangle r = PdfReader.getNormalizedRectangle(rect); - int page = item.getPage(k); - int rotation = reader.getPageRotation(page); - ret[ptr++] = page; - if (rotation != 0) { - Rectangle pageSize = reader.getPageSize(page); - switch (rotation) { - case 270: - r = new Rectangle( - pageSize.getTop() - r.getBottom(), - r.getLeft(), - pageSize.getTop() - r.getTop(), - r.getRight()); - break; - case 180: - r = new Rectangle( - pageSize.getRight() - r.getLeft(), - pageSize.getTop() - r.getBottom(), - pageSize.getRight() - r.getRight(), - pageSize.getTop() - r.getTop()); - break; - case 90: - r = new Rectangle( - r.getBottom(), - pageSize.getRight() - r.getLeft(), - r.getTop(), - pageSize.getRight() - r.getRight()); - break; - } - r.normalize(); - } - ret[ptr++] = r.getLeft(); - ret[ptr++] = r.getBottom(); - ret[ptr++] = r.getRight(); - ret[ptr++] = r.getTop(); - } catch (Exception e) { - // empty on purpose - } - } - if (ptr < ret.length) { - float[] ret2 = new float[ptr]; - System.arraycopy(ret, 0, ret2, 0, ptr); - return ret2; - } - return ret; - } - - private int removeRefFromArray(PdfArray array, PdfObject refo) { - if (refo == null || !refo.isIndirect()) { - return array.size(); - } - PdfIndirectReference ref = (PdfIndirectReference) refo; - for (int j = 0; j < array.size(); ++j) { - PdfObject obj = array.getPdfObject(j); - if (!obj.isIndirect()) { - continue; - } - if (((PdfIndirectReference) obj).getNumber() == ref.getNumber()) { - array.remove(j--); - } - } - return array.size(); - } - - /** - * Removes all the fields from page. - * - * @param page the page to remove the fields from - * @return true if any field was removed, false otherwise - */ - public boolean removeFieldsFromPage(int page) { - if (page < 1) { - return false; - } - String[] names = new String[fields.size()]; - fields.keySet().toArray(names); - boolean found = false; - for (String name : names) { - boolean fr = removeField(name, page); - found = (found || fr); - } - return found; - } - - /** - * Removes a field from the document. If page equals -1 all the fields with this - * name are removed from the document otherwise only the fields in - * that particular page are removed. - * - * @param name the field name - * @param page the page to remove the field from or -1 to remove it from all the pages - * @return true if the field exists, false otherwise - */ - public boolean removeField(String name, int page) { - Item item = getFieldItem(name); - if (item == null) { - return false; - } - PdfDictionary acroForm = (PdfDictionary) PdfReader.getPdfObject(reader.getCatalog().get(PdfName.ACROFORM), reader.getCatalog()); - - if (acroForm == null) { - return false; - } - PdfArray arrayf = acroForm.getAsArray(PdfName.FIELDS); - if (arrayf == null) { - return false; - } - for (int k = 0; k < item.size(); ++k) { - int pageV = item.getPage(k); - if (page != -1 && page != pageV) { - continue; - } - PdfIndirectReference ref = item.getWidgetRef(k); - PdfDictionary wd = item.getWidget(k); - PdfDictionary pageDic = reader.getPageN(pageV); - PdfArray annots = pageDic.getAsArray(PdfName.ANNOTS); - if (annots != null) { - if (removeRefFromArray(annots, ref) == 0) { - pageDic.remove(PdfName.ANNOTS); - markUsed(pageDic); - } else { - markUsed(annots); - } - } - PdfReader.killIndirect(ref); - PdfIndirectReference kid = ref; - while ((ref = wd.getAsIndirectObject(PdfName.PARENT)) != null) { - wd = wd.getAsDict(PdfName.PARENT); - PdfArray kids = wd.getAsArray(PdfName.KIDS); - if (removeRefFromArray(kids, kid) != 0) { - break; - } - kid = ref; - PdfReader.killIndirect(ref); - } - if (ref == null) { - removeRefFromArray(arrayf, kid); - markUsed(arrayf); - } - if (page != -1) { - item.remove(k); - --k; - } - } - if (page == -1 || item.size() == 0) { - fields.remove(name); - } - return true; - } - - /** - * Removes a field from the document. - * - * @param name the field name - * @return true if the field exists, false otherwise - */ - public boolean removeField(String name) { - return removeField(name, -1); - } - - /** - * Gets the property generateAppearances. - * - * @return the property generateAppearances - */ - public boolean isGenerateAppearances() { - return generateAppearances; - } - - /** - * Sets the option to generate appearances. Not generating appearances will speed-up form filling but the results can be unexpected in - * Acrobat. Don't use it unless your environment is well controlled. The default is true. - * - * @param generateAppearances the option to generate appearances - */ - public void setGenerateAppearances(boolean generateAppearances) { - this.generateAppearances = generateAppearances; - PdfDictionary top = reader.getCatalog().getAsDict(PdfName.ACROFORM); - if (generateAppearances) { - top.remove(PdfName.NEEDAPPEARANCES); - } else { - top.put(PdfName.NEEDAPPEARANCES, PdfBoolean.PDFTRUE); - } - } - - /** - * The field representations for retrieval and modification. - */ - public static class Item { - - /** - * writeToAll constant. + } + + /** + * Removes a field from the document. * - * @since 2.1.5 + * @param name the field name + * @return true if the field exists, false otherwise */ - public static final int WRITE_MERGED = 1; + public boolean removeField(String name) { + return removeField(name, -1); + } /** - * writeToAll and markUsed constant. + * Gets the property generateAppearances. * - * @since 2.1.5 + * @return the property generateAppearances */ - public static final int WRITE_WIDGET = 2; + public boolean isGenerateAppearances() { + return generateAppearances; + } /** - * writeToAll and markUsed constant. + * Sets the option to generate appearances. Not generating appearances will speed-up form filling but the results + * can be unexpected in Acrobat. Don't use it unless your environment is well controlled. The default is + * true. * - * @since 2.1.5 + * @param generateAppearances the option to generate appearances */ - public static final int WRITE_VALUE = 4; - - public Item(PdfIndirectReference ref) { - this.fieldReference=ref; + public void setGenerateAppearances(boolean generateAppearances) { + this.generateAppearances = generateAppearances; + PdfDictionary top = reader.getCatalog().getAsDict(PdfName.ACROFORM); + if (generateAppearances) { + top.remove(PdfName.NEEDAPPEARANCES); + } else { + top.put(PdfName.NEEDAPPEARANCES, PdfBoolean.PDFTRUE); + } } /** - * This function writes the given key/value pair to all the instances of merged, widget, and/or value, depending on the - * writeFlags setting + * Gets the field names that have signatures and are signed. * - * @param key you'll never guess what this is for. - * @param value if value is null, the key will be removed - * @param writeFlags ORed together WRITE_* flags - * @since 2.1.5 + * @return the field names that have signatures and are signed */ - public void writeToAll(PdfName key, PdfObject value, int writeFlags) { - int i; - PdfDictionary curDict = null; - if ((writeFlags & WRITE_MERGED) != 0) { - for (i = 0; i < merged.size(); ++i) { - curDict = getMerged(i); - curDict.put(key, value); + public List getSignedFieldNames() { + if (sigNames != null) { + return new ArrayList<>(sigNames.keySet()); } - } - if ((writeFlags & WRITE_WIDGET) != 0) { - for (i = 0; i < widgets.size(); ++i) { - curDict = getWidget(i); - curDict.put(key, value); + sigNames = new HashMap<>(); + List sorter = new ArrayList<>(); + for (Map.Entry entry : fields.entrySet()) { + Item item = entry.getValue(); + PdfDictionary merged = item.getMerged(0); + if (!PdfName.SIG.equals(merged.get(PdfName.FT))) { + continue; + } + PdfDictionary v = merged.getAsDict(PdfName.V); + if (v == null) { + continue; + } + PdfString contents = v.getAsString(PdfName.CONTENTS); + if (contents == null) { + continue; + } + PdfArray ro = v.getAsArray(PdfName.BYTERANGE); + if (ro == null) { + continue; + } + int rangeSize = ro.size(); + if (rangeSize < 2) { + continue; + } + /* + * From the PDF32000_2008 spec: Byterange: An array of pairs of integers + * (starting byte offset, length in bytes) Also see: + * https://pdf-insecurity.org/download/paper.pdf + */ + int lengthOfSignedBlocks = 0; + for (int i = rangeSize - 1; i > 0; i = i - 2) { + lengthOfSignedBlocks += ro.getAsNumber(i).intValue(); + } + int unsignedBlock = contents.getOriginalBytes().length * 2 + 2; + int length = lengthOfSignedBlocks + unsignedBlock; + sorter.add(new Object[]{entry.getKey(), new int[]{length, 0}}); } - } - if ((writeFlags & WRITE_VALUE) != 0) { - for (i = 0; i < values.size(); ++i) { - curDict = getValue(i); - curDict.put(key, value); + sorter.sort(new SorterComparator()); + if (!sorter.isEmpty()) { + if (((int[]) sorter.get(sorter.size() - 1)[1])[0] == reader.getFileLength()) { + totalRevisions = sorter.size(); + } else { + totalRevisions = sorter.size() + 1; + } + for (int k = 0; k < sorter.size(); ++k) { + Object[] objs = sorter.get(k); + String name = (String) objs[0]; + int[] p = (int[]) objs[1]; + p[1] = k + 1; + sigNames.put(name, p); + } } - } + return new ArrayList<>(sigNames.keySet()); } /** - * Mark all the item dictionaries used matching the given flags + * Method to differentiate the signed signatures types contained in a document. Currently approval and certification + * signatures are supported. If a signature is not signed the type 'UNSIGNED' is used. * - * @param writeFlags WRITE_MERGED is ignored - * @param parentFields parent fields - * @since 2.1.5 + * @return {@code HashMap} a list of signature names with its types. */ - public void markUsed(AcroFields parentFields, int writeFlags) { - if ((writeFlags & WRITE_VALUE) != 0) { - for (int i = 0; i < size(); ++i) { - parentFields.markUsed(getValue(i)); + public HashMap getSignatureTypes() { + if (this.sigTypes != null) { + return this.sigTypes; } - } - if ((writeFlags & WRITE_WIDGET) != 0) { - for (int i = 0; i < size(); ++i) { - parentFields.markUsed(getWidget(i)); + this.sigTypes = new HashMap<>(); + + for (Iterator> it = this.fields.entrySet().iterator(); it.hasNext(); ) { + Map.Entry entry = it.next(); + Item item = entry.getValue(); + PdfDictionary merged = item.getMerged(0); + if (!PdfName.SIG.equals(merged.get(PdfName.FT))) { + continue; + } + PdfDictionary v = merged.getAsDict(PdfName.V); + if (v == null) { + this.sigTypes.put(entry.getKey(), SignatureType.UNSIGNED); + continue; + } + PdfString contents = v.getAsString(PdfName.CONTENTS); + if (contents == null) { + this.sigTypes.put(entry.getKey(), SignatureType.INCOMPLETE); + continue; + } + PdfArray ro = v.getAsArray(PdfName.BYTERANGE); + if (ro == null || ro.size() < 2) { + this.sigTypes.put(entry.getKey(), SignatureType.INCOMPLETE); + continue; + } + + PdfArray ref = v.getAsArray(PdfName.REFERENCE); + if (ref == null || ref.size() == 0) { + this.sigTypes.put(entry.getKey(), SignatureType.APPROVAL); + } else { + + for (int i = 0; i < ref.size(); i++) { + PdfDictionary sigRefDict = ref.getAsDict(i); + + if (sigRefDict == null) { + //not PDF compliant since the content of the array must be a dictionary! + throw new IllegalStateException( + "The array of signature reference dictionaries does not contain the correct type (PdfDictionary) but a " + + ref.getPdfObject(i).getClass().getName()); + } + + PdfName name = sigRefDict.getAsName(PdfName.TRANSFORMMETHOD); + + if (name == null) { + //not PDF compliant since it is a required attribute + throw new IllegalStateException("The TRANSFORMMETHOD is missing which violates the PDF spec."); + } + + if (name.equals(PdfName.DOCMDP)) { + PdfDictionary params = sigRefDict.getAsDict(PdfName.TRANSFORMPARAMS); + + if (params == null) { + this.sigTypes.put(entry.getKey(), SignatureType.CERTIFICATION_ALL_CHANGES); + } else { + PdfNumber permissions = params.getAsNumber(PdfName.P); + if (permissions == null || permissions.intValue() == 0) { + this.sigTypes.put(entry.getKey(), SignatureType.CERTIFICATION_ALL_CHANGES); + } else if (permissions.intValue() == 1) { + this.sigTypes.put(entry.getKey(), SignatureType.CERTIFICATION_NO_CHANGES); + } else if (permissions.intValue() == 2) { + this.sigTypes.put(entry.getKey(), SignatureType.CERTIFICATION_FILLINGFORMS_SIGNING); + } else if (permissions.intValue() == 3) { + this.sigTypes.put(entry.getKey(), + SignatureType.CERTIFICATION_FILLINGFORMS_SIGNING_ANNOTATIONS); + } else { + //default according to adobe is 2 + this.sigTypes.put(entry.getKey(), SignatureType.CERTIFICATION_FILLINGFORMS_SIGNING); + } + } + } else if (name.equals(PdfName.UR)) { + this.sigTypes.put(entry.getKey(), SignatureType.USAGE_RIGHTS); + } else if (name.equals(PdfName.UR3)) { + this.sigTypes.put(entry.getKey(), SignatureType.USAGE_RIGHTS); + } else { + this.sigTypes.put(entry.getKey(), SignatureType.APPROVAL); + } + } + } } - } + return this.sigTypes; } /** - * An array of PdfDictionary where the value tag /V is present. + * Gets the field names that have blank signatures. * + * @return the field names that have blank signatures */ - ArrayList values = new ArrayList<>(); + public List getFieldNamesWithBlankSignatures() { + getSignedFieldNames(); + List sigs = new ArrayList<>(); + for (Map.Entry entry : fields.entrySet()) { + Item item = entry.getValue(); + PdfDictionary merged = item.getMerged(0); + if (!PdfName.SIG.equals(merged.getAsName(PdfName.FT))) { + continue; + } + if (sigNames.containsKey(entry.getKey())) { + continue; + } + sigs.add(entry.getKey()); + } + return sigs; + } /** - * An array of PdfDictionary with the widgets. + * Gets the signature dictionary, the one keyed by /V. * + * @param name the field name + * @return the signature dictionary keyed by /V or null if the field is not a signature */ - ArrayList widgets = new ArrayList<>(); + public PdfDictionary getSignatureDictionary(String name) { + getSignedFieldNames(); + name = getTranslatedFieldName(name); + if (!sigNames.containsKey(name)) { + return null; + } + Item item = fields.get(name); + PdfDictionary merged = item.getMerged(0); + return merged.getAsDict(PdfName.V); + } /** - * An array of PdfDictionary with the widget references. + * Checks is the signature covers the entire document or just part of it. * + * @param name the signature field name + * @return true if the signature covers the entire document, + * false otherwise */ - ArrayList widgetRefs = new ArrayList<>(); + public boolean signatureCoversWholeDocument(String name) { + getSignedFieldNames(); + name = getTranslatedFieldName(name); + if (!sigNames.containsKey(name)) { + return false; + } + return sigNames.get(name)[0] == reader.getFileLength(); + } /** - * An array of PdfDictionary with all the field and widget tags merged. + * Verifies a signature. An example usage is: * + * 
    +     * KeyStore kall = PdfPKCS7.loadCacertsKeyStore();
+     * PdfReader reader = new PdfReader("my_signed_doc.pdf");
+     * AcroFields af = reader.getAcroFields();
+     * ArrayList names = af.getSignatureNames();
+     * for (int k = 0; k < names.size(); ++k) {
+     *    String name = (String)names.get(k);
+     *    System.out.println("Signature name: " + name);
+     *    System.out.println("Signature covers whole document: " + af.signatureCoversWholeDocument(name));
+     *    PdfPKCS7 pk = af.verifySignature(name);
+     *    Calendar cal = pk.getSignDate();
+     *    Certificate pkc[] = pk.getCertificates();
+     *    System.out.println("Subject: " + PdfPKCS7.getSubjectFields(pk.getSigningCertificate()));
+     *    System.out.println("Document modified: " + !pk.verify());
+     *    Object fails[] = PdfPKCS7.verifyCertificates(pkc, kall, null, cal);
+     *    if (fails == null)
+     *        System.out.println("Certificates verified against the KeyStore");
+     *    else
+     *        System.out.println("Certificate failed: " + fails[1]);
+     * }
+     *
    + * + * @param name the signature field name + * @return a PdfPKCS7 class to continue the verification */ - ArrayList merged = new ArrayList<>(); + public PdfPKCS7 verifySignature(String name) { + return verifySignature(name, null); + } /** - * An array of Integer with the page numbers where the widgets are displayed. + * Verifies a signature. An example usage is: * + * 
    +     * KeyStore kall = PdfPKCS7.loadCacertsKeyStore();
+     * PdfReader reader = new PdfReader("my_signed_doc.pdf");
+     * AcroFields af = reader.getAcroFields();
+     * ArrayList names = af.getSignatureNames();
+     * for (int k = 0; k < names.size(); ++k) {
+     *    String name = (String)names.get(k);
+     *    System.out.println("Signature name: " + name);
+     *    System.out.println("Signature covers whole document: " + af.signatureCoversWholeDocument(name));
+     *    PdfPKCS7 pk = af.verifySignature(name);
+     *    Calendar cal = pk.getSignDate();
+     *    Certificate pkc[] = pk.getCertificates();
+     *    System.out.println("Subject: " + PdfPKCS7.getSubjectFields(pk.getSigningCertificate()));
+     *    System.out.println("Document modified: " + !pk.verify());
+     *    Object fails[] = PdfPKCS7.verifyCertificates(pkc, kall, null, cal);
+     *    if (fails == null)
+     *        System.out.println("Certificates verified against the KeyStore");
+     *    else
+     *        System.out.println("Certificate failed: " + fails[1]);
+     * }
+     *
    + * + * @param name the signature field name + * @param provider the provider or null for the default provider + * @return a PdfPKCS7 class to continue the verification */ - ArrayList page = new ArrayList<>(); + public PdfPKCS7 verifySignature(String name, String provider) { + PdfDictionary v = getSignatureDictionary(name); + if (v == null) { + return null; + } + try { + PdfName sub = v.getAsName(PdfName.SUBFILTER); + PdfString contents = v.getAsString(PdfName.CONTENTS); + PdfPKCS7 pk = null; + if (sub.equals(PdfName.ADBE_X509_RSA_SHA1)) { + PdfString cert = v.getAsString(PdfName.CERT); + pk = new PdfPKCS7(contents.getOriginalBytes(), cert.getBytes(), provider); + } else { + pk = new PdfPKCS7(contents.getOriginalBytes(), provider); + } + updateByteRange(pk, v); + PdfString str = v.getAsString(PdfName.M); + if (str != null) { + pk.setSignDate(PdfDate.decode(str.toString())); + } + PdfObject obj = PdfReader.getPdfObject(v.get(PdfName.NAME)); + if (obj != null) { + if (obj.isString()) { + pk.setSignName(((PdfString) obj).toUnicodeString()); + } else if (obj.isName()) { + pk.setSignName(PdfName.decodeName(obj.toString())); + } + } + str = v.getAsString(PdfName.REASON); + if (str != null) { + pk.setReason(str.toUnicodeString()); + } + str = v.getAsString(PdfName.LOCATION); + if (str != null) { + pk.setLocation(str.toUnicodeString()); + } + return pk; + } catch (Exception e) { + throw new ExceptionConverter(e); + } + } + + private void updateByteRange(PdfPKCS7 pkcs7, PdfDictionary v) { + PdfArray b = v.getAsArray(PdfName.BYTERANGE); + RandomAccessFileOrArray rf = reader.getSafeFile(); + try { + rf.reOpen(); + byte[] buf = new byte[8192]; + for (int k = 0; k < b.size(); ++k) { + int start = b.getAsNumber(k).intValue(); + int length = b.getAsNumber(++k).intValue(); + rf.seek(start); + while (length > 0) { + int rd = rf.read(buf, 0, Math.min(length, buf.length)); + if (rd <= 0) { + break; + } + length -= rd; + pkcs7.update(buf, 0, rd); + } + } + } catch (Exception e) { + throw new ExceptionConverter(e); + } finally { + try { + rf.close(); + } catch (Exception e) { + } + } + } + /** - * An array of Integer with the tab order of the field in the page. + * Indicate that a PDF object has just been added. If it is not in append mode the object will just be changed. In + * append mode a new object (with the same id) will be appended (cp. PDF incremental update). * + * @param obj which should be marked as 'used' (=dirty) */ - ArrayList tabOrder = new ArrayList<>(); - + public void markUsed(PdfObject obj) { + if (!append) { + return; + } + ((PdfStamperImp) writer).markUsed(obj); + } + /** - * The indirect reference of the item itself + * Gets the total number of revisions this document has. + * + * @return the total number of revisions */ - private PdfIndirectReference fieldReference; + public int getTotalRevisions() { + getSignedFieldNames(); + return this.totalRevisions; + } /** - * Preferred method of determining the number of instances of a given field. + * Gets this field revision. * - * @return number of instances - * @since 2.1.5 + * @param field the signature field name + * @return the revision or zero if it's not a signature field */ - public int size() { - return values.size(); + public int getRevision(String field) { + getSignedFieldNames(); + field = getTranslatedFieldName(field); + if (!sigNames.containsKey(field)) { + return 0; + } + return sigNames.get(field)[1]; } /** - * Remove the given instance from this item. It is possible to remove all instances using this function. + * Extracts a revision from the document. * - * @since 2.1.5 + * @param field the signature field name + * @return an InputStream covering the revision. Returns null if it's not a signature + * field + * @throws IOException on error */ - public void remove(int killIdx) { - values.remove(killIdx); - widgets.remove(killIdx); - widgetRefs.remove(killIdx); - merged.remove(killIdx); - page.remove(killIdx); - tabOrder.remove(killIdx); + public InputStream extractRevision(String field) throws IOException { + getSignedFieldNames(); + field = getTranslatedFieldName(field); + if (!sigNames.containsKey(field)) { + return null; + } + int length = sigNames.get(field)[0]; + RandomAccessFileOrArray raf = reader.getSafeFile(); + raf.reOpen(); + raf.seek(0); + return new RevisionStream(raf, length); } /** - * Retrieve the value dictionary of the given instance + * Indicates whether the stamper is in append mode or not * - * @param idx instance index - * @return dictionary storing this instance's value. It may be shared across instances. - * @since 2.1.5 + * @return true when everything is done in the append mode otherwise false */ - public PdfDictionary getValue(int idx) { - return values.get(idx); + public boolean isAppend() { + return this.append; } /** - * Add a value dict to this Item + * Gets the appearances cache. * - * @param value new value dictionary - * @since 2.1.5 + * @return the appearances cache */ - void addValue(PdfDictionary value) { - values.add(value); + public Map getFieldCacheMap() { + return fieldCache; } /** - * Retrieve the widget dictionary of the given instance + * Sets a cache for field appearances. Parsing the existing PDF to create a new TextField is time expensive. For + * those tasks that repeatedly fill the same PDF with different field values the use of the cache has dramatic speed + * advantages. An example usage: * - * @param idx instance index - * @return The dictionary found in the appropriate page's Annot array. - * @since 2.1.5 + * 
    +     * String pdfFile = ...;// the pdf file used as template
+     * ArrayList xfdfFiles = ...;// the xfdf file names
+     * ArrayList pdfOutFiles = ...;// the output file names, one for each element in xpdfFiles
+     * HashMap cache = new HashMap();// the appearances cache
+     * PdfReader originalReader = new PdfReader(pdfFile);
+     * for (int k = 0; k < xfdfFiles.size(); ++k) {
+     *    PdfReader reader = new PdfReader(originalReader);
+     *    XfdfReader xfdf = new XfdfReader((String)xfdfFiles.get(k));
+     *    PdfStamper stp = new PdfStamper(reader, new FileOutputStream((String)pdfOutFiles.get(k)));
+     *    AcroFields af = stp.getAcroFields();
+     *    af.setFieldCache(cache);
+     *    af.setFields(xfdf);
+     *    stp.close();
+     * }
+     *
    + * + * @param fieldCache a Map that will carry the cached appearances */ - public PdfDictionary getWidget(int idx) { - return widgets.get(idx); + public void setFieldCacheMap(Map fieldCache) { + this.fieldCache = fieldCache; } /** - * Add a widget dict to this Item + * Sets extra margins in text fields to better mimic the Acrobat layout. * - * @since 2.1.5 + * @param extraMarginLeft the extra margin left + * @param extraMarginTop the extra margin top */ - void addWidget(PdfDictionary widget) { - widgets.add(widget); + public void setExtraMargin(float extraMarginLeft, float extraMarginTop) { + this.extraMarginLeft = extraMarginLeft; + this.extraMarginTop = extraMarginTop; } /** - * Retrieve the reference to the given instance + * Adds a substitution font to the list. The fonts in this list will be used if the original font doesn't contain + * the needed glyphs. * - * @param idx instance index - * @return reference to the given field instance - * @since 2.1.5 + * @param font the font */ - public PdfIndirectReference getWidgetRef(int idx) { - return widgetRefs.get(idx); + public void addSubstitutionFont(BaseFont font) { + if (substitutionFonts == null) { + substitutionFonts = new ArrayList<>(); + } + substitutionFonts.add(font); } /** - * Add a widget ref to this Item + * Gets the list of substitution fonts. The list is composed of BaseFont and can be null. + * The fonts in this list will be used if the original font doesn't contain the needed glyphs. * - * @since 2.1.5 + * @return the list */ - void addWidgetRef(PdfIndirectReference widgRef) { - widgetRefs.add(widgRef); + public List getAllSubstitutionFonts() { + return substitutionFonts; } /** - * Retrieve the merged dictionary for the given instance. The merged dictionary contains all the keys present in parent fields, though - * they may have been overwritten (or modified?) by children. Example: a merged radio field dict will contain /V + * Sets a list of substitution fonts. The list is composed of BaseFont and can also be + * null. The fonts in this list will be used if the original font doesn't contain the needed glyphs. * - * @param idx instance index - * @return the merged dictionary for the given instance - * @since 2.1.5 + * @param substitutionFonts the list */ - public PdfDictionary getMerged(int idx) { - return merged.get(idx); + public void setAllSubstitutionFonts(List substitutionFonts) { + this.substitutionFonts = substitutionFonts; } /** - * Adds a merged dictionary to this Item. + * Gets the XFA form processor. * - * @since 2.1.5 + * @return the XFA form processor */ - void addMerged(PdfDictionary mergeDict) { - merged.add(mergeDict); + public XfaForm getXfa() { + return xfa; } /** - * Retrieve the page number of the given instance - * - * @param idx index - * @return remember, pages are "1-indexed", not "0-indexed" like field instances. - * @since 2.1.5 + * Removes the XFA stream from the document */ - public Integer getPage(int idx) { - return page.get(idx); + public void removeXfa() { + PdfDictionary root = this.reader.getCatalog(); + PdfDictionary acroform = root.getAsDict(PdfName.ACROFORM); + + if (acroform != null) { + acroform.remove(PdfName.XFA); + try { + this.xfa = new XfaForm(this.reader); + } catch (Exception e) { + throw new ExceptionConverter(e); + } + } } /** - * Adds a page to the current Item. + * Creates a new pushbutton from an existing field. If there are several pushbuttons with the same name only the + * first one is used. This pushbutton can be changed and be used to replace an existing one, with the same name or + * other name, as long is it is in the same document. To replace an existing pushbutton call + * {@link #replacePushbuttonField(String, PdfFormField)}. * - * @since 2.1.5 + * @param field the field name that should be a pushbutton + * @return a new pushbutton or null if the field is not a pushbutton */ - void addPage(int pg) { - page.add(pg); + public PushbuttonField getNewPushbuttonFromField(String field) { + return getNewPushbuttonFromField(field, 0); } /** - * forces a page value into the Item. + * Creates a new pushbutton from an existing field. This pushbutton can be changed and be used to replace an + * existing one, with the same name or other name, as long is it is in the same document. To replace an existing + * pushbutton call {@link #replacePushbuttonField(String, PdfFormField, int)}. * - * @since 2.1.5 + * @param field the field name that should be a pushbutton + * @param order the field order in fields with same name + * @return a new pushbutton or null if the field is not a pushbutton + * @since 2.0.7 */ - void forcePage(int idx, int pg) { - page.set(idx, pg); + public PushbuttonField getNewPushbuttonFromField(String field, int order) { + try { + if (getFieldType(field) != FIELD_TYPE_PUSHBUTTON) { + return null; + } + Item item = getFieldItem(field); + if (order >= item.size()) { + return null; + } + int posi = order * 5; + float[] pos = getFieldPositions(field); + Rectangle box = new Rectangle(pos[posi + 1], pos[posi + 2], pos[posi + 3], pos[posi + 4]); + PushbuttonField newButton = new PushbuttonField(writer, box, null); + PdfDictionary dic = item.getMerged(order); + decodeGenericDictionary(dic, newButton); + PdfDictionary mk = dic.getAsDict(PdfName.MK); + if (mk != null) { + PdfString text = mk.getAsString(PdfName.CA); + if (text != null) { + newButton.setText(text.toUnicodeString()); + } + PdfNumber tp = mk.getAsNumber(PdfName.TP); + if (tp != null) { + newButton.setLayout(tp.intValue() + 1); + } + PdfDictionary ifit = mk.getAsDict(PdfName.IF); + if (ifit != null) { + PdfName sw = ifit.getAsName(PdfName.SW); + if (sw != null) { + int scale = PushbuttonField.SCALE_ICON_ALWAYS; + if (sw.equals(PdfName.B)) { + scale = PushbuttonField.SCALE_ICON_IS_TOO_BIG; + } else if (sw.equals(PdfName.S)) { + scale = PushbuttonField.SCALE_ICON_IS_TOO_SMALL; + } else if (sw.equals(PdfName.N)) { + scale = PushbuttonField.SCALE_ICON_NEVER; + } + newButton.setScaleIcon(scale); + } + sw = ifit.getAsName(PdfName.S); + if (sw != null) { + if (sw.equals(PdfName.A)) { + newButton.setProportionalIcon(false); + } + } + PdfArray aj = ifit.getAsArray(PdfName.A); + if (aj != null && aj.size() == 2) { + float left = aj.getAsNumber(0).floatValue(); + float bottom = aj.getAsNumber(1).floatValue(); + newButton.setIconHorizontalAdjustment(left); + newButton.setIconVerticalAdjustment(bottom); + } + PdfBoolean fb = ifit.getAsBoolean(PdfName.FB); + if (fb != null && fb.booleanValue()) { + newButton.setIconFitToBounds(true); + } + } + PdfObject i = mk.get(PdfName.I); + if (i != null && i.isIndirect()) { + newButton.setIconReference((PRIndirectReference) i); + } + } + return newButton; + } catch (Exception e) { + throw new ExceptionConverter(e); + } } /** - * Gets the tabOrder. + * Replaces the first field with a new pushbutton. The pushbutton can be created with + * {@link #getNewPushbuttonFromField(String)} from the same document or it can be a generic PdfFormField of the type + * pushbutton. * - * @param idx index - * @return tab index of the given field instance - * @since 2.1.5 + * @param field the field name + * @param button the PdfFormField representing the pushbutton + * @return true if the field was replaced, false if the field + * was not a pushbutton */ - public Integer getTabOrder(int idx) { - return tabOrder.get(idx); + public boolean replacePushbuttonField(String field, PdfFormField button) { + return replacePushbuttonField(field, button, 0); } /** - * Adds a tab order value to this Item. + * Replaces the designated field with a new pushbutton. The pushbutton can be created with + * {@link #getNewPushbuttonFromField(String, int)} from the same document or it can be a generic PdfFormField of the + * type pushbutton. * - * @param order order for the tab - * @since 2.1.5 + * @param field the field name + * @param button the PdfFormField representing the pushbutton + * @param order the field order in fields with same name + * @return true if the field was replaced, false if the field + * was not a pushbutton + * @since 2.0.7 */ - void addTabOrder(int order) { - tabOrder.add(order); + public boolean replacePushbuttonField(String field, PdfFormField button, int order) { + if (getFieldType(field) != FIELD_TYPE_PUSHBUTTON) { + return false; + } + Item item = getFieldItem(field); + if (order >= item.size()) { + return false; + } + PdfDictionary merged = item.getMerged(order); + PdfDictionary values = item.getValue(order); + PdfDictionary widgets = item.getWidget(order); + for (PdfName pdfName : buttonRemove) { + merged.remove(pdfName); + values.remove(pdfName); + widgets.remove(pdfName); + } + for (PdfName key : button.getKeys()) { + if (key.equals(PdfName.T) || key.equals(PdfName.RECT)) { + continue; + } + if (key.equals(PdfName.FF)) { + values.put(key, button.get(key)); + } else { + widgets.put(key, button.get(key)); + } + merged.put(key, button.get(key)); + } + return true; } - + /** - * Returns the indirect reference of the field itself - * @return PdfIndirectReferenceof the field + * The field representations for retrieval and modification. */ - public PdfIndirectReference getFieldReference() { - return this.fieldReference; + public static class Item { + + /** + * writeToAll constant. + * + * @since 2.1.5 + */ + public static final int WRITE_MERGED = 1; + + /** + * writeToAll and markUsed constant. + * + * @since 2.1.5 + */ + public static final int WRITE_WIDGET = 2; + + /** + * writeToAll and markUsed constant. + * + * @since 2.1.5 + */ + public static final int WRITE_VALUE = 4; + /** + * An array of PdfDictionary where the value tag /V is present. + */ + ArrayList values = new ArrayList<>(); + /** + * An array of PdfDictionary with the widgets. + */ + ArrayList widgets = new ArrayList<>(); + /** + * An array of PdfDictionary with the widget references. + */ + ArrayList widgetRefs = new ArrayList<>(); + /** + * An array of PdfDictionary with all the field and widget tags merged. + */ + ArrayList merged = new ArrayList<>(); + /** + * An array of Integer with the page numbers where the widgets are displayed. + */ + ArrayList page = new ArrayList<>(); + /** + * An array of Integer with the tab order of the field in the page. + */ + ArrayList tabOrder = new ArrayList<>(); + /** + * The indirect reference of the item itself + */ + private PdfIndirectReference fieldReference; + + public Item(PdfIndirectReference ref) { + this.fieldReference = ref; + } + + /** + * This function writes the given key/value pair to all the instances of merged, widget, and/or value, depending + * on the + * writeFlags setting + * + * @param key you'll never guess what this is for. + * @param value if value is null, the key will be removed + * @param writeFlags ORed together WRITE_* flags + * @since 2.1.5 + */ + public void writeToAll(PdfName key, PdfObject value, int writeFlags) { + int i; + PdfDictionary curDict = null; + if ((writeFlags & WRITE_MERGED) != 0) { + for (i = 0; i < merged.size(); ++i) { + curDict = getMerged(i); + curDict.put(key, value); + } + } + if ((writeFlags & WRITE_WIDGET) != 0) { + for (i = 0; i < widgets.size(); ++i) { + curDict = getWidget(i); + curDict.put(key, value); + } + } + if ((writeFlags & WRITE_VALUE) != 0) { + for (i = 0; i < values.size(); ++i) { + curDict = getValue(i); + curDict.put(key, value); + } + } + } + + /** + * Mark all the item dictionaries used matching the given flags + * + * @param writeFlags WRITE_MERGED is ignored + * @param parentFields parent fields + * @since 2.1.5 + */ + public void markUsed(AcroFields parentFields, int writeFlags) { + if ((writeFlags & WRITE_VALUE) != 0) { + for (int i = 0; i < size(); ++i) { + parentFields.markUsed(getValue(i)); + } + } + if ((writeFlags & WRITE_WIDGET) != 0) { + for (int i = 0; i < size(); ++i) { + parentFields.markUsed(getWidget(i)); + } + } + } + + /** + * Preferred method of determining the number of instances of a given field. + * + * @return number of instances + * @since 2.1.5 + */ + public int size() { + return values.size(); + } + + /** + * Remove the given instance from this item. It is possible to remove all instances using this function. + * + * @since 2.1.5 + */ + public void remove(int killIdx) { + values.remove(killIdx); + widgets.remove(killIdx); + widgetRefs.remove(killIdx); + merged.remove(killIdx); + page.remove(killIdx); + tabOrder.remove(killIdx); + } + + /** + * Retrieve the value dictionary of the given instance + * + * @param idx instance index + * @return dictionary storing this instance's value. It may be shared across instances. + * @since 2.1.5 + */ + public PdfDictionary getValue(int idx) { + return values.get(idx); + } + + /** + * Add a value dict to this Item + * + * @param value new value dictionary + * @since 2.1.5 + */ + void addValue(PdfDictionary value) { + values.add(value); + } + + /** + * Retrieve the widget dictionary of the given instance + * + * @param idx instance index + * @return The dictionary found in the appropriate page's Annot array. + * @since 2.1.5 + */ + public PdfDictionary getWidget(int idx) { + return widgets.get(idx); + } + + /** + * Add a widget dict to this Item + * + * @since 2.1.5 + */ + void addWidget(PdfDictionary widget) { + widgets.add(widget); + } + + /** + * Retrieve the reference to the given instance + * + * @param idx instance index + * @return reference to the given field instance + * @since 2.1.5 + */ + public PdfIndirectReference getWidgetRef(int idx) { + return widgetRefs.get(idx); + } + + /** + * Add a widget ref to this Item + * + * @since 2.1.5 + */ + void addWidgetRef(PdfIndirectReference widgRef) { + widgetRefs.add(widgRef); + } + + /** + * Retrieve the merged dictionary for the given instance. The merged dictionary contains all the keys present + * in parent fields, though they may have been overwritten (or modified?) by children. Example: a merged radio + * field dict will contain /V + * + * @param idx instance index + * @return the merged dictionary for the given instance + * @since 2.1.5 + */ + public PdfDictionary getMerged(int idx) { + return merged.get(idx); + } + + /** + * Adds a merged dictionary to this Item. + * + * @since 2.1.5 + */ + void addMerged(PdfDictionary mergeDict) { + merged.add(mergeDict); + } + + /** + * Retrieve the page number of the given instance + * + * @param idx index + * @return remember, pages are "1-indexed", not "0-indexed" like field instances. + * @since 2.1.5 + */ + public Integer getPage(int idx) { + return page.get(idx); + } + + /** + * Adds a page to the current Item. + * + * @since 2.1.5 + */ + void addPage(int pg) { + page.add(pg); + } + + /** + * forces a page value into the Item. + * + * @since 2.1.5 + */ + void forcePage(int idx, int pg) { + page.set(idx, pg); + } + + /** + * Gets the tabOrder. + * + * @param idx index + * @return tab index of the given field instance + * @since 2.1.5 + */ + public Integer getTabOrder(int idx) { + return tabOrder.get(idx); + } + + /** + * Adds a tab order value to this Item. + * + * @param order order for the tab + * @since 2.1.5 + */ + void addTabOrder(int order) { + tabOrder.add(order); + } + + /** + * Returns the indirect reference of the field itself + * + * @return PdfIndirectReferenceof the field + */ + public PdfIndirectReference getFieldReference() { + return this.fieldReference; + } + } + + private static class InstHit { + + IntHashtable hits; + + public InstHit(int[] inst) { + if (inst == null) { + return; + } + hits = new IntHashtable(); + for (int i : inst) { + hits.put(i, 1); + } + } + + public boolean isHit(int n) { + if (hits == null) { + return true; + } + return hits.containsKey(n); + } } - } - private static class InstHit { + private static class RevisionStream extends InputStream { + + private final byte[] b = new byte[1]; + private final RandomAccessFileOrArray raf; + private final int length; + private int rangePosition = 0; + private boolean closed; + + private RevisionStream(RandomAccessFileOrArray raf, int length) { + this.raf = raf; + this.length = length; + } + + public int read() throws IOException { + int n = read(b); + if (n != 1) { + return -1; + } + return b[0] & 0xff; + } - IntHashtable hits; + public int read(byte[] b, int off, int len) throws IOException { + if (b == null) { + throw new NullPointerException(); + } else if ((off < 0) || (off > b.length) || (len < 0) || + ((off + len) > b.length) || ((off + len) < 0)) { + throw new IndexOutOfBoundsException(); + } else if (len == 0) { + return 0; + } + if (rangePosition >= length) { + close(); + return -1; + } + int elen = Math.min(len, length - rangePosition); + raf.readFully(b, off, elen); + rangePosition += elen; + return elen; + } - public InstHit(int[] inst) { - if (inst == null) { - return; - } - hits = new IntHashtable(); - for (int i : inst) { - hits.put(i, 1); - } + public void close() throws IOException { + if (!closed) { + raf.close(); + closed = true; + } + } } - public boolean isHit(int n) { - if (hits == null) { - return true; - } - return hits.containsKey(n); - } - } - - /** - * Gets the field names that have signatures and are signed. - * - * @return the field names that have signatures and are signed - */ - public List getSignedFieldNames() { - if (sigNames != null) { - return new ArrayList<>(sigNames.keySet()); - } - sigNames = new HashMap<>(); - List sorter = new ArrayList<>(); - for (Map.Entry entry : fields.entrySet()) { - Item item = entry.getValue(); - PdfDictionary merged = item.getMerged(0); - if (!PdfName.SIG.equals(merged.get(PdfName.FT))) { - continue; - } - PdfDictionary v = merged.getAsDict(PdfName.V); - if (v == null) { - continue; - } - PdfString contents = v.getAsString(PdfName.CONTENTS); - if (contents == null) { - continue; - } - PdfArray ro = v.getAsArray(PdfName.BYTERANGE); - if (ro == null) { - continue; - } - int rangeSize = ro.size(); - if (rangeSize < 2) { - continue; - } - /* - * From the PDF32000_2008 spec: Byterange: An array of pairs of integers - * (starting byte offset, length in bytes) Also see: - * https://pdf-insecurity.org/download/paper.pdf - */ - int lengthOfSignedBlocks = 0; - for (int i = rangeSize - 1; i > 0; i = i - 2) { - lengthOfSignedBlocks += ro.getAsNumber(i).intValue(); - } - int unsignedBlock = contents.getOriginalBytes().length * 2 + 2; - int length = lengthOfSignedBlocks + unsignedBlock; - sorter.add(new Object[]{entry.getKey(), new int[]{length, 0}}); - } - sorter.sort(new SorterComparator()); - if (!sorter.isEmpty()) { - if (((int[]) sorter.get(sorter.size() - 1)[1])[0] == reader.getFileLength()) { - totalRevisions = sorter.size(); - } else { - totalRevisions = sorter.size() + 1; - } - for (int k = 0; k < sorter.size(); ++k) { - Object[] objs = sorter.get(k); - String name = (String) objs[0]; - int[] p = (int[]) objs[1]; - p[1] = k + 1; - sigNames.put(name, p); - } - } - return new ArrayList<>(sigNames.keySet()); - } - - /** - * Method to differentiate the signed signatures types contained in a document. - * Currently approval and certification signatures are supported. If a signature is not signed the type 'UNSIGNED' is used. - * - * @return {@code HashMap} a list of signature names with its types. - */ - public HashMap getSignatureTypes(){ - if (this.sigTypes != null) - return this.sigTypes; - this.sigTypes = new HashMap<>(); - - for (Iterator> it = this.fields.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = it.next(); - Item item = entry.getValue(); - PdfDictionary merged = item.getMerged(0); - if (!PdfName.SIG.equals(merged.get(PdfName.FT))) - continue; - PdfDictionary v = merged.getAsDict(PdfName.V); - if (v == null) { - this.sigTypes.put(entry.getKey(), SignatureType.UNSIGNED); - continue; - } - PdfString contents = v.getAsString(PdfName.CONTENTS); - if (contents == null) { - this.sigTypes.put(entry.getKey(), SignatureType.INCOMPLETE); - continue; - } - PdfArray ro = v.getAsArray(PdfName.BYTERANGE); - if (ro == null || ro.size() < 2) { - this.sigTypes.put(entry.getKey(), SignatureType.INCOMPLETE); - continue; - } - - PdfArray ref = v.getAsArray(PdfName.REFERENCE); - if(ref==null || ref.size()==0) { - this.sigTypes.put(entry.getKey(), SignatureType.APPROVAL); - } - else { - - for(int i=0;i getFieldNamesWithBlankSignatures() { - getSignedFieldNames(); - List sigs = new ArrayList<>(); - for (Map.Entry entry : fields.entrySet()) { - Item item = entry.getValue(); - PdfDictionary merged = item.getMerged(0); - if (!PdfName.SIG.equals(merged.getAsName(PdfName.FT))) { - continue; - } - if (sigNames.containsKey(entry.getKey())) { - continue; - } - sigs.add(entry.getKey()); - } - return sigs; - } - - /** - * Gets the signature dictionary, the one keyed by /V. - * - * @param name the field name - * @return the signature dictionary keyed by /V or null if the field is not a signature - */ - public PdfDictionary getSignatureDictionary(String name) { - getSignedFieldNames(); - name = getTranslatedFieldName(name); - if (!sigNames.containsKey(name)) { - return null; - } - Item item = fields.get(name); - PdfDictionary merged = item.getMerged(0); - return merged.getAsDict(PdfName.V); - } - - /** - * Checks is the signature covers the entire document or just part of it. - * - * @param name the signature field name - * @return true if the signature covers the entire document, - * false otherwise - */ - public boolean signatureCoversWholeDocument(String name) { - getSignedFieldNames(); - name = getTranslatedFieldName(name); - if (!sigNames.containsKey(name)) { - return false; - } - return sigNames.get(name)[0] == reader.getFileLength(); - } - - /** - * Verifies a signature. An example usage is: - * - * 
    -   * KeyStore kall = PdfPKCS7.loadCacertsKeyStore();
-   * PdfReader reader = new PdfReader("my_signed_doc.pdf");
-   * AcroFields af = reader.getAcroFields();
-   * ArrayList names = af.getSignatureNames();
-   * for (int k = 0; k < names.size(); ++k) {
-   *    String name = (String)names.get(k);
-   *    System.out.println("Signature name: " + name);
-   *    System.out.println("Signature covers whole document: " + af.signatureCoversWholeDocument(name));
-   *    PdfPKCS7 pk = af.verifySignature(name);
-   *    Calendar cal = pk.getSignDate();
-   *    Certificate pkc[] = pk.getCertificates();
-   *    System.out.println("Subject: " + PdfPKCS7.getSubjectFields(pk.getSigningCertificate()));
-   *    System.out.println("Document modified: " + !pk.verify());
-   *    Object fails[] = PdfPKCS7.verifyCertificates(pkc, kall, null, cal);
-   *    if (fails == null)
-   *        System.out.println("Certificates verified against the KeyStore");
-   *    else
-   *        System.out.println("Certificate failed: " + fails[1]);
-   * }
-   *
    - * - * @param name the signature field name - * @return a PdfPKCS7 class to continue the verification - */ - public PdfPKCS7 verifySignature(String name) { - return verifySignature(name, null); - } - - /** - * Verifies a signature. An example usage is: - * - * 
    -   * KeyStore kall = PdfPKCS7.loadCacertsKeyStore();
-   * PdfReader reader = new PdfReader("my_signed_doc.pdf");
-   * AcroFields af = reader.getAcroFields();
-   * ArrayList names = af.getSignatureNames();
-   * for (int k = 0; k < names.size(); ++k) {
-   *    String name = (String)names.get(k);
-   *    System.out.println("Signature name: " + name);
-   *    System.out.println("Signature covers whole document: " + af.signatureCoversWholeDocument(name));
-   *    PdfPKCS7 pk = af.verifySignature(name);
-   *    Calendar cal = pk.getSignDate();
-   *    Certificate pkc[] = pk.getCertificates();
-   *    System.out.println("Subject: " + PdfPKCS7.getSubjectFields(pk.getSigningCertificate()));
-   *    System.out.println("Document modified: " + !pk.verify());
-   *    Object fails[] = PdfPKCS7.verifyCertificates(pkc, kall, null, cal);
-   *    if (fails == null)
-   *        System.out.println("Certificates verified against the KeyStore");
-   *    else
-   *        System.out.println("Certificate failed: " + fails[1]);
-   * }
-   *
    - * - * @param name the signature field name - * @param provider the provider or null for the default provider - * @return a PdfPKCS7 class to continue the verification - */ - public PdfPKCS7 verifySignature(String name, String provider) { - PdfDictionary v = getSignatureDictionary(name); - if (v == null) { - return null; - } - try { - PdfName sub = v.getAsName(PdfName.SUBFILTER); - PdfString contents = v.getAsString(PdfName.CONTENTS); - PdfPKCS7 pk = null; - if (sub.equals(PdfName.ADBE_X509_RSA_SHA1)) { - PdfString cert = v.getAsString(PdfName.CERT); - pk = new PdfPKCS7(contents.getOriginalBytes(), cert.getBytes(), provider); - } else { - pk = new PdfPKCS7(contents.getOriginalBytes(), provider); - } - updateByteRange(pk, v); - PdfString str = v.getAsString(PdfName.M); - if (str != null) { - pk.setSignDate(PdfDate.decode(str.toString())); - } - PdfObject obj = PdfReader.getPdfObject(v.get(PdfName.NAME)); - if (obj != null) { - if (obj.isString()) { - pk.setSignName(((PdfString) obj).toUnicodeString()); - } else if (obj.isName()) { - pk.setSignName(PdfName.decodeName(obj.toString())); - } - } - str = v.getAsString(PdfName.REASON); - if (str != null) { - pk.setReason(str.toUnicodeString()); - } - str = v.getAsString(PdfName.LOCATION); - if (str != null) { - pk.setLocation(str.toUnicodeString()); - } - return pk; - } catch (Exception e) { - throw new ExceptionConverter(e); - } - } - - private void updateByteRange(PdfPKCS7 pkcs7, PdfDictionary v) { - PdfArray b = v.getAsArray(PdfName.BYTERANGE); - RandomAccessFileOrArray rf = reader.getSafeFile(); - try { - rf.reOpen(); - byte[] buf = new byte[8192]; - for (int k = 0; k < b.size(); ++k) { - int start = b.getAsNumber(k).intValue(); - int length = b.getAsNumber(++k).intValue(); - rf.seek(start); - while (length > 0) { - int rd = rf.read(buf, 0, Math.min(length, buf.length)); - if (rd <= 0) { - break; - } - length -= rd; - pkcs7.update(buf, 0, rd); - } - } - } catch (Exception e) { - throw new ExceptionConverter(e); - } finally { - try { - rf.close(); - } catch (Exception e) { - } - } - } - - /** - * Indicate that a PDF object has just been added. If it is not in append mode the object will just be changed. - * In append mode a new object (with the same id) will be appended (cp. PDF incremental update). - * - * @param obj which should be marked as 'used' (=dirty) - */ - public void markUsed(PdfObject obj) { - if (!append) { - return; - } - ((PdfStamperImp) writer).markUsed(obj); - } - - /** - * Gets the total number of revisions this document has. - * - * @return the total number of revisions - */ - public int getTotalRevisions() { - getSignedFieldNames(); - return this.totalRevisions; - } - - /** - * Gets this field revision. - * - * @param field the signature field name - * @return the revision or zero if it's not a signature field - */ - public int getRevision(String field) { - getSignedFieldNames(); - field = getTranslatedFieldName(field); - if (!sigNames.containsKey(field)) { - return 0; - } - return sigNames.get(field)[1]; - } - - /** - * Extracts a revision from the document. - * - * @param field the signature field name - * @return an InputStream covering the revision. Returns null if it's not a signature field - * @throws IOException on error - */ - public InputStream extractRevision(String field) throws IOException { - getSignedFieldNames(); - field = getTranslatedFieldName(field); - if (!sigNames.containsKey(field)) { - return null; - } - int length = sigNames.get(field)[0]; - RandomAccessFileOrArray raf = reader.getSafeFile(); - raf.reOpen(); - raf.seek(0); - return new RevisionStream(raf, length); - } - - /** - * Indicates whether the stamper is in append mode or not - * - * @return true when everything is done in the append mode otherwise false - */ - public boolean isAppend() { - return this.append; - } - - /** - * Gets the appearances cache. - * - * @return the appearances cache - */ - public Map getFieldCacheMap() { - return fieldCache; - } - - /** - * Sets a cache for field appearances. Parsing the existing PDF to create a new TextField is time expensive. For those tasks that - * repeatedly fill the same PDF with different field values the use of the cache has dramatic speed advantages. An example usage: - * - * 
    -   * String pdfFile = ...;// the pdf file used as template
-   * ArrayList xfdfFiles = ...;// the xfdf file names
-   * ArrayList pdfOutFiles = ...;// the output file names, one for each element in xpdfFiles
-   * HashMap cache = new HashMap();// the appearances cache
-   * PdfReader originalReader = new PdfReader(pdfFile);
-   * for (int k = 0; k < xfdfFiles.size(); ++k) {
-   *    PdfReader reader = new PdfReader(originalReader);
-   *    XfdfReader xfdf = new XfdfReader((String)xfdfFiles.get(k));
-   *    PdfStamper stp = new PdfStamper(reader, new FileOutputStream((String)pdfOutFiles.get(k)));
-   *    AcroFields af = stp.getAcroFields();
-   *    af.setFieldCache(cache);
-   *    af.setFields(xfdf);
-   *    stp.close();
-   * }
-   *
    - * - * @param fieldCache a Map that will carry the cached appearances - */ - public void setFieldCacheMap(Map fieldCache) { - this.fieldCache = fieldCache; - } - - /** - * Sets extra margins in text fields to better mimic the Acrobat layout. - * - * @param extraMarginLeft the extra margin left - * @param extraMarginTop the extra margin top - */ - public void setExtraMargin(float extraMarginLeft, float extraMarginTop) { - this.extraMarginLeft = extraMarginLeft; - this.extraMarginTop = extraMarginTop; - } - - /** - * Adds a substitution font to the list. The fonts in this list will be used if the original font doesn't contain the needed glyphs. - * - * @param font the font - */ - public void addSubstitutionFont(BaseFont font) { - if (substitutionFonts == null) { - substitutionFonts = new ArrayList<>(); - } - substitutionFonts.add(font); - } - - private static final HashMap stdFieldFontNames = new HashMap<>(); - - /** - * Holds value of property totalRevisions. - */ - private int totalRevisions; - - /** - * Holds value of property fieldCache. - * - * @since 2.1.5 this used to be a HashMap - */ - private Map fieldCache; - - static { - stdFieldFontNames.put("CoBO", new String[]{"Courier-BoldOblique"}); - stdFieldFontNames.put("CoBo", new String[]{"Courier-Bold"}); - stdFieldFontNames.put("CoOb", new String[]{"Courier-Oblique"}); - stdFieldFontNames.put("Cour", new String[]{"Courier"}); - stdFieldFontNames.put("HeBO", new String[]{"Helvetica-BoldOblique"}); - stdFieldFontNames.put("HeBo", new String[]{"Helvetica-Bold"}); - stdFieldFontNames.put("HeOb", new String[]{"Helvetica-Oblique"}); - stdFieldFontNames.put("Helv", new String[]{"Helvetica"}); - stdFieldFontNames.put("Symb", new String[]{"Symbol"}); - stdFieldFontNames.put("TiBI", new String[]{"Times-BoldItalic"}); - stdFieldFontNames.put("TiBo", new String[]{"Times-Bold"}); - stdFieldFontNames.put("TiIt", new String[]{"Times-Italic"}); - stdFieldFontNames.put("TiRo", new String[]{"Times-Roman"}); - stdFieldFontNames.put("ZaDb", new String[]{"ZapfDingbats"}); - stdFieldFontNames.put("HySm", new String[]{"HYSMyeongJo-Medium", "UniKS-UCS2-H"}); - stdFieldFontNames.put("HyGo", new String[]{"HYGoThic-Medium", "UniKS-UCS2-H"}); - stdFieldFontNames.put("KaGo", new String[]{"HeiseiKakuGo-W5", "UniKS-UCS2-H"}); - stdFieldFontNames.put("KaMi", new String[]{"HeiseiMin-W3", "UniJIS-UCS2-H"}); - stdFieldFontNames.put("MHei", new String[]{"MHei-Medium", "UniCNS-UCS2-H"}); - stdFieldFontNames.put("MSun", new String[]{"MSung-Light", "UniCNS-UCS2-H"}); - stdFieldFontNames.put("STSo", new String[]{"STSong-Light", "UniGB-UCS2-H"}); - } - - private static class RevisionStream extends InputStream { - - private final byte[] b = new byte[1]; - private final RandomAccessFileOrArray raf; - private final int length; - private int rangePosition = 0; - private boolean closed; - - private RevisionStream(RandomAccessFileOrArray raf, int length) { - this.raf = raf; - this.length = length; - } - - public int read() throws IOException { - int n = read(b); - if (n != 1) { - return -1; - } - return b[0] & 0xff; - } - - public int read(byte[] b, int off, int len) throws IOException { - if (b == null) { - throw new NullPointerException(); - } else if ((off < 0) || (off > b.length) || (len < 0) || - ((off + len) > b.length) || ((off + len) < 0)) { - throw new IndexOutOfBoundsException(); - } else if (len == 0) { - return 0; - } - if (rangePosition >= length) { - close(); - return -1; - } - int elen = Math.min(len, length - rangePosition); - raf.readFully(b, off, elen); - rangePosition += elen; - return elen; - } - - public void close() throws IOException { - if (!closed) { - raf.close(); - closed = true; - } - } - } - - private static class SorterComparator implements Comparator { - - public int compare(Object[] o1, Object[] o2) { - int n1 = ((int[]) o1[1])[0]; - int n2 = ((int[]) o2[1])[0]; - return n1 - n2; - } - } - - /** - * Gets the list of substitution fonts. The list is composed of BaseFont and can be null. The fonts in this list - * will be used if the original font doesn't contain the needed glyphs. - * - * @return the list - */ - public List getAllSubstitutionFonts() { - return substitutionFonts; - } - - /** - * Sets a list of substitution fonts. The list is composed of BaseFont and can also be null. The fonts in this - * list will be used if the original font doesn't contain the needed glyphs. - * - * @param substitutionFonts the list - */ - public void setAllSubstitutionFonts(List substitutionFonts) { - this.substitutionFonts = substitutionFonts; - } - - /** - * Gets the XFA form processor. - * - * @return the XFA form processor - */ - public XfaForm getXfa() { - return xfa; - } - - /** - * Removes the XFA stream from the document - */ - public void removeXfa() { - PdfDictionary root = this.reader.getCatalog(); - PdfDictionary acroform = root.getAsDict(PdfName.ACROFORM); - - if(acroform!=null) { - acroform.remove(PdfName.XFA); - try { - this.xfa = new XfaForm(this.reader); - } - catch(Exception e) { - throw new ExceptionConverter(e); - } - } - } - - private static final PdfName[] buttonRemove = {PdfName.MK, PdfName.F, PdfName.FF, PdfName.Q, PdfName.BS, PdfName.BORDER}; - - /** - * Creates a new pushbutton from an existing field. If there are several pushbuttons with the same name only the first one is used. This - * pushbutton can be changed and be used to replace an existing one, with the same name or other name, as long is it is in the same - * document. To replace an existing pushbutton call {@link #replacePushbuttonField(String, PdfFormField)}. - * - * @param field the field name that should be a pushbutton - * @return a new pushbutton or null if the field is not a pushbutton - */ - public PushbuttonField getNewPushbuttonFromField(String field) { - return getNewPushbuttonFromField(field, 0); - } - - /** - * Creates a new pushbutton from an existing field. This pushbutton can be changed and be used to replace an existing one, with the same - * name or other name, as long is it is in the same document. To replace an existing pushbutton call {@link - * #replacePushbuttonField(String, PdfFormField, int)}. - * - * @param field the field name that should be a pushbutton - * @param order the field order in fields with same name - * @return a new pushbutton or null if the field is not a pushbutton - * @since 2.0.7 - */ - public PushbuttonField getNewPushbuttonFromField(String field, int order) { - try { - if (getFieldType(field) != FIELD_TYPE_PUSHBUTTON) { - return null; - } - Item item = getFieldItem(field); - if (order >= item.size()) { - return null; - } - int posi = order * 5; - float[] pos = getFieldPositions(field); - Rectangle box = new Rectangle(pos[posi + 1], pos[posi + 2], pos[posi + 3], pos[posi + 4]); - PushbuttonField newButton = new PushbuttonField(writer, box, null); - PdfDictionary dic = item.getMerged(order); - decodeGenericDictionary(dic, newButton); - PdfDictionary mk = dic.getAsDict(PdfName.MK); - if (mk != null) { - PdfString text = mk.getAsString(PdfName.CA); - if (text != null) { - newButton.setText(text.toUnicodeString()); - } - PdfNumber tp = mk.getAsNumber(PdfName.TP); - if (tp != null) { - newButton.setLayout(tp.intValue() + 1); - } - PdfDictionary ifit = mk.getAsDict(PdfName.IF); - if (ifit != null) { - PdfName sw = ifit.getAsName(PdfName.SW); - if (sw != null) { - int scale = PushbuttonField.SCALE_ICON_ALWAYS; - if (sw.equals(PdfName.B)) { - scale = PushbuttonField.SCALE_ICON_IS_TOO_BIG; - } else if (sw.equals(PdfName.S)) { - scale = PushbuttonField.SCALE_ICON_IS_TOO_SMALL; - } else if (sw.equals(PdfName.N)) { - scale = PushbuttonField.SCALE_ICON_NEVER; - } - newButton.setScaleIcon(scale); - } - sw = ifit.getAsName(PdfName.S); - if (sw != null) { - if (sw.equals(PdfName.A)) { - newButton.setProportionalIcon(false); - } - } - PdfArray aj = ifit.getAsArray(PdfName.A); - if (aj != null && aj.size() == 2) { - float left = aj.getAsNumber(0).floatValue(); - float bottom = aj.getAsNumber(1).floatValue(); - newButton.setIconHorizontalAdjustment(left); - newButton.setIconVerticalAdjustment(bottom); - } - PdfBoolean fb = ifit.getAsBoolean(PdfName.FB); - if (fb != null && fb.booleanValue()) { - newButton.setIconFitToBounds(true); - } - } - PdfObject i = mk.get(PdfName.I); - if (i != null && i.isIndirect()) { - newButton.setIconReference((PRIndirectReference) i); - } - } - return newButton; - } catch (Exception e) { - throw new ExceptionConverter(e); - } - } - - /** - * Replaces the first field with a new pushbutton. The pushbutton can be created with {@link #getNewPushbuttonFromField(String)} from the - * same document or it can be a generic PdfFormField of the type pushbutton. - * - * @param field the field name - * @param button the PdfFormField representing the pushbutton - * @return true if the field was replaced, false if the field - * was not a pushbutton - */ - public boolean replacePushbuttonField(String field, PdfFormField button) { - return replacePushbuttonField(field, button, 0); - } - - /** - * Replaces the designated field with a new pushbutton. The pushbutton can be created with {@link #getNewPushbuttonFromField(String, int)} - * from the same document or it can be a generic PdfFormField of the type pushbutton. - * - * @param field the field name - * @param button the PdfFormField representing the pushbutton - * @param order the field order in fields with same name - * @return true if the field was replaced, false if the field - * was not a pushbutton - * @since 2.0.7 - */ - public boolean replacePushbuttonField(String field, PdfFormField button, int order) { - if (getFieldType(field) != FIELD_TYPE_PUSHBUTTON) { - return false; - } - Item item = getFieldItem(field); - if (order >= item.size()) { - return false; - } - PdfDictionary merged = item.getMerged(order); - PdfDictionary values = item.getValue(order); - PdfDictionary widgets = item.getWidget(order); - for (PdfName pdfName : buttonRemove) { - merged.remove(pdfName); - values.remove(pdfName); - widgets.remove(pdfName); - } - for (PdfName key : button.getKeys()) { - if (key.equals(PdfName.T) || key.equals(PdfName.RECT)) - continue; - if (key.equals(PdfName.FF)) - values.put(key, button.get(key)); - else - widgets.put(key, button.get(key)); - merged.put(key, button.get(key)); - } - return true; - } + private static class SorterComparator implements Comparator { + + public int compare(Object[] o1, Object[] o2) { + int n1 = ((int[]) o1[1])[0]; + int n2 = ((int[]) o2[1])[0]; + return n1 - n2; + } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/ArabicLigaturizer.java b/openpdf/src/main/java/com/lowagie/text/pdf/ArabicLigaturizer.java index d59087ac3..642b215e9 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/ArabicLigaturizer.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/ArabicLigaturizer.java @@ -47,22 +47,170 @@ package com.lowagie.text.pdf; /** - * Shape arabic characters. This code was inspired by an LGPL'ed C library: - * Pango ( see http://www.pango.com/ ). Note that the code of this is the - * original work of Paulo Soares. Hence it is perfectly justifiable to distribute - * it under the MPL. + * Shape arabic characters. This code was inspired by an LGPL'ed C library: Pango ( see http://www.pango.com/ ). Note + * that the code of this is the original work of Paulo Soares. Hence it is perfectly justifiable to distribute it under + * the MPL. * * @author Paulo Soares (psoares@consiste.pt) */ public class ArabicLigaturizer { - + + public static final int ar_nothing = 0x0; + public static final int ar_novowel = 0x1; + public static final int ar_composedtashkeel = 0x4; + public static final int ar_lig = 0x8; + /** + * Digit shaping option: Replace European digits (U+0030...U+0039) by Arabic-Indic digits. + */ + public static final int DIGITS_EN2AN = 0x20; + /** + * Digit shaping option: Replace Arabic-Indic digits by European digits (U+0030...U+0039). + */ + public static final int DIGITS_AN2EN = 0x40; + /** + * Digit shaping option: Replace European digits (U+0030...U+0039) by Arabic-Indic digits if the most recent + * strongly directional character is an Arabic letter (its Bidi direction value is RIGHT_TO_LEFT_ARABIC). The + * initial state at the start of the text is assumed to be not an Arabic, letter, so European digits at the start of + * the text will not change. Compare to DIGITS_ALEN2AN_INIT_AL. + */ + public static final int DIGITS_EN2AN_INIT_LR = 0x60; + /** + * Digit shaping option: Replace European digits (U+0030...U+0039) by Arabic-Indic digits if the most recent + * strongly directional character is an Arabic letter (its Bidi direction value is RIGHT_TO_LEFT_ARABIC). The + * initial state at the start of the text is assumed to be an Arabic, letter, so European digits at the start of the + * text will change. Compare to DIGITS_ALEN2AN_INT_LR. + */ + public static final int DIGITS_EN2AN_INIT_AL = 0x80; + /** + * Bit mask for digit shaping options. + */ + public static final int DIGITS_MASK = 0xe0; + /** + * Digit type option: Use Arabic-Indic digits (U+0660...U+0669). + */ + public static final int DIGIT_TYPE_AN = 0; + /** + * Digit type option: Use Eastern (Extended) Arabic-Indic digits (U+06f0...U+06f9). + */ + public static final int DIGIT_TYPE_AN_EXTENDED = 0x100; + /** + * Bit mask for digit type options. + */ + public static final int DIGIT_TYPE_MASK = 0x0100; // 0x3f00? + private static final char ALEF = 0x0627; + private static final char ALEFHAMZA = 0x0623; + private static final char ALEFHAMZABELOW = 0x0625; + private static final char ALEFMADDA = 0x0622; + private static final char LAM = 0x0644; + private static final char HAMZA = 0x0621; + private static final char TATWEEL = 0x0640; + private static final char ZWJ = 0x200D; + private static final char HAMZAABOVE = 0x0654; + private static final char HAMZABELOW = 0x0655; + private static final char WAWHAMZA = 0x0624; + private static final char YEHHAMZA = 0x0626; + private static final char WAW = 0x0648; + private static final char ALEFMAKSURA = 0x0649; + private static final char YEH = 0x064A; + private static final char FARSIYEH = 0x06CC; + private static final char SHADDA = 0x0651; + private static final char KASRA = 0x0650; + private static final char FATHA = 0x064E; + private static final char DAMMA = 0x064F; + private static final char MADDA = 0x0653; + private static final char LAM_ALEF = 0xFEFB; + private static final char LAM_ALEFHAMZA = 0xFEF7; + private static final char LAM_ALEFHAMZABELOW = 0xFEF9; + private static final char LAM_ALEFMADDA = 0xFEF5; + private static final char[][] chartable = { + {0x0621, 0xFE80}, /* HAMZA */ + {0x0622, 0xFE81, 0xFE82}, /* ALEF WITH MADDA ABOVE */ + {0x0623, 0xFE83, 0xFE84}, /* ALEF WITH HAMZA ABOVE */ + {0x0624, 0xFE85, 0xFE86}, /* WAW WITH HAMZA ABOVE */ + {0x0625, 0xFE87, 0xFE88}, /* ALEF WITH HAMZA BELOW */ + {0x0626, 0xFE89, 0xFE8A, 0xFE8B, 0xFE8C}, /* YEH WITH HAMZA ABOVE */ + {0x0627, 0xFE8D, 0xFE8E}, /* ALEF */ + {0x0628, 0xFE8F, 0xFE90, 0xFE91, 0xFE92}, /* BEH */ + {0x0629, 0xFE93, 0xFE94}, /* TEH MARBUTA */ + {0x062A, 0xFE95, 0xFE96, 0xFE97, 0xFE98}, /* TEH */ + {0x062B, 0xFE99, 0xFE9A, 0xFE9B, 0xFE9C}, /* THEH */ + {0x062C, 0xFE9D, 0xFE9E, 0xFE9F, 0xFEA0}, /* JEEM */ + {0x062D, 0xFEA1, 0xFEA2, 0xFEA3, 0xFEA4}, /* HAH */ + {0x062E, 0xFEA5, 0xFEA6, 0xFEA7, 0xFEA8}, /* KHAH */ + {0x062F, 0xFEA9, 0xFEAA}, /* DAL */ + {0x0630, 0xFEAB, 0xFEAC}, /* THAL */ + {0x0631, 0xFEAD, 0xFEAE}, /* REH */ + {0x0632, 0xFEAF, 0xFEB0}, /* ZAIN */ + {0x0633, 0xFEB1, 0xFEB2, 0xFEB3, 0xFEB4}, /* SEEN */ + {0x0634, 0xFEB5, 0xFEB6, 0xFEB7, 0xFEB8}, /* SHEEN */ + {0x0635, 0xFEB9, 0xFEBA, 0xFEBB, 0xFEBC}, /* SAD */ + {0x0636, 0xFEBD, 0xFEBE, 0xFEBF, 0xFEC0}, /* DAD */ + {0x0637, 0xFEC1, 0xFEC2, 0xFEC3, 0xFEC4}, /* TAH */ + {0x0638, 0xFEC5, 0xFEC6, 0xFEC7, 0xFEC8}, /* ZAH */ + {0x0639, 0xFEC9, 0xFECA, 0xFECB, 0xFECC}, /* AIN */ + {0x063A, 0xFECD, 0xFECE, 0xFECF, 0xFED0}, /* GHAIN */ + {0x0640, 0x0640, 0x0640, 0x0640, 0x0640}, /* TATWEEL */ + {0x0641, 0xFED1, 0xFED2, 0xFED3, 0xFED4}, /* FEH */ + {0x0642, 0xFED5, 0xFED6, 0xFED7, 0xFED8}, /* QAF */ + {0x0643, 0xFED9, 0xFEDA, 0xFEDB, 0xFEDC}, /* KAF */ + {0x0644, 0xFEDD, 0xFEDE, 0xFEDF, 0xFEE0}, /* LAM */ + {0x0645, 0xFEE1, 0xFEE2, 0xFEE3, 0xFEE4}, /* MEEM */ + {0x0646, 0xFEE5, 0xFEE6, 0xFEE7, 0xFEE8}, /* NOON */ + {0x0647, 0xFEE9, 0xFEEA, 0xFEEB, 0xFEEC}, /* HEH */ + {0x0648, 0xFEED, 0xFEEE}, /* WAW */ + {0x0649, 0xFEEF, 0xFEF0, 0xFBE8, 0xFBE9}, /* ALEF MAKSURA */ + {0x064A, 0xFEF1, 0xFEF2, 0xFEF3, 0xFEF4}, /* YEH */ + {0x0671, 0xFB50, 0xFB51}, /* ALEF WASLA */ + {0x0679, 0xFB66, 0xFB67, 0xFB68, 0xFB69}, /* TTEH */ + {0x067A, 0xFB5E, 0xFB5F, 0xFB60, 0xFB61}, /* TTEHEH */ + {0x067B, 0xFB52, 0xFB53, 0xFB54, 0xFB55}, /* BEEH */ + {0x067E, 0xFB56, 0xFB57, 0xFB58, 0xFB59}, /* PEH */ + {0x067F, 0xFB62, 0xFB63, 0xFB64, 0xFB65}, /* TEHEH */ + {0x0680, 0xFB5A, 0xFB5B, 0xFB5C, 0xFB5D}, /* BEHEH */ + {0x0683, 0xFB76, 0xFB77, 0xFB78, 0xFB79}, /* NYEH */ + {0x0684, 0xFB72, 0xFB73, 0xFB74, 0xFB75}, /* DYEH */ + {0x0686, 0xFB7A, 0xFB7B, 0xFB7C, 0xFB7D}, /* TCHEH */ + {0x0687, 0xFB7E, 0xFB7F, 0xFB80, 0xFB81}, /* TCHEHEH */ + {0x0688, 0xFB88, 0xFB89}, /* DDAL */ + {0x068C, 0xFB84, 0xFB85}, /* DAHAL */ + {0x068D, 0xFB82, 0xFB83}, /* DDAHAL */ + {0x068E, 0xFB86, 0xFB87}, /* DUL */ + {0x0691, 0xFB8C, 0xFB8D}, /* RREH */ + {0x0698, 0xFB8A, 0xFB8B}, /* JEH */ + {0x06A4, 0xFB6A, 0xFB6B, 0xFB6C, 0xFB6D}, /* VEH */ + {0x06A6, 0xFB6E, 0xFB6F, 0xFB70, 0xFB71}, /* PEHEH */ + {0x06A9, 0xFB8E, 0xFB8F, 0xFB90, 0xFB91}, /* KEHEH */ + {0x06AD, 0xFBD3, 0xFBD4, 0xFBD5, 0xFBD6}, /* NG */ + {0x06AF, 0xFB92, 0xFB93, 0xFB94, 0xFB95}, /* GAF */ + {0x06B1, 0xFB9A, 0xFB9B, 0xFB9C, 0xFB9D}, /* NGOEH */ + {0x06B3, 0xFB96, 0xFB97, 0xFB98, 0xFB99}, /* GUEH */ + {0x06BA, 0xFB9E, 0xFB9F}, /* NOON GHUNNA */ + {0x06BB, 0xFBA0, 0xFBA1, 0xFBA2, 0xFBA3}, /* RNOON */ + {0x06BE, 0xFBAA, 0xFBAB, 0xFBAC, 0xFBAD}, /* HEH DOACHASHMEE */ + {0x06C0, 0xFBA4, 0xFBA5}, /* HEH WITH YEH ABOVE */ + {0x06C1, 0xFBA6, 0xFBA7, 0xFBA8, 0xFBA9}, /* HEH GOAL */ + {0x06C5, 0xFBE0, 0xFBE1}, /* KIRGHIZ OE */ + {0x06C6, 0xFBD9, 0xFBDA}, /* OE */ + {0x06C7, 0xFBD7, 0xFBD8}, /* U */ + {0x06C8, 0xFBDB, 0xFBDC}, /* YU */ + {0x06C9, 0xFBE2, 0xFBE3}, /* KIRGHIZ YU */ + {0x06CB, 0xFBDE, 0xFBDF}, /* VE */ + {0x06CC, 0xFBFC, 0xFBFD, 0xFBFE, 0xFBFF}, /* FARSI YEH */ + {0x06D0, 0xFBE4, 0xFBE5, 0xFBE6, 0xFBE7}, /* E */ + {0x06D2, 0xFBAE, 0xFBAF}, /* YEH BARREE */ + {0x06D3, 0xFBB0, 0xFBB1} /* YEH BARREE WITH HAMZA ABOVE */ + }; + /** + * Not a valid option value. + */ + private static final int DIGITS_RESERVED = 0xa0; + static boolean isVowel(char s) { return ((s >= 0x064B) && (s <= 0x0655)) || (s == 0x0670); } static char charshape(char s, int which) - /* which 0=isolated 1=final 2=initial 3=medial */ - { + /* which 0=isolated 1=final 2=initial 3=medial */ { int l, r, m; if ((s >= 0x0621) && (s <= 0x06D3)) { l = 0; @@ -71,17 +219,15 @@ static char charshape(char s, int which) m = (l + r) / 2; if (s == chartable[m][0]) { return chartable[m][which + 1]; - } - else if (s < chartable[m][0]) { + } else if (s < chartable[m][0]) { r = m - 1; - } - else { + } else { l = m + 1; } } + } else if (s >= 0xfef5 && s <= 0xfefb) { + return (char) (s + which); } - else if (s >= 0xfef5 && s <= 0xfefb) - return (char)(s + which); return s; } @@ -94,11 +240,9 @@ static int shapecount(char s) { m = (l + r) / 2; if (s == chartable[m][0]) { return chartable[m].length - 1; - } - else if (s < chartable[m][0]) { + } else if (s < chartable[m][0]) { r = m - 1; - } - else { + } else { l = m + 1; } } @@ -124,8 +268,7 @@ static int ligature(char newchar, CharStruct oldchar) { case SHADDA: if (oldchar.mark1 == 0) { oldchar.mark1 = SHADDA; - } - else { + } else { return 0; /* no ligature possible */ } break; @@ -189,7 +332,7 @@ static int ligature(char newchar, CharStruct oldchar) { if (oldchar.vowel != 0) { /* if we already joined a vowel, we can't join a Hamza */ return 0; } - + switch (oldchar.basechar) { case LAM: switch (newchar) { @@ -244,8 +387,7 @@ static void copycstostring(StringBuffer string, CharStruct s, int level) { if ((level & ar_novowel) == 0) { string.append(s.vowel); s.lignum--; - } - else { /* vowel elimination */ + } else { /* vowel elimination */ s.lignum--; } } @@ -259,13 +401,12 @@ static void copycstostring(StringBuffer string, CharStruct s, int level) { // return len static void doublelig(StringBuffer string, int level) - /* Ok. We have presentation ligatures in our font. */ - { + /* Ok. We have presentation ligatures in our font. */ { int len; int olen = len = string.length(); int j = 0, si = 1; char lapresult; - + while (si < olen) { lapresult = 0; if ((level & ar_composedtashkeel) != 0) { @@ -290,20 +431,23 @@ static void doublelig(StringBuffer string, int level) } break; case KASRA: - if (string.charAt(si) == SHADDA) + if (string.charAt(si) == SHADDA) { lapresult = 0xFC62; + } break; case FATHA: - if (string.charAt(si) == SHADDA) + if (string.charAt(si) == SHADDA) { lapresult = 0xFC60; + } break; case DAMMA: - if (string.charAt(si) == SHADDA) + if (string.charAt(si) == SHADDA) { lapresult = 0xFC61; + } break; } } - + if ((level & ar_lig) != 0) { switch (string.charAt(j)) { case 0xFEDF: /* LAM initial */ @@ -373,7 +517,7 @@ static void doublelig(StringBuffer string, int level) break; /* KHAH medial */ } break; - + case 0xFEE8: /* NOON medial */ switch (string.charAt(si)) { case 0xFEAE: @@ -400,7 +544,7 @@ static void doublelig(StringBuffer string, int level) break; /* MEEM medial */ } break; - + case 0xFED3: /* FEH initial */ switch (string.charAt(si)) { case 0xFEF2: @@ -408,7 +552,7 @@ static void doublelig(StringBuffer string, int level) break; /* YEH final */ } break; - + default: break; } /* end switch string[si] */ @@ -418,8 +562,7 @@ static void doublelig(StringBuffer string, int level) len--; si++; /* jump over one character */ /* we'll have to change this, too. */ - } - else { + } else { j++; string.setCharAt(j, string.charAt(si)); si++; @@ -431,15 +574,15 @@ static void doublelig(StringBuffer string, int level) static boolean connects_to_left(CharStruct a) { return a.numshapes > 2; } - + static void shape(char[] text, StringBuffer string, int level) { - /* string is assumed to be empty and big enough. - * text is the original text. - * This routine does the basic arabic reshaping. - * *len the number of non-null characters. - * - * Note: We have to unshape each character first! - */ + /* string is assumed to be empty and big enough. + * text is the original text. + * This routine does the basic arabic reshaping. + * *len the number of non-null characters. + * + * Note: We have to unshape each character first! + */ int join; int which; char nextletter; @@ -457,21 +600,20 @@ static void shape(char[] text, StringBuffer string, int level) { //(*len)++; if (nc == 1) { which = 0; /* final or isolated */ - } - else { + } else { which = 2; /* medial or initial */ } if (connects_to_left(oldchar)) { which++; } - + which = which % (curchar.numshapes); curchar.basechar = charshape(curchar.basechar, which); - + /* get rid of oldchar */ copycstostring(string, oldchar, level); oldchar = curchar; /* new values in oldchar */ - + /* init new curchar */ curchar = new CharStruct(); curchar.basechar = nextletter; @@ -485,28 +627,32 @@ static void shape(char[] text, StringBuffer string, int level) { // } // p = g_utf8_next_char (p); } - + /* Handle last char */ - if (connects_to_left(oldchar)) + if (connects_to_left(oldchar)) { which = 1; - else + } else { which = 0; + } which = which % (curchar.numshapes); curchar.basechar = charshape(curchar.basechar, which); - + /* get rid of oldchar */ copycstostring(string, oldchar, level); copycstostring(string, curchar, level); } - static int arabic_shape(char[] src, int srcoffset, int srclength, char[] dest, int destoffset, int destlength, int level) { + static int arabic_shape(char[] src, int srcoffset, int srclength, char[] dest, int destoffset, int destlength, + int level) { char[] str = new char[srclength]; - if (srclength + srcoffset - srcoffset >= 0) + if (srclength + srcoffset - srcoffset >= 0) { System.arraycopy(src, srcoffset, str, srcoffset - srcoffset, srclength + srcoffset - srcoffset); + } StringBuffer string = new StringBuffer(srclength); shape(str, string, level); - if ((level & (ar_composedtashkeel | ar_lig)) != 0) + if ((level & (ar_composedtashkeel | ar_lig)) != 0) { doublelig(string, level); + } // string.reverse(); System.arraycopy(string.toString().toCharArray(), 0, dest, destoffset, string.length()); return string.length(); @@ -520,15 +666,15 @@ static void processNumbers(char[] text, int offset, int length, int options) { case DIGIT_TYPE_AN: digitBase = '\u0660'; // Arabic-Indic digits break; - + case DIGIT_TYPE_AN_EXTENDED: digitBase = '\u06f0'; // Eastern Arabic-Indic digits (Persian and Urdu) break; - + default: break; } - + switch (options & DIGITS_MASK) { case DIGITS_EN2AN: { int digitDelta = digitBase - '\u0030'; @@ -540,9 +686,9 @@ static void processNumbers(char[] text, int offset, int length, int options) { } } break; - + case DIGITS_AN2EN: { - char digitTop = (char)(digitBase + 9); + char digitTop = (char) (digitBase + 9); int digitDelta = '\u0030' - digitBase; for (int i = offset; i < limit; ++i) { char ch = text[i]; @@ -568,34 +714,23 @@ static void processNumbers(char[] text, int offset, int length, int options) { } /** - * Given an array of characters, process a section of it, and replace - * European numeral characters (0-9) with Arabic numeral characters - * (depending on the {@code digitBase}) if the characters are preceded by - * Arabic characters. - * - * @param dest - * The array of characters to be processed. Must not be - * {@code null}, and must have a length greater than {@code 0}. - * @param start - * The start index of the characters to be processed. The value - * must be greater than, or equal to, {@code 0} and less than the - * length of the array {@code dest}. - * @param length - * The number of characters to process. {@code length} + - * {@code start} must be less than, or equal to, the length of - * the array {@code dest}. - * @param digitBase - * The code of the character which represents the numeral 0 into - * which the European numbers should be converted. For instance, - * Arabic-Indic digits begin at {@code '\u0660'}, and Eastern - * Arabic-Indic digits (Persian and Urdu) begin at - * {@code '\u06f0'}. - * @param lastStrongWasAL - * A boolean flag indicating whether or not the character - * preceding the array of characters to be processed was an - * Arabic character, or not. + * Given an array of characters, process a section of it, and replace European numeral characters (0-9) with Arabic + * numeral characters (depending on the {@code digitBase}) if the characters are preceded by Arabic characters. + * + * @param dest The array of characters to be processed. Must not be {@code null}, and must have a length + * greater than {@code 0}. + * @param start The start index of the characters to be processed. The value must be greater than, or + * equal to, {@code 0} and less than the length of the array {@code dest}. + * @param length The number of characters to process. {@code length} + {@code start} must be less than, or + * equal to, the length of the array {@code dest}. + * @param digitBase The code of the character which represents the numeral 0 into which the European numbers + * should be converted. For instance, Arabic-Indic digits begin at {@code '\u0660'}, and + * Eastern Arabic-Indic digits (Persian and Urdu) begin at {@code '\u06f0'}. + * @param lastStrongWasAL A boolean flag indicating whether or not the character preceding the array of characters + * to be processed was an Arabic character, or not. */ - static void shapeToArabicDigitsWithContext(char[] dest, int start, int length, char digitBase, boolean lastStrongWasAL) { + static void shapeToArabicDigitsWithContext(char[] dest, int start, int length, char digitBase, + boolean lastStrongWasAL) { digitBase -= '0'; // move common adjustment out of loop int limit = start + length; @@ -620,174 +755,6 @@ static void shapeToArabicDigitsWithContext(char[] dest, int start, int length, c } } - private static final char ALEF = 0x0627; - private static final char ALEFHAMZA = 0x0623; - private static final char ALEFHAMZABELOW = 0x0625; - private static final char ALEFMADDA = 0x0622; - private static final char LAM = 0x0644; - private static final char HAMZA = 0x0621; - private static final char TATWEEL = 0x0640; - private static final char ZWJ = 0x200D; - - private static final char HAMZAABOVE = 0x0654; - private static final char HAMZABELOW = 0x0655; - - private static final char WAWHAMZA = 0x0624; - private static final char YEHHAMZA = 0x0626; - private static final char WAW = 0x0648; - private static final char ALEFMAKSURA = 0x0649; - private static final char YEH = 0x064A; - private static final char FARSIYEH = 0x06CC; - - private static final char SHADDA = 0x0651; - private static final char KASRA = 0x0650; - private static final char FATHA = 0x064E; - private static final char DAMMA = 0x064F; - private static final char MADDA = 0x0653; - - private static final char LAM_ALEF = 0xFEFB; - private static final char LAM_ALEFHAMZA = 0xFEF7; - private static final char LAM_ALEFHAMZABELOW = 0xFEF9; - private static final char LAM_ALEFMADDA = 0xFEF5; - - private static final char[][] chartable = { - {0x0621, 0xFE80}, /* HAMZA */ - {0x0622, 0xFE81, 0xFE82}, /* ALEF WITH MADDA ABOVE */ - {0x0623, 0xFE83, 0xFE84}, /* ALEF WITH HAMZA ABOVE */ - {0x0624, 0xFE85, 0xFE86}, /* WAW WITH HAMZA ABOVE */ - {0x0625, 0xFE87, 0xFE88}, /* ALEF WITH HAMZA BELOW */ - {0x0626, 0xFE89, 0xFE8A, 0xFE8B, 0xFE8C}, /* YEH WITH HAMZA ABOVE */ - {0x0627, 0xFE8D, 0xFE8E}, /* ALEF */ - {0x0628, 0xFE8F, 0xFE90, 0xFE91, 0xFE92}, /* BEH */ - {0x0629, 0xFE93, 0xFE94}, /* TEH MARBUTA */ - {0x062A, 0xFE95, 0xFE96, 0xFE97, 0xFE98}, /* TEH */ - {0x062B, 0xFE99, 0xFE9A, 0xFE9B, 0xFE9C}, /* THEH */ - {0x062C, 0xFE9D, 0xFE9E, 0xFE9F, 0xFEA0}, /* JEEM */ - {0x062D, 0xFEA1, 0xFEA2, 0xFEA3, 0xFEA4}, /* HAH */ - {0x062E, 0xFEA5, 0xFEA6, 0xFEA7, 0xFEA8}, /* KHAH */ - {0x062F, 0xFEA9, 0xFEAA}, /* DAL */ - {0x0630, 0xFEAB, 0xFEAC}, /* THAL */ - {0x0631, 0xFEAD, 0xFEAE}, /* REH */ - {0x0632, 0xFEAF, 0xFEB0}, /* ZAIN */ - {0x0633, 0xFEB1, 0xFEB2, 0xFEB3, 0xFEB4}, /* SEEN */ - {0x0634, 0xFEB5, 0xFEB6, 0xFEB7, 0xFEB8}, /* SHEEN */ - {0x0635, 0xFEB9, 0xFEBA, 0xFEBB, 0xFEBC}, /* SAD */ - {0x0636, 0xFEBD, 0xFEBE, 0xFEBF, 0xFEC0}, /* DAD */ - {0x0637, 0xFEC1, 0xFEC2, 0xFEC3, 0xFEC4}, /* TAH */ - {0x0638, 0xFEC5, 0xFEC6, 0xFEC7, 0xFEC8}, /* ZAH */ - {0x0639, 0xFEC9, 0xFECA, 0xFECB, 0xFECC}, /* AIN */ - {0x063A, 0xFECD, 0xFECE, 0xFECF, 0xFED0}, /* GHAIN */ - {0x0640, 0x0640, 0x0640, 0x0640, 0x0640}, /* TATWEEL */ - {0x0641, 0xFED1, 0xFED2, 0xFED3, 0xFED4}, /* FEH */ - {0x0642, 0xFED5, 0xFED6, 0xFED7, 0xFED8}, /* QAF */ - {0x0643, 0xFED9, 0xFEDA, 0xFEDB, 0xFEDC}, /* KAF */ - {0x0644, 0xFEDD, 0xFEDE, 0xFEDF, 0xFEE0}, /* LAM */ - {0x0645, 0xFEE1, 0xFEE2, 0xFEE3, 0xFEE4}, /* MEEM */ - {0x0646, 0xFEE5, 0xFEE6, 0xFEE7, 0xFEE8}, /* NOON */ - {0x0647, 0xFEE9, 0xFEEA, 0xFEEB, 0xFEEC}, /* HEH */ - {0x0648, 0xFEED, 0xFEEE}, /* WAW */ - {0x0649, 0xFEEF, 0xFEF0, 0xFBE8, 0xFBE9}, /* ALEF MAKSURA */ - {0x064A, 0xFEF1, 0xFEF2, 0xFEF3, 0xFEF4}, /* YEH */ - {0x0671, 0xFB50, 0xFB51}, /* ALEF WASLA */ - {0x0679, 0xFB66, 0xFB67, 0xFB68, 0xFB69}, /* TTEH */ - {0x067A, 0xFB5E, 0xFB5F, 0xFB60, 0xFB61}, /* TTEHEH */ - {0x067B, 0xFB52, 0xFB53, 0xFB54, 0xFB55}, /* BEEH */ - {0x067E, 0xFB56, 0xFB57, 0xFB58, 0xFB59}, /* PEH */ - {0x067F, 0xFB62, 0xFB63, 0xFB64, 0xFB65}, /* TEHEH */ - {0x0680, 0xFB5A, 0xFB5B, 0xFB5C, 0xFB5D}, /* BEHEH */ - {0x0683, 0xFB76, 0xFB77, 0xFB78, 0xFB79}, /* NYEH */ - {0x0684, 0xFB72, 0xFB73, 0xFB74, 0xFB75}, /* DYEH */ - {0x0686, 0xFB7A, 0xFB7B, 0xFB7C, 0xFB7D}, /* TCHEH */ - {0x0687, 0xFB7E, 0xFB7F, 0xFB80, 0xFB81}, /* TCHEHEH */ - {0x0688, 0xFB88, 0xFB89}, /* DDAL */ - {0x068C, 0xFB84, 0xFB85}, /* DAHAL */ - {0x068D, 0xFB82, 0xFB83}, /* DDAHAL */ - {0x068E, 0xFB86, 0xFB87}, /* DUL */ - {0x0691, 0xFB8C, 0xFB8D}, /* RREH */ - {0x0698, 0xFB8A, 0xFB8B}, /* JEH */ - {0x06A4, 0xFB6A, 0xFB6B, 0xFB6C, 0xFB6D}, /* VEH */ - {0x06A6, 0xFB6E, 0xFB6F, 0xFB70, 0xFB71}, /* PEHEH */ - {0x06A9, 0xFB8E, 0xFB8F, 0xFB90, 0xFB91}, /* KEHEH */ - {0x06AD, 0xFBD3, 0xFBD4, 0xFBD5, 0xFBD6}, /* NG */ - {0x06AF, 0xFB92, 0xFB93, 0xFB94, 0xFB95}, /* GAF */ - {0x06B1, 0xFB9A, 0xFB9B, 0xFB9C, 0xFB9D}, /* NGOEH */ - {0x06B3, 0xFB96, 0xFB97, 0xFB98, 0xFB99}, /* GUEH */ - {0x06BA, 0xFB9E, 0xFB9F}, /* NOON GHUNNA */ - {0x06BB, 0xFBA0, 0xFBA1, 0xFBA2, 0xFBA3}, /* RNOON */ - {0x06BE, 0xFBAA, 0xFBAB, 0xFBAC, 0xFBAD}, /* HEH DOACHASHMEE */ - {0x06C0, 0xFBA4, 0xFBA5}, /* HEH WITH YEH ABOVE */ - {0x06C1, 0xFBA6, 0xFBA7, 0xFBA8, 0xFBA9}, /* HEH GOAL */ - {0x06C5, 0xFBE0, 0xFBE1}, /* KIRGHIZ OE */ - {0x06C6, 0xFBD9, 0xFBDA}, /* OE */ - {0x06C7, 0xFBD7, 0xFBD8}, /* U */ - {0x06C8, 0xFBDB, 0xFBDC}, /* YU */ - {0x06C9, 0xFBE2, 0xFBE3}, /* KIRGHIZ YU */ - {0x06CB, 0xFBDE, 0xFBDF}, /* VE */ - {0x06CC, 0xFBFC, 0xFBFD, 0xFBFE, 0xFBFF}, /* FARSI YEH */ - {0x06D0, 0xFBE4, 0xFBE5, 0xFBE6, 0xFBE7}, /* E */ - {0x06D2, 0xFBAE, 0xFBAF}, /* YEH BARREE */ - {0x06D3, 0xFBB0, 0xFBB1} /* YEH BARREE WITH HAMZA ABOVE */ - }; - - public static final int ar_nothing = 0x0; - public static final int ar_novowel = 0x1; - public static final int ar_composedtashkeel = 0x4; - public static final int ar_lig = 0x8; - /** - * Digit shaping option: Replace European digits (U+0030...U+0039) by Arabic-Indic digits. - */ - public static final int DIGITS_EN2AN = 0x20; - - /** - * Digit shaping option: Replace Arabic-Indic digits by European digits (U+0030...U+0039). - */ - public static final int DIGITS_AN2EN = 0x40; - - /** - * Digit shaping option: - * Replace European digits (U+0030...U+0039) by Arabic-Indic digits - * if the most recent strongly directional character - * is an Arabic letter (its Bidi direction value is RIGHT_TO_LEFT_ARABIC). - * The initial state at the start of the text is assumed to be not an Arabic, - * letter, so European digits at the start of the text will not change. - * Compare to DIGITS_ALEN2AN_INIT_AL. - */ - public static final int DIGITS_EN2AN_INIT_LR = 0x60; - - /** - * Digit shaping option: - * Replace European digits (U+0030...U+0039) by Arabic-Indic digits - * if the most recent strongly directional character - * is an Arabic letter (its Bidi direction value is RIGHT_TO_LEFT_ARABIC). - * The initial state at the start of the text is assumed to be an Arabic, - * letter, so European digits at the start of the text will change. - * Compare to DIGITS_ALEN2AN_INT_LR. - */ - public static final int DIGITS_EN2AN_INIT_AL = 0x80; - - /** Not a valid option value. */ - private static final int DIGITS_RESERVED = 0xa0; - - /** - * Bit mask for digit shaping options. - */ - public static final int DIGITS_MASK = 0xe0; - - /** - * Digit type option: Use Arabic-Indic digits (U+0660...U+0669). - */ - public static final int DIGIT_TYPE_AN = 0; - - /** - * Digit type option: Use Eastern (Extended) Arabic-Indic digits (U+06f0...U+06f9). - */ - public static final int DIGIT_TYPE_AN_EXTENDED = 0x100; - - /** - * Bit mask for digit type options. - */ - public static final int DIGIT_TYPE_MASK = 0x0100; // 0x3f00? - static class CharStruct { char basechar; diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/AsianFontMapper.java b/openpdf/src/main/java/com/lowagie/text/pdf/AsianFontMapper.java index 1f199d04d..c6063ad87 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/AsianFontMapper.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/AsianFontMapper.java @@ -49,34 +49,34 @@ import java.awt.Font; public class AsianFontMapper extends DefaultFontMapper { - + public static final String ChineseSimplifiedFont = "STSong-Light"; public static final String ChineseSimplifiedEncoding_H = "UniGB-UCS2-H"; public static final String ChineseSimplifiedEncoding_V = "UniGB-UCS2-V"; - + public static final String ChineseTraditionalFont_MHei = "MHei-Medium"; public static final String ChineseTraditionalFont_MSung = "MSung-Light"; public static final String ChineseTraditionalEncoding_H = "UniCNS-UCS2-H"; public static final String ChineseTraditionalEncoding_V = "UniCNS-UCS2-V"; - + public static final String JapaneseFont_Go = "HeiseiKakuGo-W5"; public static final String JapaneseFont_Min = "HeiseiMin-W3"; public static final String JapaneseEncoding_H = "UniJIS-UCS2-H"; public static final String JapaneseEncoding_V = "UniJIS-UCS2-V"; public static final String JapaneseEncoding_HW_H = "UniJIS-UCS2-HW-H"; public static final String JapaneseEncoding_HW_V = "UniJIS-UCS2-HW-V"; - + public static final String KoreanFont_GoThic = "HYGoThic-Medium"; public static final String KoreanFont_SMyeongJo = "HYSMyeongJo-Medium"; public static final String KoreanEncoding_H = "UniKS-UCS2-H"; public static final String KoreanEncoding_V = "UniKS-UCS2-V"; - + private final String defaultFont; private final String encoding; public AsianFontMapper(String font, String encoding) { super(); - + this.defaultFont = font; this.encoding = encoding; } @@ -84,13 +84,12 @@ public AsianFontMapper(String font, String encoding) { public BaseFont awtToPdf(Font font) { try { BaseFontParameters p = getBaseFontParameters(font.getFontName()); - if (p != null){ + if (p != null) { return BaseFont.createFont(p.fontName, p.encoding, p.embedded, p.cached, p.ttfAfm, p.pfb); - }else{ + } else { return BaseFont.createFont(defaultFont, encoding, true); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); } return null; diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BadPdfFormatException.java b/openpdf/src/main/java/com/lowagie/text/pdf/BadPdfFormatException.java index ecbd9664c..6dce31a7f 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/BadPdfFormatException.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/BadPdfFormatException.java @@ -52,34 +52,34 @@ /** * Signals that a bad PDF format has been used to construct a PdfObject. * - * @see PdfException - * @see PdfBoolean - * @see PdfNumber - * @see PdfString - * @see PdfName - * @see PdfDictionary + * @see PdfException + * @see PdfBoolean + * @see PdfNumber + * @see PdfString + * @see PdfName + * @see PdfDictionary */ public class BadPdfFormatException extends PdfException { - + // constructors - -private static final long serialVersionUID = 1802317735708833538L; -/** - * Constructs a BadPdfFormatException without a message. - */ - + private static final long serialVersionUID = 1802317735708833538L; + + /** + * Constructs a BadPdfFormatException without a message. + */ + BadPdfFormatException() { super(); } - -/** - * Constructs a BadPdfFormatException with a message. - * - * @param message a message describing the exception - */ - + + /** + * Constructs a BadPdfFormatException with a message. + * + * @param message a message describing the exception + */ + BadPdfFormatException(String message) { super(message); } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/Barcode.java b/openpdf/src/main/java/com/lowagie/text/pdf/Barcode.java index e9f3f800d..73358ab91 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/Barcode.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/Barcode.java @@ -48,422 +48,515 @@ */ package com.lowagie.text.pdf; -import java.awt.Color; - - +import com.lowagie.text.ExceptionConverter; import com.lowagie.text.Image; import com.lowagie.text.Rectangle; -import com.lowagie.text.ExceptionConverter; +import java.awt.Color; -/** Base class containing properties and methods common to all - * barcode types. +/** + * Base class containing properties and methods common to all barcode types. * * @author Paulo Soares (psoares@consiste.pt) */ public abstract class Barcode { - /** A type of barcode */ + + /** + * A type of barcode + */ public static final int EAN13 = 1; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int EAN8 = 2; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int UPCA = 3; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int UPCE = 4; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int SUPP2 = 5; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int SUPP5 = 6; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int POSTNET = 7; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int PLANET = 8; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int CODE128 = 9; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int CODE128_UCC = 10; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int CODE128_RAW = 11; - /** A type of barcode */ + /** + * A type of barcode + */ public static final int CODABAR = 12; - /** The minimum bar width. + /** + * The minimum bar width. */ - protected float x; + protected float x; - /** The bar multiplier for wide bars or the distance between - * bars for Postnet and Planet. + /** + * The bar multiplier for wide bars or the distance between bars for Postnet and Planet. */ protected float n; - - /** The text font. null if no text. + + /** + * The text font. null if no text. */ protected BaseFont font; - /** The size of the text or the height of the shorter bar - * in Postnet. - */ + /** + * The size of the text or the height of the shorter bar in Postnet. + */ protected float size; - - /** If positive, the text distance under the bars. If zero or negative, - * the text distance above the bars. + + /** + * If positive, the text distance under the bars. If zero or negative, the text distance above the bars. */ protected float baseline; - - /** The height of the bars. + + /** + * The height of the bars. */ protected float barHeight; - - /** The text alignment. Can be Element.ALIGN_LEFT, + + /** + * The text alignment. Can be Element.ALIGN_LEFT, * Element.ALIGN_CENTER or Element.ALIGN_RIGHT. */ protected int textAlignment; - - /** The optional checksum generation. + + /** + * The optional checksum generation. */ protected boolean generateChecksum; - - /** Shows the generated checksum in the the text. + + /** + * Shows the generated checksum in the the text. */ protected boolean checksumText; - - /** Show the start and stop character '*' in the text for - * the barcode 39 or 'ABCD' for codabar. + + /** + * Show the start and stop character '*' in the text for the barcode 39 or 'ABCD' for codabar. */ protected boolean startStopText; - - /** Generates extended barcode 39. + + /** + * Generates extended barcode 39. */ protected boolean extended; - - /** The code to generate. + + /** + * The code to generate. */ protected String code = ""; - - /** Show the guard bars for barcode EAN. + + /** + * Show the guard bars for barcode EAN. */ protected boolean guardBars; - - /** The code type. + + /** + * The code type. */ protected int codeType; - - /** The ink spreading. */ + + /** + * The ink spreading. + */ protected float inkSpreading = 0; - - /** Gets the minimum bar width. + /** + * The alternate text to be used, if present. + */ + protected String altText; + + /** + * Gets the minimum bar width. + * * @return the minimum bar width */ public float getX() { return x; } - - /** Sets the minimum bar width. + + /** + * Sets the minimum bar width. + * * @param x the minimum bar width */ public void setX(float x) { this.x = x; } - - /** Gets the bar multiplier for wide bars. + + /** + * Gets the bar multiplier for wide bars. + * * @return the bar multiplier for wide bars */ public float getN() { return n; } - - /** Sets the bar multiplier for wide bars. + + /** + * Sets the bar multiplier for wide bars. + * * @param n the bar multiplier for wide bars */ public void setN(float n) { this.n = n; } - - /** Gets the text font. null if no text. + + /** + * Gets the text font. null if no text. + * * @return the text font. null if no text */ public BaseFont getFont() { return font; } - - /** Sets the text font. + + /** + * Sets the text font. + * * @param font the text font. Set to null to suppress any text */ public void setFont(BaseFont font) { this.font = font; } - - /** Gets the size of the text. + + /** + * Gets the size of the text. + * * @return the size of the text */ public float getSize() { return size; } - - /** Sets the size of the text. + + /** + * Sets the size of the text. + * * @param size the size of the text */ public void setSize(float size) { this.size = size; } - - /** Gets the text baseline. - * If positive, the text distance under the bars. If zero or negative, - * the text distance above the bars. + + /** + * Gets the text baseline. If positive, the text distance under the bars. If zero or negative, the text distance + * above the bars. + * * @return the baseline. */ public float getBaseline() { return baseline; } - - /** Sets the text baseline. - * If positive, the text distance under the bars. If zero or negative, - * the text distance above the bars. + + /** + * Sets the text baseline. If positive, the text distance under the bars. If zero or negative, the text distance + * above the bars. + * * @param baseline the baseline. */ public void setBaseline(float baseline) { this.baseline = baseline; } - - /** Gets the height of the bars. + + /** + * Gets the height of the bars. + * * @return the height of the bars */ public float getBarHeight() { return barHeight; } - - /** Sets the height of the bars. + + /** + * Sets the height of the bars. + * * @param barHeight the height of the bars */ public void setBarHeight(float barHeight) { this.barHeight = barHeight; } - - /** Gets the text alignment. Can be Element.ALIGN_LEFT, + + /** + * Gets the text alignment. Can be Element.ALIGN_LEFT, * Element.ALIGN_CENTER or Element.ALIGN_RIGHT. + * * @return the text alignment */ public int getTextAlignment() { return textAlignment; } - - /** Sets the text alignment. Can be Element.ALIGN_LEFT, + + /** + * Sets the text alignment. Can be Element.ALIGN_LEFT, * Element.ALIGN_CENTER or Element.ALIGN_RIGHT. + * * @param textAlignment the text alignment */ public void setTextAlignment(int textAlignment) { this.textAlignment = textAlignment; } - - /** Gets the optional checksum generation. + + /** + * Gets the optional checksum generation. + * * @return the optional checksum generation */ public boolean isGenerateChecksum() { return generateChecksum; } - - /** Setter for property generateChecksum. + + /** + * Setter for property generateChecksum. + * * @param generateChecksum New value of property generateChecksum. */ public void setGenerateChecksum(boolean generateChecksum) { this.generateChecksum = generateChecksum; } - - /** Gets the property to show the generated checksum in the the text. + + /** + * Gets the property to show the generated checksum in the the text. + * * @return value of property checksumText */ public boolean isChecksumText() { return checksumText; } - - /** Sets the property to show the generated checksum in the the text. + + /** + * Sets the property to show the generated checksum in the the text. + * * @param checksumText new value of property checksumText */ public void setChecksumText(boolean checksumText) { this.checksumText = checksumText; } - - /** Sets the property to show the start and stop character '*' in the text for - * the barcode 39. + + /** + * Sets the property to show the start and stop character '*' in the text for the barcode 39. + * * @return value of property startStopText */ public boolean isStartStopText() { return startStopText; } - - /** Gets the property to show the start and stop character '*' in the text for - * the barcode 39. + + /** + * Gets the property to show the start and stop character '*' in the text for the barcode 39. + * * @param startStopText new value of property startStopText */ public void setStartStopText(boolean startStopText) { this.startStopText = startStopText; } - - /** Gets the property to generate extended barcode 39. + + /** + * Gets the property to generate extended barcode 39. + * * @return value of property extended. */ public boolean isExtended() { return extended; } - - /** Sets the property to generate extended barcode 39. + + /** + * Sets the property to generate extended barcode 39. + * * @param extended new value of property extended */ public void setExtended(boolean extended) { this.extended = extended; } - - /** Gets the code to generate. + + /** + * Gets the code to generate. + * * @return the code to generate */ public String getCode() { return code; } - - /** Sets the code to generate. + + /** + * Sets the code to generate. + * * @param code the code to generate */ public void setCode(String code) { this.code = code; } - - /** Gets the property to show the guard bars for barcode EAN. + + /** + * Gets the property to show the guard bars for barcode EAN. + * * @return value of property guardBars */ public boolean isGuardBars() { return guardBars; } - - /** Sets the property to show the guard bars for barcode EAN. + + /** + * Sets the property to show the guard bars for barcode EAN. + * * @param guardBars new value of property guardBars */ public void setGuardBars(boolean guardBars) { this.guardBars = guardBars; } - - /** Gets the code type. + + /** + * Gets the code type. + * * @return the code type */ public int getCodeType() { return codeType; } - - /** Sets the code type. + + /** + * Sets the code type. + * * @param codeType the code type */ public void setCodeType(int codeType) { this.codeType = codeType; } - - /** Gets the maximum area that the barcode and the text, if - * any, will occupy. The lower left corner is always (0, 0). + + /** + * Gets the maximum area that the barcode and the text, if any, will occupy. The lower left corner is always (0, + * 0). + * * @return the size the barcode occupies. - */ + */ public abstract Rectangle getBarcodeSize(); - - /** Places the barcode in a PdfContentByte. The - * barcode is always placed at coordinates (0, 0). Use the + + /** + * Places the barcode in a PdfContentByte. The barcode is always placed at coordinates (0, 0). Use the * translation matrix to move it elsewhere. *

    The bars and text are written in the following colors:

    - * - * + *
    table of the colors of the bars and text
    + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * *
    table of the colors of the bars and text

    barColor

    textColor

    Result

    barColor

    textColor

    Result

    null

    null

    bars and text painted with current fill color

    null

    null

    bars and text painted with current fill color

    barColor

    null

    bars and text painted with barColor

    barColor

    null

    bars and text painted with barColor

    null

    textColor

    bars painted with current color
    text painted with textColor

    null

    textColor

    bars painted with current color
    text painted with textColor

    barColor

    textColor

    bars painted with barColor
    text painted with textColor

    barColor

    textColor

    bars painted with barColor
    text painted with textColor

    - * @param cb the PdfContentByte where the barcode will be placed - * @param barColor the color of the bars. It can be null + * + * @param cb the PdfContentByte where the barcode will be placed + * @param barColor the color of the bars. It can be null * @param textColor the color of the text. It can be null * @return the dimensions the barcode occupies - */ + */ public abstract Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor); - - /** Creates a template with the barcode. - * @param cb the PdfContentByte to create the template. It - * serves no other use - * @param barColor the color of the bars. It can be null + + /** + * Creates a template with the barcode. + * + * @param cb the PdfContentByte to create the template. It serves no other use + * @param barColor the color of the bars. It can be null * @param textColor the color of the text. It can be null * @return the template * @see #placeBarcode(PdfContentByte cb, Color barColor, Color textColor) - */ + */ public PdfTemplate createTemplateWithBarcode(PdfContentByte cb, Color barColor, Color textColor) { PdfTemplate tp = cb.createTemplate(0, 0); Rectangle rect = placeBarcode(tp, barColor, textColor); tp.setBoundingBox(rect); return tp; } - - /** Creates an Image with the barcode. - * @param cb the PdfContentByte to create the Image. It - * serves no other use - * @param barColor the color of the bars. It can be null + + /** + * Creates an Image with the barcode. + * + * @param cb the PdfContentByte to create the Image. It serves no other use + * @param barColor the color of the bars. It can be null * @param textColor the color of the text. It can be null * @return the Image * @see #placeBarcode(PdfContentByte cb, Color barColor, Color textColor) - */ + */ public Image createImageWithBarcode(PdfContentByte cb, Color barColor, Color textColor) { try { return Image.getInstance(createTemplateWithBarcode(cb, barColor, textColor)); - } - catch (Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } } - - /** Creates a java.awt.Image. This image only - * contains the bars without any text. + + /** + * Creates a java.awt.Image. This image only contains the bars without any text. + * * @param foreground the color of the bars * @param background the color of the background * @return the image - */ + */ public abstract java.awt.Image createAwtImage(Color foreground, Color background); - - /** Gets the amount of ink spreading. - * @return the ink spreading + + /** + * Gets the amount of ink spreading. * + * @return the ink spreading */ public float getInkSpreading() { return this.inkSpreading; } - - /** Sets the amount of ink spreading. This value will be subtracted - * to the width of each bar. The actual value will depend on the ink - * and the printing medium. - * @param inkSpreading the ink spreading + + /** + * Sets the amount of ink spreading. This value will be subtracted to the width of each bar. The actual value will + * depend on the ink and the printing medium. * + * @param inkSpreading the ink spreading */ public void setInkSpreading(float inkSpreading) { this.inkSpreading = inkSpreading; } - /** - * The alternate text to be used, if present. - */ - protected String altText; - /** * Gets the alternate text. + * * @return the alternate text */ public String getAltText() { @@ -471,12 +564,12 @@ public String getAltText() { } /** - * Sets the alternate text. If present, this text will be used instead of the - * text derived from the supplied code. + * Sets the alternate text. If present, this text will be used instead of the text derived from the supplied code. + * * @param altText the alternate text */ public void setAltText(String altText) { this.altText = altText; } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/Barcode128.java b/openpdf/src/main/java/com/lowagie/text/pdf/Barcode128.java index 1d06719fb..e2e056153 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/Barcode128.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/Barcode128.java @@ -47,20 +47,20 @@ * https://github.com/LibrePDF/OpenPDF */ package com.lowagie.text.pdf; + +import com.lowagie.text.Element; +import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.Rectangle; +import com.lowagie.text.error_messages.MessageLocalization; import java.awt.Canvas; import java.awt.Color; import java.awt.Image; import java.awt.image.MemoryImageSource; -import com.lowagie.text.error_messages.MessageLocalization; - -import com.lowagie.text.Element; -import com.lowagie.text.Rectangle; -import com.lowagie.text.ExceptionConverter; /** - * Implements the code 128 and UCC/EAN-128. Other symbologies are allowed in raw mode.

    - * The code types allowed are:
    + * Implements the code 128 and UCC/EAN-128. Other symbologies are allowed in raw mode.

    The code types allowed + * are:
    *

      *
    • CODE128 - plain barcode 128. *
    • CODE128_UCC - support for UCC/EAN-128 with a full list of AI. @@ -77,10 +77,50 @@ * textAlignment = Element.ALIGN_CENTER; * codeType = CODE128; * + * * @author Paulo Soares (psoares@consiste.pt) */ -public class Barcode128 extends Barcode{ +public class Barcode128 extends Barcode { + /** + * The charset code change. + */ + public static final char CODE_AB_TO_C = 99; + /** + * The charset code change. + */ + public static final char CODE_AC_TO_B = 100; + /** + * The charset code change. + */ + public static final char CODE_BC_TO_A = 101; + /** + * The code for UCC/EAN-128. + */ + public static final char FNC1_INDEX = 102; + /** + * The start code. + */ + public static final char START_A = 103; + /** + * The start code. + */ + public static final char START_B = 104; + /** + * The start code. + */ + public static final char START_C = 105; + public static final char FNC1 = '\u00ca'; + public static final char DEL = '\u00c3'; + public static final char FNC3 = '\u00c4'; + public static final char FNC2 = '\u00c5'; + public static final char SHIFT = '\u00c6'; + public static final char CODE_C = '\u00c7'; + public static final char CODE_A = '\u00c8'; + public static final char FNC4 = '\u00c8'; + public static final char STARTA = '\u00cb'; + public static final char STARTB = '\u00cc'; + public static final char STARTC = '\u00cd'; /** * The bars to generate the code. */ @@ -193,47 +233,79 @@ public class Barcode128 extends Barcode{ {2, 1, 1, 2, 1, 4}, {2, 1, 1, 2, 3, 2} }; - /** * The stop bars. */ private static final byte[] BARS_STOP = {2, 3, 3, 1, 1, 1, 2}; - /** The charset code change. - */ - public static final char CODE_AB_TO_C = 99; - /** The charset code change. - */ - public static final char CODE_AC_TO_B = 100; - /** The charset code change. - */ - public static final char CODE_BC_TO_A = 101; - /** The code for UCC/EAN-128. - */ - public static final char FNC1_INDEX = 102; - /** The start code. - */ - public static final char START_A = 103; - /** The start code. - */ - public static final char START_B = 104; - /** The start code. - */ - public static final char START_C = 105; - - public static final char FNC1 = '\u00ca'; - public static final char DEL = '\u00c3'; - public static final char FNC3 = '\u00c4'; - public static final char FNC2 = '\u00c5'; - public static final char SHIFT = '\u00c6'; - public static final char CODE_C = '\u00c7'; - public static final char CODE_A = '\u00c8'; - public static final char FNC4 = '\u00c8'; - public static final char STARTA = '\u00cb'; - public static final char STARTB = '\u00cc'; - public static final char STARTC = '\u00cd'; - private static final IntHashtable ais = new IntHashtable(); - /** Creates new Barcode128 */ + + static { + ais.put(0, 20); + ais.put(1, 16); + ais.put(2, 16); + ais.put(10, -1); + ais.put(11, 9); + ais.put(12, 8); + ais.put(13, 8); + ais.put(15, 8); + ais.put(17, 8); + ais.put(20, 4); + ais.put(21, -1); + ais.put(22, -1); + ais.put(23, -1); + ais.put(240, -1); + ais.put(241, -1); + ais.put(250, -1); + ais.put(251, -1); + ais.put(252, -1); + ais.put(30, -1); + for (int k = 3100; k < 3700; ++k) { + ais.put(k, 10); + } + ais.put(37, -1); + for (int k = 3900; k < 3940; ++k) { + ais.put(k, -1); + } + ais.put(400, -1); + ais.put(401, -1); + ais.put(402, 20); + ais.put(403, -1); + for (int k = 410; k < 416; ++k) { + ais.put(k, 16); + } + ais.put(420, -1); + ais.put(421, -1); + ais.put(422, 6); + ais.put(423, -1); + ais.put(424, 6); + ais.put(425, 6); + ais.put(426, 6); + ais.put(7001, 17); + ais.put(7002, -1); + for (int k = 7030; k < 7040; ++k) { + ais.put(k, -1); + } + ais.put(8001, 18); + ais.put(8002, -1); + ais.put(8003, -1); + ais.put(8004, -1); + ais.put(8005, 10); + ais.put(8006, 22); + ais.put(8007, -1); + ais.put(8008, -1); + ais.put(8018, 22); + ais.put(8020, -1); + ais.put(8100, 10); + ais.put(8101, 14); + ais.put(8102, 6); + for (int k = 90; k < 100; ++k) { + ais.put(k, -1); + } + } + + /** + * Creates new Barcode128 + */ public Barcode128() { try { x = 0.8f; @@ -243,33 +315,35 @@ public Barcode128() { barHeight = size * 3; textAlignment = Element.ALIGN_CENTER; codeType = CODE128; - } - catch (Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } } /** * Removes the FNC1 codes in the text. + * * @param code the text to clean * @return the cleaned text - */ + */ public static String removeFNC1(String code) { int len = code.length(); StringBuilder buf = new StringBuilder(len); for (int k = 0; k < len; ++k) { char c = code.charAt(k); - if (c >= 32 && c <= 126) + if (c >= 32 && c <= 126) { buf.append(c); + } } return buf.toString(); } - + /** * Gets the human readable text of a sequence of AI. + * * @param code the text * @return the human readable text - */ + */ public static String getHumanReadableUCCEAN(String code) { StringBuilder buf = new StringBuilder(); String fnc1 = String.valueOf(FNC1); @@ -282,47 +356,51 @@ public static String getHumanReadableUCCEAN(String code) { int n = 0; int idlen = 0; for (int k = 2; k < 5; ++k) { - if (code.length() < k) + if (code.length() < k) { break; + } if ((n = ais.get(Integer.parseInt(code.substring(0, k)))) != 0) { idlen = k; break; } } - if (idlen == 0) + if (idlen == 0) { break; + } buf.append('(').append(code, 0, idlen).append(')'); code = code.substring(idlen); if (n > 0) { n -= idlen; - if (code.length() <= n) + if (code.length() <= n) { break; + } buf.append(removeFNC1(code.substring(0, n))); code = code.substring(n); - } - else { + } else { int idx = code.indexOf(FNC1); - if (idx < 0) + if (idx < 0) { break; + } buf.append(code, 0, idx); code = code.substring(idx + 1); } } - } - catch (Exception e) { + } catch (Exception e) { //empty } buf.append(removeFNC1(code)); return buf.toString(); } - - /** Returns true if the next numDigits - * starting from index textIndex are numeric skipping any FNC1. - * @param text the text to check + + /** + * Returns true if the next numDigits starting from index textIndex are + * numeric skipping any FNC1. + * + * @param text the text to check * @param textIndex where to check from * @param numDigits the number of digits to check * @return the check result - */ + */ static boolean isNextDigits(String text, int textIndex, int numDigits) { int len = text.length(); while (textIndex < len && numDigits > 0) { @@ -331,25 +409,28 @@ static boolean isNextDigits(String text, int textIndex, int numDigits) { continue; } int n = Math.min(2, numDigits); - if (textIndex + n > len) + if (textIndex + n > len) { return false; + } while (n-- > 0) { char c = text.charAt(textIndex++); - if (c < '0' || c > '9') + if (c < '0' || c > '9') { return false; + } --numDigits; } } return numDigits == 0; } - - /** Packs the digits for charset C also considering FNC1. It assumes that all the parameters - * are valid. - * @param text the text to pack + + /** + * Packs the digits for charset C also considering FNC1. It assumes that all the parameters are valid. + * + * @param text the text to pack * @param textIndex where to pack from * @param numDigits the number of digits to pack. It is always an even number * @return the packed digits, two digits per character - */ + */ static String getPackedRawDigits(String text, int textIndex, int numDigits) { String out = ""; int start = textIndex; @@ -362,32 +443,38 @@ static String getPackedRawDigits(String text, int textIndex, int numDigits) { numDigits -= 2; int c1 = text.charAt(textIndex++) - '0'; int c2 = text.charAt(textIndex++) - '0'; - out += (char)(c1 * 10 + c2); + out += (char) (c1 * 10 + c2); } - return (char)(textIndex - start) + out; + return (char) (textIndex - start) + out; } - - /** Converts the human readable text to the characters needed to - * create a barcode. Some optimization is done to get the shortest code. + + /** + * Converts the human readable text to the characters needed to create a barcode. Some optimization is done to get + * the shortest code. + * * @param text the text to convert - * @param ucc true if it is an UCC/EAN-128. In this case - * the character FNC1 is added + * @param ucc true if it is an UCC/EAN-128. In this case + * the character FNC1 is added * @return the code ready to be fed to getBarsCode128Raw() - */ + */ public static String getRawText(String text, boolean ucc) { String out = ""; int tLen = text.length(); if (tLen == 0) { out += START_B; - if (ucc) + if (ucc) { out += FNC1_INDEX; + } return out; } int c = 0; for (int k = 0; k < tLen; ++k) { c = text.charAt(k); - if (c > 127 && c != FNC1) - throw new RuntimeException(MessageLocalization.getComposedMessage("there.are.illegal.characters.for.barcode.128.in.1", text)); + if (c > 127 && c != FNC1) { + throw new RuntimeException( + MessageLocalization.getComposedMessage("there.are.illegal.characters.for.barcode.128.in.1", + text)); + } } c = text.charAt(0); char currentCode = START_B; @@ -395,134 +482,134 @@ public static String getRawText(String text, boolean ucc) { if (isNextDigits(text, index, 2)) { currentCode = START_C; out += currentCode; - if (ucc) + if (ucc) { out += FNC1_INDEX; + } String out2 = getPackedRawDigits(text, index, 2); index += out2.charAt(0); out += out2.substring(1); - } - else if (c < ' ') { + } else if (c < ' ') { currentCode = START_A; out += currentCode; - if (ucc) + if (ucc) { out += FNC1_INDEX; - out += (char)(c + 64); + } + out += (char) (c + 64); ++index; - } - else { + } else { out += currentCode; - if (ucc) + if (ucc) { out += FNC1_INDEX; - if (c == FNC1) + } + if (c == FNC1) { out += FNC1_INDEX; - else - out += (char)(c - ' '); + } else { + out += (char) (c - ' '); + } ++index; } while (index < tLen) { switch (currentCode) { - case START_A: - { - if (isNextDigits(text, index, 4)) { - currentCode = START_C; - out += CODE_AB_TO_C; - String out2 = getPackedRawDigits(text, index, 4); - index += out2.charAt(0); - out += out2.substring(1); - } - else { - c = text.charAt(index++); - if (c == FNC1) - out += FNC1_INDEX; - else if (c > '_') { - currentCode = START_B; - out += CODE_AC_TO_B; - out += (char)(c - ' '); - } - else if (c < ' ') - out += (char)(c + 64); - else - out += (char)(c - ' '); + case START_A: { + if (isNextDigits(text, index, 4)) { + currentCode = START_C; + out += CODE_AB_TO_C; + String out2 = getPackedRawDigits(text, index, 4); + index += out2.charAt(0); + out += out2.substring(1); + } else { + c = text.charAt(index++); + if (c == FNC1) { + out += FNC1_INDEX; + } else if (c > '_') { + currentCode = START_B; + out += CODE_AC_TO_B; + out += (char) (c - ' '); + } else if (c < ' ') { + out += (char) (c + 64); + } else { + out += (char) (c - ' '); } } - break; - case START_B: - { - if (isNextDigits(text, index, 4)) { - currentCode = START_C; - out += CODE_AB_TO_C; - String out2 = getPackedRawDigits(text, index, 4); - index += out2.charAt(0); - out += out2.substring(1); - } - else { - c = text.charAt(index++); - if (c == FNC1) - out += FNC1_INDEX; - else if (c < ' ') { - currentCode = START_A; - out += CODE_BC_TO_A; - out += (char)(c + 64); - } - else { - out += (char)(c - ' '); - } + } + break; + case START_B: { + if (isNextDigits(text, index, 4)) { + currentCode = START_C; + out += CODE_AB_TO_C; + String out2 = getPackedRawDigits(text, index, 4); + index += out2.charAt(0); + out += out2.substring(1); + } else { + c = text.charAt(index++); + if (c == FNC1) { + out += FNC1_INDEX; + } else if (c < ' ') { + currentCode = START_A; + out += CODE_BC_TO_A; + out += (char) (c + 64); + } else { + out += (char) (c - ' '); } } - break; - case START_C: - { - if (isNextDigits(text, index, 2)) { - String out2 = getPackedRawDigits(text, index, 2); - index += out2.charAt(0); - out += out2.substring(1); - } - else { - c = text.charAt(index++); - if (c == FNC1) - out += FNC1_INDEX; - else if (c < ' ') { - currentCode = START_A; - out += CODE_BC_TO_A; - out += (char)(c + 64); - } - else { - currentCode = START_B; - out += CODE_AC_TO_B; - out += (char)(c - ' '); - } + } + break; + case START_C: { + if (isNextDigits(text, index, 2)) { + String out2 = getPackedRawDigits(text, index, 2); + index += out2.charAt(0); + out += out2.substring(1); + } else { + c = text.charAt(index++); + if (c == FNC1) { + out += FNC1_INDEX; + } else if (c < ' ') { + currentCode = START_A; + out += CODE_BC_TO_A; + out += (char) (c + 64); + } else { + currentCode = START_B; + out += CODE_AC_TO_B; + out += (char) (c - ' '); } } - break; + } + break; } } return out; } - - /** Generates the bars. The input has the actual barcodes, not - * the human readable text. + + /** + * Generates the bars. The input has the actual barcodes, not the human readable text. + * * @param text the barcode * @return the bars - */ + */ public static byte[] getBarsCode128Raw(String text) { int idx = text.indexOf('\uffff'); - if (idx >= 0) + if (idx >= 0) { text = text.substring(0, idx); + } int chk = text.charAt(0); - for (int k = 1; k < text.length(); ++k) + for (int k = 1; k < text.length(); ++k) { chk += k * text.charAt(k); + } chk = chk % 103; - text += (char)chk; + text += (char) chk; byte[] bars = new byte[(text.length() + 1) * 6 + 7]; int k; - for (k = 0; k < text.length(); ++k) + for (k = 0; k < text.length(); ++k) { System.arraycopy(BARS[text.charAt(k)], 0, bars, k * 6, 6); + } System.arraycopy(BARS_STOP, 0, bars, k * 6, 7); return bars; } - - /** Gets the maximum area that the barcode and the text, if - * any, will occupy. The lower left corner is always (0, 0). + + /** + * Gets the maximum area that the barcode and the text, if any, will occupy. The lower left corner is always (0, + * 0). + * * @return the size the barcode occupies. */ public Rectangle getBarcodeSize() { @@ -530,31 +617,33 @@ public Rectangle getBarcodeSize() { float fontY = 0; String fullCode; if (font != null) { - if (baseline > 0) + if (baseline > 0) { fontY = baseline - font.getFontDescriptor(BaseFont.DESCENT, size); - else + } else { fontY = -baseline + size; + } if (codeType == CODE128_RAW) { int idx = code.indexOf('\uffff'); - if (idx < 0) + if (idx < 0) { fullCode = ""; - else + } else { fullCode = code.substring(idx + 1); - } - else if (codeType == CODE128_UCC) + } + } else if (codeType == CODE128_UCC) { fullCode = getHumanReadableUCCEAN(code); - else + } else { fullCode = removeFNC1(code); + } fontX = font.getWidthPoint(altText != null ? altText : fullCode, size); } if (codeType == CODE128_RAW) { int idx = code.indexOf('\uffff'); - if (idx >= 0) + if (idx >= 0) { fullCode = code.substring(0, idx); - else + } else { fullCode = code; - } - else { + } + } else { fullCode = getRawText(code, codeType == CODE128_UCC); } int len = fullCode.length(); @@ -563,41 +652,42 @@ else if (codeType == CODE128_UCC) float fullHeight = barHeight + fontY; return new Rectangle(fullWidth, fullHeight); } - - /** Places the barcode in a PdfContentByte. The - * barcode is always placed at coordinates (0, 0). Use the + + /** + * Places the barcode in a PdfContentByte. The barcode is always placed at coordinates (0, 0). Use the * translation matrix to move it elsewhere. *

      The bars and text are written in the following colors:

      * - * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * *
      table of the colors of the bars and texttable of the colors of the bars and text

      barColor

      textColor

      Result

      barColor

      textColor

      Result

      null

      null

      bars and text painted with current fill color

      null

      null

      bars and text painted with current fill color

      barColor

      null

      bars and text painted with barColor

      barColor

      null

      bars and text painted with barColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      - * @param cb the PdfContentByte where the barcode will be placed - * @param barColor the color of the bars. It can be null + * + * @param cb the PdfContentByte where the barcode will be placed + * @param barColor the color of the bars. It can be null * @param textColor the color of the text. It can be null * @return the dimensions the barcode occupies */ @@ -605,15 +695,16 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor String fullCode; if (codeType == CODE128_RAW) { int idx = code.indexOf('\uffff'); - if (idx < 0) + if (idx < 0) { fullCode = ""; - else + } else { fullCode = code.substring(idx + 1); - } - else if (codeType == CODE128_UCC) + } + } else if (codeType == CODE128_UCC) { fullCode = getHumanReadableUCCEAN(code); - else + } else { fullCode = removeFNC1(code); + } float fontX = 0; if (font != null) { fontX = font.getWidthPoint(fullCode = altText != null ? altText : fullCode, size); @@ -621,12 +712,12 @@ else if (codeType == CODE128_UCC) String bCode; if (codeType == CODE128_RAW) { int idx = code.indexOf('\uffff'); - if (idx >= 0) + if (idx >= 0) { bCode = code.substring(0, idx); - else + } else { bCode = code; - } - else { + } + } else { bCode = getRawText(code, codeType == CODE128_UCC); } int len = bCode.length(); @@ -637,43 +728,48 @@ else if (codeType == CODE128_UCC) case Element.ALIGN_LEFT: break; case Element.ALIGN_RIGHT: - if (fontX > fullWidth) + if (fontX > fullWidth) { barStartX = fontX - fullWidth; - else + } else { textStartX = fullWidth - fontX; + } break; default: - if (fontX > fullWidth) + if (fontX > fullWidth) { barStartX = (fontX - fullWidth) / 2; - else + } else { textStartX = (fullWidth - fontX) / 2; + } break; } float barStartY = 0; float textStartY = 0; if (font != null) { - if (baseline <= 0) + if (baseline <= 0) { textStartY = barHeight - baseline; - else { + } else { textStartY = -font.getFontDescriptor(BaseFont.DESCENT, size); barStartY = textStartY + baseline; } } byte[] bars = getBarsCode128Raw(bCode); boolean print = true; - if (barColor != null) + if (barColor != null) { cb.setColorFill(barColor); + } for (byte bar : bars) { float w = bar * x; - if (print) + if (print) { cb.rectangle(barStartX, barStartY, w - inkSpreading, barHeight); + } print = !print; barStartX += w; } cb.fill(); if (font != null) { - if (textColor != null) + if (textColor != null) { cb.setColorFill(textColor); + } cb.beginText(); cb.setFontAndSize(font, size); cb.setTextMatrix(textStartX, textStartY); @@ -682,13 +778,14 @@ else if (codeType == CODE128_UCC) } return getBarcodeSize(); } - - /** Creates a java.awt.Image. This image only - * contains the bars without any text. + + /** + * Creates a java.awt.Image. This image only contains the bars without any text. + * * @param foreground the color of the bars * @param background the color of the background * @return the image - */ + */ public java.awt.Image createAwtImage(Color foreground, Color background) { int f = foreground.getRGB(); int g = background.getRGB(); @@ -696,43 +793,46 @@ public java.awt.Image createAwtImage(Color foreground, Color background) { String bCode; if (codeType == CODE128_RAW) { int idx = code.indexOf('\uffff'); - if (idx >= 0) + if (idx >= 0) { bCode = code.substring(0, idx); - else + } else { bCode = code; - } - else { + } + } else { bCode = getRawText(code, codeType == CODE128_UCC); } int len = bCode.length(); int fullWidth = (len + 2) * 11 + 2; byte[] bars = getBarsCode128Raw(bCode); - + boolean print = true; int ptr = 0; - int height = (int)barHeight; + int height = (int) barHeight; int[] pix = new int[fullWidth * height]; for (int w : bars) { int c = g; - if (print) + if (print) { c = f; + } print = !print; - for (int j = 0; j < w; ++j) + for (int j = 0; j < w; ++j) { pix[ptr++] = c; + } } for (int k = fullWidth; k < pix.length; k += fullWidth) { - System.arraycopy(pix, 0, pix, k, fullWidth); + System.arraycopy(pix, 0, pix, k, fullWidth); } Image img = canvas.createImage(new MemoryImageSource(fullWidth, height, pix, 0, fullWidth)); - + return img; } - + /** - * Sets the code to generate. If it's an UCC code and starts with '(' it will - * be split by the AI. This code in UCC mode is valid: + * Sets the code to generate. If it's an UCC code and starts with '(' it will be split by the AI. This code in UCC + * mode is valid: *

      * (01)00000090311314(10)ABC123(15)060916 + * * @param code the code to generate */ public void setCode(String code) { @@ -741,90 +841,38 @@ public void setCode(String code) { String ret = ""; while (idx >= 0) { int end = code.indexOf(')', idx); - if (end < 0) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("badly.formed.ucc.string.1", code)); + if (end < 0) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("badly.formed.ucc.string.1", code)); + } String sai = code.substring(idx + 1, end); - if (sai.length() < 2) + if (sai.length() < 2) { throw new IllegalArgumentException(MessageLocalization.getComposedMessage("ai.too.short.1", sai)); + } int ai = Integer.parseInt(sai); int len = ais.get(ai); - if (len == 0) + if (len == 0) { throw new IllegalArgumentException(MessageLocalization.getComposedMessage("ai.not.found.1", sai)); + } sai = String.valueOf(ai); - if (sai.length() == 1) + if (sai.length() == 1) { sai = "0" + sai; + } idx = code.indexOf('(', end); int next = (idx < 0 ? code.length() : idx); ret += sai + code.substring(end + 1, next); if (len < 0) { - if (idx >= 0) + if (idx >= 0) { ret += FNC1; + } + } else if (next - end - 1 + sai.length() != len) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("invalid.ai.length.1", sai)); } - else if (next - end - 1 + sai.length() != len) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("invalid.ai.length.1", sai)); } super.setCode(ret); - } - else + } else { super.setCode(code); - } - - static { - ais.put(0, 20); - ais.put(1, 16); - ais.put(2, 16); - ais.put(10, -1); - ais.put(11, 9); - ais.put(12, 8); - ais.put(13, 8); - ais.put(15, 8); - ais.put(17, 8); - ais.put(20, 4); - ais.put(21, -1); - ais.put(22, -1); - ais.put(23, -1); - ais.put(240, -1); - ais.put(241, -1); - ais.put(250, -1); - ais.put(251, -1); - ais.put(252, -1); - ais.put(30, -1); - for (int k = 3100; k < 3700; ++k) - ais.put(k, 10); - ais.put(37, -1); - for (int k = 3900; k < 3940; ++k) - ais.put(k, -1); - ais.put(400, -1); - ais.put(401, -1); - ais.put(402, 20); - ais.put(403, -1); - for (int k = 410; k < 416; ++k) - ais.put(k, 16); - ais.put(420, -1); - ais.put(421, -1); - ais.put(422, 6); - ais.put(423, -1); - ais.put(424, 6); - ais.put(425, 6); - ais.put(426, 6); - ais.put(7001, 17); - ais.put(7002, -1); - for (int k = 7030; k < 7040; ++k) - ais.put(k, -1); - ais.put(8001, 18); - ais.put(8002, -1); - ais.put(8003, -1); - ais.put(8004, -1); - ais.put(8005, 10); - ais.put(8006, 22); - ais.put(8007, -1); - ais.put(8008, -1); - ais.put(8018, 22); - ais.put(8020, -1); - ais.put(8100, 10); - ais.put(8101, 14); - ais.put(8102, 6); - for (int k = 90; k < 100; ++k) - ais.put(k, -1); + } } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/Barcode39.java b/openpdf/src/main/java/com/lowagie/text/pdf/Barcode39.java index 9bec1f98c..35af70964 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/Barcode39.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/Barcode39.java @@ -48,35 +48,34 @@ */ package com.lowagie.text.pdf; +import com.lowagie.text.Element; +import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.Rectangle; +import com.lowagie.text.error_messages.MessageLocalization; import java.awt.Canvas; import java.awt.Color; import java.awt.Image; import java.awt.image.MemoryImageSource; -import com.lowagie.text.error_messages.MessageLocalization; - -import com.lowagie.text.Element; -import com.lowagie.text.Rectangle; -import com.lowagie.text.ExceptionConverter; - -/** Implements the code 39 and code 39 extended. The default parameters are: +/** + * Implements the code 39 and code 39 extended. The default parameters are: * 

      - *x = 0.8f;
- *n = 2;
- *font = BaseFont.createFont("Helvetica", "winansi", false);
- *size = 8;
- *baseline = size;
- *barHeight = size * 3;
- *textAlignment = Element.ALIGN_CENTER;
- *generateChecksum = false;
- *checksumText = false;
- *startStopText = true;
- *extended = false;
+ * x = 0.8f;
+ * n = 2;
+ * font = BaseFont.createFont("Helvetica", "winansi", false);
+ * size = 8;
+ * baseline = size;
+ * barHeight = size * 3;
+ * textAlignment = Element.ALIGN_CENTER;
+ * generateChecksum = false;
+ * checksumText = false;
+ * startStopText = true;
+ * extended = false;
  *
      * * @author Paulo Soares (psoares@consiste.pt) */ -public class Barcode39 extends Barcode{ +public class Barcode39 extends Barcode { /** * The bars to generate the code. @@ -128,24 +127,27 @@ public class Barcode39 extends Barcode{ {0, 0, 0, 1, 0, 1, 0, 1, 0}, {0, 1, 0, 0, 1, 0, 1, 0, 0} }; - - /** The index chars to BARS. - */ + + /** + * The index chars to BARS. + */ private static final String CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%*"; - - /** The character combinations to make the code 39 extended. - */ + + /** + * The character combinations to make the code 39 extended. + */ private static final String EXTENDED = "%U" + - "$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z" + - "%A%B%C%D%E /A/B/C/D/E/F/G/H/I/J/K/L - ./O" + - " 0 1 2 3 4 5 6 7 8 9/Z%F%G%H%I%J%V" + - " A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" + - "%K%L%M%N%O%W" + - "+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z" + - "%P%Q%R%S%T"; - - /** Creates a new Barcode39. - */ + "$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z" + + "%A%B%C%D%E /A/B/C/D/E/F/G/H/I/J/K/L - ./O" + + " 0 1 2 3 4 5 6 7 8 9/Z%F%G%H%I%J%V" + + " A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" + + "%K%L%M%N%O%W" + + "+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z" + + "%P%Q%R%S%T"; + + /** + * Creates a new Barcode39. + */ public Barcode39() { try { x = 0.8f; @@ -159,147 +161,171 @@ public Barcode39() { checksumText = false; startStopText = true; extended = false; - } - catch (Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } } - - /** Creates the bars. - * @param text the text to create the bars. This text does not include the start and - * stop characters + + /** + * Creates the bars. + * + * @param text the text to create the bars. This text does not include the start and stop characters * @return the bars - */ + */ public static byte[] getBarsCode39(String text) { text = "*" + text + "*"; byte[] bars = new byte[text.length() * 10 - 1]; for (int k = 0; k < text.length(); ++k) { int idx = CHARS.indexOf(text.charAt(k)); - if (idx < 0) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.character.1.is.illegal.in.code.39", text.charAt(k))); + if (idx < 0) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("the.character.1.is.illegal.in.code.39", + text.charAt(k))); + } System.arraycopy(BARS[idx], 0, bars, k * 10, 9); } return bars; } - - /** Converts the extended text into a normal, escaped text, - * ready to generate bars. + + /** + * Converts the extended text into a normal, escaped text, ready to generate bars. + * * @param text the extended text * @return the escaped text - */ + */ public static String getCode39Ex(String text) { String out = ""; for (int k = 0; k < text.length(); ++k) { char c = text.charAt(k); - if (c > 127) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.character.1.is.illegal.in.code.39.extended", c)); + if (c > 127) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("the.character.1.is.illegal.in.code.39.extended", c)); + } char c1 = EXTENDED.charAt(c * 2); char c2 = EXTENDED.charAt(c * 2 + 1); - if (c1 != ' ') + if (c1 != ' ') { out += c1; + } out += c2; } return out; } - - /** Calculates the checksum. + + /** + * Calculates the checksum. + * * @param text the text * @return the checksum - */ + */ static char getChecksum(String text) { int chk = 0; for (int k = 0; k < text.length(); ++k) { int idx = CHARS.indexOf(text.charAt(k)); - if (idx < 0) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.character.1.is.illegal.in.code.39", text.charAt(k))); + if (idx < 0) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("the.character.1.is.illegal.in.code.39", + text.charAt(k))); + } chk += idx; } return CHARS.charAt(chk % 43); } - - /** Gets the maximum area that the barcode and the text, if - * any, will occupy. The lower left corner is always (0, 0). + + /** + * Gets the maximum area that the barcode and the text, if any, will occupy. The lower left corner is always (0, + * 0). + * * @return the size the barcode occupies. - */ + */ public Rectangle getBarcodeSize() { float fontX = 0; float fontY = 0; String fCode = code; - if (extended) + if (extended) { fCode = getCode39Ex(code); + } if (font != null) { - if (baseline > 0) + if (baseline > 0) { fontY = baseline - font.getFontDescriptor(BaseFont.DESCENT, size); - else + } else { fontY = -baseline + size; + } String fullCode = code; - if (generateChecksum && checksumText) + if (generateChecksum && checksumText) { fullCode += getChecksum(fCode); - if (startStopText) + } + if (startStopText) { fullCode = "*" + fullCode + "*"; + } fontX = font.getWidthPoint(altText != null ? altText : fullCode, size); } int len = fCode.length() + 2; - if (generateChecksum) + if (generateChecksum) { ++len; + } float fullWidth = len * (6 * x + 3 * x * n) + (len - 1) * x; fullWidth = Math.max(fullWidth, fontX); float fullHeight = barHeight + fontY; return new Rectangle(fullWidth, fullHeight); } - - /** Places the barcode in a PdfContentByte. The - * barcode is always placed at coordinates (0, 0). Use the + + /** + * Places the barcode in a PdfContentByte. The barcode is always placed at coordinates (0, 0). Use the * translation matrix to move it elsewhere. *

      The bars and text are written in the following colors:

      * - * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * *
      table of the colors of the bars and texttable of the colors of the bars and text

      barColor

      textColor

      Result

      barColor

      textColor

      Result

      null

      null

      bars and text painted with current fill color

      null

      null

      bars and text painted with current fill color

      barColor

      null

      bars and text painted with barColor

      barColor

      null

      bars and text painted with barColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      - * @param cb the PdfContentByte where the barcode will be placed - * @param barColor the color of the bars. It can be null + * + * @param cb the PdfContentByte where the barcode will be placed + * @param barColor the color of the bars. It can be null * @param textColor the color of the text. It can be null * @return the dimensions the barcode occupies - */ + */ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor) { String fullCode = code; float fontX = 0; String bCode = code; - if (extended) + if (extended) { bCode = getCode39Ex(code); + } if (font != null) { - if (generateChecksum && checksumText) + if (generateChecksum && checksumText) { fullCode += getChecksum(bCode); - if (startStopText) + } + if (startStopText) { fullCode = "*" + fullCode + "*"; + } fontX = font.getWidthPoint(fullCode = altText != null ? altText : fullCode, size); } - if (generateChecksum) + if (generateChecksum) { bCode += getChecksum(bCode); + } int len = bCode.length() + 2; float fullWidth = len * (6 * x + 3 * x * n) + (len - 1) * x; float barStartX = 0; @@ -308,43 +334,48 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor case Element.ALIGN_LEFT: break; case Element.ALIGN_RIGHT: - if (fontX > fullWidth) + if (fontX > fullWidth) { barStartX = fontX - fullWidth; - else + } else { textStartX = fullWidth - fontX; + } break; default: - if (fontX > fullWidth) + if (fontX > fullWidth) { barStartX = (fontX - fullWidth) / 2; - else + } else { textStartX = (fullWidth - fontX) / 2; + } break; } float barStartY = 0; float textStartY = 0; if (font != null) { - if (baseline <= 0) + if (baseline <= 0) { textStartY = barHeight - baseline; - else { + } else { textStartY = -font.getFontDescriptor(BaseFont.DESCENT, size); barStartY = textStartY + baseline; } } byte[] bars = getBarsCode39(bCode); boolean print = true; - if (barColor != null) + if (barColor != null) { cb.setColorFill(barColor); + } for (byte bar : bars) { float w = (bar == 0 ? x : x * n); - if (print) + if (print) { cb.rectangle(barStartX, barStartY, w - inkSpreading, barHeight); + } print = !print; barStartX += w; } cb.fill(); if (font != null) { - if (textColor != null) + if (textColor != null) { cb.setColorFill(textColor); + } cb.beginText(); cb.setFontAndSize(font, size); cb.setTextMatrix(textStartX, textStartY); @@ -353,45 +384,50 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor } return getBarcodeSize(); } - - /** Creates a java.awt.Image. This image only - * contains the bars without any text. + + /** + * Creates a java.awt.Image. This image only contains the bars without any text. + * * @param foreground the color of the bars * @param background the color of the background * @return the image - */ + */ public java.awt.Image createAwtImage(Color foreground, Color background) { int f = foreground.getRGB(); int g = background.getRGB(); Canvas canvas = new Canvas(); String bCode = code; - if (extended) + if (extended) { bCode = getCode39Ex(code); - if (generateChecksum) + } + if (generateChecksum) { bCode += getChecksum(bCode); + } int len = bCode.length() + 2; - int nn = (int)n; + int nn = (int) n; int fullWidth = len * (6 + 3 * nn) + (len - 1); byte[] bars = getBarsCode39(bCode); boolean print = true; int ptr = 0; - int height = (int)barHeight; + int height = (int) barHeight; int[] pix = new int[fullWidth * height]; for (byte bar : bars) { int w = (bar == 0 ? 1 : nn); int c = g; - if (print) + if (print) { c = f; + } print = !print; - for (int j = 0; j < w; ++j) + for (int j = 0; j < w; ++j) { pix[ptr++] = c; + } } for (int k = fullWidth; k < pix.length; k += fullWidth) { - System.arraycopy(pix, 0, pix, k, fullWidth); + System.arraycopy(pix, 0, pix, k, fullWidth); } Image img = canvas.createImage(new MemoryImageSource(fullWidth, height, pix, 0, fullWidth)); - + return img; - } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeCodabar.java b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeCodabar.java index c6ff7e1fa..d0e64135f 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeCodabar.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeCodabar.java @@ -48,34 +48,33 @@ */ package com.lowagie.text.pdf; +import com.lowagie.text.Element; +import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.Rectangle; +import com.lowagie.text.error_messages.MessageLocalization; import java.awt.Canvas; import java.awt.Color; import java.awt.Image; import java.awt.image.MemoryImageSource; -import com.lowagie.text.error_messages.MessageLocalization; - -import com.lowagie.text.Element; -import com.lowagie.text.Rectangle; -import com.lowagie.text.ExceptionConverter; - -/** Implements the code codabar. The default parameters are: +/** + * Implements the code codabar. The default parameters are: * 
      - *x = 0.8f;
- *n = 2;
- *font = BaseFont.createFont("Helvetica", "winansi", false);
- *size = 8;
- *baseline = size;
- *barHeight = size * 3;
- *textAlignment = Element.ALIGN_CENTER;
- *generateChecksum = false;
- *checksumText = false;
- *startStopText = false;
+ * x = 0.8f;
+ * n = 2;
+ * font = BaseFont.createFont("Helvetica", "winansi", false);
+ * size = 8;
+ * baseline = size;
+ * barHeight = size * 3;
+ * textAlignment = Element.ALIGN_CENTER;
+ * generateChecksum = false;
+ * checksumText = false;
+ * startStopText = false;
  *
      * * @author Paulo Soares (psoares@consiste.pt) */ -public class BarcodeCodabar extends Barcode{ +public class BarcodeCodabar extends Barcode { /** * The bars to generate the code. @@ -103,14 +102,17 @@ public class BarcodeCodabar extends Barcode{ {0, 0, 0, 1, 0, 1, 1}, // c {0, 0, 0, 1, 1, 1, 0} // d }; - - /** The index chars to BARS. - */ + + /** + * The index chars to BARS. + */ private static final String CHARS = "0123456789-$:/.+ABCD"; - - private static final int START_STOP_IDX = 16; - /** Creates a new BarcodeCodabar. - */ + + private static final int START_STOP_IDX = 16; + + /** + * Creates a new BarcodeCodabar. + */ public BarcodeCodabar() { try { x = 0.8f; @@ -124,69 +126,87 @@ public BarcodeCodabar() { checksumText = false; startStopText = false; codeType = CODABAR; - } - catch (Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } } - - /** Creates the bars. + + /** + * Creates the bars. + * * @param text the text to create the bars * @return the bars - */ + */ public static byte[] getBarsCodabar(String text) { text = text.toUpperCase(); int len = text.length(); - if (len < 2) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("codabar.must.have.at.least.a.start.and.stop.character")); - if (CHARS.indexOf(text.charAt(0)) < START_STOP_IDX || CHARS.indexOf(text.charAt(len - 1)) < START_STOP_IDX) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("codabar.must.have.one.of.abcd.as.start.stop.character")); + if (len < 2) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("codabar.must.have.at.least.a.start.and.stop.character")); + } + if (CHARS.indexOf(text.charAt(0)) < START_STOP_IDX || CHARS.indexOf(text.charAt(len - 1)) < START_STOP_IDX) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("codabar.must.have.one.of.abcd.as.start.stop.character")); + } byte[] bars = new byte[text.length() * 8 - 1]; for (int k = 0; k < len; ++k) { int idx = CHARS.indexOf(text.charAt(k)); - if (idx >= START_STOP_IDX && k > 0 && k < len - 1) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("in.codabar.start.stop.characters.are.only.allowed.at.the.extremes")); - if (idx < 0) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.character.1.is.illegal.in.codabar", text.charAt(k))); + if (idx >= START_STOP_IDX && k > 0 && k < len - 1) { + throw new IllegalArgumentException(MessageLocalization.getComposedMessage( + "in.codabar.start.stop.characters.are.only.allowed.at.the.extremes")); + } + if (idx < 0) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("the.character.1.is.illegal.in.codabar", + text.charAt(k))); + } System.arraycopy(BARS[idx], 0, bars, k * 8, 7); } return bars; } - + public static String calculateChecksum(String code) { - if (code.length() < 2) + if (code.length() < 2) { return code; + } String text = code.toUpperCase(); int sum = 0; int len = text.length(); - for (int k = 0; k < len; ++k) + for (int k = 0; k < len; ++k) { sum += CHARS.indexOf(text.charAt(k)); + } sum = (sum + 15) / 16 * 16 - sum; return code.substring(0, len - 1) + CHARS.charAt(sum) + code.substring(len - 1); } - - /** Gets the maximum area that the barcode and the text, if - * any, will occupy. The lower left corner is always (0, 0). + + /** + * Gets the maximum area that the barcode and the text, if any, will occupy. The lower left corner is always (0, + * 0). + * * @return the size the barcode occupies. - */ + */ public Rectangle getBarcodeSize() { float fontX = 0; float fontY = 0; String text = code; - if (generateChecksum && checksumText) + if (generateChecksum && checksumText) { text = calculateChecksum(code); - if (!startStopText) + } + if (!startStopText) { text = text.substring(1, text.length() - 1); + } if (font != null) { - if (baseline > 0) + if (baseline > 0) { fontY = baseline - font.getFontDescriptor(BaseFont.DESCENT, size); - else + } else { fontY = -baseline + size; + } fontX = font.getWidthPoint(altText != null ? altText : text, size); } text = code; - if (generateChecksum) + if (generateChecksum) { text = calculateChecksum(code); + } byte[] bars = getBarsCodabar(text); int wide = 0; for (byte bar : bars) { @@ -198,50 +218,53 @@ public Rectangle getBarcodeSize() { float fullHeight = barHeight + fontY; return new Rectangle(fullWidth, fullHeight); } - - /** Places the barcode in a PdfContentByte. The - * barcode is always placed at coordinates (0, 0). Use the + + /** + * Places the barcode in a PdfContentByte. The barcode is always placed at coordinates (0, 0). Use the * translation matrix to move it elsewhere. *

      The bars and text are written in the following colors:

      * - * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * *
      table of the colors of the bars and texttable of the colors of the bars and text

      barColor

      textColor

      Result

      barColor

      textColor

      Result

      null

      null

      bars and text painted with current fill color

      null

      null

      bars and text painted with current fill color

      barColor

      null

      bars and text painted with barColor

      barColor

      null

      bars and text painted with barColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      - * @param cb the PdfContentByte where the barcode will be placed - * @param barColor the color of the bars. It can be null + * + * @param cb the PdfContentByte where the barcode will be placed + * @param barColor the color of the bars. It can be null * @param textColor the color of the text. It can be null * @return the dimensions the barcode occupies - */ + */ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor) { String fullCode = code; - if (generateChecksum && checksumText) + if (generateChecksum && checksumText) { fullCode = calculateChecksum(code); - if (!startStopText) + } + if (!startStopText) { fullCode = fullCode.substring(1, fullCode.length() - 1); + } float fontX = 0; if (font != null) { fontX = font.getWidthPoint(fullCode = altText != null ? altText : fullCode, size); @@ -259,42 +282,47 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor case Element.ALIGN_LEFT: break; case Element.ALIGN_RIGHT: - if (fontX > fullWidth) + if (fontX > fullWidth) { barStartX = fontX - fullWidth; - else + } else { textStartX = fullWidth - fontX; + } break; default: - if (fontX > fullWidth) + if (fontX > fullWidth) { barStartX = (fontX - fullWidth) / 2; - else + } else { textStartX = (fullWidth - fontX) / 2; + } break; } float barStartY = 0; float textStartY = 0; if (font != null) { - if (baseline <= 0) + if (baseline <= 0) { textStartY = barHeight - baseline; - else { + } else { textStartY = -font.getFontDescriptor(BaseFont.DESCENT, size); barStartY = textStartY + baseline; } } boolean print = true; - if (barColor != null) + if (barColor != null) { cb.setColorFill(barColor); + } for (byte bar : bars) { float w = (bar == 0 ? x : x * n); - if (print) + if (print) { cb.rectangle(barStartX, barStartY, w - inkSpreading, barHeight); + } print = !print; barStartX += w; } cb.fill(); if (font != null) { - if (textColor != null) + if (textColor != null) { cb.setColorFill(textColor); + } cb.beginText(); cb.setFontAndSize(font, size); cb.setTextMatrix(textStartX, textStartY); @@ -304,47 +332,52 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor return getBarcodeSize(); } - /** Creates a java.awt.Image. This image only - * contains the bars without any text. + /** + * Creates a java.awt.Image. This image only contains the bars without any text. + * * @param foreground the color of the bars * @param background the color of the background * @return the image - */ + */ public java.awt.Image createAwtImage(Color foreground, Color background) { int f = foreground.getRGB(); int g = background.getRGB(); Canvas canvas = new Canvas(); String fullCode = code; - if (generateChecksum && checksumText) + if (generateChecksum && checksumText) { fullCode = calculateChecksum(code); - if (!startStopText) + } + if (!startStopText) { fullCode = fullCode.substring(1, fullCode.length() - 1); + } byte[] bars = getBarsCodabar(generateChecksum ? calculateChecksum(code) : code); int wide = 0; for (byte bar1 : bars) { wide += bar1; } int narrow = bars.length - wide; - int fullWidth = narrow + wide * (int)n; + int fullWidth = narrow + wide * (int) n; boolean print = true; int ptr = 0; - int height = (int)barHeight; + int height = (int) barHeight; int[] pix = new int[fullWidth * height]; for (byte bar : bars) { int w = (bar == 0 ? 1 : (int) n); int c = g; - if (print) + if (print) { c = f; + } print = !print; - for (int j = 0; j < w; ++j) + for (int j = 0; j < w; ++j) { pix[ptr++] = c; + } } for (int k = fullWidth; k < pix.length; k += fullWidth) { - System.arraycopy(pix, 0, pix, k, fullWidth); + System.arraycopy(pix, 0, pix, k, fullWidth); } Image img = canvas.createImage(new MemoryImageSource(fullWidth, height, pix, 0, fullWidth)); - + return img; } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeDatamatrix.java b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeDatamatrix.java index 43cde7ec0..9b44ed9f2 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeDatamatrix.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeDatamatrix.java @@ -54,9 +54,9 @@ import java.awt.Canvas; import java.awt.Color; import java.awt.image.MemoryImageSource; +import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import java.io.UnsupportedEncodingException; import java.util.Hashtable; import java.util.Map; @@ -64,6 +64,7 @@ * A DataMatrix 2D barcode generator. */ public class BarcodeDatamatrix { + /** * No error. */ @@ -124,36 +125,36 @@ public class BarcodeDatamatrix { public static final int DM_TEST = 64; private final static DmParams[] dmSizes = { - new DmParams(10, 10, 10, 10, 3, 3, 5), - new DmParams(12, 12, 12, 12, 5, 5, 7), - new DmParams(8, 18, 8, 18, 5, 5, 7), - new DmParams(14, 14, 14, 14, 8, 8, 10), - new DmParams(8, 32, 8, 16, 10, 10, 11), - new DmParams(16, 16, 16, 16, 12, 12, 12), - new DmParams(12, 26, 12, 26, 16, 16, 14), - new DmParams(18, 18, 18, 18, 18, 18, 14), - new DmParams(20, 20, 20, 20, 22, 22, 18), - new DmParams(12, 36, 12, 18, 22, 22, 18), - new DmParams(22, 22, 22, 22, 30, 30, 20), - new DmParams(16, 36, 16, 18, 32, 32, 24), - new DmParams(24, 24, 24, 24, 36, 36, 24), - new DmParams(26, 26, 26, 26, 44, 44, 28), - new DmParams(16, 48, 16, 24, 49, 49, 28), - new DmParams(32, 32, 16, 16, 62, 62, 36), - new DmParams(36, 36, 18, 18, 86, 86, 42), - new DmParams(40, 40, 20, 20, 114, 114, 48), - new DmParams(44, 44, 22, 22, 144, 144, 56), - new DmParams(48, 48, 24, 24, 174, 174, 68), - new DmParams(52, 52, 26, 26, 204, 102, 42), - new DmParams(64, 64, 16, 16, 280, 140, 56), - new DmParams(72, 72, 18, 18, 368, 92, 36), - new DmParams(80, 80, 20, 20, 456, 114, 48), - new DmParams(88, 88, 22, 22, 576, 144, 56), - new DmParams(96, 96, 24, 24, 696, 174, 68), - new DmParams(104, 104, 26, 26, 816, 136, 56), - new DmParams(120, 120, 20, 20, 1050, 175, 68), - new DmParams(132, 132, 22, 22, 1304, 163, 62), - new DmParams(144, 144, 24, 24, 1558, 156, 62)}; + new DmParams(10, 10, 10, 10, 3, 3, 5), + new DmParams(12, 12, 12, 12, 5, 5, 7), + new DmParams(8, 18, 8, 18, 5, 5, 7), + new DmParams(14, 14, 14, 14, 8, 8, 10), + new DmParams(8, 32, 8, 16, 10, 10, 11), + new DmParams(16, 16, 16, 16, 12, 12, 12), + new DmParams(12, 26, 12, 26, 16, 16, 14), + new DmParams(18, 18, 18, 18, 18, 18, 14), + new DmParams(20, 20, 20, 20, 22, 22, 18), + new DmParams(12, 36, 12, 18, 22, 22, 18), + new DmParams(22, 22, 22, 22, 30, 30, 20), + new DmParams(16, 36, 16, 18, 32, 32, 24), + new DmParams(24, 24, 24, 24, 36, 36, 24), + new DmParams(26, 26, 26, 26, 44, 44, 28), + new DmParams(16, 48, 16, 24, 49, 49, 28), + new DmParams(32, 32, 16, 16, 62, 62, 36), + new DmParams(36, 36, 18, 18, 86, 86, 42), + new DmParams(40, 40, 20, 20, 114, 114, 48), + new DmParams(44, 44, 22, 22, 144, 144, 56), + new DmParams(48, 48, 24, 24, 174, 174, 68), + new DmParams(52, 52, 26, 26, 204, 102, 42), + new DmParams(64, 64, 16, 16, 280, 140, 56), + new DmParams(72, 72, 18, 18, 368, 92, 36), + new DmParams(80, 80, 20, 20, 456, 114, 48), + new DmParams(88, 88, 22, 22, 576, 144, 56), + new DmParams(96, 96, 24, 24, 696, 174, 68), + new DmParams(104, 104, 26, 26, 816, 136, 56), + new DmParams(120, 120, 20, 20, 1050, 175, 68), + new DmParams(132, 132, 22, 22, 1304, 163, 62), + new DmParams(144, 144, 24, 24, 1558, 156, 62)}; private static final String x12 = "\r*> 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; private int extOut; @@ -163,119 +164,78 @@ public class BarcodeDatamatrix { private int width; private int ws; private int options; - + /** * Creates an instance of this class. */ public BarcodeDatamatrix() { } - private void setBit(int x, int y, int xByte) { - image[y * xByte + x / 8] |= (byte)(128 >> (x & 7)); - } - - private void draw(byte[] data, int dataSize, DmParams dm) { - int i, j, p, x, y, xs, ys, z; - int xByte = (dm.width + ws * 2 + 7) / 8; - Arrays.fill(image, (byte)0); - //alignment patterns - //dotted horizontal line - for (i = ws; i < dm.height + ws; i += dm.heightSection) { - for (j = ws; j < dm.width + ws; j += 2) { - setBit(j, i, xByte); - } - } - //solid horizontal line - for (i = dm.heightSection - 1 + ws; i < dm.height + ws; i += dm.heightSection) { - for (j = ws; j < dm.width + ws; ++j) { - setBit(j, i, xByte); - } - } - //solid vertical line - for (i = ws; i < dm.width + ws; i += dm.widthSection) { - for (j = ws; j < dm.height + ws; ++j) { - setBit(i, j, xByte); - } - } - //dotted vertical line - for (i = dm.widthSection - 1 + ws; i < dm.width + ws; i += dm.widthSection) { - for (j = 1 + ws; j < dm.height + ws; j += 2) { - setBit(i, j, xByte); - } - } - p = 0; - for (ys = 0; ys < dm.height; ys += dm.heightSection) { - for (y = 1; y < dm.heightSection - 1; ++y) { - for (xs = 0; xs < dm.width; xs += dm.widthSection) { - for (x = 1; x < dm.widthSection - 1; ++x) { - z = place[p++]; - if (z == 1 || (z > 1 && ((data[z/8-1] & 0xff) & (128 >> (z%8))) != 0)) - setBit(x + xs + ws, y + ys + ws, xByte); - } - } - } - } - } - private static void makePadding(byte[] data, int position, int count) { //already in ascii mode - if (count <= 0) + if (count <= 0) { return; - data[position++] = (byte)129; + } + data[position++] = (byte) 129; while (--count > 0) { int t = 129 + (((position + 1) * 149) % 253) + 1; - if (t > 254) + if (t > 254) { t -= 254; - data[position++] = (byte)t; + } + data[position++] = (byte) t; } } private static boolean isDigit(int c) { return c >= '0' && c <= '9'; } - - private static int asciiEncodation(byte[] text, int textOffset, int textLength, byte[] data, int dataOffset, int dataLength) { + + private static int asciiEncodation(byte[] text, int textOffset, int textLength, byte[] data, int dataOffset, + int dataLength) { int ptrIn, ptrOut, c; ptrIn = textOffset; ptrOut = dataOffset; textLength += textOffset; dataLength += dataOffset; while (ptrIn < textLength) { - if (ptrOut >= dataLength) + if (ptrOut >= dataLength) { return -1; + } c = text[ptrIn++] & 0xff; if (isDigit(c) && ptrIn < textLength && isDigit(text[ptrIn] & 0xff)) { - data[ptrOut++] = (byte)((c - '0') * 10 + (text[ptrIn++] & 0xff) - '0' + 130); - } - else if (c > 127) { - if (ptrOut + 1 >= dataLength) + data[ptrOut++] = (byte) ((c - '0') * 10 + (text[ptrIn++] & 0xff) - '0' + 130); + } else if (c > 127) { + if (ptrOut + 1 >= dataLength) { return -1; - data[ptrOut++] = (byte)235; - data[ptrOut++] = (byte)(c - 128 + 1); - } - else { - data[ptrOut++] = (byte)(c + 1); + } + data[ptrOut++] = (byte) 235; + data[ptrOut++] = (byte) (c - 128 + 1); + } else { + data[ptrOut++] = (byte) (c + 1); } } return ptrOut - dataOffset; } - private static int b256Encodation(byte[] text, int textOffset, int textLength, byte[] data, int dataOffset, int dataLength) { + private static int b256Encodation(byte[] text, int textOffset, int textLength, byte[] data, int dataOffset, + int dataLength) { int k, j, prn, tv, c; - if (textLength == 0) + if (textLength == 0) { return 0; - if (textLength < 250 && textLength + 2 > dataLength) + } + if (textLength < 250 && textLength + 2 > dataLength) { return -1; - if (textLength >= 250 && textLength + 3 > dataLength) + } + if (textLength >= 250 && textLength + 3 > dataLength) { return -1; - data[dataOffset] = (byte)231; + } + data[dataOffset] = (byte) 231; if (textLength < 250) { - data[dataOffset + 1] = (byte)textLength; + data[dataOffset + 1] = (byte) textLength; k = 2; - } - else { - data[dataOffset + 1] = (byte)(textLength / 250 + 249); - data[dataOffset + 2] = (byte)(textLength % 250); + } else { + data[dataOffset + 1] = (byte) (textLength / 250 + 249); + data[dataOffset + 2] = (byte) (textLength % 250); k = 3; } System.arraycopy(text, textOffset, data, k + dataOffset, textLength); @@ -284,87 +244,101 @@ private static int b256Encodation(byte[] text, int textOffset, int textLength, b c = data[j] & 0xff; prn = ((149 * (j + 1)) % 255) + 1; tv = c + prn; - if (tv > 255) + if (tv > 255) { tv -= 256; - data[j] = (byte)tv; + } + data[j] = (byte) tv; } return k - dataOffset; } - private static int X12Encodation(byte[] text, int textOffset, int textLength, byte[] data, int dataOffset, int dataLength) { + private static int X12Encodation(byte[] text, int textOffset, int textLength, byte[] data, int dataOffset, + int dataLength) { int ptrIn, ptrOut, count, k, n, ci; byte c; - if (textLength == 0) + if (textLength == 0) { return 0; + } ptrIn = 0; ptrOut = 0; byte[] x = new byte[textLength]; count = 0; for (; ptrIn < textLength; ++ptrIn) { - int i = x12.indexOf((char)text[ptrIn + textOffset]); + int i = x12.indexOf((char) text[ptrIn + textOffset]); if (i >= 0) { - x[ptrIn] = (byte)i; + x[ptrIn] = (byte) i; ++count; - } - else { + } else { x[ptrIn] = 100; - if (count >= 6) + if (count >= 6) { count -= (count / 3) * 3; - for (k = 0; k < count; ++k) + } + for (k = 0; k < count; ++k) { x[ptrIn - k - 1] = 100; + } count = 0; } } - if (count >= 6) + if (count >= 6) { count -= (count / 3) * 3; - for (k = 0; k < count; ++k) + } + for (k = 0; k < count; ++k) { x[ptrIn - k - 1] = 100; + } ptrIn = 0; c = 0; for (; ptrIn < textLength; ++ptrIn) { c = x[ptrIn]; - if (ptrOut >= dataLength) + if (ptrOut >= dataLength) { break; + } if (c < 40) { - if (ptrIn == 0 || x[ptrIn - 1] > 40) - data[dataOffset + ptrOut++] = (byte)238; - if (ptrOut + 2 > dataLength) + if (ptrIn == 0 || x[ptrIn - 1] > 40) { + data[dataOffset + ptrOut++] = (byte) 238; + } + if (ptrOut + 2 > dataLength) { break; - if(x.length -1 < ptrIn + 2) { + } + if (x.length - 1 < ptrIn + 2) { break; } n = 1600 * x[ptrIn] + 40 * x[ptrIn + 1] + x[ptrIn + 2] + 1; - data[dataOffset + ptrOut++] = (byte)(n / 256); - data[dataOffset + ptrOut++] = (byte)n; + data[dataOffset + ptrOut++] = (byte) (n / 256); + data[dataOffset + ptrOut++] = (byte) n; ptrIn += 2; - } - else { - if (ptrIn > 0 && x[ptrIn - 1] < 40) - data[dataOffset + ptrOut++] = (byte)254; + } else { + if (ptrIn > 0 && x[ptrIn - 1] < 40) { + data[dataOffset + ptrOut++] = (byte) 254; + } ci = text[ptrIn + textOffset] & 0xff; if (ci > 127) { - data[dataOffset + ptrOut++] = (byte)235; + data[dataOffset + ptrOut++] = (byte) 235; ci -= 128; } - if (ptrOut >= dataLength) + if (ptrOut >= dataLength) { break; - data[dataOffset + ptrOut++] = (byte)(ci + 1); + } + data[dataOffset + ptrOut++] = (byte) (ci + 1); } } c = 100; c = x[textLength - 1]; - if (ptrIn != textLength || (c < 40 && ptrOut >= dataLength)) + if (ptrIn != textLength || (c < 40 && ptrOut >= dataLength)) { return -1; - if (c < 40) - data[dataOffset + ptrOut++] = (byte)(254); + } + if (c < 40) { + data[dataOffset + ptrOut++] = (byte) (254); + } return ptrOut; } - private static int EdifactEncodation(byte[] text, int textOffset, int textLength, byte[] data, int dataOffset, int dataLength) { + private static int EdifactEncodation(byte[] text, int textOffset, int textLength, byte[] data, int dataOffset, + int dataLength) { int ptrIn, ptrOut, edi, pedi, c; - if (textLength == 0) + if (textLength == 0) { return 0; + } ptrIn = 0; ptrOut = 0; edi = 0; @@ -374,82 +348,94 @@ private static int EdifactEncodation(byte[] text, int textOffset, int textLength c = text[ptrIn + textOffset] & 0xff; if (((c & 0xe0) == 0x40 || (c & 0xe0) == 0x20) && c != '_') { if (ascii) { - if (ptrOut + 1 > dataLength) + if (ptrOut + 1 > dataLength) { break; - data[dataOffset + ptrOut++] = (byte)240; + } + data[dataOffset + ptrOut++] = (byte) 240; ascii = false; } c &= 0x3f; edi |= c << pedi; if (pedi == 0) { - if (ptrOut + 3 > dataLength) + if (ptrOut + 3 > dataLength) { break; - data[dataOffset + ptrOut++] = (byte)(edi >> 16); - data[dataOffset + ptrOut++] = (byte)(edi >> 8); - data[dataOffset + ptrOut++] = (byte)edi; + } + data[dataOffset + ptrOut++] = (byte) (edi >> 16); + data[dataOffset + ptrOut++] = (byte) (edi >> 8); + data[dataOffset + ptrOut++] = (byte) edi; edi = 0; pedi = 18; - } - else + } else { pedi -= 6; - } - else { + } + } else { if (!ascii) { edi |= ('_' & 0x3f) << pedi; - if (ptrOut + (3 - pedi / 8) > dataLength) + if (ptrOut + (3 - pedi / 8) > dataLength) { break; - data[dataOffset + ptrOut++] = (byte)(edi >> 16); - if (pedi <= 12) - data[dataOffset + ptrOut++] = (byte)(edi >> 8); - if (pedi <= 6) - data[dataOffset + ptrOut++] = (byte)edi; + } + data[dataOffset + ptrOut++] = (byte) (edi >> 16); + if (pedi <= 12) { + data[dataOffset + ptrOut++] = (byte) (edi >> 8); + } + if (pedi <= 6) { + data[dataOffset + ptrOut++] = (byte) edi; + } ascii = true; pedi = 18; edi = 0; } if (c > 127) { - if (ptrOut >= dataLength) + if (ptrOut >= dataLength) { break; - data[dataOffset + ptrOut++] = (byte)235; + } + data[dataOffset + ptrOut++] = (byte) 235; c -= 128; } - if (ptrOut >= dataLength) + if (ptrOut >= dataLength) { break; - data[dataOffset + ptrOut++] = (byte)(c + 1); + } + data[dataOffset + ptrOut++] = (byte) (c + 1); } } - if (ptrIn != textLength) + if (ptrIn != textLength) { return -1; + } if (!ascii) { edi |= ('_' & 0x3f) << pedi; - if (ptrOut + (3 - pedi / 8) > dataLength) + if (ptrOut + (3 - pedi / 8) > dataLength) { return -1; - data[dataOffset + ptrOut++] = (byte)(edi >> 16); - if (pedi <= 12) - data[dataOffset + ptrOut++] = (byte)(edi >> 8); - if (pedi <= 6) - data[dataOffset + ptrOut++] = (byte)edi; + } + data[dataOffset + ptrOut++] = (byte) (edi >> 16); + if (pedi <= 12) { + data[dataOffset + ptrOut++] = (byte) (edi >> 8); + } + if (pedi <= 6) { + data[dataOffset + ptrOut++] = (byte) edi; + } } return ptrOut; } - private static int C40OrTextEncodation(byte[] text, int textOffset, int textLength, byte[] data, int dataOffset, int dataLength, boolean c40) { + private static int C40OrTextEncodation(byte[] text, int textOffset, int textLength, byte[] data, int dataOffset, + int dataLength, boolean c40) { int ptrIn, ptrOut, encPtr, last0, last1, i, a, c; String basic, shift2, shift3; - if (textLength == 0) + if (textLength == 0) { return 0; + } ptrIn = 0; ptrOut = 0; - if (c40) - data[dataOffset + ptrOut++] = (byte)230; - else - data[dataOffset + ptrOut++] = (byte)239; + if (c40) { + data[dataOffset + ptrOut++] = (byte) 230; + } else { + data[dataOffset + ptrOut++] = (byte) 239; + } shift2 = "!\"#$%&'()*+,-./:;<=>?@[\\]^_"; if (c40) { basic = " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; shift3 = "`abcdefghijklmnopqrstuvwxyz{|}~\177"; - } - else { + } else { basic = " 0123456789abcdefghijklmnopqrstuvwxyz"; shift3 = "`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~\177"; } @@ -468,19 +454,16 @@ private static int C40OrTextEncodation(byte[] text, int textOffset, int textLeng enc[encPtr++] = 1; enc[encPtr++] = 30; } - int idx = basic.indexOf((char)c); + int idx = basic.indexOf((char) c); if (idx >= 0) { enc[encPtr++] = idx + 3; - } - else if (c < 32) { + } else if (c < 32) { enc[encPtr++] = 0; enc[encPtr++] = c; - } - else if ((idx = shift2.indexOf((char)c)) >= 0) { + } else if ((idx = shift2.indexOf((char) c)) >= 0) { enc[encPtr++] = 1; enc[encPtr++] = idx; - } - else if ((idx = shift3.indexOf((char)c)) >= 0) { + } else if ((idx = shift3.indexOf((char) c)) >= 0) { enc[encPtr++] = 2; enc[encPtr++] = idx; } @@ -495,42 +478,51 @@ else if ((idx = shift3.indexOf((char)c)) >= 0) { i = 0; for (; i < encPtr; i += 3) { a = 1600 * enc[i] + 40 * enc[i + 1] + enc[i + 2] + 1; - data[dataOffset + ptrOut++] = (byte)(a / 256); - data[dataOffset + ptrOut++] = (byte)a; + data[dataOffset + ptrOut++] = (byte) (a / 256); + data[dataOffset + ptrOut++] = (byte) a; } - data[ptrOut++] = (byte)254; + data[ptrOut++] = (byte) 254; i = asciiEncodation(text, ptrIn, textLength - ptrIn, data, ptrOut, dataLength - ptrOut); - if (i < 0) + if (i < 0) { return i; + } return ptrOut + i; } - private static int getEncodation(byte[] text, int textOffset, int textSize, byte[] data, int dataOffset, int dataSize, int options, boolean firstMatch) { + private static int getEncodation(byte[] text, int textOffset, int textSize, byte[] data, int dataOffset, + int dataSize, int options, boolean firstMatch) { int e, j, k; int[] e1 = new int[6]; - if (dataSize < 0) + if (dataSize < 0) { return -1; + } e = -1; options &= 7; if (options == 0) { e1[0] = asciiEncodation(text, textOffset, textSize, data, dataOffset, dataSize); - if (firstMatch && e1[0] >= 0) + if (firstMatch && e1[0] >= 0) { return e1[0]; + } e1[1] = C40OrTextEncodation(text, textOffset, textSize, data, dataOffset, dataSize, false); - if (firstMatch && e1[1] >= 0) + if (firstMatch && e1[1] >= 0) { return e1[1]; + } e1[2] = C40OrTextEncodation(text, textOffset, textSize, data, dataOffset, dataSize, true); - if (firstMatch && e1[2] >= 0) + if (firstMatch && e1[2] >= 0) { return e1[2]; + } e1[3] = b256Encodation(text, textOffset, textSize, data, dataOffset, dataSize); - if (firstMatch && e1[3] >= 0) + if (firstMatch && e1[3] >= 0) { return e1[3]; + } e1[4] = X12Encodation(text, textOffset, textSize, data, dataOffset, dataSize); - if (firstMatch && e1[4] >= 0) + if (firstMatch && e1[4] >= 0) { return e1[4]; + } e1[5] = EdifactEncodation(text, textOffset, textSize, data, dataOffset, dataSize); - if (firstMatch && e1[5] >= 0) + if (firstMatch && e1[5] >= 0) { return e1[5]; + } if (e1[0] < 0 && e1[1] < 0 && e1[2] < 0 && e1[3] < 0 && e1[4] < 0 && e1[5] < 0) { return -1; } @@ -542,36 +534,38 @@ private static int getEncodation(byte[] text, int textOffset, int textSize, byte j = k; } } - if (j == 0) + if (j == 0) { e = asciiEncodation(text, textOffset, textSize, data, dataOffset, dataSize); - else if (j == 1) + } else if (j == 1) { e = C40OrTextEncodation(text, textOffset, textSize, data, dataOffset, dataSize, false); - else if (j == 2) + } else if (j == 2) { e = C40OrTextEncodation(text, textOffset, textSize, data, dataOffset, dataSize, true); - else if (j == 3) + } else if (j == 3) { e = b256Encodation(text, textOffset, textSize, data, dataOffset, dataSize); - else if (j == 4) + } else if (j == 4) { e = X12Encodation(text, textOffset, textSize, data, dataOffset, dataSize); + } return e; } switch (options) { - case DM_ASCII: - return asciiEncodation(text, textOffset, textSize, data, dataOffset, dataSize); - case DM_C40: - return C40OrTextEncodation(text, textOffset, textSize, data, dataOffset, dataSize, true); - case DM_TEXT: - return C40OrTextEncodation(text, textOffset, textSize, data, dataOffset, dataSize, false); - case DM_B256: - return b256Encodation(text, textOffset, textSize, data, dataOffset, dataSize); - case DM_X21: - return X12Encodation(text, textOffset, textSize, data, dataOffset, dataSize); - case DM_EDIFACT: - return EdifactEncodation(text, textOffset, textSize, data, dataOffset, dataSize); - case DM_RAW: - if (textSize > dataSize) - return -1; - System.arraycopy(text, textOffset, data, dataOffset, textSize); - return textSize; + case DM_ASCII: + return asciiEncodation(text, textOffset, textSize, data, dataOffset, dataSize); + case DM_C40: + return C40OrTextEncodation(text, textOffset, textSize, data, dataOffset, dataSize, true); + case DM_TEXT: + return C40OrTextEncodation(text, textOffset, textSize, data, dataOffset, dataSize, false); + case DM_B256: + return b256Encodation(text, textOffset, textSize, data, dataOffset, dataSize); + case DM_X21: + return X12Encodation(text, textOffset, textSize, data, dataOffset, dataSize); + case DM_EDIFACT: + return EdifactEncodation(text, textOffset, textSize, data, dataOffset, dataSize); + case DM_RAW: + if (textSize > dataSize) { + return -1; + } + System.arraycopy(text, textOffset, data, dataOffset, textSize); + return textSize; } return -1; } @@ -580,92 +574,154 @@ private static int getNumber(byte[] text, int ptrIn, int n) { int v, j, c; v = 0; for (j = 0; j < n; ++j) { - c = text[ptrIn++] &0xff; - if (c < '0' || c > '9') + c = text[ptrIn++] & 0xff; + if (c < '0' || c > '9') { return -1; + } v = v * 10 + c - '0'; } return v; } + private void setBit(int x, int y, int xByte) { + image[y * xByte + x / 8] |= (byte) (128 >> (x & 7)); + } + + private void draw(byte[] data, int dataSize, DmParams dm) { + int i, j, p, x, y, xs, ys, z; + int xByte = (dm.width + ws * 2 + 7) / 8; + Arrays.fill(image, (byte) 0); + //alignment patterns + //dotted horizontal line + for (i = ws; i < dm.height + ws; i += dm.heightSection) { + for (j = ws; j < dm.width + ws; j += 2) { + setBit(j, i, xByte); + } + } + //solid horizontal line + for (i = dm.heightSection - 1 + ws; i < dm.height + ws; i += dm.heightSection) { + for (j = ws; j < dm.width + ws; ++j) { + setBit(j, i, xByte); + } + } + //solid vertical line + for (i = ws; i < dm.width + ws; i += dm.widthSection) { + for (j = ws; j < dm.height + ws; ++j) { + setBit(i, j, xByte); + } + } + //dotted vertical line + for (i = dm.widthSection - 1 + ws; i < dm.width + ws; i += dm.widthSection) { + for (j = 1 + ws; j < dm.height + ws; j += 2) { + setBit(i, j, xByte); + } + } + p = 0; + for (ys = 0; ys < dm.height; ys += dm.heightSection) { + for (y = 1; y < dm.heightSection - 1; ++y) { + for (xs = 0; xs < dm.width; xs += dm.widthSection) { + for (x = 1; x < dm.widthSection - 1; ++x) { + z = place[p++]; + if (z == 1 || (z > 1 && ((data[z / 8 - 1] & 0xff) & (128 >> (z % 8))) != 0)) { + setBit(x + xs + ws, y + ys + ws, xByte); + } + } + } + } + } + } + private int processExtensions(byte[] text, int textOffset, int textSize, byte[] data) { int order, ptrIn, ptrOut, eci, fn, ft, fi, c; - if ((options & DM_EXTENSION) == 0) + if ((options & DM_EXTENSION) == 0) { return 0; + } order = 0; ptrIn = 0; ptrOut = 0; while (ptrIn < textSize) { - if (order > 20) + if (order > 20) { return -1; - c = text[textOffset + ptrIn++] &0xff; + } + c = text[textOffset + ptrIn++] & 0xff; ++order; switch (c) { - case '.': - extOut = ptrIn; - return ptrOut; - case 'e': - if (ptrIn + 6 > textSize) - return -1; - eci = getNumber(text, textOffset + ptrIn, 6); - if (eci < 0) - return -1; - ptrIn += 6; - data[ptrOut++] = (byte)241; - if (eci < 127) - data[ptrOut++] = (byte)(eci + 1); - else if (eci < 16383) { - data[ptrOut++] = (byte)((eci - 127) / 254 + 128); - data[ptrOut++] = (byte)(((eci - 127) % 254) + 1); - } - else { - data[ptrOut++] = (byte)((eci - 16383) / 64516 + 192); - data[ptrOut++] = (byte)((((eci - 16383) / 254) % 254) + 1); - data[ptrOut++] = (byte)(((eci - 16383) % 254) + 1); - } - break; - case 's': - if (order != 1) - return -1; - if (ptrIn + 9 > textSize) - return -1; - fn = getNumber(text, textOffset + ptrIn, 2); - if (fn <= 0 || fn > 16) - return -1; - ptrIn += 2; - ft = getNumber(text, textOffset + ptrIn, 2); - if (ft <= 1 || ft > 16) - return -1; - ptrIn += 2; - fi = getNumber(text, textOffset + ptrIn, 5); - if (fi < 0) - return -1; - ptrIn += 5; - data[ptrOut++] = (byte)(233); - data[ptrOut++] = (byte)(((fn - 1) << 4) | (17 - ft)); - data[ptrOut++] = (byte)(fi / 254 + 1); - data[ptrOut++] = (byte)((fi % 254) + 1); - break; - case 'p': - if (order != 1) - return -1; - data[ptrOut++] = (byte)(234); - break; - case 'm': - if (order != 1) - return -1; - if (ptrIn + 1 > textSize) - return -1; - c = text[textOffset + ptrIn++] &0xff; - if (c != '5' && c != '5') - return -1; - data[ptrOut++] = (byte)(234); - data[ptrOut++] = (byte)(c == '5' ? 236 : 237); - break; - case 'f': - if (order != 1 && (order != 2 || (text[textOffset] != 's' && text[textOffset] != 'm'))) - return -1; - data[ptrOut++] = (byte)(232); + case '.': + extOut = ptrIn; + return ptrOut; + case 'e': + if (ptrIn + 6 > textSize) { + return -1; + } + eci = getNumber(text, textOffset + ptrIn, 6); + if (eci < 0) { + return -1; + } + ptrIn += 6; + data[ptrOut++] = (byte) 241; + if (eci < 127) { + data[ptrOut++] = (byte) (eci + 1); + } else if (eci < 16383) { + data[ptrOut++] = (byte) ((eci - 127) / 254 + 128); + data[ptrOut++] = (byte) (((eci - 127) % 254) + 1); + } else { + data[ptrOut++] = (byte) ((eci - 16383) / 64516 + 192); + data[ptrOut++] = (byte) ((((eci - 16383) / 254) % 254) + 1); + data[ptrOut++] = (byte) (((eci - 16383) % 254) + 1); + } + break; + case 's': + if (order != 1) { + return -1; + } + if (ptrIn + 9 > textSize) { + return -1; + } + fn = getNumber(text, textOffset + ptrIn, 2); + if (fn <= 0 || fn > 16) { + return -1; + } + ptrIn += 2; + ft = getNumber(text, textOffset + ptrIn, 2); + if (ft <= 1 || ft > 16) { + return -1; + } + ptrIn += 2; + fi = getNumber(text, textOffset + ptrIn, 5); + if (fi < 0) { + return -1; + } + ptrIn += 5; + data[ptrOut++] = (byte) (233); + data[ptrOut++] = (byte) (((fn - 1) << 4) | (17 - ft)); + data[ptrOut++] = (byte) (fi / 254 + 1); + data[ptrOut++] = (byte) ((fi % 254) + 1); + break; + case 'p': + if (order != 1) { + return -1; + } + data[ptrOut++] = (byte) (234); + break; + case 'm': + if (order != 1) { + return -1; + } + if (ptrIn + 1 > textSize) { + return -1; + } + c = text[textOffset + ptrIn++] & 0xff; + if (c != '5' && c != '5') { + return -1; + } + data[ptrOut++] = (byte) (234); + data[ptrOut++] = (byte) (c == '5' ? 236 : 237); + break; + case 'f': + if (order != 1 && (order != 2 || (text[textOffset] != 's' && text[textOffset] != 'm'))) { + return -1; + } + data[ptrOut++] = (byte) (232); } } return -1; @@ -673,6 +729,7 @@ else if (eci < 16383) { /** * Creates a barcode. The String is interpreted with the ISO-8859-1 encoding + * * @param text the text * @return the status of the generation. It can be one of this values: *

      @@ -686,12 +743,13 @@ public int generate(String text) throws UnsupportedEncodingException { byte[] t = text.getBytes(StandardCharsets.ISO_8859_1); return generate(t, 0, t.length); } - + /** * Creates a barcode. - * @param text the text + * + * @param text the text * @param textOffset the offset to the start of the text - * @param textSize the text size + * @param textSize the text size * @return the status of the generation. It can be one of this values: *

      * DM_NO_ERROR - no error.
      @@ -711,29 +769,32 @@ public int generate(byte[] text, int textOffset, int textSize) { e = -1; if (height == 0 || width == 0) { last = dmSizes[dmSizes.length - 1]; - e = getEncodation(text, textOffset + extOut, textSize - extOut, data, extCount, last.dataSize - extCount, options, false); + e = getEncodation(text, textOffset + extOut, textSize - extOut, data, extCount, last.dataSize - extCount, + options, false); if (e < 0) { return DM_ERROR_TEXT_TOO_BIG; } e += extCount; for (k = 0; k < dmSizes.length; ++k) { - if (dmSizes[k].dataSize >= e) + if (dmSizes[k].dataSize >= e) { break; + } } dm = dmSizes[k]; height = dm.height; width = dm.width; - } - else { + } else { for (k = 0; k < dmSizes.length; ++k) { - if (height == dmSizes[k].height && width == dmSizes[k].width) + if (height == dmSizes[k].height && width == dmSizes[k].width) { break; + } } if (k == dmSizes.length) { return DM_ERROR_INVALID_SQUARE; } dm = dmSizes[k]; - e = getEncodation(text, textOffset + extOut, textSize - extOut, data, extCount, dm.dataSize - extCount, options, true); + e = getEncodation(text, textOffset + extOut, textSize - extOut, data, extCount, dm.dataSize - extCount, + options, true); if (e < 0) { return DM_ERROR_TEXT_TOO_BIG; } @@ -744,35 +805,41 @@ public int generate(byte[] text, int textOffset, int textSize) { } image = new byte[(((dm.width + 2 * ws) + 7) / 8) * (dm.height + 2 * ws)]; makePadding(data, e, dm.dataSize - e); - place = Placement.doPlacement(dm.height - (dm.height / dm.heightSection * 2), dm.width - (dm.width / dm.widthSection * 2)); + place = Placement.doPlacement(dm.height - (dm.height / dm.heightSection * 2), + dm.width - (dm.width / dm.widthSection * 2)); full = dm.dataSize + ((dm.dataSize + 2) / dm.dataBlock) * dm.errorBlock; ReedSolomon.generateECC(data, dm.dataSize, dm.dataBlock, dm.errorBlock); draw(data, full, dm); return DM_NO_ERROR; } - /** Gets an Image with the barcode. A successful call to the method generate() - * before calling this method is required. + /** + * Gets an Image with the barcode. A successful call to the method generate() before + * calling this method is required. + * * @return the barcode Image * @throws BadElementException on error - */ + */ public Image createImage() throws BadElementException { - if (image == null) + if (image == null) { return null; + } byte[] g4 = CCITTG4Encoder.compress(image, width + 2 * ws, height + 2 * ws); return Image.getInstance(width + 2 * ws, height + 2 * ws, false, Image.CCITTG4, 0, g4, null); } - + /** - * Creates a java.awt.Image. A successful call to the method generate() - * before calling this method is required. + * Creates a java.awt.Image. A successful call to the method generate() before calling + * this method is required. + * * @param foreground the color of the bars * @param background the color of the background * @return the image - */ + */ public java.awt.Image createAwtImage(Color foreground, Color background) { - if (image == null) + if (image == null) { return null; + } int f = foreground.getRGB(); int g = background.getRGB(); Canvas canvas = new Canvas(); @@ -793,32 +860,12 @@ public java.awt.Image createAwtImage(Color foreground, Color background) { java.awt.Image img = canvas.createImage(new MemoryImageSource(w, h, pix, 0, w)); return img; } - - private static class DmParams { - DmParams(int height, int width, int heightSection, int widthSection, int dataSize, int dataBlock, int errorBlock) { - this.height = height; - this.width = width; - this.heightSection = heightSection; - this.widthSection = widthSection; - this.dataSize = dataSize; - this.dataBlock = dataBlock; - this.errorBlock = errorBlock; - } - - int height; - int width; - int heightSection; - int widthSection; - int dataSize; - int dataBlock; - int errorBlock; - } /** - * Gets the generated image. The image is represented as a stream of bytes, each byte representing - * 8 pixels, 0 for white and 1 for black, with the high-order bit of each byte first. Each row - * is aligned at byte boundaries. The dimensions of the image are defined by height and width - * plus 2 * ws. + * Gets the generated image. The image is represented as a stream of bytes, each byte representing 8 pixels, 0 for + * white and 1 for black, with the high-order bit of each byte first. Each row is aligned at byte boundaries. The + * dimensions of the image are defined by height and width plus 2 * ws. + * * @return the generated image */ public byte[] getImage() { @@ -826,8 +873,9 @@ public byte[] getImage() { } /** - * Gets the height of the barcode. Will contain the real height used after a successful call - * to generate(). This height doesn't include the whitespace border, if any. + * Gets the height of the barcode. Will contain the real height used after a successful call to + * generate(). This height doesn't include the whitespace border, if any. + * * @return the height of the barcode */ public int getHeight() { @@ -835,39 +883,14 @@ public int getHeight() { } /** - * Sets the height of the barcode. If the height is zero it will be calculated. This height doesn't include the whitespace border, if any. + * Sets the height of the barcode. If the height is zero it will be calculated. This height doesn't include the + * whitespace border, if any. *

      - * The allowed dimensions are (height, width):

      - * 10, 10
      - * 12, 12
      - * 8, 18
      - * 14, 14
      - * 8, 32
      - * 16, 16
      - * 12, 26
      - * 18, 18
      - * 20, 20
      - * 12, 36
      - * 22, 22
      - * 16, 36
      - * 24, 24
      - * 26, 26
      - * 16, 48
      - * 32, 32
      - * 36, 36
      - * 40, 40
      - * 44, 44
      - * 48, 48
      - * 52, 52
      - * 64, 64
      - * 72, 72
      - * 80, 80
      - * 88, 88
      - * 96, 96
      - * 104, 104
      - * 120, 120
      - * 132, 132
      - * 144, 144
      + * The allowed dimensions are (height, width):

      10, 10
      12, 12
      8, 18
      14, 14
      8, 32
      16, 16
      + * 12, 26
      18, 18
      20, 20
      12, 36
      22, 22
      16, 36
      24, 24
      26, 26
      16, 48
      32, 32
      36, + * 36
      40, 40
      44, 44
      48, 48
      52, 52
      64, 64
      72, 72
      80, 80
      88, 88
      96, 96
      104, + * 104
      120, 120
      132, 132
      144, 144
      + * * @param height the height of the barcode */ public void setHeight(int height) { @@ -875,8 +898,9 @@ public void setHeight(int height) { } /** - * Gets the width of the barcode. Will contain the real width used after a successful call - * to generate(). This width doesn't include the whitespace border, if any. + * Gets the width of the barcode. Will contain the real width used after a successful call to + * generate(). This width doesn't include the whitespace border, if any. + * * @return the width of the barcode */ public int getWidth() { @@ -884,39 +908,14 @@ public int getWidth() { } /** - * Sets the width of the barcode. If the width is zero it will be calculated. This width doesn't include the whitespace border, if any. + * Sets the width of the barcode. If the width is zero it will be calculated. This width doesn't include the + * whitespace border, if any. *

      - * The allowed dimensions are (height, width):

      - * 10, 10
      - * 12, 12
      - * 8, 18
      - * 14, 14
      - * 8, 32
      - * 16, 16
      - * 12, 26
      - * 18, 18
      - * 20, 20
      - * 12, 36
      - * 22, 22
      - * 16, 36
      - * 24, 24
      - * 26, 26
      - * 16, 48
      - * 32, 32
      - * 36, 36
      - * 40, 40
      - * 44, 44
      - * 48, 48
      - * 52, 52
      - * 64, 64
      - * 72, 72
      - * 80, 80
      - * 88, 88
      - * 96, 96
      - * 104, 104
      - * 120, 120
      - * 132, 132
      - * 144, 144
      + * The allowed dimensions are (height, width):

      10, 10
      12, 12
      8, 18
      14, 14
      8, 32
      16, 16
      + * 12, 26
      18, 18
      20, 20
      12, 36
      22, 22
      16, 36
      24, 24
      26, 26
      16, 48
      32, 32
      36, + * 36
      40, 40
      44, 44
      48, 48
      52, 52
      64, 64
      72, 72
      80, 80
      88, 88
      96, 96
      104, + * 104
      120, 120
      132, 132
      144, 144
      + * * @param width the width of the barcode */ public void setWidth(int width) { @@ -925,6 +924,7 @@ public void setWidth(int width) { /** * Gets the whitespace border around the barcode. + * * @return the whitespace border around the barcode */ public int getWs() { @@ -933,6 +933,7 @@ public int getWs() { /** * Sets the whitespace border around the barcode. + * * @param ws the whitespace border around the barcode */ public void setWs(int ws) { @@ -941,6 +942,7 @@ public void setWs(int ws) { /** * Gets the barcode options. + * * @return the barcode options */ public int getOptions() { @@ -948,8 +950,7 @@ public int getOptions() { } /** - * Sets the options for the barcode generation. The options can be:

      - * One of:
      + * Sets the options for the barcode generation. The options can be:

      One of:
      * DM_AUTO - the best encodation will be used
      * DM_ASCII - ASCII encodation
      * DM_C40 - C40 encodation
      @@ -957,41 +958,61 @@ public int getOptions() { * DM_B256 - binary encodation
      * DM_X21 - X21 encodation
      * DM_EDIFACT - EDIFACT encodation
      - * DM_RAW - no encodation. The bytes provided are already encoded and will be added directly to the barcode, using padding if needed. It assumes that the encodation state is left at ASCII after the last byte.
      + * DM_RAW - no encodation. The bytes provided are already encoded and will be added directly to the + * barcode, using padding if needed. It assumes that the encodation state is left at ASCII after the last byte.
      *

      * One of:
      * DM_EXTENSION - allows extensions to be embedded at the start of the text:

      - * exxxxxx - ECI number xxxxxx
      - * m5 - macro 5
      - * m6 - macro 6
      - * f - FNC1
      - * saabbccccc - Structured Append, aa symbol position (1-16), bb total number of symbols (2-16), ccccc file identification (0-64515)
      - * p - Reader programming
      - * . - extension terminator

      - * Example for a structured append, symbol 2 of 6, with FNC1 and ECI 000005. The actual text is "Hello".

      - * s020600075fe000005.Hello

      - * One of:
      + * exxxxxx - ECI number xxxxxx
      m5 - macro 5
      m6 - macro 6
      f - FNC1
      saabbccccc - Structured Append, aa + * symbol position (1-16), bb total number of symbols (2-16), ccccc file identification (0-64515)
      p - Reader + * programming
      . - extension terminator

      Example for a structured append, symbol 2 of 6, with FNC1 and ECI + * 000005. The actual text is "Hello".

      s020600075fe000005.Hello

      One of:
      * DM_TEST - doesn't generate the image but returns all the other information. + * * @param options the barcode options */ public void setOptions(int options) { this.options = options; } - + + private static class DmParams { + + int height; + int width; + int heightSection; + int widthSection; + int dataSize; + int dataBlock; + int errorBlock; + + DmParams(int height, int width, int heightSection, int widthSection, int dataSize, int dataBlock, + int errorBlock) { + this.height = height; + this.width = width; + this.heightSection = heightSection; + this.widthSection = widthSection; + this.dataSize = dataSize; + this.dataBlock = dataBlock; + this.errorBlock = errorBlock; + } + } + static class Placement { + + private static final Map cache = new Hashtable<>(); private int nrow; private int ncol; private short[] array; - private static final Map cache = new Hashtable<>(); private Placement() { } - + static short[] doPlacement(int nrow, int ncol) { Integer key = nrow * 1000 + ncol; short[] pc = cache.get(key); - if (pc != null) + if (pc != null) { return pc; + } Placement p = new Placement(); p.nrow = nrow; p.ncol = ncol; @@ -1003,99 +1024,127 @@ static short[] doPlacement(int nrow, int ncol) { /* "module" places "chr+bit" with appropriate wrapping within array[] */ private void module(int row, int col, int chr, int bit) { - if (row < 0) { row += nrow; col += 4 - ((nrow+4)%8); } - if (col < 0) { col += ncol; row += 4 - ((ncol+4)%8); } - array[row*ncol+col] = (short)(8*chr + bit); + if (row < 0) { + row += nrow; + col += 4 - ((nrow + 4) % 8); + } + if (col < 0) { + col += ncol; + row += 4 - ((ncol + 4) % 8); + } + array[row * ncol + col] = (short) (8 * chr + bit); } + /* "utah" places the 8 bits of a utah-shaped symbol character in ECC200 */ - private void utah(int row, int col, int chr) { - module(row-2,col-2,chr,0); - module(row-2,col-1,chr,1); - module(row-1,col-2,chr,2); - module(row-1,col-1,chr,3); - module(row-1,col,chr,4); - module(row,col-2,chr,5); - module(row,col-1,chr,6); - module(row,col,chr,7); + private void utah(int row, int col, int chr) { + module(row - 2, col - 2, chr, 0); + module(row - 2, col - 1, chr, 1); + module(row - 1, col - 2, chr, 2); + module(row - 1, col - 1, chr, 3); + module(row - 1, col, chr, 4); + module(row, col - 2, chr, 5); + module(row, col - 1, chr, 6); + module(row, col, chr, 7); } + /* "cornerN" places 8 bits of the four special corner cases in ECC200 */ - private void corner1(int chr) { - module(nrow-1,0,chr,0); - module(nrow-1,1,chr,1); - module(nrow-1,2,chr,2); - module(0,ncol-2,chr,3); - module(0,ncol-1,chr,4); - module(1,ncol-1,chr,5); - module(2,ncol-1,chr,6); - module(3,ncol-1,chr,7); + private void corner1(int chr) { + module(nrow - 1, 0, chr, 0); + module(nrow - 1, 1, chr, 1); + module(nrow - 1, 2, chr, 2); + module(0, ncol - 2, chr, 3); + module(0, ncol - 1, chr, 4); + module(1, ncol - 1, chr, 5); + module(2, ncol - 1, chr, 6); + module(3, ncol - 1, chr, 7); } - private void corner2(int chr){ - module(nrow-3,0,chr,0); - module(nrow-2,0,chr,1); - module(nrow-1,0,chr,2); - module(0,ncol-4,chr,3); - module(0,ncol-3,chr,4); - module(0,ncol-2,chr,5); - module(0,ncol-1,chr,6); - module(1,ncol-1,chr,7); + + private void corner2(int chr) { + module(nrow - 3, 0, chr, 0); + module(nrow - 2, 0, chr, 1); + module(nrow - 1, 0, chr, 2); + module(0, ncol - 4, chr, 3); + module(0, ncol - 3, chr, 4); + module(0, ncol - 2, chr, 5); + module(0, ncol - 1, chr, 6); + module(1, ncol - 1, chr, 7); } - private void corner3(int chr){ - module(nrow-3,0,chr,0); - module(nrow-2,0,chr,1); - module(nrow-1,0,chr,2); - module(0,ncol-2,chr,3); - module(0,ncol-1,chr,4); - module(1,ncol-1,chr,5); - module(2,ncol-1,chr,6); - module(3,ncol-1,chr,7); + + private void corner3(int chr) { + module(nrow - 3, 0, chr, 0); + module(nrow - 2, 0, chr, 1); + module(nrow - 1, 0, chr, 2); + module(0, ncol - 2, chr, 3); + module(0, ncol - 1, chr, 4); + module(1, ncol - 1, chr, 5); + module(2, ncol - 1, chr, 6); + module(3, ncol - 1, chr, 7); } - private void corner4(int chr){ - module(nrow-1,0,chr,0); - module(nrow-1,ncol-1,chr,1); - module(0,ncol-3,chr,2); - module(0,ncol-2,chr,3); - module(0,ncol-1,chr,4); - module(1,ncol-3,chr,5); - module(1,ncol-2,chr,6); - module(1,ncol-1,chr,7); + + private void corner4(int chr) { + module(nrow - 1, 0, chr, 0); + module(nrow - 1, ncol - 1, chr, 1); + module(0, ncol - 3, chr, 2); + module(0, ncol - 2, chr, 3); + module(0, ncol - 1, chr, 4); + module(1, ncol - 3, chr, 5); + module(1, ncol - 2, chr, 6); + module(1, ncol - 1, chr, 7); } + /* "ECC200" fills an nrow x ncol array with appropriate values for ECC200 */ - private void ecc200(){ + private void ecc200() { int row, col, chr; /* First, fill the array[] with invalid entries */ - Arrays.fill(array, (short)0); + Arrays.fill(array, (short) 0); /* Starting in the correct location for character #1, bit 8,... */ - chr = 1; row = 4; col = 0; + chr = 1; + row = 4; + col = 0; do { /* repeatedly first check for one of the special corner cases, then... */ - if ((row == nrow) && (col == 0)) corner1(chr++); - if ((row == nrow-2) && (col == 0) && (ncol%4 != 0)) corner2(chr++); - if ((row == nrow-2) && (col == 0) && (ncol%8 == 4)) corner3(chr++); - if ((row == nrow+4) && (col == 2) && (ncol%8 == 0)) corner4(chr++); + if ((row == nrow) && (col == 0)) { + corner1(chr++); + } + if ((row == nrow - 2) && (col == 0) && (ncol % 4 != 0)) { + corner2(chr++); + } + if ((row == nrow - 2) && (col == 0) && (ncol % 8 == 4)) { + corner3(chr++); + } + if ((row == nrow + 4) && (col == 2) && (ncol % 8 == 0)) { + corner4(chr++); + } /* sweep upward diagonally, inserting successive characters,... */ do { - if ((row < nrow) && (col >= 0) && array[row*ncol+col] == 0) - utah(row,col,chr++); - row -= 2; col += 2; + if ((row < nrow) && (col >= 0) && array[row * ncol + col] == 0) { + utah(row, col, chr++); + } + row -= 2; + col += 2; } while ((row >= 0) && (col < ncol)); - row += 1; col += 3; + row += 1; + col += 3; /* & then sweep downward diagonally, inserting successive characters,... */ do { - if ((row >= 0) && (col < ncol) && array[row*ncol+col] == 0) - utah(row,col,chr++); - row += 2; col -= 2; + if ((row >= 0) && (col < ncol) && array[row * ncol + col] == 0) { + utah(row, col, chr++); + } + row += 2; + col -= 2; } while ((row < nrow) && (col >= 0)); - row += 3; col += 1; + row += 3; + col += 1; /* ... until the entire array is scanned */ } while ((row < nrow) || (col < ncol)); /* Lastly, if the lower righthand corner is untouched, fill in fixed pattern */ - if (array[nrow*ncol-1] == 0) { - array[nrow*ncol-1] = array[nrow*ncol-ncol-2] = 1; + if (array[nrow * ncol - 1] == 0) { + array[nrow * ncol - 1] = array[nrow * ncol - ncol - 2] = 1; } } } - + static class ReedSolomon { private static final int[] log = { @@ -1222,38 +1271,38 @@ static class ReedSolomon { private static int[] getPoly(int nc) { switch (nc) { - case 5: - return poly5; - case 7: - return poly7; - case 10: - return poly10; - case 11: - return poly11; - case 12: - return poly12; - case 14: - return poly14; - case 18: - return poly18; - case 20: - return poly20; - case 24: - return poly24; - case 28: - return poly28; - case 36: - return poly36; - case 42: - return poly42; - case 48: - return poly48; - case 56: - return poly56; - case 62: - return poly62; - case 68: - return poly68; + case 5: + return poly5; + case 7: + return poly7; + case 10: + return poly10; + case 11: + return poly11; + case 12: + return poly12; + case 14: + return poly14; + case 18: + return poly18; + case 20: + return poly20; + case 24: + return poly24; + case 28: + return poly28; + case 36: + return poly36; + case 42: + return poly42; + case 48: + return poly48; + case 56: + return poly56; + case 62: + return poly62; + case 68: + return poly68; } return null; } @@ -1261,11 +1310,14 @@ private static int[] getPoly(int nc) { private static void reedSolomonBlock(byte[] wd, int nd, byte[] ncout, int nc, int[] c) { int i, j, k; - for (i=0; i<=nc; i++) ncout[i] = 0; - for (i=0; i - *x = 0.8f; - *font = BaseFont.createFont("Helvetica", "winansi", false); - *size = 8; - *baseline = size; - *barHeight = size * 3; - *guardBars = true; - *codeType = EAN13; - *code = ""; + * x = 0.8f; + * font = BaseFont.createFont("Helvetica", "winansi", false); + * size = 8; + * baseline = size; + * barHeight = size * 3; + * guardBars = true; + * codeType = EAN13; + * code = ""; * * * @author Paulo Soares (psoares@consiste.pt) */ -public class BarcodeEAN extends Barcode{ +public class BarcodeEAN extends Barcode { /** * The bar positions that are guard bars. @@ -97,7 +95,8 @@ public class BarcodeEAN extends Barcode{ /** * The x coordinates to place the text. */ - private static final float[] TEXTPOS_EAN13 = {6.5f, 13.5f, 20.5f, 27.5f, 34.5f, 41.5f, 53.5f, 60.5f, 67.5f, 74.5f, 81.5f, 88.5f}; + private static final float[] TEXTPOS_EAN13 = {6.5f, 13.5f, 20.5f, 27.5f, 34.5f, 41.5f, 53.5f, 60.5f, 67.5f, 74.5f, + 81.5f, 88.5f}; /** * The x coordinates to place the text. */ @@ -118,20 +117,34 @@ public class BarcodeEAN extends Barcode{ {1, 2, 1, 3}, // 8 {3, 1, 1, 2} // 9 }; - - /** The total number of bars for EAN13.*/ + + /** + * The total number of bars for EAN13. + */ private static final int TOTALBARS_EAN13 = 11 + 12 * 4; - /** The total number of bars for EAN8.*/ + /** + * The total number of bars for EAN8. + */ private static final int TOTALBARS_EAN8 = 11 + 8 * 4; - /** The total number of bars for UPCE.*/ + /** + * The total number of bars for UPCE. + */ private static final int TOTALBARS_UPCE = 9 + 6 * 4; - /** The total number of bars for supplemental 2.*/ + /** + * The total number of bars for supplemental 2. + */ private static final int TOTALBARS_SUPP2 = 13; - /** The total number of bars for supplemental 5.*/ + /** + * The total number of bars for supplemental 5. + */ private static final int TOTALBARS_SUPP5 = 31; - /** Marker for odd parity.*/ + /** + * Marker for odd parity. + */ private static final int ODD = 0; - /** Marker for even parity.*/ + /** + * Marker for even parity. + */ private static final int EVEN = 1; /** @@ -195,8 +208,10 @@ public class BarcodeEAN extends Barcode{ {EVEN, ODD, EVEN, ODD, ODD, EVEN}, // 8 {EVEN, ODD, ODD, EVEN, ODD, EVEN} // 9 }; - - /** Creates new BarcodeEAN */ + + /** + * Creates new BarcodeEAN + */ public BarcodeEAN() { try { x = 0.8f; @@ -207,16 +222,17 @@ public BarcodeEAN() { guardBars = true; codeType = EAN13; code = ""; - } - catch (Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } } - - /** Calculates the EAN parity character. + + /** + * Calculates the EAN parity character. + * * @param code the code * @return the parity character - */ + */ public static int calculateEANParity(String code) { int mul = 3; int total = 0; @@ -227,44 +243,50 @@ public static int calculateEANParity(String code) { } return (10 - (total % 10)) % 10; } - - /** Converts an UPCA code into an UPCE code. If the code can not - * be converted a null is returned. + + /** + * Converts an UPCA code into an UPCE code. If the code can not be converted a null is returned. + * * @param text the code to convert. It must have 12 numeric characters - * @return the 8 converted digits or null if the - * code could not be converted - */ + * @return the 8 converted digits or null if the code could not be converted + */ static public String convertUPCAtoUPCE(String text) { - if (text.length() != 12 || !(text.startsWith("0") || text.startsWith("1"))) + if (text.length() != 12 || !(text.startsWith("0") || text.startsWith("1"))) { return null; - if (text.substring(3, 6).equals("000") || text.substring(3, 6).equals("100") - || text.substring(3, 6).equals("200")) { - if (text.substring(6, 8).equals("00")) - return text.substring(0, 1) + text.substring(1, 3) + text.substring(8, 11) + text.substring(3, 4) + text.substring(11); } - else if (text.substring(4, 6).equals("00")) { - if (text.substring(6, 9).equals("000")) + if (text.substring(3, 6).equals("000") || text.substring(3, 6).equals("100") + || text.substring(3, 6).equals("200")) { + if (text.substring(6, 8).equals("00")) { + return text.substring(0, 1) + text.substring(1, 3) + text.substring(8, 11) + text.substring(3, 4) + + text.substring(11); + } + } else if (text.substring(4, 6).equals("00")) { + if (text.substring(6, 9).equals("000")) { return text.substring(0, 1) + text.substring(1, 4) + text.substring(9, 11) + "3" + text.substring(11); - } - else if (text.substring(5, 6).equals("0")) { - if (text.substring(6, 10).equals("0000")) + } + } else if (text.substring(5, 6).equals("0")) { + if (text.substring(6, 10).equals("0000")) { return text.substring(0, 1) + text.substring(1, 5) + text.substring(10, 11) + "4" + text.substring(11); - } - else if (text.charAt(10) >= '5') { - if (text.substring(6, 10).equals("0000")) + } + } else if (text.charAt(10) >= '5') { + if (text.substring(6, 10).equals("0000")) { return text.substring(0, 1) + text.substring(1, 6) + text.substring(10, 11) + text.substring(11); + } } return null; } - - /** Creates the bars for the barcode EAN13 and UPCA. + + /** + * Creates the bars for the barcode EAN13 and UPCA. + * * @param _code the text with 13 digits * @return the barcode - */ + */ public static byte[] getBarsEAN13(String _code) { int[] code = new int[_code.length()]; - for (int k = 0; k < code.length; ++k) + for (int k = 0; k < code.length; ++k) { code[k] = _code.charAt(k) - '0'; + } byte[] bars = new byte[TOTALBARS_EAN13]; int pb = 0; bars[pb++] = 1; @@ -279,8 +301,7 @@ public static byte[] getBarsEAN13(String _code) { bars[pb++] = stripes[1]; bars[pb++] = stripes[2]; bars[pb++] = stripes[3]; - } - else { + } else { bars[pb++] = stripes[3]; bars[pb++] = stripes[2]; bars[pb++] = stripes[1]; @@ -305,15 +326,18 @@ public static byte[] getBarsEAN13(String _code) { bars[pb++] = 1; return bars; } - - /** Creates the bars for the barcode EAN8. + + /** + * Creates the bars for the barcode EAN8. + * * @param _code the text with 8 digits * @return the barcode - */ + */ public static byte[] getBarsEAN8(String _code) { int[] code = new int[_code.length()]; - for (int k = 0; k < code.length; ++k) + for (int k = 0; k < code.length; ++k) { code[k] = _code.charAt(k) - '0'; + } byte[] bars = new byte[TOTALBARS_EAN8]; int pb = 0; bars[pb++] = 1; @@ -345,15 +369,18 @@ public static byte[] getBarsEAN8(String _code) { bars[pb++] = 1; return bars; } - - /** Creates the bars for the barcode UPCE. + + /** + * Creates the bars for the barcode UPCE. + * * @param _code the text with 8 digits * @return the barcode - */ + */ public static byte[] getBarsUPCE(String _code) { int[] code = new int[_code.length()]; - for (int k = 0; k < code.length; ++k) + for (int k = 0; k < code.length; ++k) { code[k] = _code.charAt(k) - '0'; + } byte[] bars = new byte[TOTALBARS_UPCE]; boolean flip = (code[0] != 0); int pb = 0; @@ -369,8 +396,7 @@ public static byte[] getBarsUPCE(String _code) { bars[pb++] = stripes[1]; bars[pb++] = stripes[2]; bars[pb++] = stripes[3]; - } - else { + } else { bars[pb++] = stripes[3]; bars[pb++] = stripes[2]; bars[pb++] = stripes[1]; @@ -386,14 +412,17 @@ public static byte[] getBarsUPCE(String _code) { return bars; } - /** Creates the bars for the barcode supplemental 2. + /** + * Creates the bars for the barcode supplemental 2. + * * @param _code the text with 2 digits * @return the barcode - */ + */ public static byte[] getBarsSupplemental2(String _code) { int[] code = new int[2]; - for (int k = 0; k < code.length; ++k) + for (int k = 0; k < code.length; ++k) { code[k] = _code.charAt(k) - '0'; + } byte[] bars = new byte[TOTALBARS_SUPP2]; int pb = 0; int parity = (code[0] * 10 + code[1]) % 4; @@ -413,8 +442,7 @@ public static byte[] getBarsSupplemental2(String _code) { bars[pb++] = stripes[1]; bars[pb++] = stripes[2]; bars[pb++] = stripes[3]; - } - else { + } else { bars[pb++] = stripes[3]; bars[pb++] = stripes[2]; bars[pb++] = stripes[1]; @@ -422,16 +450,19 @@ public static byte[] getBarsSupplemental2(String _code) { } } return bars; - } + } - /** Creates the bars for the barcode supplemental 5. + /** + * Creates the bars for the barcode supplemental 5. + * * @param _code the text with 5 digits * @return the barcode - */ + */ public static byte[] getBarsSupplemental5(String _code) { int[] code = new int[5]; - for (int k = 0; k < code.length; ++k) + for (int k = 0; k < code.length; ++k) { code[k] = _code.charAt(k) - '0'; + } byte[] bars = new byte[TOTALBARS_SUPP5]; int pb = 0; int parity = (((code[0] + code[2] + code[4]) * 3) + ((code[1] + code[3]) * 9)) % 10; @@ -451,8 +482,7 @@ public static byte[] getBarsSupplemental5(String _code) { bars[pb++] = stripes[1]; bars[pb++] = stripes[2]; bars[pb++] = stripes[3]; - } - else { + } else { bars[pb++] = stripes[3]; bars[pb++] = stripes[2]; bars[pb++] = stripes[1]; @@ -460,20 +490,23 @@ public static byte[] getBarsSupplemental5(String _code) { } } return bars; - } - - /** Gets the maximum area that the barcode and the text, if - * any, will occupy. The lower left corner is always (0, 0). + } + + /** + * Gets the maximum area that the barcode and the text, if any, will occupy. The lower left corner is always (0, + * 0). + * * @return the size the barcode occupies. - */ + */ public Rectangle getBarcodeSize() { float width = 0; float height = barHeight; if (font != null) { - if (baseline <= 0) + if (baseline <= 0) { height += -baseline + size; - else + } else { height += baseline - font.getFontDescriptor(BaseFont.DESCENT, size); + } } switch (codeType) { case EAN13: @@ -508,53 +541,54 @@ public Rectangle getBarcodeSize() { } return new Rectangle(width, height); } - - /** Places the barcode in a PdfContentByte. The - * barcode is always placed at coordinates (0, 0). Use the + + /** + * Places the barcode in a PdfContentByte. The barcode is always placed at coordinates (0, 0). Use the * translation matrix to move it elsewhere. *

      The bars and text are written in the following colors:

      * - * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * *
      table of the colors of the bars and texttable of the colors of the bars and text

      barColor

      textColor

      Result

      barColor

      textColor

      Result

      null

      null

      bars and text painted with current fill color

      null

      null

      bars and text painted with current fill color

      barColor

      null

      bars and text painted with barColor

      barColor

      null

      bars and text painted with barColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      - * @param cb the PdfContentByte where the barcode will be placed - * @param barColor the color of the bars. It can be null + * + * @param cb the PdfContentByte where the barcode will be placed + * @param barColor the color of the bars. It can be null * @param textColor the color of the text. It can be null * @return the dimensions the barcode occupies - */ + */ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor) { Rectangle rect = getBarcodeSize(); float barStartX = 0; float barStartY = 0; float textStartY = 0; if (font != null) { - if (baseline <= 0) + if (baseline <= 0) { textStartY = barHeight - baseline; - else { + } else { textStartY = -font.getFontDescriptor(BaseFont.DESCENT, size); barStartY = textStartY + baseline; } @@ -563,8 +597,9 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor case EAN13: case UPCA: case UPCE: - if (font != null) + if (font != null) { barStartX += font.getWidthPoint(code.charAt(0), size); + } break; } byte[] bars = null; @@ -606,10 +641,11 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor for (int k = 0; k < bars.length; ++k) { float w = bars[k] * x; if (print) { - if (Arrays.binarySearch(guard, k) >= 0) + if (Arrays.binarySearch(guard, k) >= 0) { cb.rectangle(barStartX, barStartY - gd, w - inkSpreading, barHeight + gd); - else + } else { cb.rectangle(barStartX, barStartY, w - inkSpreading, barHeight); + } } print = !print; barStartX += w; @@ -617,8 +653,9 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor } cb.fill(); if (font != null) { - if (textColor != null) + if (textColor != null) { cb.setColorFill(textColor); + } cb.beginText(); cb.setFontAndSize(font, size); switch (codeType) { @@ -683,13 +720,14 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor } return rect; } - - /** Creates a java.awt.Image. This image only - * contains the bars without any text. + + /** + * Creates a java.awt.Image. This image only contains the bars without any text. + * * @param foreground the color of the bars * @param background the color of the background * @return the image - */ + */ public java.awt.Image createAwtImage(Color foreground, Color background) { int f = foreground.getRGB(); int g = background.getRGB(); @@ -728,21 +766,23 @@ public java.awt.Image createAwtImage(Color foreground, Color background) { boolean print = true; int ptr = 0; - int height = (int)barHeight; + int height = (int) barHeight; int[] pix = new int[width * height]; for (int w : bars) { int c = g; - if (print) + if (print) { c = f; + } print = !print; - for (int j = 0; j < w; ++j) + for (int j = 0; j < w; ++j) { pix[ptr++] = c; + } } for (int k = width; k < pix.length; k += width) { - System.arraycopy(pix, 0, pix, k, width); + System.arraycopy(pix, 0, pix, k, width); } Image img = canvas.createImage(new MemoryImageSource(width, height, pix, 0, width)); - + return img; - } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeEANSUPP.java b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeEANSUPP.java index 13e4bed69..a1ab19eae 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeEANSUPP.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeEANSUPP.java @@ -45,34 +45,36 @@ * https://github.com/LibrePDF/OpenPDF */ package com.lowagie.text.pdf; -import java.awt.Color; -import com.lowagie.text.error_messages.MessageLocalization; import com.lowagie.text.Rectangle; +import com.lowagie.text.error_messages.MessageLocalization; +import java.awt.Color; -/** This class takes 2 barcodes, an EAN/UPC and a supplemental - * and creates a single barcode with both combined in the - * expected layout. The UPC/EAN should have a positive text - * baseline and the supplemental a negative one (in the supplemental - * the text is on the top of the barcode.

      - * The default parameters are: +/** + * This class takes 2 barcodes, an EAN/UPC and a supplemental and creates a single barcode with both combined in the + * expected layout. The UPC/EAN should have a positive text baseline and the supplemental a negative one (in the + * supplemental the text is on the top of the barcode.

      The default parameters are: * 

      - *n = 8; // horizontal distance between the two barcodes
+ * n = 8; // horizontal distance between the two barcodes
  *
      * * @author Paulo Soares (psoares@consiste.pt) */ -public class BarcodeEANSUPP extends Barcode{ - - /** The barcode with the EAN/UPC. - */ +public class BarcodeEANSUPP extends Barcode { + + /** + * The barcode with the EAN/UPC. + */ protected Barcode ean; - /** The barcode with the supplemental. - */ + /** + * The barcode with the supplemental. + */ protected Barcode supp; - - /** Creates new combined barcode. - * @param ean the EAN/UPC barcode + + /** + * Creates new combined barcode. + * + * @param ean the EAN/UPC barcode * @param supp the supplemental barcode */ public BarcodeEANSUPP(Barcode ean, Barcode supp) { @@ -80,9 +82,11 @@ public BarcodeEANSUPP(Barcode ean, Barcode supp) { this.ean = ean; this.supp = supp; } - - /** Gets the maximum area that the barcode and the text, if - * any, will occupy. The lower left corner is always (0, 0). + + /** + * Gets the maximum area that the barcode and the text, if any, will occupy. The lower left corner is always (0, + * 0). + * * @return the size the barcode occupies. */ public Rectangle getBarcodeSize() { @@ -90,49 +94,52 @@ public Rectangle getBarcodeSize() { rect.setRight(rect.getWidth() + supp.getBarcodeSize().getWidth() + n); return rect; } - - /** Places the barcode in a PdfContentByte. The - * barcode is always placed at coordinates (0, 0). Use the + + /** + * Places the barcode in a PdfContentByte. The barcode is always placed at coordinates (0, 0). Use the * translation matrix to move it elsewhere. *

      The bars and text are written in the following colors:

      * - * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * *
      table of the colors of the bars and texttable of the colors of the bars and text

      barColor

      textColor

      Result

      barColor

      textColor

      Result

      null

      null

      bars and text painted with current fill color

      null

      null

      bars and text painted with current fill color

      barColor

      null

      bars and text painted with barColor

      barColor

      null

      bars and text painted with barColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      - * @param cb the PdfContentByte where the barcode will be placed - * @param barColor the color of the bars. It can be null + * + * @param cb the PdfContentByte where the barcode will be placed + * @param barColor the color of the bars. It can be null * @param textColor the color of the text. It can be null * @return the dimensions the barcode occupies */ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor) { - if (supp.getFont() != null) - supp.setBarHeight(ean.getBarHeight() + supp.getBaseline() - supp.getFont().getFontDescriptor(BaseFont.CAPHEIGHT, supp.getSize())); - else + if (supp.getFont() != null) { + supp.setBarHeight(ean.getBarHeight() + supp.getBaseline() - supp.getFont() + .getFontDescriptor(BaseFont.CAPHEIGHT, supp.getSize())); + } else { supp.setBarHeight(ean.getBarHeight()); + } Rectangle eanR = ean.getBarcodeSize(); cb.saveState(); ean.placeBarcode(cb, barColor, textColor); @@ -143,14 +150,16 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor cb.restoreState(); return getBarcodeSize(); } - - /** Creates a java.awt.Image. This image only - * contains the bars without any text. + + /** + * Creates a java.awt.Image. This image only contains the bars without any text. + * * @param foreground the color of the bars * @param background the color of the background * @return the image - */ + */ public java.awt.Image createAwtImage(Color foreground, Color background) { - throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("the.two.barcodes.must.be.composed.externally")); - } + throw new UnsupportedOperationException( + MessageLocalization.getComposedMessage("the.two.barcodes.must.be.composed.externally")); + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeInter25.java b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeInter25.java index fc7989eb4..885f8df3d 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeInter25.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodeInter25.java @@ -48,35 +48,33 @@ */ package com.lowagie.text.pdf; +import com.lowagie.text.Element; +import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.Rectangle; +import com.lowagie.text.error_messages.MessageLocalization; import java.awt.Canvas; import java.awt.Color; import java.awt.Image; import java.awt.image.MemoryImageSource; -import com.lowagie.text.error_messages.MessageLocalization; - -import com.lowagie.text.Element; - -import com.lowagie.text.Rectangle; -import com.lowagie.text.ExceptionConverter; -/** Implements the code interleaved 2 of 5. The text can include - * non numeric characters that are printed but do not generate bars. - * The default parameters are: +/** + * Implements the code interleaved 2 of 5. The text can include non numeric characters that are printed but do not + * generate bars. The default parameters are: * 
      - *x = 0.8f;
- *n = 2;
- *font = BaseFont.createFont("Helvetica", "winansi", false);
- *size = 8;
- *baseline = size;
- *barHeight = size * 3;
- *textAlignment = Element.ALIGN_CENTER;
- *generateChecksum = false;
- *checksumText = false;
+ * x = 0.8f;
+ * n = 2;
+ * font = BaseFont.createFont("Helvetica", "winansi", false);
+ * size = 8;
+ * baseline = size;
+ * barHeight = size * 3;
+ * textAlignment = Element.ALIGN_CENTER;
+ * generateChecksum = false;
+ * checksumText = false;
  *
      * * @author Paulo Soares (psoares@consiste.pt) */ -public class BarcodeInter25 extends Barcode{ +public class BarcodeInter25 extends Barcode { /** * The bars to generate the code. @@ -95,7 +93,9 @@ public class BarcodeInter25 extends Barcode{ {0, 1, 0, 1, 0} }; - /** Creates new BarcodeInter25 */ + /** + * Creates new BarcodeInter25 + */ public BarcodeInter25() { try { x = 0.8f; @@ -107,30 +107,34 @@ public BarcodeInter25() { textAlignment = Element.ALIGN_CENTER; generateChecksum = false; checksumText = false; - } - catch (Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } } - - /** Deletes all the non numeric characters from text. + + /** + * Deletes all the non numeric characters from text. + * * @param text the text * @return a String with only numeric characters - */ + */ public static String keepNumbers(String text) { StringBuilder sb = new StringBuilder(); for (int k = 0; k < text.length(); ++k) { char c = text.charAt(k); - if (c >= '0' && c <= '9') + if (c >= '0' && c <= '9') { sb.append(c); + } } return sb.toString(); } - - /** Calculates the checksum. + + /** + * Calculates the checksum. + * * @param text the numeric text * @return the checksum - */ + */ public static char getChecksum(String text) { int mul = 3; int total = 0; @@ -139,17 +143,20 @@ public static char getChecksum(String text) { total += mul * n; mul ^= 2; } - return (char)(((10 - (total % 10)) % 10) + '0'); + return (char) (((10 - (total % 10)) % 10) + '0'); } - /** Creates the bars for the barcode. + /** + * Creates the bars for the barcode. + * * @param text the text. It can contain non numeric characters * @return the barcode - */ + */ public static byte[] getBarsInter25(String text) { text = keepNumbers(text); - if ((text.length() & 1) != 0) + if ((text.length() & 1) != 0) { throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.text.length.must.be.even")); + } byte[] bars = new byte[text.length() * 5 + 7]; int pb = 0; bars[pb++] = 0; @@ -173,126 +180,139 @@ public static byte[] getBarsInter25(String text) { return bars; } - /** Gets the maximum area that the barcode and the text, if - * any, will occupy. The lower left corner is always (0, 0). + /** + * Gets the maximum area that the barcode and the text, if any, will occupy. The lower left corner is always (0, + * 0). + * * @return the size the barcode occupies. - */ + */ public Rectangle getBarcodeSize() { float fontX = 0; float fontY = 0; if (font != null) { - if (baseline > 0) + if (baseline > 0) { fontY = baseline - font.getFontDescriptor(BaseFont.DESCENT, size); - else + } else { fontY = -baseline + size; + } String fullCode = code; - if (generateChecksum && checksumText) + if (generateChecksum && checksumText) { fullCode += getChecksum(fullCode); + } fontX = font.getWidthPoint(altText != null ? altText : fullCode, size); } String fullCode = keepNumbers(code); int len = fullCode.length(); - if (generateChecksum) + if (generateChecksum) { ++len; - float fullWidth = len * (3 * x + 2 * x * n) + (6 + n ) * x; + } + float fullWidth = len * (3 * x + 2 * x * n) + (6 + n) * x; fullWidth = Math.max(fullWidth, fontX); float fullHeight = barHeight + fontY; return new Rectangle(fullWidth, fullHeight); } - - /** Places the barcode in a PdfContentByte. The - * barcode is always placed at coordinates (0, 0). Use the + + /** + * Places the barcode in a PdfContentByte. The barcode is always placed at coordinates (0, 0). Use the * translation matrix to move it elsewhere. *

      The bars and text are written in the following colors:

      * - * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * *
      table of the colors of the bars and texttable of the colors of the bars and text

      barColor

      textColor

      Result

      barColor

      textColor

      Result

      null

      null

      bars and text painted with current fill color

      null

      null

      bars and text painted with current fill color

      barColor

      null

      bars and text painted with barColor

      barColor

      null

      bars and text painted with barColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      - * @param cb the PdfContentByte where the barcode will be placed - * @param barColor the color of the bars. It can be null + * + * @param cb the PdfContentByte where the barcode will be placed + * @param barColor the color of the bars. It can be null * @param textColor the color of the text. It can be null * @return the dimensions the barcode occupies - */ + */ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor) { String fullCode = code; float fontX = 0; if (font != null) { - if (generateChecksum && checksumText) + if (generateChecksum && checksumText) { fullCode += getChecksum(fullCode); + } fontX = font.getWidthPoint(fullCode = altText != null ? altText : fullCode, size); } String bCode = keepNumbers(code); - if (generateChecksum) + if (generateChecksum) { bCode += getChecksum(bCode); + } int len = bCode.length(); - float fullWidth = len * (3 * x + 2 * x * n) + (6 + n ) * x; + float fullWidth = len * (3 * x + 2 * x * n) + (6 + n) * x; float barStartX = 0; float textStartX = 0; switch (textAlignment) { case Element.ALIGN_LEFT: break; case Element.ALIGN_RIGHT: - if (fontX > fullWidth) + if (fontX > fullWidth) { barStartX = fontX - fullWidth; - else + } else { textStartX = fullWidth - fontX; + } break; default: - if (fontX > fullWidth) + if (fontX > fullWidth) { barStartX = (fontX - fullWidth) / 2; - else + } else { textStartX = (fullWidth - fontX) / 2; + } break; } float barStartY = 0; float textStartY = 0; if (font != null) { - if (baseline <= 0) + if (baseline <= 0) { textStartY = barHeight - baseline; - else { + } else { textStartY = -font.getFontDescriptor(BaseFont.DESCENT, size); barStartY = textStartY + baseline; } } byte[] bars = getBarsInter25(bCode); boolean print = true; - if (barColor != null) + if (barColor != null) { cb.setColorFill(barColor); + } for (byte bar : bars) { float w = (bar == 0 ? x : x * n); - if (print) + if (print) { cb.rectangle(barStartX, barStartY, w - inkSpreading, barHeight); + } print = !print; barStartX += w; } cb.fill(); if (font != null) { - if (textColor != null) + if (textColor != null) { cb.setColorFill(textColor); + } cb.beginText(); cb.setFontAndSize(font, size); cb.setTextMatrix(textStartX, textStartY); @@ -300,44 +320,48 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor cb.endText(); } return getBarcodeSize(); - } - - /** Creates a java.awt.Image. This image only - * contains the bars without any text. + } + + /** + * Creates a java.awt.Image. This image only contains the bars without any text. + * * @param foreground the color of the bars * @param background the color of the background * @return the image - */ + */ public java.awt.Image createAwtImage(Color foreground, Color background) { int f = foreground.getRGB(); int g = background.getRGB(); Canvas canvas = new Canvas(); String bCode = keepNumbers(code); - if (generateChecksum) + if (generateChecksum) { bCode += getChecksum(bCode); + } int len = bCode.length(); - int nn = (int)n; - int fullWidth = len * (3 + 2 * nn) + (6 + nn ); + int nn = (int) n; + int fullWidth = len * (3 + 2 * nn) + (6 + nn); byte[] bars = getBarsInter25(bCode); boolean print = true; int ptr = 0; - int height = (int)barHeight; + int height = (int) barHeight; int[] pix = new int[fullWidth * height]; for (byte bar : bars) { int w = (bar == 0 ? 1 : nn); int c = g; - if (print) + if (print) { c = f; + } print = !print; - for (int j = 0; j < w; ++j) + for (int j = 0; j < w; ++j) { pix[ptr++] = c; + } } for (int k = fullWidth; k < pix.length; k += fullWidth) { - System.arraycopy(pix, 0, pix, k, fullWidth); + System.arraycopy(pix, 0, pix, k, fullWidth); } Image img = canvas.createImage(new MemoryImageSource(fullWidth, height, pix, 0, fullWidth)); - + return img; - } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodePDF417.java b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodePDF417.java index fd21c0f80..09bb2f9e2 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodePDF417.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodePDF417.java @@ -48,1033 +48,69 @@ package com.lowagie.text.pdf; +import com.lowagie.text.BadElementException; +import com.lowagie.text.Image; +import com.lowagie.text.error_messages.MessageLocalization; +import com.lowagie.text.pdf.codec.CCITTG4Encoder; import java.awt.Canvas; import java.awt.Color; import java.awt.image.MemoryImageSource; import java.util.ArrayList; -import com.lowagie.text.error_messages.MessageLocalization; - -import com.lowagie.text.BadElementException; -import com.lowagie.text.Image; -import com.lowagie.text.pdf.codec.CCITTG4Encoder; - -/** Generates the 2D barcode PDF417. Supports dimensioning auto-sizing, fixed - * and variable sizes, automatic and manual error levels, raw codeword input, - * codeword size optimization and bitmap inversion. The output can - * be a CCITT G4 Image or a raw bitmap. +/** + * Generates the 2D barcode PDF417. Supports dimensioning auto-sizing, fixed and variable sizes, automatic and manual + * error levels, raw codeword input, codeword size optimization and bitmap inversion. The output can be a CCITT G4 + * Image or a raw bitmap. + * * @author Paulo Soares (psoares@consiste.pt) */ public class BarcodePDF417 { - /** Auto-size is made based on aspectRatio and yHeight. */ + /** + * Auto-size is made based on aspectRatio and yHeight. + */ public static final int PDF417_USE_ASPECT_RATIO = 0; - /** The size of the barcode will be at least codeColumns*codeRows. */ + /** + * The size of the barcode will be at least codeColumns*codeRows. + */ public static final int PDF417_FIXED_RECTANGLE = 1; - /** The size will be at least codeColumns - * with a variable number of codeRows. - */ + /** + * The size will be at least codeColumns with a variable number of codeRows. + */ public static final int PDF417_FIXED_COLUMNS = 2; - /** The size will be at least codeRows - * with a variable number of codeColumns. - */ + /** + * The size will be at least codeRows with a variable number of codeColumns. + */ public static final int PDF417_FIXED_ROWS = 4; - /** The error level correction is set automatically according - * to ISO 15438 recommendations. - */ + /** + * The error level correction is set automatically according to ISO 15438 recommendations. + */ public static final int PDF417_AUTO_ERROR_LEVEL = 0; - /** The error level correction is set by the user. It can be 0 to 8. */ + /** + * The error level correction is set by the user. It can be 0 to 8. + */ public static final int PDF417_USE_ERROR_LEVEL = 16; /** * One single binary segment is used */ public static final int PDF417_FORCE_BINARY = 32; - /** No text interpretation is done and the content of codewords - * is used directly. - */ - public static final int PDF417_USE_RAW_CODEWORDS = 64; - /** Inverts the output bits of the raw bitmap that is normally - * bit one for black. It has only effect for the raw bitmap. - */ - public static final int PDF417_INVERT_BITMAP = 128; - /** Use Macro PDF417 Encoding - * @see #setMacroFileId(String) - * @see #setMacroSegmentId(int) - * @see #setMacroSegmentCount(int) - */ - public static final int PDF417_USE_MACRO = 256; - - - private int macroSegmentCount=0; - private int macroSegmentId=-1; - private String macroFileId; - private int macroIndex; - protected int bitPtr; - protected int cwPtr; - protected SegmentList segmentList; - - - /** Creates a new BarcodePDF417 with the default settings. */ - public BarcodePDF417() { - setDefaultParameters(); - } - /** - * Sets the segment id for macro PDF417 encoding - * @param id the id (starting at 0) - * @see #setMacroSegmentCount(int) + * No text interpretation is done and the content of codewords is used directly. */ - public void setMacroSegmentId(int id) { - this.macroSegmentId = id; - } - + public static final int PDF417_USE_RAW_CODEWORDS = 64; /** - * Sets the segment count for macro PDF417 encoding - * @param cnt the number of macro segments - * @see #setMacroSegmentId(int) + * Inverts the output bits of the raw bitmap that is normally bit one for black. It has only effect for the raw + * bitmap. */ - public void setMacroSegmentCount(int cnt) { - this.macroSegmentCount = cnt; - } - + public static final int PDF417_INVERT_BITMAP = 128; /** - * Sets the File ID for macro PDF417 encoding - * @param id the file id + * Use Macro PDF417 Encoding + * + * @see #setMacroFileId(String) + * @see #setMacroSegmentId(int) + * @see #setMacroSegmentCount(int) */ - public void setMacroFileId(String id) { - this.macroFileId = id; - } - - protected boolean checkSegmentType(Segment segment, char type) { - if (segment == null) - return false; - return segment.type == type; - } - - protected int getSegmentLength(Segment segment) { - if (segment == null) - return 0; - return segment.end - segment.start; - } - - /** Set the default settings that correspond to PDF417_USE_ASPECT_RATIO - * and PDF417_AUTO_ERROR_LEVEL. - */ - public void setDefaultParameters() { - options = 0; - outBits = null; - text = new byte[0]; - yHeight = 3; - aspectRatio = 0.5f; - } - - protected void outCodeword17(int codeword) { - int bytePtr = bitPtr / 8; - int bit = bitPtr - bytePtr * 8; - outBits[bytePtr++] |= codeword >> (9 + bit); - outBits[bytePtr++] |= codeword >> (1 + bit); - codeword <<= 8; - outBits[bytePtr] |= codeword >> (1 + bit); - bitPtr += 17; - } - - protected void outCodeword18(int codeword) { - int bytePtr = bitPtr / 8; - int bit = bitPtr - bytePtr * 8; - outBits[bytePtr++] |= codeword >> (10 + bit); - outBits[bytePtr++] |= codeword >> (2 + bit); - codeword <<= 8; - outBits[bytePtr] |= codeword >> (2 + bit); - if (bit == 7) - outBits[++bytePtr] |= 0x80; - bitPtr += 18; - } - - protected void outCodeword(int codeword) { - outCodeword17(codeword); - } - - protected void outStopPattern() { - outCodeword18(STOP_PATTERN); - } - - protected void outStartPattern() { - outCodeword17(START_PATTERN); - } - - protected void outPaintCode() { - int codePtr = 0; - bitColumns = START_CODE_SIZE * (codeColumns + 3) + STOP_SIZE; - int lenBits = ((bitColumns - 1) / 8 + 1) * codeRows; - outBits = new byte[lenBits]; - for (int row = 0; row < codeRows; ++row) { - bitPtr = ((bitColumns - 1) / 8 + 1) * 8 * row; - int rowMod = row % 3; - int[] cluster = CLUSTERS[rowMod]; - outStartPattern(); - int edge = 0; - switch (rowMod) { - case 0: - edge = 30 * (row / 3) + ((codeRows - 1) / 3); - break; - case 1: - edge = 30 * (row / 3) + errorLevel * 3 + ((codeRows - 1) % 3); - break; - default: - edge = 30 * (row / 3) + codeColumns - 1; - break; - } - outCodeword(cluster[edge]); - - for (int column = 0; column < codeColumns; ++column) { - outCodeword(cluster[codewords[codePtr++]]); - } - - switch (rowMod) { - case 0: - edge = 30 * (row / 3) + codeColumns - 1; - break; - case 1: - edge = 30 * (row / 3) + ((codeRows - 1) / 3); - break; - default: - edge = 30 * (row / 3) + errorLevel * 3 + ((codeRows - 1) % 3); - break; - } - outCodeword(cluster[edge]); - outStopPattern(); - } - if ((options & PDF417_INVERT_BITMAP) != 0) { - for (int k = 0; k < outBits.length; ++k) - outBits[k] ^= 0xff; - } - } - - protected void calculateErrorCorrection(int dest) { - if (errorLevel < 0 || errorLevel > 8) - errorLevel = 0; - int[] A = ERROR_LEVEL[errorLevel]; - int Alength = 2 << errorLevel; - for (int k = 0; k < Alength; ++k) - codewords[dest + k] = 0; - int lastE = Alength - 1; - for (int k = 0; k < lenCodewords; ++k) { - int t1 = codewords[k] + codewords[dest]; - for (int e = 0; e <= lastE; ++e) { - int t2 = (t1 * A[lastE - e]) % MOD; - int t3 = MOD - t2; - codewords[dest + e] = ((e == lastE ? 0 : codewords[dest + e + 1]) + t3) % MOD; - } - } - for (int k = 0; k < Alength; ++k) - codewords[dest + k] = (MOD - codewords[dest + k]) % MOD; - } - - private static int getTextTypeAndValue(byte[] input, int maxLength, int idx) { - if (idx >= maxLength) - return 0; - char c = (char)(input[idx] & 0xff); - if (c >= 'A' && c <= 'Z') - return (ALPHA + c - 'A'); - if (c >= 'a' && c <= 'z') - return (LOWER + c - 'a'); - if (c == ' ') - return (ALPHA + LOWER + MIXED + SPACE); - int ms = MIXED_SET.indexOf(c); - int ps = PUNCTUATION_SET.indexOf(c); - if (ms < 0 && ps < 0) - return (ISBYTE + c); - if (ms == ps) - return (MIXED + PUNCTUATION + ms); - if (ms >= 0) - return (MIXED + ms); - return (PUNCTUATION + ps); - } - - protected int getTextTypeAndValue(int maxLength, int idx) { - return getTextTypeAndValue(text, maxLength,idx); - } - - private void textCompaction(byte[] input, int start, int length) { - int[] dest = new int[ABSOLUTE_MAX_TEXT_SIZE * 2]; - int mode = ALPHA; - int ptr = 0; - int fullBytes = 0; - int v = 0; - int k; - int size; - length += start; - for (k = start; k < length; ++k) { - v = getTextTypeAndValue(input, length, k); - if ((v & mode) != 0) { - dest[ptr++] = v & 0xff; - continue; - } - if ((v & ISBYTE) != 0) { - if ((ptr & 1) != 0) { - //add a padding word - dest[ptr++] = PAL; - mode = (mode & PUNCTUATION) != 0 ? ALPHA : mode; - } - dest[ptr++] = BYTESHIFT; - dest[ptr++] = v & 0xff; - fullBytes += 2; - continue; - } - switch (mode) { - case ALPHA: - if ((v & LOWER) != 0) { - dest[ptr++] = LL; - dest[ptr++] = v & 0xff; - mode = LOWER; - } - else if ((v & MIXED) != 0) { - dest[ptr++] = ML; - dest[ptr++] = v & 0xff; - mode = MIXED; - } - else if ((getTextTypeAndValue(input, length, k + 1) & getTextTypeAndValue(input, length, k + 2) & PUNCTUATION) != 0) { - dest[ptr++] = ML; - dest[ptr++] = PL; - dest[ptr++] = v & 0xff; - mode = PUNCTUATION; - } - else { - dest[ptr++] = PS; - dest[ptr++] = v & 0xff; - } - break; - case LOWER: - if ((v & ALPHA) != 0) { - if ((getTextTypeAndValue(input, length, k + 1) & getTextTypeAndValue(input, length, k + 2) & ALPHA) != 0) { - dest[ptr++] = ML; - dest[ptr++] = AL; - mode = ALPHA; - } - else { - dest[ptr++] = AS; - } - dest[ptr++] = v & 0xff; - } - else if ((v & MIXED) != 0) { - dest[ptr++] = ML; - dest[ptr++] = v & 0xff; - mode = MIXED; - } - else if ((getTextTypeAndValue(input, length, k + 1) & getTextTypeAndValue(input, length, k + 2) & PUNCTUATION) != 0) { - dest[ptr++] = ML; - dest[ptr++] = PL; - dest[ptr++] = v & 0xff; - mode = PUNCTUATION; - } - else { - dest[ptr++] = PS; - dest[ptr++] = v & 0xff; - } - break; - case MIXED: - if ((v & LOWER) != 0) { - dest[ptr++] = LL; - dest[ptr++] = v & 0xff; - mode = LOWER; - } - else if ((v & ALPHA) != 0) { - dest[ptr++] = AL; - dest[ptr++] = v & 0xff; - mode = ALPHA; - } - else if ((getTextTypeAndValue(input, length, k + 1) & getTextTypeAndValue(input, length, k + 2) & PUNCTUATION) != 0) { - dest[ptr++] = PL; - dest[ptr++] = v & 0xff; - mode = PUNCTUATION; - } - else { - dest[ptr++] = PS; - dest[ptr++] = v & 0xff; - } - break; - case PUNCTUATION: - dest[ptr++] = PAL; - mode = ALPHA; - --k; - break; - } - } - if ((ptr & 1) != 0) - dest[ptr++] = PS; - size = (ptr + fullBytes) / 2; - if (size + cwPtr > MAX_DATA_CODEWORDS) { - throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("the.text.is.too.big")); - } - length = ptr; - ptr = 0; - while (ptr < length) { - v = dest[ptr++]; - if (v >= 30) { - codewords[cwPtr++] = v; - codewords[cwPtr++] = dest[ptr++]; - } - else - codewords[cwPtr++] = v * 30 + dest[ptr++]; - } - } - protected void textCompaction(int start, int length) { - textCompaction(text, start, length); - } - - protected void basicNumberCompaction(int start, int length) { - basicNumberCompaction(text, start, length); - } - - private void basicNumberCompaction(byte[] input, int start, int length) { - int ret = cwPtr; - int retLast = length / 3; - int ni, k; - cwPtr += retLast + 1; - for (k = 0; k <= retLast; ++k) - codewords[ret + k] = 0; - codewords[ret + retLast] = 1; - length += start; - for (ni = start; ni < length; ++ni) { - // multiply by 10 - for (k = retLast; k >= 0; --k) - codewords[ret + k] *= 10; - // add the digit - codewords[ret + retLast] += input[ni] - '0'; - // propagate carry - for (k = retLast; k > 0; --k) { - codewords[ret + k - 1] += codewords[ret + k] / 900; - codewords[ret + k] %= 900; - } - } - } - - private void numberCompaction(byte[] input, int start, int length) { - int full = (length / 44) * 15; - int size = length % 44; - int k; - if (size == 0) - size = full; - else - size = full + size / 3 + 1; - if (size + cwPtr > MAX_DATA_CODEWORDS) { - throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("the.text.is.too.big")); - } - length += start; - for (k = start; k < length; k += 44) { - size = length - k < 44 ? length - k : 44; - basicNumberCompaction(input, k, size); - } - } - - protected void numberCompaction(int start, int length) { - numberCompaction(text, start, length); - } - - protected void byteCompaction6(int start) { - int length = 6; - int ret = cwPtr; - int retLast = 4; - int ni, k; - cwPtr += retLast + 1; - for (k = 0; k <= retLast ; ++k) - codewords[ret + k] = 0; - length += start; - for (ni = start; ni < length; ++ni) { - // multiply by 256 - for (k = retLast; k >= 0; --k) - codewords[ret + k] *= 256; - // add the digit - codewords[ret + retLast] += text[ni] & 0xff; - // propagate carry - for (k = retLast; k > 0; --k) { - codewords[ret + k - 1] += codewords[ret + k] / 900; - codewords[ret + k] %= 900; - } - } - } - - void byteCompaction(int start, int length) { - int k, j; - int size = (length / 6) * 5 + (length % 6); - if (size + cwPtr > MAX_DATA_CODEWORDS) { - throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("the.text.is.too.big")); - } - length += start; - for (k = start; k < length; k += 6) { - size = length - k < 44 ? length - k : 6; - if (size < 6) { - for (j = 0; j < size; ++j) - codewords[cwPtr++] = text[k + j] & 0xff; - } - else { - byteCompaction6(k); - } - } - } - - void breakString() { - int textLength = text.length; - int lastP = 0; - int startN = 0; - int nd = 0; - char c = 0; - int k, j; - boolean lastTxt, txt; - Segment v; - Segment vp; - Segment vn; - - if ((options & PDF417_FORCE_BINARY) != 0) { - segmentList.add('B', 0, textLength); - return; - } - for (k = 0; k < textLength; ++k) { - c = (char)(text[k] & 0xff); - if (c >= '0' && c <= '9') { - if (nd == 0) - startN = k; - ++nd; - continue; - } - if (nd >= 13) { - if (lastP != startN) { - c = (char)(text[lastP] & 0xff); - lastTxt = (c >= ' ' && c < 127) || c == '\r' || c == '\n' || c == '\t'; - for (j = lastP; j < startN; ++j) { - c = (char)(text[j] & 0xff); - txt = (c >= ' ' && c < 127) || c == '\r' || c == '\n' || c == '\t'; - if (txt != lastTxt) { - segmentList.add(lastTxt ? 'T' : 'B', lastP, j); - lastP = j; - lastTxt = txt; - } - } - segmentList.add(lastTxt ? 'T' : 'B', lastP, startN); - } - segmentList.add('N', startN, k); - lastP = k; - } - nd = 0; - } - if (nd < 13) - startN = textLength; - if (lastP != startN) { - c = (char)(text[lastP] & 0xff); - lastTxt = (c >= ' ' && c < 127) || c == '\r' || c == '\n' || c == '\t'; - for (j = lastP; j < startN; ++j) { - c = (char)(text[j] & 0xff); - txt = (c >= ' ' && c < 127) || c == '\r' || c == '\n' || c == '\t'; - if (txt != lastTxt) { - segmentList.add(lastTxt ? 'T' : 'B', lastP, j); - lastP = j; - lastTxt = txt; - } - } - segmentList.add(lastTxt ? 'T' : 'B', lastP, startN); - } - if (nd >= 13) - segmentList.add('N', startN, textLength); - //optimize - //merge short binary - for (k = 0; k < segmentList.size(); ++k) { - v = segmentList.get(k); - vp = segmentList.get(k - 1); - vn = segmentList.get(k + 1); - if (checkSegmentType(v, 'B') && getSegmentLength(v) == 1) { - if (checkSegmentType(vp, 'T') && checkSegmentType(vn, 'T') - && getSegmentLength(vp) + getSegmentLength(vn) >= 3) { - vp.end = vn.end; - segmentList.remove(k); - segmentList.remove(k); - k = -1; - continue; - } - } - } - //merge text sections - for (k = 0; k < segmentList.size(); ++k) { - v = segmentList.get(k); - vp = segmentList.get(k - 1); - vn = segmentList.get(k + 1); - if (checkSegmentType(v, 'T') && getSegmentLength(v) >= 5) { - boolean redo = false; - if ((checkSegmentType(vp, 'B') && getSegmentLength(vp) == 1) || checkSegmentType(vp, 'T')) { - redo = true; - v.start = vp.start; - segmentList.remove(k - 1); - --k; - } - if ((checkSegmentType(vn, 'B') && getSegmentLength(vn) == 1) || checkSegmentType(vn, 'T')) { - redo = true; - v.end = vn.end; - segmentList.remove(k + 1); - } - if (redo) { - k = -1; - } - } - } - //merge binary sections - for (k = 0; k < segmentList.size(); ++k) { - v = segmentList.get(k); - vp = segmentList.get(k - 1); - vn = segmentList.get(k + 1); - if (checkSegmentType(v, 'B')) { - boolean redo = false; - if ((checkSegmentType(vp, 'T') && getSegmentLength(vp) < 5) || checkSegmentType(vp, 'B')) { - redo = true; - v.start = vp.start; - segmentList.remove(k - 1); - --k; - } - if ((checkSegmentType(vn, 'T') && getSegmentLength(vn) < 5) || checkSegmentType(vn, 'B')) { - redo = true; - v.end = vn.end; - segmentList.remove(k + 1); - } - if (redo) { - k = -1; - } - } - } - // check if all numbers - if (segmentList.size() == 1 && (v = segmentList.get(0)).type == 'T' && getSegmentLength(v) >= 8) { - for (k = v.start; k < v.end; ++k) { - c = (char)(text[k] & 0xff); - if (c < '0' || c > '9') - break; - } - if (k == v.end) - v.type = 'N'; - } - } - - protected void assemble() { - int k; - if (segmentList.size() == 0) - return; - cwPtr = 1; - for (k = 0; k < segmentList.size(); ++k) { - Segment v = segmentList.get(k); - switch (v.type) { - case 'T': - if (k != 0) - codewords[cwPtr++] = TEXT_MODE; - textCompaction(v.start, getSegmentLength(v)); - break; - case 'N': - codewords[cwPtr++] = NUMERIC_MODE; - numberCompaction(v.start, getSegmentLength(v)); - break; - case 'B': - codewords[cwPtr++] = (getSegmentLength(v) % 6) != 0 ? BYTE_MODE : BYTE_MODE_6; - byteCompaction(v.start, getSegmentLength(v)); - break; - } - } - - if ((options & PDF417_USE_MACRO) != 0) { - macroCodes(); - } - - } - - private void macroCodes() { - if (macroSegmentId < 0) { - throw new IllegalStateException(MessageLocalization.getComposedMessage("macrosegmentid.must.be.gt.eq.0")); - } - if (macroSegmentId >= macroSegmentCount) { - throw new IllegalStateException(MessageLocalization.getComposedMessage("macrosegmentid.must.be.lt.macrosemgentcount")); - } - - macroIndex = cwPtr; - codewords[cwPtr++] = MACRO_SEGMENT_ID; - append(macroSegmentId, 5); - - if (macroFileId != null) { - append(macroFileId); - } - - if (macroSegmentId >= macroSegmentCount-1) { - codewords[cwPtr++] = MACRO_LAST_SEGMENT; - } - - } - - private void append(int in, int len) { - StringBuilder sb = new StringBuilder(len+1); - sb.append(in); - for(int i = sb.length(); i < len; i++) { - sb.insert(0, "0"); - } - - byte[] bytes = PdfEncodings.convertToBytes(sb.toString(), "cp437"); - numberCompaction(bytes, 0, bytes.length); - } - - private void append(String s) { - byte[] bytes = PdfEncodings.convertToBytes(s, "cp437"); - textCompaction(bytes, 0, bytes.length); - } - - - protected static int maxPossibleErrorLevel(int remain) { - int level = 8; - int size = 512; - while (level > 0) { - if (remain >= size) - return level; - --level; - size >>= 1; - } - return 0; - } - - protected void dumpList() { - if (segmentList.size() == 0) - return; - for (int k = 0; k < segmentList.size(); ++k) { - Segment v = segmentList.get(k); - int len = getSegmentLength(v); - char[] c = new char[len]; - for (int j = 0; j < len; ++j) { - c[j] = (char)(text[v.start + j] & 0xff); - if (c[j] == '\r') - c[j] = '\n'; - } - StringBuilder sb = new StringBuilder(); - sb.append(v.type); - sb.append(c); - System.out.println(sb.toString()); - } - } - - protected int getMaxSquare() { - if (codeColumns > 21) { - codeColumns = 29; - codeRows = 32; - } - else { - codeColumns = 16; - codeRows = 58; - } - return MAX_DATA_CODEWORDS + 2; - } - - /** Paints the barcode. If no exception was thrown a valid barcode is available. */ - public void paintCode() { - int maxErr, lenErr, tot, pad; - if ((options & PDF417_USE_RAW_CODEWORDS) != 0) { - if (lenCodewords > MAX_DATA_CODEWORDS || lenCodewords < 1 || lenCodewords != codewords[0]) { - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("invalid.codeword.size")); - } - } - else { - if (text == null) - throw new NullPointerException(MessageLocalization.getComposedMessage("text.cannot.be.null")); - if (text.length > ABSOLUTE_MAX_TEXT_SIZE) { - throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("the.text.is.too.big")); - } - segmentList = new SegmentList(); - breakString(); - //dumpList(); - assemble(); - segmentList = null; - codewords[0] = lenCodewords = cwPtr; - } - maxErr = maxPossibleErrorLevel(MAX_DATA_CODEWORDS + 2 - lenCodewords); - if ((options & PDF417_USE_ERROR_LEVEL) == 0) { - if (lenCodewords < 41) - errorLevel = 2; - else if (lenCodewords < 161) - errorLevel = 3; - else if (lenCodewords < 321) - errorLevel = 4; - else - errorLevel = 5; - } - if (errorLevel < 0) - errorLevel = 0; - else if (errorLevel > maxErr) - errorLevel = maxErr; - if (codeColumns < 1) - codeColumns = 1; - else if (codeColumns > 30) - codeColumns = 30; - if (codeRows < 3) - codeRows = 3; - else if (codeRows > 90) - codeRows = 90; - lenErr = 2 << errorLevel; - boolean fixedColumn = (options & PDF417_FIXED_ROWS) == 0; - boolean skipRowColAdjust = false; - tot = lenCodewords + lenErr; - if ((options & PDF417_FIXED_RECTANGLE) != 0) { - tot = codeColumns * codeRows; - if (tot > MAX_DATA_CODEWORDS + 2) { - tot = getMaxSquare(); - } - if (tot < lenCodewords + lenErr) - tot = lenCodewords + lenErr; - else - skipRowColAdjust = true; - } - else if ((options & (PDF417_FIXED_COLUMNS | PDF417_FIXED_ROWS)) == 0) { - double c, b; - fixedColumn = true; - if (aspectRatio < 0.001) - aspectRatio = 0.001f; - else if (aspectRatio > 1000) - aspectRatio = 1000; - b = 73 * aspectRatio - 4; - c = (-b + Math.sqrt(b * b + 4 * 17 * aspectRatio * (lenCodewords + lenErr) * yHeight)) / (2 * 17 * aspectRatio); - codeColumns = (int)(c + 0.5); - if (codeColumns < 1) - codeColumns = 1; - else if (codeColumns > 30) - codeColumns = 30; - } - if (!skipRowColAdjust) { - if (fixedColumn) { - codeRows = (tot - 1) / codeColumns + 1; - if (codeRows < 3) - codeRows = 3; - else if (codeRows > 90) { - codeRows = 90; - codeColumns = (tot - 1) / 90 + 1; - } - } - else { - codeColumns = (tot - 1) / codeRows + 1; - if (codeColumns > 30) { - codeColumns = 30; - codeRows = (tot - 1) / 30 + 1; - } - } - tot = codeRows * codeColumns; - } - if (tot > MAX_DATA_CODEWORDS + 2) { - tot = getMaxSquare(); - } - errorLevel = maxPossibleErrorLevel(tot - lenCodewords); - lenErr = 2 << errorLevel; - pad = tot - lenErr - lenCodewords; - if ((options & PDF417_USE_MACRO) != 0) { - // the padding comes before the control block - int lenCodewordsAdjusted = lenCodewords = macroIndex; - System.arraycopy(codewords, macroIndex, codewords, macroIndex + pad, lenCodewordsAdjusted); - cwPtr = lenCodewords + pad; - while (pad-- != 0) - codewords[macroIndex++] = TEXT_MODE; - } - else { - cwPtr = lenCodewords; - while (pad-- != 0) - codewords[cwPtr++] = TEXT_MODE; - } - codewords[0] = lenCodewords = cwPtr; - calculateErrorCorrection(lenCodewords); - lenCodewords = tot; - outPaintCode(); - } - - /** Gets an Image with the barcode. The image will have to be - * scaled in the Y direction by yHeightfor the barcode - * to have the right printing aspect. - * @return the barcode Image - * @throws BadElementException on error - */ - public Image getImage() throws BadElementException { - paintCode(); - byte[] g4 = CCITTG4Encoder.compress(outBits, bitColumns, codeRows); - return Image.getInstance(bitColumns, codeRows, false, Image.CCITTG4, (options & PDF417_INVERT_BITMAP) == 0 ? 0 : Image.CCITT_BLACKIS1, g4, null); - } - - /** Creates a java.awt.Image. - * @param foreground the color of the bars - * @param background the color of the background - * @return the image - */ - public java.awt.Image createAwtImage(Color foreground, Color background) { - int f = foreground.getRGB(); - int g = background.getRGB(); - Canvas canvas = new Canvas(); - - paintCode(); - int h = (int)yHeight; - int[] pix = new int[bitColumns * codeRows * h]; - int stride = (bitColumns + 7) / 8; - int ptr = 0; - for (int k = 0; k < codeRows; ++k) { - int p = k * stride; - for (int j = 0; j < bitColumns; ++j) { - int b = outBits[p + (j / 8)] & 0xff; - b <<= j % 8; - pix[ptr++] = (b & 0x80) == 0 ? g : f; - } - for (int j = 1; j < h; ++j) { - System.arraycopy(pix, ptr - bitColumns, pix, ptr + bitColumns * (j - 1), bitColumns); - } - ptr += bitColumns * (h - 1); - } - - java.awt.Image img = canvas.createImage(new MemoryImageSource(bitColumns, codeRows * h, pix, 0, bitColumns)); - return img; - } - - /** Gets the raw image bits of the barcode. The image will have to - * be scaled in the Y direction by yHeight. - * @return The raw barcode image - */ - public byte[] getOutBits() { - return this.outBits; - } - - /** Gets the number of X pixels of outBits. - * @return the number of X pixels of outBits - */ - public int getBitColumns() { - return this.bitColumns; - } - - /** Gets the number of Y pixels of outBits. - * It is also the number of rows in the barcode. - * @return the number of Y pixels of outBits - */ - public int getCodeRows() { - return this.codeRows; - } - - /** Sets the number of barcode rows. This number may be changed - * to keep the barcode valid. - * @param codeRows the number of barcode rows - */ - public void setCodeRows(int codeRows) { - this.codeRows = codeRows; - } - - /** Gets the number of barcode data columns. - * @return he number of barcode data columns - */ - public int getCodeColumns() { - return this.codeColumns; - } - - /** Sets the number of barcode data columns. - * This number may be changed to keep the barcode valid. - * @param codeColumns the number of barcode data columns - */ - public void setCodeColumns(int codeColumns) { - this.codeColumns = codeColumns; - } - - /** Gets the codeword array. This array is always 928 elements long. - * It can be written to if the option PDF417_USE_RAW_CODEWORDS - * is set. - * @return the codeword array - */ - public int[] getCodewords() { - return this.codewords; - } - - /** Gets the length of the codewords. - * @return the length of the codewords - */ - public int getLenCodewords() { - return this.lenCodewords; - } - - /** Sets the length of the codewords. - * @param lenCodewords the length of the codewords - */ - public void setLenCodewords(int lenCodewords) { - this.lenCodewords = lenCodewords; - } - - /** Gets the error level correction used for the barcode. It may different - * from the previously set value. - * @return the error level correction used for the barcode - */ - public int getErrorLevel() { - return this.errorLevel; - } - - /** Sets the error level correction for the barcode. - * @param errorLevel the error level correction for the barcode - */ - public void setErrorLevel(int errorLevel) { - this.errorLevel = errorLevel; - } - - /** Gets the bytes that form the barcode. This bytes should - * be interpreted in the codepage Cp437. - * @return the bytes that form the barcode - */ - public byte[] getText() { - return this.text; - } - - /** Sets the bytes that form the barcode. This bytes should - * be interpreted in the codepage Cp437. - * @param text the bytes that form the barcode - */ - public void setText(byte[] text) { - this.text = text; - } - - /** Sets the text that will form the barcode. This text is converted - * to bytes using the encoding Cp437. - * @param s the text that will form the barcode - */ - public void setText(String s) { - this.text = PdfEncodings.convertToBytes(s, "cp437"); - } - - /** Gets the options to generate the barcode. - * @return the options to generate the barcode - */ - public int getOptions() { - return this.options; - } - - /** Sets the options to generate the barcode. This can be all - * the PDF417_* constants. - * @param options the options to generate the barcode - */ - public void setOptions(int options) { - this.options = options; - } - - /** Gets the barcode aspect ratio. - * @return the barcode aspect ratio - */ - public float getAspectRatio() { - return this.aspectRatio; - } - - /** Sets the barcode aspect ratio. A ratio or 0.5 will make the - * barcode width twice as large as the height. - * @param aspectRatio the barcode aspect ratio - */ - public void setAspectRatio(float aspectRatio) { - this.aspectRatio = aspectRatio; - } - - /** Gets the Y pixel height relative to X. - * @return the Y pixel height relative to X - */ - public float getYHeight() { - return this.yHeight; - } - - /** Sets the Y pixel height relative to X. It is usually 3. - * @param yHeight the Y pixel height relative to X - */ - public void setYHeight(float yHeight) { - this.yHeight = yHeight; - } - + public static final int PDF417_USE_MACRO = 256; protected static final int START_PATTERN = 0x1fea8; protected static final int STOP_PATTERN = 0x3fa29; protected static final int START_CODE_SIZE = 17; @@ -1100,12 +136,10 @@ public void setYHeight(float yHeight) { protected static final int NUMERIC_MODE = 902; protected static final int ABSOLUTE_MAX_TEXT_SIZE = 5420; protected static final int MAX_DATA_CODEWORDS = 926; - protected static final int MACRO_SEGMENT_ID=928; - protected static final int MACRO_LAST_SEGMENT=922; - + protected static final int MACRO_SEGMENT_ID = 928; + protected static final int MACRO_LAST_SEGMENT = 922; private static final String MIXED_SET = "0123456789&\r\t,:#-.$/+%*=^"; private static final String PUNCTUATION_SET = ";<>@[\\]_`~!\r\t,:\n-.$/\"|*()?{}'"; - private static final int[][] CLUSTERS = {{ 0x1d5c0, 0x1eaf0, 0x1f57c, 0x1d4e0, 0x1ea78, 0x1f53e, 0x1a8c0, 0x1d470, @@ -1462,149 +496,1204 @@ public void setYHeight(float yHeight) { 0x10396, 0x107b6, 0x187d4, 0x187d2, 0x10794, 0x10fb4, 0x10792, 0x10fb2, 0x1c7ea }}; + private static final int[][] ERROR_LEVEL = + {{ + 27, 917 + }, { + 522, 568, 723, 809 + }, { + 237, 308, 436, 284, 646, 653, 428, 379 + }, { + 274, 562, 232, 755, 599, 524, 801, 132, 295, 116, 442, 428, 295, 42, 176, 65 + }, { + 361, 575, 922, 525, 176, 586, 640, 321, 536, 742, 677, 742, 687, 284, 193, 517, + 273, 494, 263, 147, 593, 800, 571, 320, 803, 133, 231, 390, 685, 330, 63, 410 + }, { + 539, 422, 6, 93, 862, 771, 453, 106, 610, 287, 107, 505, 733, 877, 381, 612, + 723, 476, 462, 172, 430, 609, 858, 822, 543, 376, 511, 400, 672, 762, 283, 184, + 440, 35, 519, 31, 460, 594, 225, 535, 517, 352, 605, 158, 651, 201, 488, 502, + 648, 733, 717, 83, 404, 97, 280, 771, 840, 629, 4, 381, 843, 623, 264, 543 + }, { + 521, 310, 864, 547, 858, 580, 296, 379, 53, 779, 897, 444, 400, 925, 749, 415, + 822, 93, 217, 208, 928, 244, 583, 620, 246, 148, 447, 631, 292, 908, 490, 704, + 516, 258, 457, 907, 594, 723, 674, 292, 272, 96, 684, 432, 686, 606, 860, 569, + 193, 219, 129, 186, 236, 287, 192, 775, 278, 173, 40, 379, 712, 463, 646, 776, + 171, 491, 297, 763, 156, 732, 95, 270, 447, 90, 507, 48, 228, 821, 808, 898, + 784, 663, 627, 378, 382, 262, 380, 602, 754, 336, 89, 614, 87, 432, 670, 616, + 157, 374, 242, 726, 600, 269, 375, 898, 845, 454, 354, 130, 814, 587, 804, 34, + 211, 330, 539, 297, 827, 865, 37, 517, 834, 315, 550, 86, 801, 4, 108, 539 + }, { + 524, 894, 75, 766, 882, 857, 74, 204, 82, 586, 708, 250, 905, 786, 138, 720, + 858, 194, 311, 913, 275, 190, 375, 850, 438, 733, 194, 280, 201, 280, 828, 757, + 710, 814, 919, 89, 68, 569, 11, 204, 796, 605, 540, 913, 801, 700, 799, 137, + 439, 418, 592, 668, 353, 859, 370, 694, 325, 240, 216, 257, 284, 549, 209, 884, + 315, 70, 329, 793, 490, 274, 877, 162, 749, 812, 684, 461, 334, 376, 849, 521, + 307, 291, 803, 712, 19, 358, 399, 908, 103, 511, 51, 8, 517, 225, 289, 470, + 637, 731, 66, 255, 917, 269, 463, 830, 730, 433, 848, 585, 136, 538, 906, 90, + 2, 290, 743, 199, 655, 903, 329, 49, 802, 580, 355, 588, 188, 462, 10, 134, + 628, 320, 479, 130, 739, 71, 263, 318, 374, 601, 192, 605, 142, 673, 687, 234, + 722, 384, 177, 752, 607, 640, 455, 193, 689, 707, 805, 641, 48, 60, 732, 621, + 895, 544, 261, 852, 655, 309, 697, 755, 756, 60, 231, 773, 434, 421, 726, 528, + 503, 118, 49, 795, 32, 144, 500, 238, 836, 394, 280, 566, 319, 9, 647, 550, + 73, 914, 342, 126, 32, 681, 331, 792, 620, 60, 609, 441, 180, 791, 893, 754, + 605, 383, 228, 749, 760, 213, 54, 297, 134, 54, 834, 299, 922, 191, 910, 532, + 609, 829, 189, 20, 167, 29, 872, 449, 83, 402, 41, 656, 505, 579, 481, 173, + 404, 251, 688, 95, 497, 555, 642, 543, 307, 159, 924, 558, 648, 55, 497, 10 + }, { + 352, 77, 373, 504, 35, 599, 428, 207, 409, 574, 118, 498, 285, 380, 350, 492, + 197, 265, 920, 155, 914, 299, 229, 643, 294, 871, 306, 88, 87, 193, 352, 781, + 846, 75, 327, 520, 435, 543, 203, 666, 249, 346, 781, 621, 640, 268, 794, 534, + 539, 781, 408, 390, 644, 102, 476, 499, 290, 632, 545, 37, 858, 916, 552, 41, + 542, 289, 122, 272, 383, 800, 485, 98, 752, 472, 761, 107, 784, 860, 658, 741, + 290, 204, 681, 407, 855, 85, 99, 62, 482, 180, 20, 297, 451, 593, 913, 142, + 808, 684, 287, 536, 561, 76, 653, 899, 729, 567, 744, 390, 513, 192, 516, 258, + 240, 518, 794, 395, 768, 848, 51, 610, 384, 168, 190, 826, 328, 596, 786, 303, + 570, 381, 415, 641, 156, 237, 151, 429, 531, 207, 676, 710, 89, 168, 304, 402, + 40, 708, 575, 162, 864, 229, 65, 861, 841, 512, 164, 477, 221, 92, 358, 785, + 288, 357, 850, 836, 827, 736, 707, 94, 8, 494, 114, 521, 2, 499, 851, 543, + 152, 729, 771, 95, 248, 361, 578, 323, 856, 797, 289, 51, 684, 466, 533, 820, + 669, 45, 902, 452, 167, 342, 244, 173, 35, 463, 651, 51, 699, 591, 452, 578, + 37, 124, 298, 332, 552, 43, 427, 119, 662, 777, 475, 850, 764, 364, 578, 911, + 283, 711, 472, 420, 245, 288, 594, 394, 511, 327, 589, 777, 699, 688, 43, 408, + 842, 383, 721, 521, 560, 644, 714, 559, 62, 145, 873, 663, 713, 159, 672, 729, + 624, 59, 193, 417, 158, 209, 563, 564, 343, 693, 109, 608, 563, 365, 181, 772, + 677, 310, 248, 353, 708, 410, 579, 870, 617, 841, 632, 860, 289, 536, 35, 777, + 618, 586, 424, 833, 77, 597, 346, 269, 757, 632, 695, 751, 331, 247, 184, 45, + 787, 680, 18, 66, 407, 369, 54, 492, 228, 613, 830, 922, 437, 519, 644, 905, + 789, 420, 305, 441, 207, 300, 892, 827, 141, 537, 381, 662, 513, 56, 252, 341, + 242, 797, 838, 837, 720, 224, 307, 631, 61, 87, 560, 310, 756, 665, 397, 808, + 851, 309, 473, 795, 378, 31, 647, 915, 459, 806, 590, 731, 425, 216, 548, 249, + 321, 881, 699, 535, 673, 782, 210, 815, 905, 303, 843, 922, 281, 73, 469, 791, + 660, 162, 498, 308, 155, 422, 907, 817, 187, 62, 16, 425, 535, 336, 286, 437, + 375, 273, 610, 296, 183, 923, 116, 667, 751, 353, 62, 366, 691, 379, 687, 842, + 37, 357, 720, 742, 330, 5, 39, 923, 311, 424, 242, 749, 321, 54, 669, 316, + 342, 299, 534, 105, 667, 488, 640, 672, 576, 540, 316, 486, 721, 610, 46, 656, + 447, 171, 616, 464, 190, 531, 297, 321, 762, 752, 533, 175, 134, 14, 381, 433, + 717, 45, 111, 20, 596, 284, 736, 138, 646, 411, 877, 669, 141, 919, 45, 780, + 407, 164, 332, 899, 165, 726, 600, 325, 498, 655, 357, 752, 768, 223, 849, 647, + 63, 310, 863, 251, 366, 304, 282, 738, 675, 410, 389, 244, 31, 121, 303, 263 + }}; + protected int bitPtr; + protected int cwPtr; + protected SegmentList segmentList; + private int macroSegmentCount = 0; + private int macroSegmentId = -1; + private String macroFileId; + private int macroIndex; + /** + * Holds value of property outBits. + */ + private byte[] outBits; + /** + * Holds value of property bitColumns. + */ + private int bitColumns; + /** + * Holds value of property codeRows. + */ + private int codeRows; + /** + * Holds value of property codeColumns. + */ + private int codeColumns; + /** + * Holds value of property codewords. + */ + private int[] codewords = new int[MAX_DATA_CODEWORDS + 2]; + /** + * Holds value of property lenCodewords. + */ + private int lenCodewords; + /** + * Holds value of property errorLevel. + */ + private int errorLevel; + /** + * Holds value of property text. + */ + private byte[] text; + /** + * Holds value of property options. + */ + private int options; + /** + * Holds value of property aspectRatio. + */ + private float aspectRatio; + /** + * Holds value of property yHeight. + */ + private float yHeight; + + /** + * Creates a new BarcodePDF417 with the default settings. + */ + public BarcodePDF417() { + setDefaultParameters(); + } + + private static int getTextTypeAndValue(byte[] input, int maxLength, int idx) { + if (idx >= maxLength) { + return 0; + } + char c = (char) (input[idx] & 0xff); + if (c >= 'A' && c <= 'Z') { + return (ALPHA + c - 'A'); + } + if (c >= 'a' && c <= 'z') { + return (LOWER + c - 'a'); + } + if (c == ' ') { + return (ALPHA + LOWER + MIXED + SPACE); + } + int ms = MIXED_SET.indexOf(c); + int ps = PUNCTUATION_SET.indexOf(c); + if (ms < 0 && ps < 0) { + return (ISBYTE + c); + } + if (ms == ps) { + return (MIXED + PUNCTUATION + ms); + } + if (ms >= 0) { + return (MIXED + ms); + } + return (PUNCTUATION + ps); + } + + protected static int maxPossibleErrorLevel(int remain) { + int level = 8; + int size = 512; + while (level > 0) { + if (remain >= size) { + return level; + } + --level; + size >>= 1; + } + return 0; + } + + /** + * Sets the segment id for macro PDF417 encoding + * + * @param id the id (starting at 0) + * @see #setMacroSegmentCount(int) + */ + public void setMacroSegmentId(int id) { + this.macroSegmentId = id; + } + + /** + * Sets the segment count for macro PDF417 encoding + * + * @param cnt the number of macro segments + * @see #setMacroSegmentId(int) + */ + public void setMacroSegmentCount(int cnt) { + this.macroSegmentCount = cnt; + } + + /** + * Sets the File ID for macro PDF417 encoding + * + * @param id the file id + */ + public void setMacroFileId(String id) { + this.macroFileId = id; + } + + protected boolean checkSegmentType(Segment segment, char type) { + if (segment == null) { + return false; + } + return segment.type == type; + } + + protected int getSegmentLength(Segment segment) { + if (segment == null) { + return 0; + } + return segment.end - segment.start; + } + + /** + * Set the default settings that correspond to PDF417_USE_ASPECT_RATIO and + * PDF417_AUTO_ERROR_LEVEL. + */ + public void setDefaultParameters() { + options = 0; + outBits = null; + text = new byte[0]; + yHeight = 3; + aspectRatio = 0.5f; + } + + protected void outCodeword17(int codeword) { + int bytePtr = bitPtr / 8; + int bit = bitPtr - bytePtr * 8; + outBits[bytePtr++] |= codeword >> (9 + bit); + outBits[bytePtr++] |= codeword >> (1 + bit); + codeword <<= 8; + outBits[bytePtr] |= codeword >> (1 + bit); + bitPtr += 17; + } + + protected void outCodeword18(int codeword) { + int bytePtr = bitPtr / 8; + int bit = bitPtr - bytePtr * 8; + outBits[bytePtr++] |= codeword >> (10 + bit); + outBits[bytePtr++] |= codeword >> (2 + bit); + codeword <<= 8; + outBits[bytePtr] |= codeword >> (2 + bit); + if (bit == 7) { + outBits[++bytePtr] |= 0x80; + } + bitPtr += 18; + } + + protected void outCodeword(int codeword) { + outCodeword17(codeword); + } + + protected void outStopPattern() { + outCodeword18(STOP_PATTERN); + } + + protected void outStartPattern() { + outCodeword17(START_PATTERN); + } + + protected void outPaintCode() { + int codePtr = 0; + bitColumns = START_CODE_SIZE * (codeColumns + 3) + STOP_SIZE; + int lenBits = ((bitColumns - 1) / 8 + 1) * codeRows; + outBits = new byte[lenBits]; + for (int row = 0; row < codeRows; ++row) { + bitPtr = ((bitColumns - 1) / 8 + 1) * 8 * row; + int rowMod = row % 3; + int[] cluster = CLUSTERS[rowMod]; + outStartPattern(); + int edge = 0; + switch (rowMod) { + case 0: + edge = 30 * (row / 3) + ((codeRows - 1) / 3); + break; + case 1: + edge = 30 * (row / 3) + errorLevel * 3 + ((codeRows - 1) % 3); + break; + default: + edge = 30 * (row / 3) + codeColumns - 1; + break; + } + outCodeword(cluster[edge]); + + for (int column = 0; column < codeColumns; ++column) { + outCodeword(cluster[codewords[codePtr++]]); + } + + switch (rowMod) { + case 0: + edge = 30 * (row / 3) + codeColumns - 1; + break; + case 1: + edge = 30 * (row / 3) + ((codeRows - 1) / 3); + break; + default: + edge = 30 * (row / 3) + errorLevel * 3 + ((codeRows - 1) % 3); + break; + } + outCodeword(cluster[edge]); + outStopPattern(); + } + if ((options & PDF417_INVERT_BITMAP) != 0) { + for (int k = 0; k < outBits.length; ++k) { + outBits[k] ^= 0xff; + } + } + } + + protected void calculateErrorCorrection(int dest) { + if (errorLevel < 0 || errorLevel > 8) { + errorLevel = 0; + } + int[] A = ERROR_LEVEL[errorLevel]; + int Alength = 2 << errorLevel; + for (int k = 0; k < Alength; ++k) { + codewords[dest + k] = 0; + } + int lastE = Alength - 1; + for (int k = 0; k < lenCodewords; ++k) { + int t1 = codewords[k] + codewords[dest]; + for (int e = 0; e <= lastE; ++e) { + int t2 = (t1 * A[lastE - e]) % MOD; + int t3 = MOD - t2; + codewords[dest + e] = ((e == lastE ? 0 : codewords[dest + e + 1]) + t3) % MOD; + } + } + for (int k = 0; k < Alength; ++k) { + codewords[dest + k] = (MOD - codewords[dest + k]) % MOD; + } + } + + protected int getTextTypeAndValue(int maxLength, int idx) { + return getTextTypeAndValue(text, maxLength, idx); + } + + private void textCompaction(byte[] input, int start, int length) { + int[] dest = new int[ABSOLUTE_MAX_TEXT_SIZE * 2]; + int mode = ALPHA; + int ptr = 0; + int fullBytes = 0; + int v = 0; + int k; + int size; + length += start; + for (k = start; k < length; ++k) { + v = getTextTypeAndValue(input, length, k); + if ((v & mode) != 0) { + dest[ptr++] = v & 0xff; + continue; + } + if ((v & ISBYTE) != 0) { + if ((ptr & 1) != 0) { + //add a padding word + dest[ptr++] = PAL; + mode = (mode & PUNCTUATION) != 0 ? ALPHA : mode; + } + dest[ptr++] = BYTESHIFT; + dest[ptr++] = v & 0xff; + fullBytes += 2; + continue; + } + switch (mode) { + case ALPHA: + if ((v & LOWER) != 0) { + dest[ptr++] = LL; + dest[ptr++] = v & 0xff; + mode = LOWER; + } else if ((v & MIXED) != 0) { + dest[ptr++] = ML; + dest[ptr++] = v & 0xff; + mode = MIXED; + } else if ((getTextTypeAndValue(input, length, k + 1) & getTextTypeAndValue(input, length, k + 2) + & PUNCTUATION) != 0) { + dest[ptr++] = ML; + dest[ptr++] = PL; + dest[ptr++] = v & 0xff; + mode = PUNCTUATION; + } else { + dest[ptr++] = PS; + dest[ptr++] = v & 0xff; + } + break; + case LOWER: + if ((v & ALPHA) != 0) { + if ((getTextTypeAndValue(input, length, k + 1) & getTextTypeAndValue(input, length, k + 2) + & ALPHA) != 0) { + dest[ptr++] = ML; + dest[ptr++] = AL; + mode = ALPHA; + } else { + dest[ptr++] = AS; + } + dest[ptr++] = v & 0xff; + } else if ((v & MIXED) != 0) { + dest[ptr++] = ML; + dest[ptr++] = v & 0xff; + mode = MIXED; + } else if ((getTextTypeAndValue(input, length, k + 1) & getTextTypeAndValue(input, length, k + 2) + & PUNCTUATION) != 0) { + dest[ptr++] = ML; + dest[ptr++] = PL; + dest[ptr++] = v & 0xff; + mode = PUNCTUATION; + } else { + dest[ptr++] = PS; + dest[ptr++] = v & 0xff; + } + break; + case MIXED: + if ((v & LOWER) != 0) { + dest[ptr++] = LL; + dest[ptr++] = v & 0xff; + mode = LOWER; + } else if ((v & ALPHA) != 0) { + dest[ptr++] = AL; + dest[ptr++] = v & 0xff; + mode = ALPHA; + } else if ((getTextTypeAndValue(input, length, k + 1) & getTextTypeAndValue(input, length, k + 2) + & PUNCTUATION) != 0) { + dest[ptr++] = PL; + dest[ptr++] = v & 0xff; + mode = PUNCTUATION; + } else { + dest[ptr++] = PS; + dest[ptr++] = v & 0xff; + } + break; + case PUNCTUATION: + dest[ptr++] = PAL; + mode = ALPHA; + --k; + break; + } + } + if ((ptr & 1) != 0) { + dest[ptr++] = PS; + } + size = (ptr + fullBytes) / 2; + if (size + cwPtr > MAX_DATA_CODEWORDS) { + throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("the.text.is.too.big")); + } + length = ptr; + ptr = 0; + while (ptr < length) { + v = dest[ptr++]; + if (v >= 30) { + codewords[cwPtr++] = v; + codewords[cwPtr++] = dest[ptr++]; + } else { + codewords[cwPtr++] = v * 30 + dest[ptr++]; + } + } + } + + protected void textCompaction(int start, int length) { + textCompaction(text, start, length); + } + + protected void basicNumberCompaction(int start, int length) { + basicNumberCompaction(text, start, length); + } + + private void basicNumberCompaction(byte[] input, int start, int length) { + int ret = cwPtr; + int retLast = length / 3; + int ni, k; + cwPtr += retLast + 1; + for (k = 0; k <= retLast; ++k) { + codewords[ret + k] = 0; + } + codewords[ret + retLast] = 1; + length += start; + for (ni = start; ni < length; ++ni) { + // multiply by 10 + for (k = retLast; k >= 0; --k) { + codewords[ret + k] *= 10; + } + // add the digit + codewords[ret + retLast] += input[ni] - '0'; + // propagate carry + for (k = retLast; k > 0; --k) { + codewords[ret + k - 1] += codewords[ret + k] / 900; + codewords[ret + k] %= 900; + } + } + } + + private void numberCompaction(byte[] input, int start, int length) { + int full = (length / 44) * 15; + int size = length % 44; + int k; + if (size == 0) { + size = full; + } else { + size = full + size / 3 + 1; + } + if (size + cwPtr > MAX_DATA_CODEWORDS) { + throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("the.text.is.too.big")); + } + length += start; + for (k = start; k < length; k += 44) { + size = length - k < 44 ? length - k : 44; + basicNumberCompaction(input, k, size); + } + } + + protected void numberCompaction(int start, int length) { + numberCompaction(text, start, length); + } + + protected void byteCompaction6(int start) { + int length = 6; + int ret = cwPtr; + int retLast = 4; + int ni, k; + cwPtr += retLast + 1; + for (k = 0; k <= retLast; ++k) { + codewords[ret + k] = 0; + } + length += start; + for (ni = start; ni < length; ++ni) { + // multiply by 256 + for (k = retLast; k >= 0; --k) { + codewords[ret + k] *= 256; + } + // add the digit + codewords[ret + retLast] += text[ni] & 0xff; + // propagate carry + for (k = retLast; k > 0; --k) { + codewords[ret + k - 1] += codewords[ret + k] / 900; + codewords[ret + k] %= 900; + } + } + } + + void byteCompaction(int start, int length) { + int k, j; + int size = (length / 6) * 5 + (length % 6); + if (size + cwPtr > MAX_DATA_CODEWORDS) { + throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("the.text.is.too.big")); + } + length += start; + for (k = start; k < length; k += 6) { + size = length - k < 44 ? length - k : 6; + if (size < 6) { + for (j = 0; j < size; ++j) { + codewords[cwPtr++] = text[k + j] & 0xff; + } + } else { + byteCompaction6(k); + } + } + } + + void breakString() { + int textLength = text.length; + int lastP = 0; + int startN = 0; + int nd = 0; + char c = 0; + int k, j; + boolean lastTxt, txt; + Segment v; + Segment vp; + Segment vn; + + if ((options & PDF417_FORCE_BINARY) != 0) { + segmentList.add('B', 0, textLength); + return; + } + for (k = 0; k < textLength; ++k) { + c = (char) (text[k] & 0xff); + if (c >= '0' && c <= '9') { + if (nd == 0) { + startN = k; + } + ++nd; + continue; + } + if (nd >= 13) { + if (lastP != startN) { + c = (char) (text[lastP] & 0xff); + lastTxt = (c >= ' ' && c < 127) || c == '\r' || c == '\n' || c == '\t'; + for (j = lastP; j < startN; ++j) { + c = (char) (text[j] & 0xff); + txt = (c >= ' ' && c < 127) || c == '\r' || c == '\n' || c == '\t'; + if (txt != lastTxt) { + segmentList.add(lastTxt ? 'T' : 'B', lastP, j); + lastP = j; + lastTxt = txt; + } + } + segmentList.add(lastTxt ? 'T' : 'B', lastP, startN); + } + segmentList.add('N', startN, k); + lastP = k; + } + nd = 0; + } + if (nd < 13) { + startN = textLength; + } + if (lastP != startN) { + c = (char) (text[lastP] & 0xff); + lastTxt = (c >= ' ' && c < 127) || c == '\r' || c == '\n' || c == '\t'; + for (j = lastP; j < startN; ++j) { + c = (char) (text[j] & 0xff); + txt = (c >= ' ' && c < 127) || c == '\r' || c == '\n' || c == '\t'; + if (txt != lastTxt) { + segmentList.add(lastTxt ? 'T' : 'B', lastP, j); + lastP = j; + lastTxt = txt; + } + } + segmentList.add(lastTxt ? 'T' : 'B', lastP, startN); + } + if (nd >= 13) { + segmentList.add('N', startN, textLength); + } + //optimize + //merge short binary + for (k = 0; k < segmentList.size(); ++k) { + v = segmentList.get(k); + vp = segmentList.get(k - 1); + vn = segmentList.get(k + 1); + if (checkSegmentType(v, 'B') && getSegmentLength(v) == 1) { + if (checkSegmentType(vp, 'T') && checkSegmentType(vn, 'T') + && getSegmentLength(vp) + getSegmentLength(vn) >= 3) { + vp.end = vn.end; + segmentList.remove(k); + segmentList.remove(k); + k = -1; + continue; + } + } + } + //merge text sections + for (k = 0; k < segmentList.size(); ++k) { + v = segmentList.get(k); + vp = segmentList.get(k - 1); + vn = segmentList.get(k + 1); + if (checkSegmentType(v, 'T') && getSegmentLength(v) >= 5) { + boolean redo = false; + if ((checkSegmentType(vp, 'B') && getSegmentLength(vp) == 1) || checkSegmentType(vp, 'T')) { + redo = true; + v.start = vp.start; + segmentList.remove(k - 1); + --k; + } + if ((checkSegmentType(vn, 'B') && getSegmentLength(vn) == 1) || checkSegmentType(vn, 'T')) { + redo = true; + v.end = vn.end; + segmentList.remove(k + 1); + } + if (redo) { + k = -1; + } + } + } + //merge binary sections + for (k = 0; k < segmentList.size(); ++k) { + v = segmentList.get(k); + vp = segmentList.get(k - 1); + vn = segmentList.get(k + 1); + if (checkSegmentType(v, 'B')) { + boolean redo = false; + if ((checkSegmentType(vp, 'T') && getSegmentLength(vp) < 5) || checkSegmentType(vp, 'B')) { + redo = true; + v.start = vp.start; + segmentList.remove(k - 1); + --k; + } + if ((checkSegmentType(vn, 'T') && getSegmentLength(vn) < 5) || checkSegmentType(vn, 'B')) { + redo = true; + v.end = vn.end; + segmentList.remove(k + 1); + } + if (redo) { + k = -1; + } + } + } + // check if all numbers + if (segmentList.size() == 1 && (v = segmentList.get(0)).type == 'T' && getSegmentLength(v) >= 8) { + for (k = v.start; k < v.end; ++k) { + c = (char) (text[k] & 0xff); + if (c < '0' || c > '9') { + break; + } + } + if (k == v.end) { + v.type = 'N'; + } + } + } + + protected void assemble() { + int k; + if (segmentList.size() == 0) { + return; + } + cwPtr = 1; + for (k = 0; k < segmentList.size(); ++k) { + Segment v = segmentList.get(k); + switch (v.type) { + case 'T': + if (k != 0) { + codewords[cwPtr++] = TEXT_MODE; + } + textCompaction(v.start, getSegmentLength(v)); + break; + case 'N': + codewords[cwPtr++] = NUMERIC_MODE; + numberCompaction(v.start, getSegmentLength(v)); + break; + case 'B': + codewords[cwPtr++] = (getSegmentLength(v) % 6) != 0 ? BYTE_MODE : BYTE_MODE_6; + byteCompaction(v.start, getSegmentLength(v)); + break; + } + } + + if ((options & PDF417_USE_MACRO) != 0) { + macroCodes(); + } + + } + + private void macroCodes() { + if (macroSegmentId < 0) { + throw new IllegalStateException(MessageLocalization.getComposedMessage("macrosegmentid.must.be.gt.eq.0")); + } + if (macroSegmentId >= macroSegmentCount) { + throw new IllegalStateException( + MessageLocalization.getComposedMessage("macrosegmentid.must.be.lt.macrosemgentcount")); + } + + macroIndex = cwPtr; + codewords[cwPtr++] = MACRO_SEGMENT_ID; + append(macroSegmentId, 5); + + if (macroFileId != null) { + append(macroFileId); + } + + if (macroSegmentId >= macroSegmentCount - 1) { + codewords[cwPtr++] = MACRO_LAST_SEGMENT; + } + + } + + private void append(int in, int len) { + StringBuilder sb = new StringBuilder(len + 1); + sb.append(in); + for (int i = sb.length(); i < len; i++) { + sb.insert(0, "0"); + } + + byte[] bytes = PdfEncodings.convertToBytes(sb.toString(), "cp437"); + numberCompaction(bytes, 0, bytes.length); + } + + private void append(String s) { + byte[] bytes = PdfEncodings.convertToBytes(s, "cp437"); + textCompaction(bytes, 0, bytes.length); + } + + protected void dumpList() { + if (segmentList.size() == 0) { + return; + } + for (int k = 0; k < segmentList.size(); ++k) { + Segment v = segmentList.get(k); + int len = getSegmentLength(v); + char[] c = new char[len]; + for (int j = 0; j < len; ++j) { + c[j] = (char) (text[v.start + j] & 0xff); + if (c[j] == '\r') { + c[j] = '\n'; + } + } + StringBuilder sb = new StringBuilder(); + sb.append(v.type); + sb.append(c); + System.out.println(sb.toString()); + } + } + + protected int getMaxSquare() { + if (codeColumns > 21) { + codeColumns = 29; + codeRows = 32; + } else { + codeColumns = 16; + codeRows = 58; + } + return MAX_DATA_CODEWORDS + 2; + } + + /** + * Paints the barcode. If no exception was thrown a valid barcode is available. + */ + public void paintCode() { + int maxErr, lenErr, tot, pad; + if ((options & PDF417_USE_RAW_CODEWORDS) != 0) { + if (lenCodewords > MAX_DATA_CODEWORDS || lenCodewords < 1 || lenCodewords != codewords[0]) { + throw new IllegalArgumentException(MessageLocalization.getComposedMessage("invalid.codeword.size")); + } + } else { + if (text == null) { + throw new NullPointerException(MessageLocalization.getComposedMessage("text.cannot.be.null")); + } + if (text.length > ABSOLUTE_MAX_TEXT_SIZE) { + throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("the.text.is.too.big")); + } + segmentList = new SegmentList(); + breakString(); + //dumpList(); + assemble(); + segmentList = null; + codewords[0] = lenCodewords = cwPtr; + } + maxErr = maxPossibleErrorLevel(MAX_DATA_CODEWORDS + 2 - lenCodewords); + if ((options & PDF417_USE_ERROR_LEVEL) == 0) { + if (lenCodewords < 41) { + errorLevel = 2; + } else if (lenCodewords < 161) { + errorLevel = 3; + } else if (lenCodewords < 321) { + errorLevel = 4; + } else { + errorLevel = 5; + } + } + if (errorLevel < 0) { + errorLevel = 0; + } else if (errorLevel > maxErr) { + errorLevel = maxErr; + } + if (codeColumns < 1) { + codeColumns = 1; + } else if (codeColumns > 30) { + codeColumns = 30; + } + if (codeRows < 3) { + codeRows = 3; + } else if (codeRows > 90) { + codeRows = 90; + } + lenErr = 2 << errorLevel; + boolean fixedColumn = (options & PDF417_FIXED_ROWS) == 0; + boolean skipRowColAdjust = false; + tot = lenCodewords + lenErr; + if ((options & PDF417_FIXED_RECTANGLE) != 0) { + tot = codeColumns * codeRows; + if (tot > MAX_DATA_CODEWORDS + 2) { + tot = getMaxSquare(); + } + if (tot < lenCodewords + lenErr) { + tot = lenCodewords + lenErr; + } else { + skipRowColAdjust = true; + } + } else if ((options & (PDF417_FIXED_COLUMNS | PDF417_FIXED_ROWS)) == 0) { + double c, b; + fixedColumn = true; + if (aspectRatio < 0.001) { + aspectRatio = 0.001f; + } else if (aspectRatio > 1000) { + aspectRatio = 1000; + } + b = 73 * aspectRatio - 4; + c = (-b + Math.sqrt(b * b + 4 * 17 * aspectRatio * (lenCodewords + lenErr) * yHeight)) / (2 * 17 + * aspectRatio); + codeColumns = (int) (c + 0.5); + if (codeColumns < 1) { + codeColumns = 1; + } else if (codeColumns > 30) { + codeColumns = 30; + } + } + if (!skipRowColAdjust) { + if (fixedColumn) { + codeRows = (tot - 1) / codeColumns + 1; + if (codeRows < 3) { + codeRows = 3; + } else if (codeRows > 90) { + codeRows = 90; + codeColumns = (tot - 1) / 90 + 1; + } + } else { + codeColumns = (tot - 1) / codeRows + 1; + if (codeColumns > 30) { + codeColumns = 30; + codeRows = (tot - 1) / 30 + 1; + } + } + tot = codeRows * codeColumns; + } + if (tot > MAX_DATA_CODEWORDS + 2) { + tot = getMaxSquare(); + } + errorLevel = maxPossibleErrorLevel(tot - lenCodewords); + lenErr = 2 << errorLevel; + pad = tot - lenErr - lenCodewords; + if ((options & PDF417_USE_MACRO) != 0) { + // the padding comes before the control block + int lenCodewordsAdjusted = lenCodewords = macroIndex; + System.arraycopy(codewords, macroIndex, codewords, macroIndex + pad, lenCodewordsAdjusted); + cwPtr = lenCodewords + pad; + while (pad-- != 0) { + codewords[macroIndex++] = TEXT_MODE; + } + } else { + cwPtr = lenCodewords; + while (pad-- != 0) { + codewords[cwPtr++] = TEXT_MODE; + } + } + codewords[0] = lenCodewords = cwPtr; + calculateErrorCorrection(lenCodewords); + lenCodewords = tot; + outPaintCode(); + } + + /** + * Gets an Image with the barcode. The image will have to be scaled in the Y direction by + * yHeightfor the barcode to have the right printing aspect. + * + * @return the barcode Image + * @throws BadElementException on error + */ + public Image getImage() throws BadElementException { + paintCode(); + byte[] g4 = CCITTG4Encoder.compress(outBits, bitColumns, codeRows); + return Image.getInstance(bitColumns, codeRows, false, Image.CCITTG4, + (options & PDF417_INVERT_BITMAP) == 0 ? 0 : Image.CCITT_BLACKIS1, g4, null); + } + + /** + * Creates a java.awt.Image. + * + * @param foreground the color of the bars + * @param background the color of the background + * @return the image + */ + public java.awt.Image createAwtImage(Color foreground, Color background) { + int f = foreground.getRGB(); + int g = background.getRGB(); + Canvas canvas = new Canvas(); + + paintCode(); + int h = (int) yHeight; + int[] pix = new int[bitColumns * codeRows * h]; + int stride = (bitColumns + 7) / 8; + int ptr = 0; + for (int k = 0; k < codeRows; ++k) { + int p = k * stride; + for (int j = 0; j < bitColumns; ++j) { + int b = outBits[p + (j / 8)] & 0xff; + b <<= j % 8; + pix[ptr++] = (b & 0x80) == 0 ? g : f; + } + for (int j = 1; j < h; ++j) { + System.arraycopy(pix, ptr - bitColumns, pix, ptr + bitColumns * (j - 1), bitColumns); + } + ptr += bitColumns * (h - 1); + } + + java.awt.Image img = canvas.createImage(new MemoryImageSource(bitColumns, codeRows * h, pix, 0, bitColumns)); + return img; + } + + /** + * Gets the raw image bits of the barcode. The image will have to be scaled in the Y direction by + * yHeight. + * + * @return The raw barcode image + */ + public byte[] getOutBits() { + return this.outBits; + } + + /** + * Gets the number of X pixels of outBits. + * + * @return the number of X pixels of outBits + */ + public int getBitColumns() { + return this.bitColumns; + } + + /** + * Gets the number of Y pixels of outBits. It is also the number of rows in the barcode. + * + * @return the number of Y pixels of outBits + */ + public int getCodeRows() { + return this.codeRows; + } + + /** + * Sets the number of barcode rows. This number may be changed to keep the barcode valid. + * + * @param codeRows the number of barcode rows + */ + public void setCodeRows(int codeRows) { + this.codeRows = codeRows; + } + + /** + * Gets the number of barcode data columns. + * + * @return he number of barcode data columns + */ + public int getCodeColumns() { + return this.codeColumns; + } + + /** + * Sets the number of barcode data columns. This number may be changed to keep the barcode valid. + * + * @param codeColumns the number of barcode data columns + */ + public void setCodeColumns(int codeColumns) { + this.codeColumns = codeColumns; + } + + /** + * Gets the codeword array. This array is always 928 elements long. It can be written to if the option + * PDF417_USE_RAW_CODEWORDS is set. + * + * @return the codeword array + */ + public int[] getCodewords() { + return this.codewords; + } + + /** + * Gets the length of the codewords. + * + * @return the length of the codewords + */ + public int getLenCodewords() { + return this.lenCodewords; + } + + /** + * Sets the length of the codewords. + * + * @param lenCodewords the length of the codewords + */ + public void setLenCodewords(int lenCodewords) { + this.lenCodewords = lenCodewords; + } + + /** + * Gets the error level correction used for the barcode. It may different from the previously set value. + * + * @return the error level correction used for the barcode + */ + public int getErrorLevel() { + return this.errorLevel; + } + + /** + * Sets the error level correction for the barcode. + * + * @param errorLevel the error level correction for the barcode + */ + public void setErrorLevel(int errorLevel) { + this.errorLevel = errorLevel; + } + + /** + * Gets the bytes that form the barcode. This bytes should be interpreted in the codepage Cp437. + * + * @return the bytes that form the barcode + */ + public byte[] getText() { + return this.text; + } + + /** + * Sets the bytes that form the barcode. This bytes should be interpreted in the codepage Cp437. + * + * @param text the bytes that form the barcode + */ + public void setText(byte[] text) { + this.text = text; + } + + /** + * Sets the text that will form the barcode. This text is converted to bytes using the encoding Cp437. + * + * @param s the text that will form the barcode + */ + public void setText(String s) { + this.text = PdfEncodings.convertToBytes(s, "cp437"); + } + + /** + * Gets the options to generate the barcode. + * + * @return the options to generate the barcode + */ + public int getOptions() { + return this.options; + } + + /** + * Sets the options to generate the barcode. This can be all the PDF417_* constants. + * + * @param options the options to generate the barcode + */ + public void setOptions(int options) { + this.options = options; + } + + /** + * Gets the barcode aspect ratio. + * + * @return the barcode aspect ratio + */ + public float getAspectRatio() { + return this.aspectRatio; + } + + /** + * Sets the barcode aspect ratio. A ratio or 0.5 will make the barcode width twice as large as the height. + * + * @param aspectRatio the barcode aspect ratio + */ + public void setAspectRatio(float aspectRatio) { + this.aspectRatio = aspectRatio; + } + + /** + * Gets the Y pixel height relative to X. + * + * @return the Y pixel height relative to X + */ + public float getYHeight() { + return this.yHeight; + } + + /** + * Sets the Y pixel height relative to X. It is usually 3. + * + * @param yHeight the Y pixel height relative to X + */ + public void setYHeight(float yHeight) { + this.yHeight = yHeight; + } - private static final int[][] ERROR_LEVEL = - {{ - 27, 917 - }, { - 522, 568, 723, 809 - }, { - 237, 308, 436, 284, 646, 653, 428, 379 - }, { - 274, 562, 232, 755, 599, 524, 801, 132, 295, 116, 442, 428, 295, 42, 176, 65 - }, { - 361, 575, 922, 525, 176, 586, 640, 321, 536, 742, 677, 742, 687, 284, 193, 517, - 273, 494, 263, 147, 593, 800, 571, 320, 803, 133, 231, 390, 685, 330, 63, 410 - }, { - 539, 422, 6, 93, 862, 771, 453, 106, 610, 287, 107, 505, 733, 877, 381, 612, - 723, 476, 462, 172, 430, 609, 858, 822, 543, 376, 511, 400, 672, 762, 283, 184, - 440, 35, 519, 31, 460, 594, 225, 535, 517, 352, 605, 158, 651, 201, 488, 502, - 648, 733, 717, 83, 404, 97, 280, 771, 840, 629, 4, 381, 843, 623, 264, 543 - }, { - 521, 310, 864, 547, 858, 580, 296, 379, 53, 779, 897, 444, 400, 925, 749, 415, - 822, 93, 217, 208, 928, 244, 583, 620, 246, 148, 447, 631, 292, 908, 490, 704, - 516, 258, 457, 907, 594, 723, 674, 292, 272, 96, 684, 432, 686, 606, 860, 569, - 193, 219, 129, 186, 236, 287, 192, 775, 278, 173, 40, 379, 712, 463, 646, 776, - 171, 491, 297, 763, 156, 732, 95, 270, 447, 90, 507, 48, 228, 821, 808, 898, - 784, 663, 627, 378, 382, 262, 380, 602, 754, 336, 89, 614, 87, 432, 670, 616, - 157, 374, 242, 726, 600, 269, 375, 898, 845, 454, 354, 130, 814, 587, 804, 34, - 211, 330, 539, 297, 827, 865, 37, 517, 834, 315, 550, 86, 801, 4, 108, 539 - }, { - 524, 894, 75, 766, 882, 857, 74, 204, 82, 586, 708, 250, 905, 786, 138, 720, - 858, 194, 311, 913, 275, 190, 375, 850, 438, 733, 194, 280, 201, 280, 828, 757, - 710, 814, 919, 89, 68, 569, 11, 204, 796, 605, 540, 913, 801, 700, 799, 137, - 439, 418, 592, 668, 353, 859, 370, 694, 325, 240, 216, 257, 284, 549, 209, 884, - 315, 70, 329, 793, 490, 274, 877, 162, 749, 812, 684, 461, 334, 376, 849, 521, - 307, 291, 803, 712, 19, 358, 399, 908, 103, 511, 51, 8, 517, 225, 289, 470, - 637, 731, 66, 255, 917, 269, 463, 830, 730, 433, 848, 585, 136, 538, 906, 90, - 2, 290, 743, 199, 655, 903, 329, 49, 802, 580, 355, 588, 188, 462, 10, 134, - 628, 320, 479, 130, 739, 71, 263, 318, 374, 601, 192, 605, 142, 673, 687, 234, - 722, 384, 177, 752, 607, 640, 455, 193, 689, 707, 805, 641, 48, 60, 732, 621, - 895, 544, 261, 852, 655, 309, 697, 755, 756, 60, 231, 773, 434, 421, 726, 528, - 503, 118, 49, 795, 32, 144, 500, 238, 836, 394, 280, 566, 319, 9, 647, 550, - 73, 914, 342, 126, 32, 681, 331, 792, 620, 60, 609, 441, 180, 791, 893, 754, - 605, 383, 228, 749, 760, 213, 54, 297, 134, 54, 834, 299, 922, 191, 910, 532, - 609, 829, 189, 20, 167, 29, 872, 449, 83, 402, 41, 656, 505, 579, 481, 173, - 404, 251, 688, 95, 497, 555, 642, 543, 307, 159, 924, 558, 648, 55, 497, 10 - }, { - 352, 77, 373, 504, 35, 599, 428, 207, 409, 574, 118, 498, 285, 380, 350, 492, - 197, 265, 920, 155, 914, 299, 229, 643, 294, 871, 306, 88, 87, 193, 352, 781, - 846, 75, 327, 520, 435, 543, 203, 666, 249, 346, 781, 621, 640, 268, 794, 534, - 539, 781, 408, 390, 644, 102, 476, 499, 290, 632, 545, 37, 858, 916, 552, 41, - 542, 289, 122, 272, 383, 800, 485, 98, 752, 472, 761, 107, 784, 860, 658, 741, - 290, 204, 681, 407, 855, 85, 99, 62, 482, 180, 20, 297, 451, 593, 913, 142, - 808, 684, 287, 536, 561, 76, 653, 899, 729, 567, 744, 390, 513, 192, 516, 258, - 240, 518, 794, 395, 768, 848, 51, 610, 384, 168, 190, 826, 328, 596, 786, 303, - 570, 381, 415, 641, 156, 237, 151, 429, 531, 207, 676, 710, 89, 168, 304, 402, - 40, 708, 575, 162, 864, 229, 65, 861, 841, 512, 164, 477, 221, 92, 358, 785, - 288, 357, 850, 836, 827, 736, 707, 94, 8, 494, 114, 521, 2, 499, 851, 543, - 152, 729, 771, 95, 248, 361, 578, 323, 856, 797, 289, 51, 684, 466, 533, 820, - 669, 45, 902, 452, 167, 342, 244, 173, 35, 463, 651, 51, 699, 591, 452, 578, - 37, 124, 298, 332, 552, 43, 427, 119, 662, 777, 475, 850, 764, 364, 578, 911, - 283, 711, 472, 420, 245, 288, 594, 394, 511, 327, 589, 777, 699, 688, 43, 408, - 842, 383, 721, 521, 560, 644, 714, 559, 62, 145, 873, 663, 713, 159, 672, 729, - 624, 59, 193, 417, 158, 209, 563, 564, 343, 693, 109, 608, 563, 365, 181, 772, - 677, 310, 248, 353, 708, 410, 579, 870, 617, 841, 632, 860, 289, 536, 35, 777, - 618, 586, 424, 833, 77, 597, 346, 269, 757, 632, 695, 751, 331, 247, 184, 45, - 787, 680, 18, 66, 407, 369, 54, 492, 228, 613, 830, 922, 437, 519, 644, 905, - 789, 420, 305, 441, 207, 300, 892, 827, 141, 537, 381, 662, 513, 56, 252, 341, - 242, 797, 838, 837, 720, 224, 307, 631, 61, 87, 560, 310, 756, 665, 397, 808, - 851, 309, 473, 795, 378, 31, 647, 915, 459, 806, 590, 731, 425, 216, 548, 249, - 321, 881, 699, 535, 673, 782, 210, 815, 905, 303, 843, 922, 281, 73, 469, 791, - 660, 162, 498, 308, 155, 422, 907, 817, 187, 62, 16, 425, 535, 336, 286, 437, - 375, 273, 610, 296, 183, 923, 116, 667, 751, 353, 62, 366, 691, 379, 687, 842, - 37, 357, 720, 742, 330, 5, 39, 923, 311, 424, 242, 749, 321, 54, 669, 316, - 342, 299, 534, 105, 667, 488, 640, 672, 576, 540, 316, 486, 721, 610, 46, 656, - 447, 171, 616, 464, 190, 531, 297, 321, 762, 752, 533, 175, 134, 14, 381, 433, - 717, 45, 111, 20, 596, 284, 736, 138, 646, 411, 877, 669, 141, 919, 45, 780, - 407, 164, 332, 899, 165, 726, 600, 325, 498, 655, 357, 752, 768, 223, 849, 647, - 63, 310, 863, 251, 366, 304, 282, 738, 675, 410, 389, 244, 31, 121, 303, 263 - }}; - - /** Holds value of property outBits. */ - private byte[] outBits; - - /** Holds value of property bitColumns. */ - private int bitColumns; - - /** Holds value of property codeRows. */ - private int codeRows; - - /** Holds value of property codeColumns. */ - private int codeColumns; - - /** Holds value of property codewords. */ - private int[] codewords = new int[MAX_DATA_CODEWORDS + 2]; - - /** Holds value of property lenCodewords. */ - private int lenCodewords; - - /** Holds value of property errorLevel. */ - private int errorLevel; - - /** Holds value of property text. */ - private byte[] text; - - /** Holds value of property options. */ - private int options; - - /** Holds value of property aspectRatio. */ - private float aspectRatio; - - /** Holds value of property yHeight. */ - private float yHeight; - protected static class Segment { + public char type; public int start; public int end; - + public Segment(char type, int start, int end) { this.type = type; this.start = start; this.end = end; } } - + protected static class SegmentList { + protected ArrayList list = new ArrayList<>(); - + public void add(char type, int start, int end) { list.add(new Segment(type, start, end)); } public Segment get(int idx) { - if (idx < 0 || idx >= list.size()) + if (idx < 0 || idx >= list.size()) { return null; + } return list.get(idx); } public void remove(int idx) { - if (idx < 0 || idx >= list.size()) + if (idx < 0 || idx >= list.size()) { return; + } list.remove(idx); } - + public int size() { return list.size(); } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodePostnet.java b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodePostnet.java index 1e5bcf1fb..2cb723bc6 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/BarcodePostnet.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/BarcodePostnet.java @@ -45,25 +45,26 @@ * https://github.com/LibrePDF/OpenPDF */ package com.lowagie.text.pdf; + +import com.lowagie.text.Rectangle; import java.awt.Canvas; import java.awt.Color; import java.awt.Image; import java.awt.image.MemoryImageSource; -import com.lowagie.text.Rectangle; - -/** Implements the Postnet and Planet barcodes. The default parameters are: +/** + * Implements the Postnet and Planet barcodes. The default parameters are: * 
      - *n = 72f / 22f; // distance between bars
- *x = 0.02f * 72f; // bar width
- *barHeight = 0.125f * 72f; // height of the tall bars
- *size = 0.05f * 72f; // height of the short bars
- *codeType = POSTNET; // type of code
+ * n = 72f / 22f; // distance between bars
+ * x = 0.02f * 72f; // bar width
+ * barHeight = 0.125f * 72f; // height of the tall bars
+ * size = 0.05f * 72f; // height of the short bars
+ * codeType = POSTNET; // type of code
  *
      * * @author Paulo Soares (psoares@consiste.pt) */ -public class BarcodePostnet extends Barcode{ +public class BarcodePostnet extends Barcode { /** * The bars for each character. @@ -81,8 +82,10 @@ public class BarcodePostnet extends Barcode{ {1, 0, 0, 1, 0}, {1, 0, 1, 0, 0} }; - - /** Creates new BarcodePostnet */ + + /** + * Creates new BarcodePostnet + */ public BarcodePostnet() { n = 72f / 22f; // distance between bars x = 0.02f * 72f; // bar width @@ -90,18 +93,20 @@ public BarcodePostnet() { size = 0.05f * 72f; // height of the short bars codeType = POSTNET; // type of code } - - /** Creates the bars for Postnet. + + /** + * Creates the bars for Postnet. + * * @param text the code to be created without checksum * @return the bars - */ + */ public static byte[] getBarsPostnet(String text) { int total = 0; for (int k = text.length() - 1; k >= 0; --k) { int n = text.charAt(k) - '0'; total += n; } - text += (char)(((10 - (total % 10)) % 10) + '0'); + text += (char) (((10 - (total % 10)) % 10) + '0'); byte[] bars = new byte[text.length() * 5 + 2]; bars[0] = 1; bars[bars.length - 1] = 1; @@ -112,55 +117,59 @@ public static byte[] getBarsPostnet(String text) { return bars; } - /** Gets the maximum area that the barcode and the text, if - * any, will occupy. The lower left corner is always (0, 0). + /** + * Gets the maximum area that the barcode and the text, if any, will occupy. The lower left corner is always (0, + * 0). + * * @return the size the barcode occupies. */ public Rectangle getBarcodeSize() { float width = ((code.length() + 1) * 5 + 1) * n + x; return new Rectangle(width, barHeight); } - - /** Places the barcode in a PdfContentByte. The - * barcode is always placed at coordinates (0, 0). Use the + + /** + * Places the barcode in a PdfContentByte. The barcode is always placed at coordinates (0, 0). Use the * translation matrix to move it elsewhere. *

      The bars and text are written in the following colors:

      * - * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * * - * - * - * - * + * + * + * + * *
      table of the colors of the bars and texttable of the colors of the bars and text

      barColor

      textColor

      Result

      barColor

      textColor

      Result

      null

      null

      bars and text painted with current fill color

      null

      null

      bars and text painted with current fill color

      barColor

      null

      bars and text painted with barColor

      barColor

      null

      bars and text painted with barColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      null

      textColor

      bars painted with current color
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      barColor

      textColor

      bars painted with barColor
      text painted with textColor

      - * @param cb the PdfContentByte where the barcode will be placed - * @param barColor the color of the bars. It can be null + * + * @param cb the PdfContentByte where the barcode will be placed + * @param barColor the color of the bars. It can be null * @param textColor the color of the text. It can be null * @return the dimensions the barcode occupies */ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor) { - if (barColor != null) + if (barColor != null) { cb.setColorFill(barColor); + } byte[] bars = getBarsPostnet(code); byte flip = 1; if (codeType == PLANET) { @@ -176,30 +185,34 @@ public Rectangle placeBarcode(PdfContentByte cb, Color barColor, Color textColor cb.fill(); return getBarcodeSize(); } - - /** Creates a java.awt.Image. This image only - * contains the bars without any text. + + /** + * Creates a java.awt.Image. This image only contains the bars without any text. + * * @param foreground the color of the bars * @param background the color of the background * @return the image - * */ public java.awt.Image createAwtImage(Color foreground, Color background) { int f = foreground.getRGB(); int g = background.getRGB(); Canvas canvas = new Canvas(); - int barWidth = (int)x; - if (barWidth <= 0) + int barWidth = (int) x; + if (barWidth <= 0) { barWidth = 1; - int barDistance = (int)n; - if (barDistance <= barWidth) + } + int barDistance = (int) n; + if (barDistance <= barWidth) { barDistance = barWidth + 1; - int barShort = (int)size; - if (barShort <= 0) + } + int barShort = (int) size; + if (barShort <= 0) { barShort = 1; - int barTall = (int)barHeight; - if (barTall <= barShort) + } + int barTall = (int) barHeight; + if (barTall <= barShort) { barTall = barShort + 1; + } int width = ((code.length() + 1) * 5 + 1) * barDistance + barWidth; int[] pix = new int[width * barTall]; byte[] bars = getBarsPostnet(code); @@ -218,8 +231,9 @@ public java.awt.Image createAwtImage(Color foreground, Color background) { idx += barDistance; } int limit = width * (barTall - barShort); - for (int k = width; k < limit; k += width) + for (int k = width; k < limit; k += width) { System.arraycopy(pix, 0, pix, k, width); + } idx = limit; for (int k = 0; k < bars.length; ++k) { for (int j = 0; j < barDistance; ++j) { @@ -227,10 +241,11 @@ public java.awt.Image createAwtImage(Color foreground, Color background) { } idx += barDistance; } - for (int k = limit + width; k < pix.length; k += width) + for (int k = limit + width; k < pix.length; k += width) { System.arraycopy(pix, limit, pix, k, width); + } Image img = canvas.createImage(new MemoryImageSource(width, barTall, pix, 0, width)); - + return img; } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BaseField.java b/openpdf/src/main/java/com/lowagie/text/pdf/BaseField.java index 1d67025a2..1c183a64d 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/BaseField.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/BaseField.java @@ -47,6 +47,10 @@ package com.lowagie.text.pdf; +import com.lowagie.text.DocumentException; +import com.lowagie.text.Element; +import com.lowagie.text.Rectangle; +import com.lowagie.text.error_messages.MessageLocalization; import java.awt.Color; import java.io.IOException; import java.util.ArrayList; @@ -55,81 +59,102 @@ import java.util.List; import java.util.Map; -import com.lowagie.text.error_messages.MessageLocalization; - -import com.lowagie.text.DocumentException; -import com.lowagie.text.Element; -import com.lowagie.text.Rectangle; - -/** Common field variables. +/** + * Common field variables. + * * @author Paulo Soares (psoares@consiste.pt) */ public abstract class BaseField { - /** A thin border with 1 point width. */ + /** + * A thin border with 1 point width. + */ public static final float BORDER_WIDTH_THIN = 1; - /** A medium border with 2 point width. */ + /** + * A medium border with 2 point width. + */ public static final float BORDER_WIDTH_MEDIUM = 2; - /** A thick border with 3 point width. */ + /** + * A thick border with 3 point width. + */ public static final float BORDER_WIDTH_THICK = 3; - /** The field is visible. */ + /** + * The field is visible. + */ public static final int VISIBLE = 0; - /** The field is hidden. */ + /** + * The field is hidden. + */ public static final int HIDDEN = 1; - /** The field is visible but does not print. */ + /** + * The field is visible but does not print. + */ public static final int VISIBLE_BUT_DOES_NOT_PRINT = 2; - /** The field is hidden but is printable. */ + /** + * The field is hidden but is printable. + */ public static final int HIDDEN_BUT_PRINTABLE = 3; - - /** The annotation flag: Invisible. */ + + /** + * The annotation flag: Invisible. + */ public static final int INVISIBLE = PdfAnnotation.FLAGS_INVISIBLE; - /** The annotation flag Hidden. */ + /** The annotation flag Hidden. */ //public static final int HIDDEN = PdfAnnotation.FLAGS_HIDDEN; - /** The annotation flag Hidden. */ + /** + * The annotation flag Hidden. + */ public static final int PRINT = PdfAnnotation.FLAGS_PRINT; - /** The annotation flag Hidden. */ + /** + * The annotation flag Hidden. + */ public static final int NOVIEW = PdfAnnotation.FLAGS_NOVIEW; - /** The annotation flag Hidden. */ + /** + * The annotation flag Hidden. + */ public static final int LOCKED = PdfAnnotation.FLAGS_LOCKED; - - - /** The user may not change the value of the field. */ + + + /** + * The user may not change the value of the field. + */ public static final int READ_ONLY = PdfFormField.FF_READ_ONLY; - /** The field must have a value at the time it is exported by a submit-form - * action. + /** + * The field must have a value at the time it is exported by a submit-form action. */ public static final int REQUIRED = PdfFormField.FF_REQUIRED; - /** The field may contain multiple lines of text. - * This flag is only meaningful with text fields. + /** + * The field may contain multiple lines of text. This flag is only meaningful with text fields. */ public static final int MULTILINE = PdfFormField.FF_MULTILINE; - /** The field will not scroll (horizontally for single-line - * fields, vertically for multiple-line fields) to accommodate more text - * than will fit within its annotation rectangle. Once the field is full, no - * further text will be accepted. + /** + * The field will not scroll (horizontally for single-line fields, vertically for multiple-line fields) to + * accommodate more text than will fit within its annotation rectangle. Once the field is full, no further text will + * be accepted. */ public static final int DO_NOT_SCROLL = PdfFormField.FF_DONOTSCROLL; - /** The field is intended for entering a secure password that should - * not be echoed visibly to the screen. + /** + * The field is intended for entering a secure password that should not be echoed visibly to the screen. */ public static final int PASSWORD = PdfFormField.FF_PASSWORD; - /** The text entered in the field represents the pathname of - * a file whose contents are to be submitted as the value of the field. + /** + * The text entered in the field represents the pathname of a file whose contents are to be submitted as the value + * of the field. */ public static final int FILE_SELECTION = PdfFormField.FF_FILESELECT; - /** The text entered in the field will not be spell-checked. - * This flag is meaningful only in text fields and in combo + /** + * The text entered in the field will not be spell-checked. This flag is meaningful only in text fields and in combo * fields with the EDIT flag set. */ public static final int DO_NOT_SPELL_CHECK = PdfFormField.FF_DONOTSPELLCHECK; - /** If set the combo box includes an editable text box as well as a drop list; if - * clear, it includes only a drop list. - * This flag is only meaningful with combo fields. + /** + * If set the combo box includes an editable text box as well as a drop list; if clear, it includes only a drop + * list. This flag is only meaningful with combo fields. */ public static final int EDIT = PdfFormField.FF_EDIT; - /** whether or not a list may have multiple selections. Only applies to /CH LIST - * fields, not combo boxes. + /** + * whether or not a list may have multiple selections. Only applies to /CH LIST fields, not combo boxes. */ public static final int MULTISELECT = PdfFormField.FF_MULTISELECT; @@ -137,6 +162,12 @@ public abstract class BaseField { * combo box flag. */ public static final int COMB = PdfFormField.FF_COMB; + private final static Map fieldKeys = new HashMap<>(); + + static { + fieldKeys.putAll(PdfCopyFieldsImp.fieldKeys); + fieldKeys.put(PdfName.T, 1); + } protected float borderWidth = BORDER_WIDTH_THIN; protected int borderStyle = PdfBorderDictionary.STYLE_SOLID; @@ -149,39 +180,42 @@ public abstract class BaseField { protected PdfWriter writer; protected String text; protected Rectangle box; - - /** Holds value of property rotation. */ + /** + * Holds value of property rotation. + */ protected int rotation = 0; - - /** Holds value of property visibility. */ + /** + * Holds value of property visibility. + */ protected int visibility; - - /** Holds value of property fieldName. */ + /** + * Holds value of property fieldName. + */ protected String fieldName; - - /** Holds the value of the alternate field name. (PDF attribute 'TU') */ + /** + * Holds the value of the alternate field name. (PDF attribute 'TU') + */ protected String alternateFieldName; - - /** Holds the value of the mapping field name. (PDF attribute 'TM') */ + /** + * Holds the value of the mapping field name. (PDF attribute 'TM') + */ protected String mappingName; - - /** Holds value of property options. */ + /** + * Holds value of property options. + */ protected int options; - - /** Holds value of property maxCharacterLength. */ + /** + * Holds value of property maxCharacterLength. + */ protected int maxCharacterLength; - private final static Map fieldKeys = new HashMap<>(); - - static { - fieldKeys.putAll(PdfCopyFieldsImp.fieldKeys); - fieldKeys.put(PdfName.T, 1); - } - /** Creates a new TextField. - * @param writer the document PdfWriter - * @param box the field location and dimensions - * @param fieldName the field name. If null only the widget keys - * will be included in the field allowing it to be used as a kid field. + /** + * Creates a new TextField. + * + * @param writer the document PdfWriter + * @param box the field location and dimensions + * @param fieldName the field name. If null only the widget keys will be included in the field allowing + * it to be used as a kid field. */ public BaseField(PdfWriter writer, Rectangle box, String fieldName) { this.writer = writer; @@ -189,14 +223,9 @@ public BaseField(PdfWriter writer, Rectangle box, String fieldName) { this.fieldName = fieldName; } - protected BaseFont getRealFont() throws IOException, DocumentException { - if (font == null) - return BaseFont.createFont(BaseFont.HELVETICA, BaseFont.WINANSI, false); - else - return font; - } - - protected static PdfAppearance getBorderAppearance(PdfWriter writer, Rectangle box, int rotation, Color backgroundColor,int borderStyle,float borderWidth, Color borderColor, int options,int maxCharacterLength) { + protected static PdfAppearance getBorderAppearance(PdfWriter writer, Rectangle box, int rotation, + Color backgroundColor, int borderStyle, float borderWidth, Color borderColor, int options, + int maxCharacterLength) { PdfAppearance app = PdfAppearance.createAppearance(writer, box.getWidth(), box.getHeight()); switch (rotation) { case 90: @@ -225,43 +254,45 @@ protected static PdfAppearance getBorderAppearance(PdfWriter writer, Rectangle b app.lineTo(box.getWidth(), borderWidth / 2); app.stroke(); } - } - else if (borderStyle == PdfBorderDictionary.STYLE_BEVELED) { + } else if (borderStyle == PdfBorderDictionary.STYLE_BEVELED) { if (borderWidth != 0 && borderColor != null) { app.setColorStroke(borderColor); app.setLineWidth(borderWidth); - app.rectangle(borderWidth / 2, borderWidth / 2, box.getWidth() - borderWidth, box.getHeight() - borderWidth); + app.rectangle(borderWidth / 2, borderWidth / 2, box.getWidth() - borderWidth, + box.getHeight() - borderWidth); app.stroke(); } // beveled Color actual = backgroundColor; - if (actual == null) + if (actual == null) { actual = Color.white; + } app.setGrayFill(1); - drawTopFrame(app,borderWidth,box); + drawTopFrame(app, borderWidth, box); app.setColorFill(actual.darker()); - drawBottomFrame(app,borderWidth,box); - } - else if (borderStyle == PdfBorderDictionary.STYLE_INSET) { + drawBottomFrame(app, borderWidth, box); + } else if (borderStyle == PdfBorderDictionary.STYLE_INSET) { if (borderWidth != 0 && borderColor != null) { app.setColorStroke(borderColor); app.setLineWidth(borderWidth); - app.rectangle(borderWidth / 2, borderWidth / 2, box.getWidth() - borderWidth, box.getHeight() - borderWidth); + app.rectangle(borderWidth / 2, borderWidth / 2, box.getWidth() - borderWidth, + box.getHeight() - borderWidth); app.stroke(); } // inset app.setGrayFill(0.5f); - drawTopFrame(app,borderWidth,box); + drawTopFrame(app, borderWidth, box); app.setGrayFill(0.75f); - drawBottomFrame(app,borderWidth,box); - } - else { + drawBottomFrame(app, borderWidth, box); + } else { if (borderWidth != 0 && borderColor != null) { - if (borderStyle == PdfBorderDictionary.STYLE_DASHED) + if (borderStyle == PdfBorderDictionary.STYLE_DASHED) { app.setLineDash(3, 0); + } app.setColorStroke(borderColor); app.setLineWidth(borderWidth); - app.rectangle(borderWidth / 2, borderWidth / 2, box.getWidth() - borderWidth, box.getHeight() - borderWidth); + app.rectangle(borderWidth / 2, borderWidth / 2, box.getWidth() - borderWidth, + box.getHeight() - borderWidth); app.stroke(); //comb formfield flag is set and maxchar must be set (for textfield only!) if ((options & COMB) != 0 && maxCharacterLength > 1) { @@ -289,17 +320,17 @@ protected static List getAllHardBreaks(String text) { for (int k = 0; k < len; ++k) { char c = cs[k]; if (c == '\r') { - if (k + 1 < len && cs[k + 1] == '\n') + if (k + 1 < len && cs[k + 1] == '\n') { ++k; + } arr.add(buf.toString()); buf = new StringBuffer(); - } - else if (c == '\n') { + } else if (c == '\n') { arr.add(buf.toString()); buf = new StringBuffer(); - } - else + } else { buf.append(c); + } } arr.add(buf.toString()); return arr; @@ -308,10 +339,12 @@ else if (c == '\n') { protected static void trimRight(StringBuffer buf) { int len = buf.length(); while (true) { - if (len == 0) + if (len == 0) { return; - if (buf.charAt(--len) != ' ') + } + if (buf.charAt(--len) != ' ') { return; + } buf.setLength(len); } } @@ -344,20 +377,23 @@ protected static List breakLines(List breaks, BaseFont font, flo lines.add(buf.toString()); buf.setLength(0); refk = k; - if (c == ' ') + if (c == ' ') { state = 2; - else + } else { state = 1; + } } else { - if (c != ' ') + if (c != ' ') { state = 1; + } } break; case 1: w += font.getWidthPoint(c, fontSize); buf.append(c); - if (c == ' ') + if (c == ' ') { lastspace = k; + } if (w > width) { w = 0; if (lastspace >= 0) { @@ -377,8 +413,9 @@ protected static List breakLines(List breaks, BaseFont font, flo lines.add(buf.toString()); buf.setLength(0); refk = k; - if (c == ' ') + if (c == ' ') { state = 2; + } } } break; @@ -407,7 +444,7 @@ private static void drawTopFrame(PdfAppearance app, float borderWidth, Rectangle app.lineTo(borderWidth, borderWidth); app.fill(); } - + private static void drawBottomFrame(PdfAppearance app, float borderWidth, Rectangle box) { app.moveTo(borderWidth, borderWidth); app.lineTo(box.getWidth() - borderWidth, borderWidth); @@ -418,278 +455,367 @@ private static void drawBottomFrame(PdfAppearance app, float borderWidth, Rectan app.lineTo(borderWidth, borderWidth); app.fill(); } - /** Gets the border width in points. + + /** + * Moves the field keys from from to to. The moved keys are removed from + * from. + * + * @param from the source + * @param to the destination. It may be null + */ + public static void moveFields(PdfDictionary from, PdfDictionary to) { + for (Iterator i = from.getKeys().iterator(); i.hasNext(); ) { + PdfName key = (PdfName) i.next(); + if (fieldKeys.containsKey(key)) { + if (to != null) { + to.put(key, from.get(key)); + } + i.remove(); + } + } + } + + protected BaseFont getRealFont() throws IOException, DocumentException { + if (font == null) { + return BaseFont.createFont(BaseFont.HELVETICA, BaseFont.WINANSI, false); + } else { + return font; + } + } + + /** + * Gets the border width in points. + * * @return the border width in points */ public float getBorderWidth() { return this.borderWidth; } - /** Sets the border width in points. To eliminate the border - * set the border color to null. + /** + * Sets the border width in points. To eliminate the border set the border color to null. + * * @param borderWidth the border width in points */ public void setBorderWidth(float borderWidth) { this.borderWidth = borderWidth; } - /** Gets the border style. + /** + * Gets the border style. + * * @return the border style */ public int getBorderStyle() { return this.borderStyle; } - /** Sets the border style. The styles are found in PdfBorderDictionary - * and can be STYLE_SOLID, STYLE_DASHED, + /** + * Sets the border style. The styles are found in PdfBorderDictionary and can be + * STYLE_SOLID, STYLE_DASHED, * STYLE_BEVELED, STYLE_INSET and * STYLE_UNDERLINE. + * * @param borderStyle the border style */ public void setBorderStyle(int borderStyle) { this.borderStyle = borderStyle; } - /** Gets the border color. + /** + * Gets the border color. + * * @return the border color */ public Color getBorderColor() { return this.borderColor; } - /** Sets the border color. Set to null to remove - * the border. + /** + * Sets the border color. Set to null to remove the border. + * * @param borderColor the border color */ public void setBorderColor(Color borderColor) { this.borderColor = borderColor; } - /** Gets the background color. + /** + * Gets the background color. + * * @return the background color */ public Color getBackgroundColor() { return this.backgroundColor; } - /** Sets the background color. Set to null for - * transparent background. + /** + * Sets the background color. Set to null for transparent background. + * * @param backgroundColor the background color */ public void setBackgroundColor(Color backgroundColor) { this.backgroundColor = backgroundColor; } - /** Gets the text color. + /** + * Gets the text color. + * * @return the text color */ public Color getTextColor() { return this.textColor; } - /** Sets the text color. If null the color used - * will be black. + /** + * Sets the text color. If null the color used will be black. + * * @param textColor the text color */ public void setTextColor(Color textColor) { this.textColor = textColor; } - /** Gets the text font. + /** + * Gets the text font. + * * @return the text font */ public BaseFont getFont() { return this.font; } - /** Sets the text font. If null then Helvetica - * will be used. + /** + * Sets the text font. If null then Helvetica will be used. + * * @param font the text font */ public void setFont(BaseFont font) { this.font = font; } - /** Gets the font size. + /** + * Gets the font size. + * * @return the font size */ public float getFontSize() { return this.fontSize; } - /** Sets the font size. If 0 then auto-sizing will be used but - * only for text fields. + /** + * Sets the font size. If 0 then auto-sizing will be used but only for text fields. + * * @param fontSize the font size */ public void setFontSize(float fontSize) { this.fontSize = fontSize; } - /** Gets the text horizontal alignment. + /** + * Gets the text horizontal alignment. + * * @return the text horizontal alignment */ public int getAlignment() { return this.alignment; } - /** Sets the text horizontal alignment. It can be Element.ALIGN_LEFT, + /** + * Sets the text horizontal alignment. It can be Element.ALIGN_LEFT, * Element.ALIGN_CENTER and Element.ALIGN_RIGHT. + * * @param alignment the text horizontal alignment */ public void setAlignment(int alignment) { this.alignment = alignment; } - /** Gets the text. + /** + * Gets the text. + * * @return the text */ public String getText() { return this.text; } - /** Sets the text for text fields. + /** + * Sets the text for text fields. + * * @param text the text */ public void setText(String text) { this.text = text; } - /** Gets the field dimension and position. + /** + * Gets the field dimension and position. + * * @return the field dimension and position */ public Rectangle getBox() { return this.box; } - /** Sets the field dimension and position. + /** + * Sets the field dimension and position. + * * @param box the field dimension and position */ public void setBox(Rectangle box) { if (box == null) { this.box = null; - } - else { + } else { this.box = new Rectangle(box); this.box.normalize(); } } - /** Gets the field rotation. + /** + * Gets the field rotation. + * * @return the field rotation */ public int getRotation() { return this.rotation; } - /** Sets the field rotation. This value should be the same as - * the page rotation where the field will be shown. + /** + * Sets the field rotation. This value should be the same as the page rotation where the field will be shown. + * * @param rotation the field rotation */ public void setRotation(int rotation) { - if (rotation % 90 != 0) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("rotation.must.be.a.multiple.of.90")); + if (rotation % 90 != 0) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("rotation.must.be.a.multiple.of.90")); + } rotation %= 360; - if (rotation < 0) + if (rotation < 0) { rotation += 360; + } this.rotation = rotation; } - /** Convenience method to set the field rotation the same as the - * page rotation. + /** + * Convenience method to set the field rotation the same as the page rotation. + * * @param page the page */ public void setRotationFromPage(Rectangle page) { setRotation(page.getRotation()); } - /** Gets the field visibility flag. + /** + * Gets the field visibility flag. + * * @return the field visibility flag */ public int getVisibility() { return this.visibility; } - /** Sets the field visibility flag. This flags can be one of + /** + * Sets the field visibility flag. This flags can be one of * VISIBLE, HIDDEN, VISIBLE_BUT_DOES_NOT_PRINT * and HIDDEN_BUT_PRINTABLE. + * * @param visibility field visibility flag */ public void setVisibility(int visibility) { this.visibility = visibility; } - /** Gets the field name. + /** + * Gets the field name. + * * @return the field name */ public String getFieldName() { return this.fieldName; } - /** Sets the field name. - * @param fieldName the field name. If null only the widget keys - * will be included in the field allowing it to be used as a kid field. + /** + * Sets the field name. + * + * @param fieldName the field name. If null only the widget keys will be included in the field allowing + * it to be used as a kid field. */ public void setFieldName(String fieldName) { this.fieldName = fieldName; } - - /** Gets the alternate field name. (PDF attribute TU) + + /** + * Gets the alternate field name. (PDF attribute TU) + * * @return the alternate field name */ public String getAlternateFieldName() { return this.alternateFieldName; } - - /** + + /** * Sets the alternateFieldName field name. + * * @param alternateFieldName the alternate field name. */ public void setAlternateFieldName(String alternateFieldName) { this.alternateFieldName = alternateFieldName; } - - /** Gets the mapping name. (PDF attribute TM) + + /** + * Gets the mapping name. (PDF attribute TM) + * * @return the mapping field name */ public String getMappingName() { return this.mappingName; } - /** + /** * Sets the mapping name. (PDF TM) + * * @param mappingName the mapping name. */ public void setMappingName(String mappingName) { this.mappingName = mappingName; } - /** Gets the option flags. + /** + * Gets the option flags. + * * @return the option flags */ public int getOptions() { return this.options; } - /** Sets the option flags. The option flags can be a combination by oring of + /** + * Sets the option flags. The option flags can be a combination by oring of * READ_ONLY, REQUIRED, * MULTILINE, DO_NOT_SCROLL, * PASSWORD, FILE_SELECTION, * DO_NOT_SPELL_CHECK and EDIT. + * * @param options the option flags */ public void setOptions(int options) { this.options = options; } - /** Gets the maximum length of the field's text, in characters. + /** + * Gets the maximum length of the field's text, in characters. + * * @return the maximum length of the field's text, in characters. */ public int getMaxCharacterLength() { return this.maxCharacterLength; } - /** Sets the maximum length of the field's text, in characters. - * It is only meaningful for text fields. + /** + * Sets the maximum length of the field's text, in characters. It is only meaningful for text fields. + * * @param maxCharacterLength the maximum length of the field's text, in characters */ public void setMaxCharacterLength(int maxCharacterLength) { @@ -698,6 +824,7 @@ public void setMaxCharacterLength(int maxCharacterLength) { /** * Getter for property writer. + * * @return Value of property writer. */ public PdfWriter getWriter() { @@ -706,26 +833,10 @@ public PdfWriter getWriter() { /** * Setter for property writer. + * * @param writer New value of property writer. */ public void setWriter(PdfWriter writer) { this.writer = writer; } - - /** - * Moves the field keys from from to to. The moved keys - * are removed from from. - * @param from the source - * @param to the destination. It may be null - */ - public static void moveFields(PdfDictionary from, PdfDictionary to) { - for (Iterator i = from.getKeys().iterator(); i.hasNext();) { - PdfName key = (PdfName)i.next(); - if (fieldKeys.containsKey(key)) { - if (to != null) - to.put(key, from.get(key)); - i.remove(); - } - } - } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BaseFont.java b/openpdf/src/main/java/com/lowagie/text/pdf/BaseFont.java index 8501fe484..f0761b859 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/BaseFont.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/BaseFont.java @@ -51,7 +51,6 @@ import com.lowagie.text.DocumentException; import com.lowagie.text.error_messages.MessageLocalization; - import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; @@ -63,73 +62,98 @@ /** * Base class for the several font types supported - * + * * @author Paulo Soares (psoares@consiste.pt) */ public abstract class BaseFont { - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String COURIER = "Courier"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String COURIER_BOLD = "Courier-Bold"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String COURIER_OBLIQUE = "Courier-Oblique"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String COURIER_BOLDOBLIQUE = "Courier-BoldOblique"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String HELVETICA = "Helvetica"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String HELVETICA_BOLD = "Helvetica-Bold"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String HELVETICA_OBLIQUE = "Helvetica-Oblique"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String HELVETICA_BOLDOBLIQUE = "Helvetica-BoldOblique"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String SYMBOL = "Symbol"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String TIMES_ROMAN = "Times-Roman"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String TIMES_BOLD = "Times-Bold"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String TIMES_ITALIC = "Times-Italic"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String TIMES_BOLDITALIC = "Times-BoldItalic"; - /** This is a possible value of a base 14 type 1 font */ + /** + * This is a possible value of a base 14 type 1 font + */ public static final String ZAPFDINGBATS = "ZapfDingbats"; /** - * The maximum height above the baseline reached by glyphs in this font, - * excluding the height of glyphs for accented characters. + * The maximum height above the baseline reached by glyphs in this font, excluding the height of glyphs for accented + * characters. */ public static final int ASCENT = 1; /** - * The y coordinate of the top of flat capital letters, measured from the - * baseline. + * The y coordinate of the top of flat capital letters, measured from the baseline. */ public static final int CAPHEIGHT = 2; /** - * The maximum depth below the baseline reached by glyphs in this font. The - * value is a negative number. + * The maximum depth below the baseline reached by glyphs in this font. The value is a negative number. */ public static final int DESCENT = 3; /** - * The angle, expressed in degrees counterclockwise from the vertical, of - * the dominant vertical strokes of the font. The value is negative for - * fonts that slope to the right, as almost all italic fonts do. + * The angle, expressed in degrees counterclockwise from the vertical, of the dominant vertical strokes of the font. + * The value is negative for fonts that slope to the right, as almost all italic fonts do. */ public static final int ITALICANGLE = 4; /** @@ -149,13 +173,21 @@ public abstract class BaseFont { */ public static final int BBOXURY = 8; - /** java.awt.Font property */ + /** + * java.awt.Font property + */ public static final int AWT_ASCENT = 9; - /** java.awt.Font property */ + /** + * java.awt.Font property + */ public static final int AWT_DESCENT = 10; - /** java.awt.Font property */ + /** + * java.awt.Font property + */ public static final int AWT_LEADING = 11; - /** java.awt.Font property */ + /** + * java.awt.Font property + */ public static final int AWT_MAXADVANCE = 12; /** * The underline position. Usually a negative value. @@ -178,8 +210,7 @@ public abstract class BaseFont { */ public static final int SUBSCRIPT_SIZE = 17; /** - * The recommended vertical offset from the baseline for subscripts for this - * font. Usually a negative value. + * The recommended vertical offset from the baseline for subscripts for this font. Usually a negative value. */ public static final int SUBSCRIPT_OFFSET = 18; /** @@ -187,8 +218,7 @@ public abstract class BaseFont { */ public static final int SUPERSCRIPT_SIZE = 19; /** - * The recommended vertical offset from the baseline for superscripts for - * this font. + * The recommended vertical offset from the baseline for superscripts for this font. */ public static final int SUPERSCRIPT_OFFSET = 20; /** @@ -224,58 +254,103 @@ public abstract class BaseFont { */ public static final String IDENTITY_V = "Identity-V"; - /** A possible encoding. */ + /** + * A possible encoding. + */ public static final String CP1250 = "Cp1250"; - /** A possible encoding. */ + /** + * A possible encoding. + */ public static final String CP1252 = "Cp1252"; - /** A possible encoding. */ + /** + * A possible encoding. + */ public static final String CP1257 = "Cp1257"; - /** A possible encoding. */ + /** + * A possible encoding. + */ public static final String WINANSI = "Cp1252"; - /** A possible encoding. */ + /** + * A possible encoding. + */ public static final String MACROMAN = "MacRoman"; - public static final int[] CHAR_RANGE_LATIN = { 0, 0x17f, 0x2000, 0x206f, - 0x20a0, 0x20cf, 0xfb00, 0xfb06 }; - public static final int[] CHAR_RANGE_ARABIC = { 0, 0x7f, 0x0600, 0x067f, - 0x20a0, 0x20cf, 0xfb50, 0xfbff, 0xfe70, 0xfeff }; - public static final int[] CHAR_RANGE_HEBREW = { 0, 0x7f, 0x0590, 0x05ff, - 0x20a0, 0x20cf, 0xfb1d, 0xfb4f }; - public static final int[] CHAR_RANGE_CYRILLIC = { 0, 0x7f, 0x0400, 0x052f, - 0x2000, 0x206f, 0x20a0, 0x20cf }; + public static final int[] CHAR_RANGE_LATIN = {0, 0x17f, 0x2000, 0x206f, + 0x20a0, 0x20cf, 0xfb00, 0xfb06}; + public static final int[] CHAR_RANGE_ARABIC = {0, 0x7f, 0x0600, 0x067f, + 0x20a0, 0x20cf, 0xfb50, 0xfbff, 0xfe70, 0xfeff}; + public static final int[] CHAR_RANGE_HEBREW = {0, 0x7f, 0x0590, 0x05ff, + 0x20a0, 0x20cf, 0xfb1d, 0xfb4f}; + public static final int[] CHAR_RANGE_CYRILLIC = {0, 0x7f, 0x0400, 0x052f, + 0x2000, 0x206f, 0x20a0, 0x20cf}; - /** if the font has to be embedded */ + /** + * if the font has to be embedded + */ public static final boolean EMBEDDED = true; - /** if the font doesn't have to be embedded */ + /** + * if the font doesn't have to be embedded + */ public static final boolean NOT_EMBEDDED = false; - /** if the font has to be cached */ + /** + * if the font has to be cached + */ public static final boolean CACHED = true; - /** if the font doesn't have to be cached */ + /** + * if the font doesn't have to be cached + */ public static final boolean NOT_CACHED = false; - /** The path to the font resources. */ + /** + * The path to the font resources. + */ public static final String RESOURCE_PATH = "com/lowagie/text/pdf/fonts/"; - /** The fake CID code that represents a newline. */ + /** + * The fake CID code that represents a newline. + */ public static final char CID_NEWLINE = '\u7fff'; - - protected ArrayList subsetRanges; /** - * The font type. + * a not defined character in a custom PDF encoding */ - int fontType; - /** a not defined character in a custom PDF encoding */ public static final String notdef = ".notdef"; + /** + * list of the 14 built in fonts. + */ + protected static final HashMap BuiltinFonts14 = new HashMap<>(); + /** + * cache for the fonts already used. + */ + protected static ConcurrentHashMap fontCache = new ConcurrentHashMap<>( + 500, 0.85f, 64); + + static { + BuiltinFonts14.put(COURIER, PdfName.COURIER); + BuiltinFonts14.put(COURIER_BOLD, PdfName.COURIER_BOLD); + BuiltinFonts14.put(COURIER_BOLDOBLIQUE, PdfName.COURIER_BOLDOBLIQUE); + BuiltinFonts14.put(COURIER_OBLIQUE, PdfName.COURIER_OBLIQUE); + BuiltinFonts14.put(HELVETICA, PdfName.HELVETICA); + BuiltinFonts14.put(HELVETICA_BOLD, PdfName.HELVETICA_BOLD); + BuiltinFonts14 + .put(HELVETICA_BOLDOBLIQUE, PdfName.HELVETICA_BOLDOBLIQUE); + BuiltinFonts14.put(HELVETICA_OBLIQUE, PdfName.HELVETICA_OBLIQUE); + BuiltinFonts14.put(SYMBOL, PdfName.SYMBOL); + BuiltinFonts14.put(TIMES_ROMAN, PdfName.TIMES_ROMAN); + BuiltinFonts14.put(TIMES_BOLD, PdfName.TIMES_BOLD); + BuiltinFonts14.put(TIMES_BOLDITALIC, PdfName.TIMES_BOLDITALIC); + BuiltinFonts14.put(TIMES_ITALIC, PdfName.TIMES_ITALIC); + BuiltinFonts14.put(ZAPFDINGBATS, PdfName.ZAPFDINGBATS); + } + protected ArrayList subsetRanges; /** * table of characters widths for this encoding */ protected int[] widths = new int[256]; - /** * encoding names */ @@ -284,38 +359,29 @@ public abstract class BaseFont { * same as differences but with the unicode codes */ protected char[] unicodeDifferences = new char[256]; - protected int[][] charBBoxes = new int[256][]; - /** encoding used with this font */ + /** + * encoding used with this font + */ protected String encoding; - - /** true if the font is to be embedded in the PDF */ + /** + * true if the font is to be embedded in the PDF + */ protected boolean embedded; - /** * The compression level for the font stream. - * + * * @since 2.1.3 */ protected int compressionLevel = PdfStream.DEFAULT_COMPRESSION; - /** * true if the font must use its built in encoding. In that case the * encoding is only used to map a char to the position inside * the font, not to the expected char name. */ protected boolean fontSpecific = true; - - /** cache for the fonts already used. */ - protected static ConcurrentHashMap fontCache = new ConcurrentHashMap<>( - 500, 0.85f, 64); - - /** list of the 14 built in fonts. */ - protected static final HashMap BuiltinFonts14 = new HashMap<>(); - /** - * Forces the output of the width array. Only matters for the 14 built-in - * fonts. + * Forces the output of the width array. Only matters for the 14 built-in fonts. */ protected boolean forceWidthsOutput = false; @@ -325,16 +391,14 @@ public abstract class BaseFont { protected boolean directTextToByte = false; /** - * Indicates if all the glyphs and widths for that particular encoding - * should be included in the document. + * Indicates if all the glyphs and widths for that particular encoding should be included in the document. */ protected boolean subset = true; protected boolean fastWinansi = false; /** - * Custom encodings use this map to key the Unicode character to the single - * byte code. + * Custom encodings use this map to key the Unicode character to the single byte code. */ protected IntHashtable specialMap; @@ -342,95 +406,15 @@ public abstract class BaseFont { * Used to build a randomized prefix for a subset name */ protected SecureRandom secureRandom; - + /** * Indicates if a CIDSet stream should be included in the document. */ protected boolean includeCidSet = true; - - static { - BuiltinFonts14.put(COURIER, PdfName.COURIER); - BuiltinFonts14.put(COURIER_BOLD, PdfName.COURIER_BOLD); - BuiltinFonts14.put(COURIER_BOLDOBLIQUE, PdfName.COURIER_BOLDOBLIQUE); - BuiltinFonts14.put(COURIER_OBLIQUE, PdfName.COURIER_OBLIQUE); - BuiltinFonts14.put(HELVETICA, PdfName.HELVETICA); - BuiltinFonts14.put(HELVETICA_BOLD, PdfName.HELVETICA_BOLD); - BuiltinFonts14 - .put(HELVETICA_BOLDOBLIQUE, PdfName.HELVETICA_BOLDOBLIQUE); - BuiltinFonts14.put(HELVETICA_OBLIQUE, PdfName.HELVETICA_OBLIQUE); - BuiltinFonts14.put(SYMBOL, PdfName.SYMBOL); - BuiltinFonts14.put(TIMES_ROMAN, PdfName.TIMES_ROMAN); - BuiltinFonts14.put(TIMES_BOLD, PdfName.TIMES_BOLD); - BuiltinFonts14.put(TIMES_BOLDITALIC, PdfName.TIMES_BOLDITALIC); - BuiltinFonts14.put(TIMES_ITALIC, PdfName.TIMES_ITALIC); - BuiltinFonts14.put(ZAPFDINGBATS, PdfName.ZAPFDINGBATS); - } - /** - * Generates the PDF stream with the Type1 and Truetype fonts returning a - * PdfStream. + * The font type. */ - static class StreamFont extends PdfStream { - - /** - * Generates the PDF stream with the Type1 and Truetype fonts returning - * a PdfStream. - * - * @param contents - * the content of the stream - * @param lengths - * an array of int that describes the several lengths of each - * part of the font - * @param compressionLevel - * the compression level of the Stream - * @throws DocumentException - * error in the stream compression - * @since 2.1.3 (replaces the constructor without param - * compressionLevel) - */ - public StreamFont(byte[] contents, int[] lengths, int compressionLevel) - throws DocumentException { - try { - bytes = contents; - put(PdfName.LENGTH, new PdfNumber(bytes.length)); - for (int k = 0; k < lengths.length; ++k) { - put(new PdfName("Length" + (k + 1)), new PdfNumber( - lengths[k])); - } - flateCompress(compressionLevel); - } catch (Exception e) { - throw new DocumentException(e); - } - } - - /** - * Generates the PDF stream for a font. - * - * @param contents - * the content of a stream - * @param subType - * the subtype of the font. - * @param compressionLevel - * the compression level of the Stream - * @throws DocumentException - * error in the stream compression - * @since 2.1.3 (replaces the constructor without param - * compressionLevel) - */ - public StreamFont(byte[] contents, String subType, int compressionLevel) - throws DocumentException { - try { - bytes = contents; - put(PdfName.LENGTH, new PdfNumber(bytes.length)); - if (subType != null) { - put(PdfName.SUBTYPE, new PdfName(subType)); - } - flateCompress(compressionLevel); - } catch (Exception e) { - throw new DocumentException(e); - } - } - } + int fontType; /** * Creates new BaseFont @@ -439,15 +423,12 @@ protected BaseFont() { } /** - * Creates a new font. This will always be the default Helvetica font (not - * embedded). This method is introduced because Helvetica is used in many - * examples. - * + * Creates a new font. This will always be the default Helvetica font (not embedded). This method is introduced + * because Helvetica is used in many examples. + * * @return a BaseFont object (Helvetica, Winansi, not embedded) - * @throws IOException - * This shouldn't occur ever - * @throws DocumentException - * This shouldn't occur ever + * @throws IOException This shouldn't occur ever + * @throws DocumentException This shouldn't occur ever * @since 2.1.1 */ public static BaseFont createFont() throws DocumentException, IOException { @@ -456,65 +437,49 @@ public static BaseFont createFont() throws DocumentException, IOException { } /** - * Creates a new font. This font can be one of the 14 built in types, a - * Type1 font referred to by an AFM or PFM file, a TrueType font (simple or - * collection) or a CJK font from the Adobe Asian Font Pack. TrueType fonts - * and CJK fonts can have an optional style modifier appended to the name. - * These modifiers are: Bold, Italic and BoldItalic. An example would be - * "STSong-Light,Bold". Note that this modifiers do not work if the font is - * embedded. Fonts in TrueType collections are addressed by index such as - * "msgothic.ttc,1". This would get the second font (indexes start at 0), in - * this case "MS PGothic". - *

      - * The fonts are cached and if they already exist they are extracted from - * the cache, not parsed again. - *

      - * Besides the common encodings described by name, custom encodings can also - * be made. These encodings will only work for the single byte fonts Type1 - * and TrueType. The encoding string starts with a '#' followed by "simple" - * or "full". If "simple" there is a decimal for the first character - * position and then a list of hex values representing the Unicode codes - * that compose that encoding.
      - * The "simple" encoding is recommended for TrueType fonts as the "full" - * encoding risks not matching the character with the right glyph if not - * done with care.
      - * The "full" encoding is specially aimed at Type1 fonts where the glyphs - * have to be described by non standard names like the Tex math fonts. Each - * group of three elements compose a code position: the one byte code order - * in decimal or as 'x' (x cannot be the space), the name and the Unicode - * character used to access the glyph. The space must be assigned to - * character position 32 otherwise text justification will not work. - *

      - * Example for a "simple" encoding that includes the Unicode character - * space, A, B and ecyrillic: - * + * Creates a new font. This font can be one of the 14 built in types, a Type1 font referred to by an AFM or PFM + * file, a TrueType font (simple or collection) or a CJK font from the Adobe Asian Font Pack. TrueType fonts and CJK + * fonts can have an optional style modifier appended to the name. These modifiers are: Bold, Italic and BoldItalic. + * An example would be "STSong-Light,Bold". Note that this modifiers do not work if the font is embedded. Fonts in + * TrueType collections are addressed by index such as "msgothic.ttc,1". This would get the second font (indexes + * start at 0), in this case "MS PGothic". + *

      + * The fonts are cached and if they already exist they are extracted from the cache, not parsed again. + *

      + * Besides the common encodings described by name, custom encodings can also be made. These encodings will only work + * for the single byte fonts Type1 and TrueType. The encoding string starts with a '#' followed by "simple" or + * "full". If "simple" there is a decimal for the first character position and then a list of hex values + * representing the Unicode codes that compose that encoding.
      The "simple" encoding is recommended for TrueType + * fonts as the "full" encoding risks not matching the character with the right glyph if not done with care.
      The + * "full" encoding is specially aimed at Type1 fonts where the glyphs have to be described by non standard names + * like the Tex math fonts. Each group of three elements compose a code position: the one byte code order in decimal + * or as 'x' (x cannot be the space), the name and the Unicode character used to access the glyph. The space must be + * assigned to character position 32 otherwise text justification will not work. + *

      + * Example for a "simple" encoding that includes the Unicode character space, A, B and ecyrillic: + * * 

            * "# simple 32 0020 0041 0042 0454"
      *
      - *

      + *

      * Example for a "full" encoding for a Type1 Tex font: - * + * * 

            * "# full 'A' nottriangeqlleft 0041 'B' dividemultiply 0042 32 space 0020"
      *
      - *

      + *

      * This method calls:
      - * + * * 

            * createFont(name, encoding, embedded, true, null, null);
      *
      - * - * @param name - * the name of the font or its location on file - * @param encoding - * the encoding to be applied to this font - * @param embedded - * true if the font is to be embedded in the PDF + * + * @param name the name of the font or its location on file + * @param encoding the encoding to be applied to this font + * @param embedded true if the font is to be embedded in the PDF * @return returns a new font. This font may come from the cache - * @throws DocumentException - * the font is invalid - * @throws IOException - * the font file could not be read + * @throws DocumentException the font is invalid + * @throws IOException the font file could not be read */ public static BaseFont createFont(String name, String encoding, boolean embedded) throws DocumentException, IOException { @@ -522,68 +487,51 @@ public static BaseFont createFont(String name, String encoding, } /** - * Creates a new font. This font can be one of the 14 built in types, a - * Type1 font referred to by an AFM or PFM file, a TrueType font (simple or - * collection) or a CJK font from the Adobe Asian Font Pack. TrueType fonts - * and CJK fonts can have an optional style modifier appended to the name. - * These modifiers are: Bold, Italic and BoldItalic. An example would be - * "STSong-Light,Bold". Note that this modifiers do not work if the font is - * embedded. Fonts in TrueType collections are addressed by index such as - * "msgothic.ttc,1". This would get the second font (indexes start at 0), in - * this case "MS PGothic". - *

      - * The fonts are cached and if they already exist they are extracted from - * the cache, not parsed again. - *

      - * Besides the common encodings described by name, custom encodings can also - * be made. These encodings will only work for the single byte fonts Type1 - * and TrueType. The encoding string starts with a '#' followed by "simple" - * or "full". If "simple" there is a decimal for the first character - * position and then a list of hex values representing the Unicode codes - * that compose that encoding.
      - * The "simple" encoding is recommended for TrueType fonts as the "full" - * encoding risks not matching the character with the right glyph if not - * done with care.
      - * The "full" encoding is specially aimed at Type1 fonts where the glyphs - * have to be described by non standard names like the Tex math fonts. Each - * group of three elements compose a code position: the one byte code order - * in decimal or as 'x' (x cannot be the space), the name and the Unicode - * character used to access the glyph. The space must be assigned to - * character position 32 otherwise text justification will not work. - *

      - * Example for a "simple" encoding that includes the Unicode character - * space, A, B and ecyrillic: - * + * Creates a new font. This font can be one of the 14 built in types, a Type1 font referred to by an AFM or PFM + * file, a TrueType font (simple or collection) or a CJK font from the Adobe Asian Font Pack. TrueType fonts and CJK + * fonts can have an optional style modifier appended to the name. These modifiers are: Bold, Italic and BoldItalic. + * An example would be "STSong-Light,Bold". Note that this modifiers do not work if the font is embedded. Fonts in + * TrueType collections are addressed by index such as "msgothic.ttc,1". This would get the second font (indexes + * start at 0), in this case "MS PGothic". + *

      + * The fonts are cached and if they already exist they are extracted from the cache, not parsed again. + *

      + * Besides the common encodings described by name, custom encodings can also be made. These encodings will only work + * for the single byte fonts Type1 and TrueType. The encoding string starts with a '#' followed by "simple" or + * "full". If "simple" there is a decimal for the first character position and then a list of hex values + * representing the Unicode codes that compose that encoding.
      The "simple" encoding is recommended for TrueType + * fonts as the "full" encoding risks not matching the character with the right glyph if not done with care.
      The + * "full" encoding is specially aimed at Type1 fonts where the glyphs have to be described by non standard names + * like the Tex math fonts. Each group of three elements compose a code position: the one byte code order in decimal + * or as 'x' (x cannot be the space), the name and the Unicode character used to access the glyph. The space must be + * assigned to character position 32 otherwise text justification will not work. + *

      + * Example for a "simple" encoding that includes the Unicode character space, A, B and ecyrillic: + * * 

            * "# simple 32 0020 0041 0042 0454"
      *
      - *

      + *

      * Example for a "full" encoding for a Type1 Tex font: - * + * * 

            * "# full 'A' nottriangeqlleft 0041 'B' dividemultiply 0042 32 space 0020"
      *
      - *

      + *

      * This method calls:
      - * + * * 

            * createFont(name, encoding, embedded, true, null, null);
      *
      - * - * @param name - * the name of the font or its location on file - * @param encoding - * the encoding to be applied to this font - * @param embedded - * true if the font is to be embedded in the PDF - * @param forceRead - * in some cases (TrueTypeFont, Type1Font), the full font file - * will be read and kept in memory if forceRead is true + * + * @param name the name of the font or its location on file + * @param encoding the encoding to be applied to this font + * @param embedded true if the font is to be embedded in the PDF + * @param forceRead in some cases (TrueTypeFont, Type1Font), the full font file will be read and kept in memory if + * forceRead is true * @return returns a new font. This font may come from the cache - * @throws DocumentException - * the font is invalid - * @throws IOException - * the font file could not be read + * @throws DocumentException the font is invalid + * @throws IOException the font file could not be read * @since 2.1.5 */ public static BaseFont createFont(String name, String encoding, @@ -593,236 +541,172 @@ public static BaseFont createFont(String name, String encoding, } /** - * Creates a new font. This font can be one of the 14 built in types, a - * Type1 font referred to by an AFM or PFM file, a TrueType font (simple or - * collection) or a CJK font from the Adobe Asian Font Pack. TrueType fonts - * and CJK fonts can have an optional style modifier appended to the name. - * These modifiers are: Bold, Italic and BoldItalic. An example would be - * "STSong-Light,Bold". Note that this modifiers do not work if the font is - * embedded. Fonts in TrueType collections are addressed by index such as - * "msgothic.ttc,1". This would get the second font (indexes start at 0), in - * this case "MS PGothic". - *

      + * Creates a new font. This font can be one of the 14 built in types, a Type1 font referred to by an AFM or PFM + * file, a TrueType font (simple or collection) or a CJK font from the Adobe Asian Font Pack. TrueType fonts and CJK + * fonts can have an optional style modifier appended to the name. These modifiers are: Bold, Italic and BoldItalic. + * An example would be "STSong-Light,Bold". Note that this modifiers do not work if the font is embedded. Fonts in + * TrueType collections are addressed by index such as "msgothic.ttc,1". This would get the second font (indexes + * start at 0), in this case "MS PGothic". + *

      * The fonts may or may not be cached depending on the flag * cached. If the byte arrays are present the font - * will be read from them instead of the name. A name is still required to - * identify the font type. - *

      - * Besides the common encodings described by name, custom encodings can also - * be made. These encodings will only work for the single byte fonts Type1 - * and TrueType. The encoding string starts with a '#' followed by "simple" - * or "full". If "simple" there is a decimal for the first character - * position and then a list of hex values representing the Unicode codes - * that compose that encoding.
      - * The "simple" encoding is recommended for TrueType fonts as the "full" - * encoding risks not matching the character with the right glyph if not - * done with care.
      - * The "full" encoding is specially aimed at Type1 fonts where the glyphs - * have to be described by non standard names like the Tex math fonts. Each - * group of three elements compose a code position: the one byte code order - * in decimal or as 'x' (x cannot be the space), the name and the Unicode - * character used to access the glyph. The space must be assigned to - * character position 32 otherwise text justification will not work. - *

      - * Example for a "simple" encoding that includes the Unicode character - * space, A, B and ecyrillic: - * + * will be read from them instead of the name. A name is still required to identify the font type. + *

      + * Besides the common encodings described by name, custom encodings can also be made. These encodings will only work + * for the single byte fonts Type1 and TrueType. The encoding string starts with a '#' followed by "simple" or + * "full". If "simple" there is a decimal for the first character position and then a list of hex values + * representing the Unicode codes that compose that encoding.
      The "simple" encoding is recommended for TrueType + * fonts as the "full" encoding risks not matching the character with the right glyph if not done with care.
      The + * "full" encoding is specially aimed at Type1 fonts where the glyphs have to be described by non standard names + * like the Tex math fonts. Each group of three elements compose a code position: the one byte code order in decimal + * or as 'x' (x cannot be the space), the name and the Unicode character used to access the glyph. The space must be + * assigned to character position 32 otherwise text justification will not work. + *

      + * Example for a "simple" encoding that includes the Unicode character space, A, B and ecyrillic: + * * 

            * "# simple 32 0020 0041 0042 0454"
      *
      - *

      + *

      * Example for a "full" encoding for a Type1 Tex font: - * + * * 

            * "# full 'A' nottriangeqlleft 0041 'B' dividemultiply 0042 32 space 0020"
      *
      - * - * @param name - * the name of the font or its location on file - * @param encoding - * the encoding to be applied to this font - * @param embedded - * true if the font is to be embedded in the PDF - * @param cached - * true if the font comes from the cache or is added to the cache - * if new, false if the font is always created new - * @param ttfAfm - * the true type font or the afm in a byte array - * @param pfb - * the pfb in a byte array - * @return returns a new font. This font may come from the cache but only if - * cached is true, otherwise it will always be created new - * @throws DocumentException - * the font is invalid - * @throws IOException - * the font file could not be read + * + * @param name the name of the font or its location on file + * @param encoding the encoding to be applied to this font + * @param embedded true if the font is to be embedded in the PDF + * @param cached true if the font comes from the cache or is added to the cache if new, false if the font is + * always created new + * @param ttfAfm the true type font or the afm in a byte array + * @param pfb the pfb in a byte array + * @return returns a new font. This font may come from the cache but only if cached is true, otherwise it will + * always be created new + * @throws DocumentException the font is invalid + * @throws IOException the font file could not be read * @since iText 0.80 */ public static BaseFont createFont(String name, String encoding, - boolean embedded, boolean cached, byte[] ttfAfm, byte[] pfb) + boolean embedded, boolean cached, byte[] ttfAfm, byte[] pfb) throws DocumentException, IOException { return createFont(name, encoding, embedded, cached, ttfAfm, pfb, false); } /** - * Creates a new font. This font can be one of the 14 built in types, a - * Type1 font referred to by an AFM or PFM file, a TrueType font (simple or - * collection) or a CJK font from the Adobe Asian Font Pack. TrueType fonts - * and CJK fonts can have an optional style modifier appended to the name. - * These modifiers are: Bold, Italic and BoldItalic. An example would be - * "STSong-Light,Bold". Note that this modifiers do not work if the font is - * embedded. Fonts in TrueType collections are addressed by index such as - * "msgothic.ttc,1". This would get the second font (indexes start at 0), in - * this case "MS PGothic". - *

      + * Creates a new font. This font can be one of the 14 built in types, a Type1 font referred to by an AFM or PFM + * file, a TrueType font (simple or collection) or a CJK font from the Adobe Asian Font Pack. TrueType fonts and CJK + * fonts can have an optional style modifier appended to the name. These modifiers are: Bold, Italic and BoldItalic. + * An example would be "STSong-Light,Bold". Note that this modifiers do not work if the font is embedded. Fonts in + * TrueType collections are addressed by index such as "msgothic.ttc,1". This would get the second font (indexes + * start at 0), in this case "MS PGothic". + *

      * The fonts may or may not be cached depending on the flag * cached. If the byte arrays are present the font - * will be read from them instead of the name. A name is still required to - * identify the font type. - *

      - * Besides the common encodings described by name, custom encodings can also - * be made. These encodings will only work for the single byte fonts Type1 - * and TrueType. The encoding string starts with a '#' followed by "simple" - * or "full". If "simple" there is a decimal for the first character - * position and then a list of hex values representing the Unicode codes - * that compose that encoding.
      - * The "simple" encoding is recommended for TrueType fonts as the "full" - * encoding risks not matching the character with the right glyph if not - * done with care.
      - * The "full" encoding is specially aimed at Type1 fonts where the glyphs - * have to be described by non standard names like the Tex math fonts. Each - * group of three elements compose a code position: the one byte code order - * in decimal or as 'x' (x cannot be the space), the name and the Unicode - * character used to access the glyph. The space must be assigned to - * character position 32 otherwise text justification will not work. - *

      - * Example for a "simple" encoding that includes the Unicode character - * space, A, B and ecyrillic: - * + * will be read from them instead of the name. A name is still required to identify the font type. + *

      + * Besides the common encodings described by name, custom encodings can also be made. These encodings will only work + * for the single byte fonts Type1 and TrueType. The encoding string starts with a '#' followed by "simple" or + * "full". If "simple" there is a decimal for the first character position and then a list of hex values + * representing the Unicode codes that compose that encoding.
      The "simple" encoding is recommended for TrueType + * fonts as the "full" encoding risks not matching the character with the right glyph if not done with care.
      The + * "full" encoding is specially aimed at Type1 fonts where the glyphs have to be described by non standard names + * like the Tex math fonts. Each group of three elements compose a code position: the one byte code order in decimal + * or as 'x' (x cannot be the space), the name and the Unicode character used to access the glyph. The space must be + * assigned to character position 32 otherwise text justification will not work. + *

      + * Example for a "simple" encoding that includes the Unicode character space, A, B and ecyrillic: + * * 

            * "# simple 32 0020 0041 0042 0454"
      *
      - *

      + *

      * Example for a "full" encoding for a Type1 Tex font: - * + * * 

            * "# full 'A' nottriangeqlleft 0041 'B' dividemultiply 0042 32 space 0020"
      *
      - * - * @param name - * the name of the font or its location on file - * @param encoding - * the encoding to be applied to this font - * @param embedded - * true if the font is to be embedded in the PDF - * @param cached - * true if the font comes from the cache or is added to the cache - * if new, false if the font is always created new - * @param ttfAfm - * the true type font or the afm in a byte array - * @param pfb - * the pfb in a byte array - * @param noThrow - * if true will not throw an exception if the font is not - * recognized and will return null, if false will throw an - * exception if the font is not recognized. Note that even if - * true an exception may be thrown in some circumstances. This - * parameter is useful for FontFactory that may have to check - * many invalid font names before finding the right one - * @return returns a new font. This font may come from the cache but only if - * cached is true, otherwise it will always be created new - * @throws DocumentException - * the font is invalid - * @throws IOException - * the font file could not be read + * + * @param name the name of the font or its location on file + * @param encoding the encoding to be applied to this font + * @param embedded true if the font is to be embedded in the PDF + * @param cached true if the font comes from the cache or is added to the cache if new, false if the font is + * always created new + * @param ttfAfm the true type font or the afm in a byte array + * @param pfb the pfb in a byte array + * @param noThrow if true will not throw an exception if the font is not recognized and will return null, if false + * will throw an exception if the font is not recognized. Note that even if true an exception may be + * thrown in some circumstances. This parameter is useful for FontFactory that may have to check + * many invalid font names before finding the right one + * @return returns a new font. This font may come from the cache but only if cached is true, otherwise it will + * always be created new + * @throws DocumentException the font is invalid + * @throws IOException the font file could not be read * @since 2.0.3 */ public static BaseFont createFont(String name, String encoding, - boolean embedded, boolean cached, byte[] ttfAfm, byte[] pfb, - boolean noThrow) throws DocumentException, IOException { + boolean embedded, boolean cached, byte[] ttfAfm, byte[] pfb, + boolean noThrow) throws DocumentException, IOException { return createFont(name, encoding, embedded, cached, ttfAfm, pfb, false, false); } /** - * Creates a new font. This font can be one of the 14 built in types, a - * Type1 font referred to by an AFM or PFM file, a TrueType font (simple or - * collection) or a CJK font from the Adobe Asian Font Pack. TrueType fonts - * and CJK fonts can have an optional style modifier appended to the name. - * These modifiers are: Bold, Italic and BoldItalic. An example would be - * "STSong-Light,Bold". Note that this modifiers do not work if the font is - * embedded. Fonts in TrueType collections are addressed by index such as - * "msgothic.ttc,1". This would get the second font (indexes start at 0), in - * this case "MS PGothic". - *

      + * Creates a new font. This font can be one of the 14 built in types, a Type1 font referred to by an AFM or PFM + * file, a TrueType font (simple or collection) or a CJK font from the Adobe Asian Font Pack. TrueType fonts and CJK + * fonts can have an optional style modifier appended to the name. These modifiers are: Bold, Italic and BoldItalic. + * An example would be "STSong-Light,Bold". Note that this modifiers do not work if the font is embedded. Fonts in + * TrueType collections are addressed by index such as "msgothic.ttc,1". This would get the second font (indexes + * start at 0), in this case "MS PGothic". + *

      * The fonts may or may not be cached depending on the flag * cached. If the byte arrays are present the font - * will be read from them instead of the name. A name is still required to - * identify the font type. - *

      - * Besides the common encodings described by name, custom encodings can also - * be made. These encodings will only work for the single byte fonts Type1 - * and TrueType. The encoding string starts with a '#' followed by "simple" - * or "full". If "simple" there is a decimal for the first character - * position and then a list of hex values representing the Unicode codes - * that compose that encoding.
      - * The "simple" encoding is recommended for TrueType fonts as the "full" - * encoding risks not matching the character with the right glyph if not - * done with care.
      - * The "full" encoding is specially aimed at Type1 fonts where the glyphs - * have to be described by non standard names like the Tex math fonts. Each - * group of three elements compose a code position: the one byte code order - * in decimal or as 'x' (x cannot be the space), the name and the Unicode - * character used to access the glyph. The space must be assigned to - * character position 32 otherwise text justification will not work. - *

      - * Example for a "simple" encoding that includes the Unicode character - * space, A, B and ecyrillic: - * + * will be read from them instead of the name. A name is still required to identify the font type. + *

      + * Besides the common encodings described by name, custom encodings can also be made. These encodings will only work + * for the single byte fonts Type1 and TrueType. The encoding string starts with a '#' followed by "simple" or + * "full". If "simple" there is a decimal for the first character position and then a list of hex values + * representing the Unicode codes that compose that encoding.
      The "simple" encoding is recommended for TrueType + * fonts as the "full" encoding risks not matching the character with the right glyph if not done with care.
      The + * "full" encoding is specially aimed at Type1 fonts where the glyphs have to be described by non standard names + * like the Tex math fonts. Each group of three elements compose a code position: the one byte code order in decimal + * or as 'x' (x cannot be the space), the name and the Unicode character used to access the glyph. The space must be + * assigned to character position 32 otherwise text justification will not work. + *

      + * Example for a "simple" encoding that includes the Unicode character space, A, B and ecyrillic: + * * 

            * "# simple 32 0020 0041 0042 0454"
      *
      - *

      + *

      * Example for a "full" encoding for a Type1 Tex font: - * + * * 

            * "# full 'A' nottriangeqlleft 0041 'B' dividemultiply 0042 32 space 0020"
      *
      - * - * @param name - * the name of the font or its location on file - * @param encoding - * the encoding to be applied to this font - * @param embedded - * true if the font is to be embedded in the PDF - * @param cached - * true if the font comes from the cache or is added to the cache - * if new, false if the font is always created new - * @param ttfAfm - * the true type font or the afm in a byte array - * @param pfb - * the pfb in a byte array - * @param noThrow - * if true will not throw an exception if the font is not - * recognized and will return null, if false will throw an - * exception if the font is not recognized. Note that even if - * true an exception may be thrown in some circumstances. This - * parameter is useful for FontFactory that may have to check - * many invalid font names before finding the right one - * @param forceRead - * in some cases (TrueTypeFont, Type1Font), the full font file - * will be read and kept in memory if forceRead is true - * @return returns a new font. This font may come from the cache but only if - * cached is true, otherwise it will always be created new - * @throws DocumentException - * the font is invalid - * @throws IOException - * the font file could not be read + * + * @param name the name of the font or its location on file + * @param encoding the encoding to be applied to this font + * @param embedded true if the font is to be embedded in the PDF + * @param cached true if the font comes from the cache or is added to the cache if new, false if the font is + * always created new + * @param ttfAfm the true type font or the afm in a byte array + * @param pfb the pfb in a byte array + * @param noThrow if true will not throw an exception if the font is not recognized and will return null, if false + * will throw an exception if the font is not recognized. Note that even if true an exception may + * be thrown in some circumstances. This parameter is useful for FontFactory that may have to check + * many invalid font names before finding the right one + * @param forceRead in some cases (TrueTypeFont, Type1Font), the full font file will be read and kept in memory if + * forceRead is true + * @return returns a new font. This font may come from the cache but only if cached is true, otherwise it will + * always be created new + * @throws DocumentException the font is invalid + * @throws IOException the font file could not be read * @since 2.1.5 */ public static BaseFont createFont(String name, String encoding, - boolean embedded, boolean cached, byte[] ttfAfm, byte[] pfb, - boolean noThrow, boolean forceRead) throws DocumentException, + boolean embedded, boolean cached, byte[] ttfAfm, byte[] pfb, + boolean noThrow, boolean forceRead) throws DocumentException, IOException { String nameBase = getBaseName(name); encoding = normalizeEncoding(encoding); @@ -870,17 +754,16 @@ public static BaseFont createFont(String name, String encoding, } if (cached) { fontCache.putIfAbsent(key, fontBuilt); - return fontCache.get(key); + return fontCache.get(key); } return fontBuilt; } /** - * Creates a font based on an existing document font. The created font font - * may not behave as expected, depending on the encoding or subset. - * - * @param fontRef - * the reference to the document font + * Creates a font based on an existing document font. The created font font may not behave as expected, depending on + * the encoding or subset. + * + * @param fontRef the reference to the document font * @return the font */ public static BaseFont createFont(PRIndirectReference fontRef) { @@ -889,9 +772,8 @@ public static BaseFont createFont(PRIndirectReference fontRef) { /** * Gets the name without the modifiers Bold, Italic or BoldItalic. - * - * @param name - * the full name of the font + * + * @param name the full name of the font * @return the name without the modifiers Bold, Italic or BoldItalic */ protected static String getBaseName(String name) { @@ -907,11 +789,9 @@ protected static String getBaseName(String name) { } /** - * Normalize the encoding names. "winansi" is changed to "Cp1252" and - * "macroman" is changed to "MacRoman". - * - * @param enc - * the encoding to be normalized + * Normalize the encoding names. "winansi" is changed to "Cp1252" and "macroman" is changed to "MacRoman". + * + * @param enc the encoding to be normalized * @return the normalized encoding */ protected static String normalizeEncoding(String enc) { @@ -925,68 +805,310 @@ protected static String normalizeEncoding(String enc) { } /** - * Creates the widths and the differences arrays + * Gets the full name of the font. If it is a True Type font each array element will have {Platform ID, Platform + * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type + * specification, chapter 2, in the 'name' table.
      For the other fonts the array has a single element with {"", + * "", "", font name}. + * + * @param name the name of the font + * @param encoding the encoding of the font + * @param ttfAfm the true type font or the afm in a byte array + * @return the full name of the font + * @throws DocumentException on error + * @throws IOException on error */ - protected void createEncoding() { - if (encoding.startsWith("#")) { - specialMap = new IntHashtable(); - StringTokenizer tok = new StringTokenizer(encoding.substring(1), - " ,\t\n\r\f"); - if (tok.nextToken().equals("full")) { - while (tok.hasMoreTokens()) { - String order = tok.nextToken(); - String name = tok.nextToken(); - char uni = (char) Integer.parseInt(tok.nextToken(), 16); - int orderK; - if (order.startsWith("'")) { - orderK = order.charAt(1); - } else { - orderK = Integer.parseInt(order); - } - orderK %= 256; - specialMap.put(uni, orderK); - differences[orderK] = name; - unicodeDifferences[orderK] = uni; - widths[orderK] = getRawWidth(uni, name); - charBBoxes[orderK] = getRawCharBBox(uni, name); - } - } else { - int k = 0; - if (tok.hasMoreTokens()) { - k = Integer.parseInt(tok.nextToken()); - } - while (tok.hasMoreTokens() && k < 256) { - String hex = tok.nextToken(); - int uni = Integer.parseInt(hex, 16) % 0x10000; - String name = GlyphList.unicodeToName(uni); - if (name != null) { - specialMap.put(uni, k); - differences[k] = name; - unicodeDifferences[k] = (char) uni; - widths[k] = getRawWidth(uni, name); - charBBoxes[k] = getRawCharBBox(uni, name); - ++k; - } - } - } - for (int k = 0; k < 256; ++k) { - if (differences[k] == null) { - differences[k] = notdef; - } - } - } else if (fontSpecific) { - for (int k = 0; k < 256; ++k) { - widths[k] = getRawWidth(k, null); - charBBoxes[k] = getRawCharBBox(k, null); - } + public static String[][] getFullFontName(String name, String encoding, + byte[] ttfAfm) throws DocumentException, IOException { + String nameBase = getBaseName(name); + BaseFont fontBuilt = null; + if (nameBase.toLowerCase().endsWith(".ttf") + || nameBase.toLowerCase().endsWith(".otf") + || nameBase.toLowerCase().indexOf(".ttc,") > 0) { + fontBuilt = new TrueTypeFont(name, CP1252, false, ttfAfm, true, + false); } else { - String s; - String name; - char c; - byte[] b = new byte[1]; - for (int k = 0; k < 256; ++k) { - b[0] = (byte) k; - s = PdfEncodings.convertToString(b, encoding); + fontBuilt = createFont(name, encoding, false, false, ttfAfm, null); + } + return fontBuilt.getFullFontName(); + } + + /** + * Gets all the names from the font. Only the required tables are read. + * + * @param name the name of the font + * @param encoding the encoding of the font + * @param ttfAfm the true type font or the afm in a byte array + * @return an array of Object[] built with {getPostscriptFontName(), getFamilyFontName(), getFullFontName()} + * @throws DocumentException on error + * @throws IOException on error + */ + public static Object[] getAllFontNames(String name, String encoding, + byte[] ttfAfm) throws DocumentException, IOException { + String nameBase = getBaseName(name); + BaseFont fontBuilt = null; + if (nameBase.toLowerCase().endsWith(".ttf") + || nameBase.toLowerCase().endsWith(".otf") + || nameBase.toLowerCase().indexOf(".ttc,") > 0) { + fontBuilt = new TrueTypeFont(name, CP1252, false, ttfAfm, true, + false); + } else { + fontBuilt = createFont(name, encoding, false, false, ttfAfm, null); + } + return new Object[]{fontBuilt.getPostscriptFontName(), + fontBuilt.getFamilyFontName(), fontBuilt.getFullFontName()}; + } + + /** + * Gets all the entries of the namestable from the font. Only the required tables are read. + * + * @param name the name of the font + * @param encoding the encoding of the font + * @param ttfAfm the true type font or the afm in a byte array + * @return an array of Object[] built with {getPostscriptFontName(), getFamilyFontName(), getFullFontName()} + * @throws DocumentException on error + * @throws IOException on error + * @since 2.0.8 + */ + public static String[][] getAllNameEntries(String name, String encoding, + byte[] ttfAfm) throws DocumentException, IOException { + String nameBase = getBaseName(name); + BaseFont fontBuilt = null; + if (nameBase.toLowerCase().endsWith(".ttf") + || nameBase.toLowerCase().endsWith(".otf") + || nameBase.toLowerCase().indexOf(".ttc,") > 0) { + fontBuilt = new TrueTypeFont(name, CP1252, false, ttfAfm, true, + false); + } else { + fontBuilt = createFont(name, encoding, false, false, ttfAfm, null); + } + return fontBuilt.getAllNameEntries(); + } + + /** + * Enumerates the postscript font names present inside a True Type Collection. + * + * @param ttcFile the file name of the font + * @return the postscript font names + * @throws DocumentException on error + * @throws IOException on error + */ + public static String[] enumerateTTCNames(String ttcFile) + throws DocumentException, IOException { + return new EnumerateTTC(ttcFile).getNames(); + } + + /** + * Enumerates the postscript font names present inside a True Type Collection. + * + * @param ttcArray the font as a byte array + * @return the postscript font names + * @throws DocumentException on error + * @throws IOException on error + */ + public static String[] enumerateTTCNames(byte[] ttcArray) + throws DocumentException, IOException { + return new EnumerateTTC(ttcArray).getNames(); + } + + /** + * Gets the font resources. + * + * @param key the full name of the resource + * @return the InputStream to get the resource or + * null if not found + */ + public static InputStream getResourceStream(String key) { + return getResourceStream(key, null); + } + + /** + * Gets the font resources. + * + * @param key the full name of the resource + * @param loader the ClassLoader to load the resource or null to try the ones available + * @return the InputStream to get the resource or + * null if not found + */ + public static InputStream getResourceStream(String key, ClassLoader loader) { + if (key.startsWith("/")) { + key = key.substring(1); + } + InputStream is = null; + if (loader != null) { + is = loader.getResourceAsStream(key); + if (is != null) { + return new BufferedInputStream(is); + } + } + // Try to use Context Class Loader to load the properties file. + try { + ClassLoader contextClassLoader = Thread.currentThread() + .getContextClassLoader(); + if (contextClassLoader != null) { + is = contextClassLoader.getResourceAsStream(key); + } + } catch (Throwable e) { + } + + if (is == null) { + is = BaseFont.class.getResourceAsStream("/" + key); + } + if (is == null) { + is = ClassLoader.getSystemResourceAsStream(key); + } + return is == null ? null : new BufferedInputStream(is); + } + + private static void addFont(PRIndirectReference fontRef, IntHashtable hits, + ArrayList fonts) { + PdfObject obj = PdfReader.getPdfObject(fontRef); + if (obj == null || !obj.isDictionary()) { + return; + } + PdfDictionary font = (PdfDictionary) obj; + PdfName subtype = font.getAsName(PdfName.SUBTYPE); + if (!PdfName.TYPE1.equals(subtype) && !PdfName.TRUETYPE.equals(subtype)) { + return; + } + PdfName name = font.getAsName(PdfName.BASEFONT); + fonts.add(new Object[]{PdfName.decodeName(name.toString()), fontRef}); + hits.put(fontRef.getNumber(), 1); + } + + private static void recourseFonts(PdfDictionary page, IntHashtable hits, + ArrayList fonts, int level) { + ++level; + if (level > 50) { + return; + } + PdfDictionary resources = page.getAsDict(PdfName.RESOURCES); + if (resources == null) { + return; + } + PdfDictionary font = resources.getAsDict(PdfName.FONT); + if (font != null) { + for (PdfName pdfName : font.getKeys()) { + PdfObject ft = font.get(pdfName); + if (ft == null || !ft.isIndirect()) { + continue; + } + int hit = ((PRIndirectReference) ft).getNumber(); + if (hits.containsKey(hit)) { + continue; + } + addFont((PRIndirectReference) ft, hits, fonts); + } + } + PdfDictionary xobj = resources.getAsDict(PdfName.XOBJECT); + if (xobj != null) { + for (PdfName pdfName : xobj.getKeys()) { + recourseFonts(xobj.getAsDict(pdfName), hits, fonts, + level); + } + } + } + + /** + * Gets a list of all document fonts. Each element of the + * ArrayList contains a + * Object[]{String,PRIndirectReference} with the font name and + * the indirect reference to it. + * + * @param reader the document where the fonts are to be listed from + * @return the list of fonts and references + */ + public static ArrayList getDocumentFonts(PdfReader reader) { + IntHashtable hits = new IntHashtable(); + ArrayList fonts = new ArrayList<>(); + int npages = reader.getNumberOfPages(); + for (int k = 1; k <= npages; ++k) { + recourseFonts(reader.getPageN(k), hits, fonts, 1); + } + return fonts; + } + + /** + * Gets a list of the document fonts in a particular page. Each element of the ArrayList contains a + * Object[]{String,PRIndirectReference} with the font name and + * the indirect reference to it. + * + * @param reader the document where the fonts are to be listed from + * @param page the page to list the fonts from + * @return the list of fonts and references + */ + public static ArrayList getDocumentFonts(PdfReader reader, + int page) { + IntHashtable hits = new IntHashtable(); + ArrayList fonts = new ArrayList<>(); + recourseFonts(reader.getPageN(page), hits, fonts, 1); + return fonts; + } + + // ia> + + /** + * Creates the widths and the differences arrays + */ + protected void createEncoding() { + if (encoding.startsWith("#")) { + specialMap = new IntHashtable(); + StringTokenizer tok = new StringTokenizer(encoding.substring(1), + " ,\t\n\r\f"); + if (tok.nextToken().equals("full")) { + while (tok.hasMoreTokens()) { + String order = tok.nextToken(); + String name = tok.nextToken(); + char uni = (char) Integer.parseInt(tok.nextToken(), 16); + int orderK; + if (order.startsWith("'")) { + orderK = order.charAt(1); + } else { + orderK = Integer.parseInt(order); + } + orderK %= 256; + specialMap.put(uni, orderK); + differences[orderK] = name; + unicodeDifferences[orderK] = uni; + widths[orderK] = getRawWidth(uni, name); + charBBoxes[orderK] = getRawCharBBox(uni, name); + } + } else { + int k = 0; + if (tok.hasMoreTokens()) { + k = Integer.parseInt(tok.nextToken()); + } + while (tok.hasMoreTokens() && k < 256) { + String hex = tok.nextToken(); + int uni = Integer.parseInt(hex, 16) % 0x10000; + String name = GlyphList.unicodeToName(uni); + if (name != null) { + specialMap.put(uni, k); + differences[k] = name; + unicodeDifferences[k] = (char) uni; + widths[k] = getRawWidth(uni, name); + charBBoxes[k] = getRawCharBBox(uni, name); + ++k; + } + } + } + for (int k = 0; k < 256; ++k) { + if (differences[k] == null) { + differences[k] = notdef; + } + } + } else if (fontSpecific) { + for (int k = 0; k < 256; ++k) { + widths[k] = getRawWidth(k, null); + charBBoxes[k] = getRawCharBBox(k, null); + } + } else { + String s; + String name; + char c; + byte[] b = new byte[1]; + for (int k = 0; k < 256; ++k) { + b[0] = (byte) k; + s = PdfEncodings.convertToString(b, encoding); if (s.length() > 0) { c = s.charAt(0); } else { @@ -1005,48 +1127,39 @@ protected void createEncoding() { } /** - * Gets the width from the font according to the Unicode char c - * or the name. If the name is null it's a - * symbolic font. - * - * @param c - * the unicode char - * @param name - * the glyph name + * Gets the width from the font according to the Unicode char c or the name. If the + * name is null it's a symbolic font. + * + * @param c the unicode char + * @param name the glyph name * @return the width of the char */ abstract int getRawWidth(int c, String name); /** * Gets the kerning between two Unicode chars. - * - * @param char1 - * the first char - * @param char2 - * the second char + * + * @param char1 the first char + * @param char2 the second char * @return the kerning to be applied in normalized 1000 units */ public abstract int getKerning(int char1, int char2); /** * Sets the kerning between two Unicode chars. - * - * @param char1 - * the first char - * @param char2 - * the second char - * @param kern - * the kerning to apply in normalized 1000 units + * + * @param char1 the first char + * @param char2 the second char + * @param kern the kerning to apply in normalized 1000 units * @return true if the kerning was applied, false - * otherwise + * otherwise */ public abstract boolean setKerning(int char1, int char2, int kern); /** * Gets the width of a char in normalized 1000 units. - * - * @param char1 - * the unicode char to get the width of + * + * @param char1 the unicode char to get the width of * @return the width in normalized 1000 units */ public int getWidth(int char1) { @@ -1068,9 +1181,8 @@ public int getWidth(int char1) { /** * Gets the width of a String in normalized 1000 units. - * - * @param text - * the String to get the width of + * + * @param text the String to get the width of * @return the width in normalized 1000 units */ public int getWidth(String text) { @@ -1096,12 +1208,10 @@ public int getWidth(String text) { } /** - * Gets the descent of a String in normalized 1000 units. The - * descent will always be less than or equal to zero even if all the - * characters have an higher descent. - * - * @param text - * the String to get the descent of + * Gets the descent of a String in normalized 1000 units. The descent will always be less than or equal + * to zero even if all the characters have an higher descent. + * + * @param text the String to get the descent of * @return the descent in normalized 1000 units */ public int getDescent(String text) { @@ -1117,12 +1227,10 @@ public int getDescent(String text) { } /** - * Gets the ascent of a String in normalized 1000 units. The - * ascent will always be greater than or equal to zero even if all the - * characters have a lower ascent. - * - * @param text - * the String to get the ascent of + * Gets the ascent of a String in normalized 1000 units. The ascent will always be greater than or + * equal to zero even if all the characters have a lower ascent. + * + * @param text the String to get the ascent of * @return the ascent in normalized 1000 units */ public int getAscent(String text) { @@ -1138,14 +1246,11 @@ public int getAscent(String text) { } /** - * Gets the descent of a String in points. The descent will - * always be less than or equal to zero even if all the characters have an - * higher descent. - * - * @param text - * the String to get the descent of - * @param fontSize - * the size of the font + * Gets the descent of a String in points. The descent will always be less than or equal to zero even + * if all the characters have an higher descent. + * + * @param text the String to get the descent of + * @param fontSize the size of the font * @return the descent in points */ public float getDescentPoint(String text, float fontSize) { @@ -1153,30 +1258,22 @@ public float getDescentPoint(String text, float fontSize) { } /** - * Gets the ascent of a String in points. The ascent will - * always be greater than or equal to zero even if all the characters have a - * lower ascent. - * - * @param text - * the String to get the ascent of - * @param fontSize - * the size of the font + * Gets the ascent of a String in points. The ascent will always be greater than or equal to zero even + * if all the characters have a lower ascent. + * + * @param text the String to get the ascent of + * @param fontSize the size of the font * @return the ascent in points */ public float getAscentPoint(String text, float fontSize) { return getAscent(text) * 0.001f * fontSize; } - // ia> - /** - * Gets the width of a String in points taking kerning into - * account. - * - * @param text - * the String to get the width of - * @param fontSize - * the font size + * Gets the width of a String in points taking kerning into account. + * + * @param text the String to get the width of + * @param fontSize the font size * @return the width in points */ public float getWidthPointKerned(String text, float fontSize) { @@ -1195,11 +1292,9 @@ public float getWidthPointKerned(String text, float fontSize) { /** * Gets the width of a String in points. - * - * @param text - * the String to get the width of - * @param fontSize - * the font size + * + * @param text the String to get the width of + * @param fontSize the font size * @return the width in points */ public float getWidthPoint(String text, float fontSize) { @@ -1208,11 +1303,9 @@ public float getWidthPoint(String text, float fontSize) { /** * Gets the width of a char in points. - * - * @param char1 - * the char to get the width of - * @param fontSize - * the font size + * + * @param char1 the char to get the width of + * @param fontSize the font size * @return the width in points */ public float getWidthPoint(int char1, float fontSize) { @@ -1220,13 +1313,10 @@ public float getWidthPoint(int char1, float fontSize) { } /** - * Converts a String to a       byte       array according to - * the font's encoding. - * - * @param text - * the String to be converted - * @return an array of byte representing the conversion - * according to the font's encoding + * Converts a String to a byte array according to the font's encoding. + * + * @param text the String to be converted + * @return an array of byte representing the conversion according to the font's encoding */ byte[] convertToBytes(String text) { if (directTextToByte) { @@ -1254,13 +1344,10 @@ byte[] convertToBytes(String text) { } /** - * Converts a char to a byte array according to - * the font's encoding. - * - * @param char1 - * the char to be converted - * @return an array of byte representing the conversion - * according to the font's encoding + * Converts a char to a byte array according to the font's encoding. + * + * @param char1 the char to be converted + * @return an array of byte representing the conversion according to the font's encoding */ byte[] convertToBytes(int char1) { if (directTextToByte) { @@ -1268,7 +1355,7 @@ byte[] convertToBytes(int char1) { } if (specialMap != null) { if (specialMap.containsKey(char1)) { - return new byte[] { (byte) specialMap.get(char1) }; + return new byte[]{(byte) specialMap.get(char1)}; } else { return new byte[0]; } @@ -1278,28 +1365,22 @@ byte[] convertToBytes(int char1) { /** * Outputs to the writer the font dictionaries and streams. - * - * @param writer - * the writer for this document - * @param ref - * the font indirect reference - * @param params - * several parameters that depend on the font type - * @throws IOException - * on error - * @throws DocumentException - * error in generating the object + * + * @param writer the writer for this document + * @param ref the font indirect reference + * @param params several parameters that depend on the font type + * @throws IOException on error + * @throws DocumentException error in generating the object */ abstract void writeFont(PdfWriter writer, PdfIndirectReference ref, - Object[] params) throws DocumentException, IOException; + Object[] params) throws DocumentException, IOException; /** - * Returns a PdfStream object with the full font program (if possible). This - * method will return null for some types of fonts (CJKFont, Type3Font) or - * if there is no font program available (standard Type 1 fonts). - * + * Returns a PdfStream object with the full font program (if possible). This method will return null for some types + * of fonts (CJKFont, Type3Font) or if there is no font program available (standard Type 1 fonts). + * * @return a PdfStream with the font program - * @throws IOException on error + * @throws IOException on error * @throws DocumentException on error * @since 2.1.3 */ @@ -1309,7 +1390,7 @@ abstract PdfStream getFullFontStream() throws IOException, /** * Gets the encoding used to convert String into * byte[]. - * + * * @return the encoding name */ public String getEncoding() { @@ -1322,19 +1403,16 @@ public String getEncoding() { * CAPHEIGHT, DESCENT, AWT_DESCENT, * ITALICANGLE, BBOXLLX, BBOXLLY, * BBOXURX and BBOXURY. - * - * @param key - * the parameter to be extracted - * @param fontSize - * the font size in points + * + * @param key the parameter to be extracted + * @param fontSize the font size in points * @return the parameter in points */ public abstract float getFontDescriptor(int key, float fontSize); /** - * Gets the font type. The font types can be: FONT_TYPE_T1, FONT_TYPE_TT, - * FONT_TYPE_CJK and FONT_TYPE_TTUNI. - * + * Gets the font type. The font types can be: FONT_TYPE_T1, FONT_TYPE_TT, FONT_TYPE_CJK and FONT_TYPE_TTUNI. + * * @return the font type */ public int getFontType() { @@ -1343,7 +1421,7 @@ public int getFontType() { /** * Gets the embedded flag. - * + * * @return true if the font is embedded. */ public boolean isEmbedded() { @@ -1352,7 +1430,7 @@ public boolean isEmbedded() { /** * Gets the symbolic flag of the font. - * + * * @return true if the font is symbolic */ public boolean isFontSpecific() { @@ -1360,9 +1438,8 @@ public boolean isFontSpecific() { } /** - * Creates a unique subset prefix to be added to the font name when the font - * is embedded and subset. - * + * Creates a unique subset prefix to be added to the font name when the font is embedded and subset. + * * @return the subset prefix */ protected String createSubsetPrefix() { @@ -1375,8 +1452,7 @@ protected String createSubsetPrefix() { } /** - * Returns a defined SecureRandom implementation. - * If nothing is set, returns a new + * Returns a defined SecureRandom implementation. If nothing is set, returns a new * * @return {@link SecureRandom} */ @@ -1397,11 +1473,9 @@ public void setSecureRandom(SecureRandom secureRandom) { } /** - * Gets the Unicode character corresponding to the byte output to the pdf - * stream. - * - * @param index - * the byte index + * Gets the Unicode character corresponding to the byte output to the pdf stream. + * + * @param index the byte index * @return the Unicode character */ char getUnicodeDifferences(int index) { @@ -1410,204 +1484,62 @@ char getUnicodeDifferences(int index) { /** * Gets the postscript font name. - * + * * @return the postscript font name */ public abstract String getPostscriptFontName(); /** - * Sets the font name that will appear in the pdf font dictionary. Use with - * care as it can easily make a font unreadable if not embedded. - * - * @param name - * the new font name + * Sets the font name that will appear in the pdf font dictionary. Use with care as it can easily make a font + * unreadable if not embedded. + * + * @param name the new font name */ public abstract void setPostscriptFontName(String name); /** - * Gets the full name of the font. If it is a True Type font each array - * element will have {Platform ID, Platform Encoding ID, Language ID, font - * name}. The interpretation of this values can be found in the Open Type - * specification, chapter 2, in the 'name' table.
      - * For the other fonts the array has a single element with {"", "", "", font - * name}. - * + * Gets the full name of the font. If it is a True Type font each array element will have {Platform ID, Platform + * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type + * specification, chapter 2, in the 'name' table.
      For the other fonts the array has a single element with {"", + * "", "", font name}. + * * @return the full name of the font */ public abstract String[][] getFullFontName(); /** - * Gets all the entries of the names-table. If it is a True Type font each - * array element will have {Name ID, Platform ID, Platform Encoding ID, - * Language ID, font name}. The interpretation of this values can be found - * in the Open Type specification, chapter 2, in the 'name' table.
      - * For the other fonts the array has a single element with {"4", "", "", "", - * font name}. - * + * Gets all the entries of the names-table. If it is a True Type font each array element will have {Name ID, + * Platform ID, Platform Encoding ID, Language ID, font name}. The interpretation of this values can be found in the + * Open Type specification, chapter 2, in the 'name' table.
      For the other fonts the array has a single element + * with {"4", "", "", "", font name}. + * * @return the full name of the font * @since 2.0.8 */ public abstract String[][] getAllNameEntries(); /** - * Gets the full name of the font. If it is a True Type font each array - * element will have {Platform ID, Platform Encoding ID, Language ID, font - * name}. The interpretation of this values can be found in the Open Type - * specification, chapter 2, in the 'name' table.
      - * For the other fonts the array has a single element with {"", "", "", font - * name}. - * - * @param name - * the name of the font - * @param encoding - * the encoding of the font - * @param ttfAfm - * the true type font or the afm in a byte array - * @throws DocumentException - * on error - * @throws IOException - * on error - * @return the full name of the font - */ - public static String[][] getFullFontName(String name, String encoding, - byte[] ttfAfm) throws DocumentException, IOException { - String nameBase = getBaseName(name); - BaseFont fontBuilt = null; - if (nameBase.toLowerCase().endsWith(".ttf") - || nameBase.toLowerCase().endsWith(".otf") - || nameBase.toLowerCase().indexOf(".ttc,") > 0) { - fontBuilt = new TrueTypeFont(name, CP1252, false, ttfAfm, true, - false); - } else { - fontBuilt = createFont(name, encoding, false, false, ttfAfm, null); - } - return fontBuilt.getFullFontName(); - } - - /** - * Gets all the names from the font. Only the required tables are read. - * - * @param name - * the name of the font - * @param encoding - * the encoding of the font - * @param ttfAfm - * the true type font or the afm in a byte array - * @throws DocumentException - * on error - * @throws IOException - * on error - * @return an array of Object[] built with {getPostscriptFontName(), - * getFamilyFontName(), getFullFontName()} - */ - public static Object[] getAllFontNames(String name, String encoding, - byte[] ttfAfm) throws DocumentException, IOException { - String nameBase = getBaseName(name); - BaseFont fontBuilt = null; - if (nameBase.toLowerCase().endsWith(".ttf") - || nameBase.toLowerCase().endsWith(".otf") - || nameBase.toLowerCase().indexOf(".ttc,") > 0) { - fontBuilt = new TrueTypeFont(name, CP1252, false, ttfAfm, true, - false); - } else { - fontBuilt = createFont(name, encoding, false, false, ttfAfm, null); - } - return new Object[] { fontBuilt.getPostscriptFontName(), - fontBuilt.getFamilyFontName(), fontBuilt.getFullFontName() }; - } - - /** - * Gets all the entries of the namestable from the font. Only the required - * tables are read. - * - * @param name - * the name of the font - * @param encoding - * the encoding of the font - * @param ttfAfm - * the true type font or the afm in a byte array - * @throws DocumentException - * on error - * @throws IOException - * on error - * @return an array of Object[] built with {getPostscriptFontName(), - * getFamilyFontName(), getFullFontName()} - * @since 2.0.8 - */ - public static String[][] getAllNameEntries(String name, String encoding, - byte[] ttfAfm) throws DocumentException, IOException { - String nameBase = getBaseName(name); - BaseFont fontBuilt = null; - if (nameBase.toLowerCase().endsWith(".ttf") - || nameBase.toLowerCase().endsWith(".otf") - || nameBase.toLowerCase().indexOf(".ttc,") > 0) { - fontBuilt = new TrueTypeFont(name, CP1252, false, ttfAfm, true, - false); - } else { - fontBuilt = createFont(name, encoding, false, false, ttfAfm, null); - } - return fontBuilt.getAllNameEntries(); - } - - /** - * Gets the family name of the font. If it is a True Type font each array - * element will have {Platform ID, Platform Encoding ID, Language ID, font - * name}. The interpretation of this values can be found in the Open Type - * specification, chapter 2, in the 'name' table.
      - * For the other fonts the array has a single element with {"", "", "", font - * name}. - * + * Gets the family name of the font. If it is a True Type font each array element will have {Platform ID, Platform + * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type + * specification, chapter 2, in the 'name' table.
      For the other fonts the array has a single element with {"", + * "", "", font name}. + * * @return the family name of the font */ public abstract String[][] getFamilyFontName(); /** - * Gets the code pages supported by the font. This has only meaning with - * True Type fonts. - * + * Gets the code pages supported by the font. This has only meaning with True Type fonts. + * * @return the code pages supported by the font */ public String[] getCodePagesSupported() { return new String[0]; } - /** - * Enumerates the postscript font names present inside a True Type - * Collection. - * - * @param ttcFile - * the file name of the font - * @throws DocumentException - * on error - * @throws IOException - * on error - * @return the postscript font names - */ - public static String[] enumerateTTCNames(String ttcFile) - throws DocumentException, IOException { - return new EnumerateTTC(ttcFile).getNames(); - } - - /** - * Enumerates the postscript font names present inside a True Type - * Collection. - * - * @param ttcArray - * the font as a byte array - * @throws DocumentException - * on error - * @throws IOException - * on error - * @return the postscript font names - */ - public static String[] enumerateTTCNames(byte[] ttcArray) - throws DocumentException, IOException { - return new EnumerateTTC(ttcArray).getNames(); - } - /** * Gets the font width array. - * + * * @return the font width array */ public int[] getWidths() { @@ -1616,7 +1548,7 @@ public int[] getWidths() { /** * Gets the array with the names of the characters. - * + * * @return the array with the names of the characters */ public String[] getDifferences() { @@ -1625,7 +1557,7 @@ public String[] getDifferences() { /** * Gets the array with the unicode characters. - * + * * @return the array with the unicode characters */ public char[] getUnicodeDifferences() { @@ -1634,7 +1566,7 @@ public char[] getUnicodeDifferences() { /** * Gets the state of the property. - * + * * @return value of property forceWidthsOutput */ public boolean isForceWidthsOutput() { @@ -1643,9 +1575,8 @@ public boolean isForceWidthsOutput() { /** * Set to true to force the generation of the widths array. - * - * @param forceWidthsOutput - * true to force the generation of the widths array + * + * @param forceWidthsOutput true to force the generation of the widths array */ public void setForceWidthsOutput(boolean forceWidthsOutput) { this.forceWidthsOutput = forceWidthsOutput; @@ -1653,7 +1584,7 @@ public void setForceWidthsOutput(boolean forceWidthsOutput) { /** * Gets the direct conversion of char to byte. - * + * * @return value of property directTextToByte. * @see #setDirectTextToByte(boolean directTextToByte) */ @@ -1662,21 +1593,18 @@ public boolean isDirectTextToByte() { } /** - * Sets the conversion of char directly to byte by - * casting. This is a low level feature to put the bytes directly in the - * content stream without passing through String.getBytes(). - * - * @param directTextToByte - * New value of property directTextToByte. + * Sets the conversion of char directly to byte by casting. This is a low level feature to + * put the bytes directly in the content stream without passing through String.getBytes(). + * + * @param directTextToByte New value of property directTextToByte. */ public void setDirectTextToByte(boolean directTextToByte) { this.directTextToByte = directTextToByte; } /** - * Indicates if all the glyphs and widths for that particular encoding - * should be included in the document. - * + * Indicates if all the glyphs and widths for that particular encoding should be included in the document. + * * @return false to include all the glyphs and widths. */ public boolean isSubset() { @@ -1684,77 +1612,20 @@ public boolean isSubset() { } /** - * Indicates if all the glyphs and widths for that particular encoding - * should be included in the document. When set to true only - * the glyphs used will be included in the font. When set to + * Indicates if all the glyphs and widths for that particular encoding should be included in the document. When set + * to true only the glyphs used will be included in the font. When set to * false and {@link #addSubsetRange(int[])} was not called the - * full font will be included otherwise just the characters ranges will be - * included. - * - * @param subset - * new value of property subset + * full font will be included otherwise just the characters ranges will be included. + * + * @param subset new value of property subset */ public void setSubset(boolean subset) { this.subset = subset; } /** - * Gets the font resources. - * - * @param key - * the full name of the resource - * @return the InputStream to get the resource or - * null if not found - */ - public static InputStream getResourceStream(String key) { - return getResourceStream(key, null); - } - - /** - * Gets the font resources. - * - * @param key - * the full name of the resource - * @param loader - * the ClassLoader to load the resource or null to try the ones - * available - * @return the InputStream to get the resource or - * null if not found - */ - public static InputStream getResourceStream(String key, ClassLoader loader) { - if (key.startsWith("/")) { - key = key.substring(1); - } - InputStream is = null; - if (loader != null) { - is = loader.getResourceAsStream(key); - if (is != null) { - return new BufferedInputStream(is); - } - } - // Try to use Context Class Loader to load the properties file. - try { - ClassLoader contextClassLoader = Thread.currentThread() - .getContextClassLoader(); - if (contextClassLoader != null) { - is = contextClassLoader.getResourceAsStream(key); - } - } catch (Throwable e) { - } - - if (is == null) { - is = BaseFont.class.getResourceAsStream("/" + key); - } - if (is == null) { - is = ClassLoader.getSystemResourceAsStream(key); - } - return is == null ? null : new BufferedInputStream(is); - } - - /** - * Gets the Unicode equivalent to a CID. The (nonexistent) CID FF00 is - * translated as '\n'. It has only meaning with CJK fonts with Identity - * encoding. + * Gets the Unicode equivalent to a CID. The (nonexistent) CID FF00 is translated as '\n'. It has only + * meaning with CJK fonts with Identity encoding. * * @param c the CID code * @return the Unicode equivalent @@ -1765,9 +1636,8 @@ public int getUnicodeEquivalent(int c) { /** * Gets the CID code given an Unicode. It has only meaning with CJK fonts. - * - * @param c - * the Unicode + * + * @param c the Unicode * @return the CID equivalent */ public int getCidCode(int c) { @@ -1776,18 +1646,17 @@ public int getCidCode(int c) { /** * Checks if the font has any kerning pairs. - * + * * @return true if the font has any kerning pairs */ public abstract boolean hasKernPairs(); /** * Checks if a character exists in this font. - * - * @param c - * the character to check + * + * @param c the character to check * @return true if the character has a glyph, - * false otherwise + * false otherwise */ public boolean charExists(int c) { byte[] b = convertToBytes(c); @@ -1796,13 +1665,11 @@ public boolean charExists(int c) { /** * Sets the character advance. - * - * @param c - * the character - * @param advance - * the character advance normalized to 1000 units + * + * @param c the character + * @param advance the character advance normalized to 1000 units * @return true if the advance was set, false - * otherwise + * otherwise */ public boolean setCharAdvance(int c, int advance) { byte[] b = convertToBytes(c); @@ -1813,105 +1680,14 @@ public boolean setCharAdvance(int c, int advance) { return true; } - private static void addFont(PRIndirectReference fontRef, IntHashtable hits, - ArrayList fonts) { - PdfObject obj = PdfReader.getPdfObject(fontRef); - if (obj == null || !obj.isDictionary()) { - return; - } - PdfDictionary font = (PdfDictionary) obj; - PdfName subtype = font.getAsName(PdfName.SUBTYPE); - if (!PdfName.TYPE1.equals(subtype) && !PdfName.TRUETYPE.equals(subtype)) { - return; - } - PdfName name = font.getAsName(PdfName.BASEFONT); - fonts.add(new Object[] { PdfName.decodeName(name.toString()), fontRef }); - hits.put(fontRef.getNumber(), 1); - } - - private static void recourseFonts(PdfDictionary page, IntHashtable hits, - ArrayList fonts, int level) { - ++level; - if (level > 50) { - return; - } - PdfDictionary resources = page.getAsDict(PdfName.RESOURCES); - if (resources == null) { - return; - } - PdfDictionary font = resources.getAsDict(PdfName.FONT); - if (font != null) { - for (PdfName pdfName : font.getKeys()) { - PdfObject ft = font.get(pdfName); - if (ft == null || !ft.isIndirect()) { - continue; - } - int hit = ((PRIndirectReference) ft).getNumber(); - if (hits.containsKey(hit)) { - continue; - } - addFont((PRIndirectReference) ft, hits, fonts); - } - } - PdfDictionary xobj = resources.getAsDict(PdfName.XOBJECT); - if (xobj != null) { - for (PdfName pdfName : xobj.getKeys()) { - recourseFonts(xobj.getAsDict(pdfName), hits, fonts, - level); - } - } - } - - /** - * Gets a list of all document fonts. Each element of the - * ArrayList contains a - * Object[]{String,PRIndirectReference} with the font name and - * the indirect reference to it. - * - * @param reader - * the document where the fonts are to be listed from - * @return the list of fonts and references - */ - public static ArrayList getDocumentFonts(PdfReader reader) { - IntHashtable hits = new IntHashtable(); - ArrayList fonts = new ArrayList<>(); - int npages = reader.getNumberOfPages(); - for (int k = 1; k <= npages; ++k) { - recourseFonts(reader.getPageN(k), hits, fonts, 1); - } - return fonts; - } - - /** - * Gets a list of the document fonts in a particular page. Each element of - * the ArrayList contains a - * Object[]{String,PRIndirectReference} with the font name and - * the indirect reference to it. - * - * @param reader - * the document where the fonts are to be listed from - * @param page - * the page to list the fonts from - * @return the list of fonts and references - */ - public static ArrayList getDocumentFonts(PdfReader reader, - int page) { - IntHashtable hits = new IntHashtable(); - ArrayList fonts = new ArrayList<>(); - recourseFonts(reader.getPageN(page), hits, fonts, 1); - return fonts; - } - /** * Gets the smallest box enclosing the character contours. It will return * null if the font has not the information or the character - * has no contours, as in the case of the space, for example. Characters - * with no contours may also return [0,0,0,0]. - * - * @param c - * the character to get the contour bounding box from - * @return an array of four floats with the bounding box in the format - * [llx,lly,urx,ury] or null + * has no contours, as in the case of the space, for example. Characters with no contours may also return + * [0,0,0,0]. + * + * @param c the character to get the contour bounding box from + * @return an array of four floats with the bounding box in the format [llx,lly,urx,ury] or null */ public int[] getCharBBox(int c) { byte[] b = convertToBytes(c); @@ -1925,11 +1701,9 @@ public int[] getCharBBox(int c) { protected abstract int[] getRawCharBBox(int c, String name); /** - * iText expects Arabic Diactrics (tashkeel) to have zero advance but some - * fonts, most notably those that come with Windows, like times.ttf, have - * non-zero advance for those characters. This method makes those character - * to have zero width advance and work correctly in the iText Arabic shaping - * and reordering context. + * iText expects Arabic Diactrics (tashkeel) to have zero advance but some fonts, most notably those that come with + * Windows, like times.ttf, have non-zero advance for those characters. This method makes those character to have + * zero width advance and work correctly in the iText Arabic shaping and reordering context. */ public void correctArabicAdvance() { for (char c = '\u064b'; c <= '\u0658'; ++c) { @@ -1951,13 +1725,11 @@ public void correctArabicAdvance() { } /** - * Adds a character range when subsetting. The range is an int - * array where the first element is the start range inclusive and the second - * element is the end range inclusive. Several ranges are allowed in the - * same array. - * - * @param range - * the character range + * Adds a character range when subsetting. The range is an int array where the first element is the + * start range inclusive and the second element is the end range inclusive. Several ranges are allowed in the same + * array. + * + * @param range the character range */ public void addSubsetRange(int[] range) { if (subsetRanges == null) { @@ -1968,9 +1740,8 @@ public void addSubsetRange(int[] range) { /** * Returns the compression level used for the font streams. - * - * @return the compression level (0 = best speed, 9 = best compression, -1 - * is default) + * + * @return the compression level (0 = best speed, 9 = best compression, -1 is default) * @since 2.1.3 */ public int getCompressionLevel() { @@ -1979,9 +1750,8 @@ public int getCompressionLevel() { /** * Sets the compression level to be used for the font streams. - * - * @param compressionLevel - * a value between 0 (best speed) and 9 (best compression) + * + * @param compressionLevel a value between 0 (best speed) and 9 (best compression) * @since 2.1.3 */ public void setCompressionLevel(int compressionLevel) { @@ -1992,7 +1762,7 @@ public void setCompressionLevel(int compressionLevel) { this.compressionLevel = compressionLevel; } } - + /** * Indicates if a CIDSet stream should be included in the document for {@link TrueTypeFontUnicode}. * @@ -2001,16 +1771,68 @@ public void setCompressionLevel(int compressionLevel) { public boolean isIncludeCidSet() { return includeCidSet; } - + /** - * Indicates if a CIDSet stream should be included in the document for {@link TrueTypeFontUnicode}. - * When set to true, a CIDSet stream will be included in the document. - * When set to false, and {@link PdfWriter#getPDFXConformance()} does not require it, - * no CIDSet stream will be included. + * Indicates if a CIDSet stream should be included in the document for {@link TrueTypeFontUnicode}. When set to + * true, a CIDSet stream will be included in the document. When set to false, and + * {@link PdfWriter#getPDFXConformance()} does not require it, no CIDSet stream will be included. * * @param includeCidSet new value of {@link BaseFont#includeCidSet} */ public void setIncludeCidSet(boolean includeCidSet) { this.includeCidSet = includeCidSet; } + + /** + * Generates the PDF stream with the Type1 and Truetype fonts returning a PdfStream. + */ + static class StreamFont extends PdfStream { + + /** + * Generates the PDF stream with the Type1 and Truetype fonts returning a PdfStream. + * + * @param contents the content of the stream + * @param lengths an array of int that describes the several lengths of each part of the font + * @param compressionLevel the compression level of the Stream + * @throws DocumentException error in the stream compression + * @since 2.1.3 (replaces the constructor without param compressionLevel) + */ + public StreamFont(byte[] contents, int[] lengths, int compressionLevel) + throws DocumentException { + try { + bytes = contents; + put(PdfName.LENGTH, new PdfNumber(bytes.length)); + for (int k = 0; k < lengths.length; ++k) { + put(new PdfName("Length" + (k + 1)), new PdfNumber( + lengths[k])); + } + flateCompress(compressionLevel); + } catch (Exception e) { + throw new DocumentException(e); + } + } + + /** + * Generates the PDF stream for a font. + * + * @param contents the content of a stream + * @param subType the subtype of the font. + * @param compressionLevel the compression level of the Stream + * @throws DocumentException error in the stream compression + * @since 2.1.3 (replaces the constructor without param compressionLevel) + */ + public StreamFont(byte[] contents, String subType, int compressionLevel) + throws DocumentException { + try { + bytes = contents; + put(PdfName.LENGTH, new PdfNumber(bytes.length)); + if (subType != null) { + put(PdfName.SUBTYPE, new PdfName(subType)); + } + flateCompress(compressionLevel); + } catch (Exception e) { + throw new DocumentException(e); + } + } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BidiLine.java b/openpdf/src/main/java/com/lowagie/text/pdf/BidiLine.java index a6b419c82..d49263098 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/BidiLine.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/BidiLine.java @@ -48,584 +48,21 @@ package com.lowagie.text.pdf; +import com.lowagie.text.Chunk; +import com.lowagie.text.Utilities; import java.text.Bidi; import java.util.ArrayList; import java.util.List; -import com.lowagie.text.Chunk; -import com.lowagie.text.Utilities; - -/** Does all the line bidirectional processing with PdfChunk assembly. +/** + * Does all the line bidirectional processing with PdfChunk assembly. * * @author Paulo Soares (psoares@consiste.pt) */ public class BidiLine { - - protected int runDirection; - protected int pieceSize = 256; - protected char[] text = new char[pieceSize]; - protected PdfChunk[] detailChunks = new PdfChunk[pieceSize]; - protected int totalTextLength = 0; - - protected byte[] orderLevels = new byte[pieceSize]; - protected int[] indexChars = new int[pieceSize]; - - protected ArrayList chunks = new ArrayList<>(); - protected int indexChunk = 0; - protected int indexChunkChar = 0; - protected int currentChar = 0; - - protected int storedRunDirection; - protected char[] storedText = new char[0]; - protected PdfChunk[] storedDetailChunks = new PdfChunk[0]; - protected int storedTotalTextLength = 0; - protected byte[] storedOrderLevels = new byte[0]; - protected int[] storedIndexChars = new int[0]; - - protected int storedIndexChunk = 0; - protected int storedIndexChunkChar = 0; - protected int storedCurrentChar = 0; - - protected boolean shortStore; -// protected ArabicShaping arabic = new ArabicShaping(ArabicShaping.LETTERS_SHAPE | ArabicShaping.LENGTH_GROW_SHRINK | ArabicShaping.TEXT_DIRECTION_LOGICAL); + // protected ArabicShaping arabic = new ArabicShaping(ArabicShaping.LETTERS_SHAPE | ArabicShaping.LENGTH_GROW_SHRINK | ArabicShaping.TEXT_DIRECTION_LOGICAL); protected static final IntHashtable mirrorChars = new IntHashtable(); - protected int arabicOptions; - - /** Creates new BidiLine */ - public BidiLine() { - } - - public BidiLine(BidiLine org) { - runDirection = org.runDirection; - pieceSize = org.pieceSize; - text = org.text.clone(); - detailChunks = org.detailChunks.clone(); - totalTextLength = org.totalTextLength; - - orderLevels = org.orderLevels.clone(); - indexChars = org.indexChars.clone(); - - chunks = new ArrayList<>(org.chunks); - indexChunk = org.indexChunk; - indexChunkChar = org.indexChunkChar; - currentChar = org.currentChar; - - storedRunDirection = org.storedRunDirection; - storedText = org.storedText.clone(); - storedDetailChunks = org.storedDetailChunks.clone(); - storedTotalTextLength = org.storedTotalTextLength; - - storedOrderLevels = org.storedOrderLevels.clone(); - storedIndexChars = org.storedIndexChars.clone(); - - storedIndexChunk = org.storedIndexChunk; - storedIndexChunkChar = org.storedIndexChunkChar; - storedCurrentChar = org.storedCurrentChar; - - shortStore = org.shortStore; - arabicOptions = org.arabicOptions; - } - - public boolean isEmpty() { - return (currentChar >= totalTextLength && indexChunk >= chunks.size()); - } - - public void clearChunks() { - chunks.clear(); - totalTextLength = 0; - currentChar = 0; - } - - public boolean getParagraph(int runDirection) { - this.runDirection = runDirection; - currentChar = 0; - totalTextLength = 0; - boolean hasText = false; - char c; - char uniC; - BaseFont bf; - for (; indexChunk < chunks.size(); ++indexChunk) { - PdfChunk ck = chunks.get(indexChunk); - bf = ck.font().getFont(); - String s = ck.toString(); - int len = s.length(); - for (; indexChunkChar < len; ++indexChunkChar) { - c = s.charAt(indexChunkChar); - uniC = (char)bf.getUnicodeEquivalent(c); - if (uniC == '\r' || uniC == '\n') { - // next condition is never true for CID - if (uniC == '\r' && indexChunkChar + 1 < len && s.charAt(indexChunkChar + 1) == '\n') - ++indexChunkChar; - ++indexChunkChar; - if (indexChunkChar >= len) { - indexChunkChar = 0; - ++indexChunk; - } - hasText = true; - if (totalTextLength == 0) - detailChunks[0] = ck; - break; - } - addPiece(c, ck); - } - if (hasText) - break; - indexChunkChar = 0; - } - if (totalTextLength == 0) - return hasText; - - // remove trailing WS - totalTextLength = trimRight(0, totalTextLength - 1) + 1; - if (totalTextLength == 0) { - return true; - } - - if (runDirection == PdfWriter.RUN_DIRECTION_LTR || runDirection == PdfWriter.RUN_DIRECTION_RTL) { - if (orderLevels.length < totalTextLength) { - orderLevels = new byte[pieceSize]; - indexChars = new int[pieceSize]; - } - ArabicLigaturizer.processNumbers(text, 0, totalTextLength, arabicOptions); - Bidi bidi = new Bidi(new String(text), - (byte) (runDirection == PdfWriter.RUN_DIRECTION_RTL ? Bidi.DIRECTION_RIGHT_TO_LEFT : Bidi.DIRECTION_LEFT_TO_RIGHT)); - for (int k = 0; k < totalTextLength; ++k) { - orderLevels[k] = (byte) bidi.getLevelAt(k); - indexChars[k] = k; - } - doArabicShapping(); - mirrorGlyphs(); - } - - totalTextLength = trimRightEx(0, totalTextLength - 1) + 1; - return true; - } - - public void addChunk(PdfChunk chunk) { - chunks.add(chunk); - } - - public void addChunks(List chunks) { - this.chunks.addAll(chunks); - } - - public void addPiece(char c, PdfChunk chunk) { - if (totalTextLength >= pieceSize) { - char[] tempText = text; - PdfChunk[] tempDetailChunks = detailChunks; - pieceSize *= 2; - text = new char[pieceSize]; - detailChunks = new PdfChunk[pieceSize]; - System.arraycopy(tempText, 0, text, 0, totalTextLength); - System.arraycopy(tempDetailChunks, 0, detailChunks, 0, totalTextLength); - } - text[totalTextLength] = c; - detailChunks[totalTextLength++] = chunk; - } - - public void save() { - if (indexChunk > 0) { - if (indexChunk >= chunks.size()) - chunks.clear(); - else { - for (--indexChunk; indexChunk >= 0; --indexChunk) - chunks.remove(indexChunk); - } - indexChunk = 0; - } - storedRunDirection = runDirection; - storedTotalTextLength = totalTextLength; - storedIndexChunk = indexChunk; - storedIndexChunkChar = indexChunkChar; - storedCurrentChar = currentChar; - shortStore = (currentChar < totalTextLength); - if (!shortStore) { - // long save - if (storedText.length < totalTextLength) { - storedText = new char[totalTextLength]; - storedDetailChunks = new PdfChunk[totalTextLength]; - } - System.arraycopy(text, 0, storedText, 0, totalTextLength); - System.arraycopy(detailChunks, 0, storedDetailChunks, 0, totalTextLength); - } - if (runDirection == PdfWriter.RUN_DIRECTION_LTR || runDirection == PdfWriter.RUN_DIRECTION_RTL) { - if (storedOrderLevels.length < totalTextLength) { - storedOrderLevels = new byte[totalTextLength]; - storedIndexChars = new int[totalTextLength]; - } - System.arraycopy(orderLevels, currentChar, storedOrderLevels, currentChar, totalTextLength - currentChar); - System.arraycopy(indexChars, currentChar, storedIndexChars, currentChar, totalTextLength - currentChar); - } - } - - public void restore() { - runDirection = storedRunDirection; - totalTextLength = storedTotalTextLength; - indexChunk = storedIndexChunk; - indexChunkChar = storedIndexChunkChar; - currentChar = storedCurrentChar; - if (!shortStore) { - // long restore - System.arraycopy(storedText, 0, text, 0, totalTextLength); - System.arraycopy(storedDetailChunks, 0, detailChunks, 0, totalTextLength); - } - if (runDirection == PdfWriter.RUN_DIRECTION_LTR || runDirection == PdfWriter.RUN_DIRECTION_RTL) { - System.arraycopy(storedOrderLevels, currentChar, orderLevels, currentChar, totalTextLength - currentChar); - System.arraycopy(storedIndexChars, currentChar, indexChars, currentChar, totalTextLength - currentChar); - } - } - - public void mirrorGlyphs() { - for (int k = 0; k < totalTextLength; ++k) { - if ((orderLevels[k] & 1) == 1) { - int mirror = mirrorChars.get(text[k]); - if (mirror != 0) - text[k] = (char)mirror; - } - } - } - - public void doArabicShapping() { - int src = 0; - int dest = 0; - for (;;) { - while (src < totalTextLength) { - char c = text[src]; - if (c >= 0x0600 && c <= 0x06ff) - break; - if (src != dest) { - text[dest] = text[src]; - detailChunks[dest] = detailChunks[src]; - orderLevels[dest] = orderLevels[src]; - } - ++src; - ++dest; - } - if (src >= totalTextLength) { - totalTextLength = dest; - return; - } - int startArabicIdx = src; - ++src; - while (src < totalTextLength) { - char c = text[src]; - if (c < 0x0600 || c > 0x06ff) - break; - ++src; - } - int arabicWordSize = src - startArabicIdx; - int size = ArabicLigaturizer.arabic_shape(text, startArabicIdx, arabicWordSize, text, dest, arabicWordSize, arabicOptions); - if (startArabicIdx != dest) { - for (int k = 0; k < size; ++k) { - detailChunks[dest] = detailChunks[startArabicIdx]; - orderLevels[dest++] = orderLevels[startArabicIdx++]; - } - } - else - dest += size; - } - } - - public PdfLine processLine(float leftX, float width, int alignment, int runDirection, int arabicOptions) { - this.arabicOptions = arabicOptions; - save(); - boolean isRTL = (runDirection == PdfWriter.RUN_DIRECTION_RTL); - if (currentChar >= totalTextLength) { - boolean hasText = getParagraph(runDirection); - if (!hasText) - return null; - if (totalTextLength == 0) { - ArrayList ar = new ArrayList<>(); - PdfChunk ck = new PdfChunk("", detailChunks[0]); - ar.add(ck); - return new PdfLine(0, 0, 0, alignment, true, ar, isRTL); - } - } - float originalWidth = width; - int lastSplit = -1; - if (currentChar != 0) - currentChar = trimLeftEx(currentChar, totalTextLength - 1); - int oldCurrentChar = currentChar; - int uniC = 0; - PdfChunk ck = null; - float charWidth = 0; - PdfChunk lastValidChunk = null; - boolean splitChar = false; - boolean surrogate = false; - for (; currentChar < totalTextLength; ++currentChar) { - ck = detailChunks[currentChar]; - surrogate = Utilities.isSurrogatePair(text, currentChar); - if (surrogate) - uniC = ck.getUnicodeEquivalent(Utilities.convertToUtf32(text, currentChar)); - else - uniC = ck.getUnicodeEquivalent(text[currentChar]); - if (PdfChunk.noPrint(uniC)) - continue; - if (surrogate) - charWidth = ck.getCharWidth(uniC); - else - charWidth = ck.getCharWidth(text[currentChar]); - splitChar = ck.isExtSplitCharacter(oldCurrentChar, currentChar, totalTextLength, text, detailChunks); - if (splitChar && Character.isWhitespace((char)uniC)) - lastSplit = currentChar; - if (width - charWidth < 0) - break; - if (splitChar) - lastSplit = currentChar; - width -= charWidth; - lastValidChunk = ck; - if (ck.isTab()) { - Object[] tab = (Object[])ck.getAttribute(Chunk.TAB); - float tabPosition = (Float) tab[1]; - boolean newLine = (Boolean) tab[2]; - if (newLine && tabPosition < originalWidth - width) { - return new PdfLine(0, originalWidth, width, alignment, true, createArrayOfPdfChunks(oldCurrentChar, currentChar - 1), isRTL); - } - detailChunks[currentChar].adjustLeft(leftX); - width = originalWidth - tabPosition; - } - if (surrogate) - ++currentChar; - } - if (lastValidChunk == null) { - // not even a single char fit; must output the first char - ++currentChar; - if (surrogate) - ++currentChar; - return new PdfLine(0, originalWidth, 0, alignment, false, createArrayOfPdfChunks(currentChar - 1, currentChar - 1), isRTL); - } - if (currentChar >= totalTextLength) { - // there was more line than text - return new PdfLine(0, originalWidth, width, alignment, true, createArrayOfPdfChunks(oldCurrentChar, totalTextLength - 1), isRTL); - } - int newCurrentChar = trimRightEx(oldCurrentChar, currentChar - 1); - if (newCurrentChar < oldCurrentChar) { - // only WS - return new PdfLine(0, originalWidth, width, alignment, false, createArrayOfPdfChunks(oldCurrentChar, currentChar - 1), isRTL); - } - if (newCurrentChar == currentChar - 1) { // middle of word - HyphenationEvent he = (HyphenationEvent)lastValidChunk.getAttribute(Chunk.HYPHENATION); - if (he != null) { - int[] word = getWord(oldCurrentChar, newCurrentChar); - if (word != null) { - float testWidth = width + getWidth(word[0], currentChar - 1); - String pre = he.getHyphenatedWordPre(new String(text, word[0], word[1] - word[0]), lastValidChunk.font().getFont(), lastValidChunk.font().size(), testWidth); - String post = he.getHyphenatedWordPost(); - if (pre.length() > 0) { - PdfChunk extra = new PdfChunk(pre, lastValidChunk); - currentChar = word[1] - post.length(); - return new PdfLine(0, originalWidth, testWidth - lastValidChunk.font().width(pre), alignment, false, createArrayOfPdfChunks(oldCurrentChar, word[0] - 1, extra), isRTL); - } - } - } - } - if (lastSplit == -1 || lastSplit >= newCurrentChar) { - // no split point or split point ahead of end - return new PdfLine(0, originalWidth, width + getWidth(newCurrentChar + 1, currentChar - 1), alignment, false, createArrayOfPdfChunks(oldCurrentChar, newCurrentChar), isRTL); - } - // standard split - currentChar = lastSplit + 1; - newCurrentChar = trimRightEx(oldCurrentChar, lastSplit); - if (newCurrentChar < oldCurrentChar) { - // only WS again - newCurrentChar = currentChar - 1; - } - return new PdfLine(0, originalWidth, originalWidth - getWidth(oldCurrentChar, newCurrentChar), alignment, false, createArrayOfPdfChunks(oldCurrentChar, newCurrentChar), isRTL); - } - - /** Gets the width of a range of characters. - * @param startIdx the first index to calculate - * @param lastIdx the last inclusive index to calculate - * @return the sum of all widths - */ - public float getWidth(int startIdx, int lastIdx) { - char c = 0; - char uniC; - PdfChunk ck = null; - float width = 0; - for (; startIdx <= lastIdx; ++startIdx) { - boolean surrogate = Utilities.isSurrogatePair(text, startIdx); - if (surrogate) { - width += detailChunks[startIdx].getCharWidth(Utilities.convertToUtf32(text, startIdx)); - ++startIdx; - } - else { - c = text[startIdx]; - ck = detailChunks[startIdx]; - if (PdfChunk.noPrint(ck.getUnicodeEquivalent(c))) - continue; - width += detailChunks[startIdx].getCharWidth(c); - } - } - return width; - } - - public ArrayList createArrayOfPdfChunks(int startIdx, int endIdx) { - return createArrayOfPdfChunks(startIdx, endIdx, null); - } - - public ArrayList createArrayOfPdfChunks(int startIdx, int endIdx, PdfChunk extraPdfChunk) { - boolean bidi = (runDirection == PdfWriter.RUN_DIRECTION_LTR || runDirection == PdfWriter.RUN_DIRECTION_RTL); - if (bidi) - reorder(startIdx, endIdx); - ArrayList ar = new ArrayList<>(); - PdfChunk refCk = detailChunks[startIdx]; - PdfChunk ck = null; - StringBuffer buf = new StringBuffer(); - char c; - int idx = 0; - for (; startIdx <= endIdx; ++startIdx) { - idx = bidi ? indexChars[startIdx] : startIdx; - c = text[idx]; - ck = detailChunks[idx]; - if (PdfChunk.noPrint(ck.getUnicodeEquivalent(c))) - continue; - if (ck.isImage() || ck.isSeparator() || ck.isTab()) { - if (buf.length() > 0) { - ar.add(new PdfChunk(buf.toString(), refCk)); - buf = new StringBuffer(); - } - ar.add(ck); - } - else if (ck == refCk) { - buf.append(c); - } - else { - if (buf.length() > 0) { - ar.add(new PdfChunk(buf.toString(), refCk)); - buf = new StringBuffer(); - } - if (!ck.isImage() && !ck.isSeparator() && !ck.isTab()) - buf.append(c); - refCk = ck; - } - } - if (buf.length() > 0) { - ar.add(new PdfChunk(buf.toString(), refCk)); - } - if (extraPdfChunk != null) - ar.add(extraPdfChunk); - return ar; - } - - public int[] getWord(int startIdx, int idx) { - int last = idx; - int first = idx; - // forward - for (; last < totalTextLength; ++last) { - if (!Character.isLetter(text[last])) - break; - } - if (last == idx) - return null; - // backward - for (; first >= startIdx; --first) { - if (!Character.isLetter(text[first])) - break; - } - ++first; - return new int[]{first, last}; - } - - public int trimRight(int startIdx, int endIdx) { - int idx = endIdx; - char c; - for (; idx >= startIdx; --idx) { - c = (char)detailChunks[idx].getUnicodeEquivalent(text[idx]); - if (!isWS(c)) - break; - } - return idx; - } - - public int trimLeft(int startIdx, int endIdx) { - int idx = startIdx; - char c; - for (; idx <= endIdx; ++idx) { - c = (char)detailChunks[idx].getUnicodeEquivalent(text[idx]); - if (!isWS(c)) - break; - } - return idx; - } - - public int trimRightEx(int startIdx, int endIdx) { - int idx = endIdx; - char c = 0; - for (; idx >= startIdx; --idx) { - c = (char)detailChunks[idx].getUnicodeEquivalent(text[idx]); - if (!isWS(c) && !PdfChunk.noPrint(c)) - break; - } - return idx; - } - - public int trimLeftEx(int startIdx, int endIdx) { - int idx = startIdx; - char c = 0; - for (; idx <= endIdx; ++idx) { - c = (char)detailChunks[idx].getUnicodeEquivalent(text[idx]); - if (!isWS(c) && !PdfChunk.noPrint(c)) - break; - } - return idx; - } - - public void reorder(int start, int end) { - byte maxLevel = orderLevels[start]; - byte minLevel = maxLevel; - byte onlyOddLevels = maxLevel; - byte onlyEvenLevels = maxLevel; - for (int k = start + 1; k <= end; ++k) { - byte b = orderLevels[k]; - if (b > maxLevel) - maxLevel = b; - else if (b < minLevel) - minLevel = b; - onlyOddLevels &= b; - onlyEvenLevels |= b; - } - if ((onlyEvenLevels & 1) == 0) // nothing to do - return; - if ((onlyOddLevels & 1) == 1) { // single inversion - flip(start, end + 1); - return; - } - minLevel |= 1; - for (; maxLevel >= minLevel; --maxLevel) { - int pstart = start; - for (;;) { - for (;pstart <= end; ++pstart) { - if (orderLevels[pstart] >= maxLevel) - break; - } - if (pstart > end) - break; - int pend = pstart + 1; - for (; pend <= end; ++pend) { - if (orderLevels[pend] < maxLevel) - break; - } - flip(pstart, pend); - pstart = pend + 1; - } - } - } - - public void flip(int start, int end) { - int mid = (start + end) / 2; - --end; - for (; start < mid; ++start, --end) { - int temp = indexChars[start]; - indexChars[start] = indexChars[end]; - indexChars[end] = temp; - } - } - - public static boolean isWS(char c) { - return (c <= ' '); - } static { mirrorChars.put(0x0028, 0x0029); // LEFT PARENTHESIS @@ -947,4 +384,609 @@ public static boolean isWS(char c) { mirrorChars.put(0xFF62, 0xFF63); // [BEST FIT] HALFWIDTH LEFT CORNER BRACKET mirrorChars.put(0xFF63, 0xFF62); // [BEST FIT] HALFWIDTH RIGHT CORNER BRACKET } + + protected int runDirection; + protected int pieceSize = 256; + protected char[] text = new char[pieceSize]; + protected PdfChunk[] detailChunks = new PdfChunk[pieceSize]; + protected int totalTextLength = 0; + protected byte[] orderLevels = new byte[pieceSize]; + protected int[] indexChars = new int[pieceSize]; + protected ArrayList chunks = new ArrayList<>(); + protected int indexChunk = 0; + protected int indexChunkChar = 0; + protected int currentChar = 0; + protected int storedRunDirection; + protected char[] storedText = new char[0]; + protected PdfChunk[] storedDetailChunks = new PdfChunk[0]; + protected int storedTotalTextLength = 0; + protected byte[] storedOrderLevels = new byte[0]; + protected int[] storedIndexChars = new int[0]; + protected int storedIndexChunk = 0; + protected int storedIndexChunkChar = 0; + protected int storedCurrentChar = 0; + protected boolean shortStore; + protected int arabicOptions; + + /** + * Creates new BidiLine + */ + public BidiLine() { + } + + public BidiLine(BidiLine org) { + runDirection = org.runDirection; + pieceSize = org.pieceSize; + text = org.text.clone(); + detailChunks = org.detailChunks.clone(); + totalTextLength = org.totalTextLength; + + orderLevels = org.orderLevels.clone(); + indexChars = org.indexChars.clone(); + + chunks = new ArrayList<>(org.chunks); + indexChunk = org.indexChunk; + indexChunkChar = org.indexChunkChar; + currentChar = org.currentChar; + + storedRunDirection = org.storedRunDirection; + storedText = org.storedText.clone(); + storedDetailChunks = org.storedDetailChunks.clone(); + storedTotalTextLength = org.storedTotalTextLength; + + storedOrderLevels = org.storedOrderLevels.clone(); + storedIndexChars = org.storedIndexChars.clone(); + + storedIndexChunk = org.storedIndexChunk; + storedIndexChunkChar = org.storedIndexChunkChar; + storedCurrentChar = org.storedCurrentChar; + + shortStore = org.shortStore; + arabicOptions = org.arabicOptions; + } + + public static boolean isWS(char c) { + return (c <= ' '); + } + + public boolean isEmpty() { + return (currentChar >= totalTextLength && indexChunk >= chunks.size()); + } + + public void clearChunks() { + chunks.clear(); + totalTextLength = 0; + currentChar = 0; + } + + public boolean getParagraph(int runDirection) { + this.runDirection = runDirection; + currentChar = 0; + totalTextLength = 0; + boolean hasText = false; + char c; + char uniC; + BaseFont bf; + for (; indexChunk < chunks.size(); ++indexChunk) { + PdfChunk ck = chunks.get(indexChunk); + bf = ck.font().getFont(); + String s = ck.toString(); + int len = s.length(); + for (; indexChunkChar < len; ++indexChunkChar) { + c = s.charAt(indexChunkChar); + uniC = (char) bf.getUnicodeEquivalent(c); + if (uniC == '\r' || uniC == '\n') { + // next condition is never true for CID + if (uniC == '\r' && indexChunkChar + 1 < len && s.charAt(indexChunkChar + 1) == '\n') { + ++indexChunkChar; + } + ++indexChunkChar; + if (indexChunkChar >= len) { + indexChunkChar = 0; + ++indexChunk; + } + hasText = true; + if (totalTextLength == 0) { + detailChunks[0] = ck; + } + break; + } + addPiece(c, ck); + } + if (hasText) { + break; + } + indexChunkChar = 0; + } + if (totalTextLength == 0) { + return hasText; + } + + // remove trailing WS + totalTextLength = trimRight(0, totalTextLength - 1) + 1; + if (totalTextLength == 0) { + return true; + } + + if (runDirection == PdfWriter.RUN_DIRECTION_LTR || runDirection == PdfWriter.RUN_DIRECTION_RTL) { + if (orderLevels.length < totalTextLength) { + orderLevels = new byte[pieceSize]; + indexChars = new int[pieceSize]; + } + ArabicLigaturizer.processNumbers(text, 0, totalTextLength, arabicOptions); + Bidi bidi = new Bidi(new String(text), + (byte) (runDirection == PdfWriter.RUN_DIRECTION_RTL ? Bidi.DIRECTION_RIGHT_TO_LEFT + : Bidi.DIRECTION_LEFT_TO_RIGHT)); + for (int k = 0; k < totalTextLength; ++k) { + orderLevels[k] = (byte) bidi.getLevelAt(k); + indexChars[k] = k; + } + doArabicShapping(); + mirrorGlyphs(); + } + + totalTextLength = trimRightEx(0, totalTextLength - 1) + 1; + return true; + } + + public void addChunk(PdfChunk chunk) { + chunks.add(chunk); + } + + public void addChunks(List chunks) { + this.chunks.addAll(chunks); + } + + public void addPiece(char c, PdfChunk chunk) { + if (totalTextLength >= pieceSize) { + char[] tempText = text; + PdfChunk[] tempDetailChunks = detailChunks; + pieceSize *= 2; + text = new char[pieceSize]; + detailChunks = new PdfChunk[pieceSize]; + System.arraycopy(tempText, 0, text, 0, totalTextLength); + System.arraycopy(tempDetailChunks, 0, detailChunks, 0, totalTextLength); + } + text[totalTextLength] = c; + detailChunks[totalTextLength++] = chunk; + } + + public void save() { + if (indexChunk > 0) { + if (indexChunk >= chunks.size()) { + chunks.clear(); + } else { + for (--indexChunk; indexChunk >= 0; --indexChunk) { + chunks.remove(indexChunk); + } + } + indexChunk = 0; + } + storedRunDirection = runDirection; + storedTotalTextLength = totalTextLength; + storedIndexChunk = indexChunk; + storedIndexChunkChar = indexChunkChar; + storedCurrentChar = currentChar; + shortStore = (currentChar < totalTextLength); + if (!shortStore) { + // long save + if (storedText.length < totalTextLength) { + storedText = new char[totalTextLength]; + storedDetailChunks = new PdfChunk[totalTextLength]; + } + System.arraycopy(text, 0, storedText, 0, totalTextLength); + System.arraycopy(detailChunks, 0, storedDetailChunks, 0, totalTextLength); + } + if (runDirection == PdfWriter.RUN_DIRECTION_LTR || runDirection == PdfWriter.RUN_DIRECTION_RTL) { + if (storedOrderLevels.length < totalTextLength) { + storedOrderLevels = new byte[totalTextLength]; + storedIndexChars = new int[totalTextLength]; + } + System.arraycopy(orderLevels, currentChar, storedOrderLevels, currentChar, totalTextLength - currentChar); + System.arraycopy(indexChars, currentChar, storedIndexChars, currentChar, totalTextLength - currentChar); + } + } + + public void restore() { + runDirection = storedRunDirection; + totalTextLength = storedTotalTextLength; + indexChunk = storedIndexChunk; + indexChunkChar = storedIndexChunkChar; + currentChar = storedCurrentChar; + if (!shortStore) { + // long restore + System.arraycopy(storedText, 0, text, 0, totalTextLength); + System.arraycopy(storedDetailChunks, 0, detailChunks, 0, totalTextLength); + } + if (runDirection == PdfWriter.RUN_DIRECTION_LTR || runDirection == PdfWriter.RUN_DIRECTION_RTL) { + System.arraycopy(storedOrderLevels, currentChar, orderLevels, currentChar, totalTextLength - currentChar); + System.arraycopy(storedIndexChars, currentChar, indexChars, currentChar, totalTextLength - currentChar); + } + } + + public void mirrorGlyphs() { + for (int k = 0; k < totalTextLength; ++k) { + if ((orderLevels[k] & 1) == 1) { + int mirror = mirrorChars.get(text[k]); + if (mirror != 0) { + text[k] = (char) mirror; + } + } + } + } + + public void doArabicShapping() { + int src = 0; + int dest = 0; + for (; ; ) { + while (src < totalTextLength) { + char c = text[src]; + if (c >= 0x0600 && c <= 0x06ff) { + break; + } + if (src != dest) { + text[dest] = text[src]; + detailChunks[dest] = detailChunks[src]; + orderLevels[dest] = orderLevels[src]; + } + ++src; + ++dest; + } + if (src >= totalTextLength) { + totalTextLength = dest; + return; + } + int startArabicIdx = src; + ++src; + while (src < totalTextLength) { + char c = text[src]; + if (c < 0x0600 || c > 0x06ff) { + break; + } + ++src; + } + int arabicWordSize = src - startArabicIdx; + int size = ArabicLigaturizer.arabic_shape(text, startArabicIdx, arabicWordSize, text, dest, arabicWordSize, + arabicOptions); + if (startArabicIdx != dest) { + for (int k = 0; k < size; ++k) { + detailChunks[dest] = detailChunks[startArabicIdx]; + orderLevels[dest++] = orderLevels[startArabicIdx++]; + } + } else { + dest += size; + } + } + } + + public PdfLine processLine(float leftX, float width, int alignment, int runDirection, int arabicOptions) { + this.arabicOptions = arabicOptions; + save(); + boolean isRTL = (runDirection == PdfWriter.RUN_DIRECTION_RTL); + if (currentChar >= totalTextLength) { + boolean hasText = getParagraph(runDirection); + if (!hasText) { + return null; + } + if (totalTextLength == 0) { + ArrayList ar = new ArrayList<>(); + PdfChunk ck = new PdfChunk("", detailChunks[0]); + ar.add(ck); + return new PdfLine(0, 0, 0, alignment, true, ar, isRTL); + } + } + float originalWidth = width; + int lastSplit = -1; + if (currentChar != 0) { + currentChar = trimLeftEx(currentChar, totalTextLength - 1); + } + int oldCurrentChar = currentChar; + int uniC = 0; + PdfChunk ck = null; + float charWidth = 0; + PdfChunk lastValidChunk = null; + boolean splitChar = false; + boolean surrogate = false; + for (; currentChar < totalTextLength; ++currentChar) { + ck = detailChunks[currentChar]; + surrogate = Utilities.isSurrogatePair(text, currentChar); + if (surrogate) { + uniC = ck.getUnicodeEquivalent(Utilities.convertToUtf32(text, currentChar)); + } else { + uniC = ck.getUnicodeEquivalent(text[currentChar]); + } + if (PdfChunk.noPrint(uniC)) { + continue; + } + if (surrogate) { + charWidth = ck.getCharWidth(uniC); + } else { + charWidth = ck.getCharWidth(text[currentChar]); + } + splitChar = ck.isExtSplitCharacter(oldCurrentChar, currentChar, totalTextLength, text, detailChunks); + if (splitChar && Character.isWhitespace((char) uniC)) { + lastSplit = currentChar; + } + if (width - charWidth < 0) { + break; + } + if (splitChar) { + lastSplit = currentChar; + } + width -= charWidth; + lastValidChunk = ck; + if (ck.isTab()) { + Object[] tab = (Object[]) ck.getAttribute(Chunk.TAB); + float tabPosition = (Float) tab[1]; + boolean newLine = (Boolean) tab[2]; + if (newLine && tabPosition < originalWidth - width) { + return new PdfLine(0, originalWidth, width, alignment, true, + createArrayOfPdfChunks(oldCurrentChar, currentChar - 1), isRTL); + } + detailChunks[currentChar].adjustLeft(leftX); + width = originalWidth - tabPosition; + } + if (surrogate) { + ++currentChar; + } + } + if (lastValidChunk == null) { + // not even a single char fit; must output the first char + ++currentChar; + if (surrogate) { + ++currentChar; + } + return new PdfLine(0, originalWidth, 0, alignment, false, + createArrayOfPdfChunks(currentChar - 1, currentChar - 1), isRTL); + } + if (currentChar >= totalTextLength) { + // there was more line than text + return new PdfLine(0, originalWidth, width, alignment, true, + createArrayOfPdfChunks(oldCurrentChar, totalTextLength - 1), isRTL); + } + int newCurrentChar = trimRightEx(oldCurrentChar, currentChar - 1); + if (newCurrentChar < oldCurrentChar) { + // only WS + return new PdfLine(0, originalWidth, width, alignment, false, + createArrayOfPdfChunks(oldCurrentChar, currentChar - 1), isRTL); + } + if (newCurrentChar == currentChar - 1) { // middle of word + HyphenationEvent he = (HyphenationEvent) lastValidChunk.getAttribute(Chunk.HYPHENATION); + if (he != null) { + int[] word = getWord(oldCurrentChar, newCurrentChar); + if (word != null) { + float testWidth = width + getWidth(word[0], currentChar - 1); + String pre = he.getHyphenatedWordPre(new String(text, word[0], word[1] - word[0]), + lastValidChunk.font().getFont(), lastValidChunk.font().size(), testWidth); + String post = he.getHyphenatedWordPost(); + if (pre.length() > 0) { + PdfChunk extra = new PdfChunk(pre, lastValidChunk); + currentChar = word[1] - post.length(); + return new PdfLine(0, originalWidth, testWidth - lastValidChunk.font().width(pre), alignment, + false, createArrayOfPdfChunks(oldCurrentChar, word[0] - 1, extra), isRTL); + } + } + } + } + if (lastSplit == -1 || lastSplit >= newCurrentChar) { + // no split point or split point ahead of end + return new PdfLine(0, originalWidth, width + getWidth(newCurrentChar + 1, currentChar - 1), alignment, + false, createArrayOfPdfChunks(oldCurrentChar, newCurrentChar), isRTL); + } + // standard split + currentChar = lastSplit + 1; + newCurrentChar = trimRightEx(oldCurrentChar, lastSplit); + if (newCurrentChar < oldCurrentChar) { + // only WS again + newCurrentChar = currentChar - 1; + } + return new PdfLine(0, originalWidth, originalWidth - getWidth(oldCurrentChar, newCurrentChar), alignment, false, + createArrayOfPdfChunks(oldCurrentChar, newCurrentChar), isRTL); + } + + /** + * Gets the width of a range of characters. + * + * @param startIdx the first index to calculate + * @param lastIdx the last inclusive index to calculate + * @return the sum of all widths + */ + public float getWidth(int startIdx, int lastIdx) { + char c = 0; + char uniC; + PdfChunk ck = null; + float width = 0; + for (; startIdx <= lastIdx; ++startIdx) { + boolean surrogate = Utilities.isSurrogatePair(text, startIdx); + if (surrogate) { + width += detailChunks[startIdx].getCharWidth(Utilities.convertToUtf32(text, startIdx)); + ++startIdx; + } else { + c = text[startIdx]; + ck = detailChunks[startIdx]; + if (PdfChunk.noPrint(ck.getUnicodeEquivalent(c))) { + continue; + } + width += detailChunks[startIdx].getCharWidth(c); + } + } + return width; + } + + public ArrayList createArrayOfPdfChunks(int startIdx, int endIdx) { + return createArrayOfPdfChunks(startIdx, endIdx, null); + } + + public ArrayList createArrayOfPdfChunks(int startIdx, int endIdx, PdfChunk extraPdfChunk) { + boolean bidi = (runDirection == PdfWriter.RUN_DIRECTION_LTR || runDirection == PdfWriter.RUN_DIRECTION_RTL); + if (bidi) { + reorder(startIdx, endIdx); + } + ArrayList ar = new ArrayList<>(); + PdfChunk refCk = detailChunks[startIdx]; + PdfChunk ck = null; + StringBuffer buf = new StringBuffer(); + char c; + int idx = 0; + for (; startIdx <= endIdx; ++startIdx) { + idx = bidi ? indexChars[startIdx] : startIdx; + c = text[idx]; + ck = detailChunks[idx]; + if (PdfChunk.noPrint(ck.getUnicodeEquivalent(c))) { + continue; + } + if (ck.isImage() || ck.isSeparator() || ck.isTab()) { + if (buf.length() > 0) { + ar.add(new PdfChunk(buf.toString(), refCk)); + buf = new StringBuffer(); + } + ar.add(ck); + } else if (ck == refCk) { + buf.append(c); + } else { + if (buf.length() > 0) { + ar.add(new PdfChunk(buf.toString(), refCk)); + buf = new StringBuffer(); + } + if (!ck.isImage() && !ck.isSeparator() && !ck.isTab()) { + buf.append(c); + } + refCk = ck; + } + } + if (buf.length() > 0) { + ar.add(new PdfChunk(buf.toString(), refCk)); + } + if (extraPdfChunk != null) { + ar.add(extraPdfChunk); + } + return ar; + } + + public int[] getWord(int startIdx, int idx) { + int last = idx; + int first = idx; + // forward + for (; last < totalTextLength; ++last) { + if (!Character.isLetter(text[last])) { + break; + } + } + if (last == idx) { + return null; + } + // backward + for (; first >= startIdx; --first) { + if (!Character.isLetter(text[first])) { + break; + } + } + ++first; + return new int[]{first, last}; + } + + public int trimRight(int startIdx, int endIdx) { + int idx = endIdx; + char c; + for (; idx >= startIdx; --idx) { + c = (char) detailChunks[idx].getUnicodeEquivalent(text[idx]); + if (!isWS(c)) { + break; + } + } + return idx; + } + + public int trimLeft(int startIdx, int endIdx) { + int idx = startIdx; + char c; + for (; idx <= endIdx; ++idx) { + c = (char) detailChunks[idx].getUnicodeEquivalent(text[idx]); + if (!isWS(c)) { + break; + } + } + return idx; + } + + public int trimRightEx(int startIdx, int endIdx) { + int idx = endIdx; + char c = 0; + for (; idx >= startIdx; --idx) { + c = (char) detailChunks[idx].getUnicodeEquivalent(text[idx]); + if (!isWS(c) && !PdfChunk.noPrint(c)) { + break; + } + } + return idx; + } + + public int trimLeftEx(int startIdx, int endIdx) { + int idx = startIdx; + char c = 0; + for (; idx <= endIdx; ++idx) { + c = (char) detailChunks[idx].getUnicodeEquivalent(text[idx]); + if (!isWS(c) && !PdfChunk.noPrint(c)) { + break; + } + } + return idx; + } + + public void reorder(int start, int end) { + byte maxLevel = orderLevels[start]; + byte minLevel = maxLevel; + byte onlyOddLevels = maxLevel; + byte onlyEvenLevels = maxLevel; + for (int k = start + 1; k <= end; ++k) { + byte b = orderLevels[k]; + if (b > maxLevel) { + maxLevel = b; + } else if (b < minLevel) { + minLevel = b; + } + onlyOddLevels &= b; + onlyEvenLevels |= b; + } + if ((onlyEvenLevels & 1) == 0) // nothing to do + { + return; + } + if ((onlyOddLevels & 1) == 1) { // single inversion + flip(start, end + 1); + return; + } + minLevel |= 1; + for (; maxLevel >= minLevel; --maxLevel) { + int pstart = start; + for (; ; ) { + for (; pstart <= end; ++pstart) { + if (orderLevels[pstart] >= maxLevel) { + break; + } + } + if (pstart > end) { + break; + } + int pend = pstart + 1; + for (; pend <= end; ++pend) { + if (orderLevels[pend] < maxLevel) { + break; + } + } + flip(pstart, pend); + pstart = pend + 1; + } + } + } + + public void flip(int start, int end) { + int mid = (start + end) / 2; + --end; + for (; start < mid; ++start, --end) { + int temp = indexChars[start]; + indexChars[start] = indexChars[end]; + indexChars[end] = temp; + } + } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/ByteBuffer.java b/openpdf/src/main/java/com/lowagie/text/pdf/ByteBuffer.java index cf94d1015..2d5a75838 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/ByteBuffer.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/ByteBuffer.java @@ -49,86 +49,95 @@ */ package com.lowagie.text.pdf; + +import com.lowagie.text.DocWriter; +import com.lowagie.text.error_messages.MessageLocalization; import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; -import com.lowagie.text.error_messages.MessageLocalization; - -import com.lowagie.text.DocWriter; /** - * Acts like a StringBuffer but works with byte arrays. - * Floating point is converted to a format suitable to the PDF. + * Acts like a StringBuffer but works with byte arrays. Floating point is converted to a + * format suitable to the PDF. + * * @author Paulo Soares (psoares@consiste.pt) */ public class ByteBuffer extends OutputStream { - /** The count of bytes in the buffer. */ - protected int count; + public static final byte ZERO = (byte) '0'; + private static final char[] chars = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; + private static final byte[] bytes = new byte[]{48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 97, 98, 99, 100, 101, 102}; + private static final DecimalFormatSymbols dfs = new DecimalFormatSymbols(Locale.US); /** - * The buffer where the bytes are stored. + * If true always output floating point numbers with 6 decimal digits. If false uses the + * faster, although less precise, representation. */ - protected byte[] buf; - + public static boolean HIGH_PRECISION = false; private static int byteCacheSize = 0; - private static byte[][] byteCache = new byte[byteCacheSize][]; - public static final byte ZERO = (byte)'0'; - private static final char[] chars = new char[] {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; - private static final byte[] bytes = new byte[] {48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 97, 98, 99, 100, 101, 102}; /** - * If true always output floating point numbers with 6 decimal digits. - * If false uses the faster, although less precise, representation. - */ - public static boolean HIGH_PRECISION = false; - private static final DecimalFormatSymbols dfs = new DecimalFormatSymbols(Locale.US); - - /** Creates new ByteBuffer with capacity 128 */ + * The count of bytes in the buffer. + */ + protected int count; + /** + * The buffer where the bytes are stored. + */ + protected byte[] buf; + + /** + * Creates new ByteBuffer with capacity 128 + */ public ByteBuffer() { this(128); } - + /** * Creates a byte buffer with a certain capacity. + * * @param size the initial capacity */ public ByteBuffer(int size) { - if (size < 1) + if (size < 1) { size = 128; + } buf = new byte[size]; } - + /** * Sets the cache size. - *

      - * This can only be used to increment the size. - * If the size that is passed through is smaller than the current size, nothing happens. + *

      + * This can only be used to increment the size. If the size that is passed through is smaller than the current size, + * nothing happens. * - * @param size the size of the cache + * @param size the size of the cache */ - + public static void setCacheSize(int size) { - if (size > 3276700) size = 3276700; - if (size <= byteCacheSize) return; + if (size > 3276700) { + size = 3276700; + } + if (size <= byteCacheSize) { + return; + } byte[][] tmpCache = new byte[size][]; System.arraycopy(byteCache, 0, tmpCache, 0, byteCacheSize); byteCache = tmpCache; byteCacheSize = size; } - + /** * You can fill the cache in advance if you want to. * - * @param decimals decimals + * @param decimals decimals */ - + public static void fillCache(int decimals) { int step = 1; - switch(decimals) { + switch (decimals) { case 0: step = 100; break; @@ -137,20 +146,22 @@ public static void fillCache(int decimals) { break; } for (int i = 1; i < byteCacheSize; i += step) { - if (byteCache[i] != null) continue; + if (byteCache[i] != null) { + continue; + } byteCache[i] = convertToBytes(i); } } - + /** * Converts an double (multiplied by 100 and cast to an int) into an array of bytes. * - * @param i the int - * @return a byte array + * @param i the int + * @return a byte array */ - + private static byte[] convertToBytes(int i) { - int size = (int)Math.floor(Math.log(i) / Math.log(10)); + int size = (int) Math.floor(Math.log(i) / Math.log(10)); if (i % 100 != 0) { size += 2; } @@ -165,166 +176,40 @@ private static byte[] convertToBytes(int i) { } size--; byte[] cache = new byte[size]; - size --; + size--; if (i < 100) { - cache[0] = (byte)'0'; + cache[0] = (byte) '0'; } if (i % 10 != 0) { cache[size--] = bytes[i % 10]; } if (i % 100 != 0) { cache[size--] = bytes[(i / 10) % 10]; - cache[size--] = (byte)'.'; + cache[size--] = (byte) '.'; } - size = (int)Math.floor(Math.log(i) / Math.log(10)) - 1; + size = (int) Math.floor(Math.log(i) / Math.log(10)) - 1; int add = 0; while (add < size) { - cache[add] = bytes[(i / (int)Math.pow(10, size - add + 1)) % 10]; + cache[add] = bytes[(i / (int) Math.pow(10, size - add + 1)) % 10]; add++; } return cache; } - - /** - * Appends an int. The size of the array will grow by one. - * @param b the int to be appended - * @return a reference to this ByteBuffer object - */ - public ByteBuffer append_i(int b) { - int newcount = count + 1; - if (newcount > buf.length) { - byte[] newbuf = new byte[Math.max(buf.length << 1, newcount)]; - System.arraycopy(buf, 0, newbuf, 0, count); - buf = newbuf; - } - buf[count] = (byte)b; - count = newcount; - return this; - } - - /** - * Appends the subarray of the byte array. The buffer will grow by - * len bytes. - * @param b the array to be appended - * @param off the offset to the start of the array - * @param len the length of bytes to append - * @return a reference to this ByteBuffer object - */ - public ByteBuffer append(byte[] b, int off, int len) { - if ((off < 0) || (off > b.length) || (len < 0) || - ((off + len) > b.length) || ((off + len) < 0) || len == 0) - return this; - int newcount = count + len; - if (newcount > buf.length) { - byte[] newbuf = new byte[Math.max(buf.length << 1, newcount)]; - System.arraycopy(buf, 0, newbuf, 0, count); - buf = newbuf; - } - System.arraycopy(b, off, buf, count, len); - count = newcount; - return this; - } - - /** - * Appends an array of bytes. - * @param b the array to be appended - * @return a reference to this ByteBuffer object - */ - public ByteBuffer append(byte[] b) { - return append(b, 0, b.length); - } - - /** - * Appends a String to the buffer. The String is - * converted according to the encoding ISO-8859-1. - * @param str the String to be appended - * @return a reference to this ByteBuffer object - */ - public ByteBuffer append(String str) { - if (str != null) - return append(DocWriter.getISOBytes(str)); - return this; - } - - /** - * Appends a char to the buffer. The char is - * converted according to the encoding ISO-8859-1. - * @param c the char to be appended - * @return a reference to this ByteBuffer object - */ - public ByteBuffer append(char c) { - return append_i(c); - } - - /** - * Appends another ByteBuffer to this buffer. - * @param buf the ByteBuffer to be appended - * @return a reference to this ByteBuffer object - */ - public ByteBuffer append(ByteBuffer buf) { - return append(buf.buf, 0, buf.count); - } - - /** - * Appends the string representation of an int. - * @param i the int to be appended - * @return a reference to this ByteBuffer object - */ - public ByteBuffer append(int i) { - return append(String.valueOf(i)); - } - - /** - * Appends the string representation of a long. - * @param l the long to be appended - * @return a reference to this ByteBuffer object - */ - public ByteBuffer append(long l) { - return append(String.valueOf(l)); - } - public ByteBuffer append(byte b) { - return append_i(b); - } - - public ByteBuffer appendHex(byte b) { - append(bytes[(b >> 4) & 0x0f]); - return append(bytes[b & 0x0f]); - } - - /** - * Appends a string representation of a float according - * to the Pdf conventions. - * @param i the float to be appended - * @return a reference to this ByteBuffer object - */ - public ByteBuffer append(float i) { - return append((double)i); - } - - /** - * Appends a string representation of a double according - * to the Pdf conventions. - * @param d the double to be appended - * @return a reference to this ByteBuffer object - */ - public ByteBuffer append(double d) { - append(formatDouble(d, this)); - return this; - } - /** * Outputs a double into a format suitable for the PDF. + * * @param d a double * @return the String representation of the double */ public static String formatDouble(double d) { return formatDouble(d, null); } - + /** * Outputs a double into a format suitable for the PDF. - * @param d a double + * + * @param d a double * @param buf a ByteBuffer * @return the String representation of the double if * buf is null. If buf is not null, @@ -334,9 +219,9 @@ public static String formatDouble(double d, ByteBuffer buf) { if (HIGH_PRECISION) { DecimalFormat dn = new DecimalFormat("0.######", dfs); String sform = dn.format(d); - if (buf == null) + if (buf == null) { return sform; - else { + } else { buf.append(sform); return null; } @@ -359,15 +244,15 @@ public static String formatDouble(double d, ByteBuffer buf) { if (d >= 1) { if (negative) { if (buf != null) { - buf.append((byte)'-'); - buf.append((byte)'1'); + buf.append((byte) '-'); + buf.append((byte) '1'); return null; } else { return "-1"; } } else { if (buf != null) { - buf.append((byte)'1'); + buf.append((byte) '1'); return null; } else { return "1"; @@ -376,20 +261,22 @@ public static String formatDouble(double d, ByteBuffer buf) { } if (buf != null) { int v = (int) (d * 100000); - - if (negative) buf.append((byte)'-'); - buf.append((byte)'0'); - buf.append((byte)'.'); - - buf.append( (byte)(v / 10000 + ZERO) ); + + if (negative) { + buf.append((byte) '-'); + } + buf.append((byte) '0'); + buf.append((byte) '.'); + + buf.append((byte) (v / 10000 + ZERO)); if (v % 10000 != 0) { - buf.append( (byte)((v / 1000) % 10 + ZERO) ); + buf.append((byte) ((v / 1000) % 10 + ZERO)); if (v % 1000 != 0) { - buf.append( (byte)((v / 100) % 10 + ZERO) ); + buf.append((byte) ((v / 100) % 10 + ZERO)); if (v % 100 != 0) { - buf.append((byte)((v / 10) % 10 + ZERO) ); + buf.append((byte) ((v / 10) % 10 + ZERO)); if (v % 10 != 0) { - buf.append((byte)((v) % 10 + ZERO) ); + buf.append((byte) ((v) % 10 + ZERO)); } } } @@ -398,12 +285,14 @@ public static String formatDouble(double d, ByteBuffer buf) { } else { int x = 100000; int v = (int) (d * x); - + StringBuilder res = new StringBuilder(); - if (negative) res.append('-'); + if (negative) { + res.append('-'); + } res.append("0."); - - while( v < x/10 ) { + + while (v < x / 10) { res.append('0'); x /= 10; } @@ -418,15 +307,19 @@ public static String formatDouble(double d, ByteBuffer buf) { } else if (d <= 32767) { d += 0.005; int v = (int) (d * 100); - + if (v < byteCacheSize && byteCache[v] != null) { if (buf != null) { - if (negative) buf.append((byte)'-'); + if (negative) { + buf.append((byte) '-'); + } buf.append(byteCache[v]); return null; } else { String tmp = PdfEncodings.convertToString(byteCache[v], null); - if (negative) tmp = "-" + tmp; + if (negative) { + tmp = "-" + tmp; + } return tmp; } } @@ -451,7 +344,7 @@ public static String formatDouble(double d, ByteBuffer buf) { //the original number is >=1, we need 1 more bytes size += 1; } - + //now we must check if we have a decimal number if (v % 100 != 0) { //yes, do not forget the "." @@ -477,9 +370,9 @@ public static String formatDouble(double d, ByteBuffer buf) { if (v >= 100) { cache[add++] = bytes[(v / 100) % 10]; } - + if (v % 100 != 0) { - cache[add++] = (byte)'.'; + cache[add++] = (byte) '.'; cache[add++] = bytes[(v / 10) % 10]; if (v % 10 != 0) { cache[add++] = bytes[v % 10]; @@ -487,89 +380,232 @@ public static String formatDouble(double d, ByteBuffer buf) { } byteCache[v] = cache; } - - if (negative) buf.append((byte)'-'); + + if (negative) { + buf.append((byte) '-'); + } if (v >= 1000000) { - buf.append( bytes[(v / 1000000)] ); + buf.append(bytes[(v / 1000000)]); } if (v >= 100000) { - buf.append( bytes[(v / 100000) % 10] ); + buf.append(bytes[(v / 100000) % 10]); } if (v >= 10000) { - buf.append( bytes[(v / 10000) % 10] ); + buf.append(bytes[(v / 10000) % 10]); } if (v >= 1000) { - buf.append( bytes[(v / 1000) % 10] ); + buf.append(bytes[(v / 1000) % 10]); } if (v >= 100) { - buf.append( bytes[(v / 100) % 10] ); + buf.append(bytes[(v / 100) % 10]); } - + if (v % 100 != 0) { - buf.append((byte)'.'); - buf.append( bytes[(v / 10) % 10] ); + buf.append((byte) '.'); + buf.append(bytes[(v / 10) % 10]); if (v % 10 != 0) { - buf.append( bytes[v % 10] ); + buf.append(bytes[v % 10]); } } return null; } else { StringBuilder res = new StringBuilder(); - if (negative) res.append('-'); + if (negative) { + res.append('-'); + } if (v >= 1000000) { - res.append( chars[(v / 1000000)] ); + res.append(chars[(v / 1000000)]); } if (v >= 100000) { - res.append( chars[(v / 100000) % 10] ); + res.append(chars[(v / 100000) % 10]); } if (v >= 10000) { - res.append( chars[(v / 10000) % 10] ); + res.append(chars[(v / 10000) % 10]); } if (v >= 1000) { - res.append( chars[(v / 1000) % 10] ); + res.append(chars[(v / 1000) % 10]); } if (v >= 100) { - res.append( chars[(v / 100) % 10] ); + res.append(chars[(v / 100) % 10]); } - + if (v % 100 != 0) { res.append('.'); - res.append( chars[(v / 10) % 10] ); + res.append(chars[(v / 10) % 10]); if (v % 10 != 0) { - res.append( chars[v % 10] ); + res.append(chars[v % 10]); } } return res.toString(); } } else { StringBuilder res = new StringBuilder(); - if (negative) res.append('-'); + if (negative) { + res.append('-'); + } d += 0.5; long v = (long) d; return res.append(v).toString(); } } - + + /** + * Appends an int. The size of the array will grow by one. + * + * @param b the int to be appended + * @return a reference to this ByteBuffer object + */ + public ByteBuffer append_i(int b) { + int newcount = count + 1; + if (newcount > buf.length) { + byte[] newbuf = new byte[Math.max(buf.length << 1, newcount)]; + System.arraycopy(buf, 0, newbuf, 0, count); + buf = newbuf; + } + buf[count] = (byte) b; + count = newcount; + return this; + } + + /** + * Appends the subarray of the byte array. The buffer will grow by + * len bytes. + * + * @param b the array to be appended + * @param off the offset to the start of the array + * @param len the length of bytes to append + * @return a reference to this ByteBuffer object + */ + public ByteBuffer append(byte[] b, int off, int len) { + if ((off < 0) || (off > b.length) || (len < 0) || + ((off + len) > b.length) || ((off + len) < 0) || len == 0) { + return this; + } + int newcount = count + len; + if (newcount > buf.length) { + byte[] newbuf = new byte[Math.max(buf.length << 1, newcount)]; + System.arraycopy(buf, 0, newbuf, 0, count); + buf = newbuf; + } + System.arraycopy(b, off, buf, count, len); + count = newcount; + return this; + } + + /** + * Appends an array of bytes. + * + * @param b the array to be appended + * @return a reference to this ByteBuffer object + */ + public ByteBuffer append(byte[] b) { + return append(b, 0, b.length); + } + + /** + * Appends a String to the buffer. The String is converted according to the encoding + * ISO-8859-1. + * + * @param str the String to be appended + * @return a reference to this ByteBuffer object + */ + public ByteBuffer append(String str) { + if (str != null) { + return append(DocWriter.getISOBytes(str)); + } + return this; + } + + /** + * Appends a char to the buffer. The char is converted according to the encoding + * ISO-8859-1. + * + * @param c the char to be appended + * @return a reference to this ByteBuffer object + */ + public ByteBuffer append(char c) { + return append_i(c); + } + + /** + * Appends another ByteBuffer to this buffer. + * + * @param buf the ByteBuffer to be appended + * @return a reference to this ByteBuffer object + */ + public ByteBuffer append(ByteBuffer buf) { + return append(buf.buf, 0, buf.count); + } + + /** + * Appends the string representation of an int. + * + * @param i the int to be appended + * @return a reference to this ByteBuffer object + */ + public ByteBuffer append(int i) { + return append(String.valueOf(i)); + } + + /** + * Appends the string representation of a long. + * + * @param l the long to be appended + * @return a reference to this ByteBuffer object + */ + public ByteBuffer append(long l) { + return append(String.valueOf(l)); + } + + public ByteBuffer append(byte b) { + return append_i(b); + } + + public ByteBuffer appendHex(byte b) { + append(bytes[(b >> 4) & 0x0f]); + return append(bytes[b & 0x0f]); + } + + /** + * Appends a string representation of a float according to the Pdf conventions. + * + * @param i the float to be appended + * @return a reference to this ByteBuffer object + */ + public ByteBuffer append(float i) { + return append((double) i); + } + + /** + * Appends a string representation of a double according to the Pdf conventions. + * + * @param d the double to be appended + * @return a reference to this ByteBuffer object + */ + public ByteBuffer append(double d) { + append(formatDouble(d, this)); + return this; + } + /** * Sets the size to zero. */ public void reset() { count = 0; } - + /** - * Creates a newly allocated byte array. Its size is the current - * size of this output stream and the valid contents of the buffer - * have been copied into it. + * Creates a newly allocated byte array. Its size is the current size of this output stream and the valid contents + * of the buffer have been copied into it. * - * @return the current contents of this output stream, as a byte array. + * @return the current contents of this output stream, as a byte array. */ public byte[] toByteArray() { byte[] newbuf = new byte[count]; System.arraycopy(buf, 0, newbuf, 0, count); return newbuf; } - + /** * Returns the current size of the buffer. * @@ -578,56 +614,56 @@ public byte[] toByteArray() { public int size() { return count; } - + public void setSize(int size) { - if (size > count || size < 0) - throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage("the.new.size.must.be.positive.and.lt.eq.of.the.current.size")); + if (size > count || size < 0) { + throw new IndexOutOfBoundsException(MessageLocalization.getComposedMessage( + "the.new.size.must.be.positive.and.lt.eq.of.the.current.size")); + } count = size; } - + /** - * Converts the buffer's contents into a string, translating bytes into - * characters according to the platform's default character encoding. + * Converts the buffer's contents into a string, translating bytes into characters according to the platform's + * default character encoding. * * @return String translated from the buffer's contents. */ public String toString() { return new String(buf, 0, count); } - + /** - * Converts the buffer's contents into a string, translating bytes into - * characters according to the specified character encoding. + * Converts the buffer's contents into a string, translating bytes into characters according to the specified + * character encoding. * - * @param enc a character-encoding name. + * @param enc a character-encoding name. * @return String translated from the buffer's contents. - * @throws UnsupportedEncodingException - * If the named encoding is not supported. + * @throws UnsupportedEncodingException If the named encoding is not supported. */ public String toString(String enc) throws UnsupportedEncodingException { return new String(buf, 0, count, enc); } - + /** - * Writes the complete contents of this byte buffer output to - * the specified output stream argument, as if by calling the output - * stream's write method using out.write(buf, 0, count). + * Writes the complete contents of this byte buffer output to the specified output stream argument, as if by calling + * the output stream's write method using out.write(buf, 0, count). * - * @param out the output stream to which to write the data. - * @exception IOException if an I/O error occurs. + * @param out the output stream to which to write the data. + * @throws IOException if an I/O error occurs. */ public void writeTo(OutputStream out) throws IOException { out.write(buf, 0, count); } - + public void write(int b) { - append((byte)b); + append((byte) b); } - + public void write(byte[] b, int off, int len) { append(b, off, len); } - + public byte[] getBuffer() { return buf; } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/CFFFont.java b/openpdf/src/main/java/com/lowagie/text/pdf/CFFFont.java index 78a826f24..2d6a2a544 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/CFFFont.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/CFFFont.java @@ -169,132 +169,291 @@ public class CFFFont { "Ydieresissmall", "001.000", "001.001", "001.002", "001.003", "Black", "Bold", "Book", "Light", "Medium", "Regular", "Roman", "Semibold" }; - + private final int offSize; + protected String key; + protected Object[] args = new Object[48]; + protected int arg_count = 0; + /** + * A random Access File or an array + */ + protected RandomAccessFileOrArray buf; + protected int nameIndexOffset; + protected int topdictIndexOffset; + protected int stringIndexOffset; + protected int gsubrIndexOffset; + protected int[] nameOffsets; + protected int[] topdictOffsets; + protected int[] stringOffsets; + protected int[] gsubrOffsets; + // Changed from private to protected by Ygal&Oren + protected Font[] fonts; + int nextIndexOffset; + + public CFFFont(RandomAccessFileOrArray inputbuffer) { + + //System.err.println("CFF: nStdString = "+standardStrings.length); + buf = inputbuffer; + seek(0); + + int major, minor; + major = getCard8(); + minor = getCard8(); + + //System.err.println("CFF Major-Minor = "+major+"-"+minor); + + int hdrSize = getCard8(); + + offSize = getCard8(); + + //System.err.println("offSize = "+offSize); + + //int count, indexOffSize, indexOffset, nextOffset; + + nameIndexOffset = hdrSize; + nameOffsets = getIndex(nameIndexOffset); + topdictIndexOffset = nameOffsets[nameOffsets.length - 1]; + topdictOffsets = getIndex(topdictIndexOffset); + stringIndexOffset = topdictOffsets[topdictOffsets.length - 1]; + stringOffsets = getIndex(stringIndexOffset); + gsubrIndexOffset = stringOffsets[stringOffsets.length - 1]; + gsubrOffsets = getIndex(gsubrIndexOffset); + + fonts = new Font[nameOffsets.length - 1]; + + // now get the name index + + /* + names = new String[nfonts]; + privateOffset = new int[nfonts]; + charsetOffset = new int[nfonts]; + encodingOffset = new int[nfonts]; + charstringsOffset = new int[nfonts]; + fdarrayOffset = new int[nfonts]; + fdselectOffset = new int[nfonts]; + */ + + for (int j = 0; j < nameOffsets.length - 1; j++) { + fonts[j] = new Font(); + seek(nameOffsets[j]); + fonts[j].name = ""; + for (int k = nameOffsets[j]; k < nameOffsets[j + 1]; k++) { + fonts[j].name += getCard8(); + } + //System.err.println("name["+j+"]=<"+fonts[j].name+">"); + } + + // string index + + //strings = new String[stringOffsets.length-1]; + /* + System.err.println("std strings = "+standardStrings.length); + System.err.println("fnt strings = "+(stringOffsets.length-1)); + for (char j=0; j"); + } + */ + + // top dict + + for (int j = 0; j < topdictOffsets.length - 1; j++) { + seek(topdictOffsets[j]); + while (getPosition() < topdictOffsets[j + 1]) { + getDictItem(); + if (Objects.equals(key, "FullName")) { + //System.err.println("getting fullname sid = "+((Integer)args[0]).intValue()); + fonts[j].fullName = getString((char) ((Integer) args[0]).intValue()); + //System.err.println("got it"); + } else if (Objects.equals(key, "ROS")) { + fonts[j].isCID = true; + } else if (Objects.equals(key, "Private")) { + fonts[j].privateLength = (Integer) args[0]; + fonts[j].privateOffset = (Integer) args[1]; + } else if (Objects.equals(key, "charset")) { + fonts[j].charsetOffset = (Integer) args[0]; + + } else if (Objects.equals(key, "CharStrings")) { + fonts[j].charstringsOffset = (Integer) args[0]; + //System.err.println("charstrings "+fonts[j].charstringsOffset); + // Added by Oren & Ygal + int p = getPosition(); + fonts[j].charstringsOffsets = getIndex(fonts[j].charstringsOffset); + seek(p); + } else if (Objects.equals(key, "FDArray")) { + fonts[j].fdarrayOffset = (Integer) args[0]; + } else if (Objects.equals(key, "FDSelect")) { + fonts[j].fdselectOffset = (Integer) args[0]; + } else if (Objects.equals(key, "CharstringType")) { + fonts[j].CharstringType = (Integer) args[0]; + } + } + + // private dict + if (fonts[j].privateOffset >= 0) { + //System.err.println("PRIVATE::"); + seek(fonts[j].privateOffset); + while (getPosition() < fonts[j].privateOffset + fonts[j].privateLength) { + getDictItem(); + if (Objects.equals(key, "Subrs")) + //Add the private offset to the lsubrs since the offset is + // relative to the beginning of the PrivateDict + { + fonts[j].privateSubrs = (Integer) args[0] + fonts[j].privateOffset; + } + } + } + + // fdarray index + if (fonts[j].fdarrayOffset >= 0) { + int[] fdarrayOffsets = getIndex(fonts[j].fdarrayOffset); + + fonts[j].fdprivateOffsets = new int[fdarrayOffsets.length - 1]; + fonts[j].fdprivateLengths = new int[fdarrayOffsets.length - 1]; + + //System.err.println("FD Font::"); + + for (int k = 0; k < fdarrayOffsets.length - 1; k++) { + seek(fdarrayOffsets[k]); + while (getPosition() < fdarrayOffsets[k + 1]) { + getDictItem(); + } + if (Objects.equals(key, "Private")) { + fonts[j].fdprivateLengths[k] = (Integer) args[0]; + fonts[j].fdprivateOffsets[k] = (Integer) args[1]; + } + + } + } + } + //System.err.println("CFF: done"); + } + //private String[] strings; public String getString(char sid) { - if (sid < standardStrings.length) return standardStrings[sid]; - if (sid >= standardStrings.length+(stringOffsets.length-1)) return null; + if (sid < standardStrings.length) { + return standardStrings[sid]; + } + if (sid >= standardStrings.length + (stringOffsets.length - 1)) { + return null; + } int j = sid - standardStrings.length; //java.lang.System.err.println("going for "+j); int p = getPosition(); seek(stringOffsets[j]); StringBuilder s = new StringBuilder(); - for (int k=stringOffsets[j]; k count in the index header. 1->offset size in index header - + 2+1 - //offset array size * offset size - + (count+1)*indexOffSize - //???zero <-> one base - - 1 - // read object offset relative to object array base - + getOffset(indexOffSize); + //2-> count in the index header. 1->offset size in index header + + 2 + 1 + //offset array size * offset size + + (count + 1) * indexOffSize + //???zero <-> one base + - 1 + // read object offset relative to object array base + + getOffset(indexOffSize); } //nextIndexOffset = offsets[count]; return offsets; } - - protected String key; - protected Object[] args = new Object[48]; - protected int arg_count = 0; - + protected void getDictItem() { - for (int i=0; i= 32 && b0 <= 246) { - byte item = (byte) (b0-139); + byte item = (byte) (b0 - 139); args[arg_count] = (int) item; arg_count++; //System.err.println(item+" "); @@ -320,7 +479,7 @@ protected void getDictItem() { } if (b0 >= 247 && b0 <= 250) { char b1 = getCard8(); - short item = (short) ((b0-247)*256+b1+108); + short item = (short) ((b0 - 247) * 256 + b1 + 108); args[arg_count] = (int) item; arg_count++; //System.err.println(item+" "); @@ -328,7 +487,7 @@ protected void getDictItem() { } if (b0 >= 251 && b0 <= 254) { char b1 = getCard8(); - short item = (short) (-(b0-251)*256-b1-108); + short item = (short) (-(b0 - 251) * 256 - b1 - 108); args[arg_count] = (int) item; arg_count++; //System.err.println(item+" "); @@ -339,22 +498,41 @@ protected void getDictItem() { boolean done = false; char buffer = 0; byte avail = 0; - int nibble = 0; + int nibble = 0; while (!done) { // get a nibble - if (avail==0) { buffer = getCard8(); avail=2; } - if (avail==1) { nibble = (buffer / 16); avail--; } - if (avail==2) { nibble = (buffer % 16); avail--; } + if (avail == 0) { + buffer = getCard8(); + avail = 2; + } + if (avail == 1) { + nibble = (buffer / 16); + avail--; + } + if (avail == 2) { + nibble = (buffer % 16); + avail--; + } switch (nibble) { - case 0xa: item += "." ; break; - case 0xb: item += "E" ; break; - case 0xc: item += "E-"; break; - case 0xe: item += "-" ; break; - case 0xf: done=true ; break; + case 0xa: + item += "."; + break; + case 0xb: + item += "E"; + break; + case 0xc: + item += "E-"; + break; + case 0xe: + item += "-"; + break; + case 0xf: + done = true; + break; default: - if (nibble >= 0 && nibble <= 9) + if (nibble >= 0 && nibble <= 9) { item += String.valueOf(nibble); - else { + } else { item += "'; done = true; } @@ -367,9 +545,12 @@ protected void getDictItem() { continue; } if (b0 <= 21) { - gotKey=true; - if (b0 != 12) key = operatorNames[b0]; - else key = operatorNames[32 + getCard8()]; + gotKey = true; + if (b0 != 12) { + key = operatorNames[b0]; + } else { + key = operatorNames[32 + getCard8()]; + } //for (int i=0; i>> 24) & 0xff); - i++; - // fallthrough - case 3: - buffer[myOffset+i] = (byte) ((value >>> 16) & 0xff); - i++; - // fallthrough - case 2: - buffer[myOffset+i] = (byte) ((value >>> 8) & 0xff); - i++; - // fallthrough - case 1: - buffer[myOffset + i] = (byte) ((value) & 0xff); - i++; - } - /* - int mask = 0xff; - for (int i=size-1; i>=0; i--) { - buffer[myOffset+i] = (byte) (value & mask); - mask <<= 8; - } - */ + if (j == fonts.length) { + return null; } - } - - static protected final class IndexBaseItem extends Item { - public IndexBaseItem() {} - } - - static protected final class IndexMarkerItem extends Item { - - private final OffsetItem offItem; - private final IndexBaseItem indexBase; - - public IndexMarkerItem(OffsetItem offItem, IndexBaseItem indexBase) { - this.offItem = offItem; - this.indexBase = indexBase; - } - - public void xref() { - //System.err.println("index marker item, base="+indexBase.myOffset+" my="+this.myOffset); - offItem.set(this.myOffset - indexBase.myOffset + 1); - } - } - - /** - * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Generation - - * Code and Comments - */ - static protected final class SubrMarkerItem extends Item { - - private final OffsetItem offItem; - private final IndexBaseItem indexBase; - - public SubrMarkerItem(OffsetItem offItem, IndexBaseItem indexBase) { - this.offItem = offItem; - this.indexBase = indexBase; - } - - public void xref() { - //System.err.println("index marker item, base="+indexBase.myOffset+" my="+this.myOffset); - offItem.set(this.myOffset - indexBase.myOffset); - } - } - - - /** an unknown offset in a dictionary for the list. - * We will fix up the offset later; for now, assume it's large. - */ - static protected final class DictOffsetItem extends OffsetItem { - public final int size; - public DictOffsetItem() {this.size=5; } - - public void increment(int[] currentOffset) { - super.increment(currentOffset); - currentOffset[0] += size; - } - // this is incomplete! - public void emit(byte[] buffer) { - if (size==5) { - buffer[myOffset] = 29; - buffer[myOffset+1] = (byte) ((value >>> 24) & 0xff); - buffer[myOffset+2] = (byte) ((value >>> 16) & 0xff); - buffer[myOffset+3] = (byte) ((value >>> 8) & 0xff); - buffer[myOffset+4] = (byte) ((value >>> 0) & 0xff); - } - } - } - - /** Card24 item. - */ - - static protected final class UInt24Item extends Item { - public int value; - public UInt24Item(int value) {this.value=value;} - - public void increment(int[] currentOffset) { - super.increment(currentOffset); - currentOffset[0] += 3; - } - // this is incomplete! - public void emit(byte[] buffer) { - buffer[myOffset+0] = (byte) ((value >>> 16) & 0xff); - buffer[myOffset+1] = (byte) ((value >>> 8) & 0xff); - buffer[myOffset+2] = (byte) ((value >>> 0) & 0xff); - } - } - - /** Card32 item. - */ - - static protected final class UInt32Item extends Item { - public int value; - public UInt32Item(int value) {this.value=value;} - - public void increment(int[] currentOffset) { - super.increment(currentOffset); - currentOffset[0] += 4; - } - // this is incomplete! - public void emit(byte[] buffer) { - buffer[myOffset+0] = (byte) ((value >>> 24) & 0xff); - buffer[myOffset+1] = (byte) ((value >>> 16) & 0xff); - buffer[myOffset+2] = (byte) ((value >>> 8) & 0xff); - buffer[myOffset+3] = (byte) ((value >>> 0) & 0xff); - } - } - - /** A SID or Card16 item. - */ - - static protected final class UInt16Item extends Item { - public char value; - public UInt16Item(char value) {this.value=value;} - - public void increment(int[] currentOffset) { - super.increment(currentOffset); - currentOffset[0] += 2; - } - // this is incomplete! - public void emit(byte[] buffer) { - buffer[myOffset+0] = (byte) ((value >>> 8) & 0xff); - buffer[myOffset+1] = (byte) ((value >>> 0) & 0xff); - } - } - - /** A Card8 item. - */ - - static protected final class UInt8Item extends Item { - public char value; - public UInt8Item(char value) {this.value=value;} - - public void increment(int[] currentOffset) { - super.increment(currentOffset); - currentOffset[0] += 1; - } - // this is incomplete! - public void emit(byte[] buffer) { - buffer[myOffset+0] = (byte) ((value >>> 0) & 0xff); - } - } - - static protected final class StringItem extends Item { - public String s; - public StringItem(String s) {this.s=s;} - - public void increment(int[] currentOffset) { - super.increment(currentOffset); - currentOffset[0] += s.length(); - } - public void emit(byte[] buffer) { - for (int i=0; i>> 24) & 0xff); - buffer[myOffset+2] = (byte) ((value >>> 16) & 0xff); - buffer[myOffset+3] = (byte) ((value >>> 8) & 0xff); - buffer[myOffset+4] = (byte) ((value >>> 0) & 0xff); - } - } - } - - /** An offset-marker item for the list. - * It is used to mark an offset and to set the offset list item. - */ - - static protected final class MarkerItem extends Item { - OffsetItem p; - public MarkerItem(OffsetItem pointerToMarker) {p=pointerToMarker;} - public void xref() { - p.set(this.myOffset); - } - } - - /** a utility that creates a range item for an entire index - * - * @param indexOffset where the index is - * @return a range item representing the entire index - */ - - protected RangeItem getEntireIndexRange(int indexOffset) { - seek(indexOffset); - int count = getCard16(); - if (count==0) { - return new RangeItem(buf,indexOffset,2); - } else { - int indexOffSize = getCard8(); - seek(indexOffset+2+1+count*indexOffSize); - int size = getOffset(indexOffSize)-1; - return new RangeItem(buf,indexOffset, - 2+1+(count+1)*indexOffSize+size); - } - } - - - /** get a single CID font. The PDF architecture (1.4) - * supports 16-bit strings only with CID CFF fonts, not - * in Type-1 CFF fonts, so we convert the font to CID if - * it is in the Type-1 format. - * Two other tasks that we need to do are to select - * only a single font from the CFF package (this again is - * a PDF restriction) and to subset the CharStrings glyph - * description. - * - * @param fontName name of the font - * @return byte array - */ - public byte[] getCID(String fontName) - //throws java.io.FileNotFoundException - { - int j; - for (j=0; j l = new LinkedList<>(); - + // copy the header - + seek(0); - + int major = getCard8(); int minor = getCard8(); int hdrSize = getCard8(); int offSize = getCard8(); nextIndexOffset = hdrSize; - - l.addLast(new RangeItem(buf,0,hdrSize)); - - int nglyphs=-1, nstrings=-1; - if ( ! fonts[j].isCID ) { + + l.addLast(new RangeItem(buf, 0, hdrSize)); + + int nglyphs = -1, nstrings = -1; + if (!fonts[j].isCID) { // count the glyphs seek(fonts[j].charstringsOffset); nglyphs = getCard16(); seek(stringIndexOffset); - nstrings = getCard16()+standardStrings.length; + nstrings = getCard16() + standardStrings.length; //System.err.println("number of glyphs = "+nglyphs); } - + // create a name index - - l.addLast(new UInt16Item((char)1)); // count - l.addLast(new UInt8Item((char)1)); // offSize - l.addLast(new UInt8Item((char)1)); // first offset - l.addLast(new UInt8Item((char)( 1+fonts[j].name.length() ))); + + l.addLast(new UInt16Item((char) 1)); // count + l.addLast(new UInt8Item((char) 1)); // offSize + l.addLast(new UInt8Item((char) 1)); // first offset + l.addLast(new UInt8Item((char) (1 + fonts[j].name.length()))); l.addLast(new StringItem(fonts[j].name)); - + // create the topdict Index - - - l.addLast(new UInt16Item((char)1)); // count - l.addLast(new UInt8Item((char)2)); // offSize - l.addLast(new UInt16Item((char)1)); // first offset + + l.addLast(new UInt16Item((char) 1)); // count + l.addLast(new UInt8Item((char) 2)); // offSize + l.addLast(new UInt16Item((char) 1)); // first offset OffsetItem topdictIndex1Ref = new IndexOffsetItem(2); l.addLast(topdictIndex1Ref); IndexBaseItem topdictBase = new IndexBaseItem(); l.addLast(topdictBase); - + /* int maxTopdictLen = (topdictOffsets[j+1]-topdictOffsets[j]) + 9*2 // at most 9 new keys + 8*5 // 8 new integer arguments + 3*2;// 3 new SID arguments */ - + //int topdictNext = 0; //byte[] topdict = new byte[maxTopdictLen]; - - OffsetItem charsetRef = new DictOffsetItem(); + + OffsetItem charsetRef = new DictOffsetItem(); OffsetItem charstringsRef = new DictOffsetItem(); - OffsetItem fdarrayRef = new DictOffsetItem(); - OffsetItem fdselectRef = new DictOffsetItem(); - - if ( !fonts[j].isCID ) { + OffsetItem fdarrayRef = new DictOffsetItem(); + OffsetItem fdselectRef = new DictOffsetItem(); + + if (!fonts[j].isCID) { // create a ROS key l.addLast(new DictNumberItem(nstrings)); - l.addLast(new DictNumberItem(nstrings+1)); + l.addLast(new DictNumberItem(nstrings + 1)); l.addLast(new DictNumberItem(0)); - l.addLast(new UInt8Item((char)12)); - l.addLast(new UInt8Item((char)30)); + l.addLast(new UInt8Item((char) 12)); + l.addLast(new UInt8Item((char) 30)); // create a CIDCount key l.addLast(new DictNumberItem(nglyphs)); - l.addLast(new UInt8Item((char)12)); - l.addLast(new UInt8Item((char)34)); + l.addLast(new UInt8Item((char) 12)); + l.addLast(new UInt8Item((char) 34)); // What about UIDBase (12,35)? Don't know what is it. // I don't think we need FontName; the font I looked at didn't have it. } - + // create an FDArray key l.addLast(fdarrayRef); - l.addLast(new UInt8Item((char)12)); - l.addLast(new UInt8Item((char)36)); + l.addLast(new UInt8Item((char) 12)); + l.addLast(new UInt8Item((char) 36)); // create an FDSelect key l.addLast(fdselectRef); - l.addLast(new UInt8Item((char)12)); - l.addLast(new UInt8Item((char)37)); + l.addLast(new UInt8Item((char) 12)); + l.addLast(new UInt8Item((char) 37)); // create an charset key l.addLast(charsetRef); - l.addLast(new UInt8Item((char)15)); + l.addLast(new UInt8Item((char) 15)); // create a CharStrings key l.addLast(charstringsRef); - l.addLast(new UInt8Item((char)17)); - + l.addLast(new UInt8Item((char) 17)); + seek(topdictOffsets[j]); - while (getPosition() < topdictOffsets[j+1]) { + while (getPosition() < topdictOffsets[j + 1]) { int p1 = getPosition(); getDictItem(); int p2 = getPosition(); if (Objects.equals(key, "Encoding") - || Objects.equals(key, "Private") - || Objects.equals(key, "FDSelect") - || Objects.equals(key, "FDArray") - || Objects.equals(key, "charset") - || Objects.equals(key, "CharStrings") + || Objects.equals(key, "Private") + || Objects.equals(key, "FDSelect") + || Objects.equals(key, "FDArray") + || Objects.equals(key, "charset") + || Objects.equals(key, "CharStrings") ) { // just drop them } else { - l.add(new RangeItem(buf,p1,p2-p1)); + l.add(new RangeItem(buf, p1, p2 - p1)); } } - - l.addLast(new IndexMarkerItem(topdictIndex1Ref,topdictBase)); - + + l.addLast(new IndexMarkerItem(topdictIndex1Ref, topdictBase)); + // Copy the string index and append new strings. // We need 3 more strings: Registry, Ordering, and a FontName for one FD. // The total length is at most "Adobe"+"Identity"+63 = 76 - + if (fonts[j].isCID) { l.addLast(getEntireIndexRange(stringIndexOffset)); } else { - String fdFontName = fonts[j].name+"-OneRange"; - if (fdFontName.length() > 127) - fdFontName = fdFontName.substring(0,127); - String extraStrings = "Adobe"+"Identity"+fdFontName; - - int origStringsLen = stringOffsets[stringOffsets.length-1] - - stringOffsets[0]; - int stringsBaseOffset = stringOffsets[0]-1; - + String fdFontName = fonts[j].name + "-OneRange"; + if (fdFontName.length() > 127) { + fdFontName = fdFontName.substring(0, 127); + } + String extraStrings = "Adobe" + "Identity" + fdFontName; + + int origStringsLen = stringOffsets[stringOffsets.length - 1] + - stringOffsets[0]; + int stringsBaseOffset = stringOffsets[0] - 1; + byte stringsIndexOffSize; - if (origStringsLen+extraStrings.length() <= 0xff) stringsIndexOffSize = 1; - else if (origStringsLen+extraStrings.length() <= 0xffff) stringsIndexOffSize = 2; - else if (origStringsLen+extraStrings.length() <= 0xffffff) stringsIndexOffSize = 3; - else stringsIndexOffSize = 4; - - l.addLast(new UInt16Item((char)((stringOffsets.length-1)+3))); // count - l.addLast(new UInt8Item((char)stringsIndexOffSize)); // offSize - for (int stringOffset : stringOffsets) + if (origStringsLen + extraStrings.length() <= 0xff) { + stringsIndexOffSize = 1; + } else if (origStringsLen + extraStrings.length() <= 0xffff) { + stringsIndexOffSize = 2; + } else if (origStringsLen + extraStrings.length() <= 0xffffff) { + stringsIndexOffSize = 3; + } else { + stringsIndexOffSize = 4; + } + + l.addLast(new UInt16Item((char) ((stringOffsets.length - 1) + 3))); // count + l.addLast(new UInt8Item((char) stringsIndexOffSize)); // offSize + for (int stringOffset : stringOffsets) { l.addLast(new IndexOffsetItem(stringsIndexOffSize, stringOffset - stringsBaseOffset)); - int currentStringsOffset = stringOffsets[stringOffsets.length-1] - - stringsBaseOffset; + } + int currentStringsOffset = stringOffsets[stringOffsets.length - 1] + - stringsBaseOffset; //l.addLast(new IndexOffsetItem(stringsIndexOffSize,currentStringsOffset)); currentStringsOffset += "Adobe".length(); - l.addLast(new IndexOffsetItem(stringsIndexOffSize,currentStringsOffset)); + l.addLast(new IndexOffsetItem(stringsIndexOffSize, currentStringsOffset)); currentStringsOffset += "Identity".length(); - l.addLast(new IndexOffsetItem(stringsIndexOffSize,currentStringsOffset)); + l.addLast(new IndexOffsetItem(stringsIndexOffSize, currentStringsOffset)); currentStringsOffset += fdFontName.length(); - l.addLast(new IndexOffsetItem(stringsIndexOffSize,currentStringsOffset)); - - l.addLast(new RangeItem(buf,stringOffsets[0],origStringsLen)); + l.addLast(new IndexOffsetItem(stringsIndexOffSize, currentStringsOffset)); + + l.addLast(new RangeItem(buf, stringOffsets[0], origStringsLen)); l.addLast(new StringItem(extraStrings)); } - + // copy the global subroutine index - + l.addLast(getEntireIndexRange(gsubrIndexOffset)); - + // deal with fdarray, fdselect, and the font descriptors - + if (fonts[j].isCID) { // copy the FDArray, FDSelect, charset } else { // create FDSelect l.addLast(new MarkerItem(fdselectRef)); - l.addLast(new UInt8Item((char)3)); // format identifier - l.addLast(new UInt16Item((char)1)); // nRanges - - l.addLast(new UInt16Item((char)0)); // Range[0].firstGlyph - l.addLast(new UInt8Item((char)0)); // Range[0].fd - - l.addLast(new UInt16Item((char)nglyphs)); // sentinel - + l.addLast(new UInt8Item((char) 3)); // format identifier + l.addLast(new UInt16Item((char) 1)); // nRanges + + l.addLast(new UInt16Item((char) 0)); // Range[0].firstGlyph + l.addLast(new UInt8Item((char) 0)); // Range[0].fd + + l.addLast(new UInt16Item((char) nglyphs)); // sentinel + // recreate a new charset // This format is suitable only for fonts without subsetting - + l.addLast(new MarkerItem(charsetRef)); - l.addLast(new UInt8Item((char)2)); // format identifier - - l.addLast(new UInt16Item((char)1)); // first glyph in range (ignore .notdef) - l.addLast(new UInt16Item((char)(nglyphs-1))); // nLeft + l.addLast(new UInt8Item((char) 2)); // format identifier + + l.addLast(new UInt16Item((char) 1)); // first glyph in range (ignore .notdef) + l.addLast(new UInt16Item((char) (nglyphs - 1))); // nLeft // now all are covered, the data structure is complete. - + // create a font dict index (fdarray) - + l.addLast(new MarkerItem(fdarrayRef)); - l.addLast(new UInt16Item((char)1)); - l.addLast(new UInt8Item((char)1)); // offSize - l.addLast(new UInt8Item((char)1)); // first offset - + l.addLast(new UInt16Item((char) 1)); + l.addLast(new UInt8Item((char) 1)); // offSize + l.addLast(new UInt8Item((char) 1)); // first offset + OffsetItem privateIndex1Ref = new IndexOffsetItem(1); l.addLast(privateIndex1Ref); IndexBaseItem privateBase = new IndexBaseItem(); l.addLast(privateBase); - + // looking at the PS that acrobat generates from a PDF with // a CFF opentype font embedded with an identity-H encoding, // it seems that it does not need a FontName. //l.addLast(new DictNumberItem((standardStrings.length+(stringOffsets.length-1)+2))); //l.addLast(new UInt8Item((char)12)); //l.addLast(new UInt8Item((char)38)); // FontName - + l.addLast(new DictNumberItem(fonts[j].privateLength)); OffsetItem privateRef = new DictOffsetItem(); l.addLast(privateRef); - l.addLast(new UInt8Item((char)18)); // Private - - l.addLast(new IndexMarkerItem(privateIndex1Ref,privateBase)); - + l.addLast(new UInt8Item((char) 18)); // Private + + l.addLast(new IndexMarkerItem(privateIndex1Ref, privateBase)); + // copy the private index & local subroutines - + l.addLast(new MarkerItem(privateRef)); // copy the private dict and the local subroutines. // the length of the private dict seems to NOT include // the local subroutines. - l.addLast(new RangeItem(buf,fonts[j].privateOffset,fonts[j].privateLength)); + l.addLast(new RangeItem(buf, fonts[j].privateOffset, fonts[j].privateLength)); if (fonts[j].privateSubrs >= 0) { //System.err.println("has subrs="+fonts[j].privateSubrs+" ,len="+fonts[j].privateLength); l.addLast(getEntireIndexRange(fonts[j].privateSubrs)); } } - + // copy the charstring index - + l.addLast(new MarkerItem(charstringsRef)); l.addLast(getEntireIndexRange(fonts[j].charstringsOffset)); - + // now create the new CFF font - + int[] currentOffset = new int[1]; currentOffset[0] = 0; - + Iterator listIter = l.iterator(); - while ( listIter.hasNext() ) { + while (listIter.hasNext()) { Item item = (Item) listIter.next(); item.increment(currentOffset); } - + listIter = l.iterator(); - while ( listIter.hasNext() ) { + while (listIter.hasNext()) { Item item = (Item) listIter.next(); item.xref(); } - + int size = currentOffset[0]; byte[] b = new byte[size]; - + listIter = l.iterator(); - while ( listIter.hasNext() ) { + while (listIter.hasNext()) { Item item = (Item) listIter.next(); item.emit(b); } - + return b; } - - + public boolean isCID(String fontName) { int j; - for (j=0; j>> 24) & 0xff); + i++; + // fallthrough + case 3: + buffer[myOffset + i] = (byte) ((value >>> 16) & 0xff); + i++; + // fallthrough + case 2: + buffer[myOffset + i] = (byte) ((value >>> 8) & 0xff); + i++; + // fallthrough + case 1: + buffer[myOffset + i] = (byte) ((value) & 0xff); + i++; } - //System.err.println("name["+j+"]=<"+fonts[j].name+">"); + /* + int mask = 0xff; + for (int i=size-1; i>=0; i--) { + buffer[myOffset+i] = (byte) (value & mask); + mask <<= 8; + } + */ } - - // string index - - //strings = new String[stringOffsets.length-1]; - /* - System.err.println("std strings = "+standardStrings.length); - System.err.println("fnt strings = "+(stringOffsets.length-1)); - for (char j=0; j"); + } + + static protected final class IndexBaseItem extends Item { + + public IndexBaseItem() { } - */ - - // top dict - - for (int j=0; j>> 16) & 0xff); + buffer[myOffset + 1] = (byte) ((value >>> 8) & 0xff); + buffer[myOffset + 2] = (byte) ((value >>> 0) & 0xff); + } + } + + /** + * Card32 item. + */ + + static protected final class UInt32Item extends Item { + + public int value; + + public UInt32Item(int value) { + this.value = value; + } + + public void increment(int[] currentOffset) { + super.increment(currentOffset); + currentOffset[0] += 4; + } + + // this is incomplete! + public void emit(byte[] buffer) { + buffer[myOffset + 0] = (byte) ((value >>> 24) & 0xff); + buffer[myOffset + 1] = (byte) ((value >>> 16) & 0xff); + buffer[myOffset + 2] = (byte) ((value >>> 8) & 0xff); + buffer[myOffset + 3] = (byte) ((value >>> 0) & 0xff); + } + } + + /** + * A SID or Card16 item. + */ + + static protected final class UInt16Item extends Item { + + public char value; + + public UInt16Item(char value) { + this.value = value; + } + + public void increment(int[] currentOffset) { + super.increment(currentOffset); + currentOffset[0] += 2; + } + + // this is incomplete! + public void emit(byte[] buffer) { + buffer[myOffset + 0] = (byte) ((value >>> 8) & 0xff); + buffer[myOffset + 1] = (byte) ((value >>> 0) & 0xff); + } + } + + /** + * A Card8 item. + */ + + static protected final class UInt8Item extends Item { + + public char value; + + public UInt8Item(char value) { + this.value = value; + } + + public void increment(int[] currentOffset) { + super.increment(currentOffset); + currentOffset[0] += 1; + } + + // this is incomplete! + public void emit(byte[] buffer) { + buffer[myOffset + 0] = (byte) ((value >>> 0) & 0xff); + } + } + + static protected final class StringItem extends Item { + + public String s; + + public StringItem(String s) { + this.s = s; + } + + public void increment(int[] currentOffset) { + super.increment(currentOffset); + currentOffset[0] += s.length(); + } + + public void emit(byte[] buffer) { + for (int i = 0; i < s.length(); i++) { + buffer[myOffset + i] = (byte) (s.charAt(i) & 0xff); } - - // fdarray index - if (fonts[j].fdarrayOffset >= 0) { - int[] fdarrayOffsets = getIndex(fonts[j].fdarrayOffset); - - fonts[j].fdprivateOffsets = new int[fdarrayOffsets.length-1]; - fonts[j].fdprivateLengths = new int[fdarrayOffsets.length-1]; - - //System.err.println("FD Font::"); - - for (int k=0; k>> 24) & 0xff); + buffer[myOffset + 2] = (byte) ((value >>> 16) & 0xff); + buffer[myOffset + 3] = (byte) ((value >>> 8) & 0xff); + buffer[myOffset + 4] = (byte) ((value >>> 0) & 0xff); } } - //System.err.println("CFF: done"); + } + + /** + * An offset-marker item for the list. It is used to mark an offset and to set the offset list item. + */ + + static protected final class MarkerItem extends Item { + + OffsetItem p; + + public MarkerItem(OffsetItem pointerToMarker) { + p = pointerToMarker; + } + + public void xref() { + p.set(this.myOffset); + } + } + + /** + * TODO Changed from private to protected by {@literal Ygal&Oren} + */ + protected final class Font { + + public String name; + public String fullName; + public boolean isCID = false; + public int privateOffset = -1; // only if not CID + public int privateLength = -1; // only if not CID + public int privateSubrs = -1; + public int charstringsOffset = -1; + public int encodingOffset = -1; + public int charsetOffset = -1; + public int fdarrayOffset = -1; // only if CID + public int fdselectOffset = -1; // only if CID + public int[] fdprivateOffsets; + public int[] fdprivateLengths; + public int[] fdprivateSubrs; + + // Added by Oren & Ygal + public int nglyphs; + public int nstrings; + public int CharsetLength; + public int[] charstringsOffsets; + public int[] charset; + public int[] FDSelect; + public int FDSelectLength; + public int FDSelectFormat; + public int CharstringType = 2; + public int FDArrayCount; + public int FDArrayOffsize; + public int[] FDArrayOffsets; + public int[] PrivateSubrsOffset; + public int[][] PrivateSubrsOffsetsArray; + public int[] SubrsOffsets; } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/CFFFontSubset.java b/openpdf/src/main/java/com/lowagie/text/pdf/CFFFontSubset.java index 250478bff..c4002c9b7 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/CFFFontSubset.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/CFFFontSubset.java @@ -59,13 +59,13 @@ import java.util.Objects; /** - * This Class subsets a CFF Type Font. The subset is preformed for CID fonts and NON CID fonts. - * The Charstring is subsetted for both types. For CID fonts only the FDArray which are used are embedded. - * The Lsubroutines of the FDArrays used are subsetted as well. The Subroutine subset supports both Type1 and Type2 - * formatting although only tested on Type2 Format. - * For Non CID the Lsubroutines are subsetted. On both types the Gsubroutines is subsetted. - * A font which was not of CID type is transformed into CID as a part of the subset process. - * The CID synthetic creation was written by Sivan Toledo (sivan@math.tau.ac.il) + * This Class subsets a CFF Type Font. The subset is preformed for CID fonts and NON CID fonts. The Charstring is + * subsetted for both types. For CID fonts only the FDArray which are used are embedded. The Lsubroutines of the + * FDArrays used are subsetted as well. The Subroutine subset supports both Type1 and Type2 formatting although only + * tested on Type2 Format. For Non CID the Lsubroutines are subsetted. On both types the Gsubroutines is subsetted. A + * font which was not of CID type is transformed into CID as a part of the subset process. The CID synthetic creation + * was written by Sivan Toledo (sivan@math.tau.ac.il) + * * @author Oren Manor (manorore@post.tau.ac.il) and Ygal Blum (blumygal@post.tau.ac.il) */ public class CFFFontSubset extends CFFFont { @@ -90,16 +90,15 @@ public class CFFFontSubset extends CFFFont { "random", "mul", "RESERVED_25", "sqrt", "dup", "exch", "index", "roll", "RESERVED_31", "RESERVED_32", "RESERVED_33", "hflex", "flex", "hflex1", "flex1", "RESERVED_REST" }; - + /** - * Operator codes for unused CharStrings and unused local and global Subrs - */ + * Operator codes for unused CharStrings and unused local and global Subrs + */ static final byte ENDCHAR_OP = 14; static final byte RETURN_OP = 11; - + /** - * A HashMap containing the glyphs used in the text after being converted - * to glyph number by the CMap + * A HashMap containing the glyphs used in the text after being converted to glyph number by the CMap */ HashMap GlyphsUsed; /** @@ -121,7 +120,7 @@ public class CFFFontSubset extends CFFFont { /** * A HashMap for keeping the Global subroutines used in the font */ - HashMap hGSubrsUsed = new HashMap<>(); + HashMap hGSubrsUsed = new HashMap<>(); /** * The Global SubroutinesUsed HashMaps as ArrayLists */ @@ -129,7 +128,7 @@ public class CFFFontSubset extends CFFFont { /** * A HashMap for keeping the subroutines used in a non-cid font */ - HashMap hSubrsUsedNonCID = new HashMap<>(); + HashMap hSubrsUsedNonCID = new HashMap<>(); /** * The SubroutinesUsed HashMap as ArrayList */ @@ -150,112 +149,115 @@ public class CFFFontSubset extends CFFFont { * The new CharString of the font */ byte[] NewCharStringsIndex; - + /** * The bias for the global subroutines */ int GBias = 0; - + /** * The linked list for generating the new font stream */ LinkedList OutputList; - + /** * Number of arguments to the stem operators in a subroutine calculated recursively */ - int NumOfHints=0; + int NumOfHints = 0; + - - /** + /** * C'tor for CFFFontSubset - * @param rf - The font file - * @param GlyphsUsed - a HashMap that contains the glyph used in the subset + * + * @param rf - The font file + * @param GlyphsUsed - a HashMap that contains the glyph used in the subset */ - public CFFFontSubset(RandomAccessFileOrArray rf, HashMap GlyphsUsed){ + public CFFFontSubset(RandomAccessFileOrArray rf, HashMap GlyphsUsed) { // Use CFFFont c'tor in order to parse the font file. super(rf); this.GlyphsUsed = GlyphsUsed; //Put the glyphs into a list glyphsInList = new ArrayList<>(GlyphsUsed.keySet()); - - - for (int i=0;i=0) - { + if (fonts[i].fdselectOffset >= 0) { // Process the FDSelect readFDSelect(i); // Build the FDArrayUsed hashmap BuildFDArrayUsed(i); } if (fonts[i].isCID) - // Build the FD Array used Hash Map + // Build the FD Array used Hash Map + { ReadFDArray(i); + } // compute the charset length - fonts[i].CharsetLength = CountCharset(fonts[i].charsetOffset,fonts[i].nglyphs); + fonts[i].CharsetLength = CountCharset(fonts[i].charsetOffset, fonts[i].nglyphs); } } /** * Calculates the length of the charset according to its format - * @param Offset The Charset Offset + * + * @param Offset The Charset Offset * @param NumofGlyphs Number of glyphs in the font * @return the length of the Charset */ - int CountCharset(int Offset,int NumofGlyphs){ + int CountCharset(int Offset, int NumofGlyphs) { int format; - int Length=0; + int Length = 0; seek(Offset); // Read the format format = getCard8(); // Calc according to format - switch (format){ + switch (format) { case 0: - Length = 1+2*NumofGlyphs; + Length = 1 + 2 * NumofGlyphs; break; case 1: - Length = 1+3*CountRange(NumofGlyphs,1); + Length = 1 + 3 * CountRange(NumofGlyphs, 1); break; case 2: - Length = 1+4*CountRange(NumofGlyphs,2); + Length = 1 + 4 * CountRange(NumofGlyphs, 2); break; default: break; } return Length; } - + /** * Function calculates the number of ranges in the Charset + * * @param NumofGlyphs The number of glyphs in the font - * @param Type The format of the Charset + * @param Type The format of the Charset * @return The number of ranges in the Charset data structure */ - int CountRange(int NumofGlyphs,int Type){ - int num=0; + int CountRange(int NumofGlyphs, int Type) { + int num = 0; char Sid; - int i=1,nLeft; - while (i= 0) - GBias = CalcBias(gsubrIndexOffset,j); + if (gsubrIndexOffset >= 0) { + GBias = CalcBias(gsubrIndexOffset, j); + } // Prepare the new CharStrings Index BuildNewCharString(j); - // Prepare the new Global and Local Subrs Indices + // Prepare the new Global and Local Subrs Indices BuildNewLGSubrs(j); // Build the new file byte[] Ret = BuildNewFile(j); return Ret; - } - finally { + } finally { try { buf.close(); - } - catch (Exception e) { + } catch (Exception e) { // empty on purpose } } } /** - * Function calcs bias according to the CharString type and the count - * of the subrs + * Function calcs bias according to the CharString type and the count of the subrs + * * @param Offset The offset to the relevant subrs index - * @param Font the font + * @param Font the font * @return The calculated Bias */ - protected int CalcBias(int Offset,int Font) - { + protected int CalcBias(int Offset, int Font) { seek(Offset); int nSubrs = getCard16(); // If type==1 -> bias=0 - if (fonts[Font].CharstringType == 1) + if (fonts[Font].CharstringType == 1) { return 0; + } // else calc according to the count - else if (nSubrs < 1240) + else if (nSubrs < 1240) { return 107; - else if (nSubrs < 33900) + } else if (nSubrs < 33900) { return 1131; - else + } else { return 32768; + } } /** - *Function uses BuildNewIndex to create the new index of the subset charstrings + * Function uses BuildNewIndex to create the new index of the subset charstrings + * * @param FontIndex the font * @throws IOException on error */ - protected void BuildNewCharString(int FontIndex) throws IOException - { - NewCharStringsIndex = BuildNewIndex(fonts[FontIndex].charstringsOffsets,GlyphsUsed,ENDCHAR_OP); + protected void BuildNewCharString(int FontIndex) throws IOException { + NewCharStringsIndex = BuildNewIndex(fonts[FontIndex].charstringsOffsets, GlyphsUsed, ENDCHAR_OP); } - + /** - * Function builds the new local and global subsrs indices. IF CID then All of - * the FD Array lsubrs will be subsetted. + * Function builds the new local and global subsrs indices. IF CID then All of the FD Array lsubrs will be + * subsetted. + * * @param Font the font * @throws IOException on error */ @SuppressWarnings("unchecked") - protected void BuildNewLGSubrs(int Font)throws IOException - { + protected void BuildNewLGSubrs(int Font) throws IOException { // If the font is CID then the lsubrs are divided into FontDicts. // for each FD array the lsubrs will be subsetted. - if(fonts[Font].isCID) - { + if (fonts[Font].isCID) { // Init the hashmap-array and the arraylist-array to hold the subrs used // in each private dict. HashMap mapClazz = new HashMap<>(); - hSubrsUsed = (HashMap[]) Array.newInstance(mapClazz.getClass(), fonts[Font].fdprivateOffsets.length); + hSubrsUsed = (HashMap[]) Array.newInstance(mapClazz.getClass(), + fonts[Font].fdprivateOffsets.length); ArrayList listClass = new ArrayList<>(); - lSubrsUsed = (ArrayList[]) Array.newInstance(listClass.getClass(), fonts[Font].fdprivateOffsets.length); + lSubrsUsed = (ArrayList[]) Array.newInstance(listClass.getClass(), + fonts[Font].fdprivateOffsets.length); // A [][] which will store the byte array for each new FD Array lsubs index NewLSubrsIndex = new byte[fonts[Font].fdprivateOffsets.length][]; // An array to hold the offset for each Lsubr index fonts[Font].PrivateSubrsOffset = new int[fonts[Font].fdprivateOffsets.length]; // A [][] which will store the offset array for each lsubr index fonts[Font].PrivateSubrsOffsetsArray = new int[fonts[Font].fdprivateOffsets.length][]; - + // Put the FDarrayUsed into a list List FDInList = new ArrayList<>(FDArrayUsed.keySet()); // For each FD array which is used subset the lsubr @@ -468,73 +473,77 @@ protected void BuildNewLGSubrs(int Font)throws IOException if (fonts[Font].PrivateSubrsOffset[FD] >= 0) { //Scans the Charstring data storing the used Local and Global subroutines // by the glyphs. Scans the Subrs recursively. - BuildSubrUsed(Font, FD, fonts[Font].PrivateSubrsOffset[FD], fonts[Font].PrivateSubrsOffsetsArray[FD], hSubrsUsed[FD], lSubrsUsed[FD]); + BuildSubrUsed(Font, FD, fonts[Font].PrivateSubrsOffset[FD], + fonts[Font].PrivateSubrsOffsetsArray[FD], hSubrsUsed[FD], lSubrsUsed[FD]); // Builds the New Local Subrs index - NewLSubrsIndex[FD] = BuildNewIndex(fonts[Font].PrivateSubrsOffsetsArray[FD], hSubrsUsed[FD], RETURN_OP); + NewLSubrsIndex[FD] = BuildNewIndex(fonts[Font].PrivateSubrsOffsetsArray[FD], hSubrsUsed[FD], + RETURN_OP); } } } // If the font is not CID && the Private Subr exists then subset: - else if (fonts[Font].privateSubrs>=0) - { + else if (fonts[Font].privateSubrs >= 0) { // Build the subrs offsets; fonts[Font].SubrsOffsets = getIndex(fonts[Font].privateSubrs); //Scans the Charstring data storing the used Local and Global subroutines // by the glyphs. Scans the Subrs recursively. - BuildSubrUsed(Font,-1,fonts[Font].privateSubrs,fonts[Font].SubrsOffsets,hSubrsUsedNonCID,lSubrsUsedNonCID); + BuildSubrUsed(Font, -1, fonts[Font].privateSubrs, fonts[Font].SubrsOffsets, hSubrsUsedNonCID, + lSubrsUsedNonCID); } // For all fonts subset the Global Subroutines // Scan the Global Subr Hashmap recursively on the Gsubrs BuildGSubrsUsed(Font); - if (fonts[Font].privateSubrs>=0) - // Builds the New Local Subrs index - NewSubrsIndexNonCID = BuildNewIndex(fonts[Font].SubrsOffsets,hSubrsUsedNonCID,RETURN_OP); + if (fonts[Font].privateSubrs >= 0) + // Builds the New Local Subrs index + { + NewSubrsIndexNonCID = BuildNewIndex(fonts[Font].SubrsOffsets, hSubrsUsedNonCID, RETURN_OP); + } //Builds the New Global Subrs index - NewGSubrsIndex = BuildNewIndex(gsubrOffsets,hGSubrsUsed,RETURN_OP); + NewGSubrsIndex = BuildNewIndex(gsubrOffsets, hGSubrsUsed, RETURN_OP); } /** - * The function finds for the FD array processed the local subr offset and its - * offset array. + * The function finds for the FD array processed the local subr offset and its offset array. + * * @param Font the font - * @param FD The FDARRAY processed + * @param FD The FDARRAY processed */ - protected void BuildFDSubrsOffsets(int Font,int FD) - { + protected void BuildFDSubrsOffsets(int Font, int FD) { // Initiate to -1 to indicate lsubr operator present fonts[Font].PrivateSubrsOffset[FD] = -1; // Goto beginning of objects seek(fonts[Font].fdprivateOffsets[FD]); // While in the same object: - while (getPosition() < fonts[Font].fdprivateOffsets[FD]+fonts[Font].fdprivateLengths[FD]) - { + while (getPosition() < fonts[Font].fdprivateOffsets[FD] + fonts[Font].fdprivateLengths[FD]) { getDictItem(); // If the dictItem is the "Subrs" then find and store offset, - if (Objects.equals(key, "Subrs")) - fonts[Font].PrivateSubrsOffset[FD] = (Integer) args[0] +fonts[Font].fdprivateOffsets[FD]; + if (Objects.equals(key, "Subrs")) { + fonts[Font].PrivateSubrsOffset[FD] = (Integer) args[0] + fonts[Font].fdprivateOffsets[FD]; + } } //Read the lsubr index if the lsubr was found - if (fonts[Font].PrivateSubrsOffset[FD] >= 0) - fonts[Font].PrivateSubrsOffsetsArray[FD] = getIndex(fonts[Font].PrivateSubrsOffset[FD]); + if (fonts[Font].PrivateSubrsOffset[FD] >= 0) { + fonts[Font].PrivateSubrsOffsetsArray[FD] = getIndex(fonts[Font].PrivateSubrsOffset[FD]); + } } /** - * Function uses ReadAsubr on the glyph used to build the LSubr and Gsubr HashMap. - * The HashMap (of the lsubr only) is then scanned recursively for Lsubr and Gsubrs - * calls. - * @param Font the font - * @param FD FD array processed. 0 indicates function was called by non CID font - * @param SubrOffset the offset to the subr index to calc the bias + * Function uses ReadAsubr on the glyph used to build the LSubr and Gsubr HashMap. The HashMap (of the lsubr only) + * is then scanned recursively for Lsubr and Gsubrs calls. + * + * @param Font the font + * @param FD FD array processed. 0 indicates function was called by non CID font + * @param SubrOffset the offset to the subr index to calc the bias * @param SubrsOffsets the offset array of the subr index - * @param hSubr HashMap of the subrs used - * @param lSubr ArrayList of the subrs used + * @param hSubr HashMap of the subrs used + * @param lSubr ArrayList of the subrs used */ - protected void BuildSubrUsed(int Font,int FD,int SubrOffset,int[] SubrsOffsets, Map hSubr, List lSubr) - { + protected void BuildSubrUsed(int Font, int FD, int SubrOffset, int[] SubrsOffsets, Map hSubr, + List lSubr) { // Calc the Bias for the subr index - int LBias = CalcBias(SubrOffset,Font); - + int LBias = CalcBias(SubrOffset, Font); + // For each glyph used find its GID, start & end pos for (Object o : glyphsInList) { int glyph = (Integer) o; @@ -549,72 +558,67 @@ protected void BuildSubrUsed(int Font,int FD,int SubrOffset,int[] SubrsOffsets, int GlyphFD = fonts[Font].FDSelect[glyph]; // If the Glyph is part of the FD being processed if (GlyphFD == FD) - // Find the Subrs called by the glyph and insert to hash: + // Find the Subrs called by the glyph and insert to hash: + { ReadASubr(Start, End, GBias, LBias, hSubr, lSubr, SubrsOffsets); + } } else - // If the font is not CID - //Find the Subrs called by the glyph and insert to hash: + // If the font is not CID + //Find the Subrs called by the glyph and insert to hash: + { ReadASubr(Start, End, GBias, LBias, hSubr, lSubr, SubrsOffsets); + } } // For all Lsubrs used, check recursively for Lsubr & Gsubr used - for (int i=0;i=0) - { + if (Subr < SubrsOffsets.length - 1 && Subr >= 0) { // Read and process the subr int Start = SubrsOffsets[Subr]; - int End = SubrsOffsets[Subr+1]; - ReadASubr(Start,End,GBias,LBias,hSubr,lSubr,SubrsOffsets); + int End = SubrsOffsets[Subr + 1]; + ReadASubr(Start, End, GBias, LBias, hSubr, lSubr, SubrsOffsets); } } } - + /** - * Function scans the Glsubr used ArrayList to find recursive calls - * to Gsubrs and adds to Hashmap and ArrayList + * Function scans the Glsubr used ArrayList to find recursive calls to Gsubrs and adds to Hashmap and ArrayList + * * @param Font the font */ - protected void BuildGSubrsUsed(int Font) - { + protected void BuildGSubrsUsed(int Font) { int LBias = 0; int SizeOfNonCIDSubrsUsed = 0; - if (fonts[Font].privateSubrs>=0) - { - LBias = CalcBias(fonts[Font].privateSubrs,Font); + if (fonts[Font].privateSubrs >= 0) { + LBias = CalcBias(fonts[Font].privateSubrs, Font); SizeOfNonCIDSubrsUsed = lSubrsUsedNonCID.size(); } - + // For each global subr used - for (int i=0;i=0) - { + if (Subr < gsubrOffsets.length - 1 && Subr >= 0) { // Read the subr and process int Start = gsubrOffsets[Subr]; - int End = gsubrOffsets[Subr+1]; - - if (fonts[Font].isCID) - ReadASubr(Start,End,GBias,0,hGSubrsUsed,lGSubrsUsed,null); - else - { - ReadASubr(Start,End,GBias,LBias,hSubrsUsedNonCID,lSubrsUsedNonCID,fonts[Font].SubrsOffsets); - if (SizeOfNonCIDSubrsUsed < lSubrsUsedNonCID.size()) - { - for (int j=SizeOfNonCIDSubrsUsed;j=0) - { + if (LSubr < fonts[Font].SubrsOffsets.length - 1 && LSubr >= 0) { // Read the subr and process int LStart = fonts[Font].SubrsOffsets[LSubr]; - int LEnd = fonts[Font].SubrsOffsets[LSubr+1]; - ReadASubr(LStart,LEnd,GBias,LBias,hSubrsUsedNonCID,lSubrsUsedNonCID,fonts[Font].SubrsOffsets); + int LEnd = fonts[Font].SubrsOffsets[LSubr + 1]; + ReadASubr(LStart, LEnd, GBias, LBias, hSubrsUsedNonCID, lSubrsUsedNonCID, + fonts[Font].SubrsOffsets); } } SizeOfNonCIDSubrsUsed = lSubrsUsedNonCID.size(); @@ -625,19 +629,19 @@ protected void BuildGSubrsUsed(int Font) } /** - * The function reads a subrs (glyph info) between begin and end. - * Adds calls to a Lsubr to the hSubr and lSubrs. + * The function reads a subrs (glyph info) between begin and end. Adds calls to a Lsubr to the hSubr and lSubrs. * Adds calls to a Gsubr to the hGSubr and lGSubrs. - * @param begin the start point of the subr - * @param end the end point of the subr - * @param GBias the bias of the Global Subrs - * @param LBias the bias of the Local Subrs - * @param hSubr the HashMap for the lSubrs - * @param lSubr the ArrayList for the lSubrs + * + * @param begin the start point of the subr + * @param end the end point of the subr + * @param GBias the bias of the Global Subrs + * @param LBias the bias of the Local Subrs + * @param hSubr the HashMap for the lSubrs + * @param lSubr the ArrayList for the lSubrs * @param LSubrsOffsets The Offsets array of the subroutines */ - protected void ReadASubr(int begin,int end,int GBias,int LBias, Map hSubr, List lSubr, int[] LSubrsOffsets) - { + protected void ReadASubr(int begin, int end, int GBias, int LBias, Map hSubr, List lSubr, + int[] LSubrsOffsets) { // Clear the stack for the subrs EmptyStack(); NumOfHints = 0; @@ -658,149 +662,150 @@ protected void ReadASubr(int begin,int end,int GBias,int LBias, Map 0) - { + if (NumOfArgs > 0) { // Calc the index of the Subrs int Subr = (Integer) TopElement + LBias; // If the subr isn't in the HashMap -> Put in - if (!hSubr.containsKey(Subr)) - { - hSubr.put(Subr,null); + if (!hSubr.containsKey(Subr)) { + hSubr.put(Subr, null); lSubr.add(Subr); } if (LSubrsOffsets != null) { CalcHints(LSubrsOffsets[Subr], LSubrsOffsets[Subr + 1], LBias, GBias, LSubrsOffsets); } seek(pos); - } + } } // a call to a Gsubr - else if (Objects.equals(key, "callgsubr")) - { + else if (Objects.equals(key, "callgsubr")) { // Verify that arguments are passed - if (NumOfArgs > 0) - { + if (NumOfArgs > 0) { // Calc the index of the Subrs int Subr = (Integer) TopElement + GBias; // If the subr isn't in the HashMap -> Put in - if (!hGSubrsUsed.containsKey(Subr)) - { - hGSubrsUsed.put(Subr,null); + if (!hGSubrsUsed.containsKey(Subr)) { + hGSubrsUsed.put(Subr, null); lGSubrsUsed.add(Subr); } - CalcHints(gsubrOffsets[Subr],gsubrOffsets[Subr+1],LBias,GBias,LSubrsOffsets); + CalcHints(gsubrOffsets[Subr], gsubrOffsets[Subr + 1], LBias, GBias, LSubrsOffsets); seek(pos); } } // A call to "stem" - else if (Objects.equals(key, "hstem") || Objects.equals(key, "vstem") || Objects.equals(key, "hstemhm") || Objects.equals(key, "vstemhm")) - // Increment the NumOfHints by the number couples of of arguments - NumOfHints += NumOfArgs/2; - // A call to "mask" - else if (Objects.equals(key, "hintmask") || Objects.equals(key, "cntrmask")) + else if (Objects.equals(key, "hstem") || Objects.equals(key, "vstem") || Objects.equals(key, "hstemhm") + || Objects.equals(key, "vstemhm")) + // Increment the NumOfHints by the number couples of of arguments { + NumOfHints += NumOfArgs / 2; + } + // A call to "mask" + else if (Objects.equals(key, "hintmask") || Objects.equals(key, "cntrmask")) { // Compute the size of the mask - int SizeOfMask = NumOfHints/8; - if (NumOfHints%8 != 0 || SizeOfMask == 0) + int SizeOfMask = NumOfHints / 8; + if (NumOfHints % 8 != 0 || SizeOfMask == 0) { SizeOfMask++; + } // Continue the pointer in SizeOfMask steps - for (int i=0;i} flush the stack */ - protected int StackOpp() - { - if (Objects.equals(key, "ifelse")) + protected int StackOpp() { + if (Objects.equals(key, "ifelse")) { return -3; - if (Objects.equals(key, "roll") || Objects.equals(key, "put")) + } + if (Objects.equals(key, "roll") || Objects.equals(key, "put")) { return -2; - if (Objects.equals(key, "callsubr") || Objects.equals(key, "callgsubr") || Objects.equals(key, "add") || Objects.equals(key, "sub") || - Objects.equals(key, "div") || Objects.equals(key, "mul") || Objects.equals(key, "drop") || Objects.equals(key, "and") || - Objects.equals(key, "or") || Objects.equals(key, "eq")) + } + if (Objects.equals(key, "callsubr") || Objects.equals(key, "callgsubr") || Objects.equals(key, "add") + || Objects.equals(key, "sub") || + Objects.equals(key, "div") || Objects.equals(key, "mul") || Objects.equals(key, "drop") + || Objects.equals(key, "and") || + Objects.equals(key, "or") || Objects.equals(key, "eq")) { return -1; - if (Objects.equals(key, "abs") || Objects.equals(key, "neg") || Objects.equals(key, "sqrt") || Objects.equals(key, "exch") || - Objects.equals(key, "index") || Objects.equals(key, "get") || Objects.equals(key, "not") || Objects.equals(key, "return")) + } + if (Objects.equals(key, "abs") || Objects.equals(key, "neg") || Objects.equals(key, "sqrt") || Objects.equals( + key, "exch") || + Objects.equals(key, "index") || Objects.equals(key, "get") || Objects.equals(key, "not") + || Objects.equals(key, "return")) { return 0; - if (Objects.equals(key, "random") || Objects.equals(key, "dup")) + } + if (Objects.equals(key, "random") || Objects.equals(key, "dup")) { return 1; + } return 2; } - + /** * Empty the Type2 Stack - * */ - protected void EmptyStack() - { + protected void EmptyStack() { // Null the arguments - for (int i=0; i0) - { - args[arg_count-1]=null; + protected void PopStack() { + if (arg_count > 0) { + args[arg_count - 1] = null; arg_count--; } } - + /** * Add an item to the stack - * */ - protected void PushStack() - { + protected void PushStack() { arg_count++; } - + /** * The function reads the next command after the file pointer is set */ - protected void ReadCommand() - { + protected void ReadCommand() { key = null; boolean gotKey = false; // Until a key is found @@ -848,81 +853,81 @@ protected void ReadCommand() } if (b0 <= 31) // An operator was found.. Set Key. { - gotKey=true; + gotKey = true; // 12 is an escape command therefore the next byte is a part // of this command - if (b0 == 12) - { + if (b0 == 12) { int b1 = getCard8(); - if (b1>SubrsEscapeFuncs.length-1) - b1 = SubrsEscapeFuncs.length-1; + if (b1 > SubrsEscapeFuncs.length - 1) { + b1 = SubrsEscapeFuncs.length - 1; + } key = SubrsEscapeFuncs[b1]; - } - else + } else { key = SubrsFunctions[b0]; + } } - } + } } - + /** - * The function reads the subroutine and returns the number of the hint in it. - * If a call to another subroutine is found the function calls recursively. - * @param begin the start point of the subr - * @param end the end point of the subr - * @param LBias the bias of the Local Subrs - * @param GBias the bias of the Global Subrs + * The function reads the subroutine and returns the number of the hint in it. If a call to another subroutine is + * found the function calls recursively. + * + * @param begin the start point of the subr + * @param end the end point of the subr + * @param LBias the bias of the Local Subrs + * @param GBias the bias of the Global Subrs * @param LSubrsOffsets The Offsets array of the subroutines * @return The number of hints in the subroutine read. */ - protected int CalcHints(int begin, int end, int LBias, int GBias, int[] LSubrsOffsets) - { + protected int CalcHints(int begin, int end, int LBias, int GBias, int[] LSubrsOffsets) { // Goto beginning of the subr seek(begin); - while (getPosition() < end) - { + while (getPosition() < end) { // Read the next command ReadCommand(); int pos = getPosition(); Object TopElement = null; - if (arg_count>0) - TopElement = args[arg_count-1]; + if (arg_count > 0) { + TopElement = args[arg_count - 1]; + } int NumOfArgs = arg_count; //Check the modification needed on the Argument Stack according to key; HandelStack(); // a call to a Lsubr - if (Objects.equals(key, "callsubr")) - { - if (NumOfArgs>0) - { + if (Objects.equals(key, "callsubr")) { + if (NumOfArgs > 0) { int Subr = (Integer) TopElement + LBias; - CalcHints(LSubrsOffsets[Subr],LSubrsOffsets[Subr+1],LBias,GBias,LSubrsOffsets); - seek(pos); + CalcHints(LSubrsOffsets[Subr], LSubrsOffsets[Subr + 1], LBias, GBias, LSubrsOffsets); + seek(pos); } } // a call to a Gsubr - else if (Objects.equals(key, "callgsubr")) - { - if (NumOfArgs>0) - { + else if (Objects.equals(key, "callgsubr")) { + if (NumOfArgs > 0) { int Subr = (Integer) TopElement + GBias; - CalcHints(gsubrOffsets[Subr],gsubrOffsets[Subr+1],LBias,GBias,LSubrsOffsets); - seek(pos); + CalcHints(gsubrOffsets[Subr], gsubrOffsets[Subr + 1], LBias, GBias, LSubrsOffsets); + seek(pos); } } // A call to "stem" - else if (Objects.equals(key, "hstem") || Objects.equals(key, "vstem") || Objects.equals(key, "hstemhm") || Objects.equals(key, "vstemhm")) - // Increment the NumOfHints by the number couples of of arguments - NumOfHints += NumOfArgs/2; - // A call to "mask" - else if (Objects.equals(key, "hintmask") || Objects.equals(key, "cntrmask")) + else if (Objects.equals(key, "hstem") || Objects.equals(key, "vstem") || Objects.equals(key, "hstemhm") + || Objects.equals(key, "vstemhm")) + // Increment the NumOfHints by the number couples of of arguments { + NumOfHints += NumOfArgs / 2; + } + // A call to "mask" + else if (Objects.equals(key, "hintmask") || Objects.equals(key, "cntrmask")) { // Compute the size of the mask - int SizeOfMask = NumOfHints/8; - if (NumOfHints%8 != 0 || SizeOfMask == 0) + int SizeOfMask = NumOfHints / 8; + if (NumOfHints % 8 != 0 || SizeOfMask == 0) { SizeOfMask++; + } // Continue the pointer in SizeOfMask steps - for (int i=0;i Used,byte OperatorForUnusedEntries) throws IOException - { + protected byte[] BuildNewIndex(int[] Offsets, Map Used, byte OperatorForUnusedEntries) + throws IOException { int unusedCount = 0; - int Offset=0; + int Offset = 0; int[] NewOffsets = new int[Offsets.length]; // Build the Offsets Array for the Subset - for (int i=0;i Used,byte Oper } } // Offset var determines the size of the object array - byte[] NewObjects = new byte[Offset+unusedCount]; + byte[] NewObjects = new byte[Offset + unusedCount]; // Build the new Object array int unusedOffset = 0; - for (int i=0;i(); // copy the header of the font CopyHeader(); - + // create a name index - BuildIndexHeader(1,1,1); - OutputList.addLast(new UInt8Item((char)( 1+fonts[Font].name.length() ))); + BuildIndexHeader(1, 1, 1); + OutputList.addLast(new UInt8Item((char) (1 + fonts[Font].name.length()))); OutputList.addLast(new StringItem(fonts[Font].name)); - + // create the topdict Index - BuildIndexHeader(1,2,1); + BuildIndexHeader(1, 2, 1); OffsetItem topdictIndex1Ref = new IndexOffsetItem(2); OutputList.addLast(topdictIndex1Ref); IndexBaseItem topdictBase = new IndexBaseItem(); OutputList.addLast(topdictBase); - + // Initialize the Dict Items for later use - OffsetItem charsetRef = new DictOffsetItem(); + OffsetItem charsetRef = new DictOffsetItem(); OffsetItem charstringsRef = new DictOffsetItem(); - OffsetItem fdarrayRef = new DictOffsetItem(); - OffsetItem fdselectRef = new DictOffsetItem(); - OffsetItem privateRef = new DictOffsetItem(); - + OffsetItem fdarrayRef = new DictOffsetItem(); + OffsetItem fdselectRef = new DictOffsetItem(); + OffsetItem privateRef = new DictOffsetItem(); + // If the font is not CID create the following keys - if ( !fonts[Font].isCID ) { + if (!fonts[Font].isCID) { // create a ROS key OutputList.addLast(new DictNumberItem(fonts[Font].nstrings)); - OutputList.addLast(new DictNumberItem(fonts[Font].nstrings+1)); + OutputList.addLast(new DictNumberItem(fonts[Font].nstrings + 1)); OutputList.addLast(new DictNumberItem(0)); - OutputList.addLast(new UInt8Item((char)12)); - OutputList.addLast(new UInt8Item((char)30)); + OutputList.addLast(new UInt8Item((char) 12)); + OutputList.addLast(new UInt8Item((char) 30)); // create a CIDCount key OutputList.addLast(new DictNumberItem(fonts[Font].nglyphs)); - OutputList.addLast(new UInt8Item((char)12)); - OutputList.addLast(new UInt8Item((char)34)); + OutputList.addLast(new UInt8Item((char) 12)); + OutputList.addLast(new UInt8Item((char) 34)); // Sivan's comments // What about UIDBase (12,35)? Don't know what is it. // I don't think we need FontName; the font I looked at didn't have it. @@ -1090,7 +1097,7 @@ protected byte[] BuildNewFile(int Font) // Go to the TopDict of the font being processed seek(topdictOffsets[Font]); // Run until the end of the TopDict - while (getPosition() < topdictOffsets[Font+1]) { + while (getPosition() < topdictOffsets[Font + 1]) { int p1 = getPosition(); getDictItem(); int p2 = getPosition(); @@ -1108,72 +1115,74 @@ protected byte[] BuildNewFile(int Font) } } // Create the FDArray, FDSelect, Charset and CharStrings Keys - CreateKeys(fdarrayRef,fdselectRef,charsetRef,charstringsRef); - + CreateKeys(fdarrayRef, fdselectRef, charsetRef, charstringsRef); + // Mark the end of the top dict area - OutputList.addLast(new IndexMarkerItem(topdictIndex1Ref,topdictBase)); - + OutputList.addLast(new IndexMarkerItem(topdictIndex1Ref, topdictBase)); + // Copy the string index - if (fonts[Font].isCID) + if (fonts[Font].isCID) { OutputList.addLast(getEntireIndexRange(stringIndexOffset)); + } // If the font is not CID we need to append new strings. // We need 3 more strings: Registry, Ordering, and a FontName for one FD. // The total length is at most "Adobe"+"Identity"+63 = 76 - else + else { CreateNewStringIndex(Font); - + } + // copy the new subsetted global subroutine index - OutputList.addLast(new RangeItem(new RandomAccessFileOrArray(NewGSubrsIndex),0,NewGSubrsIndex.length)); - + OutputList.addLast(new RangeItem(new RandomAccessFileOrArray(NewGSubrsIndex), 0, NewGSubrsIndex.length)); + // deal with fdarray, fdselect, and the font descriptors // If the font is CID: if (fonts[Font].isCID) { // copy the FDArray, FDSelect, charset - + // Copy FDSelect // Mark the beginning OutputList.addLast(new MarkerItem(fdselectRef)); // If an FDSelect exists copy it - if (fonts[Font].fdselectOffset>=0) - OutputList.addLast(new RangeItem(buf,fonts[Font].fdselectOffset,fonts[Font].FDSelectLength)); + if (fonts[Font].fdselectOffset >= 0) { + OutputList.addLast(new RangeItem(buf, fonts[Font].fdselectOffset, fonts[Font].FDSelectLength)); + } // Else create a new one - else - CreateFDSelect(fdselectRef,fonts[Font].nglyphs); - - // Copy the Charset + else { + CreateFDSelect(fdselectRef, fonts[Font].nglyphs); + } + + // Copy the Charset // Mark the beginning and copy entirely OutputList.addLast(new MarkerItem(charsetRef)); - OutputList.addLast(new RangeItem(buf,fonts[Font].charsetOffset,fonts[Font].CharsetLength)); - + OutputList.addLast(new RangeItem(buf, fonts[Font].charsetOffset, fonts[Font].CharsetLength)); + // Copy the FDArray // If an FDArray exists - if (fonts[Font].fdarrayOffset>=0) - { + if (fonts[Font].fdarrayOffset >= 0) { // Mark the beginning OutputList.addLast(new MarkerItem(fdarrayRef)); // Build a new FDArray with its private dicts and their LSubrs Reconstruct(Font); + } else + // Else create a new one + { + CreateFDArray(fdarrayRef, privateRef, Font); } - else - // Else create a new one - CreateFDArray(fdarrayRef,privateRef,Font); - + } // If the font is not CID - else - { + else { // create FDSelect - CreateFDSelect(fdselectRef,fonts[Font].nglyphs); + CreateFDSelect(fdselectRef, fonts[Font].nglyphs); // recreate a new charset - CreateCharset(charsetRef,fonts[Font].nglyphs); + CreateCharset(charsetRef, fonts[Font].nglyphs); // create a font dict index (fdarray) - CreateFDArray(fdarrayRef,privateRef,Font); + CreateFDArray(fdarrayRef, privateRef, Font); } - + // if a private dict exists insert its subsetted version - if (fonts[Font].privateOffset>=0) - { + if (fonts[Font].privateOffset >= 0) { // Mark the beginning of the private dict IndexBaseItem PrivateBase = new IndexBaseItem(); OutputList.addLast(PrivateBase); @@ -1181,39 +1190,40 @@ protected byte[] BuildNewFile(int Font) OffsetItem Subr = new DictOffsetItem(); // Build and copy the new private dict - CreateNonCIDPrivate(Font,Subr); + CreateNonCIDPrivate(Font, Subr); // Copy the new LSubrs index - CreateNonCIDSubrs(Font,PrivateBase,Subr); + CreateNonCIDSubrs(Font, PrivateBase, Subr); } - + // copy the charstring index OutputList.addLast(new MarkerItem(charstringsRef)); // Add the subsetted charstring - OutputList.addLast(new RangeItem(new RandomAccessFileOrArray(NewCharStringsIndex),0,NewCharStringsIndex.length)); - + OutputList.addLast( + new RangeItem(new RandomAccessFileOrArray(NewCharStringsIndex), 0, NewCharStringsIndex.length)); + // now create the new CFF font int[] currentOffset = new int[1]; currentOffset[0] = 0; // Count and save the offset for each item Iterator listIter = OutputList.iterator(); - while ( listIter.hasNext() ) { + while (listIter.hasNext()) { Item item = (Item) listIter.next(); item.increment(currentOffset); } // Compute the Xref for each of the offset items listIter = OutputList.iterator(); - while ( listIter.hasNext() ) { + while (listIter.hasNext()) { Item item = (Item) listIter.next(); item.xref(); } - + int size = currentOffset[0]; byte[] b = new byte[size]; - + // Emit all the items into the new byte array listIter = OutputList.iterator(); - while ( listIter.hasNext() ) { + while (listIter.hasNext()) { Item item = (Item) listIter.next(); item.emit(b); } @@ -1224,160 +1234,163 @@ protected byte[] BuildNewFile(int Font) /** * Function Copies the header from the original fileto the output list */ - protected void CopyHeader() - { + protected void CopyHeader() { seek(0); int major = getCard8(); int minor = getCard8(); int hdrSize = getCard8(); int offSize = getCard8(); nextIndexOffset = hdrSize; - OutputList.addLast(new RangeItem(buf,0,hdrSize)); + OutputList.addLast(new RangeItem(buf, 0, hdrSize)); } /** * Function Build the header of an index - * @param Count the count field of the index + * + * @param Count the count field of the index * @param Offsize the offsize field of the index - * @param First the first offset of the index + * @param First the first offset of the index */ - protected void BuildIndexHeader(int Count,int Offsize,int First) - { + protected void BuildIndexHeader(int Count, int Offsize, int First) { // Add the count field - OutputList.addLast(new UInt16Item((char)Count)); // count + OutputList.addLast(new UInt16Item((char) Count)); // count // Add the offsize field - OutputList.addLast(new UInt8Item((char)Offsize)); // offSize + OutputList.addLast(new UInt8Item((char) Offsize)); // offSize // Add the first offset according to the offsize - switch(Offsize){ + switch (Offsize) { case 1: - OutputList.addLast(new UInt8Item((char)First)); // first offset + OutputList.addLast(new UInt8Item((char) First)); // first offset break; case 2: - OutputList.addLast(new UInt16Item((char)First)); // first offset + OutputList.addLast(new UInt16Item((char) First)); // first offset break; case 3: - OutputList.addLast(new UInt24Item((char)First)); // first offset + OutputList.addLast(new UInt24Item((char) First)); // first offset break; case 4: - OutputList.addLast(new UInt32Item((char)First)); // first offset + OutputList.addLast(new UInt32Item((char) First)); // first offset break; default: - break; + break; } } - + /** * Function adds the keys into the TopDict - * @param fdarrayRef OffsetItem for the FDArray - * @param fdselectRef OffsetItem for the FDSelect - * @param charsetRef OffsetItem for the CharSet + * + * @param fdarrayRef OffsetItem for the FDArray + * @param fdselectRef OffsetItem for the FDSelect + * @param charsetRef OffsetItem for the CharSet * @param charstringsRef OffsetItem for the CharString */ - protected void CreateKeys(OffsetItem fdarrayRef,OffsetItem fdselectRef,OffsetItem charsetRef,OffsetItem charstringsRef) - { + protected void CreateKeys(OffsetItem fdarrayRef, OffsetItem fdselectRef, OffsetItem charsetRef, + OffsetItem charstringsRef) { // create an FDArray key OutputList.addLast(fdarrayRef); - OutputList.addLast(new UInt8Item((char)12)); - OutputList.addLast(new UInt8Item((char)36)); + OutputList.addLast(new UInt8Item((char) 12)); + OutputList.addLast(new UInt8Item((char) 36)); // create an FDSelect key OutputList.addLast(fdselectRef); - OutputList.addLast(new UInt8Item((char)12)); - OutputList.addLast(new UInt8Item((char)37)); + OutputList.addLast(new UInt8Item((char) 12)); + OutputList.addLast(new UInt8Item((char) 37)); // create an charset key OutputList.addLast(charsetRef); - OutputList.addLast(new UInt8Item((char)15)); + OutputList.addLast(new UInt8Item((char) 15)); // create a CharStrings key OutputList.addLast(charstringsRef); - OutputList.addLast(new UInt8Item((char)17)); + OutputList.addLast(new UInt8Item((char) 17)); } - + /** - * Function takes the original string item and adds the new strings - * to accommodate the CID rules + * Function takes the original string item and adds the new strings to accommodate the CID rules + * * @param Font the font */ - protected void CreateNewStringIndex(int Font) - { - String fdFontName = fonts[Font].name+"-OneRange"; - if (fdFontName.length() > 127) - fdFontName = fdFontName.substring(0,127); - String extraStrings = "Adobe"+"Identity"+fdFontName; - - int origStringsLen = stringOffsets[stringOffsets.length-1] - - stringOffsets[0]; - int stringsBaseOffset = stringOffsets[0]-1; - + protected void CreateNewStringIndex(int Font) { + String fdFontName = fonts[Font].name + "-OneRange"; + if (fdFontName.length() > 127) { + fdFontName = fdFontName.substring(0, 127); + } + String extraStrings = "Adobe" + "Identity" + fdFontName; + + int origStringsLen = stringOffsets[stringOffsets.length - 1] + - stringOffsets[0]; + int stringsBaseOffset = stringOffsets[0] - 1; + byte stringsIndexOffSize; - if (origStringsLen+extraStrings.length() <= 0xff) stringsIndexOffSize = 1; - else if (origStringsLen+extraStrings.length() <= 0xffff) stringsIndexOffSize = 2; - else if (origStringsLen+extraStrings.length() <= 0xffffff) stringsIndexOffSize = 3; - else stringsIndexOffSize = 4; - - OutputList.addLast(new UInt16Item((char)((stringOffsets.length-1)+3))); // count - OutputList.addLast(new UInt8Item((char)stringsIndexOffSize)); // offSize - for (int stringOffset : stringOffsets) + if (origStringsLen + extraStrings.length() <= 0xff) { + stringsIndexOffSize = 1; + } else if (origStringsLen + extraStrings.length() <= 0xffff) { + stringsIndexOffSize = 2; + } else if (origStringsLen + extraStrings.length() <= 0xffffff) { + stringsIndexOffSize = 3; + } else { + stringsIndexOffSize = 4; + } + + OutputList.addLast(new UInt16Item((char) ((stringOffsets.length - 1) + 3))); // count + OutputList.addLast(new UInt8Item((char) stringsIndexOffSize)); // offSize + for (int stringOffset : stringOffsets) { OutputList.addLast(new IndexOffsetItem(stringsIndexOffSize, stringOffset - stringsBaseOffset)); - int currentStringsOffset = stringOffsets[stringOffsets.length-1] - - stringsBaseOffset; + } + int currentStringsOffset = stringOffsets[stringOffsets.length - 1] + - stringsBaseOffset; //l.addLast(new IndexOffsetItem(stringsIndexOffSize,currentStringsOffset)); currentStringsOffset += "Adobe".length(); - OutputList.addLast(new IndexOffsetItem(stringsIndexOffSize,currentStringsOffset)); + OutputList.addLast(new IndexOffsetItem(stringsIndexOffSize, currentStringsOffset)); currentStringsOffset += "Identity".length(); - OutputList.addLast(new IndexOffsetItem(stringsIndexOffSize,currentStringsOffset)); + OutputList.addLast(new IndexOffsetItem(stringsIndexOffSize, currentStringsOffset)); currentStringsOffset += fdFontName.length(); - OutputList.addLast(new IndexOffsetItem(stringsIndexOffSize,currentStringsOffset)); - - OutputList.addLast(new RangeItem(buf,stringOffsets[0],origStringsLen)); + OutputList.addLast(new IndexOffsetItem(stringsIndexOffSize, currentStringsOffset)); + + OutputList.addLast(new RangeItem(buf, stringOffsets[0], origStringsLen)); OutputList.addLast(new StringItem(extraStrings)); } - + /** - * Function creates new FDSelect for non-CID fonts. - * The FDSelect built uses a single range for all glyphs + * Function creates new FDSelect for non-CID fonts. The FDSelect built uses a single range for all glyphs + * * @param fdselectRef OffsetItem for the FDSelect - * @param nglyphs the number of glyphs in the font + * @param nglyphs the number of glyphs in the font */ - protected void CreateFDSelect(OffsetItem fdselectRef,int nglyphs) - { + protected void CreateFDSelect(OffsetItem fdselectRef, int nglyphs) { OutputList.addLast(new MarkerItem(fdselectRef)); - OutputList.addLast(new UInt8Item((char)3)); // format identifier - OutputList.addLast(new UInt16Item((char)1)); // nRanges - - OutputList.addLast(new UInt16Item((char)0)); // Range[0].firstGlyph - OutputList.addLast(new UInt8Item((char)0)); // Range[0].fd - - OutputList.addLast(new UInt16Item((char)nglyphs)); // sentinel + OutputList.addLast(new UInt8Item((char) 3)); // format identifier + OutputList.addLast(new UInt16Item((char) 1)); // nRanges + + OutputList.addLast(new UInt16Item((char) 0)); // Range[0].firstGlyph + OutputList.addLast(new UInt8Item((char) 0)); // Range[0].fd + + OutputList.addLast(new UInt16Item((char) nglyphs)); // sentinel } /** - * Function creates new CharSet for non-CID fonts. - * The CharSet built uses a single range for all glyphs + * Function creates new CharSet for non-CID fonts. The CharSet built uses a single range for all glyphs + * * @param charsetRef OffsetItem for the CharSet - * @param nglyphs the number of glyphs in the font + * @param nglyphs the number of glyphs in the font */ - protected void CreateCharset(OffsetItem charsetRef,int nglyphs) - { + protected void CreateCharset(OffsetItem charsetRef, int nglyphs) { OutputList.addLast(new MarkerItem(charsetRef)); - OutputList.addLast(new UInt8Item((char)2)); // format identifier - OutputList.addLast(new UInt16Item((char)1)); // first glyph in range (ignore .notdef) - OutputList.addLast(new UInt16Item((char)(nglyphs-1))); // nLeft + OutputList.addLast(new UInt8Item((char) 2)); // format identifier + OutputList.addLast(new UInt16Item((char) 1)); // first glyph in range (ignore .notdef) + OutputList.addLast(new UInt16Item((char) (nglyphs - 1))); // nLeft } - + /** - * Function creates new FDArray for non-CID fonts. - * The FDArray built has only the "Private" operator that points to the font's - * original private dict + * Function creates new FDArray for non-CID fonts. The FDArray built has only the "Private" operator that points to + * the font's original private dict + * * @param fdarrayRef OffsetItem for the FDArray * @param privateRef OffsetItem for the Private Dict - * @param Font the font + * @param Font the font */ - protected void CreateFDArray(OffsetItem fdarrayRef,OffsetItem privateRef,int Font) - { + protected void CreateFDArray(OffsetItem fdarrayRef, OffsetItem privateRef, int Font) { OutputList.addLast(new MarkerItem(fdarrayRef)); // Build the header (count=offsize=first=1) - BuildIndexHeader(1,1,1); - + BuildIndexHeader(1, 1, 1); + // Mark OffsetItem privateIndex1Ref = new IndexOffsetItem(1); OutputList.addLast(privateIndex1Ref); @@ -1388,66 +1401,64 @@ protected void CreateFDArray(OffsetItem fdarrayRef,OffsetItem privateRef,int Fon // Origianl size int NewSize = fonts[Font].privateLength; // Calc the original size of the Subr offset in the private - int OrgSubrsOffsetSize = CalcSubrOffsetSize(fonts[Font].privateOffset,fonts[Font].privateLength); + int OrgSubrsOffsetSize = CalcSubrOffsetSize(fonts[Font].privateOffset, fonts[Font].privateLength); // Increase the ptivate's size - if (OrgSubrsOffsetSize != 0) - NewSize += 5-OrgSubrsOffsetSize; + if (OrgSubrsOffsetSize != 0) { + NewSize += 5 - OrgSubrsOffsetSize; + } OutputList.addLast(new DictNumberItem(NewSize)); OutputList.addLast(privateRef); - OutputList.addLast(new UInt8Item((char)18)); // Private - - OutputList.addLast(new IndexMarkerItem(privateIndex1Ref,privateBase)); + OutputList.addLast(new UInt8Item((char) 18)); // Private + + OutputList.addLast(new IndexMarkerItem(privateIndex1Ref, privateBase)); } - + /** * Function reconstructs the FDArray, PrivateDict and LSubr for CID fonts + * * @param Font the font */ - void Reconstruct(int Font) - { + void Reconstruct(int Font) { // Init for later use - OffsetItem[] fdPrivate = new DictOffsetItem[fonts[Font].FDArrayOffsets.length-1]; - IndexBaseItem[] fdPrivateBase = new IndexBaseItem[fonts[Font].fdprivateOffsets.length]; + OffsetItem[] fdPrivate = new DictOffsetItem[fonts[Font].FDArrayOffsets.length - 1]; + IndexBaseItem[] fdPrivateBase = new IndexBaseItem[fonts[Font].fdprivateOffsets.length]; OffsetItem[] fdSubrs = new DictOffsetItem[fonts[Font].fdprivateOffsets.length]; // Reconstruct each type - ReconstructFDArray(Font,fdPrivate); - ReconstructPrivateDict(Font,fdPrivate,fdPrivateBase,fdSubrs); - ReconstructPrivateSubrs(Font,fdPrivateBase,fdSubrs); + ReconstructFDArray(Font, fdPrivate); + ReconstructPrivateDict(Font, fdPrivate, fdPrivateBase, fdSubrs); + ReconstructPrivateSubrs(Font, fdPrivateBase, fdSubrs); } /** * Function subsets the FDArray and builds the new one with new offsets - * @param Font The font + * + * @param Font The font * @param fdPrivate OffsetItem Array (one for each FDArray) */ - void ReconstructFDArray(int Font,OffsetItem[] fdPrivate) - { + void ReconstructFDArray(int Font, OffsetItem[] fdPrivate) { // Build the header of the index - BuildIndexHeader(fonts[Font].FDArrayCount,fonts[Font].FDArrayOffsize,1); + BuildIndexHeader(fonts[Font].FDArrayCount, fonts[Font].FDArrayOffsize, 1); // For each offset create an Offset Item - OffsetItem[] fdOffsets = new IndexOffsetItem[fonts[Font].FDArrayOffsets.length-1]; - for (int i=0;i= 0) - { - OutputList.addLast(new SubrMarkerItem(fdSubrs[i],fdPrivateBase[i])); - OutputList.addLast(new RangeItem(new RandomAccessFileOrArray(NewLSubrsIndex[i]),0,NewLSubrsIndex[i].length)); + if (fdSubrs[i] != null && fonts[Font].PrivateSubrsOffset[i] >= 0) { + OutputList.addLast(new SubrMarkerItem(fdSubrs[i], fdPrivateBase[i])); + OutputList.addLast( + new RangeItem(new RandomAccessFileOrArray(NewLSubrsIndex[i]), 0, NewLSubrsIndex[i].length)); } } } /** - * Calculates how many byte it took to write the offset for the subrs in a specific - * private dict. + * Calculates how many byte it took to write the offset for the subrs in a specific private dict. + * * @param Offset The Offset for the private dict - * @param Size The size of the private dict + * @param Size The size of the private dict * @return The size of the offset of the subrs in the private dict */ - int CalcSubrOffsetSize(int Offset,int Size) - { + int CalcSubrOffsetSize(int Offset, int Size) { // Set the size to 0 int OffsetSize = 0; // Go to the beginning of the private dict seek(Offset); // Go until the end of the private dict - while (getPosition() < Offset+Size) - { + while (getPosition() < Offset + Size) { int p1 = getPosition(); getDictItem(); int p2 = getPosition(); // When reached to the subrs offset if (Objects.equals(key, "Subrs")) { // The Offsize (minus the subrs key) - OffsetSize = p2-p1-1; + OffsetSize = p2 - p1 - 1; } // All other keys are ignored } // return the size return OffsetSize; } - + /** * Function computes the size of an index + * * @param indexOffset The offset for the computed index * @return The size of the index */ - protected int countEntireIndexRange(int indexOffset) - { + protected int countEntireIndexRange(int indexOffset) { // Go to the beginning of the index seek(indexOffset); // Read the count field int count = getCard16(); // If count==0 -> size=2 - if (count==0) + if (count == 0) { return 2; - else - { + } else { // Read the offsize field int indexOffSize = getCard8(); // Go to the last element of the offset array - seek(indexOffset+2+1+count*indexOffSize); + seek(indexOffset + 2 + 1 + count * indexOffSize); // The size of the object array is the value of the last element-1 - int size = getOffset(indexOffSize)-1; + int size = getOffset(indexOffSize) - 1; // Return the size of the entire index - return 2+1+(count+1)*indexOffSize+size; + return 2 + 1 + (count + 1) * indexOffSize + size; } } - + /** - * The function creates a private dict for a font that was not CID - * All the keys are copied as is except for the subrs key + * The function creates a private dict for a font that was not CID All the keys are copied as is except for the + * subrs key + * * @param Font the font - * @param Subr The OffsetItem for the subrs of the private + * @param Subr The OffsetItem for the subrs of the private */ - void CreateNonCIDPrivate(int Font,OffsetItem Subr) - { + void CreateNonCIDPrivate(int Font, OffsetItem Subr) { // Go to the beginning of the private dict and read until the end seek(fonts[Font].privateOffset); - while (getPosition() < fonts[Font].privateOffset+fonts[Font].privateLength) - { + while (getPosition() < fonts[Font].privateOffset + fonts[Font].privateLength) { int p1 = getPosition(); getDictItem(); int p2 = getPosition(); @@ -1621,28 +1630,29 @@ void CreateNonCIDPrivate(int Font,OffsetItem Subr) // use marker for offset and write operator number if (Objects.equals(key, "Subrs")) { OutputList.addLast(Subr); - OutputList.addLast(new UInt8Item((char)19)); // Subrs + OutputList.addLast(new UInt8Item((char) 19)); // Subrs } // Else copy the entire range - else - OutputList.addLast(new RangeItem(buf,p1,p2-p1)); + else { + OutputList.addLast(new RangeItem(buf, p1, p2 - p1)); + } } } - + /** - * the function marks the beginning of the subrs index and adds the subsetted subrs - * index to the output list. - * @param Font the font + * the function marks the beginning of the subrs index and adds the subsetted subrs index to the output list. + * + * @param Font the font * @param PrivateBase IndexBaseItem for the private that's referencing to the subrs - * @param Subrs OffsetItem for the subrs + * @param Subrs OffsetItem for the subrs */ - void CreateNonCIDSubrs(int Font,IndexBaseItem PrivateBase,OffsetItem Subrs) - { + void CreateNonCIDSubrs(int Font, IndexBaseItem PrivateBase, OffsetItem Subrs) { // Mark the beginning of the Subrs index - OutputList.addLast(new SubrMarkerItem(Subrs,PrivateBase)); + OutputList.addLast(new SubrMarkerItem(Subrs, PrivateBase)); // Put the subsetted new subrs index if (NewSubrsIndexNonCID != null) { - OutputList.addLast(new RangeItem(new RandomAccessFileOrArray(NewSubrsIndexNonCID), 0, NewSubrsIndexNonCID.length)); + OutputList.addLast( + new RangeItem(new RandomAccessFileOrArray(NewSubrsIndexNonCID), 0, NewSubrsIndexNonCID.length)); } - } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/CJKFont.java b/openpdf/src/main/java/com/lowagie/text/pdf/CJKFont.java index a43a6dfff..53ee004b3 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/CJKFont.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/CJKFont.java @@ -51,7 +51,6 @@ import com.lowagie.text.DocumentException; import com.lowagie.text.error_messages.MessageLocalization; - import java.io.IOException; import java.io.InputStream; import java.util.Enumeration; @@ -63,11 +62,12 @@ /** * Creates a CJK font compatible with the fonts in the Adobe Asian font Pack. - * + * * @author Paulo Soares (psoares@consiste.pt) */ class CJKFont extends BaseFont { + /** * The encoding used in the PDF document for CJK fonts */ @@ -79,17 +79,22 @@ class CJKFont extends BaseFont { static Properties cjkFonts = new Properties(); static Properties cjkEncodings = new Properties(); - Hashtable allCMaps = new Hashtable<>(); static ConcurrentHashMap> allFonts = new ConcurrentHashMap<>( 500, 0.85f, 64); private static boolean propertiesLoaded = false; private static Object initLock = new Object(); - - /** The font name */ + Hashtable allCMaps = new Hashtable<>(); + /** + * The font name + */ private String fontName; - /** The style modifier */ + /** + * The style modifier + */ private String style = ""; - /** The CMap name associated with this font */ + /** + * The CMap name associated with this font + */ private String CMap; private boolean cidDirect = false; @@ -100,42 +105,13 @@ class CJKFont extends BaseFont { private HashMap fontDesc; private boolean vertical = false; - private static void loadProperties() { - if (propertiesLoaded) { - return; - } - synchronized (initLock) { - if (propertiesLoaded) { - return; - } - try { - InputStream is = getResourceStream(RESOURCE_PATH - + "cjkfonts.properties"); - cjkFonts.load(is); - is.close(); - is = getResourceStream(RESOURCE_PATH - + "cjkencodings.properties"); - cjkEncodings.load(is); - is.close(); - } catch (Exception e) { - cjkFonts = new Properties(); - cjkEncodings = new Properties(); - } - propertiesLoaded = true; - } - } - /** * Creates a CJK font. - * - * @param fontName - * the name of the font - * @param enc - * the encoding of the font - * @param emb - * always false. CJK font and not embedded - * @throws DocumentException - * on error + * + * @param fontName the name of the font + * @param enc the encoding of the font + * @param emb always false. CJK font and not embedded + * @throws DocumentException on error */ CJKFont(String fontName, String enc, boolean emb) throws DocumentException { loadProperties(); @@ -212,13 +188,36 @@ private static void loadProperties() { vMetrics = (IntHashtable) fontDesc.get("W2"); } + private static void loadProperties() { + if (propertiesLoaded) { + return; + } + synchronized (initLock) { + if (propertiesLoaded) { + return; + } + try { + InputStream is = getResourceStream(RESOURCE_PATH + + "cjkfonts.properties"); + cjkFonts.load(is); + is.close(); + is = getResourceStream(RESOURCE_PATH + + "cjkencodings.properties"); + cjkEncodings.load(is); + is.close(); + } catch (Exception e) { + cjkFonts = new Properties(); + cjkEncodings = new Properties(); + } + propertiesLoaded = true; + } + } + /** * Checks if its a valid CJK font. - * - * @param fontName - * the font name - * @param enc - * the encoding + * + * @param fontName the font name + * @param enc the encoding * @return true if it is CJK font */ public static boolean isCJKFont(String fontName, String enc) { @@ -228,11 +227,217 @@ public static boolean isCJKFont(String fontName, String enc) { && (enc.equals("Identity-H") || enc.equals("Identity-V") || encodings.contains("_" + enc + "_")); } + static char[] readCMap(String name) { + try { + name = name + ".cmap"; + InputStream is = getResourceStream(RESOURCE_PATH + name); + char[] c = new char[0x10000]; + for (int k = 0; k < 0x10000; ++k) { + c[k] = (char) ((is.read() << 8) + is.read()); + } + is.close(); + return c; + } catch (Exception e) { + // empty on purpose + } + return null; + } + + static IntHashtable createMetric(String s) { + IntHashtable h = new IntHashtable(); + StringTokenizer tk = new StringTokenizer(s); + while (tk.hasMoreTokens()) { + int n1 = Integer.parseInt(tk.nextToken()); + h.put(n1, Integer.parseInt(tk.nextToken())); + } + return h; + } + + static String convertToHCIDMetrics(int[] keys, IntHashtable h) { + if (keys.length == 0) { + return null; + } + int lastCid = 0; + int lastValue = 0; + int start; + for (start = 0; start < keys.length; ++start) { + lastCid = keys[start]; + lastValue = h.get(lastCid); + if (lastValue != 0) { + ++start; + break; + } + } + if (lastValue == 0) { + return null; + } + StringBuilder buf = new StringBuilder(); + buf.append('['); + buf.append(lastCid); + int state = FIRST; + for (int k = start; k < keys.length; ++k) { + int cid = keys[k]; + int value = h.get(cid); + if (value == 0) { + continue; + } + switch (state) { + case FIRST: { + if (cid == lastCid + 1 && value == lastValue) { + state = SERIAL; + } else if (cid == lastCid + 1) { + state = BRACKET; + buf.append('[').append(lastValue); + } else { + buf.append('[').append(lastValue).append(']').append(cid); + } + break; + } + case BRACKET: { + if (cid == lastCid + 1 && value == lastValue) { + state = SERIAL; + buf.append(']').append(lastCid); + } else if (cid == lastCid + 1) { + buf.append(' ').append(lastValue); + } else { + state = FIRST; + buf.append(' ').append(lastValue).append(']').append(cid); + } + break; + } + case SERIAL: { + if (cid != lastCid + 1 || value != lastValue) { + buf.append(' ').append(lastCid).append(' ') + .append(lastValue).append(' ').append(cid); + state = FIRST; + } + break; + } + } + lastValue = value; + lastCid = cid; + } + switch (state) { + case FIRST: { + buf.append('[').append(lastValue).append("]]"); + break; + } + case BRACKET: { + buf.append(' ').append(lastValue).append("]]"); + break; + } + case SERIAL: { + buf.append(' ').append(lastCid).append(' ').append(lastValue) + .append(']'); + break; + } + } + return buf.toString(); + } + + static String convertToVCIDMetrics(int[] keys, IntHashtable v, + IntHashtable h) { + if (keys.length == 0) { + return null; + } + int lastCid = 0; + int lastValue = 0; + int lastHValue = 0; + int start; + for (start = 0; start < keys.length; ++start) { + lastCid = keys[start]; + lastValue = v.get(lastCid); + if (lastValue != 0) { + ++start; + break; + } else { + lastHValue = h.get(lastCid); + } + } + if (lastValue == 0) { + return null; + } + if (lastHValue == 0) { + lastHValue = 1000; + } + StringBuilder buf = new StringBuilder(); + buf.append('['); + buf.append(lastCid); + int state = FIRST; + for (int k = start; k < keys.length; ++k) { + int cid = keys[k]; + int value = v.get(cid); + if (value == 0) { + continue; + } + int hValue = h.get(lastCid); + if (hValue == 0) { + hValue = 1000; + } + switch (state) { + case FIRST: { + if (cid == lastCid + 1 && value == lastValue + && hValue == lastHValue) { + state = SERIAL; + } else { + buf.append(' ').append(lastCid).append(' ') + .append(-lastValue).append(' ') + .append(lastHValue / 2).append(' ').append(V1Y) + .append(' ').append(cid); + } + break; + } + case SERIAL: { + if (cid != lastCid + 1 || value != lastValue + || hValue != lastHValue) { + buf.append(' ').append(lastCid).append(' ') + .append(-lastValue).append(' ') + .append(lastHValue / 2).append(' ').append(V1Y) + .append(' ').append(cid); + state = FIRST; + } + break; + } + } + lastValue = value; + lastCid = cid; + lastHValue = hValue; + } + buf.append(' ').append(lastCid).append(' ').append(-lastValue) + .append(' ').append(lastHValue / 2).append(' ').append(V1Y) + .append(" ]"); + return buf.toString(); + } + + static HashMap readFontProperties(String name) { + try { + name += ".properties"; + InputStream is = getResourceStream(RESOURCE_PATH + name); + Properties p = new Properties(); + p.load(is); + is.close(); + IntHashtable W = createMetric(p.getProperty("W")); + p.remove("W"); + IntHashtable W2 = createMetric(p.getProperty("W2")); + p.remove("W2"); + HashMap map = new HashMap<>(); + for (Enumeration e = p.keys(); e.hasMoreElements(); ) { + Object obj = e.nextElement(); + map.put(obj, p.getProperty((String) obj)); + } + map.put("W", W); + map.put("W2", W2); + return map; + } catch (Exception e) { + // empty on purpose + } + return null; + } + /** * Gets the width of a char in normalized 1000 units. - * - * @param char1 - * the unicode char to get the width of + * + * @param char1 the unicode char to get the width of * @return the width in normalized 1000 units */ @Override @@ -374,9 +579,8 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) } /** - * You can't get the FontStream of a CJK font (CJK fonts are never - * embedded), so this method always returns null. - * + * You can't get the FontStream of a CJK font (CJK fonts are never embedded), so this method always returns null. + * * @return null * @since 2.1.3 */ @@ -403,38 +607,36 @@ private float getBBox(int idx) { * Gets the font parameter identified by key. Valid values for * key are ASCENT, CAPHEIGHT, * DESCENT and ITALICANGLE. - * - * @param key - * the parameter to be extracted - * @param fontSize - * the font size in points + * + * @param key the parameter to be extracted + * @param fontSize the font size in points * @return the parameter in points */ @Override public float getFontDescriptor(int key, float fontSize) { switch (key) { - case AWT_ASCENT: - case ASCENT: - return getDescNumber("Ascent") * fontSize / 1000; - case CAPHEIGHT: - return getDescNumber("CapHeight") * fontSize / 1000; - case AWT_DESCENT: - case DESCENT: - return getDescNumber("Descent") * fontSize / 1000; - case ITALICANGLE: - return getDescNumber("ItalicAngle"); - case BBOXLLX: - return fontSize * getBBox(0) / 1000; - case BBOXLLY: - return fontSize * getBBox(1) / 1000; - case BBOXURX: - return fontSize * getBBox(2) / 1000; - case BBOXURY: - return fontSize * getBBox(3) / 1000; - case AWT_LEADING: - return 0; - case AWT_MAXADVANCE: - return fontSize * (getBBox(2) - getBBox(0)) / 1000; + case AWT_ASCENT: + case ASCENT: + return getDescNumber("Ascent") * fontSize / 1000; + case CAPHEIGHT: + return getDescNumber("CapHeight") * fontSize / 1000; + case AWT_DESCENT: + case DESCENT: + return getDescNumber("Descent") * fontSize / 1000; + case ITALICANGLE: + return getDescNumber("ItalicAngle"); + case BBOXLLX: + return fontSize * getBBox(0) / 1000; + case BBOXLLY: + return fontSize * getBBox(1) / 1000; + case BBOXURX: + return fontSize * getBBox(2) / 1000; + case BBOXURY: + return fontSize * getBBox(3) / 1000; + case AWT_LEADING: + return 0; + case AWT_MAXADVANCE: + return fontSize * (getBBox(2) - getBBox(0)) / 1000; } return 0; } @@ -445,43 +647,48 @@ public String getPostscriptFontName() { } /** - * Gets the full name of the font. If it is a True Type font each array - * element will have {Platform ID, Platform Encoding ID, Language ID, font - * name}. The interpretation of this values can be found in the Open Type - * specification, chapter 2, in the 'name' table.
      - * For the other fonts the array has a single element with {"", "", "", font - * name}. - * + * Sets the font name that will appear in the pdf font dictionary. Use with care as it can easily make a font + * unreadable if not embedded. + * + * @param name the new font name + */ + @Override + public void setPostscriptFontName(String name) { + fontName = name; + } + + /** + * Gets the full name of the font. If it is a True Type font each array element will have {Platform ID, Platform + * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type + * specification, chapter 2, in the 'name' table.
      For the other fonts the array has a single element with {"", + * "", "", font name}. + * * @return the full name of the font */ @Override public String[][] getFullFontName() { - return new String[][] { { "", "", "", fontName } }; + return new String[][]{{"", "", "", fontName}}; } /** - * Gets all the entries of the names-table. If it is a True Type font each - * array element will have {Name ID, Platform ID, Platform Encoding ID, - * Language ID, font name}. The interpretation of this values can be found - * in the Open Type specification, chapter 2, in the 'name' table.
      - * For the other fonts the array has a single element with {"4", "", "", "", - * font name}. - * + * Gets all the entries of the names-table. If it is a True Type font each array element will have {Name ID, + * Platform ID, Platform Encoding ID, Language ID, font name}. The interpretation of this values can be found in the + * Open Type specification, chapter 2, in the 'name' table.
      For the other fonts the array has a single element + * with {"4", "", "", "", font name}. + * * @return the full name of the font */ @Override public String[][] getAllNameEntries() { - return new String[][] { { "4", "", "", "", fontName } }; + return new String[][]{{"4", "", "", "", fontName}}; } /** - * Gets the family name of the font. If it is a True Type font each array - * element will have {Platform ID, Platform Encoding ID, Language ID, font - * name}. The interpretation of this values can be found in the Open Type - * specification, chapter 2, in the 'name' table.
      - * For the other fonts the array has a single element with {"", "", "", font - * name}. - * + * Gets the family name of the font. If it is a True Type font each array element will have {Platform ID, Platform + * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type + * specification, chapter 2, in the 'name' table.
      For the other fonts the array has a single element with {"", + * "", "", font name}. + * * @return the family name of the font */ @Override @@ -489,213 +696,6 @@ public String[][] getFamilyFontName() { return getFullFontName(); } - static char[] readCMap(String name) { - try { - name = name + ".cmap"; - InputStream is = getResourceStream(RESOURCE_PATH + name); - char[] c = new char[0x10000]; - for (int k = 0; k < 0x10000; ++k) { - c[k] = (char) ((is.read() << 8) + is.read()); - } - is.close(); - return c; - } catch (Exception e) { - // empty on purpose - } - return null; - } - - static IntHashtable createMetric(String s) { - IntHashtable h = new IntHashtable(); - StringTokenizer tk = new StringTokenizer(s); - while (tk.hasMoreTokens()) { - int n1 = Integer.parseInt(tk.nextToken()); - h.put(n1, Integer.parseInt(tk.nextToken())); - } - return h; - } - - static String convertToHCIDMetrics(int[] keys, IntHashtable h) { - if (keys.length == 0) { - return null; - } - int lastCid = 0; - int lastValue = 0; - int start; - for (start = 0; start < keys.length; ++start) { - lastCid = keys[start]; - lastValue = h.get(lastCid); - if (lastValue != 0) { - ++start; - break; - } - } - if (lastValue == 0) { - return null; - } - StringBuilder buf = new StringBuilder(); - buf.append('['); - buf.append(lastCid); - int state = FIRST; - for (int k = start; k < keys.length; ++k) { - int cid = keys[k]; - int value = h.get(cid); - if (value == 0) { - continue; - } - switch (state) { - case FIRST: { - if (cid == lastCid + 1 && value == lastValue) { - state = SERIAL; - } else if (cid == lastCid + 1) { - state = BRACKET; - buf.append('[').append(lastValue); - } else { - buf.append('[').append(lastValue).append(']').append(cid); - } - break; - } - case BRACKET: { - if (cid == lastCid + 1 && value == lastValue) { - state = SERIAL; - buf.append(']').append(lastCid); - } else if (cid == lastCid + 1) { - buf.append(' ').append(lastValue); - } else { - state = FIRST; - buf.append(' ').append(lastValue).append(']').append(cid); - } - break; - } - case SERIAL: { - if (cid != lastCid + 1 || value != lastValue) { - buf.append(' ').append(lastCid).append(' ') - .append(lastValue).append(' ').append(cid); - state = FIRST; - } - break; - } - } - lastValue = value; - lastCid = cid; - } - switch (state) { - case FIRST: { - buf.append('[').append(lastValue).append("]]"); - break; - } - case BRACKET: { - buf.append(' ').append(lastValue).append("]]"); - break; - } - case SERIAL: { - buf.append(' ').append(lastCid).append(' ').append(lastValue) - .append(']'); - break; - } - } - return buf.toString(); - } - - static String convertToVCIDMetrics(int[] keys, IntHashtable v, - IntHashtable h) { - if (keys.length == 0) { - return null; - } - int lastCid = 0; - int lastValue = 0; - int lastHValue = 0; - int start; - for (start = 0; start < keys.length; ++start) { - lastCid = keys[start]; - lastValue = v.get(lastCid); - if (lastValue != 0) { - ++start; - break; - } else { - lastHValue = h.get(lastCid); - } - } - if (lastValue == 0) { - return null; - } - if (lastHValue == 0) { - lastHValue = 1000; - } - StringBuilder buf = new StringBuilder(); - buf.append('['); - buf.append(lastCid); - int state = FIRST; - for (int k = start; k < keys.length; ++k) { - int cid = keys[k]; - int value = v.get(cid); - if (value == 0) { - continue; - } - int hValue = h.get(lastCid); - if (hValue == 0) { - hValue = 1000; - } - switch (state) { - case FIRST: { - if (cid == lastCid + 1 && value == lastValue - && hValue == lastHValue) { - state = SERIAL; - } else { - buf.append(' ').append(lastCid).append(' ') - .append(-lastValue).append(' ') - .append(lastHValue / 2).append(' ').append(V1Y) - .append(' ').append(cid); - } - break; - } - case SERIAL: { - if (cid != lastCid + 1 || value != lastValue - || hValue != lastHValue) { - buf.append(' ').append(lastCid).append(' ') - .append(-lastValue).append(' ') - .append(lastHValue / 2).append(' ').append(V1Y) - .append(' ').append(cid); - state = FIRST; - } - break; - } - } - lastValue = value; - lastCid = cid; - lastHValue = hValue; - } - buf.append(' ').append(lastCid).append(' ').append(-lastValue) - .append(' ').append(lastHValue / 2).append(' ').append(V1Y) - .append(" ]"); - return buf.toString(); - } - - static HashMap readFontProperties(String name) { - try { - name += ".properties"; - InputStream is = getResourceStream(RESOURCE_PATH + name); - Properties p = new Properties(); - p.load(is); - is.close(); - IntHashtable W = createMetric(p.getProperty("W")); - p.remove("W"); - IntHashtable W2 = createMetric(p.getProperty("W2")); - p.remove("W2"); - HashMap map = new HashMap<>(); - for (Enumeration e = p.keys(); e.hasMoreElements();) { - Object obj = e.nextElement(); - map.put(obj, p.getProperty((String) obj)); - } - map.put("W", W); - map.put("W2", W2); - return map; - } catch (Exception e) { - // empty on purpose - } - return null; - } - @Override public int getUnicodeEquivalent(int c) { if (cidDirect) { @@ -714,7 +714,7 @@ public int getCidCode(int c) { /** * Checks if the font has any kerning pairs. - * + * * @return always false */ @Override @@ -724,11 +724,10 @@ public boolean hasKernPairs() { /** * Checks if a character exists in this font. - * - * @param c - * the character to check + * + * @param c the character to check * @return true if the character has a glyph, - * false otherwise + * false otherwise */ @Override public boolean charExists(int c) { @@ -740,31 +739,17 @@ public boolean charExists(int c) { /** * Sets the character advance. - * - * @param c - * the character - * @param advance - * the character advance normalized to 1000 units + * + * @param c the character + * @param advance the character advance normalized to 1000 units * @return true if the advance was set, false - * otherwise. Will always return false + * otherwise. Will always return false */ @Override public boolean setCharAdvance(int c, int advance) { return false; } - /** - * Sets the font name that will appear in the pdf font dictionary. Use with - * care as it can easily make a font unreadable if not embedded. - * - * @param name - * the new font name - */ - @Override - public void setPostscriptFontName(String name) { - fontName = name; - } - @Override public boolean setKerning(int char1, int char2, int kern) { return false; diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/CMYKColor.java b/openpdf/src/main/java/com/lowagie/text/pdf/CMYKColor.java index ca7cd4d27..a25d3b8ea 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/CMYKColor.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/CMYKColor.java @@ -50,8 +50,7 @@ package com.lowagie.text.pdf; /** - * - * @author Paulo Soares (psoares@consiste.pt) + * @author Paulo Soares (psoares@consiste.pt) */ public class CMYKColor extends ExtendedColor { @@ -63,33 +62,39 @@ public class CMYKColor extends ExtendedColor { /** * Constructs a CMYK Color based on 4 color values (values are integers from 0 to 255). - * @param intCyan cyan value + * + * @param intCyan cyan value * @param intMagenta magenta value - * @param intYellow yellow value - * @param intBlack black value + * @param intYellow yellow value + * @param intBlack black value */ public CMYKColor(int intCyan, int intMagenta, int intYellow, int intBlack) { - this(normalize(intCyan) / MAX_INT_COLOR_VALUE, normalize(intMagenta) / MAX_INT_COLOR_VALUE, normalize(intYellow) / MAX_INT_COLOR_VALUE, normalize(intBlack) / MAX_INT_COLOR_VALUE); + this(normalize(intCyan) / MAX_INT_COLOR_VALUE, normalize(intMagenta) / MAX_INT_COLOR_VALUE, + normalize(intYellow) / MAX_INT_COLOR_VALUE, normalize(intBlack) / MAX_INT_COLOR_VALUE); } /** * Constructs a CMYK Color based on 4 color values (values are integers from 0 to 255). - * @param intCyan cyan value + * + * @param intCyan cyan value * @param intMagenta magenta value - * @param intYellow yellow value - * @param intBlack black value - * @param intAlpha alpha value + * @param intYellow yellow value + * @param intBlack black value + * @param intAlpha alpha value */ public CMYKColor(int intCyan, int intMagenta, int intYellow, int intBlack, int intAlpha) { - this(normalize(intCyan) / MAX_INT_COLOR_VALUE, normalize(intMagenta) / MAX_INT_COLOR_VALUE, normalize(intYellow) / MAX_INT_COLOR_VALUE, normalize(intBlack) / MAX_INT_COLOR_VALUE, normalize(intAlpha) / MAX_INT_COLOR_VALUE); + this(normalize(intCyan) / MAX_INT_COLOR_VALUE, normalize(intMagenta) / MAX_INT_COLOR_VALUE, + normalize(intYellow) / MAX_INT_COLOR_VALUE, normalize(intBlack) / MAX_INT_COLOR_VALUE, + normalize(intAlpha) / MAX_INT_COLOR_VALUE); } /** * Construct a CMYK Color. - * @param floatCyan cyan value + * + * @param floatCyan cyan value * @param floatMagenta magenta value - * @param floatYellow yellow value - * @param floatBlack black value + * @param floatYellow yellow value + * @param floatBlack black value */ public CMYKColor(float floatCyan, float floatMagenta, float floatYellow, float floatBlack) { this(floatCyan, floatMagenta, floatYellow, floatBlack, MAX_FLOAT_COLOR_VALUE); @@ -97,11 +102,12 @@ public CMYKColor(float floatCyan, float floatMagenta, float floatYellow, float f /** * Construct a CMYK Color. - * @param floatCyan cyan value + * + * @param floatCyan cyan value * @param floatMagenta magenta value - * @param floatYellow yellow value - * @param floatBlack black value - * @param floatAlpha alpha value + * @param floatYellow yellow value + * @param floatBlack black value + * @param floatAlpha alpha value */ public CMYKColor(float floatCyan, float floatMagenta, float floatYellow, float floatBlack, float floatAlpha) { super(TYPE_CMYK, MAX_FLOAT_COLOR_VALUE - normalize(floatCyan) - normalize(floatBlack), @@ -142,12 +148,14 @@ public float getBlack() { } public boolean equals(Object obj) { - if (!(obj instanceof CMYKColor)) + if (!(obj instanceof CMYKColor)) { return false; - CMYKColor c2 = (CMYKColor)obj; - return (cyan == c2.cyan && magenta == c2.magenta && yellow == c2.yellow && black == c2.black && getAlpha() == c2.getAlpha()); + } + CMYKColor c2 = (CMYKColor) obj; + return (cyan == c2.cyan && magenta == c2.magenta && yellow == c2.yellow && black == c2.black + && getAlpha() == c2.getAlpha()); } - + public int hashCode() { return Float.floatToIntBits(cyan) ^ Float.floatToIntBits(magenta) @@ -156,5 +164,5 @@ public int hashCode() { ^ Float.floatToIntBits(getAlpha()) ; } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/CMapAwareDocumentFont.java b/openpdf/src/main/java/com/lowagie/text/pdf/CMapAwareDocumentFont.java index bae199a29..db5695518 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/CMapAwareDocumentFont.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/CMapAwareDocumentFont.java @@ -49,39 +49,39 @@ import com.lowagie.text.error_messages.MessageLocalization; import com.lowagie.text.pdf.fonts.cmaps.CMap; import com.lowagie.text.pdf.fonts.cmaps.CMapParser; - import java.io.ByteArrayInputStream; import java.io.IOException; /** * Implementation of DocumentFont used while parsing PDF streams. - * + * * @since 2.1.4 */ public class CMapAwareDocumentFont extends DocumentFont { - /** The font dictionary. */ + /** + * The font dictionary. + */ private PdfDictionary fontDic; - /** the width of a space for this font, in normalized 1000 point units */ + /** + * the width of a space for this font, in normalized 1000 point units + */ private int spaceWidth; /** - * The CMap constructed from the ToUnicode map from the font's dictionary, - * if present. This CMap transforms CID values into unicode equivalent + * The CMap constructed from the ToUnicode map from the font's dictionary, if present. This CMap transforms CID + * values into unicode equivalent */ private CMap toUnicodeCmap; /** - * Mapping between CID code (single byte only for now) and unicode - * equivalent as derived by the font's encoding. Only needed if the - * ToUnicode CMap is not provided. + * Mapping between CID code (single byte only for now) and unicode equivalent as derived by the font's encoding. + * Only needed if the ToUnicode CMap is not provided. */ private char[] cidbyte2uni; /** - * Creates an instance of a CMapAwareFont based on an indirect reference to - * a font. - * - * @param refFont - * the indirect reference to a font + * Creates an instance of a CMapAwareFont based on an indirect reference to a font. + * + * @param refFont the indirect reference to a font */ public CMapAwareDocumentFont(PRIndirectReference refFont) { super(refFont); @@ -101,7 +101,7 @@ public CMapAwareDocumentFont(PRIndirectReference refFont) { /** * Parses the ToUnicode entry, if present, and constructs a CMap for it - * + * * @since 2.1.7 */ private void processToUnicode() { @@ -124,9 +124,8 @@ private void processToUnicode() { } /** - * Inverts DocumentFont's uni2byte mapping to obtain a cid-to-unicode - * mapping based on the font's encoding - * + * Inverts DocumentFont's uni2byte mapping to obtain a cid-to-unicode mapping based on the font's encoding + * * @since 2.1.7 */ private void processUni2Byte() { @@ -153,11 +152,10 @@ private void processUni2Byte() { } /** - * For all widths of all glyphs, compute the average width in normalized - * 1000 point units. This is used to give some meaningful width in cases - * where we need an average font width (such as if the width of a space - * isn't specified by a given font) - * + * For all widths of all glyphs, compute the average width in normalized 1000 point units. This is used to give some + * meaningful width in cases where we need an average font width (such as if the width of a space isn't specified by + * a given font) + * * @return the average width of all non-zero width glyphs in the font */ private int computeAverageWidth() { @@ -173,9 +171,8 @@ private int computeAverageWidth() { } /** - * @since 2.1.5 Override to allow special handling for fonts that don't - * specify width of space character * @see com.lowagie.text.pdf.DocumentFont#getWidth(int) + * @since 2.1.5 Override to allow special handling for fonts that don't specify width of space character */ @Override public int getWidth(int char1) { @@ -187,17 +184,12 @@ public int getWidth(int char1) { } /** - * Decodes a single CID (represented by one or two bytes) to a unicode - * String. - * - * @param bytes - * the bytes making up the character code to convert - * @param offset - * an offset - * @param len - * a length - * @return a String containing the encoded form of the input bytes using the - * font's encoding. + * Decodes a single CID (represented by one or two bytes) to a unicode String. + * + * @param bytes the bytes making up the character code to convert + * @param offset an offset + * @param len a length + * @return a String containing the encoded form of the input bytes using the font's encoding. */ private String decodeSingleCID(byte[] bytes, int offset, int len) { if (hasUnicodeCMAP()) { @@ -231,25 +223,25 @@ public boolean hasTwoByteUnicodeCMAP() { } /** - * Decodes a string of bytes (encoded in the font's encoding) into a unicode string. This will - * use the ToUnicode map of the font, if available, otherwise it uses the font's encoding + * Decodes a string of bytes (encoded in the font's encoding) into a unicode string. This will use the ToUnicode map + * of the font, if available, otherwise it uses the font's encoding * * @param cidbytes the bytes that need to be decoded - * @param len length - * @param offset offset + * @param len length + * @param offset offset * @return the unicode String that results from decoding * @since 2.1.7 */ public String decode(byte[] cidbytes, - final int offset, - final int len) { + final int offset, + final int len) { StringBuilder sb = new StringBuilder(); // it's a shame we can't make this - // StringBuilder - for (int i = offset; i < offset + len; i++ ) { + // StringBuilder + for (int i = offset; i < offset + len; i++) { String rslt = decodeSingleCID(cidbytes, i, 1); if (rslt == null && i + 1 < offset + len) { rslt = decodeSingleCID(cidbytes, i, 2); - i++ ; + i++; } if (rslt != null) { sb.append(rslt); @@ -260,23 +252,21 @@ public String decode(byte[] cidbytes, } /** - * Decodes a string. This is a normal Java string, but if the range of character values - * exceeds the range of the encoding for the font, this will fail. Required since we need to - * process the characters of strings, and we can't determine the character boundaries in - * advance, especially because of Identity-H encoded fonts which have two-byte character - * indexes. - * - * PdfString is used to hold character code points, even though the bytes may not map 1-1. It's - * not possible to change the encoding once a string is in place. - * - * @param chars - * the Characters that need to be decoded + * Decodes a string. This is a normal Java string, but if the range of character values exceeds the range of the + * encoding for the font, this will fail. Required since we need to process the characters of strings, and we can't + * determine the character boundaries in advance, especially because of Identity-H encoded fonts which have two-byte + * character indexes. + *

      + * PdfString is used to hold character code points, even though the bytes may not map 1-1. It's not possible to + * change the encoding once a string is in place. + * + * @param chars the Characters that need to be decoded * @return the unicode String that results from decoding * @since 2.1. */ public String decode(String chars) { StringBuilder sb = new StringBuilder(); // it's a shame we can't make this - // StringBuilder + // StringBuilder for (char c : chars.toCharArray()) { String result = decode(c); if (result != null) { @@ -288,8 +278,9 @@ public String decode(String chars) { } /** - * Decode single character whose value represents a code point in this font. Will fail if - * the characters do not have values that correspond to valid code points for the font. + * Decode single character whose value represents a code point in this font. Will fail if the characters do not + * have values that correspond to valid code points for the font. + * * @param c character to decode * @return Unicode character corresponding to the remapped code according to the font's current encoding. * @throws Error if the the character is out of range diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/ColorDetails.java b/openpdf/src/main/java/com/lowagie/text/pdf/ColorDetails.java index ffa9016f2..25e895c35 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/ColorDetails.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/ColorDetails.java @@ -49,26 +49,32 @@ package com.lowagie.text.pdf; -/** Each spotcolor in the document will have an instance of this class +/** + * Each spotcolor in the document will have an instance of this class * * @author Phillip Pan (phillip@formstar.com) */ class ColorDetails { - /** The indirect reference to this color + /** + * The indirect reference to this color */ PdfIndirectReference indirectReference; - /** The color name that appears in the document body stream + /** + * The color name that appears in the document body stream */ PdfName colorName; - /** The color + /** + * The color */ PdfSpotColor spotcolor; - /** Each spot color used in a document has an instance of this class. - * @param colorName the color name + /** + * Each spot color used in a document has an instance of this class. + * + * @param colorName the color name * @param indirectReference the indirect reference to the font - * @param scolor the PDfSpotColor + * @param scolor the PDfSpotColor */ ColorDetails(PdfName colorName, PdfIndirectReference indirectReference, PdfSpotColor scolor) { this.colorName = colorName; @@ -76,21 +82,27 @@ class ColorDetails { this.spotcolor = scolor; } - /** Gets the indirect reference to this color. + /** + * Gets the indirect reference to this color. + * * @return the indirect reference to this color */ PdfIndirectReference getIndirectReference() { return indirectReference; } - /** Gets the color name as it appears in the document body. + /** + * Gets the color name as it appears in the document body. + * * @return the color name */ PdfName getColorName() { return colorName; } - /** Gets the SpotColor object. + /** + * Gets the SpotColor object. + * * @return the PdfSpotColor */ PdfObject getSpotColor(PdfWriter writer) { diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/ColumnText.java b/openpdf/src/main/java/com/lowagie/text/pdf/ColumnText.java index 65bc6a2c4..f66ec4b5c 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/ColumnText.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/ColumnText.java @@ -60,249 +60,408 @@ import com.lowagie.text.SimpleTable; import com.lowagie.text.error_messages.MessageLocalization; import com.lowagie.text.pdf.draw.DrawInterface; - import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Stack; /** - * Formats text in a columnwise form. The text is bound - * on the left and on the right by a sequence of lines. This allows the column - * to have any shape, not only rectangular. - *

      - * Several parameters can be set like the first paragraph line indent and - * extra space between paragraphs. - *

      - * A call to the method go will return one of the following - * situations: the column ended or the text ended. - *

      + * Formats text in a columnwise form. The text is bound on the left and on the right by a sequence of lines. This allows + * the column to have any shape, not only rectangular. + *

      + * Several parameters can be set like the first paragraph line indent and extra space between paragraphs. + *

      + * A call to the method go will return one of the following situations: the column ended or the text + * ended. + *

      * I the column ended, a new column definition can be loaded with the method * setColumns and the method go can be called again. - *

      - * If the text ended, more text can be loaded with addText - * and the method go can be called again.
      - * The only limitation is that one or more complete paragraphs must be loaded - * each time. - *

      + *

      + * If the text ended, more text can be loaded with addText and the method go can be called + * again.
      The only limitation is that one or more complete paragraphs must be loaded each time. + *

      * Full bidirectional reordering is supported. If the run direction is * PdfWriter.RUN_DIRECTION_RTL the meaning of the horizontal * alignments and margins is mirrored. + * * @author Paulo Soares (psoares@consiste.pt) */ public class ColumnText { - /** Eliminate the arabic vowels */ + + /** + * Eliminate the arabic vowels + */ public static final int AR_NOVOWEL = ArabicLigaturizer.ar_novowel; - /** Compose the tashkeel in the ligatures. */ + /** + * Compose the tashkeel in the ligatures. + */ public static final int AR_COMPOSEDTASHKEEL = ArabicLigaturizer.ar_composedtashkeel; - /** Do some extra double ligatures. */ + /** + * Do some extra double ligatures. + */ public static final int AR_LIG = ArabicLigaturizer.ar_lig; /** * Digit shaping option: Replace European digits (U+0030...U+0039) by Arabic-Indic digits. */ public static final int DIGITS_EN2AN = ArabicLigaturizer.DIGITS_EN2AN; - + /** * Digit shaping option: Replace Arabic-Indic digits by European digits (U+0030...U+0039). */ public static final int DIGITS_AN2EN = ArabicLigaturizer.DIGITS_AN2EN; - + /** - * Digit shaping option: - * Replace European digits (U+0030...U+0039) by Arabic-Indic digits - * if the most recent strongly directional character - * is an Arabic letter (its Bidi direction value is RIGHT_TO_LEFT_ARABIC). - * The initial state at the start of the text is assumed to be not an Arabic, - * letter, so European digits at the start of the text will not change. - * Compare to DIGITS_ALEN2AN_INIT_AL. + * Digit shaping option: Replace European digits (U+0030...U+0039) by Arabic-Indic digits if the most recent + * strongly directional character is an Arabic letter (its Bidi direction value is RIGHT_TO_LEFT_ARABIC). The + * initial state at the start of the text is assumed to be not an Arabic, letter, so European digits at the start of + * the text will not change. Compare to DIGITS_ALEN2AN_INIT_AL. */ public static final int DIGITS_EN2AN_INIT_LR = ArabicLigaturizer.DIGITS_EN2AN_INIT_LR; - + /** - * Digit shaping option: - * Replace European digits (U+0030...U+0039) by Arabic-Indic digits - * if the most recent strongly directional character - * is an Arabic letter (its Bidi direction value is RIGHT_TO_LEFT_ARABIC). - * The initial state at the start of the text is assumed to be an Arabic, - * letter, so European digits at the start of the text will change. - * Compare to DIGITS_ALEN2AN_INT_LR. + * Digit shaping option: Replace European digits (U+0030...U+0039) by Arabic-Indic digits if the most recent + * strongly directional character is an Arabic letter (its Bidi direction value is RIGHT_TO_LEFT_ARABIC). The + * initial state at the start of the text is assumed to be an Arabic, letter, so European digits at the start of the + * text will change. Compare to DIGITS_ALEN2AN_INT_LR. */ public static final int DIGITS_EN2AN_INIT_AL = ArabicLigaturizer.DIGITS_EN2AN_INIT_AL; - + /** * Digit type option: Use Arabic-Indic digits (U+0660...U+0669). */ public static final int DIGIT_TYPE_AN = ArabicLigaturizer.DIGIT_TYPE_AN; - + /** * Digit type option: Use Eastern (Extended) Arabic-Indic digits (U+06f0...U+06f9). */ public static final int DIGIT_TYPE_AN_EXTENDED = ArabicLigaturizer.DIGIT_TYPE_AN_EXTENDED; - - protected int runDirection = PdfWriter.RUN_DIRECTION_DEFAULT; - - /** the space char ratio */ + /** + * the space char ratio + */ public static final float GLOBAL_SPACE_CHAR_RATIO = 0; - - /** Initial value of the status. */ + /** + * Initial value of the status. + */ public static final int START_COLUMN = 0; - - /** Signals that there is no more text available. */ + /** + * Signals that there is no more text available. + */ public static final int NO_MORE_TEXT = 1; - - /** Signals that there is no more column. */ + /** + * Signals that there is no more column. + */ public static final int NO_MORE_COLUMN = 2; - - /** The column is valid. */ + /** + * The column is valid. + */ protected static final int LINE_STATUS_OK = 0; - - /** The line is out the column limits. */ + /** + * The line is out the column limits. + */ protected static final int LINE_STATUS_OFFLIMITS = 1; - - /** The line cannot fit this column position. */ + /** + * The line cannot fit this column position. + */ protected static final int LINE_STATUS_NOLINE = 2; - - /** Upper bound of the column. */ + protected int runDirection = PdfWriter.RUN_DIRECTION_DEFAULT; + /** + * Upper bound of the column. + */ protected float maxY; - - /** Lower bound of the column. */ + + /** + * Lower bound of the column. + */ protected float minY; - + protected float leftX; - + protected float rightX; - - /** The column alignment. Default is left alignment. */ + + /** + * The column alignment. Default is left alignment. + */ protected int alignment = Element.ALIGN_LEFT; - - /** The left column bound. */ + + /** + * The left column bound. + */ protected List leftWall; - - /** The right column bound. */ + + /** + * The right column bound. + */ protected List rightWall; - - /** The chunks that form the text. */ + + /** + * The chunks that form the text. + */ // protected ArrayList chunks = new ArrayList(); protected BidiLine bidiLine; - - /** The current y line location. Text will be written at this line minus the leading. */ + + /** + * The current y line location. Text will be written at this line minus the leading. + */ protected float yLine; - - /** The leading for the current line. */ + + /** + * The leading for the current line. + */ protected float currentLeading = 16; - - /** The fixed text leading. */ + + /** + * The fixed text leading. + */ protected float fixedLeading = 16; - - /** The text leading that is multiplied by the biggest font size in the line. */ + + /** + * The text leading that is multiplied by the biggest font size in the line. + */ protected float multipliedLeading = 0; - - /** The PdfContent where the text will be written to. */ + + /** + * The PdfContent where the text will be written to. + */ protected PdfContentByte canvas; - + protected PdfContentByte[] canvases; - - /** The line status when trying to fit a line to a column. */ + + /** + * The line status when trying to fit a line to a column. + */ protected int lineStatus; - - /** The first paragraph line indent. */ + + /** + * The first paragraph line indent. + */ protected float indent = 0; - - /** The following paragraph lines indent. */ + + /** + * The following paragraph lines indent. + */ protected float followingIndent = 0; - - /** The right paragraph lines indent. */ + + /** + * The right paragraph lines indent. + */ protected float rightIndent = 0; - - /** The extra space between paragraphs. */ + + /** + * The extra space between paragraphs. + */ protected float extraParagraphSpace = 0; - - /** The width of the line when the column is defined as a simple rectangle. */ + + /** + * The width of the line when the column is defined as a simple rectangle. + */ protected float rectangularWidth = -1; - + protected boolean rectangularMode = false; - /** Holds value of property spaceCharRatio. */ + protected float descender; + protected boolean composite = false; + protected ColumnText compositeColumn; + protected LinkedList compositeElements; + protected int listIdx = 0; + protected Phrase waitPhrase; + /** + * Holds value of property spaceCharRatio. + */ private float spaceCharRatio = GLOBAL_SPACE_CHAR_RATIO; - private boolean lastWasNewline = true; - - /** Holds value of property linesWritten. */ + /** + * Holds value of property linesWritten. + */ private int linesWritten; - private float firstLineY; private boolean firstLineYDone = false; - - /** Holds value of property arabicOptions. */ + /** + * Holds value of property arabicOptions. + */ private int arabicOptions = 0; - - protected float descender; - - protected boolean composite = false; - - protected ColumnText compositeColumn; - - protected LinkedList compositeElements; - - protected int listIdx = 0; - private boolean splittedRow; - - protected Phrase waitPhrase; - - /** if true, first line height is adjusted so that the max ascender touches the top */ + /** + * if true, first line height is adjusted so that the max ascender touches the top + */ private boolean useAscender = false; - /** Holds value of property filledWidth. */ + /** + * Holds value of property filledWidth. + */ private float filledWidth; private boolean adjustFirstLine = true; - + /** * Creates a ColumnText. - * - * @param canvas the place where the text will be written to. Can - * be a template. + * + * @param canvas the place where the text will be written to. Can be a template. */ public ColumnText(PdfContentByte canvas) { this.canvas = canvas; } - + /** * Creates an independent duplicated of the instance org. - * + * * @param org the original ColumnText * @return the duplicated - */ + */ public static ColumnText duplicate(ColumnText org) { ColumnText ct = new ColumnText(null); ct.setACopy(org); return ct; } - + + /** + * Gets the width that the line will occupy after writing. Only the width of the first line is returned. + * + * @param phrase the Phrase containing the line + * @param runDirection the run direction + * @param arabicOptions the options for the arabic shaping + * @return the width of the line + */ + public static float getWidth(Phrase phrase, int runDirection, int arabicOptions) { + ColumnText ct = new ColumnText(null); + ct.addText(phrase); + ct.addWaitingPhrase(); + PdfLine line = ct.bidiLine.processLine(0, 20000, Element.ALIGN_LEFT, runDirection, arabicOptions); + if (line == null) { + return 0; + } else { + return 20000 - line.widthLeft(); + } + } + + /** + * Gets the width that the line will occupy after writing. Only the width of the first line is returned. + * + * @param phrase the Phrase containing the line + * @return the width of the line + */ + public static float getWidth(Phrase phrase) { + return getWidth(phrase, PdfWriter.RUN_DIRECTION_NO_BIDI, 0); + } + + /** + * Shows a line of text. Only the first line is written. + * + * @param canvas where the text is to be written to + * @param alignment the alignment. It is not influenced by the run direction + * @param phrase the Phrase with the text + * @param x the x reference position + * @param y the y reference position + * @param rotation the rotation to be applied in degrees counterclockwise + * @param runDirection the run direction + * @param arabicOptions the options for the arabic shaping + */ + public static void showTextAligned(PdfContentByte canvas, int alignment, Phrase phrase, float x, float y, + float rotation, int runDirection, int arabicOptions) { + if (alignment != Element.ALIGN_LEFT && alignment != Element.ALIGN_CENTER + && alignment != Element.ALIGN_RIGHT) { + alignment = Element.ALIGN_LEFT; + } + canvas.saveState(); + ColumnText ct = new ColumnText(canvas); + float lly = -1; + float ury = 2; + float llx; + float urx; + switch (alignment) { + case Element.ALIGN_LEFT: + llx = 0; + urx = 20000; + break; + case Element.ALIGN_RIGHT: + llx = -20000; + urx = 0; + break; + default: + llx = -20000; + urx = 20000; + break; + } + if (rotation == 0) { + llx += x; + lly += y; + urx += x; + ury += y; + } else { + double alpha = rotation * Math.PI / 180.0; + float cos = (float) Math.cos(alpha); + float sin = (float) Math.sin(alpha); + canvas.concatCTM(cos, sin, -sin, cos, x, y); + } + ct.setSimpleColumn(phrase, llx, lly, urx, ury, 2, alignment); + if (runDirection == PdfWriter.RUN_DIRECTION_RTL) { + if (alignment == Element.ALIGN_LEFT) { + alignment = Element.ALIGN_RIGHT; + } else if (alignment == Element.ALIGN_RIGHT) { + alignment = Element.ALIGN_LEFT; + } + } + ct.setAlignment(alignment); + ct.setArabicOptions(arabicOptions); + ct.setRunDirection(runDirection); + try { + ct.go(); + } catch (DocumentException e) { + throw new ExceptionConverter(e); + } + canvas.restoreState(); + } + + /** + * Shows a line of text. Only the first line is written. + * + * @param canvas where the text is to be written to + * @param alignment the alignment + * @param phrase the Phrase with the text + * @param x the x reference position + * @param y the y reference position + * @param rotation the rotation to be applied in degrees counterclockwise + */ + public static void showTextAligned(PdfContentByte canvas, int alignment, Phrase phrase, float x, float y, + float rotation) { + showTextAligned(canvas, alignment, phrase, x, y, rotation, PdfWriter.RUN_DIRECTION_NO_BIDI, 0); + } + + /** + * Checks the status variable and looks if there's still some text. + * + * @param status statues variable + * @return true if there's still some text else false + */ + public static boolean hasMoreText(int status) { + return (status & ColumnText.NO_MORE_TEXT) == 0; + } + /** * Makes this instance an independent copy of org. - * + * * @param org the original ColumnText * @return itself - */ + */ public ColumnText setACopy(ColumnText org) { setSimpleVars(org); - if (org.bidiLine != null) + if (org.bidiLine != null) { bidiLine = new BidiLine(org.bidiLine); + } return this; } - + protected void setSimpleVars(ColumnText org) { maxY = org.maxY; minY = org.minY; alignment = org.alignment; leftWall = null; - if (org.leftWall != null) + if (org.leftWall != null) { leftWall = new ArrayList<>(org.leftWall); + } rightWall = null; - if (org.rightWall != null) + if (org.rightWall != null) { rightWall = new ArrayList<>(org.rightWall); + } yLine = org.yLine; currentLeading = org.currentLeading; fixedLeading = org.fixedLeading; @@ -327,11 +486,12 @@ protected void setSimpleVars(ColumnText org) { if (org.composite) { compositeElements = new LinkedList<>(org.compositeElements); if (splittedRow) { - PdfPTable table = (PdfPTable)compositeElements.getFirst(); + PdfPTable table = (PdfPTable) compositeElements.getFirst(); compositeElements.set(0, new PdfPTable(table)); } - if (org.compositeColumn != null) + if (org.compositeColumn != null) { compositeColumn = duplicate(org.compositeColumn); + } } listIdx = org.listIdx; firstLineY = org.firstLineY; @@ -343,7 +503,7 @@ protected void setSimpleVars(ColumnText org) { filledWidth = org.filledWidth; adjustFirstLine = org.adjustFirstLine; } - + private void addWaitingPhrase() { if (bidiLine == null && waitPhrase != null) { bidiLine = new BidiLine(); @@ -353,16 +513,17 @@ private void addWaitingPhrase() { waitPhrase = null; } } - + /** - * Adds a Phrase to the current text array. - * Will not have any effect if addElement() was called before. - * + * Adds a Phrase to the current text array. Will not have any effect if addElement() was called + * before. + * * @param phrase the text */ public void addText(Phrase phrase) { - if (phrase == null || composite) + if (phrase == null || composite) { return; + } addWaitingPhrase(); if (bidiLine == null) { waitPhrase = phrase; @@ -372,11 +533,11 @@ public void addText(Phrase phrase) { bidiLine.addChunk(new PdfChunk((Chunk) o, null)); } } - + /** - * Replaces the current text array with this Phrase. - * Anything added previously with addElement() is lost. - * + * Replaces the current text array with this Phrase. Anything added previously with addElement() is + * lost. + * * @param phrase the text */ public void setText(Phrase phrase) { @@ -388,41 +549,42 @@ public void setText(Phrase phrase) { splittedRow = false; waitPhrase = phrase; } - + /** - * Adds a Chunk to the current text array. - * Will not have any effect if addElement() was called before. - * + * Adds a Chunk to the current text array. Will not have any effect if addElement() was called before. + * * @param chunk the text */ public void addText(Chunk chunk) { - if (chunk == null || composite) + if (chunk == null || composite) { return; + } addText(new Phrase(chunk)); } - + /** * Adds an element. Elements supported are Paragraph, * List, PdfPTable, Image and * Graphic. *

      * It removes all the text placed with addText(). - * + * * @param element the Element - */ + */ public void addElement(Element element) { - if (element == null) + if (element == null) { return; + } if (element instanceof Image) { - Image img = (Image)element; + Image img = (Image) element; PdfPTable t = new PdfPTable(1); float w = img.getWidthPercentage(); if (w == 0) { t.setTotalWidth(img.getScaledWidth()); t.setLockedWidth(true); - } - else + } else { t.setWidthPercentage(w); + } t.setSpacingAfter(img.getSpacingAfter()); t.setSpacingBefore(img.getSpacingBefore()); switch (img.getAlignment()) { @@ -446,20 +608,20 @@ public void addElement(Element element) { element = t; } if (element.type() == Element.CHUNK) { - element = new Paragraph((Chunk)element); - } - else if (element.type() == Element.PHRASE) { - element = new Paragraph((Phrase)element); + element = new Paragraph((Chunk) element); + } else if (element.type() == Element.PHRASE) { + element = new Paragraph((Phrase) element); } if (element instanceof SimpleTable) { try { - element = ((SimpleTable)element).createPdfPTable(); + element = ((SimpleTable) element).createPdfPTable(); } catch (DocumentException e) { throw new IllegalArgumentException(MessageLocalization.getComposedMessage("element.not.allowed")); } - } - else if (element.type() != Element.PARAGRAPH && element.type() != Element.LIST && element.type() != Element.PTABLE && element.type() != Element.YMARK) + } else if (element.type() != Element.PARAGRAPH && element.type() != Element.LIST + && element.type() != Element.PTABLE && element.type() != Element.YMARK) { throw new IllegalArgumentException(MessageLocalization.getComposedMessage("element.not.allowed")); + } if (!composite) { composite = true; compositeElements = new LinkedList<>(); @@ -468,31 +630,31 @@ else if (element.type() != Element.PARAGRAPH && element.type() != Element.LIST & } compositeElements.add(element); } - + /** - * Converts a sequence of lines representing one of the column bounds into - * an internal format. + * Converts a sequence of lines representing one of the column bounds into an internal format. *

      - * Each array element will contain a float[4] representing - * the line x = ax + b. - * + * Each array element will contain a float[4] representing the line x = ax + b. + * * @param cLine the column array * @return the converted array */ protected List convertColumn(float[] cLine) { - if (cLine.length < 4) + if (cLine.length < 4) { throw new RuntimeException(MessageLocalization.getComposedMessage("no.valid.column.line.found")); + } List cc = new ArrayList<>(); for (int k = 0; k < cLine.length - 2; k += 2) { - if (cLine.length == k + 3){ + if (cLine.length == k + 3) { break; } float x1 = cLine[k]; float y1 = cLine[k + 1]; float x2 = cLine[k + 2]; float y2 = cLine[k + 3]; - if (y1 == y2) + if (y1 == y2) { continue; + } // x = ay + b float a = (x1 - x2) / (y1 - y2); float b = x1 - a * y1; @@ -505,15 +667,16 @@ protected List convertColumn(float[] cLine) { maxY = Math.max(maxY, r[1]); minY = Math.min(minY, r[0]); } - if (cc.isEmpty()) + if (cc.isEmpty()) { throw new RuntimeException(MessageLocalization.getComposedMessage("no.valid.column.line.found")); + } return cc; } - + /** - * Finds the intersection between the yLine and the column. It will - * set the lineStatus appropriately. - * + * Finds the intersection between the yLine and the column. It will set the lineStatus + * appropriately. + * * @param wall the column to intersect * @return the x coordinate of the intersection */ @@ -525,69 +688,75 @@ protected float findLimitsPoint(List wall) { } for (Object o : wall) { float[] r = (float[]) o; - if (yLine < r[0] || yLine > r[1]) + if (yLine < r[0] || yLine > r[1]) { continue; + } return r[2] * yLine + r[3]; } lineStatus = LINE_STATUS_NOLINE; return 0; } - + /** - * Finds the intersection between the yLine and the two - * column bounds. It will set the lineStatus appropriately. - * + * Finds the intersection between the yLine and the two column bounds. It will set the + * lineStatus appropriately. + * * @return a float[2]with the x coordinates of the intersection */ protected float[] findLimitsOneLine() { float x1 = findLimitsPoint(leftWall); - if (lineStatus == LINE_STATUS_OFFLIMITS || lineStatus == LINE_STATUS_NOLINE) + if (lineStatus == LINE_STATUS_OFFLIMITS || lineStatus == LINE_STATUS_NOLINE) { return null; + } float x2 = findLimitsPoint(rightWall); - if (lineStatus == LINE_STATUS_NOLINE) + if (lineStatus == LINE_STATUS_NOLINE) { return null; + } return new float[]{x1, x2}; } - + /** - * Finds the intersection between the yLine, - * the yLine-leadingand the two column bounds. + * Finds the intersection between the yLine, the yLine-leadingand the two column bounds. * It will set the lineStatus appropriately. - * + * * @return a float[4]with the x coordinates of the intersection */ protected float[] findLimitsTwoLines() { boolean repeat = false; - for (;;) { - if (repeat && currentLeading == 0) + for (; ; ) { + if (repeat && currentLeading == 0) { return null; + } repeat = true; float[] x1 = findLimitsOneLine(); - if (lineStatus == LINE_STATUS_OFFLIMITS) + if (lineStatus == LINE_STATUS_OFFLIMITS) { return null; + } yLine -= currentLeading; if (lineStatus == LINE_STATUS_NOLINE) { continue; } float[] x2 = findLimitsOneLine(); - if (lineStatus == LINE_STATUS_OFFLIMITS) + if (lineStatus == LINE_STATUS_OFFLIMITS) { return null; + } if (lineStatus == LINE_STATUS_NOLINE) { yLine -= currentLeading; continue; } - if (x1[0] >= x2[1] || x2[0] >= x1[1]) + if (x1[0] >= x2[1] || x2[0] >= x1[1]) { continue; + } return new float[]{x1[0], x1[1], x2[0], x2[1]}; } } - + /** * Sets the columns bounds. Each column bound is described by a * float[] with the line points [x1,y1,x2,y2,...]. * The array must have at least 4 elements. - * - * @param leftLine the left column bound + * + * @param leftLine the left column bound * @param rightLine the right column bound */ public void setColumns(float[] leftLine, float[] rightLine) { @@ -599,31 +768,32 @@ public void setColumns(float[] leftLine, float[] rightLine) { rectangularWidth = -1; rectangularMode = false; } - + /** * Simplified method for rectangular columns. - * - * @param phrase a Phrase - * @param llx the lower left x corner - * @param lly the lower left y corner - * @param urx the upper right x corner - * @param ury the upper right y corner - * @param leading the leading + * + * @param phrase a Phrase + * @param llx the lower left x corner + * @param lly the lower left y corner + * @param urx the upper right x corner + * @param ury the upper right y corner + * @param leading the leading * @param alignment the column alignment */ - public void setSimpleColumn(Phrase phrase, float llx, float lly, float urx, float ury, float leading, int alignment) { + public void setSimpleColumn(Phrase phrase, float llx, float lly, float urx, float ury, float leading, + int alignment) { addText(phrase); setSimpleColumn(llx, lly, urx, ury, leading, alignment); } - + /** * Simplified method for rectangular columns. - * - * @param llx the lower left x corner - * @param lly the lower left y corner - * @param urx the upper right x corner - * @param ury the upper right y corner - * @param leading the leading + * + * @param llx the lower left x corner + * @param lly the lower left y corner + * @param urx the upper right x corner + * @param ury the upper right y corner + * @param leading the leading * @param alignment the column alignment */ public void setSimpleColumn(float llx, float lly, float urx, float ury, float leading, int alignment) { @@ -631,10 +801,10 @@ public void setSimpleColumn(float llx, float lly, float urx, float ury, float le this.alignment = alignment; setSimpleColumn(llx, lly, urx, ury); } - + /** * Simplified method for rectangular columns. - * + * * @param llx lower-left-x * @param lly lower-left-y * @param urx upper-right-x @@ -647,169 +817,172 @@ public void setSimpleColumn(float llx, float lly, float urx, float ury) { rightX = Math.max(llx, urx); yLine = maxY; rectangularWidth = rightX - leftX; - if (rectangularWidth < 0) + if (rectangularWidth < 0) { rectangularWidth = 0; + } rectangularMode = true; } - - /** - * Sets the leading to fixed. - * - * @param leading the leading - */ - public void setLeading(float leading) { - fixedLeading = leading; - multipliedLeading = 0; - } - + /** - * Sets the leading fixed and variable. The resultant leading will be - * fixedLeading+multipliedLeading*maxFontSize where maxFontSize is the - * size of the biggest font in the line. - * - * @param fixedLeading the fixed leading + * Sets the leading fixed and variable. The resultant leading will be fixedLeading+multipliedLeading*maxFontSize + * where maxFontSize is the size of the biggest font in the line. + * + * @param fixedLeading the fixed leading * @param multipliedLeading the variable leading */ public void setLeading(float fixedLeading, float multipliedLeading) { this.fixedLeading = fixedLeading; this.multipliedLeading = multipliedLeading; } - + /** * Gets the fixed leading. - * + * * @return the leading */ public float getLeading() { return fixedLeading; } - + + /** + * Sets the leading to fixed. + * + * @param leading the leading + */ + public void setLeading(float leading) { + fixedLeading = leading; + multipliedLeading = 0; + } + /** * Gets the variable leading. - * + * * @return the leading */ public float getMultipliedLeading() { return multipliedLeading; } - + + /** + * Gets the yLine. + * + * @return the yLine + */ + public float getYLine() { + return yLine; + } + /** * Sets the yLine. The line will be written to yLine-leading. - * + * * @param yLine the yLine */ public void setYLine(float yLine) { this.yLine = yLine; } - + /** - * Gets the yLine. - * - * @return the yLine + * Gets the alignment. + * + * @return the alignment */ - public float getYLine() { - return yLine; + public int getAlignment() { + return alignment; } - + /** * Sets the alignment. - * + * * @param alignment the alignment */ public void setAlignment(int alignment) { this.alignment = alignment; } - + /** - * Gets the alignment. - * - * @return the alignment + * Gets the first paragraph line indent. + * + * @return the indent */ - public int getAlignment() { - return alignment; + public float getIndent() { + return indent; } - + /** * Sets the first paragraph line indent. - * + * * @param indent the indent */ public void setIndent(float indent) { this.indent = indent; lastWasNewline = true; } - + /** - * Gets the first paragraph line indent. - * + * Gets the following paragraph lines indent. + * * @return the indent */ - public float getIndent() { - return indent; + public float getFollowingIndent() { + return followingIndent; } - + /** * Sets the following paragraph lines indent. - * + * * @param indent the indent */ public void setFollowingIndent(float indent) { this.followingIndent = indent; lastWasNewline = true; } - + /** - * Gets the following paragraph lines indent. - * + * Gets the right paragraph lines indent. + * * @return the indent */ - public float getFollowingIndent() { - return followingIndent; + public float getRightIndent() { + return rightIndent; } - + /** * Sets the right paragraph lines indent. - * + * * @param indent the indent */ public void setRightIndent(float indent) { this.rightIndent = indent; lastWasNewline = true; } - - /** - * Gets the right paragraph lines indent. - * - * @return the indent - */ - public float getRightIndent() { - return rightIndent; - } - + /** * Outputs the lines to the document. It is equivalent to go(false). - * - * @return returns the result of the operation. It can be NO_MORE_TEXT - * and/or NO_MORE_COLUMN + * + * @return returns the result of the operation. It can be NO_MORE_TEXT and/or + * NO_MORE_COLUMN * @throws DocumentException on error */ public int go() throws DocumentException { return go(false); } - + /** * Outputs the lines to the document. The output can be simulated. + * * @param simulate true to simulate the writing to the document - * @return returns the result of the operation. It can be NO_MORE_TEXT - * and/or NO_MORE_COLUMN + * @return returns the result of the operation. It can be NO_MORE_TEXT and/or + * NO_MORE_COLUMN * @throws DocumentException on error */ public int go(boolean simulate) throws DocumentException { - if (composite) + if (composite) { return goComposite(simulate); + } addWaitingPhrase(); - if (bidiLine == null) + if (bidiLine == null) { return NO_MORE_TEXT; + } descender = 0; linesWritten = 0; boolean dirty = false; @@ -822,49 +995,55 @@ public int go(boolean simulate) throws DocumentException { PdfContentByte text = null; firstLineY = Float.NaN; int localRunDirection = PdfWriter.RUN_DIRECTION_NO_BIDI; - if (runDirection != PdfWriter.RUN_DIRECTION_DEFAULT) + if (runDirection != PdfWriter.RUN_DIRECTION_DEFAULT) { localRunDirection = runDirection; + } if (canvas != null) { graphics = canvas; pdf = canvas.getPdfDocument(); text = canvas.getDuplicate(); + } else if (!simulate) { + throw new NullPointerException(MessageLocalization.getComposedMessage( + "columntext.go.with.simulate.eq.eq.false.and.text.eq.eq.null")); } - else if (!simulate) - throw new NullPointerException(MessageLocalization.getComposedMessage("columntext.go.with.simulate.eq.eq.false.and.text.eq.eq.null")); if (!simulate) { - if (ratio == GLOBAL_SPACE_CHAR_RATIO) + if (ratio == GLOBAL_SPACE_CHAR_RATIO) { ratio = text.getPdfWriter().getSpaceCharRatio(); - else if (ratio < 0.001f) + } else if (ratio < 0.001f) { ratio = 0.001f; + } } float firstIndent = 0; PdfLine line; float x1; int status = 0; - while(true) { + while (true) { firstIndent = (lastWasNewline ? indent : followingIndent); // if (rectangularMode) { if (rectangularWidth <= firstIndent + rightIndent) { status = NO_MORE_COLUMN; - if (bidiLine.isEmpty()) + if (bidiLine.isEmpty()) { status |= NO_MORE_TEXT; + } break; } if (bidiLine.isEmpty()) { status = NO_MORE_TEXT; break; } - line = bidiLine.processLine(leftX, rectangularWidth - firstIndent - rightIndent, alignment, localRunDirection, arabicOptions); + line = bidiLine.processLine(leftX, rectangularWidth - firstIndent - rightIndent, alignment, + localRunDirection, arabicOptions); if (line == null) { status = NO_MORE_TEXT; break; } float[] maxSize = line.getMaxSize(); - if (isUseAscender() && Float.isNaN(firstLineY)) + if (isUseAscender() && Float.isNaN(firstLineY)) { currentLeading = line.getAscender(); - else + } else { currentLeading = Math.max(fixedLeading + maxSize[0] * multipliedLeading, maxSize[1]); - if (yLine > maxY || yLine - currentLeading < minY ) { + } + if (yLine > maxY || yLine - currentLeading < minY) { status = NO_MORE_COLUMN; bidiLine.restore(); break; @@ -874,52 +1053,55 @@ else if (ratio < 0.001f) text.beginText(); dirty = true; } - if (Float.isNaN(firstLineY)) + if (Float.isNaN(firstLineY)) { firstLineY = yLine; + } updateFilledWidth(rectangularWidth - line.widthLeft()); x1 = leftX; - } - else { - float yTemp = yLine; + } else { + float yTemp = yLine; float[] xx = findLimitsTwoLines(); - if (xx == null) { - status = NO_MORE_COLUMN; - if (bidiLine.isEmpty()) - status |= NO_MORE_TEXT; - yLine = yTemp; - break; - } - if (bidiLine.isEmpty()) { - status = NO_MORE_TEXT; - yLine = yTemp; - break; - } - x1 = Math.max(xx[0], xx[2]); - float x2 = Math.min(xx[1], xx[3]); - if (x2 - x1 <= firstIndent + rightIndent) - continue; - if (!simulate && !dirty) { - text.beginText(); - dirty = true; - } - line = bidiLine.processLine(x1, x2 - x1 - firstIndent - rightIndent, alignment, localRunDirection, arabicOptions); - if (line == null) { - status = NO_MORE_TEXT; - yLine = yTemp; - break; + if (xx == null) { + status = NO_MORE_COLUMN; + if (bidiLine.isEmpty()) { + status |= NO_MORE_TEXT; } + yLine = yTemp; + break; } - if (!simulate) { - currentValues[0] = currentFont; - text.setTextMatrix(x1 + (line.isRTL() ? rightIndent : firstIndent) + line.indentLeft(), yLine); - pdf.writeLineToContent(line, text, graphics, currentValues, ratio); - currentFont = (PdfFont)currentValues[0]; + if (bidiLine.isEmpty()) { + status = NO_MORE_TEXT; + yLine = yTemp; + break; + } + x1 = Math.max(xx[0], xx[2]); + float x2 = Math.min(xx[1], xx[3]); + if (x2 - x1 <= firstIndent + rightIndent) { + continue; + } + if (!simulate && !dirty) { + text.beginText(); + dirty = true; + } + line = bidiLine.processLine(x1, x2 - x1 - firstIndent - rightIndent, alignment, localRunDirection, + arabicOptions); + if (line == null) { + status = NO_MORE_TEXT; + yLine = yTemp; + break; } - lastWasNewline = line.isNewlineSplit(); - yLine -= line.isNewlineSplit() ? extraParagraphSpace : 0; - ++linesWritten; - descender = line.getDescender(); } + if (!simulate) { + currentValues[0] = currentFont; + text.setTextMatrix(x1 + (line.isRTL() ? rightIndent : firstIndent) + line.indentLeft(), yLine); + pdf.writeLineToContent(line, text, graphics, currentValues, ratio); + currentFont = (PdfFont) currentValues[0]; + } + lastWasNewline = line.isNewlineSplit(); + yLine -= line.isNewlineSplit() ? extraParagraphSpace : 0; + ++linesWritten; + descender = line.getDescender(); + } if (dirty) { text.endText(); if (canvas != null) { @@ -928,233 +1110,121 @@ else if (ratio < 0.001f) } return status; } - + /** * Sets the extra space between paragraphs. - * + * * @return the extra space between paragraphs */ public float getExtraParagraphSpace() { return extraParagraphSpace; } - + /** * Sets the extra space between paragraphs. - * + * * @param extraParagraphSpace the extra space between paragraphs */ public void setExtraParagraphSpace(float extraParagraphSpace) { this.extraParagraphSpace = extraParagraphSpace; } - + /** - * Clears the chunk array. - * A call to go() will always return NO_MORE_TEXT. + * Clears the chunk array. A call to go() will always return NO_MORE_TEXT. */ public void clearChunks() { - if (bidiLine != null) + if (bidiLine != null) { bidiLine.clearChunks(); + } } - + /** * Gets the space/character extra spacing ratio for fully justified text. * * @return the space/character extra spacing ratio - */ + */ public float getSpaceCharRatio() { return spaceCharRatio; } - - /** - * Sets the ratio between the extra word spacing and the extra character - * spacing when the text is fully justified. - * Extra word spacing will grow spaceCharRatio times more - * than extra character spacing. - * If the ratio is PdfWriter.NO_SPACE_CHAR_RATIO then the - * extra character spacing will be zero. - * + + /** + * Sets the ratio between the extra word spacing and the extra character spacing when the text is fully justified. + * Extra word spacing will grow spaceCharRatio times more than extra character spacing. If the ratio + * is + * PdfWriter.NO_SPACE_CHAR_RATIO then the extra character spacing will be zero. + * * @param spaceCharRatio the ratio between the extra word spacing and the extra character spacing */ public void setSpaceCharRatio(float spaceCharRatio) { this.spaceCharRatio = spaceCharRatio; } - /** - * Sets the run direction. - * - * @param runDirection the run direction - */ - public void setRunDirection(int runDirection) { - if (runDirection < PdfWriter.RUN_DIRECTION_DEFAULT || runDirection > PdfWriter.RUN_DIRECTION_RTL) - throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.run.direction.1", runDirection)); - this.runDirection = runDirection; - } - /** * Gets the run direction. - * + * * @return the run direction - */ + */ public int getRunDirection() { return runDirection; } - + + /** + * Sets the run direction. + * + * @param runDirection the run direction + */ + public void setRunDirection(int runDirection) { + if (runDirection < PdfWriter.RUN_DIRECTION_DEFAULT || runDirection > PdfWriter.RUN_DIRECTION_RTL) { + throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.run.direction.1", runDirection)); + } + this.runDirection = runDirection; + } + /** * Gets the number of lines written. - * + * * @return the number of lines written */ public int getLinesWritten() { return this.linesWritten; } - + /** * Gets the arabic shaping options. - * + * * @return the arabic shaping options */ public int getArabicOptions() { return this.arabicOptions; } - + /** - * Sets the arabic shaping options. The option can be AR_NOVOWEL, - * AR_COMPOSEDTASHKEEL and AR_LIG. - * + * Sets the arabic shaping options. The option can be AR_NOVOWEL, AR_COMPOSEDTASHKEEL and AR_LIG. + * * @param arabicOptions the arabic shaping options */ public void setArabicOptions(int arabicOptions) { this.arabicOptions = arabicOptions; } - + /** * Gets the biggest descender value of the last line written. - * + * * @return the biggest descender value of the last line written - */ + */ public float getDescender() { return descender; } - - /** - * Gets the width that the line will occupy after writing. - * Only the width of the first line is returned. - * - * @param phrase the Phrase containing the line - * @param runDirection the run direction - * @param arabicOptions the options for the arabic shaping - * @return the width of the line - */ - public static float getWidth(Phrase phrase, int runDirection, int arabicOptions) { - ColumnText ct = new ColumnText(null); - ct.addText(phrase); - ct.addWaitingPhrase(); - PdfLine line = ct.bidiLine.processLine(0, 20000, Element.ALIGN_LEFT, runDirection, arabicOptions); - if (line == null) - return 0; - else - return 20000 - line.widthLeft(); - } - - /** - * Gets the width that the line will occupy after writing. - * Only the width of the first line is returned. - * - * @param phrase the Phrase containing the line - * @return the width of the line - */ - public static float getWidth(Phrase phrase) { - return getWidth(phrase, PdfWriter.RUN_DIRECTION_NO_BIDI, 0); - } - - /** - * Shows a line of text. Only the first line is written. - * - * @param canvas where the text is to be written to - * @param alignment the alignment. It is not influenced by the run direction - * @param phrase the Phrase with the text - * @param x the x reference position - * @param y the y reference position - * @param rotation the rotation to be applied in degrees counterclockwise - * @param runDirection the run direction - * @param arabicOptions the options for the arabic shaping - */ - public static void showTextAligned(PdfContentByte canvas, int alignment, Phrase phrase, float x, float y, float rotation, int runDirection, int arabicOptions) { - if (alignment != Element.ALIGN_LEFT && alignment != Element.ALIGN_CENTER - && alignment != Element.ALIGN_RIGHT) - alignment = Element.ALIGN_LEFT; - canvas.saveState(); - ColumnText ct = new ColumnText(canvas); - float lly = -1; - float ury = 2; - float llx; - float urx; - switch (alignment) { - case Element.ALIGN_LEFT: - llx = 0; - urx = 20000; - break; - case Element.ALIGN_RIGHT: - llx = -20000; - urx = 0; - break; - default: - llx = -20000; - urx = 20000; - break; - } - if (rotation == 0) { - llx += x; - lly += y; - urx += x; - ury += y; - } - else { - double alpha = rotation * Math.PI / 180.0; - float cos = (float)Math.cos(alpha); - float sin = (float)Math.sin(alpha); - canvas.concatCTM(cos, sin, -sin, cos, x, y); - } - ct.setSimpleColumn(phrase, llx, lly, urx, ury, 2, alignment); - if (runDirection == PdfWriter.RUN_DIRECTION_RTL) { - if (alignment == Element.ALIGN_LEFT) - alignment = Element.ALIGN_RIGHT; - else if (alignment == Element.ALIGN_RIGHT) - alignment = Element.ALIGN_LEFT; - } - ct.setAlignment(alignment); - ct.setArabicOptions(arabicOptions); - ct.setRunDirection(runDirection); - try { - ct.go(); - } - catch (DocumentException e) { - throw new ExceptionConverter(e); - } - canvas.restoreState(); - } - - /** - * Shows a line of text. Only the first line is written. - * - * @param canvas where the text is to be written to - * @param alignment the alignment - * @param phrase the Phrase with the text - * @param x the x reference position - * @param y the y reference position - * @param rotation the rotation to be applied in degrees counterclockwise - */ - public static void showTextAligned(PdfContentByte canvas, int alignment, Phrase phrase, float x, float y, float rotation) { - showTextAligned(canvas, alignment, phrase, x, y, rotation, PdfWriter.RUN_DIRECTION_NO_BIDI, 0); - } protected int goComposite(boolean simulate) throws DocumentException { - if (!rectangularMode) - throw new DocumentException(MessageLocalization.getComposedMessage("irregular.columns.are.not.supported.in.composite.mode")); + if (!rectangularMode) { + throw new DocumentException( + MessageLocalization.getComposedMessage("irregular.columns.are.not.supported.in.composite.mode")); + } linesWritten = 0; descender = 0; boolean firstPass = adjustFirstLine; - + main_loop: while (true) { if (compositeElements.isEmpty()) { @@ -1162,7 +1232,7 @@ protected int goComposite(boolean simulate) throws DocumentException { } Element element = compositeElements.getFirst(); if (element.type() == Element.PARAGRAPH) { - Paragraph para = (Paragraph)element; + Paragraph para = (Paragraph) element; int status = 0; for (int keep = 0; keep < 2; ++keep) { float lastY = yLine; @@ -1176,7 +1246,9 @@ protected int goComposite(boolean simulate) throws DocumentException { compositeColumn.setFollowingIndent(para.getIndentationLeft()); compositeColumn.setRightIndent(para.getIndentationRight()); compositeColumn.setLeading(para.getLeading(), para.getMultipliedLeading()); - compositeColumn.setRunDirection(para.getRunDirection() == PdfWriter.RUN_DIRECTION_DEFAULT ? runDirection : para.getRunDirection()); + compositeColumn.setRunDirection( + para.getRunDirection() == PdfWriter.RUN_DIRECTION_DEFAULT ? runDirection + : para.getRunDirection()); compositeColumn.setArabicOptions(arabicOptions); compositeColumn.setSpaceCharRatio(spaceCharRatio); compositeColumn.addText(para); @@ -1200,8 +1272,9 @@ protected int goComposite(boolean simulate) throws DocumentException { yLine = lastY; return NO_MORE_COLUMN; } - if (simulate || !keepCandidate) + if (simulate || !keepCandidate) { break; + } if (keep == 0) { compositeColumn = null; yLine = lastY; @@ -1221,9 +1294,8 @@ protected int goComposite(boolean simulate) throws DocumentException { if ((status & NO_MORE_COLUMN) != 0) { return NO_MORE_COLUMN; } - } - else if (element.type() == Element.LIST) { - com.lowagie.text.List list = (com.lowagie.text.List)element; + } else if (element.type() == Element.LIST) { + com.lowagie.text.List list = (com.lowagie.text.List) element; java.util.List items = list.getItems(); ListItem item = null; float listIndentation = list.getIndentationLeft(); @@ -1233,14 +1305,14 @@ else if (element.type() == Element.LIST) { Object obj = items.get(k); if (obj instanceof ListItem) { if (count == listIdx) { - item = (ListItem)obj; + item = (ListItem) obj; break; + } else { + ++count; } - else ++count; - } - else if (obj instanceof com.lowagie.text.List) { + } else if (obj instanceof com.lowagie.text.List) { stack.push(new Object[]{list, k, listIndentation}); - list = (com.lowagie.text.List)obj; + list = (com.lowagie.text.List) obj; items = list.getItems(); listIndentation += list.getIndentationLeft(); k = -1; @@ -1249,7 +1321,7 @@ else if (obj instanceof com.lowagie.text.List) { if (k == items.size() - 1) { if (!stack.isEmpty()) { Object[] objs = stack.pop(); - list = (com.lowagie.text.List)objs[0]; + list = (com.lowagie.text.List) objs[0]; items = list.getItems(); k = (Integer) objs[1]; listIndentation = (Float) objs[2]; @@ -1269,12 +1341,15 @@ else if (obj instanceof com.lowagie.text.List) { compositeColumn = new ColumnText(canvas); compositeColumn.setUseAscender(firstPass && useAscender); compositeColumn.setAlignment(item.getAlignment()); - compositeColumn.setIndent(item.getIndentationLeft() + listIndentation + item.getFirstLineIndent()); + compositeColumn.setIndent( + item.getIndentationLeft() + listIndentation + item.getFirstLineIndent()); compositeColumn.setExtraParagraphSpace(item.getExtraParagraphSpace()); compositeColumn.setFollowingIndent(compositeColumn.getIndent()); compositeColumn.setRightIndent(item.getIndentationRight() + list.getIndentationRight()); compositeColumn.setLeading(item.getLeading(), item.getMultipliedLeading()); - compositeColumn.setRunDirection(item.getRunDirection() == PdfWriter.RUN_DIRECTION_DEFAULT ? runDirection : item.getRunDirection()); + compositeColumn.setRunDirection( + item.getRunDirection() == PdfWriter.RUN_DIRECTION_DEFAULT ? runDirection + : item.getRunDirection()); compositeColumn.setArabicOptions(arabicOptions); compositeColumn.setSpaceCharRatio(spaceCharRatio); compositeColumn.addText(item); @@ -1298,8 +1373,9 @@ else if (obj instanceof com.lowagie.text.List) { yLine = lastY; return NO_MORE_COLUMN; } - if (simulate || !keepCandidate) + if (simulate || !keepCandidate) { break; + } if (keep == 0) { compositeColumn = null; yLine = lastY; @@ -1312,13 +1388,15 @@ else if (obj instanceof com.lowagie.text.List) { if (!Float.isNaN(compositeColumn.firstLineY) && !compositeColumn.firstLineYDone) { if (!simulate && item != null) { int elementRunDirection; - if(item.getRunDirection() == PdfWriter.RUN_DIRECTION_NO_BIDI || item.getRunDirection() == PdfWriter.RUN_DIRECTION_DEFAULT){ + if (item.getRunDirection() == PdfWriter.RUN_DIRECTION_NO_BIDI + || item.getRunDirection() == PdfWriter.RUN_DIRECTION_DEFAULT) { elementRunDirection = PdfWriter.RUN_DIRECTION_NO_BIDI; - } - else{ + } else { elementRunDirection = item.getRunDirection(); } - showTextAligned(canvas, Element.ALIGN_LEFT, new Phrase(item.getListSymbol()), compositeColumn.leftX + listIndentation, compositeColumn.firstLineY, 0, elementRunDirection, 0); + showTextAligned(canvas, Element.ALIGN_LEFT, new Phrase(item.getListSymbol()), + compositeColumn.leftX + listIndentation, compositeColumn.firstLineY, 0, + elementRunDirection, 0); } compositeColumn.firstLineYDone = true; } @@ -1329,32 +1407,35 @@ else if (obj instanceof com.lowagie.text.List) { yLine -= item.getSpacingAfter(); } } - if ((status & NO_MORE_COLUMN) != 0) + if ((status & NO_MORE_COLUMN) != 0) { return NO_MORE_COLUMN; - } - else if (element.type() == Element.PTABLE) { + } + } else if (element.type() == Element.PTABLE) { // don't write anything in the current column if there's no more space available - if (yLine < minY || yLine > maxY) + if (yLine < minY || yLine > maxY) { return NO_MORE_COLUMN; - + } + // get the PdfPTable element - PdfPTable table = (PdfPTable)element; + PdfPTable table = (PdfPTable) element; // we ignore tables without a body if (table.size() <= table.getHeaderRows()) { compositeElements.removeFirst(); continue; } - + // offsets float yTemp = yLine; - if (!firstPass && listIdx == 0) + if (!firstPass && listIdx == 0) { yTemp -= table.spacingBefore(); + } float yLineWrite = yTemp; - + // don't write anything in the current column if there's no more space available - if (yTemp < minY || yTemp > maxY) + if (yTemp < minY || yTemp > maxY) { return NO_MORE_COLUMN; - + } + // coordinates currentLeading = 0; float x1 = leftX; @@ -1363,17 +1444,17 @@ else if (element.type() == Element.PTABLE) { tableWidth = table.getTotalWidth(); table.calculateHeights(true); updateFilledWidth(tableWidth); - } - else { + } else { tableWidth = rectangularWidth * table.getWidthPercentage() / 100f; table.setTotalWidth(tableWidth); } - + // how many header rows are real header rows; how many are footer rows? int headerRows = table.getHeaderRows(); int footerRows = table.getFooterRows(); - if (footerRows > headerRows) + if (footerRows > headerRows) { footerRows = headerRows; + } int realHeaderRows = headerRows - footerRows; float headerHeight = table.getHeaderHeight(); float footerHeight = table.getFooterHeight(); @@ -1390,21 +1471,25 @@ else if (element.type() == Element.PTABLE) { return NO_MORE_COLUMN; } } - + // how many real rows (not header or footer rows) fit on a page? int k; - if (listIdx < headerRows) + if (listIdx < headerRows) { listIdx = headerRows; - if (!table.isComplete()) + } + if (!table.isComplete()) { yTemp -= footerHeight; + } for (k = listIdx; k < table.size(); ++k) { float rowHeight = table.getRowHeight(k); - if (yTemp - rowHeight < minY) + if (yTemp - rowHeight < minY) { break; + } yTemp -= rowHeight; } - if (!table.isComplete()) + if (!table.isComplete()) { yTemp += footerHeight; + } // either k is the first row that doesn't fit on the page (break); if (k < table.size()) { if (table.isSplitRows() && (!table.isSplitLate() || (k == listIdx && firstPass))) { @@ -1413,25 +1498,26 @@ else if (element.type() == Element.PTABLE) { table = new PdfPTable(table); compositeElements.set(0, table); List rows = table.getRows(); - for (int i = headerRows; i < listIdx; ++i) + for (int i = headerRows; i < listIdx; ++i) { rows.set(i, null); + } } float h = yTemp - minY; PdfPRow newRow = table.getRow(k).splitRow(table, k, h); if (newRow == null) { - if (k == listIdx) + if (k == listIdx) { return NO_MORE_COLUMN; - } - else { + } + } else { yTemp = minY; - table.getRows().add(++k, newRow); + table.getRows().add(++k, newRow); } - } - else if (!table.isSplitRows() && k == listIdx && firstPass) { + } else if (!table.isSplitRows() && k == listIdx && firstPass) { return NO_MORE_COLUMN; - } - else if (k == listIdx && !firstPass && (!table.isSplitRows() || table.isSplitLate()) && (table.getFooterRows() == 0 || table.isComplete())) + } else if (k == listIdx && !firstPass && (!table.isSplitRows() || table.isSplitLate()) && ( + table.getFooterRows() == 0 || table.isComplete())) { return NO_MORE_COLUMN; + } } // or k is the number of rows in the table (for loop was done). firstPass = false; @@ -1450,13 +1536,13 @@ else if (k == listIdx && !firstPass && (!table.isSplitRows() || table.isSplitLat // copy the rows that fit on the page in a new table nt PdfPTable nt = PdfPTable.shallowCopy(table); List sub = nt.getRows(); - + // first we add the real header rows (if necessary) if (!skipHeader && realHeaderRows > 0) { sub.addAll(table.getRows(0, realHeaderRows)); - } - else + } else { nt.setHeaderRows(footerRows); + } // then we add the real content sub.addAll(table.getRows(listIdx, k)); // if k < table.size(), we must indicate that the new table is complete; @@ -1469,119 +1555,123 @@ else if (k == listIdx && !firstPass && (!table.isSplitRows() || table.isSplitLat newPageFollows = true; } // we add the footer rows if necessary (not for incomplete tables) - for (int j = 0; j < footerRows && nt.isComplete() && showFooter; ++j) + for (int j = 0; j < footerRows && nt.isComplete() && showFooter; ++j) { sub.add(table.getRow(j + realHeaderRows)); + } // we need a correction if the last row needs to be extended float rowHeight = 0; int index = sub.size() - 1; - if (showFooter) index -= footerRows; + if (showFooter) { + index -= footerRows; + } PdfPRow last = sub.get(index); if (table.isExtendLastRow(newPageFollows)) { rowHeight = last.getMaxHeights(); last.setMaxHeights(yTemp - minY + rowHeight); yTemp = minY; } - + // now we render the rows of the new table - if (canvases != null) + if (canvases != null) { nt.writeSelectedRows(0, -1, x1, yLineWrite, canvases); - else + } else { nt.writeSelectedRows(0, -1, x1, yLineWrite, canvas); + } if (table.isExtendLastRow(newPageFollows)) { last.setMaxHeights(rowHeight); } - } - else if (table.isExtendLastRow() && minY > PdfPRow.BOTTOM_LIMIT) + } else if (table.isExtendLastRow() && minY > PdfPRow.BOTTOM_LIMIT) { yTemp = minY; + } yLine = yTemp; - if (!(skipHeader || table.isComplete())) + if (!(skipHeader || table.isComplete())) { yLine += footerHeight; + } if (k >= table.size()) { yLine -= table.spacingAfter(); compositeElements.removeFirst(); splittedRow = false; listIdx = 0; - } - else { + } else { if (splittedRow) { List rows = table.getRows(); - for (int i = listIdx; i < k; ++i) + for (int i = listIdx; i < k; ++i) { rows.set(i, null); + } } listIdx = k; return NO_MORE_COLUMN; } - } - else if (element.type() == Element.YMARK) { + } else if (element.type() == Element.YMARK) { if (!simulate) { - DrawInterface zh = (DrawInterface)element; + DrawInterface zh = (DrawInterface) element; zh.draw(canvas, leftX, minY, rightX, maxY, yLine); } compositeElements.removeFirst(); - } - else + } else { compositeElements.removeFirst(); + } } } - + /** - * Gets the canvas. - * If a set of four canvases exists, the TEXTCANVAS is returned. - * + * Gets the canvas. If a set of four canvases exists, the TEXTCANVAS is returned. + * * @return a PdfContentByte. */ public PdfContentByte getCanvas() { return canvas; } - + /** - * Sets the canvas. - * If before a set of four canvases was set, it is being unset. - * + * Sets the canvas. If before a set of four canvases was set, it is being unset. + * * @param canvas an object of {@link PdfContentByte} */ public void setCanvas(PdfContentByte canvas) { this.canvas = canvas; this.canvases = null; - if (compositeColumn != null) + if (compositeColumn != null) { compositeColumn.setCanvas(canvas); + } + } + + /** + * Gets the canvases. + * + * @return an array of PdfContentByte + */ + public PdfContentByte[] getCanvases() { + return canvases; } - + /** * Sets the canvases. - * + * * @param canvases an array of {@link PdfContentByte} */ public void setCanvases(PdfContentByte[] canvases) { this.canvases = canvases; this.canvas = canvases[PdfPTable.TEXTCANVAS]; - if (compositeColumn != null) + if (compositeColumn != null) { compositeColumn.setCanvases(canvases); + } } - - /** - * Gets the canvases. - * - * @return an array of PdfContentByte - */ - public PdfContentByte[] getCanvases() { - return canvases; - } - + /** * Checks if the element has a height of 0. - * + * * @return true or false * @since 2.1.2 */ public boolean zeroHeightElement() { return composite && !compositeElements.isEmpty() && compositeElements.getFirst().type() == Element.YMARK; } - + /** * Checks if UseAscender is enabled/disabled. - * + * * @return true is the adjustment of the first line height is based on max ascender. */ public boolean isUseAscender() { @@ -1590,26 +1680,16 @@ public boolean isUseAscender() { /** * Enables/Disables adjustment of first line height based on max ascender. - * - * @param useAscender enable adjustment if true + * + * @param useAscender enable adjustment if true */ public void setUseAscender(boolean useAscender) { this.useAscender = useAscender; } - - /** - * Checks the status variable and looks if there's still some text. - * - * @param status statues variable - * @return true if there's still some text else false - */ - public static boolean hasMoreText(int status) { - return (status & ColumnText.NO_MORE_TEXT) == 0; - } /** * Gets the real width used by the largest line. - * + * * @return the real width used by the largest line */ public float getFilledWidth() { @@ -1617,29 +1697,29 @@ public float getFilledWidth() { } /** - * Sets the real width used by the largest line. - * Only used to set it to zero to start another measurement. + * Sets the real width used by the largest line. Only used to set it to zero to start another measurement. * * @param filledWidth the real width used by the largest line */ public void setFilledWidth(float filledWidth) { this.filledWidth = filledWidth; } - + /** * Replaces the filledWidth if greater than the existing one. * * @param w the new filledWidth if greater than the existing one */ public void updateFilledWidth(float w) { - if (w > filledWidth) + if (w > filledWidth) { filledWidth = w; + } } /** * Gets the first line adjustment property. - * + * * @return the first line adjustment property. */ public boolean isAdjustFirstLine() { @@ -1647,13 +1727,11 @@ public boolean isAdjustFirstLine() { } /** - * Sets the first line adjustment. - * Some objects have properties, like spacing before, that behave - * differently if the object is the first to be written after go() or not. - * The first line adjustment is true by default but can be - * changed if several objects are to be placed one after the other in the - * same column calling go() several times. - * + * Sets the first line adjustment. Some objects have properties, like spacing before, that behave differently if the + * object is the first to be written after go() or not. The first line adjustment is true by default + * but can be changed if several objects are to be placed one after the other in the same column calling go() + * several times. + * * @param adjustFirstLine true to adjust the first line, false otherwise */ public void setAdjustFirstLine(boolean adjustFirstLine) { diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/DefaultFontMapper.java b/openpdf/src/main/java/com/lowagie/text/pdf/DefaultFontMapper.java index 47932391d..b7cbd76a8 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/DefaultFontMapper.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/DefaultFontMapper.java @@ -47,7 +47,6 @@ package com.lowagie.text.pdf; import com.lowagie.text.ExceptionConverter; - import java.awt.Font; import java.io.File; import java.util.HashMap; @@ -61,280 +60,281 @@ public class DefaultFontMapper implements FontMapper { - /** - * A representation of BaseFont parameters. - */ - public static class BaseFontParameters { - - /** - * The font name. - */ - public String fontName; /** - * The encoding for that font. + * Maps aliases to names. */ - public String encoding; + private HashMap aliases = new HashMap<>(); /** - * The embedding for that font. + * Maps names to BaseFont parameters. */ - public boolean embedded; + private HashMap mapper = new HashMap<>(); + /** - * Whether the font is cached of not. + * Returns a BaseFont which can be used to represent the given AWT Font + * + * @param font the font to be converted + * @return a BaseFont which has similar properties to the provided Font */ - public boolean cached; + + public BaseFont awtToPdf(Font font) { + try { + BaseFontParameters p = getBaseFontParameters(font.getFontName()); + if (p != null) { + return BaseFont.createFont(p.fontName, p.encoding, p.embedded, p.cached, p.ttfAfm, p.pfb); + } + final String fontKey; + final String logicalName = font.getName().toLowerCase(); + + if (logicalName.equals("dialoginput") || logicalName.contains("mono") || logicalName.startsWith( + "courier")) { + + if (font.isItalic()) { + if (font.isBold()) { + fontKey = BaseFont.COURIER_BOLDOBLIQUE; + + } else { + fontKey = BaseFont.COURIER_OBLIQUE; + } + + } else { + if (font.isBold()) { + fontKey = BaseFont.COURIER_BOLD; + + } else { + fontKey = BaseFont.COURIER; + } + } + + } else if (logicalName.equals("serif") || logicalName.equals("timesroman")) { + + if (font.isItalic()) { + if (font.isBold()) { + fontKey = BaseFont.TIMES_BOLDITALIC; + + } else { + fontKey = BaseFont.TIMES_ITALIC; + } + + } else { + if (font.isBold()) { + fontKey = BaseFont.TIMES_BOLD; + + } else { + fontKey = BaseFont.TIMES_ROMAN; + } + } + + } else { // default, this catches Dialog and SansSerif + + if (font.isItalic()) { + if (font.isBold()) { + fontKey = BaseFont.HELVETICA_BOLDOBLIQUE; + + } else { + fontKey = BaseFont.HELVETICA_OBLIQUE; + } + + } else { + if (font.isBold()) { + fontKey = BaseFont.HELVETICA_BOLD; + } else { + fontKey = BaseFont.HELVETICA; + } + } + } + return BaseFont.createFont(fontKey, BaseFont.CP1252, false); + } catch (Exception e) { + throw new ExceptionConverter(e); + } + } + /** - * The font bytes for ttf and afm. + * Returns an AWT Font which can be used to represent the given BaseFont + * + * @param font the font to be converted + * @param size the desired point size of the resulting font + * @return a Font which has similar properties to the provided BaseFont */ - public byte[] ttfAfm; + + public Font pdfToAwt(BaseFont font, int size) { + String[][] names = font.getFullFontName(); + if (names.length == 1) { + return new Font(names[0][3], Font.PLAIN, size); + } + String name10 = null; + String name3x = null; + for (String[] name : names) { + if (name[0].equals("1") && name[1].equals("0")) { + name10 = name[3]; + } else if (name[2].equals("1033")) { + name3x = name[3]; + break; + } + } + String finalName = name3x; + if (finalName == null) { + finalName = name10; + } + if (finalName == null) { + finalName = names[0][3]; + } + return new Font(finalName, Font.PLAIN, size); + } + /** - * The font bytes for pfb. + * Maps a name to a BaseFont parameter. + * + * @param awtName the name + * @param parameters the BaseFont parameter */ - public byte[] pfb; + public void putName(String awtName, BaseFontParameters parameters) { + mapper.put(awtName, parameters); + } /** - * Constructs default BaseFont parameters. + * Maps an alias to a name. * - * @param fontName the font name or location + * @param alias the alias + * @param awtName the name */ - public BaseFontParameters(String fontName) { - this.fontName = fontName; - encoding = BaseFont.CP1252; - embedded = BaseFont.EMBEDDED; - cached = BaseFont.CACHED; + public void putAlias(String alias, String awtName) { + aliases.put(alias, awtName); } - } - - /** - * Maps aliases to names. - */ - private HashMap aliases = new HashMap<>(); - /** - * Maps names to BaseFont parameters. - */ - private HashMap mapper = new HashMap<>(); - - /** - * Returns a BaseFont which can be used to represent the given AWT Font - * - * @param font the font to be converted - * @return a BaseFont which has similar properties to the provided Font - */ - - public BaseFont awtToPdf(Font font) { - try { - BaseFontParameters p = getBaseFontParameters(font.getFontName()); - if (p != null) { - return BaseFont.createFont(p.fontName, p.encoding, p.embedded, p.cached, p.ttfAfm, p.pfb); - } - final String fontKey; - final String logicalName = font.getName().toLowerCase(); - - if (logicalName.equals("dialoginput") || logicalName.contains("mono") || logicalName.startsWith("courier")) { - - if (font.isItalic()) { - if (font.isBold()) { - fontKey = BaseFont.COURIER_BOLDOBLIQUE; - - } else { - fontKey = BaseFont.COURIER_OBLIQUE; - } - } else { - if (font.isBold()) { - fontKey = BaseFont.COURIER_BOLD; - - } else { - fontKey = BaseFont.COURIER; - } + /** + * Looks for a BaseFont parameter associated with a name. + * + * @param name the name + * @return the BaseFont parameter or null if not found. + */ + public BaseFontParameters getBaseFontParameters(String name) { + String alias = aliases.get(name); + if (alias == null) { + return mapper.get(name); } - - } else if (logicalName.equals("serif") || logicalName.equals("timesroman")) { - - if (font.isItalic()) { - if (font.isBold()) { - fontKey = BaseFont.TIMES_BOLDITALIC; - - } else { - fontKey = BaseFont.TIMES_ITALIC; - } - + BaseFontParameters p = mapper.get(alias); + if (p == null) { + return mapper.get(name); } else { - if (font.isBold()) { - fontKey = BaseFont.TIMES_BOLD; - - } else { - fontKey = BaseFont.TIMES_ROMAN; - } + return p; } + } - } else { // default, this catches Dialog and SansSerif - - if (font.isItalic()) { - if (font.isBold()) { - fontKey = BaseFont.HELVETICA_BOLDOBLIQUE; - - } else { - fontKey = BaseFont.HELVETICA_OBLIQUE; - } - - } else { - if (font.isBold()) { - fontKey = BaseFont.HELVETICA_BOLD; - } else { - fontKey = BaseFont.HELVETICA; - } + /** + * Inserts the names in this map. + * + * @param allNames the returned value of calling {@link BaseFont#getAllFontNames(String, String, byte[])} + * @param path the full path to the font + */ + public void insertNames(Object[] allNames, String path) { + String[][] names = (String[][]) allNames[2]; + String main = null; + for (String[] name : names) { + if (name[2].equals("1033")) { + main = name[3]; + break; + } } - } - return BaseFont.createFont(fontKey, BaseFont.CP1252, false); - } catch (Exception e) { - throw new ExceptionConverter(e); - } - } - - /** - * Returns an AWT Font which can be used to represent the given BaseFont - * - * @param font the font to be converted - * @param size the desired point size of the resulting font - * @return a Font which has similar properties to the provided BaseFont - */ - - public Font pdfToAwt(BaseFont font, int size) { - String[][] names = font.getFullFontName(); - if (names.length == 1) { - return new Font(names[0][3], Font.PLAIN, size); - } - String name10 = null; - String name3x = null; - for (String[] name : names) { - if (name[0].equals("1") && name[1].equals("0")) { - name10 = name[3]; - } else if (name[2].equals("1033")) { - name3x = name[3]; - break; - } - } - String finalName = name3x; - if (finalName == null) { - finalName = name10; - } - if (finalName == null) { - finalName = names[0][3]; - } - return new Font(finalName, Font.PLAIN, size); - } - - /** - * Maps a name to a BaseFont parameter. - * - * @param awtName the name - * @param parameters the BaseFont parameter - */ - public void putName(String awtName, BaseFontParameters parameters) { - mapper.put(awtName, parameters); - } - - /** - * Maps an alias to a name. - * - * @param alias the alias - * @param awtName the name - */ - public void putAlias(String alias, String awtName) { - aliases.put(alias, awtName); - } - - /** - * Looks for a BaseFont parameter associated with a name. - * - * @param name the name - * @return the BaseFont parameter or null if not found. - */ - public BaseFontParameters getBaseFontParameters(String name) { - String alias = aliases.get(name); - if (alias == null) { - return mapper.get(name); - } - BaseFontParameters p = mapper.get(alias); - if (p == null) { - return mapper.get(name); - } else { - return p; - } - } - - /** - * Inserts the names in this map. - * - * @param allNames the returned value of calling {@link BaseFont#getAllFontNames(String, String, byte[])} - * @param path the full path to the font - */ - public void insertNames(Object[] allNames, String path) { - String[][] names = (String[][]) allNames[2]; - String main = null; - for (String[] name : names) { - if (name[2].equals("1033")) { - main = name[3]; - break; - } + if (main == null) { + main = names[0][3]; + } + BaseFontParameters p = new BaseFontParameters(path); + mapper.put(main, p); + for (String[] name : names) { + aliases.put(name[3], main); + } + aliases.put((String) allNames[0], main); } - if (main == null) { - main = names[0][3]; + + /** + * Inserts all the fonts recognized by iText in the + * directory into the map. The encoding + * will be BaseFont.CP1252 but can be changed later. + * + * @param dir the directory to scan + * @return the number of files processed + */ + public int insertDirectory(String dir) { + File file = new File(dir); + if (!file.exists() || !file.isDirectory()) { + return 0; + } + File[] files = file.listFiles(); + if (files == null) { + return 0; + } + int count = 0; + for (File file1 : files) { + file = file1; + String name = file.getPath().toLowerCase(); + try { + if (name.endsWith(".ttf") || name.endsWith(".otf") || name.endsWith(".afm")) { + Object[] allNames = BaseFont.getAllFontNames(file.getPath(), BaseFont.CP1252, null); + insertNames(allNames, file.getPath()); + ++count; + } else if (name.endsWith(".ttc")) { + String[] ttcs = BaseFont.enumerateTTCNames(file.getPath()); + for (int j = 0; j < ttcs.length; ++j) { + String nt = file.getPath() + "," + j; + Object[] allNames = BaseFont.getAllFontNames(nt, BaseFont.CP1252, null); + insertNames(allNames, nt); + } + ++count; + } + } catch (Exception e) { + } + } + return count; } - BaseFontParameters p = new BaseFontParameters(path); - mapper.put(main, p); - for (String[] name : names) { - aliases.put(name[3], main); - } - aliases.put((String) allNames[0], main); - } - - /** - * Inserts all the fonts recognized by iText in the - * directory into the map. The encoding - * will be BaseFont.CP1252 but can be changed later. - * - * @param dir the directory to scan - * @return the number of files processed - */ - public int insertDirectory(String dir) { - File file = new File(dir); - if (!file.exists() || !file.isDirectory()) { - return 0; + + public HashMap getMapper() { + return mapper; } - File[] files = file.listFiles(); - if (files == null) { - return 0; + + public HashMap getAliases() { + return aliases; } - int count = 0; - for (File file1 : files) { - file = file1; - String name = file.getPath().toLowerCase(); - try { - if (name.endsWith(".ttf") || name.endsWith(".otf") || name.endsWith(".afm")) { - Object[] allNames = BaseFont.getAllFontNames(file.getPath(), BaseFont.CP1252, null); - insertNames(allNames, file.getPath()); - ++count; - } else if (name.endsWith(".ttc")) { - String[] ttcs = BaseFont.enumerateTTCNames(file.getPath()); - for (int j = 0; j < ttcs.length; ++j) { - String nt = file.getPath() + "," + j; - Object[] allNames = BaseFont.getAllFontNames(nt, BaseFont.CP1252, null); - insertNames(allNames, nt); - } - ++count; + + /** + * A representation of BaseFont parameters. + */ + public static class BaseFontParameters { + + /** + * The font name. + */ + public String fontName; + /** + * The encoding for that font. + */ + public String encoding; + /** + * The embedding for that font. + */ + public boolean embedded; + /** + * Whether the font is cached of not. + */ + public boolean cached; + /** + * The font bytes for ttf and afm. + */ + public byte[] ttfAfm; + /** + * The font bytes for pfb. + */ + public byte[] pfb; + + /** + * Constructs default BaseFont parameters. + * + * @param fontName the font name or location + */ + public BaseFontParameters(String fontName) { + this.fontName = fontName; + encoding = BaseFont.CP1252; + embedded = BaseFont.EMBEDDED; + cached = BaseFont.CACHED; } - } catch (Exception e) { - } } - return count; - } - - public HashMap getMapper() { - return mapper; - } - - public HashMap getAliases() { - return aliases; - } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/DefaultSplitCharacter.java b/openpdf/src/main/java/com/lowagie/text/pdf/DefaultSplitCharacter.java index d67a689b9..efb0e2c88 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/DefaultSplitCharacter.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/DefaultSplitCharacter.java @@ -52,38 +52,39 @@ import com.lowagie.text.SplitCharacter; /** - * The default class that is used to determine whether or not a character - * is a split character. You can subclass this class to define your own - * split characters. - * @since 2.1.2 + * The default class that is used to determine whether or not a character is a split character. You can subclass this + * class to define your own split characters. + * + * @since 2.1.2 */ public class DefaultSplitCharacter implements SplitCharacter { - + /** * An instance of the default SplitCharacter. */ public static final SplitCharacter DEFAULT = new DefaultSplitCharacter(); - + /** * Checks if a character can be used to split a PdfString. - *

      - * for the moment every character less than or equal to SPACE, the character '-' - * and some specific unicode ranges are 'splitCharacters'. - * - * @param start start position in the array + *

      + * for the moment every character less than or equal to SPACE, the character '-' and some specific unicode ranges + * are 'splitCharacters'. + * + * @param start start position in the array * @param current current position in the array - * @param end end position in the array - * @param cc the character array that has to be checked - * @param ck chunk array - * @return true if the character can be used to split a string, false otherwise + * @param end end position in the array + * @param cc the character array that has to be checked + * @param ck chunk array + * @return true if the character can be used to split a string, false otherwise */ public boolean isSplitCharacter(int start, int current, int end, char[] cc, PdfChunk[] ck) { char c = getCurrentCharacter(current, cc, ck); if (c <= ' ' || c == '-' || c == '\u2010') { return true; } - if (c < 0x2002) + if (c < 0x2002) { return false; + } return c <= 0x200b || c >= 0x2e80 && c < 0xd7a0 || c >= 0xf900 && c < 0xfb00 @@ -93,15 +94,16 @@ public boolean isSplitCharacter(int start, int current, int end, char[] cc, PdfC /** * Returns the current character + * * @param current current position in the array - * @param cc the character array that has to be checked - * @param ck chunk array - * @return the current character + * @param cc the character array that has to be checked + * @param ck chunk array + * @return the current character */ protected char getCurrentCharacter(int current, char[] cc, PdfChunk[] ck) { if (ck == null) { return cc[current]; } - return (char)ck[Math.min(current, ck.length - 1)].getUnicodeEquivalent(cc[current]); + return (char) ck[Math.min(current, ck.length - 1)].getUnicodeEquivalent(cc[current]); } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/DocumentFont.java b/openpdf/src/main/java/com/lowagie/text/pdf/DocumentFont.java index 149f7f172..a6f352992 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/DocumentFont.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/DocumentFont.java @@ -56,724 +56,725 @@ */ public class DocumentFont extends BaseFont { - // code, [glyph, width] - private HashMap metrics = new HashMap<>(); - private String fontName; - private PRIndirectReference refFont; - private PdfDictionary font; - private IntHashtable uni2byte = new IntHashtable(); - private IntHashtable diffmap; - private float Ascender = 800; - private float CapHeight = 700; - private float Descender = -200; - private float ItalicAngle = 0; - private float llx = -50; - private float lly = -200; - private float urx = 100; - private float ury = 900; - private boolean isType0 = false; - - private BaseFont cjkMirror; - - private static String[] cjkNames = {"HeiseiMin-W3", "HeiseiKakuGo-W5", "STSong-Light", "MHei-Medium", - "MSung-Light", "HYGoThic-Medium", "HYSMyeongJo-Medium", "MSungStd-Light", "STSongStd-Light", - "HYSMyeongJoStd-Medium", "KozMinPro-Regular"}; - - private static String[] cjkEncs = {"UniJIS-UCS2-H", "UniJIS-UCS2-H", "UniGB-UCS2-H", "UniCNS-UCS2-H", - "UniCNS-UCS2-H", "UniKS-UCS2-H", "UniKS-UCS2-H", "UniCNS-UCS2-H", "UniGB-UCS2-H", - "UniKS-UCS2-H", "UniJIS-UCS2-H"}; - - private static String[] cjkNames2 = {"MSungStd-Light", "STSongStd-Light", "HYSMyeongJoStd-Medium", "KozMinPro-Regular"}; - - private static String[] cjkEncs2 = {"UniCNS-UCS2-H", "UniGB-UCS2-H", "UniKS-UCS2-H", "UniJIS-UCS2-H", - "UniCNS-UTF16-H", "UniGB-UTF16-H", "UniKS-UTF16-H", "UniJIS-UTF16-H"}; - - private static final int[] stdEnc = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 32, 33, 34, 35, 36, 37, 38, 8217, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 8216, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 161, 162, 163, 8260, 165, 402, 167, 164, 39, 8220, 171, 8249, 8250, 64257, 64258, - 0, 8211, 8224, 8225, 183, 0, 182, 8226, 8218, 8222, 8221, 187, 8230, 8240, 0, 191, - 0, 96, 180, 710, 732, 175, 728, 729, 168, 0, 730, 184, 0, 733, 731, 711, - 8212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 198, 0, 170, 0, 0, 0, 0, 321, 216, 338, 186, 0, 0, 0, 0, - 0, 230, 0, 0, 0, 305, 0, 0, 322, 248, 339, 223, 0, 0, 0, 0}; - - /** - * Creates a new instance of DocumentFont - */ - DocumentFont(PRIndirectReference refFont) { - encoding = ""; - fontSpecific = false; - this.refFont = refFont; - fontType = FONT_TYPE_DOCUMENT; - font = (PdfDictionary) PdfReader.getPdfObject(refFont); - PdfName asName = font.getAsName(PdfName.BASEFONT); - if (asName != null) { - fontName = PdfName.decodeName(asName.toString()); - } else { - fontName = "badFontName"; - } - PdfName subType = font.getAsName(PdfName.SUBTYPE); - if (PdfName.TYPE1.equals(subType) || PdfName.TRUETYPE.equals(subType)) { - doType1TT(); - } else { - for (int k = 0; k < cjkNames.length; ++k) { - if (fontName.startsWith(cjkNames[k])) { - fontName = cjkNames[k]; - try { - cjkMirror = BaseFont.createFont(fontName, cjkEncs[k], false); - } catch (Exception e) { - throw new ExceptionConverter(e); - } - return; + private static final int[] stdEnc = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 32, 33, 34, 35, 36, 37, 38, 8217, 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 8216, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 161, 162, 163, 8260, 165, 402, 167, 164, 39, 8220, 171, 8249, 8250, 64257, 64258, + 0, 8211, 8224, 8225, 183, 0, 182, 8226, 8218, 8222, 8221, 187, 8230, 8240, 0, 191, + 0, 96, 180, 710, 732, 175, 728, 729, 168, 0, 730, 184, 0, 733, 731, 711, + 8212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 198, 0, 170, 0, 0, 0, 0, 321, 216, 338, 186, 0, 0, 0, 0, + 0, 230, 0, 0, 0, 305, 0, 0, 322, 248, 339, 223, 0, 0, 0, 0}; + private static String[] cjkNames = {"HeiseiMin-W3", "HeiseiKakuGo-W5", "STSong-Light", "MHei-Medium", + "MSung-Light", "HYGoThic-Medium", "HYSMyeongJo-Medium", "MSungStd-Light", "STSongStd-Light", + "HYSMyeongJoStd-Medium", "KozMinPro-Regular"}; + private static String[] cjkEncs = {"UniJIS-UCS2-H", "UniJIS-UCS2-H", "UniGB-UCS2-H", "UniCNS-UCS2-H", + "UniCNS-UCS2-H", "UniKS-UCS2-H", "UniKS-UCS2-H", "UniCNS-UCS2-H", "UniGB-UCS2-H", + "UniKS-UCS2-H", "UniJIS-UCS2-H"}; + private static String[] cjkNames2 = {"MSungStd-Light", "STSongStd-Light", "HYSMyeongJoStd-Medium", + "KozMinPro-Regular"}; + private static String[] cjkEncs2 = {"UniCNS-UCS2-H", "UniGB-UCS2-H", "UniKS-UCS2-H", "UniJIS-UCS2-H", + "UniCNS-UTF16-H", "UniGB-UTF16-H", "UniKS-UTF16-H", "UniJIS-UTF16-H"}; + // code, [glyph, width] + private HashMap metrics = new HashMap<>(); + private String fontName; + private PRIndirectReference refFont; + private PdfDictionary font; + private IntHashtable uni2byte = new IntHashtable(); + private IntHashtable diffmap; + private float Ascender = 800; + private float CapHeight = 700; + private float Descender = -200; + private float ItalicAngle = 0; + private float llx = -50; + private float lly = -200; + private float urx = 100; + private float ury = 900; + private boolean isType0 = false; + private BaseFont cjkMirror; + + /** + * Creates a new instance of DocumentFont + */ + DocumentFont(PRIndirectReference refFont) { + encoding = ""; + fontSpecific = false; + this.refFont = refFont; + fontType = FONT_TYPE_DOCUMENT; + font = (PdfDictionary) PdfReader.getPdfObject(refFont); + PdfName asName = font.getAsName(PdfName.BASEFONT); + if (asName != null) { + fontName = PdfName.decodeName(asName.toString()); + } else { + fontName = "badFontName"; } - } - PdfName encName = font.getAsName(PdfName.ENCODING); - if (encName != null) { - String enc = PdfName.decodeName(encName.toString()); - for (int k = 0; k < cjkEncs2.length; ++k) { - if (enc.startsWith(cjkEncs2[k])) { - try { - if (k > 3) { - k -= 4; - } - cjkMirror = BaseFont.createFont(cjkNames2[k], cjkEncs2[k], false); - } catch (Exception e) { - throw new ExceptionConverter(e); + PdfName subType = font.getAsName(PdfName.SUBTYPE); + if (PdfName.TYPE1.equals(subType) || PdfName.TRUETYPE.equals(subType)) { + doType1TT(); + } else { + for (int k = 0; k < cjkNames.length; ++k) { + if (fontName.startsWith(cjkNames[k])) { + fontName = cjkNames[k]; + try { + cjkMirror = BaseFont.createFont(fontName, cjkEncs[k], false); + } catch (Exception e) { + throw new ExceptionConverter(e); + } + return; + } + } + PdfName encName = font.getAsName(PdfName.ENCODING); + if (encName != null) { + String enc = PdfName.decodeName(encName.toString()); + for (int k = 0; k < cjkEncs2.length; ++k) { + if (enc.startsWith(cjkEncs2[k])) { + try { + if (k > 3) { + k -= 4; + } + cjkMirror = BaseFont.createFont(cjkNames2[k], cjkEncs2[k], false); + } catch (Exception e) { + throw new ExceptionConverter(e); + } + return; + } + } + encoding = enc; + if (PdfName.TYPE0.equals(subType) && enc.equals("Identity-H")) { + processType0(font); + isType0 = true; + } } - return; - } - } - encoding = enc; - if (PdfName.TYPE0.equals(subType) && enc.equals("Identity-H")) { - processType0(font); - isType0 = true; } - } - } - } - - private void processType0(PdfDictionary font) { - try { - PdfObject toUniObject = PdfReader.getPdfObjectRelease(font.get(PdfName.TOUNICODE)); - PdfArray df = (PdfArray) PdfReader.getPdfObjectRelease(font.get(PdfName.DESCENDANTFONTS)); - PdfDictionary cidft = (PdfDictionary) PdfReader.getPdfObjectRelease(df.getPdfObject(0)); - PdfNumber dwo = (PdfNumber) PdfReader.getPdfObjectRelease(cidft.get(PdfName.DW)); - int dw = 1000; - if (dwo != null) { - dw = dwo.intValue(); - } - IntHashtable widths = readWidths((PdfArray) PdfReader.getPdfObjectRelease(cidft.get(PdfName.W))); - PdfDictionary fontDesc = (PdfDictionary) PdfReader.getPdfObjectRelease(cidft.get(PdfName.FONTDESCRIPTOR)); - fillFontDesc(fontDesc); - if (toUniObject != null) { - fillMetrics(PdfReader.getStreamBytes((PRStream) toUniObject), widths, dw); - } - - } catch (Exception e) { - throw new ExceptionConverter(e); } - } - private IntHashtable readWidths(PdfArray ws) { - IntHashtable hh = new IntHashtable(); - if (ws == null) { - return hh; + private void processType0(PdfDictionary font) { + try { + PdfObject toUniObject = PdfReader.getPdfObjectRelease(font.get(PdfName.TOUNICODE)); + PdfArray df = (PdfArray) PdfReader.getPdfObjectRelease(font.get(PdfName.DESCENDANTFONTS)); + PdfDictionary cidft = (PdfDictionary) PdfReader.getPdfObjectRelease(df.getPdfObject(0)); + PdfNumber dwo = (PdfNumber) PdfReader.getPdfObjectRelease(cidft.get(PdfName.DW)); + int dw = 1000; + if (dwo != null) { + dw = dwo.intValue(); + } + IntHashtable widths = readWidths((PdfArray) PdfReader.getPdfObjectRelease(cidft.get(PdfName.W))); + PdfDictionary fontDesc = (PdfDictionary) PdfReader.getPdfObjectRelease(cidft.get(PdfName.FONTDESCRIPTOR)); + fillFontDesc(fontDesc); + if (toUniObject != null) { + fillMetrics(PdfReader.getStreamBytes((PRStream) toUniObject), widths, dw); + } + + } catch (Exception e) { + throw new ExceptionConverter(e); + } } - for (int k = 0; k < ws.size(); ++k) { - int c1 = ((PdfNumber) PdfReader.getPdfObjectRelease(ws.getPdfObject(k))).intValue(); - PdfObject obj = PdfReader.getPdfObjectRelease(ws.getPdfObject(++k)); - if (obj.isArray()) { - PdfArray a2 = (PdfArray) obj; - for (int j = 0; j < a2.size(); ++j) { - int c2 = ((PdfNumber) PdfReader.getPdfObjectRelease(a2.getPdfObject(j))).intValue(); - hh.put(c1++, c2); + + private IntHashtable readWidths(PdfArray ws) { + IntHashtable hh = new IntHashtable(); + if (ws == null) { + return hh; } - } else { - int c2 = ((PdfNumber) obj).intValue(); - int w = ((PdfNumber) PdfReader.getPdfObjectRelease(ws.getPdfObject(++k))).intValue(); - for (; c1 <= c2; ++c1) { - hh.put(c1, w); + for (int k = 0; k < ws.size(); ++k) { + int c1 = ((PdfNumber) PdfReader.getPdfObjectRelease(ws.getPdfObject(k))).intValue(); + PdfObject obj = PdfReader.getPdfObjectRelease(ws.getPdfObject(++k)); + if (obj.isArray()) { + PdfArray a2 = (PdfArray) obj; + for (int j = 0; j < a2.size(); ++j) { + int c2 = ((PdfNumber) PdfReader.getPdfObjectRelease(a2.getPdfObject(j))).intValue(); + hh.put(c1++, c2); + } + } else { + int c2 = ((PdfNumber) obj).intValue(); + int w = ((PdfNumber) PdfReader.getPdfObjectRelease(ws.getPdfObject(++k))).intValue(); + for (; c1 <= c2; ++c1) { + hh.put(c1, w); + } + } } - } + return hh; } - return hh; - } - - private String decodeString(PdfString ps) { - if (ps.isHexWriting()) { - return PdfEncodings.convertToString(ps.getBytes(), "UnicodeBigUnmarked"); - } else { - return ps.toUnicodeString(); + + private String decodeString(PdfString ps) { + if (ps.isHexWriting()) { + return PdfEncodings.convertToString(ps.getBytes(), "UnicodeBigUnmarked"); + } else { + return ps.toUnicodeString(); + } } - } - - private void fillMetrics(byte[] touni, IntHashtable widths, int dw) { - try { - PdfContentParser ps = new PdfContentParser(new PRTokeniser(touni)); - PdfObject ob = null; - PdfObject last = null; - while ((ob = ps.readPRObject()) != null) { - if (ob.type() == PdfContentParser.COMMAND_TYPE) { - if (ob.toString().equals("beginbfchar")) { - int n = ((PdfNumber) last).intValue(); - for (int k = 0; k < n; ++k) { - String cid = decodeString((PdfString) ps.readPRObject()); - String uni = decodeString((PdfString) ps.readPRObject()); - if (uni.length() == 1) { - int cidc = cid.charAt(0); - int unic = uni.charAt(uni.length() - 1); - int w = dw; - if (widths.containsKey(cidc)) { - w = widths.get(cidc); + + private void fillMetrics(byte[] touni, IntHashtable widths, int dw) { + try { + PdfContentParser ps = new PdfContentParser(new PRTokeniser(touni)); + PdfObject ob = null; + PdfObject last = null; + while ((ob = ps.readPRObject()) != null) { + if (ob.type() == PdfContentParser.COMMAND_TYPE) { + if (ob.toString().equals("beginbfchar")) { + int n = ((PdfNumber) last).intValue(); + for (int k = 0; k < n; ++k) { + String cid = decodeString((PdfString) ps.readPRObject()); + String uni = decodeString((PdfString) ps.readPRObject()); + if (uni.length() == 1) { + int cidc = cid.charAt(0); + int unic = uni.charAt(uni.length() - 1); + int w = dw; + if (widths.containsKey(cidc)) { + w = widths.get(cidc); + } + metrics.put(unic, new int[]{cidc, w}); + } + } + } else if (ob.toString().equals("beginbfrange")) { + int n = ((PdfNumber) last).intValue(); + for (int k = 0; k < n; ++k) { + String cid1 = decodeString((PdfString) ps.readPRObject()); + String cid2 = decodeString((PdfString) ps.readPRObject()); + int cid1c = cid1.charAt(0); + int cid2c = cid2.charAt(0); + PdfObject ob2 = ps.readPRObject(); + if (ob2.isString()) { + String uni = decodeString((PdfString) ob2); + if (uni.length() == 1) { + int unic = uni.charAt(uni.length() - 1); + for (; cid1c <= cid2c; cid1c++, unic++) { + int w = dw; + if (widths.containsKey(cid1c)) { + w = widths.get(cid1c); + } + metrics.put(unic, new int[]{cid1c, w}); + } + } + } else { + PdfArray a = (PdfArray) ob2; + for (int j = 0; j < a.size(); ++j, ++cid1c) { + String uni = decodeString(a.getAsString(j)); + if (uni.length() == 1) { + int unic = uni.charAt(uni.length() - 1); + int w = dw; + if (widths.containsKey(cid1c)) { + w = widths.get(cid1c); + } + metrics.put(unic, new int[]{cid1c, w}); + } + } + } + } + } + } else { + last = ob; } - metrics.put(unic, new int[]{cidc, w}); - } } - } else if (ob.toString().equals("beginbfrange")) { - int n = ((PdfNumber) last).intValue(); - for (int k = 0; k < n; ++k) { - String cid1 = decodeString((PdfString) ps.readPRObject()); - String cid2 = decodeString((PdfString) ps.readPRObject()); - int cid1c = cid1.charAt(0); - int cid2c = cid2.charAt(0); - PdfObject ob2 = ps.readPRObject(); - if (ob2.isString()) { - String uni = decodeString((PdfString) ob2); - if (uni.length() == 1) { - int unic = uni.charAt(uni.length() - 1); - for (; cid1c <= cid2c; cid1c++, unic++) { - int w = dw; - if (widths.containsKey(cid1c)) { - w = widths.get(cid1c); - } - metrics.put(unic, new int[]{cid1c, w}); - } + } catch (Exception e) { + throw new ExceptionConverter(e); + } + } + + private void doType1TT() { + PdfObject enc = PdfReader.getPdfObject(font.get(PdfName.ENCODING)); + if (enc == null) { + PdfName baseFont = this.font.getAsName(PdfName.BASEFONT); + if (PdfName.SYMBOL.equals(baseFont) || PdfName.ZAPFDINGBATS.equals(baseFont)) { + fillEncoding(baseFont); + } else { + fillEncoding(null); + } + } else { + if (enc.isName()) { + fillEncoding((PdfName) enc); + } else { + PdfDictionary encDic = (PdfDictionary) enc; + enc = PdfReader.getPdfObject(encDic.get(PdfName.BASEENCODING)); + if (enc == null) { + fillEncoding(null); + } else { + fillEncoding((PdfName) enc); } - } else { - PdfArray a = (PdfArray) ob2; - for (int j = 0; j < a.size(); ++j, ++cid1c) { - String uni = decodeString(a.getAsString(j)); - if (uni.length() == 1) { - int unic = uni.charAt(uni.length() - 1); - int w = dw; - if (widths.containsKey(cid1c)) { - w = widths.get(cid1c); + PdfArray diffs = encDic.getAsArray(PdfName.DIFFERENCES); + if (diffs != null) { + diffmap = new IntHashtable(); + int currentNumber = 0; + for (int k = 0; k < diffs.size(); ++k) { + PdfObject obj = diffs.getPdfObject(k); + if (obj.isNumber()) { + currentNumber = ((PdfNumber) obj).intValue(); + } else { + int[] c = GlyphList.nameToUnicode(PdfName + .decodeName(obj.toString())); + if (c != null && c.length > 0) { + uni2byte.put(c[0], currentNumber); + diffmap.put(c[0], currentNumber); + } + ++currentNumber; + } } - metrics.put(unic, new int[]{cid1c, w}); - } } - } } - } - } else { - last = ob; } - } - } catch (Exception e) { - throw new ExceptionConverter(e); + PdfArray newWidths = font.getAsArray(PdfName.WIDTHS); + PdfNumber first = font.getAsNumber(PdfName.FIRSTCHAR); + PdfNumber last = font.getAsNumber(PdfName.LASTCHAR); + if (BuiltinFonts14.containsKey(fontName)) { + BaseFont bf; + try { + bf = BaseFont.createFont(fontName, WINANSI, false); + } catch (Exception e) { + throw new ExceptionConverter(e); + } + int[] e = uni2byte.toOrderedKeys(); + for (int i : e) { + int n = uni2byte.get(i); + widths[n] = bf.getRawWidth(n, GlyphList.unicodeToName(i)); + } + if (diffmap != null) { //widths for diffmap must override existing ones + e = diffmap.toOrderedKeys(); + for (int i : e) { + int n = diffmap.get(i); + widths[n] = bf.getRawWidth(n, GlyphList.unicodeToName(i)); + } + diffmap = null; + } + Ascender = bf.getFontDescriptor(ASCENT, 1000); + CapHeight = bf.getFontDescriptor(CAPHEIGHT, 1000); + Descender = bf.getFontDescriptor(DESCENT, 1000); + ItalicAngle = bf.getFontDescriptor(ITALICANGLE, 1000); + llx = bf.getFontDescriptor(BBOXLLX, 1000); + lly = bf.getFontDescriptor(BBOXLLY, 1000); + urx = bf.getFontDescriptor(BBOXURX, 1000); + ury = bf.getFontDescriptor(BBOXURY, 1000); + } + if (first != null && last != null && newWidths != null) { + int f = first.intValue(); + for (int k = 0; k < newWidths.size(); ++k) { + widths[f + k] = newWidths.getAsNumber(k).intValue(); + } + } + fillFontDesc(font.getAsDict(PdfName.FONTDESCRIPTOR)); } - } - - private void doType1TT() { - PdfObject enc = PdfReader.getPdfObject(font.get(PdfName.ENCODING)); - if (enc == null) { - PdfName baseFont = this.font.getAsName(PdfName.BASEFONT); - if(PdfName.SYMBOL.equals(baseFont)||PdfName.ZAPFDINGBATS.equals(baseFont)) - fillEncoding(baseFont); - else - fillEncoding(null); - } else { - if (enc.isName()) { - fillEncoding((PdfName) enc); - } else { - PdfDictionary encDic = (PdfDictionary) enc; - enc = PdfReader.getPdfObject(encDic.get(PdfName.BASEENCODING)); - if (enc == null) { - fillEncoding(null); - } else { - fillEncoding((PdfName) enc); + + private void fillFontDesc(PdfDictionary fontDesc) { + if (fontDesc == null) { + return; } - PdfArray diffs = encDic.getAsArray(PdfName.DIFFERENCES); - if (diffs != null) { - diffmap = new IntHashtable(); - int currentNumber = 0; - for (int k = 0; k < diffs.size(); ++k) { - PdfObject obj = diffs.getPdfObject(k); - if (obj.isNumber()) { - currentNumber = ((PdfNumber) obj).intValue(); - } else { - int[] c = GlyphList.nameToUnicode(PdfName - .decodeName(obj.toString())); - if (c != null && c.length > 0) { - uni2byte.put(c[0], currentNumber); - diffmap.put(c[0], currentNumber); - } - ++currentNumber; + PdfNumber v = fontDesc.getAsNumber(PdfName.ASCENT); + if (v != null) { + Ascender = v.floatValue(); + } + v = fontDesc.getAsNumber(PdfName.CAPHEIGHT); + if (v != null) { + CapHeight = v.floatValue(); + } + v = fontDesc.getAsNumber(PdfName.DESCENT); + if (v != null) { + Descender = v.floatValue(); + } + v = fontDesc.getAsNumber(PdfName.ITALICANGLE); + if (v != null) { + ItalicAngle = v.floatValue(); + } + PdfArray bbox = fontDesc.getAsArray(PdfName.FONTBBOX); + if (bbox != null) { + llx = bbox.getAsNumber(0).floatValue(); + lly = bbox.getAsNumber(1).floatValue(); + urx = bbox.getAsNumber(2).floatValue(); + ury = bbox.getAsNumber(3).floatValue(); + if (llx > urx) { + float t = llx; + llx = urx; + urx = t; + } + if (lly > ury) { + float t = lly; + lly = ury; + ury = t; } - } } - } } - PdfArray newWidths = font.getAsArray(PdfName.WIDTHS); - PdfNumber first = font.getAsNumber(PdfName.FIRSTCHAR); - PdfNumber last = font.getAsNumber(PdfName.LASTCHAR); - if (BuiltinFonts14.containsKey(fontName)) { - BaseFont bf; - try { - bf = BaseFont.createFont(fontName, WINANSI, false); - } catch (Exception e) { - throw new ExceptionConverter(e); - } - int[] e = uni2byte.toOrderedKeys(); - for (int i : e) { - int n = uni2byte.get(i); - widths[n] = bf.getRawWidth(n, GlyphList.unicodeToName(i)); - } - if (diffmap != null) { //widths for diffmap must override existing ones - e = diffmap.toOrderedKeys(); - for (int i : e) { - int n = diffmap.get(i); - widths[n] = bf.getRawWidth(n, GlyphList.unicodeToName(i)); + + private void fillEncoding(PdfName encoding) { + if (PdfName.MAC_ROMAN_ENCODING.equals(encoding) || PdfName.WIN_ANSI_ENCODING.equals(encoding) + || PdfName.SYMBOL.equals(encoding) || PdfName.ZAPFDINGBATS.equals(encoding)) { + byte[] b = new byte[256]; + for (int k = 0; k < 256; ++k) { + b[k] = (byte) k; + } + String enc = WINANSI; + if (PdfName.MAC_ROMAN_ENCODING.equals(encoding)) { + enc = MACROMAN; + } else if (PdfName.SYMBOL.equals(encoding)) { + enc = SYMBOL; + } else if (PdfName.ZAPFDINGBATS.equals(encoding)) { + enc = ZAPFDINGBATS; + } + String cv = PdfEncodings.convertToString(b, enc); + char[] arr = cv.toCharArray(); + for (int k = 0; k < 256; ++k) { + uni2byte.put(arr[k], k); + } + } else { + for (int k = 0; k < 256; ++k) { + uni2byte.put(stdEnc[k], k); + } } - diffmap = null; - } - Ascender = bf.getFontDescriptor(ASCENT, 1000); - CapHeight = bf.getFontDescriptor(CAPHEIGHT, 1000); - Descender = bf.getFontDescriptor(DESCENT, 1000); - ItalicAngle = bf.getFontDescriptor(ITALICANGLE, 1000); - llx = bf.getFontDescriptor(BBOXLLX, 1000); - lly = bf.getFontDescriptor(BBOXLLY, 1000); - urx = bf.getFontDescriptor(BBOXURX, 1000); - ury = bf.getFontDescriptor(BBOXURY, 1000); } - if (first != null && last != null && newWidths != null) { - int f = first.intValue(); - for (int k = 0; k < newWidths.size(); ++k) { - widths[f + k] = newWidths.getAsNumber(k).intValue(); - } + + /** + * Gets the family name of the font. If it is a True Type font each array element will have {Platform ID, Platform + * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type + * specification, chapter 2, in the 'name' table.
      For the other fonts the array has a single element with {"", + * "", "", font name}. + * + * @return the family name of the font + */ + public String[][] getFamilyFontName() { + return getFullFontName(); } - fillFontDesc(font.getAsDict(PdfName.FONTDESCRIPTOR)); - } - private void fillFontDesc(PdfDictionary fontDesc) { - if (fontDesc == null) { - return; + /** + * Gets the font parameter identified by key. Valid values for key are + * ASCENT, + * CAPHEIGHT, DESCENT, + * ITALICANGLE, BBOXLLX, BBOXLLY, BBOXURX + * and BBOXURY. + * + * @param key the parameter to be extracted + * @param fontSize the font size in points + * @return the parameter in points + */ + public float getFontDescriptor(int key, float fontSize) { + if (cjkMirror != null) { + return cjkMirror.getFontDescriptor(key, fontSize); + } + switch (key) { + case AWT_ASCENT: + case ASCENT: + return Ascender * fontSize / 1000; + case CAPHEIGHT: + return CapHeight * fontSize / 1000; + case AWT_DESCENT: + case DESCENT: + return Descender * fontSize / 1000; + case ITALICANGLE: + return ItalicAngle; + case BBOXLLX: + return llx * fontSize / 1000; + case BBOXLLY: + return lly * fontSize / 1000; + case BBOXURX: + return urx * fontSize / 1000; + case BBOXURY: + return ury * fontSize / 1000; + case AWT_LEADING: + return 0; + case AWT_MAXADVANCE: + return (urx - llx) * fontSize / 1000; + } + return 0; } - PdfNumber v = fontDesc.getAsNumber(PdfName.ASCENT); - if (v != null) { - Ascender = v.floatValue(); + + /** + * Gets the full name of the font. If it is a True Type font each array element will have {Platform ID, Platform + * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type + * specification, chapter 2, in the 'name' table.
      For the other fonts the array has a single element with {"", + * "", "", font name}. + * + * @return the full name of the font + */ + public String[][] getFullFontName() { + return new String[][]{{"", "", "", fontName}}; } - v = fontDesc.getAsNumber(PdfName.CAPHEIGHT); - if (v != null) { - CapHeight = v.floatValue(); + + /** + * Gets all the entries of the names-table. If it is a True Type font each array element will have {Name ID, + * Platform ID, Platform Encoding ID, Language ID, font name}. The interpretation of this values can be found in the + * Open Type specification, chapter 2, in the 'name' table.
      For the other fonts the array has a single element + * with {"4", "", "", "", font name}. + * + * @return the full name of the font + * @since 2.0.8 + */ + public String[][] getAllNameEntries() { + return new String[][]{{"4", "", "", "", fontName}}; } - v = fontDesc.getAsNumber(PdfName.DESCENT); - if (v != null) { - Descender = v.floatValue(); + + /** + * Gets the kerning between two Unicode chars. + * + * @param char1 the first char + * @param char2 the second char + * @return the kerning to be applied + */ + public int getKerning(int char1, int char2) { + return 0; } - v = fontDesc.getAsNumber(PdfName.ITALICANGLE); - if (v != null) { - ItalicAngle = v.floatValue(); + + /** + * Gets the postscript font name. + * + * @return the postscript font name + */ + public String getPostscriptFontName() { + return fontName; } - PdfArray bbox = fontDesc.getAsArray(PdfName.FONTBBOX); - if (bbox != null) { - llx = bbox.getAsNumber(0).floatValue(); - lly = bbox.getAsNumber(1).floatValue(); - urx = bbox.getAsNumber(2).floatValue(); - ury = bbox.getAsNumber(3).floatValue(); - if (llx > urx) { - float t = llx; - llx = urx; - urx = t; - } - if (lly > ury) { - float t = lly; - lly = ury; - ury = t; - } + + /** + * Sets the font name that will appear in the pdf font dictionary. It does nothing in this case as the font is + * already in the document. + * + * @param name the new font name + */ + public void setPostscriptFontName(String name) { } - } - - private void fillEncoding(PdfName encoding) { - if (PdfName.MAC_ROMAN_ENCODING.equals(encoding) || PdfName.WIN_ANSI_ENCODING.equals(encoding) - ||PdfName.SYMBOL.equals(encoding)||PdfName.ZAPFDINGBATS.equals(encoding)) { - byte[] b = new byte[256]; - for (int k = 0; k < 256; ++k) { - b[k] = (byte) k; - } - String enc = WINANSI; - if (PdfName.MAC_ROMAN_ENCODING.equals(encoding)) { - enc = MACROMAN; - }else if (PdfName.SYMBOL.equals(encoding)){ - enc = SYMBOL; - }else if (PdfName.ZAPFDINGBATS.equals(encoding)){ - enc = ZAPFDINGBATS; - } - String cv = PdfEncodings.convertToString(b, enc); - char[] arr = cv.toCharArray(); - for (int k = 0; k < 256; ++k) { - uni2byte.put(arr[k], k); - } - } else { - for (int k = 0; k < 256; ++k) { - uni2byte.put(stdEnc[k], k); - } + + /** + * Gets the width from the font according to the Unicode char c or the name. If the + * name is null it's a symbolic font. + * + * @param c the unicode char + * @param name the glyph name + * @return the width of the char + */ + int getRawWidth(int c, String name) { + return 0; } - } - - /** - * Gets the family name of the font. If it is a True Type font each array element will have {Platform ID, Platform Encoding ID, Language - * ID, font name}. The interpretation of this values can be found in the Open Type specification, chapter 2, in the 'name' table.
      For - * the other fonts the array has a single element with {"", "", "", font name}. - * - * @return the family name of the font - */ - public String[][] getFamilyFontName() { - return getFullFontName(); - } - - /** - * Gets the font parameter identified by key. Valid values for key are ASCENT, - * CAPHEIGHT, DESCENT, - * ITALICANGLE, BBOXLLX, BBOXLLY, BBOXURX - * and BBOXURY. - * - * @param key the parameter to be extracted - * @param fontSize the font size in points - * @return the parameter in points - */ - public float getFontDescriptor(int key, float fontSize) { - if (cjkMirror != null) { - return cjkMirror.getFontDescriptor(key, fontSize); + + /** + * Checks if the font has any kerning pairs. + * + * @return true if the font has any kerning pairs + */ + public boolean hasKernPairs() { + return false; } - switch (key) { - case AWT_ASCENT: - case ASCENT: - return Ascender * fontSize / 1000; - case CAPHEIGHT: - return CapHeight * fontSize / 1000; - case AWT_DESCENT: - case DESCENT: - return Descender * fontSize / 1000; - case ITALICANGLE: - return ItalicAngle; - case BBOXLLX: - return llx * fontSize / 1000; - case BBOXLLY: - return lly * fontSize / 1000; - case BBOXURX: - return urx * fontSize / 1000; - case BBOXURY: - return ury * fontSize / 1000; - case AWT_LEADING: - return 0; - case AWT_MAXADVANCE: - return (urx - llx) * fontSize / 1000; + + /** + * Outputs to the writer the font dictionaries and streams. + * + * @param writer the writer for this document + * @param ref the font indirect reference + * @param params several parameters that depend on the font type + * @throws DocumentException error in generating the object + */ + void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) throws DocumentException { } - return 0; - } - - /** - * Gets the full name of the font. If it is a True Type font each array element will have {Platform ID, Platform Encoding ID, Language ID, - * font name}. The interpretation of this values can be found in the Open Type specification, chapter 2, in the 'name' table.
      For the - * other fonts the array has a single element with {"", "", "", font name}. - * - * @return the full name of the font - */ - public String[][] getFullFontName() { - return new String[][]{{"", "", "", fontName}}; - } - - /** - * Gets all the entries of the names-table. If it is a True Type font each array element will have {Name ID, Platform ID, Platform - * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type specification, chapter 2, in the - * 'name' table.
      For the other fonts the array has a single element with {"4", "", "", "", font name}. - * - * @return the full name of the font - * @since 2.0.8 - */ - public String[][] getAllNameEntries() { - return new String[][]{{"4", "", "", "", fontName}}; - } - - /** - * Gets the kerning between two Unicode chars. - * - * @param char1 the first char - * @param char2 the second char - * @return the kerning to be applied - */ - public int getKerning(int char1, int char2) { - return 0; - } - - /** - * Gets the postscript font name. - * - * @return the postscript font name - */ - public String getPostscriptFontName() { - return fontName; - } - - /** - * Gets the width from the font according to the Unicode char c or the name. If the name is null - * it's a symbolic font. - * - * @param c the unicode char - * @param name the glyph name - * @return the width of the char - */ - int getRawWidth(int c, String name) { - return 0; - } - - /** - * Checks if the font has any kerning pairs. - * - * @return true if the font has any kerning pairs - */ - public boolean hasKernPairs() { - return false; - } - - /** - * Outputs to the writer the font dictionaries and streams. - * - * @param writer the writer for this document - * @param ref the font indirect reference - * @param params several parameters that depend on the font type - * @throws DocumentException error in generating the object - */ - void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) throws DocumentException { - } - - /** - * Always returns null. - * - * @return null - * @since 2.1.3 - */ - public PdfStream getFullFontStream() { - return null; - } - - /** - * Gets the width of a char in normalized 1000 units. - * - * @param char1 the unicode char to get the width of - * @return the width in normalized 1000 units - */ - public int getWidth(int char1) { - if (cjkMirror != null) { - return cjkMirror.getWidth(char1); - } else if (isType0) { - int[] ws = metrics.get(char1); - if (ws != null) { - return ws[1]; - } else { - return 0; - } - } else { - return super.getWidth(char1); + + /** + * Always returns null. + * + * @return null + * @since 2.1.3 + */ + public PdfStream getFullFontStream() { + return null; } - } - - public int getWidth(String text) { - if (cjkMirror != null) { - return cjkMirror.getWidth(text); - } else if (isType0) { - char[] chars = text.toCharArray(); - int total = 0; - for (char aChar : chars) { - int[] ws = metrics.get(Character.getNumericValue(aChar)); - if (ws != null) { - total += ws[1]; + + /** + * Gets the width of a char in normalized 1000 units. + * + * @param char1 the unicode char to get the width of + * @return the width in normalized 1000 units + */ + public int getWidth(int char1) { + if (cjkMirror != null) { + return cjkMirror.getWidth(char1); + } else if (isType0) { + int[] ws = metrics.get(char1); + if (ws != null) { + return ws[1]; + } else { + return 0; + } + } else { + return super.getWidth(char1); + } + } + + public int getWidth(String text) { + if (cjkMirror != null) { + return cjkMirror.getWidth(text); + } else if (isType0) { + char[] chars = text.toCharArray(); + int total = 0; + for (char aChar : chars) { + int[] ws = metrics.get(Character.getNumericValue(aChar)); + if (ws != null) { + total += ws[1]; + } + } + return total; + } else { + return super.getWidth(text); + } + } + + byte[] convertToBytes(String text) { + if (cjkMirror != null) { + return PdfEncodings.convertToBytes(text, CJKFont.CJK_ENCODING); + } else if (isType0) { + char[] chars = text.toCharArray(); + int len = chars.length; + byte[] b = new byte[len * 2]; + int bptr = 0; + for (char aChar : chars) { + int[] ws = metrics.get(Character.getNumericValue(aChar)); + if (ws != null) { + int g = ws[0]; + b[bptr++] = (byte) (g / 256); + b[bptr++] = (byte) (g); + } + } + if (bptr == b.length) { + return b; + } else { + byte[] nb = new byte[bptr]; + System.arraycopy(b, 0, nb, 0, bptr); + return nb; + } + } else { + char[] cc = text.toCharArray(); + byte[] b = new byte[cc.length]; + int ptr = 0; + for (char c : cc) { + if (uni2byte.containsKey(c)) { + b[ptr++] = (byte) uni2byte.get(c); + } + } + if (ptr == b.length) { + return b; + } else { + byte[] b2 = new byte[ptr]; + System.arraycopy(b, 0, b2, 0, ptr); + return b2; + } } - } - return total; - } else { - return super.getWidth(text); } - } - - byte[] convertToBytes(String text) { - if (cjkMirror != null) { - return PdfEncodings.convertToBytes(text, CJKFont.CJK_ENCODING); - } else if (isType0) { - char[] chars = text.toCharArray(); - int len = chars.length; - byte[] b = new byte[len * 2]; - int bptr = 0; - for (char aChar : chars) { - int[] ws = metrics.get(Character.getNumericValue(aChar)); - if (ws != null) { - int g = ws[0]; - b[bptr++] = (byte) (g / 256); - b[bptr++] = (byte) (g); + + byte[] convertToBytes(int char1) { + if (cjkMirror != null) { + return PdfEncodings.convertToBytes((char) char1, CJKFont.CJK_ENCODING); + } else if (isType0) { + int[] ws = metrics.get(char1); + if (ws != null) { + int g = ws[0]; + return new byte[]{(byte) (g / 256), (byte) (g)}; + } else { + return new byte[0]; + } + } else { + if (uni2byte.containsKey(char1)) { + return new byte[]{(byte) uni2byte.get(char1)}; + } else { + return new byte[0]; + } } - } - if (bptr == b.length) { - return b; - } else { - byte[] nb = new byte[bptr]; - System.arraycopy(b, 0, nb, 0, bptr); - return nb; - } - } else { - char[] cc = text.toCharArray(); - byte[] b = new byte[cc.length]; - int ptr = 0; - for (char c : cc) { - if (uni2byte.containsKey(c)) { - b[ptr++] = (byte) uni2byte.get(c); + } + + PdfIndirectReference getIndirectReference() { + return refFont; + } + + public boolean charExists(int c) { + if (cjkMirror != null) { + return cjkMirror.charExists(c); + } else if (isType0) { + return metrics.containsKey(c); + } else { + return super.charExists(c); } - } - if (ptr == b.length) { - return b; - } else { - byte[] b2 = new byte[ptr]; - System.arraycopy(b, 0, b2, 0, ptr); - return b2; - } } - } - - byte[] convertToBytes(int char1) { - if (cjkMirror != null) { - return PdfEncodings.convertToBytes((char) char1, CJKFont.CJK_ENCODING); - } else if (isType0) { - int[] ws = metrics.get(char1); - if (ws != null) { - int g = ws[0]; - return new byte[]{(byte) (g / 256), (byte) (g)}; - } else { - return new byte[0]; - } - } else { - if (uni2byte.containsKey(char1)) { - return new byte[]{(byte) uni2byte.get(char1)}; - } else { - return new byte[0]; - } + + public boolean setKerning(int char1, int char2, int kern) { + return false; } - } - - PdfIndirectReference getIndirectReference() { - return refFont; - } - - public boolean charExists(int c) { - if (cjkMirror != null) { - return cjkMirror.charExists(c); - } else if (isType0) { - return metrics.containsKey(c); - } else { - return super.charExists(c); + + public int[] getCharBBox(int c) { + return null; + } + + protected int[] getRawCharBBox(int c, String name) { + return null; + } + + /** + * Exposes the unicode - > CID map that is constructed from the font's encoding + * + * @return the unicode to CID map + * @since 2.1.7 + */ + IntHashtable getUni2Byte() { + return uni2byte; + } + + public PdfDictionary getFontDescriptor() { + return this.font.getAsDict(PdfName.FONTDESCRIPTOR); + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("DocumentFont ["); + if (metrics != null) { + builder.append("metrics="); + builder.append(metrics); + builder.append(", "); + } + if (fontName != null) { + builder.append("fontName="); + builder.append(fontName); + builder.append(", "); + } + if (refFont != null) { + builder.append("refFont="); + builder.append(refFont); + builder.append(", "); + } + if (font != null) { + builder.append("font="); + builder.append(font); + builder.append(", "); + } + if (uni2byte != null) { + builder.append("uni2byte size="); + builder.append(uni2byte.size()); + builder.append(", "); + } + if (diffmap != null) { + builder.append("diffmap="); + builder.append(diffmap); + builder.append(", "); + } + builder.append("Ascender="); + builder.append(Ascender); + builder.append(", CapHeight="); + builder.append(CapHeight); + builder.append(", Descender="); + builder.append(Descender); + builder.append(", ItalicAngle="); + builder.append(ItalicAngle); + builder.append(", llx="); + builder.append(llx); + builder.append(", lly="); + builder.append(lly); + builder.append(", urx="); + builder.append(urx); + builder.append(", ury="); + builder.append(ury); + builder.append(", isType0="); + builder.append(isType0); + builder.append(", "); + if (cjkMirror != null) { + builder.append("cjkMirror="); + builder.append(cjkMirror); + } + builder.append("]"); + return builder.toString(); } - } - - /** - * Sets the font name that will appear in the pdf font dictionary. It does nothing in this case as the font is already in the document. - * - * @param name the new font name - */ - public void setPostscriptFontName(String name) { - } - - public boolean setKerning(int char1, int char2, int kern) { - return false; - } - - public int[] getCharBBox(int c) { - return null; - } - - protected int[] getRawCharBBox(int c, String name) { - return null; - } - - /** - * Exposes the unicode - > CID map that is constructed from the font's encoding - * - * @return the unicode to CID map - * @since 2.1.7 - */ - IntHashtable getUni2Byte() { - return uni2byte; - } - - public PdfDictionary getFontDescriptor() { - return this.font.getAsDict(PdfName.FONTDESCRIPTOR); - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("DocumentFont ["); - if (metrics != null) { - builder.append("metrics="); - builder.append(metrics); - builder.append(", "); - } - if (fontName != null) { - builder.append("fontName="); - builder.append(fontName); - builder.append(", "); - } - if (refFont != null) { - builder.append("refFont="); - builder.append(refFont); - builder.append(", "); - } - if (font != null) { - builder.append("font="); - builder.append(font); - builder.append(", "); - } - if (uni2byte != null) { - builder.append("uni2byte size="); - builder.append(uni2byte.size()); - builder.append(", "); - } - if (diffmap != null) { - builder.append("diffmap="); - builder.append(diffmap); - builder.append(", "); - } - builder.append("Ascender="); - builder.append(Ascender); - builder.append(", CapHeight="); - builder.append(CapHeight); - builder.append(", Descender="); - builder.append(Descender); - builder.append(", ItalicAngle="); - builder.append(ItalicAngle); - builder.append(", llx="); - builder.append(llx); - builder.append(", lly="); - builder.append(lly); - builder.append(", urx="); - builder.append(urx); - builder.append(", ury="); - builder.append(ury); - builder.append(", isType0="); - builder.append(isType0); - builder.append(", "); - if (cjkMirror != null) { - builder.append("cjkMirror="); - builder.append(cjkMirror); - } - builder.append("]"); - return builder.toString(); - } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/EnumerateTTC.java b/openpdf/src/main/java/com/lowagie/text/pdf/EnumerateTTC.java index 8c97cc826..633f3682f 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/EnumerateTTC.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/EnumerateTTC.java @@ -50,30 +50,29 @@ package com.lowagie.text.pdf; +import com.lowagie.text.DocumentException; +import com.lowagie.text.error_messages.MessageLocalization; import java.io.IOException; import java.util.HashMap; -import com.lowagie.text.error_messages.MessageLocalization; -import com.lowagie.text.DocumentException; -/** Enumerates all the fonts inside a True Type Collection. +/** + * Enumerates all the fonts inside a True Type Collection. * - * @author Paulo Soares (psoares@consiste.pt) + * @author Paulo Soares (psoares@consiste.pt) */ -class EnumerateTTC extends TrueTypeFont{ - /** - * OpenType fonts that contain TrueType outlines should use the value of - * 0x00010000 for the sfntVersion. OpenType fonts containing CFF data (version 1 - * or 2) should use 0x4F54544F ('OTTO', when re-interpreted as a Tag) for - * sfntVersion. - * - * Note: The Apple specification for TrueType fonts allows for 'true' and 'typ1' - * for sfnt version. These version tags should not be used for fonts which - * contain OpenType tables. - * See more at: - * https://docs.microsoft.com/de-de/typography/opentype/spec/otff#organization-of-an-opentype-font - */ - private static final int TRUE_TYPE_SFNT_VERSION = 0x00010000; - private static final int CFF_DATA_SFNT_VERSION = 0x4F54544F; //'OTTO' +class EnumerateTTC extends TrueTypeFont { + + /** + * OpenType fonts that contain TrueType outlines should use the value of 0x00010000 for the sfntVersion. OpenType + * fonts containing CFF data (version 1 or 2) should use 0x4F54544F ('OTTO', when re-interpreted as a Tag) for + * sfntVersion. + *

      + * Note: The Apple specification for TrueType fonts allows for 'true' and 'typ1' for sfnt version. These version + * tags should not be used for fonts which contain OpenType tables. See more at: + * https://docs.microsoft.com/de-de/typography/opentype/spec/otff#organization-of-an-opentype-font + */ + private static final int TRUE_TYPE_SFNT_VERSION = 0x00010000; + private static final int CFF_DATA_SFNT_VERSION = 0x4F54544F; //'OTTO' protected String[] names; @@ -88,14 +87,15 @@ class EnumerateTTC extends TrueTypeFont{ rf = new RandomAccessFileOrArray(ttcArray); findNames(); } - + void findNames() throws DocumentException, IOException { tables = new HashMap<>(); - + try { String mainTag = readStandardString(4); if (!mainTag.equals("ttcf")) { - throw new DocumentException(MessageLocalization.getComposedMessage("1.is.not.a.valid.ttc.file", fileName)); + throw new DocumentException( + MessageLocalization.getComposedMessage("1.is.not.a.valid.ttc.file", fileName)); } int majorVersion = rf.readShort(); rf.skipBytes(2); @@ -112,9 +112,10 @@ void findNames() throws DocumentException, IOException { int sfntVersion = rf.readInt(); boolean trueTypeFont = sfntVersion == TRUE_TYPE_SFNT_VERSION; boolean cffDataFont = sfntVersion == CFF_DATA_SFNT_VERSION && - (majorVersion == 1 || majorVersion == 2); + (majorVersion == 1 || majorVersion == 2); if (!trueTypeFont && !cffDataFont) { - throw new DocumentException(MessageLocalization.getComposedMessage("1.is.not.a.valid.ttf.file", fileName)); + throw new DocumentException( + MessageLocalization.getComposedMessage("1.is.not.a.valid.ttf.file", fileName)); } int num_tables = rf.readUnsignedShort(); rf.skipBytes(6); @@ -128,14 +129,13 @@ void findNames() throws DocumentException, IOException { } names[dirIdx] = getBaseFont(); } - } - finally { + } finally { if (rf != null) { rf.close(); } } } - + String[] getNames() { return names; } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/ExtendedColor.java b/openpdf/src/main/java/com/lowagie/text/pdf/ExtendedColor.java index 771cab491..46a8f3bda 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/ExtendedColor.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/ExtendedColor.java @@ -50,49 +50,68 @@ package com.lowagie.text.pdf; import java.awt.Color; + /** - * - * @author Paulo Soares (psoares@consiste.pt) + * @author Paulo Soares (psoares@consiste.pt) */ -public abstract class ExtendedColor extends Color{ - - private static final long serialVersionUID = 2722660170712380080L; - /** a type of extended color. */ +public abstract class ExtendedColor extends Color { + + /** + * a type of extended color. + */ public static final int TYPE_RGB = 0; - /** a type of extended color. */ + /** + * a type of extended color. + */ public static final int TYPE_GRAY = 1; - /** a type of extended color. */ + /** + * a type of extended color. + */ public static final int TYPE_CMYK = 2; - /** a type of extended color. */ + /** + * a type of extended color. + */ public static final int TYPE_SEPARATION = 3; - /** a type of extended color. */ + /** + * a type of extended color. + */ public static final int TYPE_PATTERN = 4; - /** a type of extended color. */ + /** + * a type of extended color. + */ public static final int TYPE_SHADING = 5; - /** the max int color value (255) expressed in int */ + /** + * the max int color value (255) expressed in int + */ public static final int MAX_COLOR_VALUE = 0xFF; - /** the max int color value (255) expressed in float */ + /** + * the max int color value (255) expressed in float + */ public static final float MAX_INT_COLOR_VALUE = 0xFF; - /** the max float color value (1) expressed in float */ + /** + * the max float color value (1) expressed in float + */ public static final float MAX_FLOAT_COLOR_VALUE = 0x1; - + private static final long serialVersionUID = 2722660170712380080L; protected int type; /** * Constructs an extended color of a certain type. + * * @param type {@link ExtendedColor#type} */ public ExtendedColor(int type) { super(0, 0, 0); this.type = type; } - + /** * Constructs an extended color of a certain type and a certain color. - * @param type {@link ExtendedColor#type} - * @param red red quotient + * + * @param type {@link ExtendedColor#type} + * @param red red quotient * @param green green quotient - * @param blue blue quotient + * @param blue blue quotient */ public ExtendedColor(int type, float red, float green, float blue) { this(type, normalize(red), normalize(green), normalize(blue), MAX_FLOAT_COLOR_VALUE); @@ -100,10 +119,11 @@ public ExtendedColor(int type, float red, float green, float blue) { /** * Constructs an extended color of a certain type and a certain color. - * @param type {@link ExtendedColor#type} - * @param red red quotient + * + * @param type {@link ExtendedColor#type} + * @param red red quotient * @param green green quotient - * @param blue blue quotient + * @param blue blue quotient * @param alpha alpha quotient */ public ExtendedColor(int type, float red, float green, float blue, float alpha) { @@ -111,38 +131,45 @@ public ExtendedColor(int type, float red, float green, float blue, float alpha) this.type = type; } - /** - * Gets the type of this color. - * @return one of the types (see constants) - */ - public int getType() { - return type; - } - /** * Gets the type of a given color. + * * @param color an object of {@link Color} * @return one of the types (see constants) */ public static int getType(Color color) { - if (color instanceof ExtendedColor) - return ((ExtendedColor)color).getType(); + if (color instanceof ExtendedColor) { + return ((ExtendedColor) color).getType(); + } return TYPE_RGB; } static final float normalize(float value) { - if (value < 0f) + if (value < 0f) { return 0f; - if (value > MAX_FLOAT_COLOR_VALUE) + } + if (value > MAX_FLOAT_COLOR_VALUE) { return MAX_FLOAT_COLOR_VALUE; + } return value; } static final int normalize(int value) { - if (value < 0) + if (value < 0) { return 0; - if (value > (int)MAX_INT_COLOR_VALUE) - return (int)MAX_INT_COLOR_VALUE; + } + if (value > (int) MAX_INT_COLOR_VALUE) { + return (int) MAX_INT_COLOR_VALUE; + } return value; } + + /** + * Gets the type of this color. + * + * @return one of the types (see constants) + */ + public int getType() { + return type; + } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/ExtraEncoding.java b/openpdf/src/main/java/com/lowagie/text/pdf/ExtraEncoding.java index 833a9266e..71c9dde49 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/ExtraEncoding.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/ExtraEncoding.java @@ -48,35 +48,36 @@ package com.lowagie.text.pdf; /** - * Classes implementing this interface can create custom encodings or - * replace existing ones. It is used in the context of PdfEncoding. + * Classes implementing this interface can create custom encodings or replace existing ones. It is used in the context + * of PdfEncoding. + * * @author Paulo Soares (psoares@consiste.pt) */ public interface ExtraEncoding { - + /** * Converts an Unicode string to a byte array according to some encoding. - * @param text the Unicode string - * @param encoding the requested encoding. It's mainly of use if the same class - * supports more than one encoding. + * + * @param text the Unicode string + * @param encoding the requested encoding. It's mainly of use if the same class supports more than one encoding. * @return the conversion or null if no conversion is supported */ byte[] charToByte(String text, String encoding); - + /** * Converts an Unicode char to a byte array according to some encoding. - * @param char1 the Unicode char - * @param encoding the requested encoding. It's mainly of use if the same class - * supports more than one encoding. + * + * @param char1 the Unicode char + * @param encoding the requested encoding. It's mainly of use if the same class supports more than one encoding. * @return the conversion or null if no conversion is supported */ byte[] charToByte(char char1, String encoding); - + /** * Converts a byte array to an Unicode string according to some encoding. - * @param b the input byte array - * @param encoding the requested encoding. It's mainly of use if the same class - * supports more than one encoding. + * + * @param b the input byte array + * @param encoding the requested encoding. It's mainly of use if the same class supports more than one encoding. * @return the conversion or null if no conversion is supported */ String byteToChar(byte[] b, String encoding); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/FdfReader.java b/openpdf/src/main/java/com/lowagie/text/pdf/FdfReader.java index fdad2eb1c..223cfc12a 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/FdfReader.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/FdfReader.java @@ -45,22 +45,27 @@ * https://github.com/LibrePDF/OpenPDF */ package com.lowagie.text.pdf; + import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.HashMap; import java.util.Map; -/** Reads an FDF form and makes the fields available +/** + * Reads an FDF form and makes the fields available + * * @author Paulo Soares (psoares@consiste.pt) */ public class FdfReader extends PdfReader { + PdfName encoding; private Map fields; private String fileSpec; - PdfName encoding; - /** Reads an FDF form. + /** + * Reads an FDF form. + * * @param filename the file name of the form * @throws IOException on error */ @@ -68,7 +73,9 @@ public FdfReader(String filename) throws IOException { super(filename); } - /** Reads an FDF form. + /** + * Reads an FDF form. + * * @param pdfIn the byte array with the form * @throws IOException on error */ @@ -76,7 +83,9 @@ public FdfReader(byte[] pdfIn) throws IOException { super(pdfIn); } - /** Reads an FDF form. + /** + * Reads an FDF form. + * * @param url the URL of the document * @throws IOException on error */ @@ -84,9 +93,10 @@ public FdfReader(URL url) throws IOException { super(url); } - /** Reads an FDF form. - * @param is the InputStream containing the document. The stream is read to the - * end but is not closed + /** + * Reads an FDF form. + * + * @param is the InputStream containing the document. The stream is read to the end but is not closed * @throws IOException on error */ public FdfReader(InputStream is) throws IOException { @@ -99,12 +109,10 @@ protected void readPdf() throws IOException { tokens.checkFdfHeader(); rebuildXref(); readDocObj(); - } - finally { + } finally { try { tokens.close(); - } - catch (Exception e) { + } catch (Exception e) { // empty on purpose } } @@ -114,11 +122,11 @@ protected void readPdf() throws IOException { protected void kidNode(PdfDictionary merged, String name) { PdfArray kids = merged.getAsArray(PdfName.KIDS); if (kids == null || kids.isEmpty()) { - if (!name.isEmpty()) + if (!name.isEmpty()) { name = name.substring(1); + } fields.put(name, merged); - } - else { + } else { merged.remove(PdfName.KIDS); for (int k = 0; k < kids.size(); ++k) { PdfDictionary dic = new PdfDictionary(); @@ -126,8 +134,9 @@ protected void kidNode(PdfDictionary merged, String name) { PdfDictionary newDic = kids.getAsDict(k); PdfString t = newDic.getAsString(PdfName.T); String newName = name; - if (t != null) + if (t != null) { newName += "." + t.toUnicodeString(); + } dic.merge(newDic); dic.remove(PdfName.T); kidNode(dic, newName); @@ -138,30 +147,36 @@ protected void kidNode(PdfDictionary merged, String name) { protected void readFields() { catalog = trailer.getAsDict(PdfName.ROOT); PdfDictionary fdf = catalog.getAsDict(PdfName.FDF); - if (fdf == null) + if (fdf == null) { return; + } PdfString fs = fdf.getAsString(PdfName.F); - if (fs != null) + if (fs != null) { fileSpec = fs.toUnicodeString(); + } PdfArray fld = fdf.getAsArray(PdfName.FIELDS); - if (fld == null) + if (fld == null) { return; + } encoding = fdf.getAsName(PdfName.ENCODING); PdfDictionary merged = new PdfDictionary(); merged.put(PdfName.KIDS, fld); kidNode(merged, ""); } - /** Gets all the fields. The map is keyed by the fully qualified - * field name and the value is a merged PdfDictionary - * with the field content. + /** + * Gets all the fields. The map is keyed by the fully qualified field name and the value is a merged + * PdfDictionary with the field content. + * * @return all the fields */ public Map getAllFields() { return fields; } - /** Gets the field dictionary. + /** + * Gets the field dictionary. + * * @param name the fully qualified field name * @return the field dictionary */ @@ -169,45 +184,52 @@ public PdfDictionary getField(String name) { return fields.get(name); } - /** Gets the field value or null if the field does not - * exist or has no value defined. + /** + * Gets the field value or null if the field does not exist or has no value defined. + * * @param name the fully qualified field name * @return the field value or null */ public String getFieldValue(String name) { PdfDictionary field = fields.get(name); - if (field == null) + if (field == null) { return null; + } PdfObject v = getPdfObject(field.get(PdfName.V)); - if (v == null) + if (v == null) { return null; - if (v.isName()) + } + if (v.isName()) { return PdfName.decodeName(v.toString()); - else if (v.isString()) { - PdfString vs = (PdfString)v; - if (encoding == null || vs.getEncoding() != null) + } else if (v.isString()) { + PdfString vs = (PdfString) v; + if (encoding == null || vs.getEncoding() != null) { return vs.toUnicodeString(); + } byte[] b = vs.getBytes(); - if (b.length >= 2 && b[0] == (byte)254 && b[1] == (byte)255) + if (b.length >= 2 && b[0] == (byte) 254 && b[1] == (byte) 255) { return vs.toUnicodeString(); + } try { - if (encoding.equals(PdfName.SHIFT_JIS)) + if (encoding.equals(PdfName.SHIFT_JIS)) { return new String(b, "SJIS"); - else if (encoding.equals(PdfName.UHC)) + } else if (encoding.equals(PdfName.UHC)) { return new String(b, "MS949"); - else if (encoding.equals(PdfName.GBK)) + } else if (encoding.equals(PdfName.GBK)) { return new String(b, "GBK"); - else if (encoding.equals(PdfName.BIGFIVE)) + } else if (encoding.equals(PdfName.BIGFIVE)) { return new String(b, "Big5"); - } - catch (Exception e) { + } + } catch (Exception e) { } return vs.toUnicodeString(); } return null; } - /** Gets the PDF file specification contained in the FDF. + /** + * Gets the PDF file specification contained in the FDF. + * * @return the PDF file specification contained in the FDF */ public String getFileSpec() { diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/FdfWriter.java b/openpdf/src/main/java/com/lowagie/text/pdf/FdfWriter.java index ff3526e55..b66ce186a 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/FdfWriter.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/FdfWriter.java @@ -46,6 +46,7 @@ */ package com.lowagie.text.pdf; +import com.lowagie.text.DocWriter; import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; @@ -54,26 +55,33 @@ import java.util.Map; import java.util.StringTokenizer; -import com.lowagie.text.DocWriter; - -/** Writes an FDF form. +/** + * Writes an FDF form. + * * @author Paulo Soares (psoares@consiste.pt) */ public class FdfWriter { + private static final byte[] HEADER_FDF = DocWriter.getISOBytes("%FDF-1.2\n%\u00e2\u00e3\u00cf\u00d3\n"); HashMap fields = new HashMap<>(); - /** The PDF file associated with the FDF. */ + /** + * The PDF file associated with the FDF. + */ private String file; - - /** Creates a new FdfWriter. */ + + /** + * Creates a new FdfWriter. + */ public FdfWriter() { } - /** Writes the content to a stream. + /** + * Writes the content to a stream. + * * @param os the stream * @throws IOException on error - */ + */ public void writeTo(OutputStream os) throws IOException { Wrt wrt = new Wrt(os, this); wrt.writeTo(); @@ -83,8 +91,9 @@ public void writeTo(OutputStream os) throws IOException { boolean setField(String field, PdfObject value) { Map map = fields; StringTokenizer tk = new StringTokenizer(field, "."); - if (!tk.hasMoreTokens()) + if (!tk.hasMoreTokens()) { return false; + } while (true) { String s = tk.nextToken(); Object obj = map.get(s); @@ -92,21 +101,20 @@ boolean setField(String field, PdfObject value) { if (obj == null) { obj = new HashMap(); map.put(s, obj); - map = (Map)obj; + map = (Map) obj; continue; - } - else if (obj instanceof Map) - map = (Map)obj; - else + } else if (obj instanceof Map) { + map = (Map) obj; + } else { return false; - } - else { + } + } else { if (!(obj instanceof Map)) { map.put(s, value); return true; - } - else + } else { return false; + } } } } @@ -116,14 +124,17 @@ void iterateFields(HashMap values, HashMap map, for (Map.Entry entry : map.entrySet()) { String s = entry.getKey(); Object obj = entry.getValue(); - if (obj instanceof HashMap) + if (obj instanceof HashMap) { iterateFields(values, (HashMap) obj, name + "." + s); - else + } else { values.put((name + "." + s).substring(1), obj); + } } } - - /** Removes the field value. + + /** + * Removes the field value. + * * @param field the field name * @return true if the field was found and removed, * false otherwise @@ -132,51 +143,111 @@ void iterateFields(HashMap values, HashMap map, public boolean removeField(String field) { Map map = fields; StringTokenizer tk = new StringTokenizer(field, "."); - if (!tk.hasMoreTokens()) + if (!tk.hasMoreTokens()) { return false; + } List> histMap = new ArrayList<>(); List histStr = new ArrayList<>(); while (true) { String s = tk.nextToken(); Object obj = map.get(s); - if (obj == null) + if (obj == null) { return false; + } histMap.add(map); histStr.add(s); if (tk.hasMoreTokens()) { - if (obj instanceof Map) - map = (Map)obj; - else + if (obj instanceof Map) { + map = (Map) obj; + } else { return false; - } - else { - if (obj instanceof Map) + } + } else { + if (obj instanceof Map) { return false; - else + } else { break; + } } } for (int k = histMap.size() - 1; k >= 0; k -= 1) { map = histMap.get(k); String s = histStr.get(k); map.remove(s); - if (!map.isEmpty()) + if (!map.isEmpty()) { break; + } } return true; } - - /** Gets all the fields. The map is keyed by the fully qualified - * field name and the values are PdfObject. + + /** + * Gets all the fields. The map is keyed by the fully qualified field name and the values are + * PdfObject. + * * @return a map with all the fields - */ + */ public HashMap getFields() { HashMap values = new HashMap<>(); iterateFields(values, fields, ""); return values; } - - /** Gets the field value. + + /** + * Sets all the fields from this FdfReader + * + * @param fdf the FdfReader + */ + public void setFields(FdfReader fdf) { + Map map = fdf.getAllFields(); + for (Map.Entry entry : map.entrySet()) { + String key = entry.getKey(); + PdfDictionary dic = entry.getValue(); + PdfObject v = dic.get(PdfName.V); + if (v != null) { + setField(key, v); + } + v = dic.get(PdfName.A); // (plaflamme) + if (v != null) { + setField(key, v); + } + } + } + + /** + * Sets all the fields from this PdfReader + * + * @param pdf the PdfReader + */ + public void setFields(PdfReader pdf) { + setFields(pdf.getAcroFields()); + } + + /** + * Sets all the fields from this AcroFields + * + * @param af the AcroFields + */ + public void setFields(AcroFields af) { + for (Map.Entry entry : af.getAllFields().entrySet()) { + String fn = entry.getKey(); + AcroFields.Item item = entry.getValue(); + PdfDictionary dic = item.getMerged(0); + PdfObject v = PdfReader.getPdfObjectRelease(dic.get(PdfName.V)); + if (v == null) { + continue; + } + PdfObject ft = PdfReader.getPdfObjectRelease(dic.get(PdfName.FT)); + if (ft == null || PdfName.SIG.equals(ft)) { + continue; + } + setField(fn, v); + } + } + + /** + * Gets the field value. + * * @param field the field name * @return the field value or null if not found */ @@ -184,144 +255,112 @@ public HashMap getFields() { public String getField(String field) { Map map = fields; StringTokenizer tk = new StringTokenizer(field, "."); - if (!tk.hasMoreTokens()) + if (!tk.hasMoreTokens()) { return null; + } while (true) { String s = tk.nextToken(); Object obj = map.get(s); - if (obj == null) + if (obj == null) { return null; + } if (tk.hasMoreTokens()) { - if (obj instanceof Map) - map = (Map)obj; - else + if (obj instanceof Map) { + map = (Map) obj; + } else { return null; - } - else { - if (obj instanceof Map) + } + } else { + if (obj instanceof Map) { return null; - else { - if (((PdfObject)obj).isString()) - return ((PdfString)obj).toUnicodeString(); - else + } else { + if (((PdfObject) obj).isString()) { + return ((PdfString) obj).toUnicodeString(); + } else { return PdfName.decodeName(obj.toString()); + } } } } } - - /** Sets the field value as a name. + + /** + * Sets the field value as a name. + * * @param field the fully qualified field name * @param value the value * @return true if the value was inserted, * false if the name is incompatible with * an existing field - */ + */ public boolean setFieldAsName(String field, String value) { return setField(field, new PdfName(value)); } - - /** Sets the field value as a string. + + /** + * Sets the field value as a string. + * * @param field the fully qualified field name * @param value the value * @return true if the value was inserted, * false if the name is incompatible with * an existing field - */ + */ public boolean setFieldAsString(String field, String value) { return setField(field, new PdfString(value, PdfObject.TEXT_UNICODE)); } - + /** - * Sets the field value as a PDFAction. - * For example, this method allows setting a form submit button action using {@link PdfAction#createSubmitForm(String, Object[], int)}. - * This method creates an A entry for the specified field in the underlying FDF file. - * Method contributed by Philippe Laflamme (plaflamme) - * @param field the fully qualified field name + * Sets the field value as a PDFAction. For example, this method allows setting a form submit button + * action using {@link PdfAction#createSubmitForm(String, Object[], int)}. This method creates an A + * entry for the specified field in the underlying FDF file. Method contributed by Philippe Laflamme (plaflamme) + * + * @param field the fully qualified field name * @param action the field's action * @return true if the value was inserted, * false if the name is incompatible with * an existing field - * @since 2.1.5 + * @since 2.1.5 */ public boolean setFieldAsAction(String field, PdfAction action) { return setField(field, action); } - - /** Sets all the fields from this FdfReader - * @param fdf the FdfReader - */ - public void setFields(FdfReader fdf) { - Map map = fdf.getAllFields(); - for (Map.Entry entry : map.entrySet()) { - String key = entry.getKey(); - PdfDictionary dic = entry.getValue(); - PdfObject v = dic.get(PdfName.V); - if (v != null) { - setField(key, v); - } - v = dic.get(PdfName.A); // (plaflamme) - if (v != null) { - setField(key, v); - } - } - } - - /** Sets all the fields from this PdfReader - * @param pdf the PdfReader - */ - public void setFields(PdfReader pdf) { - setFields(pdf.getAcroFields()); - } - - /** Sets all the fields from this AcroFields - * @param af the AcroFields - */ - public void setFields(AcroFields af) { - for (Map.Entry entry : af.getAllFields().entrySet()) { - String fn = entry.getKey(); - AcroFields.Item item = entry.getValue(); - PdfDictionary dic = item.getMerged(0); - PdfObject v = PdfReader.getPdfObjectRelease(dic.get(PdfName.V)); - if (v == null) - continue; - PdfObject ft = PdfReader.getPdfObjectRelease(dic.get(PdfName.FT)); - if (ft == null || PdfName.SIG.equals(ft)) - continue; - setField(fn, v); - } - } - - /** Gets the PDF file name associated with the FDF. + + /** + * Gets the PDF file name associated with the FDF. + * * @return the PDF file name associated with the FDF */ public String getFile() { return this.file; } - - /** Sets the PDF file name associated with the FDF. - * @param file the PDF file name associated with the FDF + + /** + * Sets the PDF file name associated with the FDF. * + * @param file the PDF file name associated with the FDF */ public void setFile(String file) { this.file = file; } - + static class Wrt extends PdfWriter { + private FdfWriter fdf; - + Wrt(OutputStream os, FdfWriter fdf) throws IOException { super(new PdfDocument(), os); this.fdf = fdf; this.os.write(HEADER_FDF); body = new PdfBody(this); } - + void writeTo() throws IOException { PdfDictionary dic = new PdfDictionary(); dic.put(PdfName.FIELDS, calculate(fdf.fields)); - if (fdf.file != null) + if (fdf.file != null) { dic.put(PdfName.F, new PdfString(fdf.file, PdfObject.TEXT_UNICODE)); + } PdfDictionary fd = new PdfDictionary(); fd.put(PdfName.FDF, dic); PdfIndirectReference ref = addToBody(fd).getIndirectReference(); @@ -342,7 +381,7 @@ PdfArray calculate(HashMap map) { PdfDictionary dic = new PdfDictionary(); dic.put(PdfName.T, new PdfString(key, PdfObject.TEXT_UNICODE)); if (v instanceof HashMap) { - dic.put(PdfName.KIDS, calculate((HashMap)v)); + dic.put(PdfName.KIDS, calculate((HashMap) v)); } else if (v instanceof PdfAction) { // (plaflamme) dic.put(PdfName.A, (PdfAction) v); } else { diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/FontDetails.java b/openpdf/src/main/java/com/lowagie/text/pdf/FontDetails.java index 6e24abdba..ed037d537 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/FontDetails.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/FontDetails.java @@ -49,37 +49,40 @@ package com.lowagie.text.pdf; +import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.TextRenderingOptions; +import com.lowagie.text.Utilities; import java.awt.font.GlyphVector; import java.io.UnsupportedEncodingException; import java.util.HashMap; -import com.lowagie.text.Utilities; -import com.lowagie.text.ExceptionConverter; -import com.lowagie.text.TextRenderingOptions; - /** - * Each font in the document will have an instance of this class - * where the characters used will be represented. + * Each font in the document will have an instance of this class where the characters used will be represented. * - * @author Paulo Soares (psoares@consiste.pt) + * @author Paulo Soares (psoares@consiste.pt) */ class FontDetails { - + + /** + * Indicates if only a subset of the glyphs and widths for that particular encoding should be included in the + * document. + */ + protected boolean subset = true; /** * The indirect reference to this font - */ + */ PdfIndirectReference indirectReference; /** * The font name that appears in the document body stream - */ + */ PdfName fontName; /** * The font - */ + */ BaseFont baseFont; /** * The font if it's an instance of TrueTypeFontUnicode - */ + */ TrueTypeFontUnicode ttu; /** * The font if it's an instance of CJKFont @@ -90,9 +93,9 @@ class FontDetails { */ byte[] shortTag; /** - * The map used with double byte encodings. The key is Integer(glyph) and - * the value is int[]{glyph, width, Unicode code} - */ + * The map used with double byte encodings. The key is Integer(glyph) and the value is int[]{glyph, width, Unicode + * code} + */ HashMap longTag; /** * IntHashtable with CIDs of CJK glyphs that are used in the text. @@ -100,25 +103,20 @@ class FontDetails { IntHashtable cjkTag; /** * The font type - */ + */ int fontType; /** * true if the font is symbolic - */ - boolean symbolic; - /** - * Indicates if only a subset of the glyphs and widths for that particular - * encoding should be included in the document. */ - protected boolean subset = true; - + boolean symbolic; + /** - * Each font used in a document has an instance of this class. - * This class stores the characters used in the document and other - * specifics unique to the current working document. - * @param fontName the font name + * Each font used in a document has an instance of this class. This class stores the characters used in the document + * and other specifics unique to the current working document. + * + * @param fontName the font name * @param indirectReference the indirect reference to the font - * @param baseFont the BaseFont + * @param baseFont the BaseFont */ FontDetails(PdfName fontName, PdfIndirectReference indirectReference, BaseFont baseFont) { this.fontName = fontName; @@ -132,47 +130,50 @@ class FontDetails { break; case BaseFont.FONT_TYPE_CJK: cjkTag = new IntHashtable(); - cjkFont = (CJKFont)baseFont; + cjkFont = (CJKFont) baseFont; break; case BaseFont.FONT_TYPE_TTUNI: longTag = new HashMap<>(); - ttu = (TrueTypeFontUnicode)baseFont; + ttu = (TrueTypeFontUnicode) baseFont; symbolic = baseFont.isFontSpecific(); break; } } - + /** * Gets the indirect reference to this font. + * * @return the indirect reference to this font - */ + */ PdfIndirectReference getIndirectReference() { return indirectReference; } - + /** * Gets the font name as it appears in the document body. + * * @return the font name - */ + */ PdfName getFontName() { return fontName; } - + /** * Gets the BaseFont of this font. + * * @return the BaseFont of this font - */ + */ BaseFont getBaseFont() { return baseFont; } - + /** - * Converts the text into bytes to be placed in the document. - * The conversion is done according to the font and the encoding and the characters - * used are stored. + * Converts the text into bytes to be placed in the document. The conversion is done according to the font and the + * encoding and the characters used are stored. + * * @param text the text to convert * @return the conversion - */ + */ byte[] convertToBytes(String text, TextRenderingOptions options) { byte[] b = null; switch (fontType) { @@ -182,13 +183,16 @@ byte[] convertToBytes(String text, TextRenderingOptions options) { case BaseFont.FONT_TYPE_TT: { b = baseFont.convertToBytes(text); int len = b.length; - for (byte b1 : b) shortTag[b1 & 0xff] = 1; + for (byte b1 : b) { + shortTag[b1 & 0xff] = 1; + } break; } case BaseFont.FONT_TYPE_CJK: { int len = text.length(); - for (int k = 0; k < len; ++k) + for (int k = 0; k < len; ++k) { cjkTag.put(cjkFont.getCidCode(text.charAt(k)), 0); + } b = baseFont.convertToBytes(text); break; } @@ -207,27 +211,28 @@ byte[] convertToBytes(String text, TextRenderingOptions options) { len = b.length; for (int k = 0; k < len; ++k) { metrics = ttu.getMetricsTT(b[k] & 0xff); - if (metrics == null) + if (metrics == null) { continue; - longTag.put(metrics[0], new int[]{metrics[0], metrics[1], ttu.getUnicodeDifferences(b[k] & 0xff)}); - glyph[i++] = (char)metrics[0]; + } + longTag.put(metrics[0], + new int[]{metrics[0], metrics[1], ttu.getUnicodeDifferences(b[k] & 0xff)}); + glyph[i++] = (char) metrics[0]; } String s = new String(glyph, 0, i); b = s.getBytes(CJKFont.CJK_ENCODING); - } - else { - String fileName = ((TrueTypeFontUnicode)getBaseFont()).fileName; - if (options.isGlyphSubstitutionEnabled() && FopGlyphProcessor.isFopSupported() - && (fileName!=null && fileName.length()>0 - &&( fileName.contains(".ttf") || fileName.contains(".TTF")))){ - return FopGlyphProcessor.convertToBytesWithGlyphs(ttu,text,fileName,longTag, options.getDocumentLanguage()); - }else { + } else { + String fileName = ((TrueTypeFontUnicode) getBaseFont()).fileName; + if (options.isGlyphSubstitutionEnabled() && FopGlyphProcessor.isFopSupported() + && (fileName != null && fileName.length() > 0 + && (fileName.contains(".ttf") || fileName.contains(".TTF")))) { + return FopGlyphProcessor.convertToBytesWithGlyphs(ttu, text, fileName, longTag, + options.getDocumentLanguage()); + } else { return convertToBytesWithGlyphs(text); } } - } - catch (UnsupportedEncodingException e) { + } catch (UnsupportedEncodingException e) { throw new ExceptionConverter(e); } break; @@ -246,17 +251,18 @@ private byte[] convertToBytesWithGlyphs(String text) throws UnsupportedEncodingE if (Utilities.isSurrogatePair(text, k)) { val = Utilities.convertToUtf32(text, k); k++; - } - else { + } else { val = text.charAt(k); } metrics = ttu.getMetricsTT(val); - if (metrics == null) + if (metrics == null) { continue; + } int m0 = metrics[0]; Integer gl = m0; - if (!longTag.containsKey(gl)) + if (!longTag.containsKey(gl)) { longTag.put(gl, new int[]{m0, metrics[1], val}); + } glyph[i++] = m0; } return getCJKEncodingBytes(glyph, i); @@ -266,8 +272,8 @@ private byte[] getCJKEncodingBytes(int[] glyph, int size) { byte[] result = new byte[size * 2]; for (int i = 0; i < size; i++) { int g = glyph[i]; - result[i * 2] = (byte)(g >> 8); - result[i * 2 + 1] = (byte)(g & 0xFF); + result[i * 2] = (byte) (g >> 8); + result[i * 2 + 1] = (byte) (g & 0xFF); } return result; } @@ -275,18 +281,18 @@ private byte[] getCJKEncodingBytes(int[] glyph, int size) { byte[] convertToBytes(GlyphVector glyphVector) { return convertToBytes(glyphVector, 0, glyphVector.getNumGlyphs()); } - + byte[] convertToBytes(GlyphVector glyphVector, int beginIndex, int endIndex) { if (fontType != BaseFont.FONT_TYPE_TTUNI || symbolic) { throw new UnsupportedOperationException("Only supported for True Type Unicode fonts"); } - char[] glyphs = new char[endIndex-beginIndex]; + char[] glyphs = new char[endIndex - beginIndex]; int glyphCount = 0; for (int i = beginIndex; i < endIndex; i++) { int code = glyphVector.getGlyphCode(i); if (code == 0xFFFE || code == 0xFFFF) {// considered non-glyphs by - // AWT + // AWT continue; } @@ -296,8 +302,8 @@ byte[] convertToBytes(GlyphVector glyphVector, int beginIndex, int endIndex) { if (!longTag.containsKey(codeKey)) { int glyphWidth = ttu.getGlyphWidth(code); Integer charCode = ttu.getCharacterCode(code); - int[] metrics = charCode != null ? new int[] { code, glyphWidth, charCode} : new int[] { - code, glyphWidth }; + int[] metrics = charCode != null ? new int[]{code, glyphWidth, charCode} : new int[]{ + code, glyphWidth}; longTag.put(codeKey, metrics); } } @@ -310,12 +316,13 @@ byte[] convertToBytes(GlyphVector glyphVector, int beginIndex, int endIndex) { throw new ExceptionConverter(e); } } - - + + /** * Writes the font definition to the document. + * * @param writer the PdfWriter of this document - */ + */ void writeFont(PdfWriter writer) { try { switch (fontType) { @@ -327,12 +334,14 @@ void writeFont(PdfWriter writer) { int firstChar; int lastChar; for (firstChar = 0; firstChar < 256; ++firstChar) { - if (shortTag[firstChar] != 0) + if (shortTag[firstChar] != 0) { break; + } } for (lastChar = 255; lastChar >= firstChar; --lastChar) { - if (shortTag[lastChar] != 0) + if (shortTag[lastChar] != 0) { break; + } } if (firstChar > 255) { firstChar = 255; @@ -348,25 +357,24 @@ void writeFont(PdfWriter writer) { baseFont.writeFont(writer, indirectReference, new Object[]{longTag, subset}); break; } - } - catch(Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } } - + /** - * Indicates if all the glyphs and widths for that particular - * encoding should be included in the document. + * Indicates if all the glyphs and widths for that particular encoding should be included in the document. + * * @return false to include all the glyphs and widths. */ public boolean isSubset() { return subset; } - + /** - * Indicates if all the glyphs and widths for that particular - * encoding should be included in the document. Set to false - * to include all. + * Indicates if all the glyphs and widths for that particular encoding should be included in the document. Set to + * false to include all. + * * @param subset new value of property subset */ public void setSubset(boolean subset) { diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/FontMapper.java b/openpdf/src/main/java/com/lowagie/text/pdf/FontMapper.java index fa31700e4..fab625f58 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/FontMapper.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/FontMapper.java @@ -50,10 +50,9 @@ import java.awt.Font; /** - * A FontMapper implementation handles mappings between AWT Fonts and PDF - * fonts. An interface is used instead of a fixed class because there isn't - * an exact correlation between the font types, so each application is free - * to define a mapping which is appropriate for it. + * A FontMapper implementation handles mappings between AWT Fonts and PDF fonts. An interface is used instead of a fixed + * class because there isn't an exact correlation between the font types, so each application is free to define a + * mapping which is appropriate for it. */ public interface FontMapper { @@ -61,8 +60,8 @@ public interface FontMapper { /** * Returns a BaseFont which can be used to represent the given AWT Font * - * @param font the font to be converted - * @return a BaseFont which has similar properties to the provided Font + * @param font the font to be converted + * @return a BaseFont which has similar properties to the provided Font */ BaseFont awtToPdf(Font font); @@ -70,9 +69,9 @@ public interface FontMapper { /** * Returns an AWT Font which can be used to represent the given BaseFont * - * @param font the font to be converted - * @param size the desired point size of the resulting font - * @return a Font which has similar properties to the provided BaseFont + * @param font the font to be converted + * @param size the desired point size of the resulting font + * @return a Font which has similar properties to the provided BaseFont */ Font pdfToAwt(BaseFont font, int size); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/FontSelector.java b/openpdf/src/main/java/com/lowagie/text/pdf/FontSelector.java index 8262849c0..1b4c49639 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/FontSelector.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/FontSelector.java @@ -46,21 +46,21 @@ */ package com.lowagie.text.pdf; -import java.awt.Color; -import java.util.ArrayList; - import com.lowagie.text.Chunk; import com.lowagie.text.Font; import com.lowagie.text.FontFactory; import com.lowagie.text.Phrase; import com.lowagie.text.Utilities; +import java.awt.Color; +import java.util.ArrayList; -/** Selects the appropriate fonts that contain the glyphs needed to - * render text correctly. The fonts are checked in order until the - * character is found. +/** + * Selects the appropriate fonts that contain the glyphs needed to render text correctly. The fonts are checked in order + * until the character is found. *

      - * The built in fonts "Symbol" and "ZapfDingbats", if used, have a special encoding - * to allow the characters to be referred by Unicode. + * The built in fonts "Symbol" and "ZapfDingbats", if used, have a special encoding to allow the characters to be + * referred by Unicode. + * * @author Paulo Soares (psoares@consiste.pt) */ public class FontSelector { @@ -75,6 +75,7 @@ public FontSelector() { /** * change the color of default font in FontSelector. + * * @param color the Color of default font */ public void setDefaultColor(Color color) { @@ -83,6 +84,7 @@ public void setDefaultColor(Color color) { /** * change the size of default font in FontSelector. + * * @param size the size of default font */ public void setDefaultSize(float size) { @@ -91,6 +93,7 @@ public void setDefaultSize(float size) { /** * Adds a Font to be searched for valid characters. + * * @param font the Font */ public void addFont(Font font) { @@ -104,8 +107,8 @@ public void addFont(Font font) { } /** - * Process the text so that it will render with a combination of fonts - * if needed. + * Process the text so that it will render with a combination of fonts if needed. + * * @param text the text * @return a Phrase with one or more chunks */ diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/FopGlyphProcessor.java b/openpdf/src/main/java/com/lowagie/text/pdf/FopGlyphProcessor.java index 020c8b9b4..d5b308a9d 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/FopGlyphProcessor.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/FopGlyphProcessor.java @@ -3,7 +3,6 @@ import java.io.UnsupportedEncodingException; import java.nio.IntBuffer; import java.util.Map; - import org.apache.fop.complexscripts.fonts.GlyphSubstitutionTable; import org.apache.fop.complexscripts.util.CharScript; import org.apache.fop.complexscripts.util.GlyphSequence; @@ -11,7 +10,8 @@ /** * Utilizing Fop advanced typography capabilities for TrueType fonts. - * @author Gajendra kumar (raaz2.gajendra@gmail.com) + * + * @author Gajendra kumar (raaz2.gajendra@gmail.com) */ public class FopGlyphProcessor { @@ -26,20 +26,20 @@ public class FopGlyphProcessor { } } - public static boolean isFopSupported(){ + public static boolean isFopSupported() { return isFopSupported; } public static byte[] convertToBytesWithGlyphs(BaseFont font, String text, String fileName, - Map longTag, String language) throws UnsupportedEncodingException { - TrueTypeFontUnicode ttu = (TrueTypeFontUnicode)font; + Map longTag, String language) throws UnsupportedEncodingException { + TrueTypeFontUnicode ttu = (TrueTypeFontUnicode) font; IntBuffer charBuffer = IntBuffer.allocate(text.length()); IntBuffer glyphBuffer = IntBuffer.allocate(text.length()); int textLength = text.length(); for (char c : text.toCharArray()) { int[] metrics = ttu.getMetricsTT(c); // metrics will be null in case glyph not defined in TTF font, skip these characters. - if (metrics == null){ + if (metrics == null) { textLength--; continue; } @@ -59,7 +59,7 @@ public static byte[] convertToBytesWithGlyphs(BaseFont font, String text, String } glyphSequence = gsubTable.substitute(glyphSequence, script, language); } - int limit = glyphSequence.getGlyphs().limit(); + int limit = glyphSequence.getGlyphs().limit(); int[] processedChars = glyphSequence.getGlyphs().array(); char[] charEncodedGlyphCodes = new char[limit]; @@ -68,7 +68,7 @@ public static byte[] convertToBytesWithGlyphs(BaseFont font, String text, String Integer glyphCode = processedChars[i]; if (!longTag.containsKey(glyphCode)) { longTag.put(glyphCode, - new int[] { processedChars[i], ttu.getGlyphWidth(processedChars[i]), charBuffer.get(i) }); + new int[]{processedChars[i], ttu.getGlyphWidth(processedChars[i]), charBuffer.get(i)}); } } return new String(charEncodedGlyphCodes).getBytes(CJKFont.CJK_ENCODING); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/GlyphList.java b/openpdf/src/main/java/com/lowagie/text/pdf/GlyphList.java index 1391caead..34e59bb84 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/GlyphList.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/GlyphList.java @@ -49,77 +49,77 @@ package com.lowagie.text.pdf; +import com.lowagie.text.pdf.fonts.FontsResourceAnchor; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.util.HashMap; import java.util.StringTokenizer; -import com.lowagie.text.pdf.fonts.FontsResourceAnchor; - public class GlyphList { - private static HashMap unicode2names = new HashMap<>(); - private static HashMap names2unicode = new HashMap<>(); + private static HashMap unicode2names = new HashMap<>(); + private static HashMap names2unicode = new HashMap<>(); - static { - InputStream is = null; - try { - is = BaseFont.getResourceStream(BaseFont.RESOURCE_PATH + "glyphlist.txt", FontsResourceAnchor.class.getClassLoader()); - if (is == null) { - String msg = "glyphlist.txt not found as resource. (It must exist as resource in the package com.lowagie.text.pdf.fonts)"; - throw new Exception(msg); - } - byte[] buf = new byte[1024]; - ByteArrayOutputStream out = new ByteArrayOutputStream(); - while (true) { - int size = is.read(buf); - if (size < 0) { - break; - } - out.write(buf, 0, size); - } - is.close(); - is = null; - String s = PdfEncodings.convertToString(out.toByteArray(), null); - StringTokenizer tk = new StringTokenizer(s, "\r\n"); - while (tk.hasMoreTokens()) { - String line = tk.nextToken(); - if (line.startsWith("#")) { - continue; - } - StringTokenizer t2 = new StringTokenizer(line, " ;\r\n\t\f"); - String name; - String hex; - if (!t2.hasMoreTokens()) { - continue; - } - name = t2.nextToken(); - if (!t2.hasMoreTokens()) { - continue; - } - hex = t2.nextToken(); - Integer num = Integer.valueOf(hex, 16); - unicode2names.put(num, name); - names2unicode.put(name, new int[]{ num }); - } - } catch (Exception e) { - System.err.println("glyphlist.txt loading error: " + e.getMessage()); - } finally { - if (is != null) { + static { + InputStream is = null; try { - is.close(); + is = BaseFont.getResourceStream(BaseFont.RESOURCE_PATH + "glyphlist.txt", + FontsResourceAnchor.class.getClassLoader()); + if (is == null) { + String msg = "glyphlist.txt not found as resource. (It must exist as resource in the package com.lowagie.text.pdf.fonts)"; + throw new Exception(msg); + } + byte[] buf = new byte[1024]; + ByteArrayOutputStream out = new ByteArrayOutputStream(); + while (true) { + int size = is.read(buf); + if (size < 0) { + break; + } + out.write(buf, 0, size); + } + is.close(); + is = null; + String s = PdfEncodings.convertToString(out.toByteArray(), null); + StringTokenizer tk = new StringTokenizer(s, "\r\n"); + while (tk.hasMoreTokens()) { + String line = tk.nextToken(); + if (line.startsWith("#")) { + continue; + } + StringTokenizer t2 = new StringTokenizer(line, " ;\r\n\t\f"); + String name; + String hex; + if (!t2.hasMoreTokens()) { + continue; + } + name = t2.nextToken(); + if (!t2.hasMoreTokens()) { + continue; + } + hex = t2.nextToken(); + Integer num = Integer.valueOf(hex, 16); + unicode2names.put(num, name); + names2unicode.put(name, new int[]{num}); + } } catch (Exception e) { - // empty on purpose + System.err.println("glyphlist.txt loading error: " + e.getMessage()); + } finally { + if (is != null) { + try { + is.close(); + } catch (Exception e) { + // empty on purpose + } + } } - } } - } - public static int[] nameToUnicode(String name) { - return names2unicode.get(name); - } + public static int[] nameToUnicode(String name) { + return names2unicode.get(name); + } - public static String unicodeToName(int num) { - return unicode2names.get(num); - } + public static String unicodeToName(int num) { + return unicode2names.get(num); + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/GrayColor.java b/openpdf/src/main/java/com/lowagie/text/pdf/GrayColor.java index ff7556cbe..aeefb6f6d 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/GrayColor.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/GrayColor.java @@ -50,17 +50,14 @@ package com.lowagie.text.pdf; /** - * - * @author Paulo Soares (psoares@consiste.pt) + * @author Paulo Soares (psoares@consiste.pt) */ public class GrayColor extends ExtendedColor { - private static final long serialVersionUID = -6571835680819282746L; - - private float gray; - public static final GrayColor GRAYBLACK = new GrayColor(0); public static final GrayColor GRAYWHITE = new GrayColor(MAX_FLOAT_COLOR_VALUE); + private static final long serialVersionUID = -6571835680819282746L; + private float gray; public GrayColor(int intGray) { this(normalize(intGray) / MAX_INT_COLOR_VALUE); @@ -84,11 +81,11 @@ public float getGray() { } public boolean equals(Object obj) { - return obj instanceof GrayColor && ((GrayColor)obj).gray == this.gray; + return obj instanceof GrayColor && ((GrayColor) obj).gray == this.gray; } - + public int hashCode() { return Float.floatToIntBits(gray); } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/HyphenationAuto.java b/openpdf/src/main/java/com/lowagie/text/pdf/HyphenationAuto.java index 6afe6f30b..0555cb6c8 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/HyphenationAuto.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/HyphenationAuto.java @@ -50,53 +50,61 @@ import com.lowagie.text.pdf.hyphenation.Hyphenation; import com.lowagie.text.pdf.hyphenation.Hyphenator; -/** Hyphenates words automatically accordingly to the language and country. - * The hyphenator engine was taken from FOP and uses the TEX patterns. If a language - * is not provided and a TEX pattern for it exists, it can be easily adapted. +/** + * Hyphenates words automatically accordingly to the language and country. The hyphenator engine was taken from FOP and + * uses the TEX patterns. If a language is not provided and a TEX pattern for it exists, it can be easily adapted. * * @author Paulo Soares (psoares@consiste.pt) */ public class HyphenationAuto implements HyphenationEvent { - /** The hyphenator engine. - */ + /** + * The hyphenator engine. + */ protected Hyphenator hyphenator; - /** The second part of the hyphenated word. - */ + /** + * The second part of the hyphenated word. + */ protected String post; - - /** Creates a new hyphenation instance usable in Chunk. - * @param lang the language ("en" for English, for example) - * @param country the country ("GB" for Great-Britain or "none" for no country, for example) - * @param leftMin the minimum number of letters before the hyphen + + /** + * Creates a new hyphenation instance usable in Chunk. + * + * @param lang the language ("en" for English, for example) + * @param country the country ("GB" for Great-Britain or "none" for no country, for example) + * @param leftMin the minimum number of letters before the hyphen * @param rightMin the minimum number of letters after the hyphen - */ + */ public HyphenationAuto(String lang, String country, int leftMin, int rightMin) { hyphenator = new Hyphenator(lang, country, leftMin, rightMin); } - /** Gets the hyphen symbol. + /** + * Gets the hyphen symbol. + * * @return the hyphen symbol - */ + */ public String getHyphenSymbol() { return "-"; } - - /** Hyphenates a word and returns the first part of it. To get - * the second part of the hyphenated word call getHyphenatedWordPost(). - * @param word the word to hyphenate - * @param font the font used by this word - * @param fontSize the font size used by this word + + /** + * Hyphenates a word and returns the first part of it. To get the second part of the hyphenated word call + * getHyphenatedWordPost(). + * + * @param word the word to hyphenate + * @param font the font used by this word + * @param fontSize the font size used by this word * @param remainingWidth the width available to fit this word in - * @return the first part of the hyphenated word including - * the hyphen symbol, if any - */ + * @return the first part of the hyphenated word including the hyphen symbol, if any + */ public String getHyphenatedWordPre(String word, BaseFont font, float fontSize, float remainingWidth) { post = word; String hyphen = getHyphenSymbol(); float hyphenWidth = font.getWidthPoint(hyphen, fontSize); - if (hyphenWidth > remainingWidth) + if (hyphenWidth > remainingWidth) { return ""; + } Hyphenation hyphenation = hyphenator.hyphenate(word); if (hyphenation == null) { return ""; @@ -104,22 +112,25 @@ public String getHyphenatedWordPre(String word, BaseFont font, float fontSize, f int len = hyphenation.length(); int k; for (k = 0; k < len; ++k) { - if (font.getWidthPoint(hyphenation.getPreHyphenText(k), fontSize) + hyphenWidth > remainingWidth) + if (font.getWidthPoint(hyphenation.getPreHyphenText(k), fontSize) + hyphenWidth > remainingWidth) { break; + } } --k; - if (k < 0) + if (k < 0) { return ""; + } post = hyphenation.getPostHyphenText(k); return hyphenation.getPreHyphenText(k) + hyphen; } - - /** Gets the second part of the hyphenated word. Must be called - * after getHyphenatedWordPre(). + + /** + * Gets the second part of the hyphenated word. Must be called after getHyphenatedWordPre(). + * * @return the second part of the hyphenated word - */ + */ public String getHyphenatedWordPost() { return post; } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/HyphenationEvent.java b/openpdf/src/main/java/com/lowagie/text/pdf/HyphenationEvent.java index 12124ddec..0ae3f0714 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/HyphenationEvent.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/HyphenationEvent.java @@ -47,30 +47,35 @@ package com.lowagie.text.pdf; -/** Called by Chunk to hyphenate a word. +/** + * Called by Chunk to hyphenate a word. * * @author Paulo Soares (psoares@consiste.pt) */ public interface HyphenationEvent { - /** Gets the hyphen symbol. + /** + * Gets the hyphen symbol. + * * @return the hyphen symbol */ String getHyphenSymbol(); - - /** Hyphenates a word and returns the first part of it. To get - * the second part of the hyphenated word call getHyphenatedWordPost(). - * @param word the word to hyphenate - * @param font the font used by this word - * @param fontSize the font size used by this word + + /** + * Hyphenates a word and returns the first part of it. To get the second part of the hyphenated word call + * getHyphenatedWordPost(). + * + * @param word the word to hyphenate + * @param font the font used by this word + * @param fontSize the font size used by this word * @param remainingWidth the width available to fit this word in - * @return the first part of the hyphenated word including - * the hyphen symbol, if any + * @return the first part of the hyphenated word including the hyphen symbol, if any */ String getHyphenatedWordPre(String word, BaseFont font, float fontSize, float remainingWidth); - - /** Gets the second part of the hyphenated word. Must be called - * after getHyphenatedWordPre(). + + /** + * Gets the second part of the hyphenated word. Must be called after getHyphenatedWordPre(). + * * @return the second part of the hyphenated word */ String getHyphenatedWordPost(); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/IntHashtable.java b/openpdf/src/main/java/com/lowagie/text/pdf/IntHashtable.java index 6d7c9cef2..ee34d54a4 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/IntHashtable.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/IntHashtable.java @@ -5,34 +5,34 @@ * reusing methods that were written by Paulo Soares. * Instead of being a hashtable that stores objects with an int as key, * it stores int values with an int as key. - * + * * This is the original license of the original class IntHashMap: - * + * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You 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. - * - * Note: originally released under the GNU LGPL v2.1, + * + * Note: originally released under the GNU LGPL v2.1, * but rereleased by the original author under the ASF license (above). */ package com.lowagie.text.pdf; +import com.lowagie.text.error_messages.MessageLocalization; import java.util.Arrays; import java.util.Iterator; import java.util.NoSuchElementException; -import com.lowagie.text.error_messages.MessageLocalization; /*** *

      A hash map that uses primitive ints for the key rather than objects.

      @@ -106,10 +106,12 @@ public IntHashtable(int initialCapacity) { public IntHashtable(int initialCapacity, float loadFactor) { super(); if (initialCapacity < 0) { - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("illegal.capacity.1", initialCapacity)); + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("illegal.capacity.1", initialCapacity)); } if (loadFactor <= 0) { - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("illegal.load.1", String.valueOf(loadFactor))); + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("illegal.load.1", String.valueOf(loadFactor))); } if (initialCapacity == 0) { initialCapacity = 1; @@ -122,7 +124,7 @@ public IntHashtable(int initialCapacity, float loadFactor) { /*** *

      Returns the number of keys in this hashtable.

      * - * @return the number of keys in this hashtable. + * @return the number of keys in this hashtable. */ public int size() { return count; @@ -151,7 +153,7 @@ public boolean isEmpty() { * value argument in this hashtable as * determined by the equals method; * false otherwise. - * @throws NullPointerException if the value is null. + * @throws NullPointerException if the value is null. * @see #containsKey(int) * @see #containsValue(int) * @see java.util.Map @@ -159,7 +161,7 @@ public boolean isEmpty() { public boolean contains(int value) { Entry[] tab = table; - for (int i = tab.length; i-- > 0;) { + for (int i = tab.length; i-- > 0; ) { for (Entry e = tab[i]; e != null; e = e.next) { if (e.value == value) { return true; @@ -167,7 +169,7 @@ public boolean contains(int value) { } } return false; - } + } /*** *

      Returns true if this HashMap maps one or more keys @@ -210,7 +212,7 @@ public boolean containsKey(int key) { *

      Returns the value to which the specified key is mapped in this map.

      * * @param key a key in the hashtable. - * @return the value to which the key is mapped in this hashtable; + * @return the value to which the key is mapped in this hashtable; * null if the key is not mapped to any value in * this hashtable. * @see #put(int, int) @@ -246,8 +248,8 @@ protected void rehash() { threshold = (int) (newCapacity * loadFactor); table = newMap; - for (int i = oldCapacity; i-- > 0;) { - for (Entry old = oldMap[i]; old != null;) { + for (int i = oldCapacity; i-- > 0; ) { + for (Entry old = oldMap[i]; old != null; ) { Entry e = old; old = old.next; @@ -270,7 +272,7 @@ protected void rehash() { * @param value the value. * @return the previous value of the specified key in this hashtable, * or null if it did not have one. - * @throws NullPointerException if the key is null. + * @throws NullPointerException if the key is null. * @see #get(int) */ public int put(int key, int value) { @@ -293,12 +295,12 @@ public int put(int key, int value) { tab = table; index = (hash & 0x7FFFFFFF) % tab.length; } - - // Creates the new entry. - Entry e = new Entry(hash, key, value, tab[index]); - tab[index] = e; - count++; - return 0; + + // Creates the new entry. + Entry e = new Entry(hash, key, value, tab[index]); + tab[index] = e; + count++; + return 0; } /*** @@ -309,7 +311,7 @@ public int put(int key, int value) { * hashtable.

      * * @param key the key that needs to be removed. - * @return the value to which the key had been mapped in this hashtable, + * @return the value to which the key had been mapped in this hashtable, * or null if the key did not have a mapping. */ public int remove(int key) { @@ -337,17 +339,79 @@ public int remove(int key) { */ public void clear() { Entry[] tab = table; - for (int index = tab.length; --index >= 0;) { + for (int index = tab.length; --index >= 0; ) { tab[index] = null; } count = 0; } - + + public Iterator getEntryIterator() { + return new IntHashtableIterator(table); + } + + public int[] toOrderedKeys() { + int[] res = getKeys(); + Arrays.sort(res); + return res; + } + +// extra methods by Paulo Soares: + + public int[] getKeys() { + int[] res = new int[count]; + int ptr = 0; + int index = table.length; + Entry entry = null; + while (true) { + if (entry == null) { + while ((index-- > 0) && ((entry = table[index]) == null)) + ; + } + if (entry == null) { + break; + } + Entry e = entry; + entry = e.next; + res[ptr++] = e.key; + } + return res; + } + + public int getOneKey() { + if (count == 0) { + return 0; + } + int index = table.length; + Entry entry = null; + while ((index-- > 0) && ((entry = table[index]) == null)) + ; + if (entry == null) { + return 0; + } + return entry.key; + } + + public Object clone() { + try { + IntHashtable t = (IntHashtable) super.clone(); + t.table = new Entry[table.length]; + for (int i = table.length; i-- > 0; ) { + t.table[i] = (table[i] != null) + ? (Entry) table[i].clone() : null; + } + return t; + } catch (CloneNotSupportedException e) { + // this shouldn't happen, since we are Cloneable + throw new InternalError(); + } + } + /*** *

      Innerclass that acts as a datastructure to create a new entry in the * table.

      */ static class Entry { + int hash; int key; int value; @@ -367,30 +431,34 @@ protected Entry(int hash, int key, int value, Entry next) { this.value = value; this.next = next; } - + // extra methods for inner class Entry by Paulo public int getKey() { return key; } + public int getValue() { return value; } + protected Object clone() { - Entry entry = new Entry(hash, key, value, (next != null) ? (Entry)next.clone() : null); + Entry entry = new Entry(hash, key, value, (next != null) ? (Entry) next.clone() : null); return entry; } } - + // extra inner class by Paulo static class IntHashtableIterator implements Iterator { + int index; Entry[] table; Entry entry; - + IntHashtableIterator(Entry[] table) { this.table = table; this.index = table.length; } + public boolean hasNext() { if (entry != null) { return true; @@ -402,10 +470,11 @@ public boolean hasNext() { } return false; } - + public Object next() { if (entry == null) { - while ((index-- > 0) && ((entry = table[index]) == null)); + while ((index-- > 0) && ((entry = table[index]) == null)) + ; } if (entry != null) { Entry e = entry; @@ -414,63 +483,9 @@ public Object next() { } throw new NoSuchElementException(MessageLocalization.getComposedMessage("inthashtableiterator")); } + public void remove() { throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("remove.not.supported")); } } - -// extra methods by Paulo Soares: - - public Iterator getEntryIterator() { - return new IntHashtableIterator(table); - } - - public int[] toOrderedKeys() { - int[] res = getKeys(); - Arrays.sort(res); - return res; - } - - public int[] getKeys() { - int[] res = new int[count]; - int ptr = 0; - int index = table.length; - Entry entry = null; - while (true) { - if (entry == null) - while ((index-- > 0) && ((entry = table[index]) == null)); - if (entry == null) - break; - Entry e = entry; - entry = e.next; - res[ptr++] = e.key; - } - return res; - } - - public int getOneKey() { - if (count == 0) - return 0; - int index = table.length; - Entry entry = null; - while ((index-- > 0) && ((entry = table[index]) == null)); - if (entry == null) - return 0; - return entry.key; - } - - public Object clone() { - try { - IntHashtable t = (IntHashtable)super.clone(); - t.table = new Entry[table.length]; - for (int i = table.length ; i-- > 0 ; ) { - t.table[i] = (table[i] != null) - ? (Entry)table[i].clone() : null; - } - return t; - } catch (CloneNotSupportedException e) { - // this shouldn't happen, since we are Cloneable - throw new InternalError(); - } - } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/LZWDecoder.java b/openpdf/src/main/java/com/lowagie/text/pdf/LZWDecoder.java index 4ad171f45..146dd9c2c 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/LZWDecoder.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/LZWDecoder.java @@ -1,6 +1,6 @@ /* * Copyright 2002-2008 by Paulo Soares. - * + * * This code was originally released in 2001 by SUN (see class * com.sun.media.imageioimpl.plugins.tiff.TIFFLZWDecompressor.java) * using the BSD license in a specific wording. In a mail dating from @@ -8,51 +8,50 @@ * to use the code under the following version of the BSD license: * * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions - * are met: - * - * - Redistribution of source code must retain the above copyright + * are met: + * + * - Redistribution of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistribution in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in + * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * - * Neither the name of Sun Microsystems, Inc. or the names of - * contributors may be used to endorse or promote products derived + * + * Neither the name of Sun Microsystems, Inc. or the names of + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any - * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND - * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, + * + * This software is provided "AS IS," without a warranty of any + * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND + * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY - * EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL - * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF + * EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL + * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR + * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - * - * You acknowledge that this software is not designed or intended for - * use in the design, construction, operation or maintenance of any + * POSSIBILITY OF SUCH DAMAGES. + * + * You acknowledge that this software is not designed or intended for + * use in the design, construction, operation or maintenance of any * nuclear facility. */ package com.lowagie.text.pdf; + +import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.error_messages.MessageLocalization; import java.io.IOException; import java.io.OutputStream; -import com.lowagie.text.error_messages.MessageLocalization; -import com.lowagie.text.ExceptionConverter; /** * A class for performing LZW decoding. - * - * */ public class LZWDecoder { @@ -70,63 +69,63 @@ public class LZWDecoder { 2047, 4095 }; - + public LZWDecoder() { } - + /** * Method to decode LZW compressed data. * - * @param data The compressed data. - * @param uncompData Array to return the uncompressed data in. + * @param data The compressed data. + * @param uncompData Array to return the uncompressed data in. */ public void decode(byte[] data, OutputStream uncompData) { - - if(data[0] == (byte)0x00 && data[1] == (byte)0x01) { + + if (data[0] == (byte) 0x00 && data[1] == (byte) 0x01) { throw new RuntimeException(MessageLocalization.getComposedMessage("lzw.flavour.not.supported")); } - + initializeStringTable(); - + this.data = data; this.uncompData = uncompData; - + // Initialize pointers bytePointer = 0; bitPointer = 0; - + nextData = 0; nextBits = 0; - + int code, oldCode = 0; byte[] string; - + while ((code = getNextCode()) != 257) { - + if (code == 256) { - + initializeStringTable(); code = getNextCode(); - + if (code == 257) { break; } - + writeString(stringTable[code]); oldCode = code; - + } else { - + if (code < tableIndex) { - + string = stringTable[code]; - + writeString(string); addStringToTable(stringTable[oldCode], string[0]); oldCode = code; - + } else { - + string = stringTable[oldCode]; string = composeString(string, string[0]); writeString(string); @@ -136,24 +135,24 @@ public void decode(byte[] data, OutputStream uncompData) { } } } - - + + /** * Initialize the string table. */ public void initializeStringTable() { - + stringTable = new byte[8192][]; - - for (int i=0; i<256; i++) { + + for (int i = 0; i < 256; i++) { stringTable[i] = new byte[1]; - stringTable[i][0] = (byte)i; + stringTable[i][0] = (byte) i; } - + tableIndex = 258; bitsToGet = 9; } - + /** * Write out the string just uncompressed. * @@ -162,12 +161,11 @@ public void initializeStringTable() { public void writeString(byte[] string) { try { uncompData.write(string); - } - catch (IOException e) { + } catch (IOException e) { throw new ExceptionConverter(e); } } - + /** * Add a new string to the string table. * @@ -179,10 +177,10 @@ public void addStringToTable(byte[] oldString, byte newString) { byte[] string = new byte[length + 1]; System.arraycopy(oldString, 0, string, 0, length); string[length] = newString; - + // Add this new String to the table stringTable[tableIndex++] = string; - + if (tableIndex == 511) { bitsToGet = 10; } else if (tableIndex == 1023) { @@ -191,17 +189,17 @@ public void addStringToTable(byte[] oldString, byte newString) { bitsToGet = 12; } } - + /** * Add a new string to the string table. * * @param string bytes */ public void addStringToTable(byte[] string) { - + // Add this new String to the table stringTable[tableIndex++] = string; - + if (tableIndex == 511) { bitsToGet = 10; } else if (tableIndex == 1023) { @@ -210,7 +208,7 @@ public void addStringToTable(byte[] string) { bitsToGet = 12; } } - + /** * Append newString to the end of oldString. * @@ -223,10 +221,10 @@ public byte[] composeString(byte[] oldString, byte newString) { byte[] string = new byte[length + 1]; System.arraycopy(oldString, 0, string, 0, length); string[length] = newString; - + return string; } - + // Returns the next 9, 10, 11 or 12 bits public int getNextCode() { // Attempt to get the next code. The exception is caught to make @@ -236,18 +234,18 @@ public int getNextCode() { try { nextData = (nextData << 8) | (data[bytePointer++] & 0xff); nextBits += 8; - + if (nextBits < bitsToGet) { nextData = (nextData << 8) | (data[bytePointer++] & 0xff); nextBits += 8; } - + int code = - (nextData >> (nextBits - bitsToGet)) & andTable[bitsToGet-9]; + (nextData >> (nextBits - bitsToGet)) & andTable[bitsToGet - 9]; nextBits -= bitsToGet; - + return code; - } catch(ArrayIndexOutOfBoundsException e) { + } catch (ArrayIndexOutOfBoundsException e) { // Strip not terminated as expected: return EndOfInformation code. return 257; } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java b/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java index 86db322cc..c26db6c8b 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java @@ -258,8 +258,8 @@ public static void loadFont(BaseFont baseFont, String filename) { if (file.canRead()) { inputStream = Files.newInputStream(file.toPath()); } else if (filename.startsWith("file:/") || filename.startsWith("http://") - || filename.startsWith("https://") || filename.startsWith("jar:") - || filename.startsWith("wsjar:")) { + || filename.startsWith("https://") || filename.startsWith("jar:") + || filename.startsWith("wsjar:")) { inputStream = new URL(filename).openStream(); } else if ("-".equals(filename)) { inputStream = System.in; @@ -268,7 +268,7 @@ public static void loadFont(BaseFont baseFont, String filename) { } if (inputStream == null) { throw new IOException( - MessageLocalization.getComposedMessage("1.not.found.as.file.or.resource", filename)); + MessageLocalization.getComposedMessage("1.not.found.as.file.or.resource", filename)); } awtFont = java.awt.Font.createFont(java.awt.Font.TRUETYPE_FONT, inputStream); if (awtFont != null) { @@ -316,7 +316,7 @@ public static GlyphVector computeGlyphVector(BaseFont baseFont, float fontSize, Object runDirection = textAttributes.get(TextAttribute.RUN_DIRECTION); if (runDirection != null) { localFlags = runDirection == TextAttribute.RUN_DIRECTION_LTR ? java.awt.Font.LAYOUT_LEFT_TO_RIGHT : - java.awt.Font.LAYOUT_RIGHT_TO_LEFT; + java.awt.Font.LAYOUT_RIGHT_TO_LEFT; } } return awtFont.layoutGlyphVector(fontRenderContext, chars, 0, chars.length, localFlags); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java b/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java index 78ad06066..d16ba3dae 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java @@ -62,45 +62,80 @@ /** * A {@link java.nio.MappedByteBuffer} wrapped as a {@link java.io.RandomAccessFile} * - * @author Joakim Sandstroem - * Created on 6.9.2006 + * @author Joakim Sandstroem Created on 6.9.2006 */ public class MappedRandomAccessFile implements AutoCloseable { - + private MappedByteBuffer mappedByteBuffer = null; private FileChannel channel = null; - + /** * Constructs a new MappedRandomAccessFile instance + * * @param filename String - * @param mode String r, w or rw + * @param mode String r, w or rw * @throws FileNotFoundException on error - * @throws IOException on error + * @throws IOException on error */ public MappedRandomAccessFile(String filename, String mode) - throws IOException { - - if (mode.equals("rw")) + throws IOException { + + if (mode.equals("rw")) { init( new java.io.RandomAccessFile(filename, mode).getChannel(), FileChannel.MapMode.READ_WRITE); - else + } else { init( new FileInputStream(filename).getChannel(), FileChannel.MapMode.READ_ONLY); - + } + + } + + /** + * invokes the clean method on the ByteBuffer's cleaner + * + * @param buffer ByteBuffer + * @return boolean true on success + */ + public static boolean clean(final java.nio.ByteBuffer buffer) { + if (buffer == null || !buffer.isDirect()) { + return false; + } + return cleanJava11(buffer); + + } + + private static boolean cleanJava11(final ByteBuffer buffer) { + Boolean success = Boolean.FALSE; + try { + MethodHandles.Lookup lookup = MethodHandles.lookup(); + Class unsafeClass = Class.forName("sun.misc.Unsafe"); + MethodHandle methodHandle = lookup.findStatic(unsafeClass, "getUnsafe", MethodType.methodType(unsafeClass)); + Object theUnsafe = methodHandle.invoke(); + MethodHandle invokeCleanerMethod = lookup.findVirtual(unsafeClass, "invokeCleaner", + MethodType.methodType(void.class, ByteBuffer.class)); + invokeCleanerMethod.invoke(theUnsafe, buffer); + success = Boolean.TRUE; + } catch (Throwable ignore) { + // Ignore + } + return success; } - + /** * initializes the channel and mapped bytebuffer + * * @param channel FileChannel * @param mapMode FileChannel.MapMode * @throws IOException */ private void init(FileChannel channel, FileChannel.MapMode mapMode) - throws IOException { + throws IOException { - if (channel.size() > Integer.MAX_VALUE) throw new PdfException("The PDF file is too large. Max 2GB. Size: " + channel.size()); + if (channel.size() > Integer.MAX_VALUE) { + throw new PdfException("The PDF file is too large. Max 2GB. Size: " + channel.size()); + } this.channel = channel; this.mappedByteBuffer = channel.map(mapMode, 0L, channel.size()); @@ -108,40 +143,41 @@ private void init(FileChannel channel, FileChannel.MapMode mapMode) } /** - * @return FileChannel + * @return FileChannel * @since 2.0.8 */ public FileChannel getChannel() { return channel; } - + /** - * @see java.io.RandomAccessFile#read() * @return int next integer or -1 on EOF + * @see java.io.RandomAccessFile#read() */ public int read() { try { byte b = mappedByteBuffer.get(); int n = b & 0xff; - + return n; } catch (BufferUnderflowException e) { return -1; // EOF } } - + /** - * @see java.io.RandomAccessFile#read(byte[], int, int) * @param bytes byte[] - * @param off int offset - * @param len int length + * @param off int offset + * @param len int length * @return int bytes read or -1 on EOF + * @see java.io.RandomAccessFile#read(byte[], int, int) */ public int read(byte[] bytes, int off, int len) { int pos = mappedByteBuffer.position(); int limit = mappedByteBuffer.limit(); - if (pos == limit) + if (pos == limit) { return -1; // EOF + } int newlimit = pos + len - off; if (newlimit > limit) { len = limit - pos; // don't read beyond EOF @@ -149,31 +185,31 @@ public int read(byte[] bytes, int off, int len) { mappedByteBuffer.get(bytes, off, len); return len; } - + /** - * @see java.io.RandomAccessFile#getFilePointer() * @return long + * @see java.io.RandomAccessFile#getFilePointer() */ public long getFilePointer() { return mappedByteBuffer.position(); } - + /** - * @see java.io.RandomAccessFile#seek(long) * @param pos long position + * @see java.io.RandomAccessFile#seek(long) */ public void seek(long pos) { mappedByteBuffer.position((int) pos); } - + /** - * @see java.io.RandomAccessFile#length() * @return long length + * @see java.io.RandomAccessFile#length() */ public long length() { return mappedByteBuffer.limit(); } - + /** * Cleans the mapped bytebuffer and closes the channel * @@ -183,47 +219,20 @@ public long length() { public void close() throws IOException { clean(mappedByteBuffer); mappedByteBuffer = null; - if (channel != null) + if (channel != null) { channel.close(); + } channel = null; } - + /** * invokes the close method + * * @see java.lang.Object#finalize() */ protected void finalize() throws Throwable { close(); super.finalize(); } - - /** - * invokes the clean method on the ByteBuffer's cleaner - * @param buffer ByteBuffer - * @return boolean true on success - */ - public static boolean clean(final java.nio.ByteBuffer buffer) { - if (buffer == null || !buffer.isDirect()) { - return false; - } - return cleanJava11(buffer); - - } - - private static boolean cleanJava11(final ByteBuffer buffer) { - Boolean success = Boolean.FALSE; - try { - MethodHandles.Lookup lookup = MethodHandles.lookup(); - Class unsafeClass = Class.forName("sun.misc.Unsafe"); - MethodHandle methodHandle = lookup.findStatic(unsafeClass, "getUnsafe", MethodType.methodType(unsafeClass)); - Object theUnsafe = methodHandle.invoke(); - MethodHandle invokeCleanerMethod = lookup.findVirtual(unsafeClass, "invokeCleaner", MethodType.methodType(void.class, ByteBuffer.class)); - invokeCleanerMethod.invoke(theUnsafe, buffer); - success = Boolean.TRUE; - } catch (Throwable ignore) { - // Ignore - } - return success; - } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/MultiColumnText.java b/openpdf/src/main/java/com/lowagie/text/pdf/MultiColumnText.java index d66f47c8d..bb1054ea4 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/MultiColumnText.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/MultiColumnText.java @@ -49,34 +49,33 @@ package com.lowagie.text.pdf; -import java.util.ArrayList; -import java.util.List; - -import com.lowagie.text.error_messages.MessageLocalization; - import com.lowagie.text.Chunk; import com.lowagie.text.DocumentException; import com.lowagie.text.Element; import com.lowagie.text.ElementListener; import com.lowagie.text.Phrase; import com.lowagie.text.Rectangle; +import com.lowagie.text.error_messages.MessageLocalization; +import java.util.ArrayList; +import java.util.List; /** - * Formats content into one or more columns bounded by a - * rectangle. The columns may be simple rectangles or - * more complicated shapes. Add all of the columns before - * adding content. Column continuation is supported. A MultiColumnText object may be added to - * a document using Document.add. + * Formats content into one or more columns bounded by a rectangle. The columns may be simple rectangles or more + * complicated shapes. Add all of the columns before adding content. Column continuation is supported. A MultiColumnText + * object may be added to a document using Document.add. + * * @author Steve Appling */ public class MultiColumnText implements Element { - /** special constant for automatic calculation of height */ + /** + * special constant for automatic calculation of height + */ public static final float AUTOMATIC = -1f; /** - * total desiredHeight of columns. If AUTOMATIC, this means fill pages until done. - * This may be larger than one page + * total desiredHeight of columns. If AUTOMATIC, this means fill pages until done. This may be larger + * than one page */ private float desiredHeight; @@ -91,8 +90,8 @@ public class MultiColumnText implements Element { private boolean overflow; /** - * Top of the columns - y position on starting page. - * If AUTOMATIC, it means current y position when added to document + * Top of the columns - y position on starting page. If AUTOMATIC, it means current y position when + * added to document */ private float top; @@ -112,24 +111,24 @@ public class MultiColumnText implements Element { private boolean simple = true; private int currentColumn = 0; - + private float nextY = AUTOMATIC; - + private boolean columnsRightToLeft = false; - + private PdfDocument document; + /** - * Default constructor. Sets height to AUTOMATIC. - * Columns will repeat on each page as necessary to accommodate content length. + * Default constructor. Sets height to AUTOMATIC. Columns will repeat on each page as necessary to + * accommodate content length. */ public MultiColumnText() { this(AUTOMATIC); } /** - * Construct a MultiColumnText container of the specified height. - * If height is AUTOMATIC, fill complete pages until done. - * If a specific height is used, it may span one or more pages. + * Construct a MultiColumnText container of the specified height. If height is AUTOMATIC, fill complete + * pages until done. If a specific height is used, it may span one or more pages. * * @param height height */ @@ -143,11 +142,10 @@ public MultiColumnText(float height) { } /** - * Construct a MultiColumnText container of the specified height - * starting at the specified Y position. + * Construct a MultiColumnText container of the specified height starting at the specified Y position. * * @param height height - * @param top top + * @param top top */ public MultiColumnText(float top, float height) { columnDefs = new ArrayList<>(); @@ -158,13 +156,10 @@ public MultiColumnText(float top, float height) { columnText = new ColumnText(null); totalHeight = 0f; } - + /** - * Indicates that all of the text did not fit in the - * specified height. Note that isOverflow will return - * false before the MultiColumnText object has been - * added to the document. It will always be false if - * the height is AUTOMATIC. + * Indicates that all of the text did not fit in the specified height. Note that isOverflow will return false before + * the MultiColumnText object has been added to the document. It will always be false if the height is AUTOMATIC. * * @return true if there is still space left in the column */ @@ -173,9 +168,8 @@ public boolean isOverflow() { } /** - * Copy the parameters from the specified ColumnText to use - * when rendering. Parameters like setArabicOptions - * must be set in this way. + * Copy the parameters from the specified ColumnText to use when rendering. Parameters like + * setArabicOptions must be set in this way. * * @param sourceColumn source */ @@ -185,21 +179,22 @@ public void useColumnParams(ColumnText sourceColumn) { } /** - * Add a new column. The parameters are limits for each column - * wall in the format of a sequence of points (x1,y1,x2,y2,...). + * Add a new column. The parameters are limits for each column wall in the format of a sequence of points + * (x1,y1,x2,y2,...). * * @param left limits for left column * @param right limits for right column */ public void addColumn(float[] left, float[] right) { ColumnDef nextDef = new ColumnDef(left, right); - if (!nextDef.isSimple()) simple = false; + if (!nextDef.isSimple()) { + simple = false; + } columnDefs.add(nextDef); } /** - * Add a simple rectangular column with specified left - * and right x position boundaries. + * Add a simple rectangular column with specified left and right x position boundaries. * * @param left left boundary * @param right right boundary @@ -210,8 +205,8 @@ public void addSimpleColumn(float left, float right) { } /** - * Add the specified number of evenly spaced rectangular columns. - * Columns will be separated by the specified gutterWidth. + * Add the specified number of evenly spaced rectangular columns. Columns will be separated by the specified + * gutterWidth. * * @param left left boundary of first column * @param right right boundary of last column @@ -229,30 +224,29 @@ public void addRegularColumns(float left, float right, float gutterWidth, int nu } /** - * Adds a Phrase to the current text array. - * Will not have any effect if addElement() was called before. + * Adds a Phrase to the current text array. Will not have any effect if addElement() was called + * before. + * * @param phrase the text - * @since 2.1.5 + * @since 2.1.5 */ public void addText(Phrase phrase) { columnText.addText(phrase); } - + /** - * Adds a Chunk to the current text array. - * Will not have any effect if addElement() was called before. + * Adds a Chunk to the current text array. Will not have any effect if addElement() was called before. + * * @param chunk the text - * @since 2.1.5 + * @since 2.1.5 */ public void addText(Chunk chunk) { columnText.addText(chunk); } - + /** - * Add an element to be rendered in a column. - * Note that you can only add a Phrase - * or a Chunk if the columns are - * not all simple. This is an underlying restriction in + * Add an element to be rendered in a column. Note that you can only add a Phrase or a + * Chunk if the columns are not all simple. This is an underlying restriction in * {@link com.lowagie.text.pdf.ColumnText} * * @param element element to add @@ -266,16 +260,18 @@ public void addElement(Element element) throws DocumentException { } else if (element instanceof Chunk) { columnText.addText((Chunk) element); } else { - throw new DocumentException(MessageLocalization.getComposedMessage("can.t.add.1.to.multicolumntext.with.complex.columns", element.getClass())); + throw new DocumentException( + MessageLocalization.getComposedMessage("can.t.add.1.to.multicolumntext.with.complex.columns", + element.getClass())); } } /** - * Write out the columns. After writing, use - * {@link #isOverflow()} to see if all text was written. - * @param canvas PdfContentByte to write with - * @param document document to write to (only used to get page limit info) + * Write out the columns. After writing, use {@link #isOverflow()} to see if all text was written. + * + * @param canvas PdfContentByte to write with + * @param document document to write to (only used to get page limit info) * @param documentY starting y position to begin writing at * @return the current height (y position) after writing the columns * @throws DocumentException on error @@ -292,17 +288,18 @@ public float write(PdfContentByte canvas, PdfDocument document, float documentY) try { while (!done) { if (top == AUTOMATIC) { - top = document.getVerticalPosition(true); // RS - 07/07/2005 - Get current doc writing position for top of columns on new page. - } - else if (nextY == AUTOMATIC) { - nextY = document.getVerticalPosition(true); // RS - 07/07/2005 - - Get current doc writing position for top of columns on new page. + top = document.getVerticalPosition( + true); // RS - 07/07/2005 - Get current doc writing position for top of columns on new page. + } else if (nextY == AUTOMATIC) { + nextY = document.getVerticalPosition( + true); // RS - 07/07/2005 - - Get current doc writing position for top of columns on new page. } ColumnDef currentDef = columnDefs.get(getCurrentColumn()); columnText.setYLine(top); float[] left = currentDef.resolvePositions(Rectangle.LEFT); float[] right = currentDef.resolvePositions(Rectangle.RIGHT); - if (document.isMarginMirroring() && document.getPageNumber() % 2 == 0){ + if (document.isMarginMirroring() && document.getPageNumber() % 2 == 0) { float delta = document.rightMargin() - document.left(); left = left.clone(); right = right.clone(); @@ -313,7 +310,7 @@ else if (nextY == AUTOMATIC) { right[i] -= delta; } } - + currentHeight = Math.max(currentHeight, getHeight(left, right)); if (currentDef.isSimple()) { @@ -354,8 +351,7 @@ private void newPage() throws DocumentException { resetCurrentColumn(); if (desiredHeight == AUTOMATIC) { top = nextY = AUTOMATIC; - } - else { + } else { top = nextY; } totalHeight = 0; @@ -363,7 +359,7 @@ private void newPage() throws DocumentException { document.newPage(); } } - + /** * Figure out the height of a column from the border extents * @@ -394,8 +390,8 @@ private float getHeight(float[] left, float[] right) { * Processes the element by adding it to an * ElementListener. * - * @param listener an ElementListener - * @return true if the element was processed successfully + * @param listener an ElementListener + * @return true if the element was processed successfully */ public boolean process(ElementListener listener) { try { @@ -408,7 +404,7 @@ public boolean process(ElementListener listener) { /** * Gets the type of the text element. * - * @return a type + * @return a type */ public int type() { @@ -418,16 +414,16 @@ public int type() { /** * Returns null - not used * - * @return null + * @return null */ public ArrayList getChunks() { return null; } - + /** * @see com.lowagie.text.Element#isContent() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isContent() { return true; @@ -435,15 +431,14 @@ public boolean isContent() { /** * @see com.lowagie.text.Element#isNestable() - * @since iText 2.0.8 + * @since iText 2.0.8 */ public boolean isNestable() { return false; } /** - * Calculates the appropriate y position for the bottom - * of the columns on this page. + * Calculates the appropriate y position for the bottom of the columns on this page. * * @return the y position of the bottom of the columns */ @@ -456,10 +451,10 @@ private float getColumnBottom() { } /** - * Moves the text insertion point to the beginning of the next column, issuing a page break if - * needed. + * Moves the text insertion point to the beginning of the next column, issuing a page break if needed. + * * @throws DocumentException on error - */ + */ public void nextColumn() throws DocumentException { currentColumn = (currentColumn + 1) % columnDefs.size(); top = nextY; @@ -470,24 +465,26 @@ public void nextColumn() throws DocumentException { /** * Gets the current column. + * * @return the current column */ public int getCurrentColumn() { if (columnsRightToLeft) { return (columnDefs.size() - currentColumn - 1); - } + } return currentColumn; } - + /** * Resets the current column. */ public void resetCurrentColumn() { currentColumn = 0; } - + /** * Shifts the current column. + * * @return true if the current column has changed */ public boolean shiftCurrentColumn() { @@ -497,52 +494,60 @@ public boolean shiftCurrentColumn() { } return false; } - + /** * Sets the direction of the columns. + * * @param direction true = right2left; false = left2right */ public void setColumnsRightToLeft(boolean direction) { columnsRightToLeft = direction; } - - /** Sets the ratio between the extra word spacing and the extra character spacing - * when the text is fully justified. - * Extra word spacing will grow spaceCharRatio times more than extra character spacing. - * If the ratio is PdfWriter.NO_SPACE_CHAR_RATIO then the extra character spacing - * will be zero. + + /** + * Sets the ratio between the extra word spacing and the extra character spacing when the text is fully justified. + * Extra word spacing will grow spaceCharRatio times more than extra character spacing. If the ratio + * is + * PdfWriter.NO_SPACE_CHAR_RATIO then the extra character spacing will be zero. + * * @param spaceCharRatio the ratio between the extra word spacing and the extra character spacing */ public void setSpaceCharRatio(float spaceCharRatio) { columnText.setSpaceCharRatio(spaceCharRatio); } - /** Sets the run direction. + /** + * Sets the run direction. + * * @param runDirection the run direction - */ + */ public void setRunDirection(int runDirection) { columnText.setRunDirection(runDirection); } - - /** Sets the arabic shaping options. The option can be AR_NOVOWEL, - * AR_COMPOSEDTASHKEEL and AR_LIG. + + /** + * Sets the arabic shaping options. The option can be AR_NOVOWEL, AR_COMPOSEDTASHKEEL and AR_LIG. + * * @param arabicOptions the arabic shaping options */ public void setArabicOptions(int arabicOptions) { columnText.setArabicOptions(arabicOptions); } - - /** Sets the default alignment + + /** + * Sets the default alignment + * * @param alignment the default alignment */ public void setAlignment(int alignment) { columnText.setAlignment(alignment); } - + /** * Inner class used to define a column */ private class ColumnDef { + private float[] left; private float[] right; @@ -574,11 +579,10 @@ private class ColumnDef { } /** - * Resolves the positions for the specified side of the column - * into real numbers once the top of the column is known. + * Resolves the positions for the specified side of the column into real numbers once the top of the column is + * known. * - * @param side either Rectangle.LEFT - * or Rectangle.RIGHT + * @param side either Rectangle.LEFT or Rectangle.RIGHT * @return the array of floats for the side */ float[] resolvePositions(int side) { @@ -606,7 +610,8 @@ private float[] resolvePositions(float[] positions) { /** * Checks if column definition is a simple rectangle - * @return true if it is a simple column + * + * @return true if it is a simple column */ private boolean isSimple() { return (left.length == 4 && right.length == 4) && (left[0] == left[2] && right[0] == right[2]); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/OcspClient.java b/openpdf/src/main/java/com/lowagie/text/pdf/OcspClient.java index fc0681db3..2e3772562 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/OcspClient.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/OcspClient.java @@ -51,12 +51,15 @@ /** * Interface for the OCSP Client. + * * @since 2.1.6 */ public interface OcspClient { + /** * Gets an encoded byte array. - * @return a byte array + * + * @return a byte array */ byte[] getEncoded(); } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/OcspClientBouncyCastle.java b/openpdf/src/main/java/com/lowagie/text/pdf/OcspClientBouncyCastle.java index e6e654b0a..c6de574dc 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/OcspClientBouncyCastle.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/OcspClientBouncyCastle.java @@ -98,6 +98,8 @@ * https://github.com/LibrePDF/OpenPDF */ +import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.error_messages.MessageLocalization; import java.io.BufferedOutputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -112,8 +114,6 @@ import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; import java.util.Random; - -import com.lowagie.text.ExceptionConverter; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; import org.bouncycastle.asn1.x509.ExtensionsGenerator; @@ -129,174 +129,178 @@ import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; - -import com.lowagie.text.error_messages.MessageLocalization; - /** * OcspClient implementation using BouncyCastle. - * + * * @author psoares * @since 2.1.6 */ public class OcspClientBouncyCastle implements OcspClient { - /** root certificate */ - private final X509Certificate rootCert; - /** check certificate */ - private final X509Certificate checkCert; - /** OCSP URL */ - private final String url; - /** HTTP proxy used to access the OCSP URL */ - private Proxy proxy; - /** - * Creates an instance of an OcspClient that will be using BouncyCastle. - * - * @param checkCert - * the check certificate - * @param rootCert - * the root certificate - * @param url - * the OCSP URL - */ - public OcspClientBouncyCastle(X509Certificate checkCert, - X509Certificate rootCert, String url) { - this.checkCert = checkCert; - this.rootCert = rootCert; - this.url = url; - } + /** + * root certificate + */ + private final X509Certificate rootCert; + /** + * check certificate + */ + private final X509Certificate checkCert; + /** + * OCSP URL + */ + private final String url; + /** + * HTTP proxy used to access the OCSP URL + */ + private Proxy proxy; + + /** + * Creates an instance of an OcspClient that will be using BouncyCastle. + * + * @param checkCert the check certificate + * @param rootCert the root certificate + * @param url the OCSP URL + */ + public OcspClientBouncyCastle(X509Certificate checkCert, + X509Certificate rootCert, String url) { + this.checkCert = checkCert; + this.rootCert = rootCert; + this.url = url; + } - /** - * Generates an OCSP request using BouncyCastle. - * - * @param issuerCert - * certificate of the issues - * @param serialNumber - * serial number - * @return an OCSP request - * @throws OCSPException - * @throws IOException - */ - private static OCSPReq generateOCSPRequest(X509Certificate issuerCert, - BigInteger serialNumber) throws OCSPException, IOException, - OperatorCreationException, CertificateEncodingException { - // Add provider BC - Provider prov = new org.bouncycastle.jce.provider.BouncyCastleProvider(); - Security.addProvider(prov); + /** + * Generates an OCSP request using BouncyCastle. + * + * @param issuerCert certificate of the issues + * @param serialNumber serial number + * @return an OCSP request + * @throws OCSPException + * @throws IOException + */ + private static OCSPReq generateOCSPRequest(X509Certificate issuerCert, + BigInteger serialNumber) throws OCSPException, IOException, + OperatorCreationException, CertificateEncodingException { + // Add provider BC + Provider prov = new org.bouncycastle.jce.provider.BouncyCastleProvider(); + Security.addProvider(prov); - // Generate the id for the certificate we are looking for - // OJO... Modificacion de - // Felix-------------------------------------------------- - // CertificateID id = new CertificateID(CertificateID.HASH_SHA1, issuerCert, - // serialNumber); - // Example from - // http://grepcode.com/file/repo1.maven.org/maven2/org.bouncycastle/bcmail-jdk16/1.46/org/bouncycastle/cert/ocsp/test/OCSPTest.java - DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder() - .setProvider(prov).build(); + // Generate the id for the certificate we are looking for + // OJO... Modificacion de + // Felix-------------------------------------------------- + // CertificateID id = new CertificateID(CertificateID.HASH_SHA1, issuerCert, + // serialNumber); + // Example from + // http://grepcode.com/file/repo1.maven.org/maven2/org.bouncycastle/bcmail-jdk16/1.46/org/bouncycastle/cert/ocsp/test/OCSPTest.java + DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder() + .setProvider(prov).build(); - CertificateID id = new CertificateID( - digCalcProv.get(CertificateID.HASH_SHA1), new JcaX509CertificateHolder( - issuerCert), serialNumber); + CertificateID id = new CertificateID( + digCalcProv.get(CertificateID.HASH_SHA1), new JcaX509CertificateHolder( + issuerCert), serialNumber); - // basic request generation with nonce - OCSPReqBuilder gen = new OCSPReqBuilder(); + // basic request generation with nonce + OCSPReqBuilder gen = new OCSPReqBuilder(); - gen.addRequest(id); + gen.addRequest(id); - // create details for nonce extension - // Vector oids = new Vector(); - // Vector values = new Vector(); - // oids.add(OCSPObjectIdentifiers.id_pkix_ocsp_nonce); - // values.add(new X509Extension(false, new DEROctetString(new - // DEROctetString(PdfEncryption.createDocumentId()).getEncoded()))); - // gen.setRequestExtensions(new X509Extensions(oids, values)); + // create details for nonce extension + // Vector oids = new Vector(); + // Vector values = new Vector(); + // oids.add(OCSPObjectIdentifiers.id_pkix_ocsp_nonce); + // values.add(new X509Extension(false, new DEROctetString(new + // DEROctetString(PdfEncryption.createDocumentId()).getEncoded()))); + // gen.setRequestExtensions(new X509Extensions(oids, values)); - // Add nonce extension - ExtensionsGenerator extGen = new ExtensionsGenerator(); - byte[] nonce = new byte[16]; - Random rand = new Random(); - rand.nextBytes(nonce); + // Add nonce extension + ExtensionsGenerator extGen = new ExtensionsGenerator(); + byte[] nonce = new byte[16]; + Random rand = new Random(); + rand.nextBytes(nonce); - extGen.addExtension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce, false, - new DEROctetString(nonce)); - gen.setRequestExtensions(extGen.generate()); + extGen.addExtension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce, false, + new DEROctetString(nonce)); + gen.setRequestExtensions(extGen.generate()); - // Build request - return gen.build(); - // ****************************************************************************** - } + // Build request + return gen.build(); + // ****************************************************************************** + } - /** - * @return a byte array - * @see com.lowagie.text.pdf.OcspClient - */ - @Override - public byte[] getEncoded() { - try { - OCSPReq request = generateOCSPRequest(rootCert, - checkCert.getSerialNumber()); - byte[] array = request.getEncoded(); - URL urlt = new URL(url); - Proxy tmpProxy = proxy == null ? Proxy.NO_PROXY : proxy; - HttpURLConnection con = (HttpURLConnection) urlt.openConnection(tmpProxy); - con.setRequestProperty("Content-Type", "application/ocsp-request"); - con.setRequestProperty("Accept", "application/ocsp-response"); - con.setDoOutput(true); - OutputStream out = con.getOutputStream(); - DataOutputStream dataOut = new DataOutputStream(new BufferedOutputStream( - out)); - dataOut.write(array); - dataOut.flush(); - dataOut.close(); - if (con.getResponseCode() / 100 != 2) { - throw new IOException(MessageLocalization.getComposedMessage( - "invalid.http.response.1", con.getResponseCode())); - } - // Get Response - InputStream in = (InputStream) con.getContent(); - OCSPResp ocspResponse = new OCSPResp(in); + /** + * @return a byte array + * @see com.lowagie.text.pdf.OcspClient + */ + @Override + public byte[] getEncoded() { + try { + OCSPReq request = generateOCSPRequest(rootCert, + checkCert.getSerialNumber()); + byte[] array = request.getEncoded(); + URL urlt = new URL(url); + Proxy tmpProxy = proxy == null ? Proxy.NO_PROXY : proxy; + HttpURLConnection con = (HttpURLConnection) urlt.openConnection(tmpProxy); + con.setRequestProperty("Content-Type", "application/ocsp-request"); + con.setRequestProperty("Accept", "application/ocsp-response"); + con.setDoOutput(true); + OutputStream out = con.getOutputStream(); + DataOutputStream dataOut = new DataOutputStream(new BufferedOutputStream( + out)); + dataOut.write(array); + dataOut.flush(); + dataOut.close(); + if (con.getResponseCode() / 100 != 2) { + throw new IOException(MessageLocalization.getComposedMessage( + "invalid.http.response.1", con.getResponseCode())); + } + // Get Response + InputStream in = (InputStream) con.getContent(); + OCSPResp ocspResponse = new OCSPResp(in); - if (ocspResponse.getStatus() != 0) - throw new IOException(MessageLocalization.getComposedMessage( - "invalid.status.1", ocspResponse.getStatus())); - BasicOCSPResp basicResponse = (BasicOCSPResp) ocspResponse - .getResponseObject(); - if (basicResponse != null) { - SingleResp[] responses = basicResponse.getResponses(); - if (responses.length == 1) { - SingleResp resp = responses[0]; - Object status = resp.getCertStatus(); - if (status == null) { - return basicResponse.getEncoded(); - } else if (status instanceof org.bouncycastle.cert.ocsp.RevokedStatus) { - throw new IOException( - MessageLocalization - .getComposedMessage("ocsp.status.is.revoked")); - } else { - throw new IOException( - MessageLocalization - .getComposedMessage("ocsp.status.is.unknown")); - } + if (ocspResponse.getStatus() != 0) { + throw new IOException(MessageLocalization.getComposedMessage( + "invalid.status.1", ocspResponse.getStatus())); + } + BasicOCSPResp basicResponse = (BasicOCSPResp) ocspResponse + .getResponseObject(); + if (basicResponse != null) { + SingleResp[] responses = basicResponse.getResponses(); + if (responses.length == 1) { + SingleResp resp = responses[0]; + Object status = resp.getCertStatus(); + if (status == null) { + return basicResponse.getEncoded(); + } else if (status instanceof org.bouncycastle.cert.ocsp.RevokedStatus) { + throw new IOException( + MessageLocalization + .getComposedMessage("ocsp.status.is.revoked")); + } else { + throw new IOException( + MessageLocalization + .getComposedMessage("ocsp.status.is.unknown")); + } + } + } + } catch (Exception ex) { + throw new ExceptionConverter(ex); } - } - } catch (Exception ex) { - throw new ExceptionConverter(ex); + return null; } - return null; - } - /** - * Sets Proxy which will be used for URL connection. - * @param aProxy Proxy to set - */ - public void setProxy(final Proxy aProxy) { - this.proxy = aProxy; - } + /** + * Returns Proxy object used for URL connections. + * + * @return configured proxy + */ + public Proxy getProxy() { + return proxy; + } - /** - * Returns Proxy object used for URL connections. - * @return configured proxy - */ - public Proxy getProxy() { - return proxy; - } + /** + * Sets Proxy which will be used for URL connection. + * + * @param aProxy Proxy to set + */ + public void setProxy(final Proxy aProxy) { + this.proxy = aProxy; + } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/OutputStreamCounter.java b/openpdf/src/main/java/com/lowagie/text/pdf/OutputStreamCounter.java index 4653638da..d9e91c26e 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/OutputStreamCounter.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/OutputStreamCounter.java @@ -45,18 +45,18 @@ * https://github.com/LibrePDF/OpenPDF */ package com.lowagie.text.pdf; + import java.io.IOException; import java.io.OutputStream; /** - * - * @author psoares + * @author psoares */ public class OutputStreamCounter extends OutputStream { - + protected OutputStream out; protected long counter = 0; - + /** * Creates a new instance of OutputStreamCounter * @@ -65,84 +65,73 @@ public class OutputStreamCounter extends OutputStream { public OutputStreamCounter(OutputStream out) { this.out = out; } - - /** Closes this output stream and releases any system resources - * associated with this stream. The general contract of close - * is that it closes the output stream. A closed stream cannot perform - * output operations and cannot be reopened. + + /** + * Closes this output stream and releases any system resources associated with this stream. The general contract of + * close is that it closes the output stream. A closed stream cannot perform output operations and + * cannot be reopened. *

      * The close method of OutputStream does nothing. * - * @exception IOException if an I/O error occurs. - * + * @throws IOException if an I/O error occurs. */ public void close() throws IOException { out.close(); } - - /** Flushes this output stream and forces any buffered output bytes - * to be written out. The general contract of flush is - * that calling it is an indication that, if any bytes previously - * written have been buffered by the implementation of the output - * stream, such bytes should immediately be written to their - * intended destination. + + /** + * Flushes this output stream and forces any buffered output bytes to be written out. The general contract of + * flush is that calling it is an indication that, if any bytes previously written have been buffered + * by the implementation of the output stream, such bytes should immediately be written to their intended + * destination. *

      * The flush method of OutputStream does nothing. * - * @exception IOException if an I/O error occurs. - * + * @throws IOException if an I/O error occurs. */ public void flush() throws IOException { out.flush(); } - - /** Writes b.length bytes from the specified byte array - * to this output stream. The general contract for write(b) - * is that it should have exactly the same effect as the call + + /** + * Writes b.length bytes from the specified byte array to this output stream. The general contract for + * write(b) is that it should have exactly the same effect as the call * write(b, 0, b.length). * - * @param b the data. - * @exception IOException if an I/O error occurs. - * @see java.io.OutputStream#write(byte[], int, int) - * + * @param b the data. + * @throws IOException if an I/O error occurs. + * @see java.io.OutputStream#write(byte[], int, int) */ public void write(byte[] b) throws IOException { counter += b.length; out.write(b); } - - /** Writes the specified byte to this output stream. The general - * contract for write is that one byte is written - * to the output stream. The byte to be written is the eight - * low-order bits of the argument b. The 24 - * high-order bits of b are ignored. + + /** + * Writes the specified byte to this output stream. The general contract for write is that one byte is + * written to the output stream. The byte to be written is the eight low-order bits of the argument b. + * The 24 high-order bits of b are ignored. *

      - * Subclasses of OutputStream must provide an - * implementation for this method. - * - * @param b the byte. - * @exception IOException if an I/O error occurs. In particular, - * an IOException may be thrown if the - * output stream has been closed. + * Subclasses of OutputStream must provide an implementation for this method. * + * @param b the byte. + * @throws IOException if an I/O error occurs. In particular, an IOException may be thrown if the + * output stream has been closed. */ public void write(int b) throws IOException { ++counter; out.write(b); } - - /** Writes len bytes from the specified byte array - * starting at offset off to this output stream. - * The general contract for write(b, off, len) is that - * some of the bytes in the array b are written to the - * output stream in order; element b[off] is the first - * byte written and b[off+len-1] is the last byte written - * by this operation. + + /** + * Writes len bytes from the specified byte array starting at offset off to this output + * stream. The general contract for write(b, off, len) is that some of the bytes in the array + * b are written to the output stream in order; element b[off] is the first byte written + * and b[off+len-1] is the last byte written by this operation. *

      - * The write method of OutputStream calls - * the write method of one argument on each of the bytes to be - * written out. Subclasses are encouraged to override this method and - * provide a more efficient implementation. + * The write method of OutputStream calls the write method of one argument on each of the + * bytes to be written out. Subclasses are encouraged to override this method and provide a more efficient + * implementation. *

      * If b is null, a * NullPointerException is thrown. @@ -151,23 +140,21 @@ public void write(int b) throws IOException { * off+len is greater than the length of the array * b, then an IndexOutOfBoundsException is thrown. * - * @param b the data. - * @param off the start offset in the data. - * @param len the number of bytes to write. - * @exception IOException if an I/O error occurs. In particular, - * an IOException is thrown if the output - * stream is closed. - * + * @param b the data. + * @param off the start offset in the data. + * @param len the number of bytes to write. + * @throws IOException if an I/O error occurs. In particular, an IOException is thrown if the output + * stream is closed. */ public void write(byte[] b, int off, int len) throws IOException { counter += len; out.write(b, off, len); } - + public long getCounter() { return counter; } - + public void resetCounter() { counter = 0; } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/OutputStreamEncryption.java b/openpdf/src/main/java/com/lowagie/text/pdf/OutputStreamEncryption.java index b11378044..f03706068 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/OutputStreamEncryption.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/OutputStreamEncryption.java @@ -50,29 +50,29 @@ import com.lowagie.text.ExceptionConverter; import com.lowagie.text.pdf.crypto.AESCipher; -import com.lowagie.text.pdf.crypto.IVGenerator; import com.lowagie.text.pdf.crypto.ARCFOUREncryption; +import com.lowagie.text.pdf.crypto.IVGenerator; import java.io.IOException; import java.io.OutputStream; public class OutputStreamEncryption extends OutputStream { - + + private static final int AES_128 = 4; + private static final int AES_256_V3 = 6; protected OutputStream out; protected ARCFOUREncryption arcfour; protected AESCipher cipher; private byte[] sb = new byte[1]; - private static final int AES_128 = 4; - private static final int AES_256_V3 = 6; private boolean aes; private boolean finished; - + /** * Creates a new instance of OutputStreamCounter * - * @param key bytes for key - * @param len length - * @param off offset - * @param out output stream + * @param key bytes for key + * @param len length + * @param off offset + * @param out output stream * @param revision revision number */ public OutputStreamEncryption(OutputStream out, byte[] key, int off, int len, int revision) { @@ -85,8 +85,7 @@ public OutputStreamEncryption(OutputStream out, byte[] key, int off, int len, in System.arraycopy(key, off, nkey, 0, len); cipher = new AESCipher(true, nkey, iv); write(iv); - } - else { + } else { arcfour = new ARCFOUREncryption(); arcfour.prepareARCFOURKey(key, off, len); } @@ -94,88 +93,77 @@ public OutputStreamEncryption(OutputStream out, byte[] key, int off, int len, in throw new ExceptionConverter(ex); } } - + public OutputStreamEncryption(OutputStream out, byte[] key, int revision) { this(out, key, 0, key.length, revision); } - - /** Closes this output stream and releases any system resources - * associated with this stream. The general contract of close - * is that it closes the output stream. A closed stream cannot perform - * output operations and cannot be reopened. + + /** + * Closes this output stream and releases any system resources associated with this stream. The general contract of + * close is that it closes the output stream. A closed stream cannot perform output operations and + * cannot be reopened. *

      * The close method of OutputStream does nothing. * - * @exception IOException if an I/O error occurs. - * + * @throws IOException if an I/O error occurs. */ public void close() throws IOException { finish(); out.close(); } - - /** Flushes this output stream and forces any buffered output bytes - * to be written out. The general contract of flush is - * that calling it is an indication that, if any bytes previously - * written have been buffered by the implementation of the output - * stream, such bytes should immediately be written to their - * intended destination. + + /** + * Flushes this output stream and forces any buffered output bytes to be written out. The general contract of + * flush is that calling it is an indication that, if any bytes previously written have been buffered + * by the implementation of the output stream, such bytes should immediately be written to their intended + * destination. *

      * The flush method of OutputStream does nothing. * - * @exception IOException if an I/O error occurs. - * + * @throws IOException if an I/O error occurs. */ public void flush() throws IOException { out.flush(); } - - /** Writes b.length bytes from the specified byte array - * to this output stream. The general contract for write(b) - * is that it should have exactly the same effect as the call + + /** + * Writes b.length bytes from the specified byte array to this output stream. The general contract for + * write(b) is that it should have exactly the same effect as the call * write(b, 0, b.length). * - * @param b the data. - * @exception IOException if an I/O error occurs. - * @see java.io.OutputStream#write(byte[], int, int) - * + * @param b the data. + * @throws IOException if an I/O error occurs. + * @see java.io.OutputStream#write(byte[], int, int) */ public void write(byte[] b) throws IOException { write(b, 0, b.length); } - - /** Writes the specified byte to this output stream. The general - * contract for write is that one byte is written - * to the output stream. The byte to be written is the eight - * low-order bits of the argument b. The 24 - * high-order bits of b are ignored. + + /** + * Writes the specified byte to this output stream. The general contract for write is that one byte is + * written to the output stream. The byte to be written is the eight low-order bits of the argument b. + * The 24 high-order bits of b are ignored. *

      - * Subclasses of OutputStream must provide an - * implementation for this method. - * - * @param b the byte. - * @exception IOException if an I/O error occurs. In particular, - * an IOException may be thrown if the - * output stream has been closed. + * Subclasses of OutputStream must provide an implementation for this method. * + * @param b the byte. + * @throws IOException if an I/O error occurs. In particular, an IOException may be thrown if the + * output stream has been closed. */ public void write(int b) throws IOException { - sb[0] = (byte)b; + sb[0] = (byte) b; write(sb, 0, 1); } - - /** Writes len bytes from the specified byte array - * starting at offset off to this output stream. - * The general contract for write(b, off, len) is that - * some of the bytes in the array b are written to the - * output stream in order; element b[off] is the first - * byte written and b[off+len-1] is the last byte written - * by this operation. + + /** + * Writes len bytes from the specified byte array starting at offset off to this output + * stream. The general contract for write(b, off, len) is that some of the bytes in the array + * b are written to the output stream in order; element b[off] is the first byte written + * and b[off+len-1] is the last byte written by this operation. *

      - * The write method of OutputStream calls - * the write method of one argument on each of the bytes to be - * written out. Subclasses are encouraged to override this method and - * provide a more efficient implementation. + * The write method of OutputStream calls the write method of one argument on each of the + * bytes to be written out. Subclasses are encouraged to override this method and provide a more efficient + * implementation. *

      * If b is null, a * NullPointerException is thrown. @@ -184,22 +172,20 @@ public void write(int b) throws IOException { * off+len is greater than the length of the array * b, then an IndexOutOfBoundsException is thrown. * - * @param b the data. - * @param off the start offset in the data. - * @param len the number of bytes to write. - * @exception IOException if an I/O error occurs. In particular, - * an IOException is thrown if the output - * stream is closed. - * + * @param b the data. + * @param off the start offset in the data. + * @param len the number of bytes to write. + * @throws IOException if an I/O error occurs. In particular, an IOException is thrown if the output + * stream is closed. */ public void write(byte[] b, int off, int len) throws IOException { if (aes) { byte[] b2 = cipher.update(b, off, len); - if (b2 == null || b2.length == 0) + if (b2 == null || b2.length == 0) { return; + } out.write(b2, 0, b2.length); - } - else { + } else { byte[] b2 = new byte[Math.min(len, 4192)]; while (len > 0) { int sz = Math.min(len, b2.length); @@ -210,7 +196,7 @@ public void write(byte[] b, int off, int len) throws IOException { } } } - + public void finish() throws IOException { if (!finished) { finished = true; diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PRAcroForm.java b/openpdf/src/main/java/com/lowagie/text/pdf/PRAcroForm.java index b1dbe6080..d1657fc35 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PRAcroForm.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PRAcroForm.java @@ -57,36 +57,21 @@ import java.util.List; /** - * This class captures an AcroForm on input. Basically, it extends Dictionary - * by indexing the fields of an AcroForm + * This class captures an AcroForm on input. Basically, it extends Dictionary by indexing the fields of an AcroForm + * * @author Mark Thompson */ public class PRAcroForm extends PdfDictionary { - - /** - * This class holds the information for a single field - */ - public static class FieldInformation { - String name; - PdfDictionary info; - PRIndirectReference ref; - - FieldInformation(String name, PdfDictionary info, PRIndirectReference ref) { - this.name = name; this.info = info; this.ref = ref; - } - public String getName() { return name; } - public PdfDictionary getInfo() { return info; } - public PRIndirectReference getRef() { return ref; } - } ArrayList fields; ArrayList stack; HashMap fieldByName; PdfReader reader; - + /** * Constructor + * * @param reader reader of the input file */ public PRAcroForm(PdfReader reader) { @@ -95,69 +80,81 @@ public PRAcroForm(PdfReader reader) { fieldByName = new HashMap<>(); stack = new ArrayList<>(); } + /** * Number of fields found + * * @return size */ public int size() { return fields.size(); } - + public ArrayList getFields() { return fields; } - + public FieldInformation getField(String name) { return fieldByName.get(name); } - + /** * Given the title (/T) of a reference, return the associated reference + * * @param name a string containing the path * @return a reference to the field, or null */ public PRIndirectReference getRefByName(String name) { FieldInformation fi = fieldByName.get(name); - if (fi == null) return null; + if (fi == null) { + return null; + } return fi.getRef(); } + /** * Read, and comprehend the acroform + * * @param root the document root */ public void readAcroForm(PdfDictionary root) { - if (root == null) + if (root == null) { return; + } hashMap = root.hashMap; pushAttrib(root); - PdfArray fieldlist = (PdfArray)PdfReader.getPdfObjectRelease(root.get(PdfName.FIELDS)); + PdfArray fieldlist = (PdfArray) PdfReader.getPdfObjectRelease(root.get(PdfName.FIELDS)); iterateFields(fieldlist, null, null); } - + /** * After reading, we index all of the fields. Recursive. + * * @param fieldlist An array of fields * @param fieldDict the last field dictionary we encountered (recursively) - * @param title the pathname of the field, up to this point or null + * @param title the pathname of the field, up to this point or null */ protected void iterateFields(PdfArray fieldlist, PRIndirectReference fieldDict, String title) { for (PdfObject pdfObject : fieldlist.getElements()) { - PRIndirectReference ref = (PRIndirectReference)pdfObject; + PRIndirectReference ref = (PRIndirectReference) pdfObject; PdfDictionary dict = (PdfDictionary) PdfReader.getPdfObjectRelease(ref); - + // if we are not a field dictionary, pass our parent's values PRIndirectReference myFieldDict = fieldDict; String myTitle = title; - PdfString tField = (PdfString)dict.get(PdfName.T); + PdfString tField = (PdfString) dict.get(PdfName.T); boolean isFieldDict = tField != null; - + if (isFieldDict) { myFieldDict = ref; - if (title == null) myTitle = tField.toString(); - else myTitle = title + '.' + tField.toString(); + if (title == null) { + myTitle = tField.toString(); + } else { + myTitle = title + '.' + tField.toString(); + } } - - PdfArray kids = (PdfArray)dict.get(PdfName.KIDS); + + PdfArray kids = (PdfArray) dict.get(PdfName.KIDS); if (kids != null) { pushAttrib(dict); List elements = kids.getElements(); @@ -170,13 +167,13 @@ protected void iterateFields(PdfArray fieldlist, PRIndirectReference fieldDict, } iterateFields(new PdfArray(elements), myFieldDict, myTitle); stack.remove(stack.size() - 1); // pop - } - else { // leaf node + } else { // leaf node if (myFieldDict != null) { PdfDictionary mergedDict = stack.get(stack.size() - 1); - if (isFieldDict) + if (isFieldDict) { mergedDict = mergeAttrib(mergedDict, dict); - + } + mergedDict.put(PdfName.T, new PdfString(myTitle)); FieldInformation fi = new FieldInformation(myTitle, mergedDict, myFieldDict); fields.add(fi); @@ -185,15 +182,19 @@ protected void iterateFields(PdfArray fieldlist, PRIndirectReference fieldDict, } } } + /** * merge field attributes from two dictionaries + * * @param parent one dictionary - * @param child the other dictionary + * @param child the other dictionary * @return a merged dictionary */ protected PdfDictionary mergeAttrib(PdfDictionary parent, PdfDictionary child) { PdfDictionary targ = new PdfDictionary(); - if (parent != null) targ.putAll(parent); + if (parent != null) { + targ.putAll(parent); + } for (PdfName key : child.getKeys()) { if (key.equals(PdfName.DR) || key.equals(PdfName.DA) || @@ -206,8 +207,10 @@ protected PdfDictionary mergeAttrib(PdfDictionary parent, PdfDictionary child) { } return targ; } + /** * stack a level of dictionary. Merge in a dictionary from this level + * * @param dict the PfdDictionary */ protected void pushAttrib(PdfDictionary dict) { @@ -218,4 +221,32 @@ protected void pushAttrib(PdfDictionary dict) { dic = mergeAttrib(dic, dict); stack.add(dic); } + + /** + * This class holds the information for a single field + */ + public static class FieldInformation { + + String name; + PdfDictionary info; + PRIndirectReference ref; + + FieldInformation(String name, PdfDictionary info, PRIndirectReference ref) { + this.name = name; + this.info = info; + this.ref = ref; + } + + public String getName() { + return name; + } + + public PdfDictionary getInfo() { + return info; + } + + public PRIndirectReference getRef() { + return ref; + } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PRIndirectReference.java b/openpdf/src/main/java/com/lowagie/text/pdf/PRIndirectReference.java index 6e3b8e17c..642528e87 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PRIndirectReference.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PRIndirectReference.java @@ -48,44 +48,45 @@ */ package com.lowagie.text.pdf; + import java.io.IOException; import java.io.OutputStream; public class PRIndirectReference extends PdfIndirectReference { - + protected PdfReader reader; // membervariables - + // constructors - -/** - * Constructs a PdfIndirectReference. - * - * @param reader a PdfReader - * @param number the object number. - * @param generation the generation number. - */ - + + /** + * Constructs a PdfIndirectReference. + * + * @param reader a PdfReader + * @param number the object number. + * @param generation the generation number. + */ + public PRIndirectReference(PdfReader reader, int number, int generation) { type = INDIRECT; this.number = number; this.generation = generation; this.reader = reader; } - -/** - * Constructs a PdfIndirectReference. - * - * @param reader a PdfReader - * @param number the object number. - */ - + + /** + * Constructs a PdfIndirectReference. + * + * @param reader a PdfReader + * @param number the object number. + */ + public PRIndirectReference(PdfReader reader, int number) { this(reader, number, 0); } - + // methods - + public void toPdf(PdfWriter writer, OutputStream os) throws IOException { int n = writer.getNewObjectNumber(reader, number, generation); os.write(PdfEncodings.convertToBytes(new StringBuffer().append(n).append(" 0 R").toString(), null)); @@ -94,7 +95,7 @@ public void toPdf(PdfWriter writer, OutputStream os) throws IOException { public PdfReader getReader() { return reader; } - + public void setNumber(int number, int generation) { this.number = number; this.generation = generation; diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PRStream.java b/openpdf/src/main/java/com/lowagie/text/pdf/PRStream.java index d2cab3cf6..26d0bc33f 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PRStream.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PRStream.java @@ -49,26 +49,25 @@ package com.lowagie.text.pdf; +import com.lowagie.text.Document; +import com.lowagie.text.ExceptionConverter; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.zip.Deflater; import java.util.zip.DeflaterOutputStream; -import com.lowagie.text.Document; -import com.lowagie.text.ExceptionConverter; - public class PRStream extends PdfStream { - + protected PdfReader reader; protected int offset; protected int length; - + //added by ujihara for decryption protected int objNum = 0; protected int objGen = 0; - + public PRStream(PRStream stream, PdfDictionary newDic) { reader = stream.reader; offset = stream.offset; @@ -79,10 +78,11 @@ public PRStream(PRStream stream, PdfDictionary newDic) { bytes = stream.bytes; objNum = stream.objNum; objGen = stream.objGen; - if (newDic != null) + if (newDic != null) { putAll(newDic); - else + } else { hashMap.putAll(stream.hashMap); + } } public PRStream(PRStream stream, PdfDictionary newDic, PdfReader reader) { @@ -100,12 +100,12 @@ public PRStream(PdfReader reader, byte[] conts) { } /** - * Creates a new PDF stream object that will replace a stream - * in a existing PDF file. - * @param reader the reader that holds the existing PDF - * @param conts the new content - * @param compressionLevel the compression level for the content - * @since 2.1.3 (replacing the existing constructor without param compressionLevel) + * Creates a new PDF stream object that will replace a stream in a existing PDF file. + * + * @param reader the reader that holds the existing PDF + * @param conts the new content + * @param compressionLevel the compression level for the content + * @since 2.1.3 (replacing the existing constructor without param compressionLevel) */ public PRStream(PdfReader reader, byte[] conts, int compressionLevel) { this.reader = reader; @@ -119,39 +119,36 @@ public PRStream(PdfReader reader, byte[] conts, int compressionLevel) { zip.close(); deflater.end(); bytes = stream.toByteArray(); - } - catch (IOException ioe) { + } catch (IOException ioe) { throw new ExceptionConverter(ioe); } put(PdfName.FILTER, PdfName.FLATEDECODE); - } - else + } else { bytes = conts; + } setLength(bytes.length); } - + /** - * Sets the data associated with the stream, either compressed or - * uncompressed. Note that the data will never be compressed if - * Document.compress is set to false. - * - * @param data raw data, decrypted and uncompressed. + * Sets the data associated with the stream, either compressed or uncompressed. Note that the data will never be + * compressed if Document.compress is set to false. + * + * @param data raw data, decrypted and uncompressed. * @param compress true if you want the stream to be compressed. - * @since iText 2.1.1 + * @since iText 2.1.1 */ public void setData(byte[] data, boolean compress) { setData(data, compress, DEFAULT_COMPRESSION); } - + /** - * Sets the data associated with the stream, either compressed or - * uncompressed. Note that the data will never be compressed if - * Document.compress is set to false. - * - * @param data raw data, decrypted and uncompressed. - * @param compress true if you want the stream to be compressed. - * @param compressionLevel a value between -1 and 9 (ignored if compress == false) - * @since iText 2.1.3 + * Sets the data associated with the stream, either compressed or uncompressed. Note that the data will never be + * compressed if Document.compress is set to false. + * + * @param data raw data, decrypted and uncompressed. + * @param compress true if you want the stream to be compressed. + * @param compressionLevel a value between -1 and 9 (ignored if compress == false) + * @since iText 2.1.3 */ public void setData(byte[] data, boolean compress, int compressionLevel) { remove(PdfName.FILTER); @@ -166,74 +163,78 @@ public void setData(byte[] data, boolean compress, int compressionLevel) { deflater.end(); bytes = stream.toByteArray(); this.compressionLevel = compressionLevel; - } - catch (IOException ioe) { + } catch (IOException ioe) { throw new ExceptionConverter(ioe); } put(PdfName.FILTER, PdfName.FLATEDECODE); - } - else + } else { bytes = data; + } setLength(bytes.length); } - - /**Sets the data associated with the stream + + /** + * Sets the data associated with the stream + * * @param data raw data, decrypted and uncompressed. */ public void setData(byte[] data) { setData(data, true); } - public void setLength(int length) { - this.length = length; - put(PdfName.LENGTH, new PdfNumber(length)); - } - public int getOffset() { return offset; } - + public int getLength() { return length; } - + + public void setLength(int length) { + this.length = length; + put(PdfName.LENGTH, new PdfNumber(length)); + } + public PdfReader getReader() { return reader; } - + public byte[] getBytes() { return bytes; } - + public void setObjNum(int objNum, int objGen) { this.objNum = objNum; this.objGen = objGen; } - + int getObjNum() { return objNum; } - + int getObjGen() { return objGen; } - + public void toPdf(PdfWriter writer, OutputStream os) throws IOException { byte[] b = PdfReader.getStreamBytesRaw(this); PdfEncryption crypto = null; - if (writer != null) + if (writer != null) { crypto = writer.getEncryption(); + } PdfObject objLen = get(PdfName.LENGTH); int nn = b.length; - if (crypto != null) + if (crypto != null) { nn = crypto.calculateStreamSize(nn); + } put(PdfName.LENGTH, new PdfNumber(nn)); superToPdf(writer, os); put(PdfName.LENGTH, objLen); os.write(STARTSTREAM); if (length > 0) { - if (crypto != null && !crypto.isEmbeddedFilesOnly()) + if (crypto != null && !crypto.isEmbeddedFilesOnly()) { b = crypto.encryptByteArray(b); + } os.write(b); } os.write(ENDSTREAM); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java b/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java index 2f38eb39e..1708135eb 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java @@ -49,15 +49,15 @@ package com.lowagie.text.pdf; -import java.io.IOException; -import com.lowagie.text.exceptions.InvalidPdfException; import com.lowagie.text.error_messages.MessageLocalization; +import com.lowagie.text.exceptions.InvalidPdfException; +import java.io.IOException; + /** - * - * @author Paulo Soares (psoares@consiste.pt) + * @author Paulo Soares (psoares@consiste.pt) */ public class PRTokeniser implements AutoCloseable { - + public static final int TK_NUMBER = 1; public static final int TK_STRING = 2; public static final int TK_NAME = 3; @@ -96,17 +96,17 @@ public class PRTokeniser implements AutoCloseable { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false}; - + static final String EMPTY = ""; - + protected RandomAccessFileOrArray file; protected int type; protected String stringValue; protected int reference; protected int generation; protected boolean hexString; - + public PRTokeniser(String filename) throws IOException { file = new RandomAccessFileOrArray(filename); } @@ -114,15 +114,66 @@ public PRTokeniser(String filename) throws IOException { public PRTokeniser(byte[] pdfIn) { file = new RandomAccessFileOrArray(pdfIn); } - + public PRTokeniser(RandomAccessFileOrArray file) { this.file = file; } - + + public static final boolean isWhitespace(int ch) { + return (ch == 0 || ch == 9 || ch == 10 || ch == 12 || ch == 13 || ch == 32); + } + + public static final boolean isDelimiter(int ch) { + return (ch == '(' || ch == ')' || ch == '<' || ch == '>' || ch == '[' || ch == ']' || ch == '/' || ch == '%'); + } + + public static final boolean isDelimiterWhitespace(int ch) { + return delims[ch + 1]; + } + + public static int getHex(int v) { + if (v >= '0' && v <= '9') { + return v - '0'; + } + if (v >= 'A' && v <= 'F') { + return v - 'A' + 10; + } + if (v >= 'a' && v <= 'f') { + return v - 'a' + 10; + } + return -1; + } + + public static int[] checkObjectStart(byte[] line) { + try { + PRTokeniser tk = new PRTokeniser(line); + int num = 0; + int gen = 0; + if (!tk.nextToken() || tk.getTokenType() != TK_NUMBER) { + return null; + } + num = tk.intValue(); + if (!tk.nextToken() || tk.getTokenType() != TK_NUMBER) { + return null; + } + gen = tk.intValue(); + if (!tk.nextToken()) { + return null; + } + if (!tk.getStringValue().equals("obj")) { + return null; + } + return new int[]{num, gen}; + } catch (Exception ioe) { + // empty on purpose + } + return null; + } + public void seek(int pos) throws IOException { file.seek(pos); } - + public int getFilePointer() throws IOException { return file.getFilePointer(); } @@ -130,7 +181,7 @@ public int getFilePointer() throws IOException { public void close() throws IOException { file.close(); } - + public int length() throws IOException { return file.length(); } @@ -138,80 +189,73 @@ public int length() throws IOException { public int read() throws IOException { return file.read(); } - + public RandomAccessFileOrArray getSafeFile() { return new RandomAccessFileOrArray(file); } - + public RandomAccessFileOrArray getFile() { return file; } - + public String readString(int size) throws IOException { StringBuilder buf = new StringBuilder(); int ch; while ((size--) > 0) { ch = file.read(); - if (ch == -1) + if (ch == -1) { break; - buf.append((char)ch); + } + buf.append((char) ch); } return buf.toString(); } - public static final boolean isWhitespace(int ch) { - return (ch == 0 || ch == 9 || ch == 10 || ch == 12 || ch == 13 || ch == 32); - } - - public static final boolean isDelimiter(int ch) { - return (ch == '(' || ch == ')' || ch == '<' || ch == '>' || ch == '[' || ch == ']' || ch == '/' || ch == '%'); - } - - public static final boolean isDelimiterWhitespace(int ch) { - return delims[ch + 1]; - } - public int getTokenType() { return type; } - + public String getStringValue() { return stringValue; } - + public int getReference() { return reference; } - + public int getGeneration() { return generation; } - + public void backOnePosition(int ch) { - if (ch != -1) - file.pushBack((byte)ch); + if (ch != -1) { + file.pushBack((byte) ch); + } } - + public void throwError(String error) throws IOException { - throw new InvalidPdfException(MessageLocalization.getComposedMessage("1.at.file.pointer.2", error, String.valueOf(file.getFilePointer()))); + throw new InvalidPdfException(MessageLocalization.getComposedMessage("1.at.file.pointer.2", error, + String.valueOf(file.getFilePointer()))); } - + public char checkPdfHeader() throws IOException { file.setStartOffset(0); String str = readString(1024); int idx = str.indexOf("%PDF-"); - if (idx < 0) + if (idx < 0) { throw new InvalidPdfException(MessageLocalization.getComposedMessage("pdf.header.not.found")); + } file.setStartOffset(idx); return str.charAt(idx + 7); } - + public void checkFdfHeader() throws IOException { file.setStartOffset(0); String str = readString(1024); int idx = str.indexOf("%FDF-1.2"); - if (idx < 0) + if (idx < 0) { throw new InvalidPdfException(MessageLocalization.getComposedMessage("fdf.header.not.found")); + } file.setStartOffset(idx); } @@ -226,41 +270,32 @@ public int getStartxref() throws IOException { String str = readString(step + delta); idx = str.lastIndexOf("startxref"); } while (pos > 0 && idx < 0); - if (idx < 0) + if (idx < 0) { throw new InvalidPdfException(MessageLocalization.getComposedMessage("pdf.startxref.not.found")); + } return pos + idx; } - public static int getHex(int v) { - if (v >= '0' && v <= '9') - return v - '0'; - if (v >= 'A' && v <= 'F') - return v - 'A' + 10; - if (v >= 'a' && v <= 'f') - return v - 'a' + 10; - return -1; - } - public void nextValidToken() throws IOException { int level = 0; String n1 = null; String n2 = null; int ptr = 0; while (nextToken() || level == 2) { - if (type == TK_COMMENT) + if (type == TK_COMMENT) { continue; + } switch (level) { - case 0: - { - if (type != TK_NUMBER) + case 0: { + if (type != TK_NUMBER) { return; + } ptr = file.getFilePointer(); n1 = stringValue; ++level; break; } - case 1: - { + case 1: { if (type != TK_NUMBER) { file.seek(ptr); type = TK_NUMBER; @@ -271,8 +306,7 @@ public void nextValidToken() throws IOException { ++level; break; } - default: - { + default: { if (type != TK_OTHER || !stringValue.equals("R")) { file.seek(ptr); type = TK_NUMBER; @@ -305,13 +339,13 @@ public void nextValidToken() throws IOException { // or the last token ended exactly at the end of a stream. This last // case can occur inside an Object Stream. } - + public boolean nextToken() throws IOException { int ch = 0; do { ch = file.read(); } while (ch != -1 && isWhitespace(ch)); - if (ch == -1){ + if (ch == -1) { type = TK_ENDOFFILE; return false; } @@ -329,30 +363,30 @@ public boolean nextToken() throws IOException { case ']': type = TK_END_ARRAY; break; - case '/': - { + case '/': { outBuf = new StringBuffer(); type = TK_NAME; while (true) { ch = file.read(); - if (delims[ch + 1]) + if (delims[ch + 1]) { break; + } if (ch == '#') { ch = (getHex(file.read()) << 4) + getHex(file.read()); } - outBuf.append((char)ch); + outBuf.append((char) ch); } backOnePosition(ch); break; } case '>': ch = file.read(); - if (ch != '>') + if (ch != '>') { throwError(MessageLocalization.getComposedMessage("greaterthan.not.expected")); + } type = TK_END_DIC; break; - case '<': - { + case '<': { int v1 = file.read(); while (isWhitespace(v1)) { v1 = file.read(); @@ -366,30 +400,36 @@ public boolean nextToken() throws IOException { hexString = true; int v2 = 0; while (true) { - while (isWhitespace(v1)) + while (isWhitespace(v1)) { v1 = file.read(); - if (v1 == '>') + } + if (v1 == '>') { break; + } v1 = getHex(v1); - if (v1 < 0) + if (v1 < 0) { break; + } v2 = file.read(); - while (isWhitespace(v2)) + while (isWhitespace(v2)) { v2 = file.read(); + } if (v2 == '>') { ch = v1 << 4; - outBuf.append((char)ch); + outBuf.append((char) ch); break; } v2 = getHex(v2); - if (v2 < 0) + if (v2 < 0) { break; + } ch = (v1 << 4) + v2; - outBuf.append((char)ch); + outBuf.append((char) ch); v1 = file.read(); } - if (v1 < 0 || v2 < 0) + if (v1 < 0 || v2 < 0) { throwError(MessageLocalization.getComposedMessage("error.reading.string")); + } break; } case '%': @@ -398,23 +438,21 @@ public boolean nextToken() throws IOException { ch = file.read(); } while (ch != -1 && ch != '\r' && ch != '\n'); break; - case '(': - { + case '(': { outBuf = new StringBuffer(); type = TK_STRING; hexString = false; int nesting = 0; while (true) { ch = file.read(); - if (ch == -1) + if (ch == -1) { break; + } if (ch == '(') { ++nesting; - } - else if (ch == ')') { + } else if (ch == ')') { --nesting; - } - else if (ch == '\\') { + } else if (ch == '\\') { boolean lineBreak = false; ch = file.read(); switch (ch) { @@ -440,14 +478,14 @@ else if (ch == '\\') { case '\r': lineBreak = true; ch = file.read(); - if (ch != '\n') + if (ch != '\n') { backOnePosition(ch); + } break; case '\n': lineBreak = true; break; - default: - { + default: { if (ch < '0' || ch > '7') { break; } @@ -470,42 +508,44 @@ else if (ch == '\\') { break; } } - if (lineBreak) + if (lineBreak) { continue; - if (ch < 0) + } + if (ch < 0) { break; - } - else if (ch == '\r') { + } + } else if (ch == '\r') { ch = file.read(); - if (ch < 0) + if (ch < 0) { break; + } if (ch != '\n') { backOnePosition(ch); ch = '\n'; } } - if (nesting == -1) + if (nesting == -1) { break; - outBuf.append((char)ch); + } + outBuf.append((char) ch); } - if (ch == -1) + if (ch == -1) { throwError(MessageLocalization.getComposedMessage("error.reading.string")); + } break; } - default: - { + default: { outBuf = new StringBuffer(); if (ch == '-' || ch == '+' || ch == '.' || (ch >= '0' && ch <= '9')) { type = TK_NUMBER; do { - outBuf.append((char)ch); + outBuf.append((char) ch); ch = file.read(); } while (ch != -1 && ((ch >= '0' && ch <= '9') || ch == '.')); - } - else { + } else { type = TK_OTHER; do { - outBuf.append((char)ch); + outBuf.append((char) ch); ch = file.read(); } while (!delims[ch + 1]); } @@ -513,28 +553,30 @@ else if (ch == '\r') { break; } } - if (outBuf != null) + if (outBuf != null) { stringValue = outBuf.toString(); + } return true; } - + public int intValue() { return Integer.parseInt(stringValue); } - + public boolean readLineSegment(byte[] input) throws IOException { int c = -1; boolean eol = false; int ptr = 0; int len = input.length; - // ssteward, pdftk-1.10, 040922: - // skip initial whitespace; added this because PdfReader.rebuildXref() - // assumes that line provided by readLineSegment does not have init. whitespace; - if ( ptr < len ) { - while ( isWhitespace( (c = read()) ) ); - } - while ( !eol && ptr < len ) { - switch (c) { + // ssteward, pdftk-1.10, 040922: + // skip initial whitespace; added this because PdfReader.rebuildXref() + // assumes that line provided by readLineSegment does not have init. whitespace; + if (ptr < len) { + while (isWhitespace((c = read()))) + ; + } + while (!eol && ptr < len) { + switch (c) { case -1: case '\n': eol = true; @@ -547,17 +589,16 @@ public boolean readLineSegment(byte[] input) throws IOException { } break; default: - input[ptr++] = (byte)c; + input[ptr++] = (byte) c; break; } - // break loop? do it before we read() again - if( eol || len <= ptr ) { - break; - } - else { - c = read(); - } + // break loop? do it before we read() again + if (eol || len <= ptr) { + break; + } else { + c = read(); + } } if (ptr >= len) { eol = false; @@ -577,42 +618,19 @@ public boolean readLineSegment(byte[] input) throws IOException { } } } - + if ((c == -1) && (ptr == 0)) { return false; } if (ptr + 2 <= len) { - input[ptr++] = (byte)' '; - input[ptr] = (byte)'X'; + input[ptr++] = (byte) ' '; + input[ptr] = (byte) 'X'; } return true; } - - public static int[] checkObjectStart(byte[] line) { - try { - PRTokeniser tk = new PRTokeniser(line); - int num = 0; - int gen = 0; - if (!tk.nextToken() || tk.getTokenType() != TK_NUMBER) - return null; - num = tk.intValue(); - if (!tk.nextToken() || tk.getTokenType() != TK_NUMBER) - return null; - gen = tk.intValue(); - if (!tk.nextToken()) - return null; - if (!tk.getStringValue().equals("obj")) - return null; - return new int[]{num, gen}; - } - catch (Exception ioe) { - // empty on purpose - } - return null; - } - + public boolean isHexString() { return this.hexString; } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PageResources.java b/openpdf/src/main/java/com/lowagie/text/pdf/PageResources.java index 9249c304b..47880fc50 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PageResources.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PageResources.java @@ -51,7 +51,7 @@ import java.util.HashMap; class PageResources { - + protected PdfDictionary fontDictionary = new PdfDictionary(); protected PdfDictionary xObjectDictionary = new PdfDictionary(); protected PdfDictionary colorDictionary = new PdfDictionary(); @@ -66,14 +66,16 @@ class PageResources { PageResources() { } - + void setOriginalResources(PdfDictionary resources, int[] newNamePtr) { - if (newNamePtr != null) + if (newNamePtr != null) { namePtr = newNamePtr; + } forbiddenNames = new HashMap<>(); usedNames = new HashMap<>(); - if (resources == null) + if (resources == null) { return; + } originalResources = new PdfDictionary(); originalResources.merge(resources); for (PdfName key : resources.getKeys()) { @@ -89,7 +91,7 @@ void setOriginalResources(PdfDictionary resources, int[] newNamePtr) { } } } - + PdfName translateName(PdfName name) { PdfName translated = name; if (forbiddenNames != null) { @@ -103,7 +105,7 @@ PdfName translateName(PdfName name) { } return translated; } - + PdfName addFont(PdfName name, PdfIndirectReference reference) { name = translateName(name); fontDictionary.put(name, reference); @@ -123,10 +125,11 @@ PdfName addColor(PdfName name, PdfIndirectReference reference) { } void addDefaultColor(PdfName name, PdfObject obj) { - if (obj == null || obj.isNull()) + if (obj == null || obj.isNull()) { colorDictionary.remove(name); - else + } else { colorDictionary.put(name, obj); + } } void addDefaultColor(PdfDictionary dic) { @@ -142,7 +145,7 @@ PdfName addShading(PdfName name, PdfIndirectReference reference) { shadingDictionary.put(name, reference); return name; } - + PdfName addPattern(PdfName name, PdfIndirectReference reference) { name = translateName(name); patternDictionary.put(name, reference); @@ -162,9 +165,10 @@ PdfName addProperty(PdfName name, PdfIndirectReference reference) { } PdfDictionary getResources() { - PdfResources resources = new PdfResources(); - if (originalResources != null) + PdfResources resources = new PdfResources(); + if (originalResources != null) { resources.putAll(originalResources); + } //resources.put(PdfName.PROCSET, new PdfLiteral("[/PDF /Text /ImageB /ImageC /ImageI]")); resources.add(PdfName.FONT, fontDictionary); resources.add(PdfName.XOBJECT, xObjectDictionary); @@ -175,14 +179,14 @@ PdfDictionary getResources() { resources.add(PdfName.PROPERTIES, propertyDictionary); return resources; } - + boolean hasResources() { return (fontDictionary.size() > 0 - || xObjectDictionary.size() > 0 - || colorDictionary.size() > 0 - || patternDictionary.size() > 0 - || shadingDictionary.size() > 0 - || extGStateDictionary.size() > 0 - || propertyDictionary.size() > 0); + || xObjectDictionary.size() > 0 + || colorDictionary.size() > 0 + || patternDictionary.size() > 0 + || shadingDictionary.size() > 0 + || extGStateDictionary.size() > 0 + || propertyDictionary.size() > 0); } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PatternColor.java b/openpdf/src/main/java/com/lowagie/text/pdf/PatternColor.java index f2e0785c1..019cf765e 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PatternColor.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PatternColor.java @@ -46,35 +46,41 @@ */ package com.lowagie.text.pdf; -/** Represents a pattern. Can be used in high-level constructs (Paragraph, Cell, etc.). +/** + * Represents a pattern. Can be used in high-level constructs (Paragraph, Cell, etc.). */ public class PatternColor extends ExtendedColor { + private static final long serialVersionUID = -1185448552860615964L; /** * The actual pattern. - */ + */ PdfPatternPainter painter; - - /** Creates a color representing a pattern. + + /** + * Creates a color representing a pattern. + * * @param painter the actual pattern - */ + */ public PatternColor(PdfPatternPainter painter) { super(TYPE_PATTERN, .5f, .5f, .5f); this.painter = painter; } - - /** Gets the pattern. + + /** + * Gets the pattern. + * * @return the pattern - */ + */ public PdfPatternPainter getPainter() { return this.painter; } - + public boolean equals(Object obj) { return this == obj; } - + public int hashCode() { return painter.hashCode(); - } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfAcroForm.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfAcroForm.java index 4b48eae49..c6e738570 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfAcroForm.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfAcroForm.java @@ -49,13 +49,11 @@ package com.lowagie.text.pdf; +import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.Rectangle; import java.util.HashMap; import java.util.Map; - -import com.lowagie.text.Rectangle; -import com.lowagie.text.ExceptionConverter; - /** * Each PDF document can contain maximum 1 AcroForm. */ @@ -65,25 +63,35 @@ public class PdfAcroForm extends PdfDictionary { private PdfWriter writer; - /** This is a map containing FieldTemplates. */ + /** + * This is a map containing FieldTemplates. + */ private Map fieldTemplates = new HashMap<>(); - /** This is an array containing DocumentFields. */ + /** + * This is an array containing DocumentFields. + */ private PdfArray documentFields = new PdfArray(); - /** This is an array containing the calculationorder of the fields. */ + /** + * This is an array containing the calculationorder of the fields. + */ private PdfArray calculationOrder = new PdfArray(); - /** Contains the signature flags. */ + /** + * Contains the signature flags. + */ private int sigFlags = 0; - /** Creates new PdfAcroForm + /** + * Creates new PdfAcroForm + * * @param writer {@link PdfWriter} */ public PdfAcroForm(PdfWriter writer) { this.writer = writer; } - + public void setNeedAppearances(boolean value) { put(PdfName.NEEDAPPEARANCES, new PdfBoolean(value)); } @@ -91,6 +99,7 @@ public void setNeedAppearances(boolean value) { /** * Adds fieldTemplates. + * * @param ft field templates */ @@ -100,6 +109,7 @@ public void addFieldTemplates(Map ft) { /** * Adds documentFields. + * * @param ref an object of {@link PdfIndirectReference} */ @@ -109,17 +119,24 @@ public void addDocumentField(PdfIndirectReference ref) { /** * Checks if the Acroform is valid + * * @return true if the Acroform is valid */ public boolean isValid() { - if (documentFields.size() == 0) return false; + if (documentFields.size() == 0) { + return false; + } put(PdfName.FIELDS, documentFields); - if (sigFlags != 0) + if (sigFlags != 0) { put(PdfName.SIGFLAGS, new PdfNumber(sigFlags)); - if (calculationOrder.size() > 0) + } + if (calculationOrder.size() > 0) { put(PdfName.CO, calculationOrder); - if (fieldTemplates.isEmpty()) return true; + } + if (fieldTemplates.isEmpty()) { + return true; + } PdfDictionary dic = new PdfDictionary(); for (Object o : fieldTemplates.keySet()) { PdfTemplate template = (PdfTemplate) o; @@ -127,7 +144,7 @@ public boolean isValid() { } put(PdfName.DR, dic); put(PdfName.DA, new PdfString("/Helv 0 Tf 0 g ")); - PdfDictionary fonts = (PdfDictionary)dic.get(PdfName.FONT); + PdfDictionary fonts = (PdfDictionary) dic.get(PdfName.FONT); if (fonts != null) { writer.eliminateFontSubset(fonts); } @@ -136,6 +153,7 @@ public boolean isValid() { /** * Adds an object to the calculationOrder. + * * @param formField an object of {@link PdfFormField} */ @@ -145,6 +163,7 @@ public void addCalculationOrder(PdfFormField formField) { /** * Sets the signature flags. + * * @param f signature flag */ @@ -154,6 +173,7 @@ public void setSigFlags(int f) { /** * Adds a formfield to the AcroForm. + * * @param formField an object of {@link PdfFormField} */ @@ -162,40 +182,42 @@ public void addFormField(PdfFormField formField) { } /** - * @param name name of the field - * @param value value of the field - * @param url url for the action - * @param caption caption - * @param font an object of {@link BaseFont} + * @param name name of the field + * @param value value of the field + * @param url url for the action + * @param caption caption + * @param font an object of {@link BaseFont} * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addHtmlPostButton(String name, String caption, String value, String url, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public PdfFormField addHtmlPostButton(String name, String caption, String value, String url, BaseFont font, + float fontSize, float llx, float lly, float urx, float ury) { PdfAction action = PdfAction.createSubmitForm(url, null, PdfAction.SUBMIT_HTML_FORMAT); PdfFormField button = new PdfFormField(writer, llx, lly, urx, ury, action); setButtonParams(button, PdfFormField.FF_PUSHBUTTON, name, value); drawButton(button, caption, font, fontSize, llx, lly, urx, ury); addFormField(button); - return button; + return button; } /** - * @param name name of the field - * @param value value of the field - * @param caption caption - * @param font an object of {@link BaseFont} + * @param name name of the field + * @param value value of the field + * @param caption caption + * @param font an object of {@link BaseFont} * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addResetButton(String name, String caption, String value, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public PdfFormField addResetButton(String name, String caption, String value, BaseFont font, float fontSize, + float llx, float lly, float urx, float ury) { PdfAction action = PdfAction.createResetForm(null, 0); PdfFormField button = new PdfFormField(writer, llx, lly, urx, ury, action); setButtonParams(button, PdfFormField.FF_PUSHBUTTON, name, value); @@ -205,18 +227,20 @@ public PdfFormField addResetButton(String name, String caption, String value, Ba } /** - * @param name name of the field - * @param value value of the field - * @param url url of the action + * @param name name of the field + * @param value value of the field + * @param url url of the action * @param appearance an object of {@link PdfContentByte} - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addMap(String name, String value, String url, PdfContentByte appearance, float llx, float lly, float urx, float ury) { - PdfAction action = PdfAction.createSubmitForm(url, null, PdfAction.SUBMIT_HTML_FORMAT | PdfAction.SUBMIT_COORDINATES); + public PdfFormField addMap(String name, String value, String url, PdfContentByte appearance, float llx, float lly, + float urx, float ury) { + PdfAction action = PdfAction.createSubmitForm(url, null, + PdfAction.SUBMIT_HTML_FORMAT | PdfAction.SUBMIT_COORDINATES); PdfFormField button = new PdfFormField(writer, llx, lly, urx, ury, action); setButtonParams(button, PdfFormField.FF_PUSHBUTTON, name, null); PdfAppearance pa = PdfAppearance.createAppearance(writer, urx - llx, ury - lly); @@ -227,37 +251,40 @@ public PdfFormField addMap(String name, String value, String url, PdfContentByte } /** - * @param button an object of {@link PdfFormField} + * @param button an object of {@link PdfFormField} * @param characteristics characteristics - * @param name name of the field - * @param value value of the field + * @param name name of the field + * @param value value of the field */ public void setButtonParams(PdfFormField button, int characteristics, String name, String value) { button.setButton(characteristics); button.setFlags(PdfAnnotation.FLAGS_PRINT); button.setPage(); button.setFieldName(name); - if (value != null) button.setValueAsString(value); + if (value != null) { + button.setValueAsString(value); + } } /** - * @param button an object of {@link PdfFormField} - * @param caption caption - * @param font an object of {@link BaseFont} + * @param button an object of {@link PdfFormField} + * @param caption caption + * @param font an object of {@link BaseFont} * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y */ - public void drawButton(PdfFormField button, String caption, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public void drawButton(PdfFormField button, String caption, BaseFont font, float fontSize, float llx, float lly, + float urx, float ury) { PdfAppearance pa = PdfAppearance.createAppearance(writer, urx - llx, ury - lly); pa.drawButton(0f, 0f, urx - llx, ury - lly, caption, font, fontSize); button.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, pa); } /** - * @param name name of the field + * @param name name of the field * @param value value of the field * @return a PdfFormField */ @@ -270,17 +297,18 @@ public PdfFormField addHiddenField(String name, String value) { } /** - * @param name name of the field - * @param text value for field - * @param font an object of {@link BaseFont} + * @param name name of the field + * @param text value for field + * @param font an object of {@link BaseFont} * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addSingleLineTextField(String name, String text, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public PdfFormField addSingleLineTextField(String name, String text, BaseFont font, float fontSize, float llx, + float lly, float urx, float ury) { PdfFormField field = PdfFormField.createTextField(writer, PdfFormField.SINGLELINE, PdfFormField.PLAINTEXT, 0); setTextFieldParams(field, text, name, llx, lly, urx, ury); drawSingleLineOfText(field, text, font, fontSize, llx, lly, urx, ury); @@ -289,17 +317,18 @@ public PdfFormField addSingleLineTextField(String name, String text, BaseFont fo } /** - * @param name name of the field - * @param text value for field - * @param font an object of {@link BaseFont} + * @param name name of the field + * @param text value for field + * @param font an object of {@link BaseFont} * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addMultiLineTextField(String name, String text, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public PdfFormField addMultiLineTextField(String name, String text, BaseFont font, float fontSize, float llx, + float lly, float urx, float ury) { PdfFormField field = PdfFormField.createTextField(writer, PdfFormField.MULTILINE, PdfFormField.PLAINTEXT, 0); setTextFieldParams(field, text, name, llx, lly, urx, ury); drawMultiLineOfText(field, text, font, fontSize, llx, lly, urx, ury); @@ -308,17 +337,18 @@ public PdfFormField addMultiLineTextField(String name, String text, BaseFont fon } /** - * @param name name of the field - * @param text text for the field - * @param font an object of {@link BaseFont} + * @param name name of the field + * @param text text for the field + * @param font an object of {@link BaseFont} * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return PdfFormField */ - public PdfFormField addSingleLinePasswordField(String name, String text, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public PdfFormField addSingleLinePasswordField(String name, String text, BaseFont font, float fontSize, float llx, + float lly, float urx, float ury) { PdfFormField field = PdfFormField.createTextField(writer, PdfFormField.SINGLELINE, PdfFormField.PASSWORD, 0); setTextFieldParams(field, text, name, llx, lly, urx, ury); drawSingleLineOfText(field, text, font, fontSize, llx, lly, urx, ury); @@ -328,14 +358,15 @@ public PdfFormField addSingleLinePasswordField(String name, String text, BaseFon /** * @param field an object of {@link PdfFormField} - * @param text text for the field - * @param name name of the field - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y - */ - public void setTextFieldParams(PdfFormField field, String text, String name, float llx, float lly, float urx, float ury) { + * @param text text for the field + * @param name name of the field + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y + */ + public void setTextFieldParams(PdfFormField field, String text, String name, float llx, float lly, float urx, + float ury) { field.setWidget(new Rectangle(llx, lly, urx, ury), PdfAnnotation.HIGHLIGHT_INVERT); field.setValueAsString(text); field.setDefaultValueAsString(text); @@ -345,18 +376,19 @@ public void setTextFieldParams(PdfFormField field, String text, String name, flo } /** - * @param field field - * @param text text for the field - * @param font an object of {@link BaseFont} + * @param field field + * @param text text for the field + * @param font an object of {@link BaseFont} * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y */ - public void drawSingleLineOfText(PdfFormField field, String text, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public void drawSingleLineOfText(PdfFormField field, String text, BaseFont font, float fontSize, float llx, + float lly, float urx, float ury) { PdfAppearance tp = PdfAppearance.createAppearance(writer, urx - llx, ury - lly); - PdfAppearance tp2 = (PdfAppearance)tp.getDuplicate(); + PdfAppearance tp2 = (PdfAppearance) tp.getDuplicate(); tp2.setFontAndSize(font, fontSize); tp2.resetRGBColorFill(); field.setDefaultAppearanceString(tp2); @@ -378,18 +410,19 @@ public void drawSingleLineOfText(PdfFormField field, String text, BaseFont font, } /** - * @param field field, an object of {@link PdfFormField} - * @param text text for field - * @param font an object of {@link BaseFont} + * @param field field, an object of {@link PdfFormField} + * @param text text for field + * @param font an object of {@link BaseFont} * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y */ - public void drawMultiLineOfText(PdfFormField field, String text, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public void drawMultiLineOfText(PdfFormField field, String text, BaseFont font, float fontSize, float llx, + float lly, float urx, float ury) { PdfAppearance tp = PdfAppearance.createAppearance(writer, urx - llx, ury - lly); - PdfAppearance tp2 = (PdfAppearance)tp.getDuplicate(); + PdfAppearance tp2 = (PdfAppearance) tp.getDuplicate(); tp2.setFontAndSize(font, fontSize); tp2.resetRGBColorFill(); field.setDefaultAppearanceString(tp2); @@ -416,16 +449,17 @@ public void drawMultiLineOfText(PdfFormField field, String text, BaseFont font, } /** - * @param name field name + * @param name field name * @param status status - * @param value value of the field - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param value value of the field + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addCheckBox(String name, String value, boolean status, float llx, float lly, float urx, float ury) { + public PdfFormField addCheckBox(String name, String value, boolean status, float llx, float lly, float urx, + float ury) { PdfFormField field = PdfFormField.createCheckBox(writer); setCheckBoxParams(field, name, value, status, llx, lly, urx, ury); drawCheckBoxAppearences(field, value, llx, lly, urx, ury); @@ -434,23 +468,23 @@ public PdfFormField addCheckBox(String name, String value, boolean status, float } /** - * @param name field name + * @param name field name * @param status status - * @param field field, an object of {@link PdfFormField} - * @param value value of the field - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y - */ - public void setCheckBoxParams(PdfFormField field, String name, String value, boolean status, float llx, float lly, float urx, float ury) { + * @param field field, an object of {@link PdfFormField} + * @param value value of the field + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y + */ + public void setCheckBoxParams(PdfFormField field, String name, String value, boolean status, float llx, float lly, + float urx, float ury) { field.setWidget(new Rectangle(llx, lly, urx, ury), PdfAnnotation.HIGHLIGHT_TOGGLE); field.setFieldName(name); if (status) { field.setValueAsName(value); field.setAppearanceState(value); - } - else { + } else { field.setValueAsName("Off"); field.setAppearanceState("Off"); } @@ -462,22 +496,21 @@ public void setCheckBoxParams(PdfFormField field, String name, String value, boo /** * @param field field, an object of {@link PdfFormField} * @param value value of the field - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y */ public void drawCheckBoxAppearences(PdfFormField field, String value, float llx, float lly, float urx, float ury) { BaseFont font = null; try { font = BaseFont.createFont(BaseFont.ZAPFDINGBATS, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED); - } - catch(Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } float size = (ury - lly); PdfAppearance tpOn = PdfAppearance.createAppearance(writer, urx - llx, ury - lly); - PdfAppearance tp2 = (PdfAppearance)tpOn.getDuplicate(); + PdfAppearance tp2 = (PdfAppearance) tpOn.getDuplicate(); tp2.setFontAndSize(font, size); tp2.resetRGBColorFill(); field.setDefaultAppearanceString(tp2); @@ -496,8 +529,8 @@ public void drawCheckBoxAppearences(PdfFormField field, String value, float llx, } /** - * @param name name of the field - * @param defaultValue default value + * @param name name of the field + * @param defaultValue default value * @param noToggleToOff noToggleToOff * @return a PdfFormField */ @@ -517,21 +550,21 @@ public void addRadioGroup(PdfFormField radiogroup) { /** * @param radiogroup radio group field - * @param value value of the field - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param value value of the field + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addRadioButton(PdfFormField radiogroup, String value, float llx, float lly, float urx, float ury) { + public PdfFormField addRadioButton(PdfFormField radiogroup, String value, float llx, float lly, float urx, + float ury) { PdfFormField radio = PdfFormField.createEmpty(writer); radio.setWidget(new Rectangle(llx, lly, urx, ury), PdfAnnotation.HIGHLIGHT_TOGGLE); String name = radiogroup.get(PdfName.V).toString().substring(1); if (name.equals(value)) { radio.setAppearanceState(value); - } - else { + } else { radio.setAppearanceState("Off"); } drawRadioAppearences(radio, value, llx, lly, urx, ury); @@ -542,10 +575,10 @@ public PdfFormField addRadioButton(PdfFormField radiogroup, String value, float /** * @param field field, an object of {@link PdfFormField} * @param value value - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y */ public void drawRadioAppearences(PdfFormField field, String value, float llx, float lly, float urx, float ury) { PdfAppearance tpOn = PdfAppearance.createAppearance(writer, urx - llx, ury - lly); @@ -557,18 +590,19 @@ public void drawRadioAppearences(PdfFormField field, String value, float llx, fl } /** - * @param name name of the field - * @param options options + * @param name name of the field + * @param options options * @param defaultValue default value - * @param font an object of {@link BaseFont} - * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param font an object of {@link BaseFont} + * @param fontSize font size + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addSelectList(String name, String[] options, String defaultValue, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public PdfFormField addSelectList(String name, String[] options, String defaultValue, BaseFont font, float fontSize, + float llx, float lly, float urx, float ury) { PdfFormField choice = PdfFormField.createList(writer, options, 0); setChoiceParams(choice, name, defaultValue, llx, lly, urx, ury); StringBuilder text = new StringBuilder(); @@ -581,18 +615,19 @@ public PdfFormField addSelectList(String name, String[] options, String defaultV } /** - * @param name name of the field - * @param options options + * @param name name of the field + * @param options options * @param defaultValue default value - * @param font an object of {@link BaseFont} - * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param font an object of {@link BaseFont} + * @param fontSize font size + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addSelectList(String name, String[][] options, String defaultValue, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public PdfFormField addSelectList(String name, String[][] options, String defaultValue, BaseFont font, + float fontSize, float llx, float lly, float urx, float ury) { PdfFormField choice = PdfFormField.createList(writer, options, 0); setChoiceParams(choice, name, defaultValue, llx, lly, urx, ury); StringBuilder text = new StringBuilder(); @@ -605,19 +640,20 @@ public PdfFormField addSelectList(String name, String[][] options, String defaul } /** - * @param name name of the field - * @param options options + * @param name name of the field + * @param options options * @param defaultValue default value - * @param editable if field is editable, true or false - * @param font an object of {@link BaseFont} - * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param editable if field is editable, true or false + * @param font an object of {@link BaseFont} + * @param fontSize font size + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addComboBox(String name, String[] options, String defaultValue, boolean editable, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public PdfFormField addComboBox(String name, String[] options, String defaultValue, boolean editable, BaseFont font, + float fontSize, float llx, float lly, float urx, float ury) { PdfFormField choice = PdfFormField.createCombo(writer, editable, options, 0); setChoiceParams(choice, name, defaultValue, llx, lly, urx, ury); if (defaultValue == null) { @@ -629,19 +665,20 @@ public PdfFormField addComboBox(String name, String[] options, String defaultVal } /** - * @param name name of the field - * @param options options + * @param name name of the field + * @param options options * @param defaultValue default value - * @param editable if field is editable, true or false - * @param font an object of {@link BaseFont} - * @param fontSize font size - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param editable if field is editable, true or false + * @param font an object of {@link BaseFont} + * @param fontSize font size + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addComboBox(String name, String[][] options, String defaultValue, boolean editable, BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { + public PdfFormField addComboBox(String name, String[][] options, String defaultValue, boolean editable, + BaseFont font, float fontSize, float llx, float lly, float urx, float ury) { PdfFormField choice = PdfFormField.createCombo(writer, editable, options, 0); setChoiceParams(choice, name, defaultValue, llx, lly, urx, ury); String value = null; @@ -660,15 +697,16 @@ public PdfFormField addComboBox(String name, String[][] options, String defaultV } /** - * @param field field, an object of {@link PdfFormField} - * @param name field name + * @param field field, an object of {@link PdfFormField} + * @param name field name * @param defaultValue default calue - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y */ - public void setChoiceParams(PdfFormField field, String name, String defaultValue, float llx, float lly, float urx, float ury) { + public void setChoiceParams(PdfFormField field, String name, String defaultValue, float llx, float lly, float urx, + float ury) { field.setWidget(new Rectangle(llx, lly, urx, ury), PdfAnnotation.HIGHLIGHT_INVERT); if (defaultValue != null) { field.setValueAsString(defaultValue); @@ -682,31 +720,31 @@ public void setChoiceParams(PdfFormField field, String name, String defaultValue /** * @param name field name - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @return a PdfFormField */ - public PdfFormField addSignature(String name, - float llx, float lly, float urx, float ury) { + public PdfFormField addSignature(String name, + float llx, float lly, float urx, float ury) { PdfFormField signature = PdfFormField.createSignature(writer); setSignatureParams(signature, name, llx, lly, urx, ury); drawSignatureAppearences(signature, llx, lly, urx, ury); addFormField(signature); return signature; } - + /** - * @param name field name + * @param name field name * @param field field, an object of {@link PdfFormField} - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y */ public void setSignatureParams(PdfFormField field, String name, - float llx, float lly, float urx, float ury) { + float llx, float lly, float urx, float ury) { field.setWidget(new Rectangle(llx, lly, urx, ury), PdfAnnotation.HIGHLIGHT_INVERT); field.setFieldName(name); field.setFlags(PdfAnnotation.FLAGS_PRINT); @@ -717,13 +755,13 @@ public void setSignatureParams(PdfFormField field, String name, /** * @param field field, an object of {@link PdfFormField} - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y */ - public void drawSignatureAppearences(PdfFormField field, - float llx, float lly, float urx, float ury) { + public void drawSignatureAppearences(PdfFormField field, + float llx, float lly, float urx, float ury) { PdfAppearance tp = PdfAppearance.createAppearance(writer, urx - llx, ury - lly); tp.setGrayFill(1.0f); tp.rectangle(0, 0, urx - llx, ury - lly); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfAction.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfAction.java index abb7d8fc2..da197a2a2 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfAction.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfAction.java @@ -49,151 +49,193 @@ package com.lowagie.text.pdf; +import com.lowagie.text.error_messages.MessageLocalization; +import com.lowagie.text.pdf.collection.PdfTargetDictionary; import java.io.IOException; import java.net.URL; import java.util.List; -import com.lowagie.text.error_messages.MessageLocalization; -import com.lowagie.text.pdf.collection.PdfTargetDictionary; - /** * A PdfAction defines an action that can be triggered from a PDF file. * - * @see PdfDictionary + * @see PdfDictionary */ public class PdfAction extends PdfDictionary { - - /** A named action to go to the first page. + + /** + * A named action to go to the first page. */ public static final int FIRSTPAGE = 1; - /** A named action to go to the previous page. + /** + * A named action to go to the previous page. */ public static final int PREVPAGE = 2; - /** A named action to go to the next page. + /** + * A named action to go to the next page. */ public static final int NEXTPAGE = 3; - /** A named action to go to the last page. + /** + * A named action to go to the last page. */ public static final int LASTPAGE = 4; - /** A named action to open a print dialog. + /** + * A named action to open a print dialog. */ public static final int PRINTDIALOG = 5; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_EXCLUDE = 1; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_INCLUDE_NO_VALUE_FIELDS = 2; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_HTML_FORMAT = 4; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_HTML_GET = 8; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_COORDINATES = 16; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_XFDF = 32; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_INCLUDE_APPEND_SAVES = 64; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_INCLUDE_ANNOTATIONS = 128; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_PDF = 256; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_CANONICAL_FORMAT = 512; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_EXCL_NON_USER_ANNOTS = 1024; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_EXCL_F_KEY = 2048; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int SUBMIT_EMBED_FORM = 8196; - /** a possible submitvalue */ + /** + * a possible submitvalue + */ public static final int RESET_EXCLUDE = 1; // constructors - - /** Create an empty action. - */ + + /** + * Create an empty action. + */ public PdfAction() { } - + /** * Constructs a new PdfAction of Subtype URI. * * @param url the Url to go to */ - + public PdfAction(URL url) { this(url.toExternalForm()); } - + /** - * Construct a new PdfAction of Subtype URI that accepts the x and y coordinate of the position that was clicked. - * @param url the URL + * Construct a new PdfAction of Subtype URI that accepts the x and y coordinate of the position that + * was clicked. + * + * @param url the URL * @param isMap true if it is a map, false otherwise */ public PdfAction(URL url, boolean isMap) { this(url.toExternalForm(), isMap); } - + /** * Constructs a new PdfAction of Subtype URI. * * @param url the url to go to */ - + public PdfAction(String url) { this(url, false); } - + /** - * Construct a new PdfAction of Subtype URI that accepts the x and y coordinate of the position that was clicked. - * @param url the URL + * Construct a new PdfAction of Subtype URI that accepts the x and y coordinate of the position that + * was clicked. + * + * @param url the URL * @param isMap true if it is a map, false otherwise */ public PdfAction(String url, boolean isMap) { put(PdfName.S, PdfName.URI); put(PdfName.URI, new PdfString(url)); - if (isMap) + if (isMap) { put(PdfName.ISMAP, PdfBoolean.PDFTRUE); + } } - + /** * Constructs a new PdfAction of Subtype GoTo. + * * @param destination the destination to go to */ - + PdfAction(PdfIndirectReference destination) { put(PdfName.S, PdfName.GOTO); put(PdfName.D, destination); } - + /** * Constructs a new PdfAction of Subtype GoToR. + * * @param filename the file name to go to - * @param name the named destination to go to + * @param name the named destination to go to */ - + public PdfAction(String filename, String name) { put(PdfName.S, PdfName.GOTOR); put(PdfName.F, new PdfString(filename)); put(PdfName.D, new PdfString(name)); } - + /** * Constructs a new PdfAction of Subtype GoToR. + * * @param filename the file name to go to - * @param page the page destination to go to + * @param page the page destination to go to */ - + public PdfAction(String filename, int page) { put(PdfName.S, PdfName.GOTOR); put(PdfName.F, new PdfString(filename)); put(PdfName.D, new PdfLiteral("[" + (page - 1) + " /FitH 10000]")); } - - /** Implements name actions. The action can be FIRSTPAGE, LASTPAGE, - * NEXTPAGE, PREVPAGE and PRINTDIALOG. + + /** + * Implements name actions. The action can be FIRSTPAGE, LASTPAGE, NEXTPAGE, PREVPAGE and PRINTDIALOG. + * * @param named the named action */ public PdfAction(int named) { @@ -219,113 +261,119 @@ public PdfAction(int named) { throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.named.action")); } } - - /** Launches an application or a document. + + /** + * Launches an application or a document. + * * @param application the application to be launched or the document to be opened or printed. - * @param parameters (Windows-specific) A parameter string to be passed to the application. - * It can be null. - * @param operation (Windows-specific) the operation to perform: "open" - Open a document, - * "print" - Print a document. - * It can be null. - * @param defaultDir (Windows-specific) the default directory in standard DOS syntax. - * It can be null. + * @param parameters (Windows-specific) A parameter string to be passed to the application. It can be + * null. + * @param operation (Windows-specific) the operation to perform: "open" - Open a document, "print" - Print a + * document. It can be null. + * @param defaultDir (Windows-specific) the default directory in standard DOS syntax. It can be null. */ public PdfAction(String application, String parameters, String operation, String defaultDir) { put(PdfName.S, PdfName.LAUNCH); - if (parameters == null && operation == null && defaultDir == null) + if (parameters == null && operation == null && defaultDir == null) { put(PdfName.F, new PdfString(application)); - else { + } else { PdfDictionary dic = new PdfDictionary(); dic.put(PdfName.F, new PdfString(application)); - if (parameters != null) + if (parameters != null) { dic.put(PdfName.P, new PdfString(parameters)); - if (operation != null) + } + if (operation != null) { dic.put(PdfName.O, new PdfString(operation)); - if (defaultDir != null) + } + if (defaultDir != null) { dic.put(PdfName.D, new PdfString(defaultDir)); + } put(PdfName.WIN, dic); } } - - /** Launches an application or a document. + + /** + * Launches an application or a document. + * * @param application the application to be launched or the document to be opened or printed. - * @param parameters (Windows-specific) A parameter string to be passed to the application. - * It can be null. - * @param operation (Windows-specific) the operation to perform: "open" - Open a document, - * "print" - Print a document. - * It can be null. - * @param defaultDir (Windows-specific) the default directory in standard DOS syntax. - * It can be null. + * @param parameters (Windows-specific) A parameter string to be passed to the application. It can be + * null. + * @param operation (Windows-specific) the operation to perform: "open" - Open a document, "print" - Print a + * document. It can be null. + * @param defaultDir (Windows-specific) the default directory in standard DOS syntax. It can be null. * @return a Launch action */ public static PdfAction createLaunch(String application, String parameters, String operation, String defaultDir) { return new PdfAction(application, parameters, operation, defaultDir); } - - /**Creates a Rendition action - * @param file the name of the file - * @param fs the PdfSpecification + + /** + * Creates a Rendition action + * + * @param file the name of the file + * @param fs the PdfSpecification * @param mimeType the mime type - * @param ref the PdfIndirectReference + * @param ref the PdfIndirectReference * @return a Media Clip action * @throws IOException thrown when an I/O operation fails */ - public static PdfAction rendition(String file, PdfFileSpecification fs, String mimeType, PdfIndirectReference ref) throws IOException { + public static PdfAction rendition(String file, PdfFileSpecification fs, String mimeType, PdfIndirectReference ref) + throws IOException { PdfAction js = new PdfAction(); js.put(PdfName.S, PdfName.RENDITION); js.put(PdfName.R, new PdfRendition(file, fs, mimeType)); js.put(new PdfName("OP"), new PdfNumber(0)); js.put(new PdfName("AN"), ref); return js; - } - - /** Creates a JavaScript action. If the JavaScript is smaller than - * 50 characters it will be placed as a string, otherwise it will - * be placed as a compressed stream. - * @param code the JavaScript code - * @param writer the writer for this action - * @param unicode select JavaScript unicode. Note that the internal - * Acrobat JavaScript engine does not support unicode, - * so this may or may not work for you + } + + /** + * Creates a JavaScript action. If the JavaScript is smaller than 50 characters it will be placed as a string, + * otherwise it will be placed as a compressed stream. + * + * @param code the JavaScript code + * @param writer the writer for this action + * @param unicode select JavaScript unicode. Note that the internal Acrobat JavaScript engine does not support + * unicode, so this may or may not work for you * @return the JavaScript action - */ + */ public static PdfAction javaScript(String code, PdfWriter writer, boolean unicode) { PdfAction js = new PdfAction(); js.put(PdfName.S, PdfName.JAVASCRIPT); if (unicode && code.length() < 50) { - js.put(PdfName.JS, new PdfString(code, PdfObject.TEXT_UNICODE)); - } - else if (!unicode && code.length() < 100) { - js.put(PdfName.JS, new PdfString(code)); - } - else { + js.put(PdfName.JS, new PdfString(code, PdfObject.TEXT_UNICODE)); + } else if (!unicode && code.length() < 100) { + js.put(PdfName.JS, new PdfString(code)); + } else { try { - byte[] b = PdfEncodings.convertToBytes(code, unicode ? PdfObject.TEXT_UNICODE : PdfObject.TEXT_PDFDOCENCODING); + byte[] b = PdfEncodings.convertToBytes(code, + unicode ? PdfObject.TEXT_UNICODE : PdfObject.TEXT_PDFDOCENCODING); PdfStream stream = new PdfStream(b); stream.flateCompress(writer.getCompressionLevel()); js.put(PdfName.JS, writer.addToBody(stream).getIndirectReference()); - } - catch (Exception e) { + } catch (Exception e) { js.put(PdfName.JS, new PdfString(code)); } } return js; } - /** Creates a JavaScript action. If the JavaScript is smaller than - * 50 characters it will be place as a string, otherwise it will - * be placed as a compressed stream. - * @param code the JavaScript code + /** + * Creates a JavaScript action. If the JavaScript is smaller than 50 characters it will be place as a string, + * otherwise it will be placed as a compressed stream. + * + * @param code the JavaScript code * @param writer the writer for this action * @return the JavaScript action - */ + */ public static PdfAction javaScript(String code, PdfWriter writer) { return javaScript(code, writer, false); } - + /** * A Hide action hides or shows an object. - * @param obj object to hide or show + * + * @param obj object to hide or show * @param hide true is hide, false is show * @return a Hide Action */ @@ -333,23 +381,26 @@ static PdfAction createHide(PdfObject obj, boolean hide) { PdfAction action = new PdfAction(); action.put(PdfName.S, PdfName.HIDE); action.put(PdfName.T, obj); - if (!hide) + if (!hide) { action.put(PdfName.H, PdfBoolean.PDFFALSE); + } return action; } - + /** * A Hide action hides or shows an annotation. + * * @param annot the annotation to hide or show - * @param hide true is hide, false is show + * @param hide true is hide, false is show * @return A Hide Action */ public static PdfAction createHide(PdfAnnotation annot, boolean hide) { return createHide(annot.getIndirectReference(), hide); } - + /** * A Hide action hides or shows an annotation. + * * @param name the name of the object to hide or show * @param hide true is hide, false is show * @return A Hide Action @@ -357,22 +408,25 @@ public static PdfAction createHide(PdfAnnotation annot, boolean hide) { public static PdfAction createHide(String name, boolean hide) { return createHide(new PdfString(name), hide); } - + static PdfArray buildArray(Object[] names) { PdfArray array = new PdfArray(); for (Object obj : names) { - if (obj instanceof String) + if (obj instanceof String) { array.add(new PdfString((String) obj)); - else if (obj instanceof PdfAnnotation) + } else if (obj instanceof PdfAnnotation) { array.add(((PdfAnnotation) obj).getIndirectReference()); - else - throw new RuntimeException(MessageLocalization.getComposedMessage("the.array.must.contain.string.or.pdfannotation")); + } else { + throw new RuntimeException( + MessageLocalization.getComposedMessage("the.array.must.contain.string.or.pdfannotation")); + } } return array; } - + /** * A Hide action hides or shows objects. + * * @param names Object array containing the Objects to hide or show * @param hide true is hide, false is show * @return A Hide Action @@ -380,12 +434,13 @@ else if (obj instanceof PdfAnnotation) public static PdfAction createHide(Object[] names, boolean hide) { return createHide(buildArray(names), hide); } - + /** * Creates a submit form. - * @param file the URI to submit the form to - * @param names the objects to submit - * @param flags submit properties + * + * @param file the URI to submit the form to + * @param names the objects to submit + * @param flags submit properties * @return A PdfAction */ public static PdfAction createSubmitForm(String file, Object[] names, int flags) { @@ -395,29 +450,33 @@ public static PdfAction createSubmitForm(String file, Object[] names, int flags) dic.put(PdfName.F, new PdfString(file)); dic.put(PdfName.FS, PdfName.URL); action.put(PdfName.F, dic); - if (names != null) + if (names != null) { action.put(PdfName.FIELDS, buildArray(names)); + } action.put(PdfName.FLAGS, new PdfNumber(flags)); return action; } - + /** * Creates a resetform. - * @param names the objects to reset - * @param flags submit properties + * + * @param names the objects to reset + * @param flags submit properties * @return A PdfAction */ public static PdfAction createResetForm(Object[] names, int flags) { PdfAction action = new PdfAction(); action.put(PdfName.S, PdfName.RESETFORM); - if (names != null) + if (names != null) { action.put(PdfName.FIELDS, buildArray(names)); + } action.put(PdfName.FLAGS, new PdfNumber(flags)); return action; } - + /** * Creates an Import field. + * * @param file the name of the file * @return A PdfAction */ @@ -427,30 +486,15 @@ public static PdfAction createImportData(String file) { action.put(PdfName.F, new PdfString(file)); return action; } - - /** Add a chained action. - * @param na the next action - */ - public void next(PdfAction na) { - PdfObject nextAction = get(PdfName.NEXT); - if (nextAction == null) - put(PdfName.NEXT, na); - else if (nextAction.isDictionary()) { - PdfArray array = new PdfArray(nextAction); - array.add(na); - put(PdfName.NEXT, array); - } - else { - ((PdfArray)nextAction).add(na); - } - } - - /** Creates a GoTo action to an internal page. - * @param page the page to go. First page is 1 - * @param dest the destination for the page + + /** + * Creates a GoTo action to an internal page. + * + * @param page the page to go. First page is 1 + * @param dest the destination for the page * @param writer the writer for this action * @return a GoTo action - */ + */ public static PdfAction gotoLocalPage(int page, PdfDestination dest, PdfWriter writer) { PdfIndirectReference ref = writer.getPageReference(page); dest.addPage(ref); @@ -462,66 +506,78 @@ public static PdfAction gotoLocalPage(int page, PdfDestination dest, PdfWriter w /** * Creates a GoTo action to a named destination. - * @param dest the named destination + * + * @param dest the named destination * @param isName if true sets the destination as a name, if false sets it as a String * @return a GoTo action */ public static PdfAction gotoLocalPage(String dest, boolean isName) { PdfAction action = new PdfAction(); action.put(PdfName.S, PdfName.GOTO); - if (isName) + if (isName) { action.put(PdfName.D, new PdfName(dest)); - else + } else { action.put(PdfName.D, new PdfString(dest, null)); + } return action; } /** * Creates a GoToR action to a named destination. - * @param filename the file name to go to - * @param dest the destination name - * @param isName if true sets the destination as a name, if false sets it as a String - * @param newWindow open the document in a new window if true, if false the current document is replaced by the new document. + * + * @param filename the file name to go to + * @param dest the destination name + * @param isName if true sets the destination as a name, if false sets it as a String + * @param newWindow open the document in a new window if true, if false the current document is + * replaced by the new document. * @return a GoToR action */ public static PdfAction gotoRemotePage(String filename, String dest, boolean isName, boolean newWindow) { PdfAction action = new PdfAction(); action.put(PdfName.F, new PdfString(filename)); action.put(PdfName.S, PdfName.GOTOR); - if (isName) + if (isName) { action.put(PdfName.D, new PdfName(dest)); - else + } else { action.put(PdfName.D, new PdfString(dest, null)); - if (newWindow) + } + if (newWindow) { action.put(PdfName.NEWWINDOW, PdfBoolean.PDFTRUE); + } return action; } /** * Creates a GoToE action to an embedded file. - * @param filename the root document of the target (null if the target is in the same document) - * @param dest the named destination - * @param isName if true sets the destination as a name, if false sets it as a String + * + * @param filename the root document of the target (null if the target is in the same document) + * @param dest the named destination + * @param isName if true sets the destination as a name, if false sets it as a String * @param newWindow if true, the doc should be opened in a new window - * @param target a path to the target document of this action + * @param target a path to the target document of this action * @return a GoToE action */ - public static PdfAction gotoEmbedded(String filename, PdfTargetDictionary target, String dest, boolean isName, boolean newWindow) { - if (isName) + public static PdfAction gotoEmbedded(String filename, PdfTargetDictionary target, String dest, boolean isName, + boolean newWindow) { + if (isName) { return gotoEmbedded(filename, target, new PdfName(dest), newWindow); - else + } else { return gotoEmbedded(filename, target, new PdfString(dest, null), newWindow); + } } /** * Creates a GoToE action to an embedded file. - * @param filename the root document of the target (null if the target is in the same document) + * + * @param filename the root document of the target (null if the target is in the same document) * @param target a path to the target document of this action - * @param dest the destination inside the target document, can be of type PdfDestination, PdfName, or PdfString - * @param newWindow if true, the destination document should be opened in a new window + * @param dest the destination inside the target document, can be of type PdfDestination, PdfName, or + * PdfString + * @param newWindow if true, the destination document should be opened in a new window * @return a GoToE action */ - public static PdfAction gotoEmbedded(String filename, PdfTargetDictionary target, PdfObject dest, boolean newWindow) { + public static PdfAction gotoEmbedded(String filename, PdfTargetDictionary target, PdfObject dest, + boolean newWindow) { PdfAction action = new PdfAction(); action.put(PdfName.S, PdfName.GOTOE); action.put(PdfName.T, target); @@ -534,25 +590,27 @@ public static PdfAction gotoEmbedded(String filename, PdfTargetDictionary target } /** - * A set-OCG-state action (PDF 1.5) sets the state of one or more optional content - * groups. - * @param state an array consisting of any number of sequences beginning with a PdfName - * or String (ON, OFF, or Toggle) followed by one or more optional content group dictionaries - * PdfLayer or a PdfIndirectReference to a PdfLayer.
      - * The array elements are processed from left to right; each name is applied - * to the subsequent groups until the next name is encountered: - *

        - *
      • ON sets the state of subsequent groups to ON
        • - *
      • OFF sets the state of subsequent groups to OFF
        • - *
      • Toggle reverses the state of subsequent groups
        • - *
      - * @param preserveRB if true, indicates that radio-button state relationships between optional - * content groups (as specified by the RBGroups entry in the current configuration - * dictionary) should be preserved when the states in the - * state array are applied. That is, if a group is set to ON (either by ON or Toggle) during - * processing of the state array, any other groups belong to the same radio-button - * group are turned OFF. If a group is set to OFF, there is no effect on other groups.
      - * If false, radio-button state relationships, if any, are ignored + * A set-OCG-state action (PDF 1.5) sets the state of one or more optional content groups. + * + * @param state an array consisting of any number of sequences beginning with a PdfName or + * String (ON, OFF, or Toggle) followed by one or more optional content group + * dictionaries + * PdfLayer or a PdfIndirectReference to a PdfLayer.
      + * The array elements are processed from left to right; each name is applied to the subsequent + * groups until the next name is encountered: + *
        + *
      • ON sets the state of subsequent groups to ON
        • + *
      • OFF sets the state of subsequent groups to OFF
        • + *
      • Toggle reverses the state of subsequent groups
        • + *
      + * @param preserveRB if true, indicates that radio-button state relationships between optional content + * groups (as specified by the RBGroups entry in the current configuration dictionary) should be + * preserved when the states in the + * state array are applied. That is, if a group is set to ON (either by ON or + * Toggle) during processing of the state array, any other groups belong to the same + * radio-button group are turned OFF. If a group is set to OFF, there is no effect on other + * groups.
      If + * false, radio-button state relationships, if any, are ignored * @return the action */ public static PdfAction setOCGstate(List state, boolean preserveRB) { @@ -560,32 +618,57 @@ public static PdfAction setOCGstate(List state, boolean preserveRB) { action.put(PdfName.S, PdfName.SETOCGSTATE); PdfArray a = new PdfArray(); for (Object o : state) { - if (o == null) + if (o == null) { continue; - if (o instanceof PdfIndirectReference) + } + if (o instanceof PdfIndirectReference) { a.add((PdfIndirectReference) o); - else if (o instanceof PdfLayer) + } else if (o instanceof PdfLayer) { a.add(((PdfLayer) o).getRef()); - else if (o instanceof PdfName) + } else if (o instanceof PdfName) { a.add((PdfName) o); - else if (o instanceof String) { + } else if (o instanceof String) { PdfName name = null; String s = (String) o; - if (s.equalsIgnoreCase("on")) + if (s.equalsIgnoreCase("on")) { name = PdfName.ON; - else if (s.equalsIgnoreCase("off")) + } else if (s.equalsIgnoreCase("off")) { name = PdfName.OFF; - else if (s.equalsIgnoreCase("toggle")) + } else if (s.equalsIgnoreCase("toggle")) { name = PdfName.TOGGLE; - else - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("a.string.1.was.passed.in.state.only.on.off.and.toggle.are.allowed", s)); + } else { + throw new IllegalArgumentException(MessageLocalization.getComposedMessage( + "a.string.1.was.passed.in.state.only.on.off.and.toggle.are.allowed", s)); + } a.add(name); - } else - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("invalid.type.was.passed.in.state.1", o.getClass().getName())); + } else { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("invalid.type.was.passed.in.state.1", + o.getClass().getName())); + } } action.put(PdfName.STATE, a); - if (!preserveRB) + if (!preserveRB) { action.put(PdfName.PRESERVERB, PdfBoolean.PDFFALSE); + } return action; } + + /** + * Add a chained action. + * + * @param na the next action + */ + public void next(PdfAction na) { + PdfObject nextAction = get(PdfName.NEXT); + if (nextAction == null) { + put(PdfName.NEXT, na); + } else if (nextAction.isDictionary()) { + PdfArray array = new PdfArray(nextAction); + array.add(na); + put(PdfName.NEXT, array); + } else { + ((PdfArray) nextAction).add(na); + } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfAnnotation.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfAnnotation.java index e409c5476..229104635 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfAnnotation.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfAnnotation.java @@ -49,1037 +49,1053 @@ package com.lowagie.text.pdf; +import com.lowagie.text.Rectangle; +import com.lowagie.text.error_messages.MessageLocalization; import java.awt.Color; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import com.lowagie.text.error_messages.MessageLocalization; - -import com.lowagie.text.Rectangle; - /** * A PdfAnnotation is a note that is associated with a page. * - * @see PdfDictionary + * @see PdfDictionary */ public class PdfAnnotation extends PdfDictionary { - /** - * highlight attributename - */ - public static final PdfName HIGHLIGHT_NONE = PdfName.N; - /** - * highlight attributename - */ - public static final PdfName HIGHLIGHT_INVERT = PdfName.I; - /** - * highlight attributename - */ - public static final PdfName HIGHLIGHT_OUTLINE = PdfName.O; - /** - * highlight attributename - */ - public static final PdfName HIGHLIGHT_PUSH = PdfName.P; - /** - * highlight attributename - */ - public static final PdfName HIGHLIGHT_TOGGLE = PdfName.T; - /** - * flagvalue - */ - public static final int FLAGS_INVISIBLE = 1; - /** - * flagvalue - */ - public static final int FLAGS_HIDDEN = 2; - /** - * flagvalue - */ - public static final int FLAGS_PRINT = 4; - /** - * flagvalue - */ - public static final int FLAGS_NOZOOM = 8; - /** - * flagvalue - */ - public static final int FLAGS_NOROTATE = 16; - /** - * flagvalue - */ - public static final int FLAGS_NOVIEW = 32; - /** - * flagvalue - */ - public static final int FLAGS_READONLY = 64; - /** - * flagvalue - */ - public static final int FLAGS_LOCKED = 128; - /** - * flagvalue - */ - public static final int FLAGS_TOGGLENOVIEW = 256; - /** - * appearance attributename - */ - public static final PdfName APPEARANCE_NORMAL = PdfName.N; - /** - * appearance attributename - */ - public static final PdfName APPEARANCE_ROLLOVER = PdfName.R; - /** - * appearance attributename - */ - public static final PdfName APPEARANCE_DOWN = PdfName.D; - /** - * attributevalue - */ - public static final PdfName AA_ENTER = PdfName.E; - /** - * attributevalue - */ - public static final PdfName AA_EXIT = PdfName.X; - /** - * attributevalue - */ - public static final PdfName AA_DOWN = PdfName.D; - /** - * attributevalue - */ - public static final PdfName AA_UP = PdfName.U; - /** - * attributevalue - */ - public static final PdfName AA_FOCUS = PdfName.FO; - /** - * attributevalue - */ - public static final PdfName AA_BLUR = PdfName.BL; - /** - * attributevalue - */ - public static final PdfName AA_JS_KEY = PdfName.K; - /** - * attributevalue - */ - public static final PdfName AA_JS_FORMAT = PdfName.F; - /** - * attributevalue - */ - public static final PdfName AA_JS_CHANGE = PdfName.V; - /** - * attributevalue - */ - public static final PdfName AA_JS_OTHER_CHANGE = PdfName.C; - /** - * attributevalue - */ - public static final int MARKUP_HIGHLIGHT = 0; - /** - * attributevalue - */ - public static final int MARKUP_UNDERLINE = 1; - /** - * attributevalue - */ - public static final int MARKUP_STRIKEOUT = 2; - /** - * attributevalue - * - * @since 2.1.3 - */ - public static final int MARKUP_SQUIGGLY = 3; - - protected PdfWriter writer; - /** - * Reference to this annotation. - * - * @since 2.1.6; was removed in 2.1.5, but restored in 2.1.6 - */ - protected PdfIndirectReference reference; - protected Map templates; - protected boolean form = false; - protected boolean annotation = true; - - /** - * Holds value of property used. - */ - protected boolean used = false; - - /** - * Holds value of property placeInPage. - */ - private int placeInPage = -1; - - // constructors - public PdfAnnotation(PdfWriter writer, Rectangle rect) { - this.writer = writer; - if (rect != null) { - put(PdfName.RECT, new PdfRectangle(rect)); + /** + * highlight attributename + */ + public static final PdfName HIGHLIGHT_NONE = PdfName.N; + /** + * highlight attributename + */ + public static final PdfName HIGHLIGHT_INVERT = PdfName.I; + /** + * highlight attributename + */ + public static final PdfName HIGHLIGHT_OUTLINE = PdfName.O; + /** + * highlight attributename + */ + public static final PdfName HIGHLIGHT_PUSH = PdfName.P; + /** + * highlight attributename + */ + public static final PdfName HIGHLIGHT_TOGGLE = PdfName.T; + /** + * flagvalue + */ + public static final int FLAGS_INVISIBLE = 1; + /** + * flagvalue + */ + public static final int FLAGS_HIDDEN = 2; + /** + * flagvalue + */ + public static final int FLAGS_PRINT = 4; + /** + * flagvalue + */ + public static final int FLAGS_NOZOOM = 8; + /** + * flagvalue + */ + public static final int FLAGS_NOROTATE = 16; + /** + * flagvalue + */ + public static final int FLAGS_NOVIEW = 32; + /** + * flagvalue + */ + public static final int FLAGS_READONLY = 64; + /** + * flagvalue + */ + public static final int FLAGS_LOCKED = 128; + /** + * flagvalue + */ + public static final int FLAGS_TOGGLENOVIEW = 256; + /** + * appearance attributename + */ + public static final PdfName APPEARANCE_NORMAL = PdfName.N; + /** + * appearance attributename + */ + public static final PdfName APPEARANCE_ROLLOVER = PdfName.R; + /** + * appearance attributename + */ + public static final PdfName APPEARANCE_DOWN = PdfName.D; + /** + * attributevalue + */ + public static final PdfName AA_ENTER = PdfName.E; + /** + * attributevalue + */ + public static final PdfName AA_EXIT = PdfName.X; + /** + * attributevalue + */ + public static final PdfName AA_DOWN = PdfName.D; + /** + * attributevalue + */ + public static final PdfName AA_UP = PdfName.U; + /** + * attributevalue + */ + public static final PdfName AA_FOCUS = PdfName.FO; + /** + * attributevalue + */ + public static final PdfName AA_BLUR = PdfName.BL; + /** + * attributevalue + */ + public static final PdfName AA_JS_KEY = PdfName.K; + /** + * attributevalue + */ + public static final PdfName AA_JS_FORMAT = PdfName.F; + /** + * attributevalue + */ + public static final PdfName AA_JS_CHANGE = PdfName.V; + /** + * attributevalue + */ + public static final PdfName AA_JS_OTHER_CHANGE = PdfName.C; + /** + * attributevalue + */ + public static final int MARKUP_HIGHLIGHT = 0; + /** + * attributevalue + */ + public static final int MARKUP_UNDERLINE = 1; + /** + * attributevalue + */ + public static final int MARKUP_STRIKEOUT = 2; + /** + * attributevalue + * + * @since 2.1.3 + */ + public static final int MARKUP_SQUIGGLY = 3; + + protected PdfWriter writer; + /** + * Reference to this annotation. + * + * @since 2.1.6; was removed in 2.1.5, but restored in 2.1.6 + */ + protected PdfIndirectReference reference; + protected Map templates; + protected boolean form = false; + protected boolean annotation = true; + + /** + * Holds value of property used. + */ + protected boolean used = false; + + /** + * Holds value of property placeInPage. + */ + private int placeInPage = -1; + + // constructors + public PdfAnnotation(PdfWriter writer, Rectangle rect) { + this.writer = writer; + if (rect != null) { + put(PdfName.RECT, new PdfRectangle(rect)); + } + addFKey(); + } + + /** + * Constructs a new PdfAnnotation of subtype text. + * + * @param writer pdf writer + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y + * @param title title + * @param content content + */ + public PdfAnnotation(PdfWriter writer, float llx, float lly, float urx, float ury, PdfString title, + PdfString content) { + this.writer = writer; + put(PdfName.SUBTYPE, PdfName.TEXT); + put(PdfName.T, title); + put(PdfName.RECT, new PdfRectangle(llx, lly, urx, ury)); + put(PdfName.CONTENTS, content); + addFKey(); + } + + /** + * Constructs a new PdfAnnotation of subtype link (Action). + * + * @param writer pdf writer + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y + * @param action {@link PdfAction} + */ + + public PdfAnnotation(PdfWriter writer, float llx, float lly, float urx, float ury, PdfAction action) { + this.writer = writer; + put(PdfName.SUBTYPE, PdfName.LINK); + put(PdfName.RECT, new PdfRectangle(llx, lly, urx, ury)); + put(PdfName.A, action); + put(PdfName.BORDER, new PdfBorderArray(0, 0, 0)); + put(PdfName.C, new PdfColor(0x00, 0x00, 0xFF)); + addFKey(); + } + + /** + * Creates a screen PdfAnnotation + * + * @param writer {@link PdfWriter} + * @param rect dimensions {@link Rectangle} + * @param clipTitle clip title + * @param fs {@link PdfFileSpecification} + * @param mimeType mime type of the file + * @param playOnDisplay play on display + * @return a screen PdfAnnotation + * @throws IOException on error + */ + public static PdfAnnotation createScreen(PdfWriter writer, Rectangle rect, String clipTitle, + PdfFileSpecification fs, + String mimeType, boolean playOnDisplay) throws IOException { + PdfAnnotation ann = new PdfAnnotation(writer, rect); + ann.put(PdfName.SUBTYPE, PdfName.SCREEN); + ann.put(PdfName.F, new PdfNumber(FLAGS_PRINT)); + ann.put(PdfName.TYPE, PdfName.ANNOT); + ann.setPage(); + PdfIndirectReference ref = ann.getIndirectReference(); + PdfAction action = PdfAction.rendition(clipTitle, fs, mimeType, ref); + PdfIndirectReference actionRef = writer.addToBody(action).getIndirectReference(); + // for play on display add trigger event + if (playOnDisplay) { + PdfDictionary aa = new PdfDictionary(); + aa.put(new PdfName("PV"), actionRef); + ann.put(PdfName.AA, aa); + } + ann.put(PdfName.A, actionRef); + return ann; + } + + /** + * @param writer {@link PdfWriter} + * @param rect dimensions {@link Rectangle} + * @param title title for the link + * @param contents content + * @param open open + * @param icon icon + * @return a PdfAnnotation + */ + public static PdfAnnotation createText(PdfWriter writer, Rectangle rect, String title, String contents, + boolean open, String icon) { + PdfAnnotation annot = new PdfAnnotation(writer, rect); + annot.put(PdfName.SUBTYPE, PdfName.TEXT); + if (title != null) { + annot.put(PdfName.T, new PdfString(title, PdfObject.TEXT_UNICODE)); + } + if (contents != null) { + annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + } + if (open) { + annot.put(PdfName.OPEN, PdfBoolean.PDFTRUE); + } + if (icon != null) { + annot.put(PdfName.NAME, new PdfName(icon)); + } + return annot; } - addFKey(); - } - - /** - * Constructs a new PdfAnnotation of subtype text. - * - * @param writer pdf writer - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y - * @param title title - * @param content content - */ - public PdfAnnotation(PdfWriter writer, float llx, float lly, float urx, float ury, PdfString title, PdfString content) { - this.writer = writer; - put(PdfName.SUBTYPE, PdfName.TEXT); - put(PdfName.T, title); - put(PdfName.RECT, new PdfRectangle(llx, lly, urx, ury)); - put(PdfName.CONTENTS, content); - addFKey(); - } - - /** - * Constructs a new PdfAnnotation of subtype link (Action). - * - * @param writer pdf writer - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y - * @param action {@link PdfAction} - */ - - public PdfAnnotation(PdfWriter writer, float llx, float lly, float urx, float ury, PdfAction action) { - this.writer = writer; - put(PdfName.SUBTYPE, PdfName.LINK); - put(PdfName.RECT, new PdfRectangle(llx, lly, urx, ury)); - put(PdfName.A, action); - put(PdfName.BORDER, new PdfBorderArray(0, 0, 0)); - put(PdfName.C, new PdfColor(0x00, 0x00, 0xFF)); - addFKey(); - } - - /** - * Creates a screen PdfAnnotation - * - * @param writer {@link PdfWriter} - * @param rect dimensions {@link Rectangle} - * @param clipTitle clip title - * @param fs {@link PdfFileSpecification} - * @param mimeType mime type of the file - * @param playOnDisplay play on display - * @throws IOException on error - * @return a screen PdfAnnotation - */ - public static PdfAnnotation createScreen(PdfWriter writer, Rectangle rect, String clipTitle, PdfFileSpecification fs, - String mimeType, boolean playOnDisplay) throws IOException { - PdfAnnotation ann = new PdfAnnotation(writer, rect); - ann.put(PdfName.SUBTYPE, PdfName.SCREEN); - ann.put(PdfName.F, new PdfNumber(FLAGS_PRINT)); - ann.put(PdfName.TYPE, PdfName.ANNOT); - ann.setPage(); - PdfIndirectReference ref = ann.getIndirectReference(); - PdfAction action = PdfAction.rendition(clipTitle, fs, mimeType, ref); - PdfIndirectReference actionRef = writer.addToBody(action).getIndirectReference(); - // for play on display add trigger event - if (playOnDisplay) { - PdfDictionary aa = new PdfDictionary(); - aa.put(new PdfName("PV"), actionRef); - ann.put(PdfName.AA, aa); + + /** + * Creates a link. + * + * @param writer {@link PdfWriter} + * @param rect dimensions {@link Rectangle} + * @param highlight the highlight property + * @return A PdfAnnotation + */ + protected static PdfAnnotation createLink(PdfWriter writer, Rectangle rect, PdfName highlight) { + PdfAnnotation annot = new PdfAnnotation(writer, rect); + annot.put(PdfName.SUBTYPE, PdfName.LINK); + if (!highlight.equals(HIGHLIGHT_INVERT)) { + annot.put(PdfName.H, highlight); + } + return annot; } - ann.put(PdfName.A, actionRef); - return ann; - } - - /** - * Returns an indirect reference to the annotation - * - * @return the indirect reference - */ - public PdfIndirectReference getIndirectReference() { - if (reference == null) { - reference = writer.getPdfIndirectReference(); + + /** + * Creates an Annotation with an Action. + * + * @param writer {@link PdfWriter} + * @param rect dimensions {@link Rectangle} + * @param highlight title for the link + * @param action action for annotation + * @return A PdfAnnotation + */ + public static PdfAnnotation createLink(PdfWriter writer, Rectangle rect, PdfName highlight, PdfAction action) { + PdfAnnotation annot = createLink(writer, rect, highlight); + annot.putEx(PdfName.A, action); + return annot; } - return reference; - } - - /** - * @param writer {@link PdfWriter} - * @param rect dimensions {@link Rectangle} - * @param title title for the link - * @param contents content - * @param open open - * @param icon icon - * @return a PdfAnnotation - */ - public static PdfAnnotation createText(PdfWriter writer, Rectangle rect, String title, String contents, boolean open, String icon) { - PdfAnnotation annot = new PdfAnnotation(writer, rect); - annot.put(PdfName.SUBTYPE, PdfName.TEXT); - if (title != null) { - annot.put(PdfName.T, new PdfString(title, PdfObject.TEXT_UNICODE)); + + /** + * Creates an Annotation with an local destination. + * + * @param writer {@link PdfWriter} + * @param rect dimensions {@link Rectangle} + * @param highlight title for the link + * @param namedDestination destination for pdf annotation + * @return A PdfAnnotation + */ + public static PdfAnnotation createLink(PdfWriter writer, Rectangle rect, PdfName highlight, + String namedDestination) { + PdfAnnotation annot = createLink(writer, rect, highlight); + annot.put(PdfName.DEST, new PdfString(namedDestination)); + return annot; } - if (contents != null) { - annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + + /** + * Creates an Annotation with a PdfDestination. + * + * @param writer {@link PdfWriter} + * @param rect dimensions {@link Rectangle} + * @param highlight title for the link + * @param page page + * @param dest destination for pdf annotation + * @return A PdfAnnotation + */ + public static PdfAnnotation createLink(PdfWriter writer, Rectangle rect, PdfName highlight, int page, + PdfDestination dest) { + PdfAnnotation annot = createLink(writer, rect, highlight); + PdfIndirectReference ref = writer.getPageReference(page); + dest.addPage(ref); + annot.put(PdfName.DEST, dest); + return annot; } - if (open) { - annot.put(PdfName.OPEN, PdfBoolean.PDFTRUE); + + /** + * Add some free text to the document. + * + * @param writer pdf writer + * @param rect dimension + * @param contents content of free text + * @param defaultAppearance default appearance + * @return A PdfAnnotation + */ + public static PdfAnnotation createFreeText(PdfWriter writer, Rectangle rect, String contents, + PdfContentByte defaultAppearance) { + PdfAnnotation annot = new PdfAnnotation(writer, rect); + annot.put(PdfName.SUBTYPE, PdfName.FREETEXT); + annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + annot.setDefaultAppearanceString(defaultAppearance); + return annot; } - if (icon != null) { - annot.put(PdfName.NAME, new PdfName(icon)); + + /** + * Adds a line to the document. Move over the line and a tooltip is shown. + * + * @param writer {@link PdfWriter} + * @param rect dimensions {@link Rectangle} + * @param contents content for the file + * @param x1 x-coordinate + * @param y1 y-coordinate + * @param x2 x-coordinate + * @param y2 y-coordinate + * @return A PdfAnnotation + */ + public static PdfAnnotation createLine(PdfWriter writer, Rectangle rect, String contents, float x1, float y1, + float x2, float y2) { + PdfAnnotation annot = new PdfAnnotation(writer, rect); + annot.put(PdfName.SUBTYPE, PdfName.LINE); + annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + PdfArray array = new PdfArray(new PdfNumber(x1)); + array.add(new PdfNumber(y1)); + array.add(new PdfNumber(x2)); + array.add(new PdfNumber(y2)); + annot.put(PdfName.L, array); + return annot; } - return annot; - } - - /** - * Creates a link. - * @param writer {@link PdfWriter} - * @param rect dimensions {@link Rectangle} - * @param highlight the highlight property - * @return A PdfAnnotation - */ - protected static PdfAnnotation createLink(PdfWriter writer, Rectangle rect, PdfName highlight) { - PdfAnnotation annot = new PdfAnnotation(writer, rect); - annot.put(PdfName.SUBTYPE, PdfName.LINK); - if (!highlight.equals(HIGHLIGHT_INVERT)) { - annot.put(PdfName.H, highlight); + + /** + * Adds a circle or a square that shows a tooltip when you pass over it. + * + * @param writer pdf writer + * @param rect dimension of the tooltip + * @param contents The tooltip + * @param square true if you want a square, false if you want a circle + * @return A PdfAnnotation + */ + public static PdfAnnotation createSquareCircle(PdfWriter writer, Rectangle rect, String contents, boolean square) { + PdfAnnotation annot = new PdfAnnotation(writer, rect); + if (square) { + annot.put(PdfName.SUBTYPE, PdfName.SQUARE); + } else { + annot.put(PdfName.SUBTYPE, PdfName.CIRCLE); + } + annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + return annot; } - return annot; - } - - /** - * Creates an Annotation with an Action. - * - * @param writer {@link PdfWriter} - * @param rect dimensions {@link Rectangle} - * @param highlight title for the link - * @param action action for annotation - * @return A PdfAnnotation - */ - public static PdfAnnotation createLink(PdfWriter writer, Rectangle rect, PdfName highlight, PdfAction action) { - PdfAnnotation annot = createLink(writer, rect, highlight); - annot.putEx(PdfName.A, action); - return annot; - } - - /** - * Creates an Annotation with an local destination. - * - * @param writer {@link PdfWriter} - * @param rect dimensions {@link Rectangle} - * @param highlight title for the link - * @param namedDestination destination for pdf annotation - * @return A PdfAnnotation - */ - public static PdfAnnotation createLink(PdfWriter writer, Rectangle rect, PdfName highlight, String namedDestination) { - PdfAnnotation annot = createLink(writer, rect, highlight); - annot.put(PdfName.DEST, new PdfString(namedDestination)); - return annot; - } - - /** - * Creates an Annotation with a PdfDestination. - * - * @param writer {@link PdfWriter} - * @param rect dimensions {@link Rectangle} - * @param highlight title for the link - * @param page page - * @param dest destination for pdf annotation - * @return A PdfAnnotation - */ - public static PdfAnnotation createLink(PdfWriter writer, Rectangle rect, PdfName highlight, int page, PdfDestination dest) { - PdfAnnotation annot = createLink(writer, rect, highlight); - PdfIndirectReference ref = writer.getPageReference(page); - dest.addPage(ref); - annot.put(PdfName.DEST, dest); - return annot; - } - - /** - * Add some free text to the document. - * - * @param writer pdf writer - * @param rect dimension - * @param contents content of free text - * @param defaultAppearance default appearance - * @return A PdfAnnotation - */ - public static PdfAnnotation createFreeText(PdfWriter writer, Rectangle rect, String contents, PdfContentByte defaultAppearance) { - PdfAnnotation annot = new PdfAnnotation(writer, rect); - annot.put(PdfName.SUBTYPE, PdfName.FREETEXT); - annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); - annot.setDefaultAppearanceString(defaultAppearance); - return annot; - } - - /** - * Adds a line to the document. Move over the line and a tooltip is shown. - * - * @param writer {@link PdfWriter} - * @param rect dimensions {@link Rectangle} - * @param contents content for the file - * @param x1 x-coordinate - * @param y1 y-coordinate - * @param x2 x-coordinate - * @param y2 y-coordinate - * @return A PdfAnnotation - */ - public static PdfAnnotation createLine(PdfWriter writer, Rectangle rect, String contents, float x1, float y1, float x2, float y2) { - PdfAnnotation annot = new PdfAnnotation(writer, rect); - annot.put(PdfName.SUBTYPE, PdfName.LINE); - annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); - PdfArray array = new PdfArray(new PdfNumber(x1)); - array.add(new PdfNumber(y1)); - array.add(new PdfNumber(x2)); - array.add(new PdfNumber(y2)); - annot.put(PdfName.L, array); - return annot; - } - - /** - * Adds a circle or a square that shows a tooltip when you pass over it. - * - * @param writer pdf writer - * @param rect dimension of the tooltip - * @param contents The tooltip - * @param square true if you want a square, false if you want a circle - * @return A PdfAnnotation - */ - public static PdfAnnotation createSquareCircle(PdfWriter writer, Rectangle rect, String contents, boolean square) { - PdfAnnotation annot = new PdfAnnotation(writer, rect); - if (square) { - annot.put(PdfName.SUBTYPE, PdfName.SQUARE); - } else { - annot.put(PdfName.SUBTYPE, PdfName.CIRCLE); + + public static PdfAnnotation createMarkup(PdfWriter writer, Rectangle rect, String contents, int type, + float[] quadPoints) { + PdfAnnotation annot = new PdfAnnotation(writer, rect); + PdfName name = PdfName.HIGHLIGHT; + switch (type) { + case MARKUP_UNDERLINE: + name = PdfName.UNDERLINE; + break; + case MARKUP_STRIKEOUT: + name = PdfName.STRIKEOUT; + break; + case MARKUP_SQUIGGLY: + name = PdfName.SQUIGGLY; + break; + } + annot.put(PdfName.SUBTYPE, name); + annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + PdfArray array = new PdfArray(); + for (float quadPoint : quadPoints) { + array.add(new PdfNumber(quadPoint)); + } + annot.put(PdfName.QUADPOINTS, array); + return annot; } - annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); - return annot; - } - - public static PdfAnnotation createMarkup(PdfWriter writer, Rectangle rect, String contents, int type, float[] quadPoints) { - PdfAnnotation annot = new PdfAnnotation(writer, rect); - PdfName name = PdfName.HIGHLIGHT; - switch (type) { - case MARKUP_UNDERLINE: - name = PdfName.UNDERLINE; - break; - case MARKUP_STRIKEOUT: - name = PdfName.STRIKEOUT; - break; - case MARKUP_SQUIGGLY: - name = PdfName.SQUIGGLY; - break; + + /** + * Adds a Stamp to your document. Move over the stamp and a tooltip is shown + * + * @param writer {@link PdfWriter} + * @param rect dimensions {@link Rectangle} + * @param contents content for the file + * @param name name of the annotation + * @return A PdfAnnotation + */ + public static PdfAnnotation createStamp(PdfWriter writer, Rectangle rect, String contents, String name) { + PdfAnnotation annot = new PdfAnnotation(writer, rect); + annot.put(PdfName.SUBTYPE, PdfName.STAMP); + annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + annot.put(PdfName.NAME, new PdfName(name)); + return annot; } - annot.put(PdfName.SUBTYPE, name); - annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); - PdfArray array = new PdfArray(); - for (float quadPoint : quadPoints) { - array.add(new PdfNumber(quadPoint)); - } - annot.put(PdfName.QUADPOINTS, array); - return annot; - } - - /** - * Adds a Stamp to your document. Move over the stamp and a tooltip is shown - * - * @param writer {@link PdfWriter} - * @param rect dimensions {@link Rectangle} - * @param contents content for the file - * @param name name of the annotation - * @return A PdfAnnotation - */ - public static PdfAnnotation createStamp(PdfWriter writer, Rectangle rect, String contents, String name) { - PdfAnnotation annot = new PdfAnnotation(writer, rect); - annot.put(PdfName.SUBTYPE, PdfName.STAMP); - annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); - annot.put(PdfName.NAME, new PdfName(name)); - return annot; - } - - public static PdfAnnotation createInk(PdfWriter writer, Rectangle rect, String contents, float[][] inkList) { - PdfAnnotation annot = new PdfAnnotation(writer, rect); - annot.put(PdfName.SUBTYPE, PdfName.INK); - annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); - PdfArray outer = new PdfArray(); - for (float[] floats : inkList) { - PdfArray inner = new PdfArray(); - float[] deep = floats; - for (float v : deep) { - inner.add(new PdfNumber(v)); - } - outer.add(inner); - } - annot.put(PdfName.INKLIST, outer); - return annot; - } - - /** - * Creates a file attachment annotation. - * - * @param writer the PdfWriter - * @param rect the dimensions in the page of the annotation - * @param contents the file description - * @param fileStore an array with the file. If it's null the file will be read from the disk - * @param file the path to the file. It will only be used if - * fileStore is not null - * @param fileDisplay the actual file name stored in the pdf - * @return the annotation - * @throws IOException on error - */ - public static PdfAnnotation createFileAttachment(PdfWriter writer, Rectangle rect, String contents, byte[] fileStore, String file, - String fileDisplay) throws IOException { - return createFileAttachment(writer, rect, contents, PdfFileSpecification.fileEmbedded(writer, file, fileDisplay, fileStore)); - } - - /** - * Creates a file attachment annotation - * - * @param writer {@link PdfWriter} - * @param rect dimensions {@link Rectangle} - * @param contents content for the file - * @param fs {@link PdfFileSpecification} - * @throws IOException on error - * @return the annotation - */ - public static PdfAnnotation createFileAttachment(PdfWriter writer, Rectangle rect, String contents, PdfFileSpecification fs) - throws IOException { - PdfAnnotation annot = new PdfAnnotation(writer, rect); - annot.put(PdfName.SUBTYPE, PdfName.FILEATTACHMENT); - if (contents != null) { - annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + + public static PdfAnnotation createInk(PdfWriter writer, Rectangle rect, String contents, float[][] inkList) { + PdfAnnotation annot = new PdfAnnotation(writer, rect); + annot.put(PdfName.SUBTYPE, PdfName.INK); + annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + PdfArray outer = new PdfArray(); + for (float[] floats : inkList) { + PdfArray inner = new PdfArray(); + float[] deep = floats; + for (float v : deep) { + inner.add(new PdfNumber(v)); + } + outer.add(inner); + } + annot.put(PdfName.INKLIST, outer); + return annot; } - annot.put(PdfName.FS, fs.getReference()); - return annot; - } - - /** - * Adds a popup to your document. - * - * @param writer {@link PdfWriter} - * @param rect dimensions {@link Rectangle} - * @param contents content for the file - * @param open if popup is open - * @return A PdfAnnotation - */ - public static PdfAnnotation createPopup(PdfWriter writer, Rectangle rect, String contents, boolean open) { - PdfAnnotation annot = new PdfAnnotation(writer, rect); - annot.put(PdfName.SUBTYPE, PdfName.POPUP); - if (contents != null) { - annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + + /** + * Creates a file attachment annotation. + * + * @param writer the PdfWriter + * @param rect the dimensions in the page of the annotation + * @param contents the file description + * @param fileStore an array with the file. If it's null the file will be read from the disk + * @param file the path to the file. It will only be used if + * fileStore is not null + * @param fileDisplay the actual file name stored in the pdf + * @return the annotation + * @throws IOException on error + */ + public static PdfAnnotation createFileAttachment(PdfWriter writer, Rectangle rect, String contents, + byte[] fileStore, String file, + String fileDisplay) throws IOException { + return createFileAttachment(writer, rect, contents, + PdfFileSpecification.fileEmbedded(writer, file, fileDisplay, fileStore)); } - if (open) { - annot.put(PdfName.OPEN, PdfBoolean.PDFTRUE); + + /** + * Creates a file attachment annotation + * + * @param writer {@link PdfWriter} + * @param rect dimensions {@link Rectangle} + * @param contents content for the file + * @param fs {@link PdfFileSpecification} + * @return the annotation + * @throws IOException on error + */ + public static PdfAnnotation createFileAttachment(PdfWriter writer, Rectangle rect, String contents, + PdfFileSpecification fs) + throws IOException { + PdfAnnotation annot = new PdfAnnotation(writer, rect); + annot.put(PdfName.SUBTYPE, PdfName.FILEATTACHMENT); + if (contents != null) { + annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + } + annot.put(PdfName.FS, fs.getReference()); + return annot; } - return annot; - } - - public void setDefaultAppearanceString(PdfContentByte cb) { - byte[] b = cb.getInternalBuffer().toByteArray(); - int len = b.length; - for (int k = 0; k < len; ++k) { - if (b[k] == '\n') { - b[k] = 32; - } + + /** + * Adds a popup to your document. + * + * @param writer {@link PdfWriter} + * @param rect dimensions {@link Rectangle} + * @param contents content for the file + * @param open if popup is open + * @return A PdfAnnotation + */ + public static PdfAnnotation createPopup(PdfWriter writer, Rectangle rect, String contents, boolean open) { + PdfAnnotation annot = new PdfAnnotation(writer, rect); + annot.put(PdfName.SUBTYPE, PdfName.POPUP); + if (contents != null) { + annot.put(PdfName.CONTENTS, new PdfString(contents, PdfObject.TEXT_UNICODE)); + } + if (open) { + annot.put(PdfName.OPEN, PdfBoolean.PDFTRUE); + } + return annot; } - put(PdfName.DA, new PdfString(b)); - } - - public void setFlags(int flags) { - if (flags == 0) { - remove(PdfName.F); - } else { - put(PdfName.F, new PdfNumber(flags)); + + public static PdfArray getMKColor(Color color) { + PdfArray array = new PdfArray(); + int type = ExtendedColor.getType(color); + switch (type) { + case ExtendedColor.TYPE_GRAY: { + array.add(new PdfNumber(((GrayColor) color).getGray())); + break; + } + case ExtendedColor.TYPE_CMYK: { + CMYKColor cmyk = (CMYKColor) color; + array.add(new PdfNumber(cmyk.getCyan())); + array.add(new PdfNumber(cmyk.getMagenta())); + array.add(new PdfNumber(cmyk.getYellow())); + array.add(new PdfNumber(cmyk.getBlack())); + break; + } + case ExtendedColor.TYPE_SEPARATION: + case ExtendedColor.TYPE_PATTERN: + case ExtendedColor.TYPE_SHADING: + throw new RuntimeException( + MessageLocalization.getComposedMessage( + "separations.patterns.and.shadings.are.not.allowed.in.mk.dictionary")); + default: + array.add(new PdfNumber(color.getRed() / 255f)); + array.add(new PdfNumber(color.getGreen() / 255f)); + array.add(new PdfNumber(color.getBlue() / 255f)); + } + return array; } - } - - /** - * Adds one or more flag(s) to the existing annotation flags - * - * @param flags value to be added - * @return int the new flag value - */ - public int addFlags(int flags) { - PdfNumber obj = (PdfNumber)get(PdfName.F); - int old; - if (obj == null) - old = 0; - else - old = obj.intValue(); - int v = old | flags; - put(PdfName.F, new PdfNumber(v)); - return old; - } - - public void setBorder(PdfBorderArray border) { - put(PdfName.BORDER, border); - } - - public void setBorderStyle(PdfBorderDictionary border) { - put(PdfName.BS, border); - } - - /** - * Sets the annotation's highlighting mode. The values can be - * HIGHLIGHT_NONE, HIGHLIGHT_INVERT, - * HIGHLIGHT_OUTLINE and HIGHLIGHT_PUSH; - * - * @param highlight the annotation's highlighting mode - */ - public void setHighlighting(PdfName highlight) { - if (highlight.equals(HIGHLIGHT_INVERT)) { - remove(PdfName.H); - } else { - put(PdfName.H, highlight); + + /** + * Returns an indirect reference to the annotation + * + * @return the indirect reference + */ + public PdfIndirectReference getIndirectReference() { + if (reference == null) { + reference = writer.getPdfIndirectReference(); + } + return reference; } - } - public void setAppearance(PdfName ap, PdfTemplate template) { - PdfDictionary dic = (PdfDictionary) get(PdfName.AP); - if (dic == null) { - dic = new PdfDictionary(); + public void setDefaultAppearanceString(PdfContentByte cb) { + byte[] b = cb.getInternalBuffer().toByteArray(); + int len = b.length; + for (int k = 0; k < len; ++k) { + if (b[k] == '\n') { + b[k] = 32; + } + } + put(PdfName.DA, new PdfString(b)); } - dic.put(ap, template.getIndirectReference()); - put(PdfName.AP, dic); - if (!form) { - return; + + public void setFlags(int flags) { + if (flags == 0) { + remove(PdfName.F); + } else { + put(PdfName.F, new PdfNumber(flags)); + } } - if (templates == null) { - templates = new HashMap<>(); + + /** + * Adds one or more flag(s) to the existing annotation flags + * + * @param flags value to be added + * @return int the new flag value + */ + public int addFlags(int flags) { + PdfNumber obj = (PdfNumber) get(PdfName.F); + int old; + if (obj == null) { + old = 0; + } else { + old = obj.intValue(); + } + int v = old | flags; + put(PdfName.F, new PdfNumber(v)); + return old; } - templates.put(template, null); - } - public void setAppearance(PdfName ap, String state, PdfTemplate template) { - PdfDictionary dicAp = (PdfDictionary) get(PdfName.AP); - if (dicAp == null) { - dicAp = new PdfDictionary(); + public void setBorder(PdfBorderArray border) { + put(PdfName.BORDER, border); } - PdfDictionary dic; - PdfObject obj = dicAp.get(ap); - if (obj != null && obj.isDictionary()) { - dic = (PdfDictionary) obj; - } else { - dic = new PdfDictionary(); + public void setBorderStyle(PdfBorderDictionary border) { + put(PdfName.BS, border); } - dic.put(new PdfName(state), template.getIndirectReference()); - dicAp.put(ap, dic); - put(PdfName.AP, dicAp); - if (!form) { - return; + + /** + * Sets the annotation's highlighting mode. The values can be + * HIGHLIGHT_NONE, HIGHLIGHT_INVERT, + * HIGHLIGHT_OUTLINE and HIGHLIGHT_PUSH; + * + * @param highlight the annotation's highlighting mode + */ + public void setHighlighting(PdfName highlight) { + if (highlight.equals(HIGHLIGHT_INVERT)) { + remove(PdfName.H); + } else { + put(PdfName.H, highlight); + } } - if (templates == null) { - templates = new HashMap<>(); + + public void setAppearance(PdfName ap, PdfTemplate template) { + PdfDictionary dic = (PdfDictionary) get(PdfName.AP); + if (dic == null) { + dic = new PdfDictionary(); + } + dic.put(ap, template.getIndirectReference()); + put(PdfName.AP, dic); + if (!form) { + return; + } + if (templates == null) { + templates = new HashMap<>(); + } + templates.put(template, null); } - templates.put(template, null); - } - public void setAppearanceState(String state) { - if (state == null) { - remove(PdfName.AS); - return; + public void setAppearance(PdfName ap, String state, PdfTemplate template) { + PdfDictionary dicAp = (PdfDictionary) get(PdfName.AP); + if (dicAp == null) { + dicAp = new PdfDictionary(); + } + + PdfDictionary dic; + PdfObject obj = dicAp.get(ap); + if (obj != null && obj.isDictionary()) { + dic = (PdfDictionary) obj; + } else { + dic = new PdfDictionary(); + } + dic.put(new PdfName(state), template.getIndirectReference()); + dicAp.put(ap, dic); + put(PdfName.AP, dicAp); + if (!form) { + return; + } + if (templates == null) { + templates = new HashMap<>(); + } + templates.put(template, null); } - put(PdfName.AS, new PdfName(state)); - } - public void setColor(Color color) { - put(PdfName.C, new PdfColor(color)); - } + public void setAppearanceState(String state) { + if (state == null) { + remove(PdfName.AS); + return; + } + put(PdfName.AS, new PdfName(state)); + } - public void setTitle(String title) { - if (title == null) { - remove(PdfName.T); - return; + public void setColor(Color color) { + put(PdfName.C, new PdfColor(color)); } - put(PdfName.T, new PdfString(title, PdfObject.TEXT_UNICODE)); - } - - public void setPopup(PdfAnnotation popup) { - put(PdfName.POPUP, popup.getIndirectReference()); - popup.put(PdfName.PARENT, getIndirectReference()); - } - - public void setAction(PdfAction action) { - put(PdfName.A, action); - } - - public void setAdditionalActions(PdfName key, PdfAction action) { - PdfDictionary dic; - PdfObject obj = get(PdfName.AA); - if (obj != null && obj.isDictionary()) { - dic = (PdfDictionary) obj; - } else { - dic = new PdfDictionary(); + + public void setTitle(String title) { + if (title == null) { + remove(PdfName.T); + return; + } + put(PdfName.T, new PdfString(title, PdfObject.TEXT_UNICODE)); } - dic.put(key, action); - put(PdfName.AA, dic); - } - - /** - * Getter for property used. - * - * @return Value of property used. - */ - public boolean isUsed() { - return used; - } - - /** - * Setter for property used. - */ - public void setUsed() { - used = true; - } - - public HashMap getTemplates() { - return (HashMap) templates; - } - - /** - * Getter for property form. - * - * @return Value of property form. - */ - public boolean isForm() { - return form; - } - - /** - * Getter for property annotation. - * - * @return Value of property annotation. - */ - public boolean isAnnotation() { - return annotation; - } - - public void setPage(int page) { - put(PdfName.P, writer.getPageReference(page)); - } - - public void setPage() { - put(PdfName.P, writer.getCurrentPage()); - } - - /** - * Getter for property placeInPage. - * - * @return Value of property placeInPage. - */ - public int getPlaceInPage() { - return placeInPage; - } - - /** - * Places the annotation in a specified page that must be greater or equal to the current one. With PdfStamper the page can - * be any. The first page is 1. - * - * @param placeInPage New value of property placeInPage. - */ - public void setPlaceInPage(int placeInPage) { - this.placeInPage = placeInPage; - } - - public void setRotate(int v) { - put(PdfName.ROTATE, new PdfNumber(v)); - } - - PdfDictionary getMK() { - PdfDictionary mk = (PdfDictionary) get(PdfName.MK); - if (mk == null) { - mk = new PdfDictionary(); - put(PdfName.MK, mk); + + public void setPopup(PdfAnnotation popup) { + put(PdfName.POPUP, popup.getIndirectReference()); + popup.put(PdfName.PARENT, getIndirectReference()); } - return mk; - } - - public void setMKRotation(int rotation) { - getMK().put(PdfName.R, new PdfNumber(rotation)); - } - - public static PdfArray getMKColor(Color color) { - PdfArray array = new PdfArray(); - int type = ExtendedColor.getType(color); - switch (type) { - case ExtendedColor.TYPE_GRAY: { - array.add(new PdfNumber(((GrayColor) color).getGray())); - break; - } - case ExtendedColor.TYPE_CMYK: { - CMYKColor cmyk = (CMYKColor) color; - array.add(new PdfNumber(cmyk.getCyan())); - array.add(new PdfNumber(cmyk.getMagenta())); - array.add(new PdfNumber(cmyk.getYellow())); - array.add(new PdfNumber(cmyk.getBlack())); - break; - } - case ExtendedColor.TYPE_SEPARATION: - case ExtendedColor.TYPE_PATTERN: - case ExtendedColor.TYPE_SHADING: - throw new RuntimeException( - MessageLocalization.getComposedMessage("separations.patterns.and.shadings.are.not.allowed.in.mk.dictionary")); - default: - array.add(new PdfNumber(color.getRed() / 255f)); - array.add(new PdfNumber(color.getGreen() / 255f)); - array.add(new PdfNumber(color.getBlue() / 255f)); + + public void setAction(PdfAction action) { + put(PdfName.A, action); } - return array; - } - - public void setMKBorderColor(Color color) { - if (color == null) { - getMK().remove(PdfName.BC); - } else { - getMK().put(PdfName.BC, getMKColor(color)); + + public void setAdditionalActions(PdfName key, PdfAction action) { + PdfDictionary dic; + PdfObject obj = get(PdfName.AA); + if (obj != null && obj.isDictionary()) { + dic = (PdfDictionary) obj; + } else { + dic = new PdfDictionary(); + } + dic.put(key, action); + put(PdfName.AA, dic); } - } - public void setMKBackgroundColor(Color color) { - if (color == null) { - getMK().remove(PdfName.BG); - } else { - getMK().put(PdfName.BG, getMKColor(color)); + /** + * Getter for property used. + * + * @return Value of property used. + */ + public boolean isUsed() { + return used; } - } - public void setMKNormalCaption(String caption) { - getMK().put(PdfName.CA, new PdfString(caption, PdfObject.TEXT_UNICODE)); - } + /** + * Setter for property used. + */ + public void setUsed() { + used = true; + } - public void setMKRolloverCaption(String caption) { - getMK().put(PdfName.RC, new PdfString(caption, PdfObject.TEXT_UNICODE)); - } + public HashMap getTemplates() { + return (HashMap) templates; + } - public void setMKAlternateCaption(String caption) { - getMK().put(PdfName.AC, new PdfString(caption, PdfObject.TEXT_UNICODE)); - } + /** + * Getter for property form. + * + * @return Value of property form. + */ + public boolean isForm() { + return form; + } - public void setMKNormalIcon(PdfTemplate template) { - getMK().put(PdfName.I, template.getIndirectReference()); - } + /** + * Getter for property annotation. + * + * @return Value of property annotation. + */ + public boolean isAnnotation() { + return annotation; + } - public void setMKRolloverIcon(PdfTemplate template) { - getMK().put(PdfName.RI, template.getIndirectReference()); - } + public void setPage(int page) { + put(PdfName.P, writer.getPageReference(page)); + } - public void setMKAlternateIcon(PdfTemplate template) { - getMK().put(PdfName.IX, template.getIndirectReference()); - } + public void setPage() { + put(PdfName.P, writer.getCurrentPage()); + } - public void setMKIconFit(PdfName scale, PdfName scalingType, float leftoverLeft, float leftoverBottom, boolean fitInBounds) { - PdfDictionary dic = new PdfDictionary(); - if (!scale.equals(PdfName.A)) { - dic.put(PdfName.SW, scale); + /** + * Getter for property placeInPage. + * + * @return Value of property placeInPage. + */ + public int getPlaceInPage() { + return placeInPage; } - if (!scalingType.equals(PdfName.P)) { - dic.put(PdfName.S, scalingType); + + /** + * Places the annotation in a specified page that must be greater or equal to the current one. With + * PdfStamper the page can be any. The first page is 1. + * + * @param placeInPage New value of property placeInPage. + */ + public void setPlaceInPage(int placeInPage) { + this.placeInPage = placeInPage; } - if (leftoverLeft != 0.5f || leftoverBottom != 0.5f) { - PdfArray array = new PdfArray(new PdfNumber(leftoverLeft)); - array.add(new PdfNumber(leftoverBottom)); - dic.put(PdfName.A, array); + + public void setRotate(int v) { + put(PdfName.ROTATE, new PdfNumber(v)); } - if (fitInBounds) { - dic.put(PdfName.FB, PdfBoolean.PDFTRUE); + + PdfDictionary getMK() { + PdfDictionary mk = (PdfDictionary) get(PdfName.MK); + if (mk == null) { + mk = new PdfDictionary(); + put(PdfName.MK, mk); + } + return mk; } - getMK().put(PdfName.IF, dic); - } - - public void setMKTextPosition(int tp) { - getMK().put(PdfName.TP, new PdfNumber(tp)); - } - - /** - * Sets the layer this annotation belongs to. - * - * @param layer the layer this annotation belongs to - */ - public void setLayer(PdfOCG layer) { - put(PdfName.OC, layer.getRef()); - } - - /** - * Sets the name of the annotation. With this name the annotation can be identified among all the annotations on a page (it has to be - * unique). - * - * @param name name to be set for annotation - */ - public void setName(String name) { - put(PdfName.NM, new PdfString(name)); - } - - /** - * This class processes links from imported pages so that they may be active. The following example code reads a group of files and places - * them all on the output PDF, four pages in a single page, keeping the links active. - * 
      -   * String[] files = new String[] {"input1.pdf", "input2.pdf"};
-   * String outputFile = "output.pdf";
-   * int firstPage=1;
-   * Document document = new Document();
-   * PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(outputFile));
-   * document.setPageSize(PageSize.A4);
-   * float W = PageSize.A4.getWidth() / 2;
-   * float H = PageSize.A4.getHeight() / 2;
-   * document.open();
-   * PdfContentByte cb = writer.getDirectContent();
-   * for (int i = 0; i < files.length; i++) {
-   *    PdfReader currentReader = new PdfReader(files[i]);
-   *    currentReader.consolidateNamedDestinations();
-   *    for (int page = 1; page <= currentReader.getNumberOfPages(); page++) {
-   *        PdfImportedPage importedPage = writer.getImportedPage(currentReader, page);
-   *        float a = 0.5f;
-   *        float e = (page % 2 == 0) ? W : 0;
-   *        float f = (page % 4 == 1 || page % 4 == 2) ? H : 0;
-   *        ArrayList links = currentReader.getLinks(page);
-   *        cb.addTemplate(importedPage, a, 0, 0, a, e, f);
-   *        for (int j = 0; j < links.size(); j++) {
-   *            PdfAnnotation.PdfImportedLink link = (PdfAnnotation.PdfImportedLink)links.get(j);
-   *            if (link.isInternal()) {
-   *                int dPage = link.getDestinationPage();
-   *                int newDestPage = (dPage-1)/4 + firstPage;
-   *                float ee = (dPage % 2 == 0) ? W : 0;
-   *                float ff = (dPage % 4 == 1 || dPage % 4 == 2) ? H : 0;
-   *                link.setDestinationPage(newDestPage);
-   *                link.transformDestination(a, 0, 0, a, ee, ff);
-   *            }
-   *            link.transformRect(a, 0, 0, a, e, f);
-   *            writer.addAnnotation(link.createAnnotation(writer));
-   *        }
-   *        if (page % 4 == 0)
-   *        document.newPage();
-   *    }
-   *    if (i < files.length - 1)
-   *    document.newPage();
-   *    firstPage += (currentReader.getNumberOfPages()+3)/4;
-   * }
-   * document.close();
-   *
      - */ - public static class PdfImportedLink { - - float llx, lly, urx, ury; - HashMap parameters = new HashMap<>(); - PdfArray destination; - int newPage = 0; - - PdfImportedLink(PdfDictionary annotation) { - parameters.putAll(annotation.hashMap); - try { - destination = (PdfArray) parameters.remove(PdfName.DEST); - } catch (ClassCastException ex) { - throw new IllegalArgumentException( - MessageLocalization.getComposedMessage("you.have.to.consolidate.the.named.destinations.of.your.reader")); - } - if (destination != null) { - destination = new PdfArray(destination); - } - PdfArray rc = (PdfArray) parameters.remove(PdfName.RECT); - llx = rc.getAsNumber(0).floatValue(); - lly = rc.getAsNumber(1).floatValue(); - urx = rc.getAsNumber(2).floatValue(); - ury = rc.getAsNumber(3).floatValue(); + + public void setMKRotation(int rotation) { + getMK().put(PdfName.R, new PdfNumber(rotation)); } - public boolean isInternal() { - return destination != null; + public void setMKBorderColor(Color color) { + if (color == null) { + getMK().remove(PdfName.BC); + } else { + getMK().put(PdfName.BC, getMKColor(color)); + } } - public int getDestinationPage() { - if (!isInternal()) { - return 0; - } - - // here destination is something like - // [132 0 R, /XYZ, 29.3898, 731.864502, null] - PdfIndirectReference ref = destination.getAsIndirectObject(0); - - PRIndirectReference pr = (PRIndirectReference) ref; - PdfReader r = pr.getReader(); - for (int i = 1; i <= r.getNumberOfPages(); i++) { - PRIndirectReference pp = r.getPageOrigRef(i); - if (pp.getGeneration() == pr.getGeneration() && pp.getNumber() == pr.getNumber()) { - return i; + public void setMKBackgroundColor(Color color) { + if (color == null) { + getMK().remove(PdfName.BG); + } else { + getMK().put(PdfName.BG, getMKColor(color)); } - } - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("page.not.found")); } - public void setDestinationPage(int newPage) { - if (!isInternal()) { - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("cannot.change.destination.of.external.link")); - } - this.newPage = newPage; + public void setMKNormalCaption(String caption) { + getMK().put(PdfName.CA, new PdfString(caption, PdfObject.TEXT_UNICODE)); + } + + public void setMKRolloverCaption(String caption) { + getMK().put(PdfName.RC, new PdfString(caption, PdfObject.TEXT_UNICODE)); + } + + public void setMKAlternateCaption(String caption) { + getMK().put(PdfName.AC, new PdfString(caption, PdfObject.TEXT_UNICODE)); + } + + public void setMKNormalIcon(PdfTemplate template) { + getMK().put(PdfName.I, template.getIndirectReference()); } - public void transformDestination(float a, float b, float c, float d, float e, float f) { - if (!isInternal()) { - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("cannot.change.destination.of.external.link")); - } - if (destination.getAsName(1).equals(PdfName.XYZ)) { - float x = destination.getAsNumber(2).floatValue(); - float y = destination.getAsNumber(3).floatValue(); - float xx = x * a + y * c + e; - float yy = x * b + y * d + f; - destination.set(2, new PdfNumber(xx)); - destination.set(3, new PdfNumber(yy)); - } + public void setMKRolloverIcon(PdfTemplate template) { + getMK().put(PdfName.RI, template.getIndirectReference()); } - public void transformRect(float a, float b, float c, float d, float e, float f) { - float x = llx * a + lly * c + e; - float y = llx * b + lly * d + f; - llx = x; - lly = y; - x = urx * a + ury * c + e; - y = urx * b + ury * d + f; - urx = x; - ury = y; + public void setMKAlternateIcon(PdfTemplate template) { + getMK().put(PdfName.IX, template.getIndirectReference()); } - public PdfAnnotation createAnnotation(PdfWriter writer) { - PdfAnnotation annotation = new PdfAnnotation(writer, new Rectangle(llx, lly, urx, ury)); - if (newPage != 0) { - PdfIndirectReference ref = writer.getPageReference(newPage); - destination.set(0, ref); - } - if (destination != null) { - annotation.put(PdfName.DEST, destination); - } - annotation.hashMap.putAll(parameters); - return annotation; + public void setMKIconFit(PdfName scale, PdfName scalingType, float leftoverLeft, float leftoverBottom, + boolean fitInBounds) { + PdfDictionary dic = new PdfDictionary(); + if (!scale.equals(PdfName.A)) { + dic.put(PdfName.SW, scale); + } + if (!scalingType.equals(PdfName.P)) { + dic.put(PdfName.S, scalingType); + } + if (leftoverLeft != 0.5f || leftoverBottom != 0.5f) { + PdfArray array = new PdfArray(new PdfNumber(leftoverLeft)); + array.add(new PdfNumber(leftoverBottom)); + dic.put(PdfName.A, array); + } + if (fitInBounds) { + dic.put(PdfName.FB, PdfBoolean.PDFTRUE); + } + getMK().put(PdfName.IF, dic); + } + + public void setMKTextPosition(int tp) { + getMK().put(PdfName.TP, new PdfNumber(tp)); } /** - * Returns a String representation of the link. + * Sets the layer this annotation belongs to. * - * @return a String representation of the imported link - * @since 2.1.6 + * @param layer the layer this annotation belongs to */ - public String toString() { - StringBuilder buf = new StringBuilder("Imported link: location ["); - buf.append(llx); - buf.append(' '); - buf.append(lly); - buf.append(' '); - buf.append(urx); - buf.append(' '); - buf.append(ury); - buf.append("] destination "); - buf.append(destination); - buf.append(" parameters "); - buf.append(parameters); - return buf.toString(); + public void setLayer(PdfOCG layer) { + put(PdfName.OC, layer.getRef()); } - } - private void addFKey() { - if (writer.isPdfA1()) { - put(PdfName.F, new PdfNumber(FLAGS_PRINT)); - } - } + /** + * Sets the name of the annotation. With this name the annotation can be identified among all the annotations on a + * page (it has to be unique). + * + * @param name name to be set for annotation + */ + public void setName(String name) { + put(PdfName.NM, new PdfString(name)); + } + + private void addFKey() { + if (writer.isPdfA1()) { + put(PdfName.F, new PdfNumber(FLAGS_PRINT)); + } + } + + /** + * This class processes links from imported pages so that they may be active. The following example code reads a + * group of files and places them all on the output PDF, four pages in a single page, keeping the links active. + * 
      +     * String[] files = new String[] {"input1.pdf", "input2.pdf"};
+     * String outputFile = "output.pdf";
+     * int firstPage=1;
+     * Document document = new Document();
+     * PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(outputFile));
+     * document.setPageSize(PageSize.A4);
+     * float W = PageSize.A4.getWidth() / 2;
+     * float H = PageSize.A4.getHeight() / 2;
+     * document.open();
+     * PdfContentByte cb = writer.getDirectContent();
+     * for (int i = 0; i < files.length; i++) {
+     *    PdfReader currentReader = new PdfReader(files[i]);
+     *    currentReader.consolidateNamedDestinations();
+     *    for (int page = 1; page <= currentReader.getNumberOfPages(); page++) {
+     *        PdfImportedPage importedPage = writer.getImportedPage(currentReader, page);
+     *        float a = 0.5f;
+     *        float e = (page % 2 == 0) ? W : 0;
+     *        float f = (page % 4 == 1 || page % 4 == 2) ? H : 0;
+     *        ArrayList links = currentReader.getLinks(page);
+     *        cb.addTemplate(importedPage, a, 0, 0, a, e, f);
+     *        for (int j = 0; j < links.size(); j++) {
+     *            PdfAnnotation.PdfImportedLink link = (PdfAnnotation.PdfImportedLink)links.get(j);
+     *            if (link.isInternal()) {
+     *                int dPage = link.getDestinationPage();
+     *                int newDestPage = (dPage-1)/4 + firstPage;
+     *                float ee = (dPage % 2 == 0) ? W : 0;
+     *                float ff = (dPage % 4 == 1 || dPage % 4 == 2) ? H : 0;
+     *                link.setDestinationPage(newDestPage);
+     *                link.transformDestination(a, 0, 0, a, ee, ff);
+     *            }
+     *            link.transformRect(a, 0, 0, a, e, f);
+     *            writer.addAnnotation(link.createAnnotation(writer));
+     *        }
+     *        if (page % 4 == 0)
+     *        document.newPage();
+     *    }
+     *    if (i < files.length - 1)
+     *    document.newPage();
+     *    firstPage += (currentReader.getNumberOfPages()+3)/4;
+     * }
+     * document.close();
+     *
      + */ + public static class PdfImportedLink { + + float llx, lly, urx, ury; + HashMap parameters = new HashMap<>(); + PdfArray destination; + int newPage = 0; + + PdfImportedLink(PdfDictionary annotation) { + parameters.putAll(annotation.hashMap); + try { + destination = (PdfArray) parameters.remove(PdfName.DEST); + } catch (ClassCastException ex) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage( + "you.have.to.consolidate.the.named.destinations.of.your.reader")); + } + if (destination != null) { + destination = new PdfArray(destination); + } + PdfArray rc = (PdfArray) parameters.remove(PdfName.RECT); + llx = rc.getAsNumber(0).floatValue(); + lly = rc.getAsNumber(1).floatValue(); + urx = rc.getAsNumber(2).floatValue(); + ury = rc.getAsNumber(3).floatValue(); + } + + public boolean isInternal() { + return destination != null; + } + + public int getDestinationPage() { + if (!isInternal()) { + return 0; + } + + // here destination is something like + // [132 0 R, /XYZ, 29.3898, 731.864502, null] + PdfIndirectReference ref = destination.getAsIndirectObject(0); + + PRIndirectReference pr = (PRIndirectReference) ref; + PdfReader r = pr.getReader(); + for (int i = 1; i <= r.getNumberOfPages(); i++) { + PRIndirectReference pp = r.getPageOrigRef(i); + if (pp.getGeneration() == pr.getGeneration() && pp.getNumber() == pr.getNumber()) { + return i; + } + } + throw new IllegalArgumentException(MessageLocalization.getComposedMessage("page.not.found")); + } + + public void setDestinationPage(int newPage) { + if (!isInternal()) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("cannot.change.destination.of.external.link")); + } + this.newPage = newPage; + } + + public void transformDestination(float a, float b, float c, float d, float e, float f) { + if (!isInternal()) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("cannot.change.destination.of.external.link")); + } + if (destination.getAsName(1).equals(PdfName.XYZ)) { + float x = destination.getAsNumber(2).floatValue(); + float y = destination.getAsNumber(3).floatValue(); + float xx = x * a + y * c + e; + float yy = x * b + y * d + f; + destination.set(2, new PdfNumber(xx)); + destination.set(3, new PdfNumber(yy)); + } + } + + public void transformRect(float a, float b, float c, float d, float e, float f) { + float x = llx * a + lly * c + e; + float y = llx * b + lly * d + f; + llx = x; + lly = y; + x = urx * a + ury * c + e; + y = urx * b + ury * d + f; + urx = x; + ury = y; + } + + public PdfAnnotation createAnnotation(PdfWriter writer) { + PdfAnnotation annotation = new PdfAnnotation(writer, new Rectangle(llx, lly, urx, ury)); + if (newPage != 0) { + PdfIndirectReference ref = writer.getPageReference(newPage); + destination.set(0, ref); + } + if (destination != null) { + annotation.put(PdfName.DEST, destination); + } + annotation.hashMap.putAll(parameters); + return annotation; + } + + /** + * Returns a String representation of the link. + * + * @return a String representation of the imported link + * @since 2.1.6 + */ + public String toString() { + StringBuilder buf = new StringBuilder("Imported link: location ["); + buf.append(llx); + buf.append(' '); + buf.append(lly); + buf.append(' '); + buf.append(urx); + buf.append(' '); + buf.append(ury); + buf.append("] destination "); + buf.append(destination); + buf.append(" parameters "); + buf.append(parameters); + return buf.toString(); + } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfAppearance.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfAppearance.java index 5e42fb00f..f1d40c363 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfAppearance.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfAppearance.java @@ -47,11 +47,10 @@ package com.lowagie.text.pdf; +import com.lowagie.text.Rectangle; import java.util.HashMap; import java.util.Map; -import com.lowagie.text.Rectangle; - /** * Implements the appearance stream to be used with form fields.. */ @@ -59,6 +58,7 @@ public class PdfAppearance extends PdfTemplate { public static final Map stdFieldFontNames = new HashMap<>(); + static { stdFieldFontNames.put("Courier-BoldOblique", new PdfName("CoBO")); stdFieldFontNames.put("Courier-Bold", new PdfName("CoBo")); @@ -86,41 +86,41 @@ public class PdfAppearance extends PdfTemplate { stdFieldFontNames.put("HYSMyeongJoStd-Medium", new PdfName("HySm")); stdFieldFontNames.put("KozMinPro-Regular", new PdfName("KaMi")); } - + /** - *Creates a PdfAppearance. + * Creates a PdfAppearance. */ - + PdfAppearance() { super(); separator = ' '; } - + PdfAppearance(PdfIndirectReference iref) { thisReference = iref; } - + /** * Creates new PdfTemplate * * @param wr the PdfWriter */ - + PdfAppearance(PdfWriter wr) { super(wr); separator = ' '; } - + /** * Creates a new appearance to be used with form fields. * * @param writer the PdfWriter to use - * @param width the bounding box width + * @param width the bounding box width * @param height the bounding box height * @return the appearance created */ public static PdfAppearance createAppearance(PdfWriter writer, float width, float height) { - return createAppearance(writer, width, height, (PdfName)null); + return createAppearance(writer, width, height, (PdfName) null); } private static PdfAppearance createAppearance(PdfWriter writer, float width, float height, PdfName forcedName) { @@ -130,19 +130,19 @@ private static PdfAppearance createAppearance(PdfWriter writer, float width, flo writer.addDirectTemplateSimple(template, forcedName); return template; } - + /** - * Creates a new appearance to be used with existing form fields. - * (Create an empty signature appearance with an existing reference). - * + * Creates a new appearance to be used with existing form fields. (Create an empty signature appearance with an + * existing reference). + * * @param writer the PdfWriter to use - * @param width the bounding box width + * @param width the bounding box width * @param height the bounding box height - * @param ref to be overwritten - * - * @return the created appearance + * @param ref to be overwritten + * @return the created appearance */ - public static PdfAppearance createAppearance(PdfWriter writer, float width, float height, PdfIndirectReference ref) { + public static PdfAppearance createAppearance(PdfWriter writer, float width, float height, + PdfIndirectReference ref) { PdfAppearance template = new PdfAppearance(ref); template.setWidth(width); template.setHeight(height); @@ -153,22 +153,22 @@ public static PdfAppearance createAppearance(PdfWriter writer, float width, floa /** * Set the font and the size for the subsequent text writing. * - * @param bf the font + * @param bf the font * @param size the font size in points */ public void setFontAndSize(BaseFont bf, float size) { checkWriter(); state.size = size; if (bf.getFontType() == BaseFont.FONT_TYPE_DOCUMENT) { - state.fontDetails = new FontDetails(null, ((DocumentFont)bf).getIndirectReference(), bf); - } - else + state.fontDetails = new FontDetails(null, ((DocumentFont) bf).getIndirectReference(), bf); + } else { state.fontDetails = writer.addSimple(bf); + } PdfName psn = stdFieldFontNames.get(bf.getPostscriptFontName()); if (psn == null) { - if (bf.isSubset() && bf.getFontType() == BaseFont.FONT_TYPE_TTUNI) + if (bf.isSubset() && bf.getFontType() == BaseFont.FONT_TYPE_TTUNI) { psn = state.fontDetails.getFontName(); - else { + } else { psn = new PdfName(bf.getPostscriptFontName()); state.fontDetails.setSubset(false); } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfArray.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfArray.java index 981822005..6bf5218ec 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfArray.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfArray.java @@ -58,20 +58,20 @@ /** * PdfArray is the PDF Array object. - *

      - * An array is a sequence of PDF objects. An array may contain a mixture of - * object types. An array is written as a left square bracket ([), followed by a - * sequence of objects, followed by a right square bracket (]).
      - * This object is described in the 'Portable Document Format Reference Manual - * version 1.7' section 3.2.5 (page 58). - * + *

      + * An array is a sequence of PDF objects. An array may contain a mixture of object types. An array is written as a left + * square bracket ([), followed by a sequence of objects, followed by a right square bracket (]).
      This object is + * described in the 'Portable Document Format Reference Manual version 1.7' section 3.2.5 (page 58). + * * @see PdfObject */ public class PdfArray extends PdfObject { // CLASS VARIABLES - /** this is the actual array of PdfObjects */ + /** + * this is the actual array of PdfObjects + */ protected List arrayList; // constructors @@ -87,9 +87,8 @@ public PdfArray() { /** * Constructs an PdfArray-object, containing 1 * PdfObject. - * - * @param object - * a PdfObject that has to be added to the array + * + * @param object a PdfObject that has to be added to the array */ public PdfArray(PdfObject object) { this(); @@ -99,12 +98,11 @@ public PdfArray(PdfObject object) { /** * Constructs a PdfArray-object, containing all * float values in a specified array. - * + *

      * The float values are internally converted to * PdfNumber objects. - * - * @param values - * an array of float values to be added + * + * @param values an array of float values to be added */ public PdfArray(float[] values) { this(); @@ -114,12 +112,11 @@ public PdfArray(float[] values) { /** * Constructs a PdfArray-object, containing all * int values in a specified array. - * + *

      * The int values are internally converted to * PdfNumber objects. - * - * @param values - * an array of int values to be added + * + * @param values an array of int values to be added */ public PdfArray(int[] values) { this(); @@ -127,12 +124,9 @@ public PdfArray(int[] values) { } /** - * Constructs a PdfArray, containing all elements of a - * specified List. + * Constructs a PdfArray, containing all elements of a specified List. * - * @param pdfObjectList - * an List with PdfObjects to be - * added to the array + * @param pdfObjectList an List with PdfObjects to be added to the array * @since 2.1.3 */ public PdfArray(List pdfObjectList) { @@ -145,9 +139,8 @@ public PdfArray(List pdfObjectList) { /** * Constructs an PdfArray-object, containing all * PdfObjects in a specified PdfArray. - * - * @param array - * a PdfArray to be added to the array + * + * @param array a PdfArray to be added to the array */ public PdfArray(PdfArray array) { this(array.getElements()); @@ -156,13 +149,11 @@ public PdfArray(PdfArray array) { // METHODS OVERRIDING SOME PDFOBJECT METHODS /** - * Writes the PDF representation of this PdfArray as an array - * of byte to the specified OutputStream. - * - * @param writer - * for backwards compatibility - * @param os - * the OutputStream to write the bytes to. + * Writes the PDF representation of this PdfArray as an array of byte to the specified + * OutputStream. + * + * @param writer for backwards compatibility + * @param os the OutputStream to write the bytes to. */ @Override public void toPdf(PdfWriter writer, OutputStream os) throws IOException { @@ -195,12 +186,11 @@ public void toPdf(PdfWriter writer, OutputStream os) throws IOException { /** * Returns a string representation of this PdfArray. - * + *

      * The string representation consists of a list of all * PdfObjects contained in this PdfArray, enclosed - * in square brackets ("[]"). Adjacent elements are separated by the - * characters ", " (comma and space). - * + * in square brackets ("[]"). Adjacent elements are separated by the characters ", " (comma and space). + * * @return the string representation of this PdfArray */ @Override @@ -211,16 +201,12 @@ public String toString() { // ARRAY CONTENT METHODS /** - * Overwrites a specified location of the array, returning the previous - * value - * - * @param idx - * The index of the element to be overwritten - * @param obj - * new value for the specified index - * @throws IndexOutOfBoundsException - * if the specified position doesn't exist + * Overwrites a specified location of the array, returning the previous value + * + * @param idx The index of the element to be overwritten + * @param obj new value for the specified index * @return the previous value + * @throws IndexOutOfBoundsException if the specified position doesn't exist * @since 2.1.5 */ public PdfObject set(int idx, PdfObject obj) { @@ -229,27 +215,23 @@ public PdfObject set(int idx, PdfObject obj) { /** * Remove the element at the specified position from the array. - * - * Shifts any subsequent elements to the left (subtracts one from their - * indices). - * - * @param idx - * The index of the element to be removed. - * @throws IndexOutOfBoundsException - * the specified position doesn't exist - * @since 2.1.5 + *

      + * Shifts any subsequent elements to the left (subtracts one from their indices). + * + * @param idx The index of the element to be removed. * @return the PdfObject that was removed + * @throws IndexOutOfBoundsException the specified position doesn't exist + * @since 2.1.5 */ public PdfObject remove(int idx) { return arrayList.remove(idx); } - + /** * Removes the element from the list. - * - * Shifts any subsequent elements to the left (subtracts one from their - * indices). - * + *

      + * Shifts any subsequent elements to the left (subtracts one from their indices). + * * @param object to be removed. */ public boolean remove(PdfObject object) { @@ -276,7 +258,7 @@ public int size() { /** * Returns true if the array is empty. - * + * * @return true if the array is empty * @since 2.1.5 */ @@ -286,11 +268,10 @@ public boolean isEmpty() { /** * Adds a PdfObject to the end of the PdfArray. - * + *

      * The PdfObject will be the last element. - * - * @param object - * PdfObject to add + * + * @param object PdfObject to add * @return always true */ public boolean add(PdfObject object) { @@ -300,12 +281,11 @@ public boolean add(PdfObject object) { /** * Adds an array of float values to end of the * PdfArray. - * - * The values will be the last elements. The float values are - * internally converted to PdfNumber objects. - * - * @param values - * An array of float values to add + *

      + * The values will be the last elements. The float values are internally converted to + * PdfNumber objects. + * + * @param values An array of float values to add * @return always true */ public boolean add(float[] values) { @@ -318,12 +298,11 @@ public boolean add(float[] values) { /** * Adds an array of int values to end of the * PdfArray. - * - * The values will be the last elements. The int values are - * internally converted to PdfNumber objects. - * - * @param values - * An array of int values to add + *

      + * The values will be the last elements. The int values are internally converted to + * PdfNumber objects. + * + * @param values An array of int values to add * @return always true */ public boolean add(int[] values) { @@ -335,17 +314,13 @@ public boolean add(int[] values) { /** * Inserts the specified element at the specified position. - * - * Shifts the element currently at that position (if any) and any subsequent - * elements to the right (adds one to their indices). - * - * @param index - * The index at which the specified element is to be inserted - * @param element - * The element to be inserted - * @throws IndexOutOfBoundsException - * if the specified index is larger than the last position - * currently set, plus 1. + *

      + * Shifts the element currently at that position (if any) and any subsequent elements to the right (adds one to + * their indices). + * + * @param index The index at which the specified element is to be inserted + * @param element The element to be inserted + * @throws IndexOutOfBoundsException if the specified index is larger than the last position currently set, plus 1. * @since 2.1.5 */ public void add(int index, PdfObject element) { @@ -355,12 +330,11 @@ public void add(int index, PdfObject element) { /** * Inserts a PdfObject at the beginning of the * PdfArray. - * - * The PdfObject will be the first element, any other elements - * will be shifted to the right (adds one to their indices). - * - * @param object - * The PdfObject to add + *

      + * The PdfObject will be the first element, any other elements will be shifted to the right (adds one + * to their indices). + * + * @param object The PdfObject to add */ public void addFirst(PdfObject object) { arrayList.add(0, object); @@ -369,9 +343,8 @@ public void addFirst(PdfObject object) { /** * Checks if the PdfArray already contains a certain * PdfObject. - * - * @param object - * The PdfObject to check + * + * @param object The PdfObject to check * @return true */ public boolean contains(PdfObject object) { @@ -380,7 +353,7 @@ public boolean contains(PdfObject object) { /** * Returns the list iterator for the array. - * + * * @return a ListIterator */ public ListIterator listIterator() { @@ -389,14 +362,13 @@ public ListIterator listIterator() { /** * Returns the PdfObject with the specified index. - * + *

      * A possible indirect references is not resolved, so the returned * PdfObject may be either a direct object or an indirect * reference, depending on how the object is stored in the * PdfArray. - * - * @param idx - * The index of the PdfObject to be returned + * + * @param idx The index of the PdfObject to be returned * @return A PdfObject */ public PdfObject getPdfObject(int idx) { @@ -404,14 +376,12 @@ public PdfObject getPdfObject(int idx) { } /** - * Returns the PdfObject with the specified index, resolving a - * possible indirect reference to a direct object. - * - * Thus this method will never return a PdfIndirectReference + * Returns the PdfObject with the specified index, resolving a possible indirect reference to a direct * object. - * - * @param idx - * The index of the PdfObject to be returned + *

      + * Thus this method will never return a PdfIndirectReference object. + * + * @param idx The index of the PdfObject to be returned * @return A direct PdfObject or null */ public PdfObject getDirectObject(int idx) { @@ -422,17 +392,14 @@ public PdfObject getDirectObject(int idx) { // @author Mark A Storer (2/17/06) /** - * Returns a PdfObject as a PdfDictionary, - * resolving indirect references. - * - * The object corresponding to the specified index is retrieved and - * resolvedto a direct object. If it is a PdfDictionary, it is - * cast down and returned as such. Otherwise null is returned. - * - * @param idx - * The index of the PdfObject to be returned + * Returns a PdfObject as a PdfDictionary, resolving indirect references. + *

      + * The object corresponding to the specified index is retrieved and resolvedto a direct object. If it is a + * PdfDictionary, it is cast down and returned as such. Otherwise null is returned. + * + * @param idx The index of the PdfObject to be returned * @return the corresponding PdfDictionary object, or - * null + * null */ public PdfDictionary getAsDict(int idx) { PdfDictionary dict = null; @@ -444,17 +411,14 @@ public PdfDictionary getAsDict(int idx) { } /** - * Returns a PdfObject as a PdfArray, resolving - * indirect references. - * - * The object corresponding to the specified index is retrieved and resolved - * to a direct object. If it is a PdfArray, it is cast down and - * returned as such. Otherwise null is returned. - * - * @param idx - * The index of the PdfObject to be returned + * Returns a PdfObject as a PdfArray, resolving indirect references. + *

      + * The object corresponding to the specified index is retrieved and resolved to a direct object. If it is a + * PdfArray, it is cast down and returned as such. Otherwise null is returned. + * + * @param idx The index of the PdfObject to be returned * @return the corresponding PdfArray object, or - * null + * null */ public PdfArray getAsArray(int idx) { PdfArray array = null; @@ -466,17 +430,14 @@ public PdfArray getAsArray(int idx) { } /** - * Returns a PdfObject as a PdfStream, resolving - * indirect references. - * - * The object corresponding to the specified index is retrieved and resolved - * to a direct object. If it is a PdfStream, it is cast down - * and returned as such. Otherwise null is returned. - * - * @param idx - * The index of the PdfObject to be returned + * Returns a PdfObject as a PdfStream, resolving indirect references. + *

      + * The object corresponding to the specified index is retrieved and resolved to a direct object. If it is a + * PdfStream, it is cast down and returned as such. Otherwise null is returned. + * + * @param idx The index of the PdfObject to be returned * @return the corresponding PdfStream object, or - * null + * null */ public PdfStream getAsStream(int idx) { PdfStream stream = null; @@ -488,17 +449,14 @@ public PdfStream getAsStream(int idx) { } /** - * Returns a PdfObject as a PdfString, resolving - * indirect references. - * - * The object corresponding to the specified index is retrieved and resolved - * to a direct object. If it is a PdfString, it is cast down - * and returned as such. Otherwise null is returned. - * - * @param idx - * The index of the PdfObject to be returned + * Returns a PdfObject as a PdfString, resolving indirect references. + *

      + * The object corresponding to the specified index is retrieved and resolved to a direct object. If it is a + * PdfString, it is cast down and returned as such. Otherwise null is returned. + * + * @param idx The index of the PdfObject to be returned * @return the corresponding PdfString object, or - * null + * null */ public PdfString getAsString(int idx) { PdfString string = null; @@ -510,17 +468,14 @@ public PdfString getAsString(int idx) { } /** - * Returns a PdfObject as a PdfNumber, resolving - * indirect references. - * - * The object corresponding to the specified index is retrieved and resolved - * to a direct object. If it is a PdfNumber, it is cast down - * and returned as such. Otherwise null is returned. - * - * @param idx - * The index of the PdfObject to be returned + * Returns a PdfObject as a PdfNumber, resolving indirect references. + *

      + * The object corresponding to the specified index is retrieved and resolved to a direct object. If it is a + * PdfNumber, it is cast down and returned as such. Otherwise null is returned. + * + * @param idx The index of the PdfObject to be returned * @return the corresponding PdfNumber object, or - * null + * null */ public PdfNumber getAsNumber(int idx) { PdfNumber number = null; @@ -532,17 +487,14 @@ public PdfNumber getAsNumber(int idx) { } /** - * Returns a PdfObject as a PdfName, resolving - * indirect references. - * - * The object corresponding to the specified index is retrieved and resolved - * to a direct object. If it is a PdfName, it is cast down and - * returned as such. Otherwise null is returned. - * - * @param idx - * The index of the PdfObject to be returned + * Returns a PdfObject as a PdfName, resolving indirect references. + *

      + * The object corresponding to the specified index is retrieved and resolved to a direct object. If it is a + * PdfName, it is cast down and returned as such. Otherwise null is returned. + * + * @param idx The index of the PdfObject to be returned * @return the corresponding PdfName object, or - * null + * null */ public PdfName getAsName(int idx) { PdfName name = null; @@ -554,17 +506,14 @@ public PdfName getAsName(int idx) { } /** - * Returns a PdfObject as a PdfBoolean, resolving - * indirect references. - * - * The object corresponding to the specified index is retrieved and resolved - * to a direct object. If it is a PdfBoolean, it is cast down - * and returned as such. Otherwise null is returned. - * - * @param idx - * The index of the PdfObject to be returned + * Returns a PdfObject as a PdfBoolean, resolving indirect references. + *

      + * The object corresponding to the specified index is retrieved and resolved to a direct object. If it is a + * PdfBoolean, it is cast down and returned as such. Otherwise null is returned. + * + * @param idx The index of the PdfObject to be returned * @return the corresponding PdfBoolean object, or - * null + * null */ public PdfBoolean getAsBoolean(int idx) { PdfBoolean bool = null; @@ -577,15 +526,14 @@ public PdfBoolean getAsBoolean(int idx) { /** * Returns a PdfObject as a PdfIndirectReference. - * + *

      * The object corresponding to the specified index is retrieved. If it is a * PdfIndirectReference, it is cast down and returned as such. * Otherwise null is returned. - * - * @param idx - * The index of the PdfObject to be returned + * + * @param idx The index of the PdfObject to be returned * @return the corresponding PdfIndirectReference object, or - * null + * null */ public PdfIndirectReference getAsIndirectObject(int idx) { PdfIndirectReference ref = null; diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfBoolean.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfBoolean.java index b4456a2b2..9e9391617 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfBoolean.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfBoolean.java @@ -54,82 +54,84 @@ /** * PdfBoolean is the boolean object represented by the keywords true or false. - *

      - * This object is described in the 'Portable Document Format Reference Manual version 1.7' - * section 3.2.1 (page 52). + *

      + * This object is described in the 'Portable Document Format Reference Manual version 1.7' section 3.2.1 (page 52). * - * @see PdfObject - * @see BadPdfFormatException + * @see PdfObject + * @see BadPdfFormatException */ public class PdfBoolean extends PdfObject { - + // static membervariables (possible values of a boolean object) public static final PdfBoolean PDFTRUE = new PdfBoolean(true); public static final PdfBoolean PDFFALSE = new PdfBoolean(false); -/** A possible value of PdfBoolean */ + /** + * A possible value of PdfBoolean + */ public static final String TRUE = "true"; - -/** A possible value of PdfBoolean */ + + /** + * A possible value of PdfBoolean + */ public static final String FALSE = "false"; - + // membervariables - -/** the boolean value of this object */ + + /** + * the boolean value of this object + */ private boolean value; - + // constructors - -/** - * Constructs a PdfBoolean-object. - * - * @param value the value of the new PdfObject - */ - + + /** + * Constructs a PdfBoolean-object. + * + * @param value the value of the new PdfObject + */ + public PdfBoolean(boolean value) { super(BOOLEAN); if (value) { setContent(TRUE); - } - else { + } else { setContent(FALSE); } this.value = value; } - -/** - * Constructs a PdfBoolean-object. - * - * @param value the value of the new PdfObject, represented as a String - * - * @throws BadPdfFormatException thrown if the value isn't 'true' or 'false' - */ - + + /** + * Constructs a PdfBoolean-object. + * + * @param value the value of the new PdfObject, represented as a String + * @throws BadPdfFormatException thrown if the value isn't 'true' or 'false' + */ + public PdfBoolean(String value) throws BadPdfFormatException { super(BOOLEAN, value); if (value.equals(TRUE)) { this.value = true; - } - else if (value.equals(FALSE)) { + } else if (value.equals(FALSE)) { this.value = false; - } - else { - throw new BadPdfFormatException(MessageLocalization.getComposedMessage("the.value.has.to.be.true.of.false.instead.of.1", value)); + } else { + throw new BadPdfFormatException( + MessageLocalization.getComposedMessage("the.value.has.to.be.true.of.false.instead.of.1", value)); } } - + // methods returning the value of this object - -/** - * Returns the primitive value of the PdfBoolean-object. - * - * @return the actual value of the object. - */ - + + /** + * Returns the primitive value of the PdfBoolean-object. + * + * @return the actual value of the object. + */ + public boolean booleanValue() { return value; } - + public String toString() { return value ? TRUE : FALSE; } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfBorderArray.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfBorderArray.java index 025e2f01c..016c1f2d0 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfBorderArray.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfBorderArray.java @@ -52,37 +52,40 @@ /** * A PdfBorderArray defines the border of a PdfAnnotation. * - * @see PdfArray + * @see PdfArray */ public class PdfBorderArray extends PdfArray { - + // constructors - -/** - * Constructs a new PdfBorderArray. - * @param width the width - * @param vRadius the vertical radius - * @param hRadius the horizontal radius - */ - + + /** + * Constructs a new PdfBorderArray. + * + * @param width the width + * @param vRadius the vertical radius + * @param hRadius the horizontal radius + */ + public PdfBorderArray(float hRadius, float vRadius, float width) { this(hRadius, vRadius, width, null); } - -/** - * Constructs a new PdfBorderArray. - * @param dash the dash pattern of the border - * @param hRadius the horizontal radius - * @param vRadius the vertical radius - * @param width the width - */ - + + /** + * Constructs a new PdfBorderArray. + * + * @param dash the dash pattern of the border + * @param hRadius the horizontal radius + * @param vRadius the vertical radius + * @param width the width + */ + public PdfBorderArray(float hRadius, float vRadius, float width, PdfDashPattern dash) { super(new PdfNumber(hRadius)); add(new PdfNumber(vRadius)); add(new PdfNumber(width)); - if (dash != null) + if (dash != null) { add(dash); + } } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfBorderDictionary.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfBorderDictionary.java index b5b301d04..aa3c95f06 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfBorderDictionary.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfBorderDictionary.java @@ -55,25 +55,26 @@ /** * A PdfBorderDictionary define the appearance of a Border (Annotations). * - * @see PdfDictionary + * @see PdfDictionary */ public class PdfBorderDictionary extends PdfDictionary { - + public static final int STYLE_SOLID = 0; public static final int STYLE_DASHED = 1; public static final int STYLE_BEVELED = 2; public static final int STYLE_INSET = 3; public static final int STYLE_UNDERLINE = 4; // constructors - -/** - * Constructs a PdfBorderDictionary. - * @param borderStyle the border style - * @param borderWidth the width of the border - * @param dashes the pattern of the border - */ - + + /** + * Constructs a PdfBorderDictionary. + * + * @param borderStyle the border style + * @param borderWidth the width of the border + * @param dashes the pattern of the border + */ + public PdfBorderDictionary(float borderWidth, int borderStyle, PdfDashPattern dashes) { put(PdfName.W, new PdfNumber(borderWidth)); switch (borderStyle) { @@ -81,8 +82,9 @@ public PdfBorderDictionary(float borderWidth, int borderStyle, PdfDashPattern da put(PdfName.S, PdfName.S); break; case STYLE_DASHED: - if (dashes != null) + if (dashes != null) { put(PdfName.D, dashes); + } put(PdfName.S, PdfName.D); break; case STYLE_BEVELED: @@ -98,7 +100,7 @@ public PdfBorderDictionary(float borderWidth, int borderStyle, PdfDashPattern da throw new IllegalArgumentException(MessageLocalization.getComposedMessage("invalid.border.style")); } } - + public PdfBorderDictionary(float borderWidth, int borderStyle) { this(borderWidth, borderStyle, null); } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCell.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCell.java index 00fa0812b..7f7cfa6fe 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCell.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCell.java @@ -49,9 +49,6 @@ package com.lowagie.text.pdf; -import java.util.ArrayList; -import java.util.Iterator; - import com.lowagie.text.Anchor; import com.lowagie.text.Cell; import com.lowagie.text.Chunk; @@ -62,29 +59,28 @@ import com.lowagie.text.Paragraph; import com.lowagie.text.Phrase; import com.lowagie.text.Rectangle; +import java.util.ArrayList; +import java.util.Iterator; /** * A PdfCell is the PDF translation of a Cell. - *

      + *

      * A PdfCell is an ArrayList of PdfLines. - *

      + *

      * When using variable borders ({@link com.lowagie.text.Rectangle#isUseVariableBorders isUseVariableBorders()} == true), - * the borders are drawn completely inside the cell Rectangle - * so that adjacent cell borders will not overlap. - * Otherwise, the borders are drawn on top of the edges of the - * cell Rectangle and will overlap the borders of adjacent - * cells. + * the borders are drawn completely inside the cell Rectangle so that adjacent cell borders will not overlap. Otherwise, + * the borders are drawn on top of the edges of the cell Rectangle and will overlap the borders of adjacent cells. * - * @see com.lowagie.text.Rectangle - * @see com.lowagie.text.Cell - * @see PdfLine - * @see PdfTable + * @see com.lowagie.text.Rectangle + * @see com.lowagie.text.Cell + * @see PdfLine + * @see PdfTable */ public class PdfCell extends Rectangle { // membervariables - + /** * These are the PdfLines in the Cell. */ @@ -131,20 +127,21 @@ public class PdfCell extends Rectangle { private boolean header = false; /** - * This is the total height of the content of the cell. Note that the actual cell - * height may be larger due to another cell on the row * + * This is the total height of the content of the cell. Note that the actual cell height may be larger due to + * another cell on the row * */ private float contentHeight = 0.0f; /** - * Indicates that the largest ascender height should be used to - * determine the height of the first line. Setting this to true can help - * with vertical alignment problems. */ + * Indicates that the largest ascender height should be used to determine the height of the first line. Setting this + * to true can help with vertical alignment problems. + */ private boolean useAscender; /** - * Indicates that the largest descender height should be added to the height of - * the last line (so characters like y don't dip into the border). */ + * Indicates that the largest descender height should be added to the height of the last line (so characters like y + * don't dip into the border). + */ private boolean useDescender; /** @@ -158,17 +155,21 @@ public class PdfCell extends Rectangle { private PdfLine lastLine; // constructors - + /** + * This is the number of the group the cell is in. + */ + private int groupNumber; + /** * Constructs a PdfCell-object. * - * @param cell the original Cell - * @param rownumber the number of the Row the Cell was in. - * @param left the left border of the PdfCell - * @param right the right border of the PdfCell - * @param top the top border of the PdfCell - * @param cellspacing the cellspacing of the Table - * @param cellpadding the cellpadding of the Table + * @param cell the original Cell + * @param rownumber the number of the Row the Cell was in. + * @param left the left border of the PdfCell + * @param right the right border of the PdfCell + * @param top the top border of the PdfCell + * @param cellspacing the cellspacing of the Table + * @param cellpadding the cellpadding of the Table */ public PdfCell(Cell cell, int rownumber, float left, float right, float top, float cellspacing, float cellpadding) { @@ -197,7 +198,6 @@ public PdfCell(Cell cell, int rownumber, float left, float right, float top, flo left += getBorderWidthInside(LEFT); right -= getBorderWidthInside(RIGHT); - contentHeight = 0; rowspan = cell.getRowspan(); @@ -205,7 +205,7 @@ public PdfCell(Cell cell, int rownumber, float left, float right, float top, flo java.util.List allActions; int aCounter; // we loop over all the elements of the cell - for (Iterator i = cell.getElements(); i.hasNext();) { + for (Iterator i = cell.getElements(); i.hasNext(); ) { element = (Element) i.next(); switch (element.type()) { case Element.JPEG: @@ -215,17 +215,17 @@ public PdfCell(Cell cell, int rownumber, float left, float right, float top, flo case Element.IMGTEMPLATE: addImage((Image) element, left, right, 0.4f * leading, alignment); // break; - // if the element is a list + // if the element is a list case Element.LIST: if (line != null && line.size() > 0) { line.resetAlignment(); addLine(line); } // we loop over all the listitems - addList((List)element, left, right, alignment); + addList((List) element, left, right, alignment); line = new PdfLine(left, right, alignment, leading); break; - // if the element is something else + // if the element is something else default: allActions = new ArrayList<>(); processActions(element, null, allActions); @@ -248,10 +248,9 @@ public PdfCell(Cell cell, int rownumber, float left, float right, float top, flo // we loop over the chunks java.util.List chunks = element.getChunks(); if (chunks.isEmpty()) { - addLine(line); // add empty line - all cells need some lines even if they are empty - line = new PdfLine(currentLeft, currentRight, alignment, currentLineLeading); - } - else { + addLine(line); // add empty line - all cells need some lines even if they are empty + line = new PdfLine(currentLeft, currentRight, alignment, currentLineLeading); + } else { for (Object chunk1 : chunks) { Chunk c = (Chunk) chunk1; chunk = new PdfChunk(c, (allActions.get(aCounter++))); @@ -317,6 +316,8 @@ public PdfCell(Cell cell, int rownumber, float left, float right, float top, flo this.rownumber = rownumber; } + // overriding of the Rectangle methods + private void addList(List list, float left, float right, int alignment) { PdfChunk chunk; PdfChunk overflow; @@ -350,48 +351,10 @@ private void addList(List list, float left, float right, int alignment) { } } - // overriding of the Rectangle methods - - - /** - * Sets the bottom of the Rectangle and determines the proper {link #verticalOffset} - * to appropriately align the contents vertically. - * @param value the lower-left y-coordinate of the rectangle - */ - public void setBottom(float value) { - super.setBottom(value); - float firstLineRealHeight = firstLineRealHeight(); - - float totalHeight = ury - value; // can't use top (already compensates for cellspacing) - float nonContentHeight = (cellpadding() * 2f) + (cellspacing() * 2f); - nonContentHeight += getBorderWidthInside(TOP) + getBorderWidthInside(BOTTOM); - - float interiorHeight = totalHeight - nonContentHeight; - float extraHeight = 0.0f; - - switch (verticalAlignment) { - case Element.ALIGN_BOTTOM: - extraHeight = interiorHeight - contentHeight; - break; - case Element.ALIGN_MIDDLE: - extraHeight = (interiorHeight - contentHeight) / 2.0f; - break; - default: // ALIGN_TOP - extraHeight = 0f; - } - - extraHeight += cellpadding() + cellspacing(); - extraHeight += getBorderWidthInside(TOP); - if (firstLine != null) { - firstLine.height = firstLineRealHeight + extraHeight; - contentHeight += extraHeight; - } - } - /** * Returns the lower left x-coordinate. * - * @return the lower left x-coordinate + * @return the lower left x-coordinate */ public float getLeft() { @@ -401,7 +364,7 @@ public float getLeft() { /** * Returns the upper right x-coordinate. * - * @return the upper right x-coordinate + * @return the upper right x-coordinate */ public float getRight() { @@ -411,7 +374,7 @@ public float getRight() { /** * Returns the upper right y-coordinate. * - * @return the upper right y-coordinate + * @return the upper right y-coordinate */ public float getTop() { @@ -421,15 +384,51 @@ public float getTop() { /** * Returns the lower left y-coordinate. * - * @return the lower left y-coordinate + * @return the lower left y-coordinate */ public float getBottom() { return super.getBottom(cellspacing); } - + // methods + /** + * Sets the bottom of the Rectangle and determines the proper {link #verticalOffset} to appropriately align the + * contents vertically. + * + * @param value the lower-left y-coordinate of the rectangle + */ + public void setBottom(float value) { + super.setBottom(value); + float firstLineRealHeight = firstLineRealHeight(); + + float totalHeight = ury - value; // can't use top (already compensates for cellspacing) + float nonContentHeight = (cellpadding() * 2f) + (cellspacing() * 2f); + nonContentHeight += getBorderWidthInside(TOP) + getBorderWidthInside(BOTTOM); + + float interiorHeight = totalHeight - nonContentHeight; + float extraHeight = 0.0f; + + switch (verticalAlignment) { + case Element.ALIGN_BOTTOM: + extraHeight = interiorHeight - contentHeight; + break; + case Element.ALIGN_MIDDLE: + extraHeight = (interiorHeight - contentHeight) / 2.0f; + break; + default: // ALIGN_TOP + extraHeight = 0f; + } + + extraHeight += cellpadding() + cellspacing(); + extraHeight += getBorderWidthInside(TOP); + if (firstLine != null) { + firstLine.height = firstLineRealHeight + extraHeight; + contentHeight += extraHeight; + } + } + private void addLine(PdfLine line) { lines.add(line); contentHeight += line.height(); @@ -459,9 +458,9 @@ private void flushCurrentLine() { } /** - * Calculates what the height of the first line should be so that the content will be - * flush with the top. For text, this is the height of the ascender. For an image, - * it is the actual height of the image. + * Calculates what the height of the first line should be so that the content will be flush with the top. For text, + * this is the height of the ascender. For an image, it is the actual height of the image. + * * @return the real height of the first line */ private float firstLineRealHeight() { @@ -481,9 +480,9 @@ private float firstLineRealHeight() { } /** - * Gets the amount of the border for the specified side that is inside the Rectangle. - * For non-variable width borders this is only 1/2 the border width on that side. This - * always returns 0 if {@link #useBorderPadding} is false; + * Gets the amount of the border for the specified side that is inside the Rectangle. For non-variable width borders + * this is only 1/2 the border width on that side. This always returns 0 if {@link #useBorderPadding} is false; + * * @param side the side to check. One of the side constants in {@link com.lowagie.text.Rectangle} * @return the borderwidth inside the cell */ @@ -515,7 +514,6 @@ private float getBorderWidthInside(int side) { return width; } - /** * Adds an image to this Cell. * @@ -555,12 +553,12 @@ private float addImage(Image i, float left, float right, float extraHeight, int /** * Gets the lines of a cell that can be drawn between certain limits. - *

      + *

      * Remark: all the lines that can be drawn are removed from the object! * - * @param top the top of the part of the table that can be drawn - * @param bottom the bottom of the part of the table that can be drawn - * @return an ArrayList of PdfLines + * @param top the top of the part of the table that can be drawn + * @param bottom the bottom of the part of the table that can be drawn + * @return an ArrayList of PdfLines */ public java.util.ArrayList getLines(float top, float bottom) { @@ -573,7 +571,7 @@ public java.util.ArrayList getLines(float top, float bottom) { if (getTop() < bottom) { return result; } - + // we loop over the lines int size = lines.size(); boolean aboveBottom = true; @@ -612,12 +610,12 @@ public java.util.ArrayList getLines(float top, float bottom) { /** * Gets the images of a cell that can be drawn between certain limits. - *

      + *

      * Remark: all the lines that can be drawn are removed from the object! * - * @param top the top of the part of the table that can be drawn - * @param bottom the bottom of the part of the table that can be drawn - * @return an ArrayList of Images + * @param top the top of the part of the table that can be drawn + * @param bottom the bottom of the part of the table that can be drawn + * @return an ArrayList of Images */ public java.util.ArrayList getImages(float top, float bottom) { @@ -632,7 +630,7 @@ public java.util.ArrayList getImages(float top, float bottom) { float height; java.util.ArrayList result = new ArrayList<>(); // we loop over the images - for (Iterator i = images.iterator(); i.hasNext() && !header;) { + for (Iterator i = images.iterator(); i.hasNext() && !header; ) { image = i.next(); height = image.getAbsoluteY(); // if the currentPosition is higher than the bottom, we add the line to the result @@ -648,7 +646,7 @@ public java.util.ArrayList getImages(float top, float bottom) { /** * Checks if this cell belongs to the header of a PdfTable. * - * @return void + * @return void */ boolean isHeader() { @@ -665,11 +663,11 @@ void setHeader() { /** * Checks if the cell may be removed. - *

      - * Headers may always be removed, even if they are drawn only partially: - * they will be repeated on each following page anyway! + *

      + * Headers may always be removed, even if they are drawn only partially: they will be repeated on each following + * page anyway! * - * @return true if all the lines are already drawn; false otherwise. + * @return true if all the lines are already drawn; false otherwise. */ boolean mayBeRemoved() { @@ -679,7 +677,7 @@ boolean mayBeRemoved() { /** * Returns the number of lines in the cell. * - * @return a value + * @return a value */ public int size() { @@ -689,10 +687,12 @@ public int size() { /** * Returns the total height of all the lines in the cell. * - * @return a value + * @return a value */ private float remainingLinesHeight() { - if (lines.isEmpty()) return 0; + if (lines.isEmpty()) { + return 0; + } float result = 0; int size = lines.size(); PdfLine line; @@ -703,6 +703,8 @@ private float remainingLinesHeight() { return result; } + // methods to retrieve membervariables + /** * Returns the height needed to draw the remaining text. * @@ -717,13 +719,11 @@ public float remainingHeight() { } return remainingLinesHeight() + cellspacing + 2 * cellpadding + result; } - - // methods to retrieve membervariables - + /** * Gets the leading of a cell. * - * @return the leading of the lines is the cell. + * @return the leading of the lines is the cell. */ public float leading() { @@ -733,7 +733,7 @@ public float leading() { /** * Gets the number of the row this cell is in.. * - * @return a number + * @return a number */ public int rownumber() { @@ -743,7 +743,7 @@ public int rownumber() { /** * Gets the rowspan of a cell. * - * @return the rowspan of the cell + * @return the rowspan of the cell */ public int rowspan() { @@ -753,7 +753,7 @@ public int rowspan() { /** * Gets the cellspacing of a cell. * - * @return a value + * @return a value */ public float cellspacing() { @@ -763,7 +763,7 @@ public float cellspacing() { /** * Gets the cellpadding of a cell.. * - * @return a value + * @return a value */ public float cellpadding() { @@ -772,9 +772,10 @@ public float cellpadding() { /** * Processes all actions contained in the cell. + * * @param element an element in the cell - * @param action an action that should be coupled to the cell - * @param allActions a list of PdfAction to execute + * @param action an action that should be coupled to the cell + * @param allActions a list of PdfAction to execute */ protected void processActions(Element element, PdfAction action, java.util.List allActions) { @@ -792,7 +793,7 @@ protected void processActions(Element element, PdfAction action, java.util.List< case Element.CHAPTER: case Element.LISTITEM: case Element.PARAGRAPH: - for (i = ((ArrayList) element).iterator(); i.hasNext();) { + for (i = ((ArrayList) element).iterator(); i.hasNext(); ) { processActions((Element) i.next(), action, allActions); } break; @@ -800,27 +801,23 @@ protected void processActions(Element element, PdfAction action, java.util.List< allActions.add(action); break; case Element.LIST: - for (i = ((List) element).getItems().iterator(); i.hasNext();) { + for (i = ((List) element).getItems().iterator(); i.hasNext(); ) { processActions((Element) i.next(), action, allActions); } break; default: int n = element.getChunks().size(); - while (n-- > 0) + while (n-- > 0) { allActions.add(action); + } break; } } - /** - * This is the number of the group the cell is in. - */ - private int groupNumber; - /** * Gets the number of the group this cell is in.. * - * @return a number + * @return a number */ public int getGroupNumber() { @@ -829,6 +826,7 @@ public int getGroupNumber() { /** * Sets the group number. + * * @param number */ @@ -839,9 +837,9 @@ void setGroupNumber(int number) { /** * Gets a Rectangle that is altered to fit on the page. * - * @param top the top position - * @param bottom the bottom position - * @return a Rectangle + * @param top the top position + * @param bottom the bottom position + * @return a Rectangle */ public Rectangle rectangle(float top, float bottom) { @@ -858,16 +856,9 @@ public Rectangle rectangle(float top, float bottom) { return tmp; } - /** - * Sets the value of useAscender. - * @param use use ascender height if true - */ - public void setUseAscender(boolean use) { - useAscender = use; - } - /** * Gets the value of useAscender + * * @return useAscender */ public boolean isUseAscender() { @@ -875,15 +866,17 @@ public boolean isUseAscender() { } /** - * Sets the value of useDescender. - * @param use use descender height if true + * Sets the value of useAscender. + * + * @param use use ascender height if true */ - public void setUseDescender(boolean use) { - useDescender = use; + public void setUseAscender(boolean use) { + useAscender = use; } /** * gets the value of useDescender + * * @return useDescender */ public boolean isUseDescender() { @@ -891,19 +884,30 @@ public boolean isUseDescender() { } /** - * Sets the value of useBorderPadding. - * @param use adjust layout for borders if true + * Sets the value of useDescender. + * + * @param use use descender height if true */ - public void setUseBorderPadding(boolean use) { - useBorderPadding = use; + public void setUseDescender(boolean use) { + useDescender = use; } /** * Gets the value of useBorderPadding. + * * @return useBorderPadding */ public boolean isUseBorderPadding() { return useBorderPadding; } + /** + * Sets the value of useBorderPadding. + * + * @param use adjust layout for borders if true + */ + public void setUseBorderPadding(boolean use) { + useBorderPadding = use; + } + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfChunk.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfChunk.java index e4f7ed078..761b066c4 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfChunk.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfChunk.java @@ -61,13 +61,13 @@ /** * A PdfChunk is the PDF translation of a Chunk. - *

      + *

      * A PdfChunk is a PdfString in a certain * PdfFont and Color. * - * @see PdfString - * @see com.lowagie.text.Chunk - * @see com.lowagie.text.Font + * @see PdfString + * @see com.lowagie.text.Chunk + * @see com.lowagie.text.Font */ public class PdfChunk { @@ -75,12 +75,16 @@ public class PdfChunk { private static final char[] singleSpace = {' '}; private static final PdfChunk[] thisChunk = new PdfChunk[1]; private static final float ITALIC_ANGLE = 0.21256f; -/** The allowed attributes in variable attributes. */ + /** + * The allowed attributes in variable attributes. + */ private static final Map keysAttributes = new HashMap<>(); - -/** The allowed attributes in variable noStroke. */ + + /** + * The allowed attributes in variable noStroke. + */ private static final Map keysNoStroke = new HashMap<>(); - + static { keysAttributes.put(Chunk.ACTION, null); keysAttributes.put(Chunk.UNDERLINE, null); @@ -102,62 +106,76 @@ public class PdfChunk { keysNoStroke.put(Chunk.HYPHENATION, null); keysNoStroke.put(Chunk.TEXTRENDERMODE, null); } - + // membervariables - /** The value of this object. */ + /** + * The value of this object. + */ protected String value = PdfObject.NOTHING; - - /** The encoding. */ + + /** + * The encoding. + */ protected String encoding = BaseFont.WINANSI; - - -/** The font for this PdfChunk. */ + + + /** + * The font for this PdfChunk. + */ protected PdfFont font; - + protected BaseFont baseFont; - + protected SplitCharacter splitCharacter; -/** - * Metric attributes. - *

      - * This attributes require the measurement of characters widths when rendering - * such as underline. - */ + /** + * Metric attributes. + *

      + * This attributes require the measurement of characters widths when rendering such as underline. + */ protected Map attributes = new HashMap<>(); - -/** - * Non metric attributes. - *

      - * This attributes do not require the measurement of characters widths when rendering - * such as Color. - */ + + /** + * Non metric attributes. + *

      + * This attributes do not require the measurement of characters widths when rendering such as Color. + */ protected Map noStroke = new HashMap<>(); - -/** true if the chunk split was cause by a newline. */ + + /** + * true if the chunk split was cause by a newline. + */ protected boolean newlineSplit; - -/** The image in this PdfChunk, if it has one */ + + /** + * The image in this PdfChunk, if it has one + */ protected Image image; - -/** The offset in the x direction for the image */ + + /** + * The offset in the x direction for the image + */ protected float offsetX; - -/** The offset in the y direction for the image */ + + /** + * The offset in the y direction for the image + */ protected float offsetY; -/** Indicates if the height and offset of the Image has to be taken into account */ + /** + * Indicates if the height and offset of the Image has to be taken into account + */ protected boolean changeLeading = false; // constructors - -/** - * Constructs a PdfChunk-object. - * - * @param string the content of the PdfChunk-object - * @param other Chunk with the same style you want for the new Chunk - */ - + + /** + * Constructs a PdfChunk-object. + * + * @param string the content of the PdfChunk-object + * @param other Chunk with the same style you want for the new Chunk + */ + PdfChunk(String string, PdfChunk other) { thisChunk[0] = this; value = string; @@ -166,35 +184,37 @@ public class PdfChunk { this.noStroke = other.noStroke; this.baseFont = other.baseFont; Object[] obj = (Object[]) attributes.get(Chunk.IMAGE); - if (obj == null) + if (obj == null) { image = null; - else { - image = (Image)obj[0]; + } else { + image = (Image) obj[0]; offsetX = (Float) obj[1]; offsetY = (Float) obj[2]; changeLeading = (Boolean) obj[3]; } encoding = font.getFont().getEncoding(); - splitCharacter = (SplitCharacter)noStroke.get(Chunk.SPLITCHARACTER); - if (splitCharacter == null) + splitCharacter = (SplitCharacter) noStroke.get(Chunk.SPLITCHARACTER); + if (splitCharacter == null) { splitCharacter = DefaultSplitCharacter.DEFAULT; + } } - -/** - * Constructs a PdfChunk-object. - * - * @param chunk the original Chunk-object - * @param action the PdfAction if the Chunk comes from an Anchor - */ - + + /** + * Constructs a PdfChunk-object. + * + * @param chunk the original Chunk-object + * @param action the PdfAction if the Chunk comes from an Anchor + */ + PdfChunk(Chunk chunk, PdfAction action) { thisChunk[0] = this; value = chunk.getContent(); - + Font f = chunk.getFont(); float size = f.getSize(); - if (size == Font.UNDEFINED) + if (size == Font.UNDEFINED) { size = 12; + } baseFont = f.getBaseFont(); int style = f.getStyle(); if (style == Font.UNDEFINED) { @@ -222,14 +242,16 @@ public class PdfChunk { throw new RuntimeException(e); } } - } - else { + } else { // bold simulation - if ((style & Font.BOLD) != 0) - attributes.put(Chunk.TEXTRENDERMODE, new Object[]{PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE, size / 30f, null}); + if ((style & Font.BOLD) != 0) { + attributes.put(Chunk.TEXTRENDERMODE, + new Object[]{PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE, size / 30f, null}); + } // italic simulation - if ((style & Font.ITALIC) != 0) + if ((style & Font.ITALIC) != 0) { attributes.put(Chunk.SKEW, new float[]{0, ITALIC_ANGLE}); + } } font = new PdfFont(baseFont, size); // other style possibilities @@ -257,42 +279,47 @@ public class PdfChunk { Object[][] unders = Utilities.addToArray((Object[][]) attributes.get(Chunk.UNDERLINE), obj); attributes.put(Chunk.UNDERLINE, unders); } - if (action != null) + if (action != null) { attributes.put(Chunk.ACTION, action); + } // the color can't be stored in a PdfFont noStroke.put(Chunk.COLOR, f.getColor()); noStroke.put(Chunk.ENCODING, font.getFont().getEncoding()); Object[] obj = (Object[]) attributes.get(Chunk.IMAGE); if (obj == null) { image = null; - } - else { + } else { attributes.remove(Chunk.HSCALE); // images are scaled in other ways - image = (Image)obj[0]; + image = (Image) obj[0]; offsetX = (Float) obj[1]; offsetY = (Float) obj[2]; changeLeading = (Boolean) obj[3]; } font.setImage(image); - Float hs = (Float)attributes.get(Chunk.HSCALE); - if (hs != null) + Float hs = (Float) attributes.get(Chunk.HSCALE); + if (hs != null) { font.setHorizontalScaling(hs); + } encoding = font.getFont().getEncoding(); - splitCharacter = (SplitCharacter)noStroke.get(Chunk.SPLITCHARACTER); - if (splitCharacter == null) + splitCharacter = (SplitCharacter) noStroke.get(Chunk.SPLITCHARACTER); + if (splitCharacter == null) { splitCharacter = DefaultSplitCharacter.DEFAULT; + } } - + // methods + public static boolean noPrint(int c) { + return ((c >= 0x200b && c <= 0x200f) || (c >= 0x202a && c <= 0x202e)); + } + /** - * Gets the Unicode equivalent to a CID. - * The (nonexistent) CID FF00 is translated as '\n'. - * It has only meaning with CJK fonts with Identity encoding. + * Gets the Unicode equivalent to a CID. The (nonexistent) CID FF00 is translated as '\n'. It has only + * meaning with CJK fonts with Identity encoding. * * @param c the CID code * @return the Unicode equivalent - */ + */ public int getUnicodeEquivalent(int c) { return baseFont.getUnicodeEquivalent(c); } @@ -300,22 +327,23 @@ public int getUnicodeEquivalent(int c) { protected int getWord(String text, int start) { int len = text.length(); while (start < len) { - if (!Character.isLetter(text.charAt(start))) + if (!Character.isLetter(text.charAt(start))) { break; + } ++start; } return start; } - -/** - * Splits this PdfChunk if it's too long for the given width. - *

      - * Returns null if the PdfChunk wasn't truncated. - * - * @param width a given width - * @return the PdfChunk that doesn't fit into the width. - */ - + + /** + * Splits this PdfChunk if it's too long for the given width. + *

      + * Returns null if the PdfChunk wasn't truncated. + * + * @param width a given width + * @return the PdfChunk that doesn't fit into the width. + */ + PdfChunk split(float width) { newlineSplit = false; if (image != null) { @@ -326,15 +354,15 @@ PdfChunk split(float width) { image = null; font = PdfFont.getDefaultFont(); return pc; - } - else + } else { return null; + } } - HyphenationEvent hyphenationEvent = (HyphenationEvent)noStroke.get(Chunk.HYPHENATION); + HyphenationEvent hyphenationEvent = (HyphenationEvent) noStroke.get(Chunk.HYPHENATION); int currentPosition = 0; int splitPosition = -1; float currentWidth = 0; - + // loop over all the characters of a string // or until the totalWidth is reached int lastSpace = -1; @@ -348,7 +376,7 @@ PdfChunk split(float width) { while (currentPosition < length) { // the width of every character is added to the currentWidth char cidChar = valueArray[currentPosition]; - character = (char)ft.getUnicodeEquivalent(cidChar); + character = (char) ft.getUnicodeEquivalent(cidChar); // if a newLine or carriageReturn is encountered if (character == '\n') { newlineSplit = true; @@ -364,15 +392,16 @@ PdfChunk split(float width) { lastSpace = currentPosition + 1; lastSpaceWidth = currentWidth; } - if (currentWidth > width) + if (currentWidth > width) { break; + } // if a split-character is encountered, the splitPosition is altered - if (splitCharacter.isSplitCharacter(0, currentPosition, length, valueArray, thisChunk)) + if (splitCharacter.isSplitCharacter(0, currentPosition, length, valueArray, thisChunk)) { splitPosition = currentPosition + 1; + } currentPosition++; } - } - else { + } else { while (currentPosition < length) { // the width of every character is added to the currentWidth character = valueArray[currentPosition]; @@ -380,8 +409,9 @@ PdfChunk split(float width) { if (character == '\r' || character == '\n') { newlineSplit = true; int inc = 1; - if (character == '\r' && currentPosition + 1 < length && valueArray[currentPosition + 1] == '\n') + if (character == '\r' && currentPosition + 1 < length && valueArray[currentPosition + 1] == '\n') { inc = 2; + } String returnValue = value.substring(currentPosition + inc); value = value.substring(0, currentPosition); if (value.length() < 1) { @@ -390,25 +420,30 @@ PdfChunk split(float width) { return new PdfChunk(returnValue, this); } surrogate = Utilities.isSurrogatePair(valueArray, currentPosition); - if (surrogate) - currentWidth += getCharWidth(Utilities.convertToUtf32(valueArray[currentPosition], valueArray[currentPosition + 1])); - else + if (surrogate) { + currentWidth += getCharWidth( + Utilities.convertToUtf32(valueArray[currentPosition], valueArray[currentPosition + 1])); + } else { currentWidth += getCharWidth(character); + } if (character == ' ') { lastSpace = currentPosition + 1; lastSpaceWidth = currentWidth; } - if (surrogate) + if (surrogate) { currentPosition++; - if (currentWidth > width) + } + if (currentWidth > width) { break; + } // if a split-character is encountered, the splitPosition is altered - if (splitCharacter.isSplitCharacter(0, currentPosition, length, valueArray, null)) + if (splitCharacter.isSplitCharacter(0, currentPosition, length, valueArray, null)) { splitPosition = currentPosition + 1; + } currentPosition++; } } - + // if all the characters fit in the total width, null is returned (there is no overflow) if (currentPosition == length) { return null; @@ -419,12 +454,14 @@ PdfChunk split(float width) { value = ""; return new PdfChunk(returnValue, this); } - if (lastSpace > splitPosition && splitCharacter.isSplitCharacter(0, 0, 1, singleSpace, null)) + if (lastSpace > splitPosition && splitCharacter.isSplitCharacter(0, 0, 1, singleSpace, null)) { splitPosition = lastSpace; + } if (hyphenationEvent != null && lastSpace >= 0 && lastSpace < currentPosition) { int wordIdx = getWord(value, lastSpace); if (wordIdx > lastSpace) { - String pre = hyphenationEvent.getHyphenatedWordPre(value.substring(lastSpace, wordIdx), font.getFont(), font.size(), width - lastSpaceWidth); + String pre = hyphenationEvent.getHyphenatedWordPre(value.substring(lastSpace, wordIdx), font.getFont(), + font.size(), width - lastSpaceWidth); String post = hyphenationEvent.getHyphenatedWordPost(); if (pre.length() > 0) { String returnValue = post + value.substring(wordIdx); @@ -437,16 +474,18 @@ PdfChunk split(float width) { value = trim(value.substring(0, splitPosition)); return new PdfChunk(returnValue, this); } - -/** - * Truncates this PdfChunk if it's too long for the given width. - *

      - * Returns null if the PdfChunk wasn't truncated. - * - * @param width a given width - * @return the PdfChunk that doesn't fit into the width. - */ - + + // methods to retrieve the membervariables + + /** + * Truncates this PdfChunk if it's too long for the given width. + *

      + * Returns null if the PdfChunk wasn't truncated. + * + * @param width a given width + * @return the PdfChunk that doesn't fit into the width. + */ + PdfChunk truncate(float width) { if (image != null) { if (image.getScaledWidth() > width) { @@ -456,21 +495,21 @@ PdfChunk truncate(float width) { image = null; font = PdfFont.getDefaultFont(); return pc; - } - else + } else { return null; + } } - + int currentPosition = 0; float currentWidth = 0; - + // it's no use trying to split if there isn't even enough place for a space if (width < font.width()) { String returnValue = value.substring(1); value = value.substring(0, 1); return new PdfChunk(returnValue, this); } - + // loop over all the characters of a string // or until the totalWidth is reached int length = value.length(); @@ -479,105 +518,109 @@ PdfChunk truncate(float width) { while (currentPosition < length) { // the width of every character is added to the currentWidth surrogate = Utilities.isSurrogatePair(value, currentPosition); - if (surrogate) + if (surrogate) { currentWidth += getCharWidth(Utilities.convertToUtf32(value, currentPosition)); - else + } else { currentWidth += getCharWidth(value.charAt(currentPosition)); - if (currentWidth > width) + } + if (currentWidth > width) { break; - if (surrogate) + } + if (surrogate) { currentPosition++; + } currentPosition++; } - + // if all the characters fit in the total width, null is returned (there is no overflow) if (currentPosition == length) { return null; } - + // otherwise, the string has to be truncated //currentPosition -= 2; // we have to chop off minimum 1 character from the chunk if (currentPosition == 0) { currentPosition = 1; - if (surrogate) + if (surrogate) { ++currentPosition; + } } String returnValue = value.substring(currentPosition); value = value.substring(0, currentPosition); return new PdfChunk(returnValue, this); } - - // methods to retrieve the membervariables - -/** - * Returns the font of this Chunk. - * - * @return a PdfFont - */ - + + /** + * Returns the font of this Chunk. + * + * @return a PdfFont + */ + PdfFont font() { return font; } - -/** - * Returns the color of this Chunk. - * - * @return a Color - */ - + + /** + * Returns the color of this Chunk. + * + * @return a Color + */ + Color color() { - return (Color)noStroke.get(Chunk.COLOR); + return (Color) noStroke.get(Chunk.COLOR); } - -/** - * Returns the width of this PdfChunk. - * - * @return a width - */ - + + /** + * Returns the width of this PdfChunk. + * + * @return a width + */ + float width() { - if (isAttribute(Chunk.TAB)) + if (isAttribute(Chunk.TAB)) { return 0.0f; + } if (isAttribute(Chunk.CHAR_SPACING)) { Float cs = (Float) getAttribute(Chunk.CHAR_SPACING); return font.width(value) + value.length() * cs; } return font.width(value); } - -/** - * Checks if the PdfChunk split was caused by a newline. - * @return true if the PdfChunk split was caused by a newline. - */ - - public boolean isNewlineSplit() - { + + /** + * Checks if the PdfChunk split was caused by a newline. + * + * @return true if the PdfChunk split was caused by a newline. + */ + + public boolean isNewlineSplit() { return newlineSplit; } - -/** - * Gets the width of the PdfChunk taking into account the - * extra character and word spacing. - * @param charSpacing the extra character spacing - * @param wordSpacing the extra word spacing - * @return the calculated width - */ - - public float getWidthCorrected(float charSpacing, float wordSpacing) - { + + /** + * Gets the width of the PdfChunk taking into account the extra character and word spacing. + * + * @param charSpacing the extra character spacing + * @param wordSpacing the extra word spacing + * @return the calculated width + */ + + public float getWidthCorrected(float charSpacing, float wordSpacing) { if (image != null) { return image.getScaledWidth() + charSpacing; } int numberOfSpaces = 0; int idx = -1; - while ((idx = value.indexOf(' ', idx + 1)) >= 0) + while ((idx = value.indexOf(' ', idx + 1)) >= 0) { ++numberOfSpaces; + } return width() + (value.length() * charSpacing + numberOfSpaces * wordSpacing); } - + /** * Gets the text displacement relative to the baseline. + * * @return a displacement in points */ public float getTextRise() { @@ -587,39 +630,37 @@ public float getTextRise() { } return 0.0f; } - -/** - * Trims the last space. - * @return the width of the space trimmed, otherwise 0 - */ - - public float trimLastSpace() - { + + /** + * Trims the last space. + * + * @return the width of the space trimmed, otherwise 0 + */ + + public float trimLastSpace() { BaseFont ft = font.getFont(); if (ft.getFontType() == BaseFont.FONT_TYPE_CJK && ft.getUnicodeEquivalent(' ') != ' ') { if (value.length() > 1 && value.endsWith("\u0001")) { value = value.substring(0, value.length() - 1); return font.width('\u0001'); } - } - else { + } else { if (value.length() > 1 && value.endsWith(" ")) { value = value.substring(0, value.length() - 1); return font.width(' '); } } return 0; - } - public float trimFirstSpace() - { + } + + public float trimFirstSpace() { BaseFont ft = font.getFont(); if (ft.getFontType() == BaseFont.FONT_TYPE_CJK && ft.getUnicodeEquivalent(' ') != ' ') { if (value.length() > 1 && value.startsWith("\u0001")) { value = value.substring(1); return font.width('\u0001'); } - } - else { + } else { if (value.length() > 1 && value.startsWith(" ")) { value = value.substring(1); return font.width(' '); @@ -627,61 +668,64 @@ public float trimFirstSpace() } return 0; } - -/** - * Gets an attribute. The search is made in attributes - * and noStroke. - * @param name the attribute key - * @return the attribute value or null if not found - */ - - Object getAttribute(String name) - { - if (attributes.containsKey(name)) + + /** + * Gets an attribute. The search is made in attributes and noStroke. + * + * @param name the attribute key + * @return the attribute value or null if not found + */ + + Object getAttribute(String name) { + if (attributes.containsKey(name)) { return attributes.get(name); + } return noStroke.get(name); } - -/** - *Checks if the attribute exists. - * @param name the attribute key - * @return true if the attribute exists - */ - - boolean isAttribute(String name) - { - if (attributes.containsKey(name)) + + /** + * Checks if the attribute exists. + * + * @param name the attribute key + * @return true if the attribute exists + */ + + boolean isAttribute(String name) { + if (attributes.containsKey(name)) { return true; + } return noStroke.containsKey(name); } - -/** - * Checks if this PdfChunk needs some special metrics handling. - * @return true if this PdfChunk needs some special metrics handling. - */ - - boolean isStroked() - { + + /** + * Checks if this PdfChunk needs some special metrics handling. + * + * @return true if this PdfChunk needs some special metrics handling. + */ + + boolean isStroked() { return (!attributes.isEmpty()); } - + /** * Checks if this PdfChunk is a Separator Chunk. - * @return true if this chunk is a separator. - * @since 2.1.2 + * + * @return true if this chunk is a separator. + * @since 2.1.2 */ boolean isSeparator() { return isAttribute(Chunk.SEPARATOR); } - + /** * Checks if this PdfChunk is a horizontal Separator Chunk. - * @return true if this chunk is a horizontal separator. - * @since 2.1.2 + * + * @return true if this chunk is a horizontal separator. + * @since 2.1.2 */ boolean isHorizontalSeparator() { if (isAttribute(Chunk.SEPARATOR)) { - Object[] o = (Object[])getAttribute(Chunk.SEPARATOR); + Object[] o = (Object[]) getAttribute(Chunk.SEPARATOR); return !(Boolean) o[1]; } return false; @@ -689,105 +733,108 @@ boolean isHorizontalSeparator() { /** * Checks if this PdfChunk is a vertical Separator Chunk. - * @return true if this chunk is a vertical separator. - * @since OpenPDF + * + * @return true if this chunk is a vertical separator. + * @since OpenPDF */ boolean isVerticalSeparator() { if (isAttribute(Chunk.SEPARATOR)) { - Object[] o = (Object[])getAttribute(Chunk.SEPARATOR); + Object[] o = (Object[]) getAttribute(Chunk.SEPARATOR); return (Boolean) o[1]; } return false; } - + /** * Checks if this PdfChunk is a tab Chunk. - * @return true if this chunk is a separator. - * @since 2.1.2 + * + * @return true if this chunk is a separator. + * @since 2.1.2 */ boolean isTab() { return isAttribute(Chunk.TAB); } - + /** * Correction for the tab position based on the left starting position. - * @param newValue the new value for the left X. - * @since 2.1.2 + * + * @param newValue the new value for the left X. + * @since 2.1.2 */ void adjustLeft(float newValue) { - Object[] o = (Object[])attributes.get(Chunk.TAB); + Object[] o = (Object[]) attributes.get(Chunk.TAB); if (o != null) { attributes.put(Chunk.TAB, new Object[]{o[0], o[1], o[2], newValue}); } } - -/** - * Checks if there is an image in the PdfChunk. - * @return true if an image is present - */ - - boolean isImage() - { + + /** + * Checks if there is an image in the PdfChunk. + * + * @return true if an image is present + */ + + boolean isImage() { return image != null; } - -/** - * Gets the image in the PdfChunk. - * @return the image or null - */ - - Image getImage() - { + + /** + * Gets the image in the PdfChunk. + * + * @return the image or null + */ + + Image getImage() { return image; } - -/** - * Sets the image offset in the x direction - * @param offsetX the image offset in the x direction - */ - - void setImageOffsetX(float offsetX) - { - this.offsetX = offsetX; - } - -/** - * Gets the image offset in the x direction - * @return the image offset in the x direction - */ - - float getImageOffsetX() - { + + /** + * Gets the image offset in the x direction + * + * @return the image offset in the x direction + */ + + float getImageOffsetX() { return offsetX; } - -/** - * Sets the image offset in the y direction - * @param offsetY the image offset in the y direction - */ - - void setImageOffsetY(float offsetY) - { - this.offsetY = offsetY; + + /** + * Sets the image offset in the x direction + * + * @param offsetX the image offset in the x direction + */ + + void setImageOffsetX(float offsetX) { + this.offsetX = offsetX; } - -/** - * Gets the image offset in the y direction - * @return Gets the image offset in the y direction - */ - - float getImageOffsetY() - { + + /** + * Gets the image offset in the y direction + * + * @return Gets the image offset in the y direction + */ + + float getImageOffsetY() { return offsetY; } - -/** - * sets the value. - * @param value content of the Chunk - */ - - void setValue(String value) - { + + /** + * Sets the image offset in the y direction + * + * @param offsetY the image offset in the y direction + */ + + void setImageOffsetY(float offsetY) { + this.offsetY = offsetY; + } + + /** + * sets the value. + * + * @param value content of the Chunk + */ + + void setValue(String value) { this.value = value; } @@ -800,19 +847,20 @@ public String toString() { /** * Tells you if this string is in Chinese, Japanese, Korean or Identity-H. + * * @return true if the Chunk has a special encoding */ - + boolean isSpecialEncoding() { return encoding.equals(CJKFont.CJK_ENCODING) || encoding.equals(BaseFont.IDENTITY_H); } - + /** * Gets the encoding of this string. * - * @return a String + * @return a String */ - + String getEncoding() { return encoding; } @@ -820,38 +868,40 @@ String getEncoding() { int length() { return value.length(); } - + int lengthUtf32() { - if (!BaseFont.IDENTITY_H.equals(encoding)) + if (!BaseFont.IDENTITY_H.equals(encoding)) { return value.length(); + } int total = 0; int len = value.length(); for (int k = 0; k < len; ++k) { - if (Utilities.isSurrogateHigh(value.charAt(k))) + if (Utilities.isSurrogateHigh(value.charAt(k))) { ++k; + } ++total; } return total; } - + boolean isExtSplitCharacter(int start, int current, int end, char[] cc, PdfChunk[] ck) { return splitCharacter.isSplitCharacter(start, current, end, cc, ck); } - -/** - * Removes all the ' ' and '-'-characters on the right of a String. - *

      - * @param string the String that has to be trimmed. - * @return the trimmed String - */ + + /** + * Removes all the ' ' and '-'-characters on the right of a String. + *

      + * + * @param string the String that has to be trimmed. + * @return the trimmed String + */ String trim(String string) { BaseFont ft = font.getFont(); if (ft.getFontType() == BaseFont.FONT_TYPE_CJK && ft.getUnicodeEquivalent(' ') != ' ') { while (string.endsWith("\u0001")) { string = string.substring(0, string.length() - 1); } - } - else { + } else { while (string.endsWith(" ") || string.endsWith("\t")) { string = string.substring(0, string.length() - 1); } @@ -862,19 +912,16 @@ String trim(String string) { public boolean changeLeading() { return changeLeading; } - + float getCharWidth(int c) { - if (noPrint(c)) + if (noPrint(c)) { return 0; + } if (isAttribute(Chunk.CHAR_SPACING)) { Float cs = (Float) getAttribute(Chunk.CHAR_SPACING); return font.width(c) + cs; } return font.width(c); } - - public static boolean noPrint(int c) { - return ((c >= 0x200b && c <= 0x200f) || (c >= 0x202a && c <= 0x202e)); - } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfColor.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfColor.java index deed2dc3c..1b0db56eb 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfColor.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfColor.java @@ -48,31 +48,33 @@ */ package com.lowagie.text.pdf; + import java.awt.Color; + /** * A PdfColor defines a Color (it's a PdfArray containing 3 values). * - * @see PdfDictionary + * @see PdfDictionary */ public class PdfColor extends PdfArray { - + // constructors - -/** - * Constructs a new PdfColor. - * - * @param red a value between 0 and 255 - * @param green a value between 0 and 255 - * @param blue a value between 0 and 255 - */ - + + /** + * Constructs a new PdfColor. + * + * @param red a value between 0 and 255 + * @param green a value between 0 and 255 + * @param blue a value between 0 and 255 + */ + PdfColor(int red, int green, int blue) { - super(new PdfNumber((double)(red & 0xFF) / 0xFF)); - add(new PdfNumber((double)(green & 0xFF) / 0xFF)); - add(new PdfNumber((double)(blue & 0xFF) / 0xFF)); + super(new PdfNumber((double) (red & 0xFF) / 0xFF)); + add(new PdfNumber((double) (green & 0xFF) / 0xFF)); + add(new PdfNumber((double) (blue & 0xFF) / 0xFF)); } - + public PdfColor(Color color) { this(color.getRed(), color.getGreen(), color.getBlue()); } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java index 37ec67a7d..40b1fae2c 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java @@ -77,141 +77,113 @@ /** * PdfContentByte is an object containing the user positioned - * text and graphic contents of a page. It knows how to apply the proper - * font encoding. + * text and graphic contents of a page. It knows how to apply the proper font encoding. */ public class PdfContentByte { /** - * This class keeps the graphic state of the current page + * The alignment is center */ - - static class GraphicState { - - /** This is the font in use */ - FontDetails fontDetails; - - /** This is the color in use */ - ColorDetails colorDetails; - - /** This is the font size in use */ - float size; - - /** The x position of the text line matrix. */ - protected float xTLM = 0; - /** The y position of the text line matrix. */ - protected float yTLM = 0; - - /** The current text leading. */ - protected float leading = 0; - - /** The current horizontal scaling */ - protected float scale = 100; - - /** The current character spacing */ - protected float charSpace = 0; - - /** The current word spacing */ - protected float wordSpace = 0; - - protected ExtendedColor colorFill = GrayColor.GRAYBLACK; - - protected ExtendedColor colorStroke = GrayColor.GRAYBLACK; - - protected PdfObject extGState = null; - - GraphicState() { - } - - GraphicState(GraphicState cp) { - copyParameters(cp); - } - - void copyParameters(final GraphicState cp) { - fontDetails = cp.fontDetails; - colorDetails = cp.colorDetails; - size = cp.size; - xTLM = cp.xTLM; - yTLM = cp.yTLM; - leading = cp.leading; - scale = cp.scale; - charSpace = cp.charSpace; - wordSpace = cp.wordSpace; - colorFill = cp.colorFill; - colorStroke = cp.colorStroke; - extGState = cp.extGState; - } - - void restore(final GraphicState restore) { - copyParameters(restore); - } - } - - /** The alignment is center */ public static final int ALIGN_CENTER = Element.ALIGN_CENTER; - - /** The alignment is left */ + /** + * The alignment is left + */ public static final int ALIGN_LEFT = Element.ALIGN_LEFT; - - /** The alignment is right */ + /** + * The alignment is right + */ public static final int ALIGN_RIGHT = Element.ALIGN_RIGHT; - - /** A possible line cap value */ + /** + * A possible line cap value + */ public static final int LINE_CAP_BUTT = 0; - /** A possible line cap value */ + /** + * A possible line cap value + */ public static final int LINE_CAP_ROUND = 1; - /** A possible line cap value */ + /** + * A possible line cap value + */ public static final int LINE_CAP_PROJECTING_SQUARE = 2; - - /** A possible line join value */ + /** + * A possible line join value + */ public static final int LINE_JOIN_MITER = 0; - /** A possible line join value */ + /** + * A possible line join value + */ public static final int LINE_JOIN_ROUND = 1; - /** A possible line join value */ + /** + * A possible line join value + */ public static final int LINE_JOIN_BEVEL = 2; - - /** A possible text rendering value */ + /** + * A possible text rendering value + */ public static final int TEXT_RENDER_MODE_FILL = 0; - /** A possible text rendering value */ + /** + * A possible text rendering value + */ public static final int TEXT_RENDER_MODE_STROKE = 1; - /** A possible text rendering value */ + /** + * A possible text rendering value + */ public static final int TEXT_RENDER_MODE_FILL_STROKE = 2; - /** A possible text rendering value */ + /** + * A possible text rendering value + */ public static final int TEXT_RENDER_MODE_INVISIBLE = 3; - /** A possible text rendering value */ + /** + * A possible text rendering value + */ public static final int TEXT_RENDER_MODE_FILL_CLIP = 4; - /** A possible text rendering value */ + /** + * A possible text rendering value + */ public static final int TEXT_RENDER_MODE_STROKE_CLIP = 5; - /** A possible text rendering value */ + /** + * A possible text rendering value + */ public static final int TEXT_RENDER_MODE_FILL_STROKE_CLIP = 6; - /** A possible text rendering value */ + /** + * A possible text rendering value + */ public static final int TEXT_RENDER_MODE_CLIP = 7; - static final float MIN_FONT_SIZE = 0.0001f; - private static final float[] unitRect = {0, 0, 0, 1, 1, 0, 1, 1}; + private static final Map abrev = new HashMap<>(); // membervariables - /** This is the actual content */ - protected ByteBuffer content = new ByteBuffer(); + static { + abrev.put(PdfName.BITSPERCOMPONENT, "/BPC "); + abrev.put(PdfName.COLORSPACE, "/CS "); + abrev.put(PdfName.DECODE, "/D "); + abrev.put(PdfName.DECODEPARMS, "/DP "); + abrev.put(PdfName.FILTER, "/F "); + abrev.put(PdfName.HEIGHT, "/H "); + abrev.put(PdfName.IMAGEMASK, "/IM "); + abrev.put(PdfName.INTENT, "/Intent "); + abrev.put(PdfName.INTERPOLATE, "/I "); + abrev.put(PdfName.WIDTH, "/W "); + } + /** + * This is the actual content + */ + protected ByteBuffer content = new ByteBuffer(); /** * This is the writer */ protected PdfWriter writer; - /** * This is the PdfDocument */ protected PdfDocument pdf; - /** * This is the GraphicState in use */ protected GraphicState state = new GraphicState(); - - private static final Map abrev = new HashMap<>(); /** * The list were we save/restore the state */ @@ -221,35 +193,18 @@ void restore(final GraphicState restore) { * The separator between commands. */ protected int separator = '\n'; - - private int mcDepth = 0; - private boolean inText = false; /** * The list were we save/restore the layer depth */ protected List layerDepth; - + private int mcDepth = 0; + private boolean inText = false; private int lastFillAlpha = MAX_COLOR_VALUE; private int lastStrokeAlpha = MAX_COLOR_VALUE; // Correction to apply to next moveText after calling LayoutProcessor.showText private Point2D layoutPositionCorrection = null; - static { - abrev.put(PdfName.BITSPERCOMPONENT, "/BPC "); - abrev.put(PdfName.COLORSPACE, "/CS "); - abrev.put(PdfName.DECODE, "/D "); - abrev.put(PdfName.DECODEPARMS, "/DP "); - abrev.put(PdfName.FILTER, "/F "); - abrev.put(PdfName.HEIGHT, "/H "); - abrev.put(PdfName.IMAGEMASK, "/IM "); - abrev.put(PdfName.INTENT, "/Intent "); - abrev.put(PdfName.INTERPOLATE, "/I "); - abrev.put(PdfName.WIDTH, "/W "); - } - - // constructors - /** * Constructs a new PdfContentByte-object. * @@ -263,12 +218,176 @@ public PdfContentByte(PdfWriter wr) { } } + // constructors + + /** + * Constructs a kern array for a text in a certain font + * + * @param text the text + * @param font the font + * @return a PdfTextArray + */ + public static PdfTextArray getKernArray(String text, BaseFont font) { + PdfTextArray pa = new PdfTextArray(); + StringBuilder acc = new StringBuilder(); + int len = text.length() - 1; + char[] c = text.toCharArray(); + if (len >= 0) { + acc.append(c, 0, 1); + } + for (int k = 0; k < len; ++k) { + char c2 = c[k + 1]; + int kern = font.getKerning(c[k], c2); + if (kern == 0) { + acc.append(c2); + } else { + pa.add(acc.toString()); + acc.setLength(0); + acc.append(c, k + 1, 1); + pa.add(-kern); + } + } + pa.add(acc.toString()); + return pa; + } + // methods to get the content of this object + /** + * Escapes a byte array according to the PDF conventions. + * + * @param b the byte array to escape + * @return an escaped byte array + */ + static byte[] escapeString(byte[] b) { + ByteBuffer content = new ByteBuffer(); + escapeString(b, content); + return content.toByteArray(); + } + + /** + * Escapes a byte array according to the PDF conventions. + * + * @param b the byte array to escape + * @param content the content + */ + static void escapeString(byte[] b, ByteBuffer content) { + content.append_i('('); + for (byte c : b) { + switch (c) { + case '\r': + content.append("\\r"); + break; + case '\n': + content.append("\\n"); + break; + case '\t': + content.append("\\t"); + break; + case '\b': + content.append("\\b"); + break; + case '\f': + content.append("\\f"); + break; + case '(': + case ')': + case '\\': + content.append_i('\\').append_i(c); + break; + default: + content.append_i(c); + } + } + content.append(")"); + } + + /** + * Generates an array of bezier curves to draw an arc. + *

      + * (x1, y1) and (x2, y2) are the corners of the enclosing rectangle. Angles, measured in degrees, start with 0 to + * the right (the positive X axis) and increase counter-clockwise. The arc extends from startAng to + * startAng+extent. I.e. startAng=0 and extent=180 yields an openside-down semi-circle. + *

      + * The resulting coordinates are of the form float[]{x1,y1,x2,y2,x3,y3, x4,y4} such that the curve goes from (x1, + * y1) to (x4, y4) with (x2, y2) and (x3, y3) as their respective Bezier control points. + *

      + * Note: this code was taken from ReportLab (www.reportlab.org), an excellent PDF generator for Python (BSD license: + * http://www.reportlab.org/devfaq.html#1.3 ). + * + * @param x1 a corner of the enclosing rectangle + * @param y1 a corner of the enclosing rectangle + * @param x2 a corner of the enclosing rectangle + * @param y2 a corner of the enclosing rectangle + * @param startAng starting angle in degrees + * @param extent angle extent in degrees + * @return a list of float[] with the bezier curves + */ + public static List bezierArc(float x1, float y1, float x2, float y2, float startAng, float extent) { + float tmp; + if (x1 > x2) { + tmp = x1; + x1 = x2; + x2 = tmp; + } + if (y2 > y1) { + tmp = y1; + y1 = y2; + y2 = tmp; + } + + float fragAngle; + int Nfrag; + if (Math.abs(extent) <= 90f) { + fragAngle = extent; + Nfrag = 1; + } else { + Nfrag = (int) (Math.ceil(Math.abs(extent) / 90f)); + fragAngle = extent / Nfrag; + } + float x_cen = (x1 + x2) / 2f; + float y_cen = (y1 + y2) / 2f; + float rx = (x2 - x1) / 2f; + float ry = (y2 - y1) / 2f; + float halfAng = (float) (fragAngle * Math.PI / 360.); + float kappa = (float) (Math.abs(4. / 3. * (1. - Math.cos(halfAng)) / Math.sin(halfAng))); + List pointList = new ArrayList<>(); + for (int i = 0; i < Nfrag; ++i) { + float theta0 = (float) ((startAng + i * fragAngle) * Math.PI / 180.); + float theta1 = (float) ((startAng + (i + 1) * fragAngle) * Math.PI / 180.); + float cos0 = (float) Math.cos(theta0); + float cos1 = (float) Math.cos(theta1); + float sin0 = (float) Math.sin(theta0); + float sin1 = (float) Math.sin(theta1); + if (fragAngle > 0f) { + pointList.add(new float[]{x_cen + rx * cos0, + y_cen - ry * sin0, + x_cen + rx * (cos0 - kappa * sin0), + y_cen - ry * (sin0 + kappa * cos0), + x_cen + rx * (cos1 + kappa * sin1), + y_cen - ry * (sin1 - kappa * cos1), + x_cen + rx * cos1, + y_cen - ry * sin1}); + } else { + pointList.add(new float[]{x_cen + rx * cos0, + y_cen - ry * sin0, + x_cen + rx * (cos0 + kappa * sin0), + y_cen - ry * (sin0 - kappa * cos0), + x_cen + rx * (cos1 - kappa * sin1), + y_cen - ry * (sin1 + kappa * cos1), + x_cen + rx * cos1, + y_cen - ry * sin1}); + } + } + return pointList; + } + + // methods to add graphical content + /** * Returns the String representation of this PdfContentByte-object. * - * @return a String + * @return a String */ public String toString() { @@ -277,13 +396,15 @@ public String toString() { /** * Gets the internal buffer. + * * @return the internal buffer */ public ByteBuffer getInternalBuffer() { return content; } - /** Returns the PDF representation of this PdfContentByte-object. + /** + * Returns the PDF representation of this PdfContentByte-object. * * @param writer the PdfWriter * @return a byte array with the representation @@ -294,17 +415,17 @@ public byte[] toPdf(PdfWriter writer) { return content.toByteArray(); } - // methods to add graphical content - /** * Adds the content of another PdfContent-object to this object. * - * @param other another PdfByteContent-object + * @param other another PdfByteContent-object */ public void add(PdfContentByte other) { - if (other.writer != null && writer != other.writer) - throw new RuntimeException(MessageLocalization.getComposedMessage("inconsistent.writers.are.you.mixing.two.documents")); + if (other.writer != null && writer != other.writer) { + throw new RuntimeException( + MessageLocalization.getComposedMessage("inconsistent.writers.are.you.mixing.two.documents")); + } content.append(other.content); } @@ -335,6 +456,21 @@ public float getLeading() { return state.leading; } + /** + * Sets the text leading parameter. + *

      + * The leading parameter is measured in text space units. It specifies the vertical distance between the baselines + * of adjacent lines of text.

      + * + * @param leading the new leading + */ + public void setLeading(float leading) { + if (state != null) { + state.leading = leading; + } + content.append(leading).append(" TL").append_i(separator); + } + /** * Gets the current character spacing. * @@ -344,6 +480,18 @@ public float getCharacterSpacing() { return state.charSpace; } + /** + * Sets the character spacing parameter. + * + * @param charSpace a parameter + */ + public void setCharacterSpacing(float charSpace) { + if (state != null) { + state.charSpace = charSpace; + } + content.append(charSpace).append(" Tc").append_i(separator); + } + /** * Gets the current word spacing. * @@ -353,6 +501,18 @@ public float getWordSpacing() { return state.wordSpace; } + /** + * Sets the word spacing parameter. + * + * @param wordSpace a parameter + */ + public void setWordSpacing(float wordSpace) { + if (state != null) { + state.wordSpace = wordSpace; + } + content.append(wordSpace).append(" Tw").append_i(separator); + } + /** * Gets the current character spacing. * @@ -362,13 +522,25 @@ public float getHorizontalScaling() { return state.scale; } + /** + * Sets the horizontal scaling parameter. + * + * @param scale a parameter + */ + public void setHorizontalScaling(float scale) { + if (state != null) { + state.scale = scale; + } + content.append(scale).append(" Tz").append_i(separator); + } + /** * Changes the Flatness. - *

      + *

      * Flatness sets the maximum permitted distance in device pixels between the * mathematically correct path and an approximation constructed from straight line segments.
      * - * @param flatness a value + * @param flatness a value */ public void setFlatness(float flatness) { @@ -379,12 +551,11 @@ public void setFlatness(float flatness) { /** * Changes the Line cap style. - *

      - * The line cap style specifies the shape to be used at the end of open subpaths - * when they are stroked.
      - * Allowed values are LINE_CAP_BUTT, LINE_CAP_ROUND and LINE_CAP_PROJECTING_SQUARE.
      + *

      + * The line cap style specifies the shape to be used at the end of open subpaths when they are + * stroked.
      Allowed values are LINE_CAP_BUTT, LINE_CAP_ROUND and LINE_CAP_PROJECTING_SQUARE.
      * - * @param style a value + * @param style a value */ public void setLineCap(int style) { @@ -395,13 +566,12 @@ public void setLineCap(int style) { /** * Changes the value of the line dash pattern. - *

      - * The line dash pattern controls the pattern of dashes and gaps used to stroke paths. - * It is specified by an array and a phase. The array specifies the length - * of the alternating dashes and gaps. The phase specifies the distance into the dash - * pattern to start the dash.
      + *

      + * The line dash pattern controls the pattern of dashes and gaps used to stroke paths. It is specified by an + * array and a phase. The array specifies the length of the alternating dashes and gaps. The phase + * specifies the distance into the dash pattern to start the dash.
      * - * @param phase the value of the phase + * @param phase the value of the phase */ public void setLineDash(float phase) { @@ -410,14 +580,13 @@ public void setLineDash(float phase) { /** * Changes the value of the line dash pattern. - *

      - * The line dash pattern controls the pattern of dashes and gaps used to stroke paths. - * It is specified by an array and a phase. The array specifies the length - * of the alternating dashes and gaps. The phase specifies the distance into the dash - * pattern to start the dash.
      + *

      + * The line dash pattern controls the pattern of dashes and gaps used to stroke paths. It is specified by an + * array and a phase. The array specifies the length of the alternating dashes and gaps. The phase + * specifies the distance into the dash pattern to start the dash.
      * - * @param phase the value of the phase - * @param unitsOn the number of units that must be 'on' (equals the number of units that must be 'off'). + * @param phase the value of the phase + * @param unitsOn the number of units that must be 'on' (equals the number of units that must be 'off'). */ public void setLineDash(float unitsOn, float phase) { @@ -426,50 +595,51 @@ public void setLineDash(float unitsOn, float phase) { /** * Changes the value of the line dash pattern. - *

      - * The line dash pattern controls the pattern of dashes and gaps used to stroke paths. - * It is specified by an array and a phase. The array specifies the length - * of the alternating dashes and gaps. The phase specifies the distance into the dash - * pattern to start the dash.
      + *

      + * The line dash pattern controls the pattern of dashes and gaps used to stroke paths. It is specified by an + * array and a phase. The array specifies the length of the alternating dashes and gaps. The phase + * specifies the distance into the dash pattern to start the dash.
      * - * @param phase the value of the phase - * @param unitsOn the number of units that must be 'on' - * @param unitsOff the number of units that must be 'off' + * @param phase the value of the phase + * @param unitsOn the number of units that must be 'on' + * @param unitsOff the number of units that must be 'off' */ public void setLineDash(float unitsOn, float unitsOff, float phase) { - content.append("[").append(unitsOn).append(' ').append(unitsOff).append("] ").append(phase).append(" d").append_i(separator); + content.append("[").append(unitsOn).append(' ').append(unitsOff).append("] ").append(phase).append(" d") + .append_i(separator); } /** * Changes the value of the line dash pattern. - *

      - * The line dash pattern controls the pattern of dashes and gaps used to stroke paths. - * It is specified by an array and a phase. The array specifies the length - * of the alternating dashes and gaps. The phase specifies the distance into the dash - * pattern to start the dash.
      + *

      + * The line dash pattern controls the pattern of dashes and gaps used to stroke paths. It is specified by an + * array and a phase. The array specifies the length of the alternating dashes and gaps. The phase + * specifies the distance into the dash pattern to start the dash.
      * - * @param array length of the alternating dashes and gaps - * @param phase the value of the phase + * @param array length of the alternating dashes and gaps + * @param phase the value of the phase */ public final void setLineDash(float[] array, float phase) { content.append("["); for (int i = 0; i < array.length; i++) { content.append(array[i]); - if (i < array.length - 1) content.append(' '); + if (i < array.length - 1) { + content.append(' '); + } } content.append("] ").append(phase).append(" d").append_i(separator); } /** * Changes the Line join style. - *

      - * The line join style specifies the shape to be used at the corners of paths - * that are stroked.
      - * Allowed values are LINE_JOIN_MITER (Miter joins), LINE_JOIN_ROUND (Round joins) and LINE_JOIN_BEVEL (Bevel joins).
      + *

      + * The line join style specifies the shape to be used at the corners of paths that are stroked.
      + * Allowed values are LINE_JOIN_MITER (Miter joins), LINE_JOIN_ROUND (Round joins) and LINE_JOIN_BEVEL (Bevel + * joins).
      * - * @param style a value + * @param style a value */ public void setLineJoin(int style) { @@ -480,11 +650,11 @@ public void setLineJoin(int style) { /** * Changes the line width. - *

      - * The line width specifies the thickness of the line used to stroke a path and is measured - * in user space units.
      + *

      + * The line width specifies the thickness of the line used to stroke a path and is measured in user space + * units.
      * - * @param w a width + * @param w a width */ public void setLineWidth(float w) { @@ -493,13 +663,13 @@ public void setLineWidth(float w) { /** * Changes the Miter limit. - *

      - * When two line segments meet at a sharp angle and mitered joins have been specified as the - * line join style, it is possible for the miter to extend far beyond the thickness of the line - * stroking path. The miter limit imposes a maximum on the ratio of the miter length to the line - * witdh. When the limit is exceeded, the join is converted from a miter to a bevel.
      + *

      + * When two line segments meet at a sharp angle and mitered joins have been specified as the line join style, it is + * possible for the miter to extend far beyond the thickness of the line stroking path. The miter limit imposes a + * maximum on the ratio of the miter length to the line witdh. When the limit is exceeded, the join is converted + * from a miter to a bevel.
      * - * @param miterLimit a miter limit + * @param miterLimit a miter limit */ public void setMiterLimit(float miterLimit) { @@ -509,9 +679,8 @@ public void setMiterLimit(float miterLimit) { } /** - * Modify the current clipping path by intersecting it with the current path, using the - * nonzero winding number rule to determine which regions lie inside the clipping - * path. + * Modify the current clipping path by intersecting it with the current path, using the nonzero winding number rule + * to determine which regions lie inside the clipping path. */ public void clip() { @@ -519,8 +688,8 @@ public void clip() { } /** - * Modify the current clipping path by intersecting it with the current path, using the - * even-odd rule to determine which regions lie inside the clipping path. + * Modify the current clipping path by intersecting it with the current path, using the even-odd rule to determine + * which regions lie inside the clipping path. */ public void eoClip() { @@ -529,11 +698,11 @@ public void eoClip() { /** * Changes the currentgray tint for filling paths (device dependent colors!). - *

      - * Sets the color space to DeviceGray (or the DefaultGray color space), - * and sets the gray tint to use for filling paths.

      + *

      + * Sets the color space to DeviceGray (or the DefaultGray color space), and sets the gray tint to use + * for filling paths.

      * - * @param gray a value between 0 (black) and 1 (white) + * @param gray a value between 0 (black) and 1 (white) */ public void setGrayFill(float gray) { @@ -556,16 +725,17 @@ public void resetGrayFill() { /** * Changes the currentgray tint for stroking paths (device dependent colors!). - *

      - * Sets the color space to DeviceGray (or the DefaultGray color space), - * and sets the gray tint to use for stroking paths.

      + *

      + * Sets the color space to DeviceGray (or the DefaultGray color space), and sets the gray tint to use + * for stroking paths.

      * - * @param gray a value between 0 (black) and 1 (white) + * @param gray a value between 0 (black) and 1 (white) */ public void setGrayStroke(float gray) { setGrayStroke(gray, MAX_FLOAT_COLOR_VALUE); } + public void setGrayStroke(float gray, float alpha) { saveColorStroke(new GrayColor(gray, alpha)); content.append(gray).append(" G").append_i(separator); @@ -582,54 +752,62 @@ public void resetGrayStroke() { /** * Helper to validate and write the RGB color components - * @param red the intensity of red. A value between 0 and 255 - * @param green the intensity of green. A value between 0 and 255 - * @param blue the intensity of blue. A value between 0 and 255 + * + * @param red the intensity of red. A value between 0 and 255 + * @param green the intensity of green. A value between 0 and 255 + * @param blue the intensity of blue. A value between 0 and 255 */ private void HelperRGB(int red, int green, int blue) { - HelperRGB((float)(red & MAX_COLOR_VALUE) / MAX_INT_COLOR_VALUE, (float)(green & MAX_COLOR_VALUE) / MAX_INT_COLOR_VALUE, (float)(blue & MAX_COLOR_VALUE) / MAX_INT_COLOR_VALUE); + HelperRGB((float) (red & MAX_COLOR_VALUE) / MAX_INT_COLOR_VALUE, + (float) (green & MAX_COLOR_VALUE) / MAX_INT_COLOR_VALUE, + (float) (blue & MAX_COLOR_VALUE) / MAX_INT_COLOR_VALUE); } /** * Helper to validate and write the RGB color components - * @param red the intensity of red. A value between 0 and 1 - * @param green the intensity of green. A value between 0 and 1 - * @param blue the intensity of blue. A value between 0 and 1 + * + * @param red the intensity of red. A value between 0 and 1 + * @param green the intensity of green. A value between 0 and 1 + * @param blue the intensity of blue. A value between 0 and 1 */ private void HelperRGB(float red, float green, float blue) { PdfXConformanceImp.checkPDFXConformance(writer, PdfXConformanceImp.PDFXKEY_RGB, null); - if (red < 0.0f) + if (red < 0.0f) { red = 0.0f; - else if (red > MAX_FLOAT_COLOR_VALUE) + } else if (red > MAX_FLOAT_COLOR_VALUE) { red = MAX_FLOAT_COLOR_VALUE; - if (green < 0.0f) + } + if (green < 0.0f) { green = 0.0f; - else if (green > MAX_FLOAT_COLOR_VALUE) + } else if (green > MAX_FLOAT_COLOR_VALUE) { green = MAX_FLOAT_COLOR_VALUE; - if (blue < 0.0f) + } + if (blue < 0.0f) { blue = 0.0f; - else if (blue > MAX_FLOAT_COLOR_VALUE) + } else if (blue > MAX_FLOAT_COLOR_VALUE) { blue = MAX_FLOAT_COLOR_VALUE; + } content.append(red).append(' ').append(green).append(' ').append(blue); } /** * Changes the current color for filling paths (device dependent colors!). - *

      - * Sets the color space to DeviceRGB (or the DefaultRGB color space), - * and sets the color to use for filling paths.

      - *

      - * Following the PDF manual, each operand must be a number between 0 (minimum intensity) and - * 1 (maximum intensity).

      + *

      + * Sets the color space to DeviceRGB (or the DefaultRGB color space), and sets the color to use for + * filling paths.

      + *

      + * Following the PDF manual, each operand must be a number between 0 (minimum intensity) and 1 (maximum + * intensity).

      * - * @param red the intensity of red. A value between 0 and 1 - * @param green the intensity of green. A value between 0 and 1 - * @param blue the intensity of blue. A value between 0 and 1 + * @param red the intensity of red. A value between 0 and 1 + * @param green the intensity of green. A value between 0 and 1 + * @param blue the intensity of blue. A value between 0 and 1 */ public void setRGBColorFillF(float red, float green, float blue) { setRGBColorFillF(red, green, blue, MAX_FLOAT_COLOR_VALUE); } + public void setRGBColorFillF(float red, float green, float blue, float alpha) { saveColorFill(new RGBColor(red, green, blue, alpha)); HelperRGB(red, green, blue); @@ -637,8 +815,8 @@ public void setRGBColorFillF(float red, float green, float blue, float alpha) { } /** - * Changes the current color for filling paths to black. - * Resetting using gray color to keep the backward compatibility. + * Changes the current color for filling paths to black. Resetting using gray color to keep the backward + * compatibility. */ public void resetRGBColorFill() { @@ -647,16 +825,16 @@ public void resetRGBColorFill() { /** * Changes the current color for stroking paths (device dependent colors!). - *

      - * Sets the color space to DeviceRGB (or the DefaultRGB color space), - * and sets the color to use for stroking paths.

      - *

      - * Following the PDF manual, each operand must be a number between 0 (miniumum intensity) and - * 1 (maximum intensity). + *

      + * Sets the color space to DeviceRGB (or the DefaultRGB color space), and sets the color to use for + * stroking paths.

      + *

      + * Following the PDF manual, each operand must be a number between 0 (miniumum intensity) and 1 (maximum + * intensity). * - * @param red the intensity of red. A value between 0 and 1 - * @param green the intensity of green. A value between 0 and 1 - * @param blue the intensity of blue. A value between 0 and 1 + * @param red the intensity of red. A value between 0 and 1 + * @param green the intensity of green. A value between 0 and 1 + * @param blue the intensity of blue. A value between 0 and 1 */ public void setRGBColorStrokeF(float red, float green, float blue) { @@ -666,8 +844,8 @@ public void setRGBColorStrokeF(float red, float green, float blue) { } /** - * Changes the current color for stroking paths to black. - * Resetting using gray color to keep the backward compatibility. + * Changes the current color for stroking paths to black. Resetting using gray color to keep the backward + * compatibility. */ public void resetRGBColorStroke() { @@ -677,10 +855,10 @@ public void resetRGBColorStroke() { /** * Helper to validate and write the CMYK color components. * - * @param cyan the intensity of cyan. A value between 0 and 255 - * @param magenta the intensity of magenta. A value between 0 and 255 - * @param yellow the intensity of yellow. A value between 0 and 255 - * @param black the intensity of black. A value between 0 and 255 + * @param cyan the intensity of cyan. A value between 0 and 255 + * @param magenta the intensity of magenta. A value between 0 and 255 + * @param yellow the intensity of yellow. A value between 0 and 255 + * @param black the intensity of black. A value between 0 and 255 */ private void HelperCMYK(int cyan, int magenta, int yellow, int black) { HelperCMYK((float) (cyan & MAX_COLOR_VALUE) / MAX_INT_COLOR_VALUE, @@ -692,44 +870,47 @@ private void HelperCMYK(int cyan, int magenta, int yellow, int black) { /** * Helper to validate and write the CMYK color components. * - * @param cyan the intensity of cyan. A value between 0 and 1 - * @param magenta the intensity of magenta. A value between 0 and 1 - * @param yellow the intensity of yellow. A value between 0 and 1 - * @param black the intensity of black. A value between 0 and 1 + * @param cyan the intensity of cyan. A value between 0 and 1 + * @param magenta the intensity of magenta. A value between 0 and 1 + * @param yellow the intensity of yellow. A value between 0 and 1 + * @param black the intensity of black. A value between 0 and 1 */ private void HelperCMYK(float cyan, float magenta, float yellow, float black) { - if (cyan < 0.0f) + if (cyan < 0.0f) { cyan = 0.0f; - else if (cyan > MAX_FLOAT_COLOR_VALUE) + } else if (cyan > MAX_FLOAT_COLOR_VALUE) { cyan = MAX_FLOAT_COLOR_VALUE; - if (magenta < 0.0f) + } + if (magenta < 0.0f) { magenta = 0.0f; - else if (magenta > MAX_FLOAT_COLOR_VALUE) + } else if (magenta > MAX_FLOAT_COLOR_VALUE) { magenta = MAX_FLOAT_COLOR_VALUE; - if (yellow < 0.0f) + } + if (yellow < 0.0f) { yellow = 0.0f; - else if (yellow > MAX_FLOAT_COLOR_VALUE) + } else if (yellow > MAX_FLOAT_COLOR_VALUE) { yellow = MAX_FLOAT_COLOR_VALUE; - if (black < 0.0f) + } + if (black < 0.0f) { black = 0.0f; - else if (black > MAX_FLOAT_COLOR_VALUE) + } else if (black > MAX_FLOAT_COLOR_VALUE) { black = MAX_FLOAT_COLOR_VALUE; + } content.append(cyan).append(' ').append(magenta).append(' ').append(yellow).append(' ').append(black); } /** * Changes the current color for filling paths (device dependent colors!). - *

      - * Sets the color space to DeviceCMYK (or the DefaultCMYK color space), - * and sets the color to use for filling paths.

      - *

      - * Following the PDF manual, each operand must be a number between 0 (no ink) and - * 1 (maximum ink).

      + *

      + * Sets the color space to DeviceCMYK (or the DefaultCMYK color space), and sets the color to use for + * filling paths.

      + *

      + * Following the PDF manual, each operand must be a number between 0 (no ink) and 1 (maximum ink).

      * - * @param cyan the intensity of cyan. A value between 0 and 1 - * @param magenta the intensity of magenta. A value between 0 and 1 - * @param yellow the intensity of yellow. A value between 0 and 1 - * @param black the intensity of black. A value between 0 and 1 + * @param cyan the intensity of cyan. A value between 0 and 1 + * @param magenta the intensity of magenta. A value between 0 and 1 + * @param yellow the intensity of yellow. A value between 0 and 1 + * @param black the intensity of black. A value between 0 and 1 */ public void setCMYKColorFillF(float cyan, float magenta, float yellow, float black) { @@ -744,7 +925,6 @@ public void setCMYKColorFillF(float cyan, float magenta, float yellow, float bla /** * Changes the current color for filling paths to black. - * */ public void resetCMYKColorFill() { @@ -755,22 +935,23 @@ public void resetCMYKColorFill() { /** * Changes the current color for stroking paths (device dependent colors!). - *

      - * Sets the color space to DeviceCMYK (or the DefaultCMYK color space), - * and sets the color to use for stroking paths.

      - *

      - * Following the PDF manual, each operand must be a number between 0 (miniumum intensity) and - * 1 (maximum intensity). + *

      + * Sets the color space to DeviceCMYK (or the DefaultCMYK color space), and sets the color to use for + * stroking paths.

      + *

      + * Following the PDF manual, each operand must be a number between 0 (miniumum intensity) and 1 (maximum + * intensity). * - * @param cyan the intensity of cyan. A value between 0 and 1 - * @param magenta the intensity of magenta. A value between 0 and 1 - * @param yellow the intensity of yellow. A value between 0 and 1 - * @param black the intensity of black. A value between 0 and 1 + * @param cyan the intensity of cyan. A value between 0 and 1 + * @param magenta the intensity of magenta. A value between 0 and 1 + * @param yellow the intensity of yellow. A value between 0 and 1 + * @param black the intensity of black. A value between 0 and 1 */ public void setCMYKColorStrokeF(float cyan, float magenta, float yellow, float black) { setCMYKColorStrokeF(cyan, magenta, yellow, black, MAX_FLOAT_COLOR_VALUE); } + public void setCMYKColorStrokeF(float cyan, float magenta, float yellow, float black, float alpha) { saveColorStroke(new CMYKColor(cyan, magenta, yellow, black, alpha)); HelperCMYK(cyan, magenta, yellow, black); @@ -779,7 +960,6 @@ public void setCMYKColorStrokeF(float cyan, float magenta, float yellow, float b /** * Changes the current color for stroking paths to black. - * */ public void resetCMYKColorStroke() { @@ -791,8 +971,8 @@ public void resetCMYKColorStroke() { /** * Move the current point (x, y), omitting any connecting line segment. * - * @param x new x-coordinate - * @param y new y-coordinate + * @param x new x-coordinate + * @param y new y-coordinate */ public void moveTo(float x, float y) { @@ -800,11 +980,10 @@ public void moveTo(float x, float y) { } /** - * Appends a straight line segment from the current point (x, y). The new current - * point is (x, y). + * Appends a straight line segment from the current point (x, y). The new current point is (x, y). * - * @param x new x-coordinate - * @param y new y-coordinate + * @param x new x-coordinate + * @param y new y-coordinate */ public void lineTo(float x, float y) { @@ -814,45 +993,49 @@ public void lineTo(float x, float y) { /** * Appends a Bêzier curve to the path, starting from the current point. * - * @param x1 x-coordinate of the first control point - * @param y1 y-coordinate of the first control point - * @param x2 x-coordinate of the second control point - * @param y2 y-coordinate of the second control point - * @param x3 x-coordinate of the ending point (= new current point) - * @param y3 y-coordinate of the ending point (= new current point) + * @param x1 x-coordinate of the first control point + * @param y1 y-coordinate of the first control point + * @param x2 x-coordinate of the second control point + * @param y2 y-coordinate of the second control point + * @param x3 x-coordinate of the ending point (= new current point) + * @param y3 y-coordinate of the ending point (= new current point) */ public void curveTo(float x1, float y1, float x2, float y2, float x3, float y3) { - content.append(x1).append(' ').append(y1).append(' ').append(x2).append(' ').append(y2).append(' ').append(x3).append(' ').append(y3).append(" c").append_i(separator); + content.append(x1).append(' ').append(y1).append(' ').append(x2).append(' ').append(y2).append(' ').append(x3) + .append(' ').append(y3).append(" c").append_i(separator); } /** * Appends a Bêzier curve to the path, starting from the current point. * - * @param x2 x-coordinate of the second control point - * @param y2 y-coordinate of the second control point - * @param x3 x-coordinate of the ending point (= new current point) - * @param y3 y-coordinate of the ending point (= new current point) + * @param x2 x-coordinate of the second control point + * @param y2 y-coordinate of the second control point + * @param x3 x-coordinate of the ending point (= new current point) + * @param y3 y-coordinate of the ending point (= new current point) */ public void curveTo(float x2, float y2, float x3, float y3) { - content.append(x2).append(' ').append(y2).append(' ').append(x3).append(' ').append(y3).append(" v").append_i(separator); + content.append(x2).append(' ').append(y2).append(' ').append(x3).append(' ').append(y3).append(" v") + .append_i(separator); } /** * Appends a Bêzier curve to the path, starting from the current point. * - * @param x1 x-coordinate of the first control point - * @param y1 y-coordinate of the first control point - * @param x3 x-coordinate of the ending point (= new current point) - * @param y3 y-coordinate of the ending point (= new current point) + * @param x1 x-coordinate of the first control point + * @param y1 y-coordinate of the first control point + * @param x3 x-coordinate of the ending point (= new current point) + * @param y3 y-coordinate of the ending point (= new current point) */ public void curveFromTo(float x1, float y1, float x3, float y3) { - content.append(x1).append(' ').append(y1).append(' ').append(x3).append(' ').append(y3).append(" y").append_i(separator); + content.append(x1).append(' ').append(y1).append(' ').append(x3).append(' ').append(y3).append(" y") + .append_i(separator); } - /** Draws a circle. The endpoint will (x+r, y). + /** + * Draws a circle. The endpoint will (x+r, y). * * @param x x center of circle * @param y y center of circle @@ -867,35 +1050,37 @@ public void circle(float x, float y, float r) { curveTo(x + r * b, y - r, x + r, y - r * b, x + r, y); } - - /** * Adds a rectangle to the current path. * - * @param x x-coordinate of the starting point - * @param y y-coordinate of the starting point - * @param w width - * @param h height + * @param x x-coordinate of the starting point + * @param y y-coordinate of the starting point + * @param w width + * @param h height */ public void rectangle(float x, float y, float w, float h) { - content.append(x).append(' ').append(y).append(' ').append(w).append(' ').append(h).append(" re").append_i(separator); + content.append(x).append(' ').append(y).append(' ').append(w).append(' ').append(h).append(" re") + .append_i(separator); } private boolean compareColors(Color c1, Color c2) { - if (c1 == null && c2 == null) + if (c1 == null && c2 == null) { return true; - if (c1 == null || c2 == null) + } + if (c1 == null || c2 == null) { return false; - if (c1 instanceof ExtendedColor) + } + if (c1 instanceof ExtendedColor) { return c1.equals(c2); + } return c2.equals(c1); } /** - * Adds a variable width border to the current path. - * Only use if {@link com.lowagie.text.Rectangle#isUseVariableBorders() Rectangle.isUseVariableBorders} - * = true. + * Adds a variable width border to the current path. Only use if + * {@link com.lowagie.text.Rectangle#isUseVariableBorders() Rectangle.isUseVariableBorders} = true. + * * @param rect a Rectangle */ public void variableRectangle(Rectangle rect) { @@ -923,10 +1108,11 @@ public void variableRectangle(Rectangle rect) { if (wt > 0) { setLineWidth(clw = wt); cdef = true; - if (ct == null) + if (ct == null) { resetRGBColorStroke(); - else + } else { setColorStroke(ct); + } ccol = ct; moveTo(l, t - wt / 2f); lineTo(r, t - wt / 2f); @@ -935,14 +1121,16 @@ public void variableRectangle(Rectangle rect) { // Draw bottom if (wb > 0) { - if (wb != clw) + if (wb != clw) { setLineWidth(clw = wb); + } if (!cdef || !compareColors(ccol, cb)) { cdef = true; - if (cb == null) + if (cb == null) { resetRGBColorStroke(); - else + } else { setColorStroke(cb); + } ccol = cb; } moveTo(r, b + wb / 2f); @@ -952,14 +1140,16 @@ public void variableRectangle(Rectangle rect) { // Draw right if (wr > 0) { - if (wr != clw) + if (wr != clw) { setLineWidth(clw = wr); + } if (!cdef || !compareColors(ccol, cr)) { cdef = true; - if (cr == null) + if (cr == null) { resetRGBColorStroke(); - else + } else { setColorStroke(cr); + } ccol = cr; } boolean bt = compareColors(ct, cr); @@ -969,10 +1159,11 @@ public void variableRectangle(Rectangle rect) { stroke(); if (!bt || !bb) { cdefi = true; - if (cr == null) + if (cr == null) { resetRGBColorFill(); - else + } else { setColorFill(cr); + } cfil = cr; if (!bt) { moveTo(r, t); @@ -991,13 +1182,15 @@ public void variableRectangle(Rectangle rect) { // Draw Left if (wl > 0) { - if (wl != clw) + if (wl != clw) { setLineWidth(wl); + } if (!cdef || !compareColors(ccol, cl)) { - if (cl == null) + if (cl == null) { resetRGBColorStroke(); - else + } else { setColorStroke(cl); + } } boolean bt = compareColors(ct, cl); boolean bb = compareColors(cb, cl); @@ -1006,10 +1199,11 @@ public void variableRectangle(Rectangle rect) { stroke(); if (!bt || !bb) { if (!cdefi || !compareColors(cfil, cl)) { - if (cl == null) + if (cl == null) { resetRGBColorFill(); - else + } else { setColorFill(cl); + } } if (!bt) { moveTo(l, t); @@ -1031,7 +1225,7 @@ public void variableRectangle(Rectangle rect) { /** * Adds a border (complete or partially) to the current path.. * - * @param rectangle a Rectangle + * @param rectangle a Rectangle */ public void rectangle(Rectangle rectangle) { @@ -1052,7 +1246,7 @@ public void rectangle(Rectangle rectangle) { } // if the element hasn't got any borders, nothing is added - if (! rectangle.hasBorders()) { + if (!rectangle.hasBorders()) { return; } @@ -1061,8 +1255,7 @@ public void rectangle(Rectangle rectangle) { // different colors if (rectangle.isUseVariableBorders()) { variableRectangle(rectangle); - } - else { + } else { // the width is set to the width of the element if (rectangle.getBorderWidth() != Rectangle.UNDEFINED) { setLineWidth(rectangle.getBorderWidth()); @@ -1076,7 +1269,7 @@ public void rectangle(Rectangle rectangle) { // if the box is a rectangle, it is added as a rectangle if (rectangle.hasBorder(Rectangle.BOX)) { - rectangle(x1, y1, x2 - x1, y2 - y1); + rectangle(x1, y1, x2 - x1, y2 - y1); } // if the border isn't a rectangle, the different sides are added apart else { @@ -1107,8 +1300,8 @@ public void rectangle(Rectangle rectangle) { } /** - * Closes the current subpath by appending a straight line segment from the current point - * to the starting point of the subpath. + * Closes the current subpath by appending a straight line segment from the current point to the starting point of + * the subpath. */ public void closePath() { @@ -1188,8 +1381,8 @@ public void closePathEoFillStroke() { } /** - * Adds an Image to the page. The Image must have - * absolute positioning. + * Adds an Image to the page. The Image must have absolute positioning. + * * @param image the Image object * @throws DocumentException if the Image does not have absolute positioning */ @@ -1198,15 +1391,18 @@ public void addImage(Image image) throws DocumentException { } /** - * Adds an Image to the page. The Image must have - * absolute positioning. The image can be placed inline. - * @param image the Image object + * Adds an Image to the page. The Image must have absolute positioning. The image can be + * placed inline. + * + * @param image the Image object * @param inlineImage true to place this image inline, false otherwise * @throws DocumentException if the Image does not have absolute positioning */ public void addImage(Image image, boolean inlineImage) throws DocumentException { - if (!image.hasAbsoluteY()) - throw new DocumentException(MessageLocalization.getComposedMessage("the.image.must.have.absolute.positioning")); + if (!image.hasAbsoluteY()) { + throw new DocumentException( + MessageLocalization.getComposedMessage("the.image.must.have.absolute.positioning")); + } float[] matrix = image.matrix(); matrix[Image.CX] = image.getAbsoluteX() - matrix[Image.CX]; matrix[Image.CY] = image.getAbsoluteY() - matrix[Image.CY]; @@ -1214,16 +1410,16 @@ public void addImage(Image image, boolean inlineImage) throws DocumentException } /** - * Adds an Image to the page. The positioning of the Image - * is done with the transformation matrix. To position an image at (x,y) - * use addImage(image, image_width, 0, 0, image_height, x, y). + * Adds an Image to the page. The positioning of the Image is done with the transformation + * matrix. To position an image at (x,y) use addImage(image, image_width, 0, 0, image_height, x, y). + * * @param image the Image object - * @param a an element of the transformation matrix - * @param b an element of the transformation matrix - * @param c an element of the transformation matrix - * @param d an element of the transformation matrix - * @param e an element of the transformation matrix - * @param f an element of the transformation matrix + * @param a an element of the transformation matrix + * @param b an element of the transformation matrix + * @param c an element of the transformation matrix + * @param d an element of the transformation matrix + * @param e an element of the transformation matrix + * @param f an element of the transformation matrix * @throws DocumentException on error */ public void addImage(Image image, float a, float b, float c, float d, float e, float f) throws DocumentException { @@ -1231,31 +1427,33 @@ public void addImage(Image image, float a, float b, float c, float d, float e, f } /** - * Adds an Image to the page. The positioning of the Image - * is done with the transformation matrix. To position an image at (x,y) - * use addImage(image, image_width, 0, 0, image_height, x, y). The image can be placed inline. - * @param image the Image object - * @param a an element of the transformation matrix - * @param b an element of the transformation matrix - * @param c an element of the transformation matrix - * @param d an element of the transformation matrix - * @param e an element of the transformation matrix - * @param f an element of the transformation matrix + * Adds an Image to the page. The positioning of the Image is done with the transformation + * matrix. To position an image at (x,y) use addImage(image, image_width, 0, 0, image_height, x, y). + * The image can be placed inline. + * + * @param image the Image object + * @param a an element of the transformation matrix + * @param b an element of the transformation matrix + * @param c an element of the transformation matrix + * @param d an element of the transformation matrix + * @param e an element of the transformation matrix + * @param f an element of the transformation matrix * @param inlineImage true to place this image inline, false otherwise * @throws DocumentException on error */ - public void addImage(Image image, float a, float b, float c, float d, float e, float f, boolean inlineImage) throws DocumentException { + public void addImage(Image image, float a, float b, float c, float d, float e, float f, boolean inlineImage) + throws DocumentException { try { - if (image.getLayer() != null) + if (image.getLayer() != null) { beginLayer(image.getLayer()); + } if (image.isImgTemplate()) { writer.addDirectImageSimple(image); PdfTemplate template = image.getTemplateData(); float w = template.getWidth(); float h = template.getHeight(); addTemplate(template, a / w, b / w, c / h, d / h, e, f); - } - else { + } else { content.append("q "); content.append(a).append(' '); content.append(b).append(' '); @@ -1267,7 +1465,7 @@ public void addImage(Image image, float a, float b, float c, float d, float e, f content.append("\nBI\n"); PdfImage pimage = new PdfImage(image, "", null); if (image instanceof ImgJBIG2) { - byte[] globals = ((ImgJBIG2)image).getGlobalBytes(); + byte[] globals = ((ImgJBIG2) image).getGlobalBytes(); if (globals != null) { PdfDictionary decodeparms = new PdfDictionary(); decodeparms.put(PdfName.JBIG2GLOBALS, writer.getReferenceJBIG2Globals(globals)); @@ -1277,8 +1475,9 @@ public void addImage(Image image, float a, float b, float c, float d, float e, f for (PdfName key : pimage.getKeys()) { PdfObject value = pimage.get(key); String s = abrev.get(key); - if (s == null) + if (s == null) { continue; + } content.append(s); boolean check = true; if (key.equals(PdfName.COLORSPACE) && value.isArray()) { @@ -1305,8 +1504,7 @@ public void addImage(Image image, float a, float b, float c, float d, float e, f content.append("ID\n"); pimage.writeContent(content); content.append("\nEI\nQ").append_i(separator); - } - else { + } else { PdfName name; PageResources prs = getPageResources(); Image maskImage = image.getImageMask(); @@ -1327,11 +1525,13 @@ public void addImage(Image image, float a, float b, float c, float d, float e, f rectangle(image); restoreState(); } - if (image.getLayer() != null) + if (image.getLayer() != null) { endLayer(); + } Annotation annot = image.getAnnotation(); - if (annot == null) + if (annot == null) { return; + } float[] r = new float[unitRect.length]; for (int k = 0; k < unitRect.length; k += 2) { r[k] = a * unitRect[k] + c * unitRect[k + 1] + e; @@ -1350,29 +1550,29 @@ public void addImage(Image image, float a, float b, float c, float d, float e, f annot = new Annotation(annot); annot.setDimensions(llx, lly, urx, ury); PdfAnnotation an = PdfAnnotationsImp.convertAnnotation(writer, annot, new Rectangle(llx, lly, urx, ury)); - if (an == null) + if (an == null) { return; + } addAnnotation(an); - } - catch (Exception ee) { + } catch (Exception ee) { throw new DocumentException(ee); } } /** - * Makes this PdfContentByte empty. - * Calls reset( true ) + * Makes this PdfContentByte empty. Calls reset( true ) */ public void reset() { - reset( true ); + reset(true); } /** * Makes this PdfContentByte empty. + * * @param validateContent will call sanityCheck() if true. * @since 2.1.6 */ - public void reset( boolean validateContent ) { + public void reset(boolean validateContent) { content.reset(); if (validateContent) { sanityCheck(); @@ -1380,13 +1580,13 @@ public void reset( boolean validateContent ) { state = new GraphicState(); } - /** * Starts the writing of text. */ public void beginText() { if (inText) { - throw new IllegalPdfSyntaxException(MessageLocalization.getComposedMessage("unbalanced.begin.end.text.operators")); + throw new IllegalPdfSyntaxException( + MessageLocalization.getComposedMessage("unbalanced.begin.end.text.operators")); } inText = true; state.xTLM = 0; @@ -1400,7 +1600,8 @@ public void beginText() { */ public void endText() { if (!inText) { - throw new IllegalPdfSyntaxException(MessageLocalization.getComposedMessage("unbalanced.begin.end.text.operators")); + throw new IllegalPdfSyntaxException( + MessageLocalization.getComposedMessage("unbalanced.begin.end.text.operators")); } inText = false; content.append("ET").append_i(separator); @@ -1424,8 +1625,10 @@ public void saveState() { public void restoreState() { content.append("Q").append_i(separator); int idx = stateList.size() - 1; - if (idx < 0) - throw new IllegalPdfSyntaxException(MessageLocalization.getComposedMessage("unbalanced.save.restore.state.operators")); + if (idx < 0) { + throw new IllegalPdfSyntaxException( + MessageLocalization.getComposedMessage("unbalanced.save.restore.state.operators")); + } if (stateList.get(idx) != null) { state.restore(stateList.get(idx)); @@ -1433,59 +1636,17 @@ public void restoreState() { stateList.remove(idx); } - /** - * Sets the character spacing parameter. - * - * @param charSpace a parameter - */ - public void setCharacterSpacing(float charSpace) { - if (state != null) state.charSpace = charSpace; - content.append(charSpace).append(" Tc").append_i(separator); - } - - /** - * Sets the word spacing parameter. - * - * @param wordSpace a parameter - */ - public void setWordSpacing(float wordSpace) { - if (state != null) state.wordSpace = wordSpace; - content.append(wordSpace).append(" Tw").append_i(separator); - } - - /** - * Sets the horizontal scaling parameter. - * - * @param scale a parameter - */ - public void setHorizontalScaling(float scale) { - if (state != null) state.scale = scale; - content.append(scale).append(" Tz").append_i(separator); - } - - /** - * Sets the text leading parameter. - *

      - * The leading parameter is measured in text space units. It specifies the vertical distance - * between the baselines of adjacent lines of text.

      - * - * @param leading the new leading - */ - public void setLeading(float leading) { - if (state != null) state.leading = leading; - content.append(leading).append(" TL").append_i(separator); - } - /** * Set the font and the size for the subsequent text writing. * - * @param bf the font + * @param bf the font * @param size the font size in points */ public void setFontAndSize(BaseFont bf, float size) { checkWriter(); if (size < MIN_FONT_SIZE && size > -MIN_FONT_SIZE) { - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("font.size.too.small.1", String.valueOf(size))); + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("font.size.too.small.1", String.valueOf(size))); } state.size = size; state.fontDetails = writer.addSimple(bf); @@ -1498,7 +1659,7 @@ public void setFontAndSize(BaseFont bf, float size) { /** * Sets the text rendering parameter. * - * @param rendering a parameter + * @param rendering a parameter */ public void setTextRenderingMode(int rendering) { content.append(rendering).append(" Tr").append_i(separator); @@ -1506,46 +1667,48 @@ public void setTextRenderingMode(int rendering) { /** * Sets the text rise parameter. - *

      + *

      * This allows to write text in subscript or superscript mode.

      * - * @param rise a parameter + * @param rise a parameter */ public void setTextRise(float rise) { content.append(rise).append(" Ts").append_i(separator); } /** - * A helper to insert into the content stream the text - * converted to bytes according to the font's encoding. + * A helper to insert into the content stream the text converted to bytes according to the font's + * encoding. * * @param text the text to write */ private void showText2(String text) { if (state.fontDetails == null) { - throw new NullPointerException(MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); + throw new NullPointerException( + MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); } byte[] b = state.fontDetails.convertToBytes(text, getPdfDocument().getTextRenderingOptions()); escapeString(b, content); } /** - * Shows the text. - * If applicable, the LayoutProcessor is used + * Shows the text. If applicable, the LayoutProcessor is used * * @param text the text to write */ public void showText(String text) { if (state.fontDetails == null) { - throw new NullPointerException(MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); + throw new NullPointerException( + MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); } BaseFont baseFont = state.fontDetails.getBaseFont(); if (LayoutProcessor.supportsFont(baseFont)) { Point2D corr = LayoutProcessor.showText(this, baseFont, state.size, text); - if (layoutPositionCorrection==null) { + if (layoutPositionCorrection == null) { layoutPositionCorrection = corr; } else { - layoutPositionCorrection.setLocation(layoutPositionCorrection.getX()+corr.getX(), layoutPositionCorrection.getY()+corr.getY()); + layoutPositionCorrection.setLocation(layoutPositionCorrection.getX() + corr.getX(), + layoutPositionCorrection.getY() + corr.getY()); } } else { showTextBasic(text); @@ -1553,8 +1716,7 @@ public void showText(String text) { } /** - * Shows the text. - * LayoutProcessor is not used. + * Shows the text. LayoutProcessor is not used. * * @param text the text to write */ @@ -1563,10 +1725,8 @@ public void showTextBasic(String text) { content.append("Tj").append_i(separator); } - /** - * Shows the glyphs in glyphVector. - * Layout info in glyphVector is ignored + * Shows the glyphs in glyphVector. Layout info in glyphVector is ignored * * @param glyphVector containing the glyphs to write */ @@ -1575,65 +1735,38 @@ public void showText(GlyphVector glyphVector) { } /** - * Shows the glyphVector. - * Layout info in glyphVector is ignored + * Shows the glyphVector. Layout info in glyphVector is ignored * * @param glyphVector containing the glyphs to write - * @param beginIndex index of first glyph - * @param endIndex index of last glyph+1 + * @param beginIndex index of first glyph + * @param endIndex index of last glyph+1 */ public void showText(GlyphVector glyphVector, int beginIndex, int endIndex) { if (state.fontDetails == null) { - throw new NullPointerException(MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); + throw new NullPointerException( + MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); } byte[] b = state.fontDetails.convertToBytes(glyphVector, beginIndex, endIndex); escapeString(b, content); content.append("Tj").append_i(separator); } - /** - * Constructs a kern array for a text in a certain font - * @param text the text - * @param font the font - * @return a PdfTextArray - */ - public static PdfTextArray getKernArray(String text, BaseFont font) { - PdfTextArray pa = new PdfTextArray(); - StringBuilder acc = new StringBuilder(); - int len = text.length() - 1; - char[] c = text.toCharArray(); - if (len >= 0) - acc.append(c, 0, 1); - for (int k = 0; k < len; ++k) { - char c2 = c[k + 1]; - int kern = font.getKerning(c[k], c2); - if (kern == 0) { - acc.append(c2); - } - else { - pa.add(acc.toString()); - acc.setLength(0); - acc.append(c, k + 1, 1); - pa.add(-kern); - } - } - pa.add(acc.toString()); - return pa; - } - /** * Shows the text kerned. * * @param text the text to write */ public void showTextKerned(String text) { - if (state.fontDetails == null) - throw new NullPointerException(MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); + if (state.fontDetails == null) { + throw new NullPointerException( + MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); + } BaseFont bf = state.fontDetails.getBaseFont(); - if (bf.hasKernPairs()) + if (bf.hasKernPairs()) { showText(getKernArray(text, bf)); - else + } else { showText(text); + } } /** @@ -1648,11 +1781,12 @@ public void newlineShowText(String text) { } /** - * Moves to the next line and shows text string, using the given values of the character and word spacing parameters. + * Moves to the next line and shows text string, using the given values of the character and word spacing + * parameters. * - * @param wordSpacing a parameter - * @param charSpacing a parameter - * @param text the text to write + * @param wordSpacing a parameter + * @param charSpacing a parameter + * @param text the text to write */ public void newlineShowText(float wordSpacing, float charSpacing, String text) { state.yTLM -= state.leading; @@ -1668,31 +1802,31 @@ public void newlineShowText(float wordSpacing, float charSpacing, String text) { /** * Changes the text matrix. - *

      + *

      * Remark: this operation also initializes the current point position.

      * - * @param a operand 1,1 in the matrix - * @param b operand 1,2 in the matrix - * @param c operand 2,1 in the matrix - * @param d operand 2,2 in the matrix - * @param x operand 3,1 in the matrix - * @param y operand 3,2 in the matrix + * @param a operand 1,1 in the matrix + * @param b operand 1,2 in the matrix + * @param c operand 2,1 in the matrix + * @param d operand 2,2 in the matrix + * @param x operand 3,1 in the matrix + * @param y operand 3,2 in the matrix */ public void setTextMatrix(float a, float b, float c, float d, float x, float y) { state.xTLM = x; state.yTLM = y; content.append(a).append(' ').append(b).append_i(' ') - .append(c).append_i(' ').append(d).append_i(' ') - .append(x).append_i(' ').append(y).append(" Tm").append_i(separator); + .append(c).append_i(' ').append(d).append_i(' ') + .append(x).append_i(' ').append(y).append(" Tm").append_i(separator); } /** * Changes the text matrix. The first four parameters are {1,0,0,1}. - *

      + *

      * Remark: this operation also initializes the current point position.

      * - * @param x operand 3,1 in the matrix - * @param y operand 3,2 in the matrix + * @param x operand 3,1 in the matrix + * @param y operand 3,2 in the matrix */ public void setTextMatrix(float x, float y) { setTextMatrix(1, 0, 0, 1, x, y); @@ -1701,11 +1835,11 @@ public void setTextMatrix(float x, float y) { /** * Moves to the start of the next line, offset from the start of the current line. * - * @param x x-coordinate of the new current point - * @param y y-coordinate of the new current point + * @param x x-coordinate of the new current point + * @param y y-coordinate of the new current point */ public void moveText(float x, float y) { - if(layoutPositionCorrection != null) { + if (layoutPositionCorrection != null) { x += (float) layoutPositionCorrection.getX(); y += (float) layoutPositionCorrection.getY(); layoutPositionCorrection = null; @@ -1716,10 +1850,10 @@ public void moveText(float x, float y) { /** * Moves to the start of the next line, offset from the start of the current line. * - * @param x x-coordinate of the new current point - * @param y y-coordinate of the new current point + * @param x x-coordinate of the new current point + * @param y y-coordinate of the new current point */ - void moveTextBasic(float x, float y) { + void moveTextBasic(float x, float y) { state.xTLM += x; state.yTLM += y; content.append(x).append(' ').append(y).append(" Td").append_i(separator); @@ -1727,14 +1861,14 @@ void moveTextBasic(float x, float y) { /** * Moves to the start of the next line, offset from the start of the current line. - *

      + *

      * As a side effect, this sets the leading parameter in the text state.

      * - * @param x offset of the new current point - * @param y y-coordinate of the new current point + * @param x offset of the new current point + * @param y y-coordinate of the new current point */ public void moveTextWithLeading(float x, float y) { - if(layoutPositionCorrection != null) { + if (layoutPositionCorrection != null) { x += (float) layoutPositionCorrection.getX(); y += (float) layoutPositionCorrection.getY(); layoutPositionCorrection = null; @@ -1749,7 +1883,9 @@ public void moveTextWithLeading(float x, float y) { * Moves to the start of the next line. */ public void newlineText() { - if (state != null) state.yTLM -= state.leading; + if (state != null) { + state.yTLM -= state.leading; + } content.append("T*").append_i(separator); } @@ -1762,65 +1898,17 @@ int size() { return content.size(); } - /** - * Escapes a byte array according to the PDF conventions. - * - * @param b the byte array to escape - * @return an escaped byte array - */ - static byte[] escapeString(byte[] b) { - ByteBuffer content = new ByteBuffer(); - escapeString(b, content); - return content.toByteArray(); - } - - /** - * Escapes a byte array according to the PDF conventions. - * - * @param b the byte array to escape - * @param content the content - */ - static void escapeString(byte[] b, ByteBuffer content) { - content.append_i('('); - for (byte c : b) { - switch (c) { - case '\r': - content.append("\\r"); - break; - case '\n': - content.append("\\n"); - break; - case '\t': - content.append("\\t"); - break; - case '\b': - content.append("\\b"); - break; - case '\f': - content.append("\\f"); - break; - case '(': - case ')': - case '\\': - content.append_i('\\').append_i(c); - break; - default: - content.append_i(c); - } - } - content.append(")"); - } - /** * Adds a named outline to the document. * * @param outline the outline - * @param name the name for the local destination + * @param name the name for the local destination */ public void addOutline(PdfOutline outline, String name) { checkWriter(); pdf.addOutline(outline, name); } + /** * Gets the root outline. * @@ -1832,12 +1920,10 @@ public PdfOutline getRootOutline() { } /** - * Computes the width of the given string taking in account - * the current values of "Character spacing", "Word Spacing" - * and "Horizontal Scaling". - * The additional spacing is not computed for the last character - * of the string. - * @param text the string to get width of + * Computes the width of the given string taking in account the current values of "Character spacing", "Word + * Spacing" and "Horizontal Scaling". The additional spacing is not computed for the last character of the string. + * + * @param text the string to get width of * @param kerned the kerning option * @return the width */ @@ -1846,24 +1932,28 @@ public float getEffectiveStringWidth(String text, boolean kerned) { BaseFont bf = state.fontDetails.getBaseFont(); float w; - if (kerned) + if (kerned) { w = bf.getWidthPointKerned(text, state.size); - else + } else { w = bf.getWidthPoint(text, state.size); + } if (state.charSpace != 0.0f && text.length() > 1) { - w += state.charSpace * (text.length() -1); + w += state.charSpace * (text.length() - 1); } int ft = bf.getFontType(); - if (state.wordSpace != 0.0f && (ft == BaseFont.FONT_TYPE_T1 || ft == BaseFont.FONT_TYPE_TT || ft == BaseFont.FONT_TYPE_T3)) { - for (int i = 0; i < (text.length() -1); i++) { - if (text.charAt(i) == ' ') + if (state.wordSpace != 0.0f && (ft == BaseFont.FONT_TYPE_T1 || ft == BaseFont.FONT_TYPE_TT + || ft == BaseFont.FONT_TYPE_T3)) { + for (int i = 0; i < (text.length() - 1); i++) { + if (text.charAt(i) == ' ') { w += state.wordSpace; + } } } - if (state.scale != 100.0) + if (state.scale != 100.0) { w = (w * state.scale) / 100.0f; + } //System.out.println("String width = " + Float.toString(w)); return w; @@ -1871,19 +1961,22 @@ public float getEffectiveStringWidth(String text, boolean kerned) { /** * Shows text right, left or center aligned with rotation. + * * @param alignment the alignment can be ALIGN_CENTER, ALIGN_RIGHT or ALIGN_LEFT - * @param text the text to show - * @param x the x pivot position - * @param y the y pivot position - * @param rotation the rotation to be applied in degrees counterclockwise + * @param text the text to show + * @param x the x pivot position + * @param y the y pivot position + * @param rotation the rotation to be applied in degrees counterclockwise */ public void showTextAligned(int alignment, String text, float x, float y, float rotation) { showTextAligned(alignment, text, x, y, rotation, false); } private void showTextAligned(int alignment, String text, float x, float y, float rotation, boolean kerned) { - if (state.fontDetails == null) - throw new NullPointerException(MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); + if (state.fontDetails == null) { + throw new NullPointerException( + MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); + } if (rotation == 0) { switch (alignment) { case ALIGN_CENTER: @@ -1894,164 +1987,82 @@ private void showTextAligned(int alignment, String text, float x, float y, float break; } setTextMatrix(x, y); - if (kerned) + if (kerned) { showTextKerned(text); - else + } else { showText(text); - } - else { + } + } else { double alpha = rotation * Math.PI / 180.0; - float cos = (float)Math.cos(alpha); - float sin = (float)Math.sin(alpha); + float cos = (float) Math.cos(alpha); + float sin = (float) Math.sin(alpha); float len; switch (alignment) { - case ALIGN_CENTER: - len = getEffectiveStringWidth(text, kerned) / 2; - x -= len * cos; - y -= len * sin; - break; - case ALIGN_RIGHT: - len = getEffectiveStringWidth(text, kerned); - x -= len * cos; - y -= len * sin; - break; - } - setTextMatrix(cos, sin, -sin, cos, x, y); - if (kerned) - showTextKerned(text); - else - showText(text); - setTextMatrix(0f, 0f); - } - } - - /** - * Shows text kerned right, left or center aligned with rotation. - * @param alignment the alignment can be ALIGN_CENTER, ALIGN_RIGHT or ALIGN_LEFT - * @param text the text to show - * @param x the x pivot position - * @param y the y pivot position - * @param rotation the rotation to be applied in degrees counterclockwise - */ - public void showTextAlignedKerned(int alignment, String text, float x, float y, float rotation) { - showTextAligned(alignment, text, x, y, rotation, true); - } - - /** - * Concatenate a matrix to the current transformation matrix. - * @param a an element of the transformation matrix - * @param b an element of the transformation matrix - * @param c an element of the transformation matrix - * @param d an element of the transformation matrix - * @param e an element of the transformation matrix - * @param f an element of the transformation matrix - **/ - public void concatCTM(float a, float b, float c, float d, float e, float f) { - content.append(a).append(' ').append(b).append(' ').append(c).append(' '); - content.append(d).append(' ').append(e).append(' ').append(f).append(" cm").append_i(separator); - } - - /** - * Generates an array of bezier curves to draw an arc. - *

      - * (x1, y1) and (x2, y2) are the corners of the enclosing rectangle. - * Angles, measured in degrees, start with 0 to the right (the positive X - * axis) and increase counter-clockwise. The arc extends from startAng - * to startAng+extent. I.e. startAng=0 and extent=180 yields an openside-down - * semi-circle. - *

      - * The resulting coordinates are of the form float[]{x1,y1,x2,y2,x3,y3, x4,y4} - * such that the curve goes from (x1, y1) to (x4, y4) with (x2, y2) and - * (x3, y3) as their respective Bezier control points. - *

      - * Note: this code was taken from ReportLab (www.reportlab.org), an excellent - * PDF generator for Python (BSD license: http://www.reportlab.org/devfaq.html#1.3 ). - * - * @param x1 a corner of the enclosing rectangle - * @param y1 a corner of the enclosing rectangle - * @param x2 a corner of the enclosing rectangle - * @param y2 a corner of the enclosing rectangle - * @param startAng starting angle in degrees - * @param extent angle extent in degrees - * @return a list of float[] with the bezier curves - */ - public static List bezierArc(float x1, float y1, float x2, float y2, float startAng, float extent) { - float tmp; - if (x1 > x2) { - tmp = x1; - x1 = x2; - x2 = tmp; - } - if (y2 > y1) { - tmp = y1; - y1 = y2; - y2 = tmp; - } - - float fragAngle; - int Nfrag; - if (Math.abs(extent) <= 90f) { - fragAngle = extent; - Nfrag = 1; - } - else { - Nfrag = (int)(Math.ceil(Math.abs(extent)/90f)); - fragAngle = extent / Nfrag; - } - float x_cen = (x1+x2)/2f; - float y_cen = (y1+y2)/2f; - float rx = (x2-x1)/2f; - float ry = (y2-y1)/2f; - float halfAng = (float)(fragAngle * Math.PI / 360.); - float kappa = (float)(Math.abs(4. / 3. * (1. - Math.cos(halfAng)) / Math.sin(halfAng))); - List pointList = new ArrayList<>(); - for (int i = 0; i < Nfrag; ++i) { - float theta0 = (float)((startAng + i*fragAngle) * Math.PI / 180.); - float theta1 = (float)((startAng + (i+1)*fragAngle) * Math.PI / 180.); - float cos0 = (float)Math.cos(theta0); - float cos1 = (float)Math.cos(theta1); - float sin0 = (float)Math.sin(theta0); - float sin1 = (float)Math.sin(theta1); - if (fragAngle > 0f) { - pointList.add(new float[]{x_cen + rx * cos0, - y_cen - ry * sin0, - x_cen + rx * (cos0 - kappa * sin0), - y_cen - ry * (sin0 + kappa * cos0), - x_cen + rx * (cos1 + kappa * sin1), - y_cen - ry * (sin1 - kappa * cos1), - x_cen + rx * cos1, - y_cen - ry * sin1}); - } - else { - pointList.add(new float[]{x_cen + rx * cos0, - y_cen - ry * sin0, - x_cen + rx * (cos0 + kappa * sin0), - y_cen - ry * (sin0 - kappa * cos0), - x_cen + rx * (cos1 - kappa * sin1), - y_cen - ry * (sin1 + kappa * cos1), - x_cen + rx * cos1, - y_cen - ry * sin1}); + case ALIGN_CENTER: + len = getEffectiveStringWidth(text, kerned) / 2; + x -= len * cos; + y -= len * sin; + break; + case ALIGN_RIGHT: + len = getEffectiveStringWidth(text, kerned); + x -= len * cos; + y -= len * sin; + break; + } + setTextMatrix(cos, sin, -sin, cos, x, y); + if (kerned) { + showTextKerned(text); + } else { + showText(text); } + setTextMatrix(0f, 0f); } - return pointList; } /** - * Draws a partial ellipse inscribed within the rectangle x1,y1,x2,y2, - * starting at startAng degrees and covering extent degrees. Angles - * start with 0 to the right (+x) and increase counter-clockwise. + * Shows text kerned right, left or center aligned with rotation. * - * @param x1 a corner of the enclosing rectangle - * @param y1 a corner of the enclosing rectangle - * @param x2 a corner of the enclosing rectangle - * @param y2 a corner of the enclosing rectangle + * @param alignment the alignment can be ALIGN_CENTER, ALIGN_RIGHT or ALIGN_LEFT + * @param text the text to show + * @param x the x pivot position + * @param y the y pivot position + * @param rotation the rotation to be applied in degrees counterclockwise + */ + public void showTextAlignedKerned(int alignment, String text, float x, float y, float rotation) { + showTextAligned(alignment, text, x, y, rotation, true); + } + + /** + * Concatenate a matrix to the current transformation matrix. + * + * @param a an element of the transformation matrix + * @param b an element of the transformation matrix + * @param c an element of the transformation matrix + * @param d an element of the transformation matrix + * @param e an element of the transformation matrix + * @param f an element of the transformation matrix + **/ + public void concatCTM(float a, float b, float c, float d, float e, float f) { + content.append(a).append(' ').append(b).append(' ').append(c).append(' '); + content.append(d).append(' ').append(e).append(' ').append(f).append(" cm").append_i(separator); + } + + /** + * Draws a partial ellipse inscribed within the rectangle x1,y1,x2,y2, starting at startAng degrees and covering + * extent degrees. Angles start with 0 to the right (+x) and increase counter-clockwise. + * + * @param x1 a corner of the enclosing rectangle + * @param y1 a corner of the enclosing rectangle + * @param x2 a corner of the enclosing rectangle + * @param y2 a corner of the enclosing rectangle * @param startAng starting angle in degrees - * @param extent angle extent in degrees + * @param extent angle extent in degrees */ public void arc(float x1, float y1, float x2, float y2, float startAng, float extent) { List ar = bezierArc(x1, y1, x2, y2, startAng, extent); - if (ar.isEmpty()) + if (ar.isEmpty()) { return; + } float[] pt = ar.get(0); moveTo(pt[0], pt[1]); for (float[] anAr : ar) { @@ -2075,18 +2086,19 @@ public void ellipse(float x1, float y1, float x2, float y2) { /** * Create a new colored tiling pattern. * - * @param width the width of the pattern + * @param width the width of the pattern * @param height the height of the pattern - * @param xstep the desired horizontal spacing between pattern cells. - * May be either positive or negative, but not zero. - * @param ystep the desired vertical spacing between pattern cells. - * May be either positive or negative, but not zero. + * @param xstep the desired horizontal spacing between pattern cells. May be either positive or negative, but not + * zero. + * @param ystep the desired vertical spacing between pattern cells. May be either positive or negative, but not + * zero. * @return the PdfPatternPainter where the pattern will be created */ public PdfPatternPainter createPattern(float width, float height, float xstep, float ystep) { checkWriter(); - if ( xstep == 0.0f || ystep == 0.0f ) + if (xstep == 0.0f || ystep == 0.0f) { throw new RuntimeException(MessageLocalization.getComposedMessage("xstep.or.ystep.can.not.be.zero")); + } PdfPatternPainter painter = new PdfPatternPainter(writer); painter.setWidth(width); painter.setHeight(height); @@ -2097,9 +2109,9 @@ public PdfPatternPainter createPattern(float width, float height, float xstep, f } /** - * Create a new colored tiling pattern. Variables xstep and ystep are set to the same values - * of width and height. - * @param width the width of the pattern + * Create a new colored tiling pattern. Variables xstep and ystep are set to the same values of width and height. + * + * @param width the width of the pattern * @param height the height of the pattern * @return the PdfPatternPainter where the pattern will be created */ @@ -2110,19 +2122,20 @@ public PdfPatternPainter createPattern(float width, float height) { /** * Create a new uncolored tiling pattern. * - * @param width the width of the pattern + * @param width the width of the pattern * @param height the height of the pattern - * @param xstep the desired horizontal spacing between pattern cells. - * May be either positive or negative, but not zero. - * @param ystep the desired vertical spacing between pattern cells. - * May be either positive or negative, but not zero. - * @param color the default color. Can be null + * @param xstep the desired horizontal spacing between pattern cells. May be either positive or negative, but not + * zero. + * @param ystep the desired vertical spacing between pattern cells. May be either positive or negative, but not + * zero. + * @param color the default color. Can be null * @return the PdfPatternPainter where the pattern will be created */ public PdfPatternPainter createPattern(float width, float height, float xstep, float ystep, Color color) { checkWriter(); - if ( xstep == 0.0f || ystep == 0.0f ) + if (xstep == 0.0f || ystep == 0.0f) { throw new RuntimeException(MessageLocalization.getComposedMessage("xstep.or.ystep.can.not.be.zero")); + } PdfPatternPainter painter = new PdfPatternPainter(writer, color); painter.setWidth(width); painter.setHeight(height); @@ -2133,12 +2146,11 @@ public PdfPatternPainter createPattern(float width, float height, float xstep, f } /** - * Create a new uncolored tiling pattern. - * Variables xstep and ystep are set to the same values - * of width and height. - * @param width the width of the pattern + * Create a new uncolored tiling pattern. Variables xstep and ystep are set to the same values of width and height. + * + * @param width the width of the pattern * @param height the height of the pattern - * @param color the default color. Can be null + * @param color the default color. Can be null * @return the PdfPatternPainter where the pattern will be created */ public PdfPatternPainter createPattern(float width, float height, Color color) { @@ -2147,13 +2159,12 @@ public PdfPatternPainter createPattern(float width, float height, Color color) { /** * Creates a new template. - *

      - * Creates a new template that is nothing more than a form XObject. This template can be included - * in this PdfContentByte or in another template. Templates are only written - * to the output when the document is closed permitting things like showing text in the first page - * that is only defined in the last page. + *

      + * Creates a new template that is nothing more than a form XObject. This template can be included in this + * PdfContentByte or in another template. Templates are only written to the output when the document + * is closed permitting things like showing text in the first page that is only defined in the last page. * - * @param width the bounding box width + * @param width the bounding box width * @param height the bounding box height * @return the created template */ @@ -2173,7 +2184,7 @@ PdfTemplate createTemplate(float width, float height, PdfName forcedName) { /** * Creates a new appearance to be used with form fields. * - * @param width the bounding box width + * @param width the bounding box width * @param height the bounding box height * @return the appearance created */ @@ -2207,12 +2218,12 @@ public void addPSXObject(PdfPSXObject psobject) { * Adds a template to this content. * * @param template the template - * @param a an element of the transformation matrix - * @param b an element of the transformation matrix - * @param c an element of the transformation matrix - * @param d an element of the transformation matrix - * @param e an element of the transformation matrix - * @param f an element of the transformation matrix + * @param a an element of the transformation matrix + * @param b an element of the transformation matrix + * @param c an element of the transformation matrix + * @param d an element of the transformation matrix + * @param e an element of the transformation matrix + * @param f an element of the transformation matrix */ public void addTemplate(PdfTemplate template, float a, float b, float c, float d, float e, float f) { checkWriter(); @@ -2230,7 +2241,8 @@ public void addTemplate(PdfTemplate template, float a, float b, float c, float d content.append(name.getBytes()).append(" Do Q").append_i(separator); } - void addTemplateReference(PdfIndirectReference template, PdfName name, float a, float b, float c, float d, float e, float f) { + void addTemplateReference(PdfIndirectReference template, PdfName name, float a, float b, float c, float d, float e, + float f) { checkWriter(); PageResources prs = getPageResources(); name = prs.addXObject(name, template); @@ -2248,25 +2260,26 @@ void addTemplateReference(PdfIndirectReference template, PdfName name, float a, * Adds a template to this content. * * @param template the template - * @param x the x location of this template - * @param y the y location of this template + * @param x the x location of this template + * @param y the y location of this template */ public void addTemplate(PdfTemplate template, float x, float y) { addTemplate(template, 1, 0, 0, 1, x, y); } - /** + /** * Adds a template to this content using double matrices. * * @param template the template - * @param a an element of the transformation matrix - * @param b an element of the transformation matrix - * @param c an element of the transformation matrix - * @param d an element of the transformation matrix - * @param e an element of the transformation matrix - * @param f an element of the transformation matrix - */ - public void addTemplate(final PdfTemplate template, final double a, final double b, final double c, final double d, final double e, final double f) { + * @param a an element of the transformation matrix + * @param b an element of the transformation matrix + * @param c an element of the transformation matrix + * @param d an element of the transformation matrix + * @param e an element of the transformation matrix + * @param f an element of the transformation matrix + */ + public void addTemplate(final PdfTemplate template, final double a, final double b, final double c, final double d, + final double e, final double f) { checkWriter(); checkNoPattern(template); @@ -2286,41 +2299,41 @@ public void addTemplate(final PdfTemplate template, final double a, final double /** * Changes the current color for filling paths (device dependent colors!). - *

      - * Sets the color space to DeviceCMYK (or the DefaultCMYK color space), - * and sets the color to use for filling paths.

      - *

      - * This method is described in the 'Portable Document Format Reference Manual version 1.3' - * section 8.5.2.1 (page 331).

      - *

      - * Following the PDF manual, each operand must be a number between 0 (no ink) and - * 1 (maximum ink). This method however accepts only integers between 0x00 and 0xFF.

      - * - * @param cyan the intensity of cyan + *

      + * Sets the color space to DeviceCMYK (or the DefaultCMYK color space), and sets the color to use for + * filling paths.

      + *

      + * This method is described in the 'Portable Document Format Reference Manual version 1.3' section 8.5.2.1 (page + * 331).

      + *

      + * Following the PDF manual, each operand must be a number between 0 (no ink) and 1 (maximum ink). This method + * however accepts only integers between 0x00 and 0xFF.

      + * + * @param cyan the intensity of cyan * @param magenta the intensity of magenta - * @param yellow the intensity of yellow - * @param black the intensity of black + * @param yellow the intensity of yellow + * @param black the intensity of black */ public void setCMYKColorFill(int cyan, int magenta, int yellow, int black) { HelperCMYK(cyan, magenta, yellow, black); content.append(" k").append_i(separator); } + /** * Changes the current color for stroking paths (device dependent colors!). - *

      - * Sets the color space to DeviceCMYK (or the DefaultCMYK color space), - * and sets the color to use for stroking paths.

      - *

      - * This method is described in the 'Portable Document Format Reference Manual version 1.3' - * section 8.5.2.1 (page 331).

      - * Following the PDF manual, each operand must be a number between 0 (minimum intensity) and - * 1 (maximum intensity). This method however accepts only integers between 0x00 and 0xFF. - * - * @param cyan the intensity of red + *

      + * Sets the color space to DeviceCMYK (or the DefaultCMYK color space), and sets the color to use for + * stroking paths.

      + *

      + * This method is described in the 'Portable Document Format Reference Manual version 1.3' section 8.5.2.1 (page + * 331).

      Following the PDF manual, each operand must be a number between 0 (minimum intensity) and 1 (maximum + * intensity). This method however accepts only integers between 0x00 and 0xFF. + * + * @param cyan the intensity of red * @param magenta the intensity of green - * @param yellow the intensity of blue - * @param black the intensity of black + * @param yellow the intensity of blue + * @param black the intensity of black */ public void setCMYKColorStroke(int cyan, int magenta, int yellow, int black) { @@ -2330,24 +2343,25 @@ public void setCMYKColorStroke(int cyan, int magenta, int yellow, int black) { /** * Changes the current color for filling paths (device dependent colors!). - *

      - * Sets the color space to DeviceRGB (or the DefaultRGB color space), - * and sets the color to use for filling paths.

      - *

      - * This method is described in the 'Portable Document Format Reference Manual version 1.3' - * section 8.5.2.1 (page 331).

      - *

      - * Following the PDF manual, each operand must be a number between 0 (minimum intensity) and - * 1 (maximum intensity). This method however accepts only integers between 0x00 and 0xFF.

      - * - * @param red the intensity of red + *

      + * Sets the color space to DeviceRGB (or the DefaultRGB color space), and sets the color to use for + * filling paths.

      + *

      + * This method is described in the 'Portable Document Format Reference Manual version 1.3' section 8.5.2.1 (page + * 331).

      + *

      + * Following the PDF manual, each operand must be a number between 0 (minimum intensity) and 1 (maximum intensity). + * This method however accepts only integers between 0x00 and 0xFF.

      + * + * @param red the intensity of red * @param green the intensity of green - * @param blue the intensity of blue + * @param blue the intensity of blue */ public void setRGBColorFill(int red, int green, int blue) { setRGBColorFill(red, green, blue, MAX_COLOR_VALUE); } + public void setRGBColorFill(int red, int green, int blue, int alpha) { saveColorFill(new RGBColor(red, green, blue, alpha)); HelperRGB(red, green, blue); @@ -2356,31 +2370,33 @@ public void setRGBColorFill(int red, int green, int blue, int alpha) { /** * Changes the current color for stroking paths (device dependent colors!). - *

      - * Sets the color space to DeviceRGB (or the DefaultRGB color space), - * and sets the color to use for stroking paths.

      - *

      - * This method is described in the 'Portable Document Format Reference Manual version 1.3' - * section 8.5.2.1 (page 331).

      - * Following the PDF manual, each operand must be a number between 0 (minimum intensity) and - * 1 (maximum intensity). This method however accepts only integers between 0x00 and 0xFF. - * - * @param red the intensity of red + *

      + * Sets the color space to DeviceRGB (or the DefaultRGB color space), and sets the color to use for + * stroking paths.

      + *

      + * This method is described in the 'Portable Document Format Reference Manual version 1.3' section 8.5.2.1 (page + * 331).

      Following the PDF manual, each operand must be a number between 0 (minimum intensity) and 1 (maximum + * intensity). This method however accepts only integers between 0x00 and 0xFF. + * + * @param red the intensity of red * @param green the intensity of green - * @param blue the intensity of blue + * @param blue the intensity of blue */ public void setRGBColorStroke(int red, int green, int blue) { setRGBColorStroke(red, green, blue, MAX_COLOR_VALUE); } + public void setRGBColorStroke(int red, int green, int blue, int alpha) { saveColorStroke(new RGBColor(red, green, blue, alpha)); HelperRGB(red, green, blue); content.append(" RG").append_i(separator); } - /** Sets the stroke color. color can be an + /** + * Sets the stroke color. color can be an * ExtendedColor. + * * @param color the color */ public void setColorStroke(Color color) { @@ -2393,12 +2409,13 @@ public void setColorStroke(Color color) { break; } case ExtendedColor.TYPE_CMYK: { - CMYKColor cmyk = (CMYKColor)color; - setCMYKColorStrokeF(cmyk.getCyan(), cmyk.getMagenta(), cmyk.getYellow(), cmyk.getBlack(), cmyk.getAlpha()); + CMYKColor cmyk = (CMYKColor) color; + setCMYKColorStrokeF(cmyk.getCyan(), cmyk.getMagenta(), cmyk.getYellow(), cmyk.getBlack(), + cmyk.getAlpha()); break; } case ExtendedColor.TYPE_SEPARATION: { - SpotColor spot = (SpotColor)color; + SpotColor spot = (SpotColor) color; setColorStroke(spot.getPdfSpotColor(), spot.getTint()); break; } @@ -2424,11 +2441,15 @@ private void saveColorStroke(ExtendedColor extendedColor) { setGState(gState); lastStrokeAlpha = extendedColor.getAlpha(); } - if (state != null) state.colorStroke = extendedColor; + if (state != null) { + state.colorStroke = extendedColor; + } } - /** Sets the fill color. color can be an + /** + * Sets the fill color. color can be an * ExtendedColor. + * * @param color the color */ public void setColorFill(Color color) { @@ -2442,7 +2463,8 @@ public void setColorFill(Color color) { } case ExtendedColor.TYPE_CMYK: { CMYKColor cmyk = (CMYKColor) color; - setCMYKColorFillF(cmyk.getCyan(), cmyk.getMagenta(), cmyk.getYellow(), cmyk.getBlack(), cmyk.getAlpha() / MAX_INT_COLOR_VALUE); + setCMYKColorFillF(cmyk.getCyan(), cmyk.getMagenta(), cmyk.getYellow(), cmyk.getBlack(), + cmyk.getAlpha() / MAX_INT_COLOR_VALUE); break; } case ExtendedColor.TYPE_SEPARATION: { @@ -2472,17 +2494,20 @@ private void saveColorFill(ExtendedColor extendedColor) { setGState(gState); lastFillAlpha = extendedColor.getAlpha(); } - if (state != null) state.colorFill = extendedColor; + if (state != null) { + state.colorFill = extendedColor; + } } - /** Sets the fill color to a spot color. - * @param sp the spot color - * @param tint the tint for the spot color. 0 is no color and 1 - * is 100% color + /** + * Sets the fill color to a spot color. + * + * @param sp the spot color + * @param tint the tint for the spot color. 0 is no color and 1 is 100% color */ public void setColorFill(PdfSpotColor sp, float tint) { checkWriter(); - saveColorFill(new SpotColor(sp,tint)); + saveColorFill(new SpotColor(sp, tint)); state.colorDetails = writer.addSimple(sp); PageResources prs = getPageResources(); PdfName name = state.colorDetails.getColorName(); @@ -2490,14 +2515,15 @@ public void setColorFill(PdfSpotColor sp, float tint) { content.append(name.getBytes()).append(" cs ").append(tint).append(" scn").append_i(separator); } - /** Sets the stroke color to a spot color. - * @param sp the spot color - * @param tint the tint for the spot color. 0 is no color and 1 - * is 100% color + /** + * Sets the stroke color to a spot color. + * + * @param sp the spot color + * @param tint the tint for the spot color. 0 is no color and 1 is 100% color */ public void setColorStroke(PdfSpotColor sp, float tint) { checkWriter(); - saveColorStroke(new SpotColor(sp,tint)); + saveColorStroke(new SpotColor(sp, tint)); state.colorDetails = writer.addSimple(sp); PageResources prs = getPageResources(); PdfName name = state.colorDetails.getColorName(); @@ -2505,8 +2531,9 @@ public void setColorStroke(PdfSpotColor sp, float tint) { content.append(name.getBytes()).append(" CS ").append(tint).append(" SCN").append_i(separator); } - /** Sets the fill color to a pattern. The pattern can be - * colored or uncolored. + /** + * Sets the fill color to a pattern. The pattern can be colored or uncolored. + * * @param p the pattern */ public void setPatternFill(PdfPatternPainter p) { @@ -2519,29 +2546,32 @@ public void setPatternFill(PdfPatternPainter p) { PageResources prs = getPageResources(); PdfName name = writer.addSimplePattern(p); name = prs.addPattern(name, p.getIndirectReference()); - content.append(PdfName.PATTERN.getBytes()).append(" cs ").append(name.getBytes()).append(" scn").append_i(separator); + content.append(PdfName.PATTERN.getBytes()).append(" cs ").append(name.getBytes()).append(" scn") + .append_i(separator); } - /** Outputs the color values to the content. + /** + * Outputs the color values to the content. + * * @param color The color - * @param tint the tint if it is a spot color, ignored otherwise + * @param tint the tint if it is a spot color, ignored otherwise */ void outputColorNumbers(Color color, float tint) { PdfXConformanceImp.checkPDFXConformance(writer, PdfXConformanceImp.PDFXKEY_COLOR, color); int type = ExtendedColor.getType(color); switch (type) { case ExtendedColor.TYPE_RGB: - content.append((float)(color.getRed()) / MAX_INT_COLOR_VALUE); + content.append((float) (color.getRed()) / MAX_INT_COLOR_VALUE); content.append(' '); - content.append((float)(color.getGreen()) / MAX_INT_COLOR_VALUE); + content.append((float) (color.getGreen()) / MAX_INT_COLOR_VALUE); content.append(' '); - content.append((float)(color.getBlue()) / MAX_INT_COLOR_VALUE); + content.append((float) (color.getBlue()) / MAX_INT_COLOR_VALUE); break; case ExtendedColor.TYPE_GRAY: - content.append(((GrayColor)color).getGray()); + content.append(((GrayColor) color).getGray()); break; case ExtendedColor.TYPE_CMYK: { - CMYKColor cmyk = (CMYKColor)color; + CMYKColor cmyk = (CMYKColor) color; content.append(cmyk.getCyan()).append(' ').append(cmyk.getMagenta()); content.append(' ').append(cmyk.getYellow()).append(' ').append(cmyk.getBlack()); break; @@ -2554,21 +2584,26 @@ void outputColorNumbers(Color color, float tint) { } } - /** Sets the fill color to an uncolored pattern. - * @param p the pattern + /** + * Sets the fill color to an uncolored pattern. + * + * @param p the pattern * @param color the color of the pattern */ public void setPatternFill(PdfPatternPainter p, Color color) { - if (ExtendedColor.getType(color) == ExtendedColor.TYPE_SEPARATION) - setPatternFill(p, color, ((SpotColor)color).getTint()); - else + if (ExtendedColor.getType(color) == ExtendedColor.TYPE_SEPARATION) { + setPatternFill(p, color, ((SpotColor) color).getTint()); + } else { setPatternFill(p, color, 0); + } } - /** Sets the fill color to an uncolored pattern. - * @param p the pattern + /** + * Sets the fill color to an uncolored pattern. + * + * @param p the pattern * @param color the color of the pattern - * @param tint the tint if the color is a spot color, ignored otherwise + * @param tint the tint if the color is a spot color, ignored otherwise */ public void setPatternFill(PdfPatternPainter p, Color color, float tint) { checkWriter(); @@ -2586,26 +2621,32 @@ public void setPatternFill(PdfPatternPainter p, Color color, float tint) { content.append(' ').append(name.getBytes()).append(" scn").append_i(separator); } - /** Sets the stroke color to an uncolored pattern. - * @param p the pattern + /** + * Sets the stroke color to an uncolored pattern. + * + * @param p the pattern * @param color the color of the pattern */ public void setPatternStroke(PdfPatternPainter p, Color color) { - if (ExtendedColor.getType(color) == ExtendedColor.TYPE_SEPARATION) - setPatternStroke(p, color, ((SpotColor)color).getTint()); - else + if (ExtendedColor.getType(color) == ExtendedColor.TYPE_SEPARATION) { + setPatternStroke(p, color, ((SpotColor) color).getTint()); + } else { setPatternStroke(p, color, 0); + } } - /** Sets the stroke color to an uncolored pattern. - * @param p the pattern + /** + * Sets the stroke color to an uncolored pattern. + * + * @param p the pattern * @param color the color of the pattern - * @param tint the tint if the color is a spot color, ignored otherwise + * @param tint the tint if the color is a spot color, ignored otherwise */ public void setPatternStroke(PdfPatternPainter p, Color color, float tint) { checkWriter(); - if (!p.isStencil()) + if (!p.isStencil()) { throw new RuntimeException(MessageLocalization.getComposedMessage("an.uncolored.pattern.was.expected")); + } saveColorStroke(new PatternColor(p)); PageResources prs = getPageResources(); PdfName name = writer.addSimplePattern(p); @@ -2617,8 +2658,9 @@ public void setPatternStroke(PdfPatternPainter p, Color color, float tint) { content.append(' ').append(name.getBytes()).append(" SCN").append_i(separator); } - /** Sets the stroke color to a pattern. The pattern can be - * colored or uncolored. + /** + * Sets the stroke color to a pattern. The pattern can be colored or uncolored. + * * @param p the pattern */ public void setPatternStroke(PdfPatternPainter p) { @@ -2631,11 +2673,13 @@ public void setPatternStroke(PdfPatternPainter p) { PageResources prs = getPageResources(); PdfName name = writer.addSimplePattern(p); name = prs.addPattern(name, p.getIndirectReference()); - content.append(PdfName.PATTERN.getBytes()).append(" CS ").append(name.getBytes()).append(" SCN").append_i(separator); + content.append(PdfName.PATTERN.getBytes()).append(" CS ").append(name.getBytes()).append(" SCN") + .append_i(separator); } /** * Paints using a shading object. + * * @param shading the shading object */ public void paintShading(PdfShading shading) { @@ -2644,12 +2688,14 @@ public void paintShading(PdfShading shading) { PdfName name = prs.addShading(shading.getShadingName(), shading.getShadingReference()); content.append(name.getBytes()).append(" sh").append_i(separator); ColorDetails details = shading.getColorDetails(); - if (details != null) + if (details != null) { prs.addColor(details.getColorName(), details.getIndirectReference()); + } } /** * Paints using a shading pattern. + * * @param shading the shading pattern */ public void paintShading(PdfShadingPattern shading) { @@ -2658,6 +2704,7 @@ public void paintShading(PdfShadingPattern shading) { /** * Sets the shading fill pattern. + * * @param shading the shading pattern */ public void setShadingFill(PdfShadingPattern shading) { @@ -2666,14 +2713,17 @@ public void setShadingFill(PdfShadingPattern shading) { writer.addSimpleShadingPattern(shading); PageResources prs = getPageResources(); PdfName name = prs.addPattern(shading.getPatternName(), shading.getPatternReference()); - content.append(PdfName.PATTERN.getBytes()).append(" cs ").append(name.getBytes()).append(" scn").append_i(separator); + content.append(PdfName.PATTERN.getBytes()).append(" cs ").append(name.getBytes()).append(" scn") + .append_i(separator); ColorDetails details = shading.getColorDetails(); - if (details != null) + if (details != null) { prs.addColor(details.getColorName(), details.getIndirectReference()); + } } /** * Sets the shading stroke pattern + * * @param shading the shading pattern */ public void setShadingStroke(PdfShadingPattern shading) { @@ -2682,27 +2732,34 @@ public void setShadingStroke(PdfShadingPattern shading) { writer.addSimpleShadingPattern(shading); PageResources prs = getPageResources(); PdfName name = prs.addPattern(shading.getPatternName(), shading.getPatternReference()); - content.append(PdfName.PATTERN.getBytes()).append(" CS ").append(name.getBytes()).append(" SCN").append_i(separator); + content.append(PdfName.PATTERN.getBytes()).append(" CS ").append(name.getBytes()).append(" SCN") + .append_i(separator); ColorDetails details = shading.getColorDetails(); - if (details != null) + if (details != null) { prs.addColor(details.getColorName(), details.getIndirectReference()); + } } - /** Check if we have a valid PdfWriter. - * + /** + * Check if we have a valid PdfWriter. */ protected void checkWriter() { - if (writer == null) - throw new NullPointerException(MessageLocalization.getComposedMessage("the.writer.in.pdfcontentbyte.is.null")); + if (writer == null) { + throw new NullPointerException( + MessageLocalization.getComposedMessage("the.writer.in.pdfcontentbyte.is.null")); + } } /** * Show an array of text. + * * @param text array of text */ public void showText(PdfTextArray text) { - if (state.fontDetails == null) - throw new NullPointerException(MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); + if (state.fontDetails == null) { + throw new NullPointerException( + MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text")); + } content.append("["); List arrayList = text.getArrayList(); boolean lastWasNumber = false; @@ -2711,10 +2768,11 @@ public void showText(PdfTextArray text) { showText2((String) obj); lastWasNumber = false; } else { - if (lastWasNumber) + if (lastWasNumber) { content.append(' '); - else + } else { lastWasNumber = true; + } content.append((Float) obj); } } @@ -2723,6 +2781,7 @@ public void showText(PdfTextArray text) { /** * Gets the PdfWriter in use by this object. + * * @return the PdfWriter in use by this object */ public PdfWriter getPdfWriter() { @@ -2731,6 +2790,7 @@ public PdfWriter getPdfWriter() { /** * Gets the PdfDocument in use by this object. + * * @return the PdfDocument in use by this object */ public PdfDocument getPdfDocument() { @@ -2738,22 +2798,23 @@ public PdfDocument getPdfDocument() { } /** - * Implements a link to other part of the document. The jump will - * be made to a local destination with the same name, that must exist. + * Implements a link to other part of the document. The jump will be made to a local destination with the same name, + * that must exist. + * * @param name the name for this link - * @param llx the lower left x corner of the activation area - * @param lly the lower left y corner of the activation area - * @param urx the upper right x corner of the activation area - * @param ury the upper right y corner of the activation area + * @param llx the lower left x corner of the activation area + * @param lly the lower left y corner of the activation area + * @param urx the upper right x corner of the activation area + * @param ury the upper right y corner of the activation area */ public void localGoto(String name, float llx, float lly, float urx, float ury) { pdf.localGoto(name, llx, lly, urx, ury); } /** - * The local destination to where a local goto with the same - * name will jump. - * @param name the name of this local destination + * The local destination to where a local goto with the same name will jump. + * + * @param name the name of this local destination * @param destination the PdfDestination with the jump coordinates * @return true if the local destination was added, * false if a local destination with the same name @@ -2764,8 +2825,8 @@ public boolean localDestination(String name, PdfDestination destination) { } /** - * Gets a duplicate of this PdfContentByte. All - * the members are copied by reference but the buffer stays different. + * Gets a duplicate of this PdfContentByte. All the members are copied by reference but the buffer + * stays different. * * @return a copy of this PdfContentByte */ @@ -2775,12 +2836,13 @@ public PdfContentByte getDuplicate() { /** * Implements a link to another document. + * * @param filename the filename for the remote document - * @param name the name to jump to - * @param llx the lower left x corner of the activation area - * @param lly the lower left y corner of the activation area - * @param urx the upper right x corner of the activation area - * @param ury the upper right y corner of the activation area + * @param name the name to jump to + * @param llx the lower left x corner of the activation area + * @param lly the lower left y corner of the activation area + * @param urx the upper right x corner of the activation area + * @param ury the upper right y corner of the activation area */ public void remoteGoto(String filename, String name, float llx, float lly, float urx, float ury) { pdf.remoteGoto(filename, name, llx, lly, urx, ury); @@ -2788,16 +2850,18 @@ public void remoteGoto(String filename, String name, float llx, float lly, float /** * Implements a link to another document. + * * @param filename the filename for the remote document - * @param page the page to jump to - * @param llx the lower left x corner of the activation area - * @param lly the lower left y corner of the activation area - * @param urx the upper right x corner of the activation area - * @param ury the upper right y corner of the activation area + * @param page the page to jump to + * @param llx the lower left x corner of the activation area + * @param lly the lower left y corner of the activation area + * @param urx the upper right x corner of the activation area + * @param ury the upper right y corner of the activation area */ public void remoteGoto(String filename, int page, float llx, float lly, float urx, float ury) { pdf.remoteGoto(filename, page, llx, lly, urx, ury); } + /** * Adds a round rectangle to the current path. * @@ -2816,8 +2880,9 @@ public void roundRectangle(float x, float y, float w, float h, float r) { y += h; h = -h; } - if (r < 0) + if (r < 0) { r = -r; + } float b = 0.4477f; moveTo(x + r, y); lineTo(x + w - r, y); @@ -2830,57 +2895,78 @@ public void roundRectangle(float x, float y, float w, float h, float r) { curveTo(x, y + r * b, x + r * b, y, x + r, y); } - /** Implements an action in an area. + /** + * Implements an action in an area. + * * @param action the PdfAction - * @param llx the lower left x corner of the activation area - * @param lly the lower left y corner of the activation area - * @param urx the upper right x corner of the activation area - * @param ury the upper right y corner of the activation area + * @param llx the lower left x corner of the activation area + * @param lly the lower left y corner of the activation area + * @param urx the upper right x corner of the activation area + * @param ury the upper right y corner of the activation area */ public void setAction(PdfAction action, float llx, float lly, float urx, float ury) { pdf.setAction(action, llx, lly, urx, ury); } - /** Outputs a String directly to the content. + /** + * Outputs a String directly to the content. + * * @param s the String */ public void setLiteral(String s) { content.append(s); } - /** Outputs a char directly to the content. + /** + * Outputs a char directly to the content. + * * @param c the char */ public void setLiteral(char c) { content.append(c); } - /** Outputs a float directly to the content. + /** + * Outputs a float directly to the content. + * * @param n the float */ public void setLiteral(float n) { content.append(n); } - /** Throws an error if it is a pattern. + /** + * Throws an error if it is a pattern. + * * @param t the object to check */ void checkNoPattern(PdfTemplate t) { - if (t.getType() == PdfTemplate.TYPE_PATTERN) - throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.use.of.a.pattern.a.template.was.expected")); + if (t.getType() == PdfTemplate.TYPE_PATTERN) { + throw new RuntimeException( + MessageLocalization.getComposedMessage("invalid.use.of.a.pattern.a.template.was.expected")); + } } /** * Draws a TextField. + * * @param llx lower-left-x * @param lly lower-left-y * @param urx upper-right-x * @param ury upper-right-y - * @param on if radio is selected or not + * @param on if radio is selected or not */ public void drawRadioField(float llx, float lly, float urx, float ury, boolean on) { - if (llx > urx) { float x = llx; llx = urx; urx = x; } - if (lly > ury) { float y = lly; lly = ury; ury = y; } + if (llx > urx) { + float x = llx; + llx = urx; + urx = x; + } + if (lly > ury) { + float y = lly; + lly = ury; + ury = y; + } // silver circle saveState(); setLineWidth(1); @@ -2913,14 +2999,23 @@ public void drawRadioField(float llx, float lly, float urx, float ury, boolean o /** * Draws a TextField. + * * @param llx lower-left-x * @param lly lower-left-y * @param urx upper-right-x * @param ury upper-right-y */ public void drawTextField(float llx, float lly, float urx, float ury) { - if (llx > urx) { float x = llx; llx = urx; urx = x; } - if (lly > ury) { float y = lly; lly = ury; ury = y; } + if (llx > urx) { + float x = llx; + llx = urx; + urx = x; + } + if (lly > ury) { + float y = lly; + lly = ury; + ury = y; + } // silver rectangle not filled saveState(); setColorStroke(new Color(0xC0, 0xC0, 0xC0)); @@ -2932,7 +3027,7 @@ public void drawTextField(float llx, float lly, float urx, float ury) { setLineWidth(1); setLineCap(0); setColorFill(new Color(MAX_COLOR_VALUE, MAX_COLOR_VALUE, MAX_COLOR_VALUE)); - rectangle(llx + 0.5f, lly + 0.5f, urx - llx - 1f, ury -lly - 1f); + rectangle(llx + 0.5f, lly + 0.5f, urx - llx - 1f, ury - lly - 1f); fill(); // silver lines setColorStroke(new Color(0xC0, 0xC0, 0xC0)); @@ -2963,17 +3058,26 @@ public void drawTextField(float llx, float lly, float urx, float ury) { /** * Draws a button. - * @param llx lower-left-x - * @param lly lower-left-y - * @param urx upper-right-x - * @param ury upper-right-y + * + * @param llx lower-left-x + * @param lly lower-left-y + * @param urx upper-right-x + * @param ury upper-right-y * @param text text - * @param bf {@link BaseFont} + * @param bf {@link BaseFont} * @param size size */ public void drawButton(float llx, float lly, float urx, float ury, String text, BaseFont bf, float size) { - if (llx > urx) { float x = llx; llx = urx; urx = x; } - if (lly > ury) { float y = lly; lly = ury; ury = y; } + if (llx > urx) { + float x = llx; + llx = urx; + urx = x; + } + if (lly > ury) { + float y = lly; + lly = ury; + ury = y; + } // black rectangle not filled saveState(); setColorStroke(new Color(0x00, 0x00, 0x00)); @@ -2985,7 +3089,7 @@ public void drawButton(float llx, float lly, float urx, float ury, String text, setLineWidth(1); setLineCap(0); setColorFill(new Color(0xC0, 0xC0, 0xC0)); - rectangle(llx + 0.5f, lly + 0.5f, urx - llx - 1f, ury -lly - 1f); + rectangle(llx + 0.5f, lly + 0.5f, urx - llx - 1f, ury - lly - 1f); fill(); // white lines setColorStroke(new Color(MAX_COLOR_VALUE, MAX_COLOR_VALUE, MAX_COLOR_VALUE)); @@ -3012,9 +3116,11 @@ public void drawButton(float llx, float lly, float urx, float ury, String text, restoreState(); } - /** Gets a Graphics2D to write on. The graphics - * are translated to PDF commands as shapes. No PDF fonts will appear. - * @param width the width of the panel + /** + * Gets a Graphics2D to write on. The graphics are translated to PDF commands as shapes. No PDF fonts + * will appear. + * + * @param width the width of the panel * @param height the height of the panel * @return a Graphics2D */ @@ -3022,10 +3128,12 @@ public java.awt.Graphics2D createGraphicsShapes(float width, float height) { return new PdfGraphics2D(this, width, height, null, true, false, 0); } - /** Gets a Graphics2D to print on. The graphics - * are translated to PDF commands as shapes. No PDF fonts will appear. - * @param width the width of the panel - * @param height the height of the panel + /** + * Gets a Graphics2D to print on. The graphics are translated to PDF commands as shapes. No PDF fonts + * will appear. + * + * @param width the width of the panel + * @param height the height of the panel * @param printerJob a printer job * @return a Graphics2D */ @@ -3033,9 +3141,10 @@ public java.awt.Graphics2D createPrinterGraphicsShapes(float width, float height return new PdfPrinterGraphics2D(this, width, height, null, true, false, 0, printerJob); } - /** Gets a Graphics2D to write on. The graphics - * are translated to PDF commands. - * @param width the width of the panel + /** + * Gets a Graphics2D to write on. The graphics are translated to PDF commands. + * + * @param width the width of the panel * @param height the height of the panel * @return a Graphics2D */ @@ -3043,10 +3152,11 @@ public java.awt.Graphics2D createGraphics(float width, float height) { return new PdfGraphics2D(this, width, height, null, false, false, 0); } - /** Gets a Graphics2D to print on. The graphics - * are translated to PDF commands. - * @param width width of the panel - * @param height height of the panel + /** + * Gets a Graphics2D to print on. The graphics are translated to PDF commands. + * + * @param width width of the panel + * @param height height of the panel * @param printerJob {@link PrinterJob} * @return a Graphics2D */ @@ -3054,60 +3164,68 @@ public java.awt.Graphics2D createPrinterGraphics(float width, float height, Prin return new PdfPrinterGraphics2D(this, width, height, null, false, false, 0, printerJob); } - /** Gets a Graphics2D to write on. The graphics - * are translated to PDF commands. - * @param width width of the panel - * @param height height of the panel + /** + * Gets a Graphics2D to write on. The graphics are translated to PDF commands. + * + * @param width width of the panel + * @param height height of the panel * @param convertImagesToJPEG if convert images to JPEG - * @param quality quality fo the print + * @param quality quality fo the print * @return a Graphics2D */ public java.awt.Graphics2D createGraphics(float width, float height, boolean convertImagesToJPEG, float quality) { return new PdfGraphics2D(this, width, height, null, false, convertImagesToJPEG, quality); } - /** Gets a Graphics2D to print on. The graphics - * are translated to PDF commands. - * @param width width of the panel - * @param height height of the panel + /** + * Gets a Graphics2D to print on. The graphics are translated to PDF commands. + * + * @param width width of the panel + * @param height height of the panel * @param convertImagesToJPEG if convert images to JPEG - * @param quality quality fo the print - * @param printerJob {@link PrinterJob} + * @param quality quality fo the print + * @param printerJob {@link PrinterJob} * @return a Graphics2D */ - public java.awt.Graphics2D createPrinterGraphics(float width, float height, boolean convertImagesToJPEG, float quality, PrinterJob printerJob) { + public java.awt.Graphics2D createPrinterGraphics(float width, float height, boolean convertImagesToJPEG, + float quality, PrinterJob printerJob) { return new PdfPrinterGraphics2D(this, width, height, null, false, convertImagesToJPEG, quality, printerJob); } - /** Gets a Graphics2D to print on. The graphics - * are translated to PDF commands. - * @param width width of the panel - * @param height height of the panel + /** + * Gets a Graphics2D to print on. The graphics are translated to PDF commands. + * + * @param width width of the panel + * @param height height of the panel * @param convertImagesToJPEG if convert images to JPEG - * @param quality quality fo the print + * @param quality quality fo the print * @return A Graphics2D object */ - public java.awt.Graphics2D createGraphicsShapes(float width, float height, boolean convertImagesToJPEG, float quality) { + public java.awt.Graphics2D createGraphicsShapes(float width, float height, boolean convertImagesToJPEG, + float quality) { return new PdfGraphics2D(this, width, height, null, true, convertImagesToJPEG, quality); } - /** Gets a Graphics2D to print on. The graphics - * are translated to PDF commands. - * @param width width of the panel - * @param height height of the panel + /** + * Gets a Graphics2D to print on. The graphics are translated to PDF commands. + * + * @param width width of the panel + * @param height height of the panel * @param convertImagesToJPEG if convert images to JPEG - * @param quality quality fo the print - * @param printerJob {@link PrinterJob} + * @param quality quality fo the print + * @param printerJob {@link PrinterJob} * @return a Graphics2D object */ - public java.awt.Graphics2D createPrinterGraphicsShapes(float width, float height, boolean convertImagesToJPEG, float quality, PrinterJob printerJob) { + public java.awt.Graphics2D createPrinterGraphicsShapes(float width, float height, boolean convertImagesToJPEG, + float quality, PrinterJob printerJob) { return new PdfPrinterGraphics2D(this, width, height, null, true, convertImagesToJPEG, quality, printerJob); } - /** Gets a Graphics2D to write on. The graphics - * are translated to PDF commands. - * @param width the width of the panel - * @param height the height of the panel + /** + * Gets a Graphics2D to write on. The graphics are translated to PDF commands. + * + * @param width the width of the panel + * @param height the height of the panel * @param fontMapper the mapping from awt fonts to BaseFont * @return a Graphics2D */ @@ -3115,81 +3233,96 @@ public java.awt.Graphics2D createGraphics(float width, float height, FontMapper return new PdfGraphics2D(this, width, height, fontMapper, false, false, 0); } - /** Gets a Graphics2D to print on. The graphics - * are translated to PDF commands. - * @param width the width of the panel - * @param height the height of the panel + /** + * Gets a Graphics2D to print on. The graphics are translated to PDF commands. + * + * @param width the width of the panel + * @param height the height of the panel * @param fontMapper the mapping from awt fonts to BaseFont * @param printerJob a printer job * @return a Graphics2D */ - public java.awt.Graphics2D createPrinterGraphics(float width, float height, FontMapper fontMapper, PrinterJob printerJob) { + public java.awt.Graphics2D createPrinterGraphics(float width, float height, FontMapper fontMapper, + PrinterJob printerJob) { return new PdfPrinterGraphics2D(this, width, height, fontMapper, false, false, 0, printerJob); } - /** Gets a Graphics2D to write on. The graphics - * are translated to PDF commands. - * @param width the width of the panel - * @param height the height of the panel - * @param fontMapper the mapping from awt fonts to BaseFont + /** + * Gets a Graphics2D to write on. The graphics are translated to PDF commands. + * + * @param width the width of the panel + * @param height the height of the panel + * @param fontMapper the mapping from awt fonts to BaseFont * @param convertImagesToJPEG converts awt images to jpeg before inserting in pdf - * @param quality the quality of the jpeg + * @param quality the quality of the jpeg * @return a Graphics2D */ - public java.awt.Graphics2D createGraphics(float width, float height, FontMapper fontMapper, boolean convertImagesToJPEG, float quality) { + public java.awt.Graphics2D createGraphics(float width, float height, FontMapper fontMapper, + boolean convertImagesToJPEG, float quality) { return new PdfGraphics2D(this, width, height, fontMapper, false, convertImagesToJPEG, quality); } - /** Gets a Graphics2D to print on. The graphics - * are translated to PDF commands. - * @param width the width of the panel - * @param height the height of the panel - * @param fontMapper the mapping from awt fonts to BaseFont + /** + * Gets a Graphics2D to print on. The graphics are translated to PDF commands. + * + * @param width the width of the panel + * @param height the height of the panel + * @param fontMapper the mapping from awt fonts to BaseFont * @param convertImagesToJPEG converts awt images to jpeg before inserting in pdf - * @param quality the quality of the jpeg - * @param printerJob a printer job + * @param quality the quality of the jpeg + * @param printerJob a printer job * @return a Graphics2D */ - public java.awt.Graphics2D createPrinterGraphics(float width, float height, FontMapper fontMapper, boolean convertImagesToJPEG, float quality, PrinterJob printerJob) { - return new PdfPrinterGraphics2D(this, width, height, fontMapper, false, convertImagesToJPEG, quality, printerJob); + public java.awt.Graphics2D createPrinterGraphics(float width, float height, FontMapper fontMapper, + boolean convertImagesToJPEG, float quality, PrinterJob printerJob) { + return new PdfPrinterGraphics2D(this, width, height, fontMapper, false, convertImagesToJPEG, quality, + printerJob); } PageResources getPageResources() { return pdf.getPageResources(); } - /** Sets the graphic state + /** + * Sets the graphic state + * * @param gstate the graphic state */ public void setGState(PdfGState gstate) { - if (writer == null) return; + if (writer == null) { + return; + } PdfObject[] obj = writer.addSimpleExtGState(gstate); PageResources prs = getPageResources(); - PdfName name = prs.addExtGState((PdfName)obj[0], (PdfIndirectReference)obj[1]); - if (state != null) state.extGState = gstate; + PdfName name = prs.addExtGState((PdfName) obj[0], (PdfIndirectReference) obj[1]); + if (state != null) { + state.extGState = gstate; + } content.append(name.getBytes()).append(" gs").append_i(separator); } /** - * Begins a graphic block whose visibility is controlled by the layer. - * Blocks can be nested. Each block must be terminated by an {@link #endLayer()}.

      - * Note that nested layers with {@link PdfLayer#addChild(PdfLayer)} only require a single - * call to this method and a single call to {@link #endLayer()}; all the nesting control - * is built in. + * Begins a graphic block whose visibility is controlled by the layer. Blocks can be nested. Each block + * must be terminated by an {@link #endLayer()}.

      Note that nested layers with {@link PdfLayer#addChild(PdfLayer)} + * only require a single call to this method and a single call to {@link #endLayer()}; all the nesting control is + * built in. + * * @param layer the layer */ public void beginLayer(PdfOCG layer) { - if ((layer instanceof PdfLayer) && ((PdfLayer)layer).getTitle() != null) + if ((layer instanceof PdfLayer) && ((PdfLayer) layer).getTitle() != null) { throw new IllegalArgumentException(MessageLocalization.getComposedMessage("a.title.is.not.a.layer")); - if (layerDepth == null) + } + if (layerDepth == null) { layerDepth = new ArrayList<>(); + } if (layer instanceof PdfLayerMembership) { layerDepth.add(1); beginLayer2(layer); return; } int n = 0; - PdfLayer la = (PdfLayer)layer; + PdfLayer la = (PdfLayer) layer; while (la != null) { if (la.getTitle() == null) { beginLayer2(la); @@ -3201,7 +3334,7 @@ public void beginLayer(PdfOCG layer) { } private void beginLayer2(PdfOCG layer) { - PdfName name = (PdfName)writer.addSimpleProperty(layer, layer.getRef())[0]; + PdfName name = (PdfName) writer.addSimpleProperty(layer, layer.getRef())[0]; PageResources prs = getPageResources(); name = prs.addProperty(name, layer.getRef()); content.append("/OC ").append(name.getBytes()).append(" BDC").append_i(separator); @@ -3218,12 +3351,14 @@ public void endLayer() { } else { throw new IllegalPdfSyntaxException(MessageLocalization.getComposedMessage("unbalanced.layer.operators")); } - while (n-- > 0) + while (n-- > 0) { content.append("EMC").append_i(separator); + } } - /** Concatenates a transformation to the current transformation - * matrix. + /** + * Concatenates a transformation to the current transformation matrix. + * * @param af the transformation */ public void transform(AffineTransform af) { @@ -3239,9 +3374,11 @@ void addAnnotation(PdfAnnotation annot) { /** * Sets the default colorspace. - * @param name the name of the colorspace. It can be PdfName.DEFAULTGRAY, PdfName.DEFAULTRGB - * or PdfName.DEFAULTCMYK - * @param obj the colorspace. A null or PdfNull removes any colorspace with the same name + * + * @param name the name of the colorspace. It can be PdfName.DEFAULTGRAY, + * PdfName.DEFAULTRGB or PdfName.DEFAULTCMYK + * @param obj the colorspace. A null or PdfNull removes any colorspace with the same + * name */ public void setDefaultColorspace(PdfName name, PdfObject obj) { PageResources prs = getPageResources(); @@ -3249,9 +3386,10 @@ public void setDefaultColorspace(PdfName name, PdfObject obj) { } /** - * Begins a marked content sequence. This sequence will be tagged with the structure struc. - * The same structure can be used several times to connect text that belongs to the same logical segment - * but is in a different location, like the same paragraph crossing to another page, for example. + * Begins a marked content sequence. This sequence will be tagged with the structure struc. The same + * structure can be used several times to connect text that belongs to the same logical segment but is in a + * different location, like the same paragraph crossing to another page, for example. + * * @param struc the tagging structure */ public void beginMarkedContentSequence(PdfStructureElement struc) { @@ -3268,21 +3406,22 @@ public void beginMarkedContentSequence(PdfStructureElement struc, PdfDictionary ar = new PdfArray(); ar.add(obj); struc.put(PdfName.K, ar); + } else if (obj.isArray()) { + ar = (PdfArray) obj; + if (!(ar.getPdfObject(0)).isNumber()) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("the.structure.has.kids")); + } + } else { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("unknown.object.at.k.1", obj.getClass().toString())); } - else if (obj.isArray()) { - ar = (PdfArray)obj; - if (!(ar.getPdfObject(0)).isNumber()) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.structure.has.kids")); - } - else - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("unknown.object.at.k.1", obj.getClass().toString())); PdfDictionary dic = new PdfDictionary(PdfName.MCR); dic.put(PdfName.PG, writer.getCurrentPage()); dic.put(PdfName.MCID, new PdfNumber(mark)); ar.add(dic); struc.setPageMark(writer.getPageNumber() - 1, -1); - } - else { + } else { struc.setPageMark(writer.getPageNumber() - 1, mark); struc.put(PdfName.PG, writer.getCurrentPage()); } @@ -3292,8 +3431,7 @@ else if (obj.isArray()) { content.append(struc.get(PdfName.S).getBytes()).append(" "); try { dict.toPdf(writer, content); - } - catch (IOException e) { + } catch (IOException e) { throw new ExceptionConverter(e); } content.append(" BDC").append_i(separator); @@ -3304,7 +3442,8 @@ else if (obj.isArray()) { */ public void endMarkedContentSequence() { if (mcDepth == 0) { - throw new IllegalPdfSyntaxException(MessageLocalization.getComposedMessage("unbalanced.begin.end.marked.content.operators")); + throw new IllegalPdfSyntaxException( + MessageLocalization.getComposedMessage("unbalanced.begin.end.marked.content.operators")); } --mcDepth; content.append("EMC").append_i(separator); @@ -3313,10 +3452,11 @@ public void endMarkedContentSequence() { /** * Begins a marked content sequence. If property is null the mark will be of the type * BMC otherwise it will be BDC. - * @param tag the tag + * + * @param tag the tag * @param property the property - * @param inline true to include the property in the content or false - * to include the property in the resource dictionary with the possibility of reusing + * @param inline true to include the property in the content or false + * to include the property in the resource dictionary with the possibility of reusing */ public void beginMarkedContentSequence(PdfName tag, PdfDictionary property, boolean inline) { if (property == null) { @@ -3331,10 +3471,11 @@ public void beginMarkedContentSequence(PdfName tag, PdfDictionary property, bool } } else { PdfObject[] objs; - if (writer.propertyExists(property)) + if (writer.propertyExists(property)) { objs = writer.addSimpleProperty(property, null); - else + } else { objs = writer.addSimpleProperty(property, writer.getPdfIndirectReference()); + } PdfName name = (PdfName) objs[0]; PageResources prs = getPageResources(); name = prs.addProperty(name, (PdfIndirectReference) objs[1]); @@ -3347,6 +3488,7 @@ public void beginMarkedContentSequence(PdfName tag, PdfDictionary property, bool /** * This is just a shorthand to beginMarkedContentSequence(tag, null, false). + * * @param tag the tag */ public void beginMarkedContentSequence(PdfName tag) { @@ -3354,28 +3496,102 @@ public void beginMarkedContentSequence(PdfName tag) { } /** - * Checks for any dangling state: Mismatched save/restore state, begin/end text, - * begin/end layer, or begin/end marked content sequence. - * If found, this function will throw. This function is called automatically - * during a reset() (from Document.newPage() for example), and before writing - * itself out in toPdf(). - * One possible cause: not calling myPdfGraphics2D.dispose() will leave dangling - * saveState() calls. - * @since 2.1.6 + * Checks for any dangling state: Mismatched save/restore state, begin/end text, begin/end layer, or begin/end + * marked content sequence. If found, this function will throw. This function is called automatically during a + * reset() (from Document.newPage() for example), and before writing itself out in toPdf(). One possible cause: not + * calling myPdfGraphics2D.dispose() will leave dangling saveState() calls. + * * @throws IllegalPdfSyntaxException (a runtime exception) + * @since 2.1.6 */ public void sanityCheck() { if (mcDepth != 0) { - throw new IllegalPdfSyntaxException(MessageLocalization.getComposedMessage("unbalanced.marked.content.operators")); + throw new IllegalPdfSyntaxException( + MessageLocalization.getComposedMessage("unbalanced.marked.content.operators")); } if (inText) { - throw new IllegalPdfSyntaxException(MessageLocalization.getComposedMessage("unbalanced.begin.end.text.operators")); + throw new IllegalPdfSyntaxException( + MessageLocalization.getComposedMessage("unbalanced.begin.end.text.operators")); } if (layerDepth != null && !layerDepth.isEmpty()) { throw new IllegalPdfSyntaxException(MessageLocalization.getComposedMessage("unbalanced.layer.operators")); } if (!stateList.isEmpty()) { - throw new IllegalPdfSyntaxException(MessageLocalization.getComposedMessage("unbalanced.save.restore.state.operators")); + throw new IllegalPdfSyntaxException( + MessageLocalization.getComposedMessage("unbalanced.save.restore.state.operators")); + } + } + + /** + * This class keeps the graphic state of the current page + */ + + static class GraphicState { + + /** + * The x position of the text line matrix. + */ + protected float xTLM = 0; + /** + * The y position of the text line matrix. + */ + protected float yTLM = 0; + /** + * The current text leading. + */ + protected float leading = 0; + /** + * The current horizontal scaling + */ + protected float scale = 100; + /** + * The current character spacing + */ + protected float charSpace = 0; + /** + * The current word spacing + */ + protected float wordSpace = 0; + protected ExtendedColor colorFill = GrayColor.GRAYBLACK; + protected ExtendedColor colorStroke = GrayColor.GRAYBLACK; + protected PdfObject extGState = null; + /** + * This is the font in use + */ + FontDetails fontDetails; + /** + * This is the color in use + */ + ColorDetails colorDetails; + /** + * This is the font size in use + */ + float size; + + GraphicState() { + } + + GraphicState(GraphicState cp) { + copyParameters(cp); + } + + void copyParameters(final GraphicState cp) { + fontDetails = cp.fontDetails; + colorDetails = cp.colorDetails; + size = cp.size; + xTLM = cp.xTLM; + yTLM = cp.yTLM; + leading = cp.leading; + scale = cp.scale; + charSpace = cp.charSpace; + wordSpace = cp.wordSpace; + colorFill = cp.colorFill; + colorStroke = cp.colorStroke; + extGState = cp.extGState; + } + + void restore(final GraphicState restore) { + copyParameters(restore); } } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentParser.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentParser.java index 63ea77e4d..9ed8d8c55 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentParser.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentParser.java @@ -49,43 +49,45 @@ package com.lowagie.text.pdf; +import com.lowagie.text.error_messages.MessageLocalization; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import com.lowagie.text.error_messages.MessageLocalization; /** * Parses the page or template content. + * * @author Paulo Soares (psoares@consiste.pt) */ public class PdfContentParser { - + /** * Commands have this type. - */ + */ public static final int COMMAND_TYPE = 200; /** * Holds value of property tokeniser. */ - private PRTokeniser tokeniser; - + private PRTokeniser tokeniser; + /** * Creates a new instance of PdfContentParser + * * @param tokeniser the tokeniser with the content */ public PdfContentParser(PRTokeniser tokeniser) { this.tokeniser = tokeniser; } - + /** - * Parses a single command from the content. Each command is output as an array of arguments - * having the command itself as the last element. The returned array will be empty if the - * end of content was reached. + * Parses a single command from the content. Each command is output as an array of arguments having the command + * itself as the last element. The returned array will be empty if the end of content was reached. + * * @param ls an ArrayList to use. It will be cleared before using. If it's - * null will create a new ArrayList + * null will create a new ArrayList * @return the same ArrayList given as argument or a new one * @throws IOException on error - */ + */ public List parse(List ls) throws IOException { if (ls == null) { ls = new ArrayList<>(); @@ -101,76 +103,89 @@ public List parse(List ls) throws IOException { } return ls; } - + /** * Gets the tokeniser. + * * @return the tokeniser. */ public PRTokeniser getTokeniser() { return this.tokeniser; } - + /** * Sets the tokeniser. + * * @param tokeniser the tokeniser */ public void setTokeniser(PRTokeniser tokeniser) { this.tokeniser = tokeniser; } - + /** * Reads a dictionary. The tokeniser must be positioned past the "<<" token. + * * @return the dictionary * @throws IOException on error - */ + */ public PdfDictionary readDictionary() throws IOException { PdfDictionary dic = new PdfDictionary(); while (true) { - if (!nextValidToken()) + if (!nextValidToken()) { throw new IOException(MessageLocalization.getComposedMessage("unexpected.end.of.file")); - if (tokeniser.getTokenType() == PRTokeniser.TK_END_DIC) - break; - if (tokeniser.getTokenType() != PRTokeniser.TK_NAME) - throw new IOException(MessageLocalization.getComposedMessage("dictionary.key.is.not.a.name")); - PdfName name = new PdfName(tokeniser.getStringValue(), false); - PdfObject obj = readPRObject(); - int type = obj.type(); - if (-type == PRTokeniser.TK_END_DIC) - throw new IOException(MessageLocalization.getComposedMessage("unexpected.gt.gt")); - if (-type == PRTokeniser.TK_END_ARRAY) - throw new IOException(MessageLocalization.getComposedMessage("unexpected.close.bracket")); - dic.put(name, obj); + } + if (tokeniser.getTokenType() == PRTokeniser.TK_END_DIC) { + break; + } + if (tokeniser.getTokenType() != PRTokeniser.TK_NAME) { + throw new IOException(MessageLocalization.getComposedMessage("dictionary.key.is.not.a.name")); + } + PdfName name = new PdfName(tokeniser.getStringValue(), false); + PdfObject obj = readPRObject(); + int type = obj.type(); + if (-type == PRTokeniser.TK_END_DIC) { + throw new IOException(MessageLocalization.getComposedMessage("unexpected.gt.gt")); + } + if (-type == PRTokeniser.TK_END_ARRAY) { + throw new IOException(MessageLocalization.getComposedMessage("unexpected.close.bracket")); + } + dic.put(name, obj); } return dic; } - + /** * Reads an array. The tokeniser must be positioned past the "[" token. + * * @return an array * @throws IOException on error - */ + */ public PdfArray readArray() throws IOException { PdfArray array = new PdfArray(); while (true) { PdfObject obj = readPRObject(); int type = obj.type(); - if (-type == PRTokeniser.TK_END_ARRAY) + if (-type == PRTokeniser.TK_END_ARRAY) { break; - if (-type == PRTokeniser.TK_END_DIC) + } + if (-type == PRTokeniser.TK_END_DIC) { throw new IOException(MessageLocalization.getComposedMessage("unexpected.gt.gt")); + } array.add(obj); } return array; } - + /** * Reads a pdf object. + * * @return the pdf object * @throws IOException on error - */ + */ public PdfObject readPRObject() throws IOException { - if (!nextValidToken()) + if (!nextValidToken()) { return null; + } int type = tokeniser.getTokenType(); switch (type) { case PRTokeniser.TK_START_DIC: { @@ -192,16 +207,18 @@ public PdfObject readPRObject() throws IOException { return new PdfLiteral(-type, tokeniser.getStringValue()); } } - + /** * Reads the next token skipping over the comments. + * * @return true if a token was read, false if the end of content was reached * @throws IOException on error - */ + */ public boolean nextValidToken() throws IOException { while (tokeniser.nextToken()) { - if (tokeniser.getTokenType() == PRTokeniser.TK_COMMENT) + if (tokeniser.getTokenType() == PRTokeniser.TK_COMMENT) { continue; + } return true; } return false; diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContents.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContents.java index 3697d2a4d..39b0fdf95 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContents.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContents.java @@ -49,17 +49,17 @@ package com.lowagie.text.pdf; +import com.lowagie.text.DocWriter; +import com.lowagie.text.Document; +import com.lowagie.text.Rectangle; import java.io.ByteArrayOutputStream; import java.io.OutputStream; import java.util.zip.Deflater; import java.util.zip.DeflaterOutputStream; -import com.lowagie.text.DocWriter; -import com.lowagie.text.Document; -import com.lowagie.text.Rectangle; - /** - * PdfContents is a PdfStream containing the contents (text + graphics) of a PdfPage. + * PdfContents is a PdfStream containing the contents (text + graphics) of a + * PdfPage. */ class PdfContents extends PdfStream { @@ -71,32 +71,32 @@ class PdfContents extends PdfStream { static final byte[] ROTATE270 = DocWriter.getISOBytes("0 -1 1 0 "); static final byte[] ROTATEFINAL = DocWriter.getISOBytes(" cm\n"); // constructor - -/** - * Constructs a PdfContents-object, containing text and general graphics. - * - * @param under the direct content that is under all others - * @param content the graphics in a page - * @param text the text in a page - * @param secondContent the direct content that is over all others - * @throws BadPdfFormatException on error - */ - - PdfContents(PdfContentByte under, PdfContentByte content, PdfContentByte text, PdfContentByte secondContent, Rectangle page) throws BadPdfFormatException { + + /** + * Constructs a PdfContents-object, containing text and general graphics. + * + * @param under the direct content that is under all others + * @param content the graphics in a page + * @param text the text in a page + * @param secondContent the direct content that is over all others + * @throws BadPdfFormatException on error + */ + + PdfContents(PdfContentByte under, PdfContentByte content, PdfContentByte text, PdfContentByte secondContent, + Rectangle page) throws BadPdfFormatException { super(); try { OutputStream out = null; Deflater deflater = null; streamBytes = new ByteArrayOutputStream(); - if (Document.compress) - { + if (Document.compress) { compressed = true; compressionLevel = text.getPdfWriter().getCompressionLevel(); deflater = new Deflater(compressionLevel); out = new DeflaterOutputStream(streamBytes, deflater); - } - else + } else { out = streamBytes; + } int rotation = page.getRotation(); switch (rotation) { case 90: @@ -143,12 +143,12 @@ class PdfContents extends PdfStream { if (deflater != null) { deflater.end(); } - } - catch (Exception e) { + } catch (Exception e) { throw new BadPdfFormatException(e.getMessage()); } put(PdfName.LENGTH, new PdfNumber(streamBytes.size())); - if (compressed) + if (compressed) { put(PdfName.FILTER, PdfName.FLATEDECODE); + } } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopy.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopy.java index 35f338666..dcdb79eb2 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopy.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopy.java @@ -67,781 +67,788 @@ public class PdfCopy extends PdfWriter { - /** - * This class holds information about indirect references, since they are renumbered by iText. - */ - static class IndirectReferences { - - PdfIndirectReference theRef; - boolean hasCopied; + protected HashMap indirects; + protected HashMap> indirectMap; + protected PdfReader reader; + protected PdfIndirectReference acroForm; + protected int[] namePtr = {0}; + protected PdfArray fieldArray; + protected HashMap fieldTemplates; + /** + * Holds value of property rotateContents. + */ + private boolean rotateContents = true; - IndirectReferences(PdfIndirectReference ref) { - theRef = ref; - hasCopied = false; + /** + * Constructor + * + * @param os outputstream + * @param document document + */ + public PdfCopy(Document document, OutputStream os) throws DocumentException { + super(new PdfDocument(), os); + this.document.setTextRenderingOptions(document.getTextRenderingOptions()); + document.addDocListener(pdf); + pdf.addWriter(this); + indirectMap = new HashMap<>(); } - void setCopied() { - hasCopied = true; + /** + * Getter for property rotateContents. + * + * @return Value of property rotateContents. + */ + public boolean isRotateContents() { + return this.rotateContents; } - boolean getCopied() { - return hasCopied; + /** + * Setter for property rotateContents. + * + * @param rotateContents New value of property rotateContents. + */ + public void setRotateContents(boolean rotateContents) { + this.rotateContents = rotateContents; } - PdfIndirectReference getRef() { - return theRef; - } - } - - protected HashMap indirects; - protected HashMap> indirectMap; - protected PdfReader reader; - protected PdfIndirectReference acroForm; - protected int[] namePtr = {0}; - /** - * Holds value of property rotateContents. - */ - private boolean rotateContents = true; - protected PdfArray fieldArray; - protected HashMap fieldTemplates; - - /** - * A key to allow us to hash indirect references - */ - protected static class RefKey { - - int num; - int gen; - - RefKey(int num, int gen) { - this.num = num; - this.gen = gen; + /** + * Grabs a page from the input document + * + * @param reader the reader of the document + * @param pageNumber which page to get + * @return the page + */ + public PdfImportedPage getImportedPage(PdfReader reader, int pageNumber) { + if (currentPdfReaderInstance != null) { + if (currentPdfReaderInstance.getReader() != reader) { + try { + currentPdfReaderInstance.getReader().close(); + currentPdfReaderInstance.getReaderFile().close(); + } catch (IOException ioe) { + // empty on purpose + } + currentPdfReaderInstance = reader.getPdfReaderInstance(this); + } + } else { + currentPdfReaderInstance = reader.getPdfReaderInstance(this); + } + return currentPdfReaderInstance.getImportedPage(pageNumber); } - RefKey(PdfIndirectReference ref) { - num = ref.getNumber(); - gen = ref.getGeneration(); + /** + * Translate a PRIndirectReference to a PdfIndirectReference In addition, translates the object numbers, and copies + * the referenced object to the output file. NB: PRIndirectReferences (and PRIndirectObjects) really need to know + * what file they came from, because each file has its own namespace. The translation we do from their namespace to + * ours is *at best* heuristic, and guaranteed to fail under some circumstances. + * + * @param in the PRIndirectReference to translate + * @return the translated PRIndirectReference + * @throws IOException on error + * @throws BadPdfFormatException on error with the Pdf format + */ + protected PdfIndirectReference copyIndirect(PRIndirectReference in) throws IOException, BadPdfFormatException { + PdfIndirectReference theRef; + RefKey key = new RefKey(in); + IndirectReferences iRef = indirects.get(key); + if (iRef != null) { + theRef = iRef.getRef(); + if (iRef.getCopied()) { + return theRef; + } + } else { + theRef = body.getPdfIndirectReference(); + iRef = new IndirectReferences(theRef); + indirects.put(key, iRef); + } + PdfObject obj = PdfReader.getPdfObjectRelease(in); + if (obj != null && obj.isDictionary()) { + PdfObject type = PdfReader.getPdfObjectRelease(((PdfDictionary) obj).get(PdfName.TYPE)); + if (PdfName.PAGE.equals(type)) { + return theRef; + } + } + iRef.setCopied(); + obj = copyObject(obj); + addToBody(obj, theRef); + return theRef; } - RefKey(PRIndirectReference ref) { - num = ref.getNumber(); - gen = ref.getGeneration(); + /** + * Translate a PRDictionary to a PdfDictionary. Also translate all of the objects contained in it. + * + * @param in the PRDictionary to translate + * @return the translated PRDictionary + * @throws IOException on error + * @throws BadPdfFormatException on error with the Pdf format + */ + protected PdfDictionary copyDictionary(PdfDictionary in) + throws IOException, BadPdfFormatException { + PdfDictionary out = new PdfDictionary(); + PdfObject type = PdfReader.getPdfObjectRelease(in.get(PdfName.TYPE)); + + for (PdfName key : in.getKeys()) { + PdfObject value = in.get(key); + // System.out.println("Copy " + key); + if (PdfName.PAGE.equals(type)) { + if (!key.equals(PdfName.B) && !key.equals(PdfName.PARENT)) { + out.put(key, copyObject(value)); + } + } else { + out.put(key, copyObject(value)); + } + } + return out; } - public int hashCode() { - return (gen << 16) + num; - } + /** + * Translate a PRStream to a PdfStream. The data part copies itself. + * + * @param in the PRStream to translate + * @return the translated PRStream + * @throws IOException on error + * @throws BadPdfFormatException on error with the Pdf format + */ + protected PdfStream copyStream(PRStream in) throws IOException, BadPdfFormatException { + PRStream out = new PRStream(in, null); - public boolean equals(Object o) { - if (!(o instanceof RefKey)) { - return false; - } - RefKey other = (RefKey) o; - return this.gen == other.gen && this.num == other.num; - } + for (PdfName key : in.getKeys()) { + PdfObject value = in.get(key); + out.put(key, copyObject(value)); + } - public String toString() { - return Integer.toString(num) + ' ' + gen; - } - } - - /** - * Constructor - * - * @param os outputstream - * @param document document - */ - public PdfCopy(Document document, OutputStream os) throws DocumentException { - super(new PdfDocument(), os); - this.document.setTextRenderingOptions(document.getTextRenderingOptions()); - document.addDocListener(pdf); - pdf.addWriter(this); - indirectMap = new HashMap<>(); - } - - /** - * Getter for property rotateContents. - * - * @return Value of property rotateContents. - */ - public boolean isRotateContents() { - return this.rotateContents; - } - - /** - * Setter for property rotateContents. - * - * @param rotateContents New value of property rotateContents. - */ - public void setRotateContents(boolean rotateContents) { - this.rotateContents = rotateContents; - } - - /** - * Grabs a page from the input document - * - * @param reader the reader of the document - * @param pageNumber which page to get - * @return the page - */ - public PdfImportedPage getImportedPage(PdfReader reader, int pageNumber) { - if (currentPdfReaderInstance != null) { - if (currentPdfReaderInstance.getReader() != reader) { - try { - currentPdfReaderInstance.getReader().close(); - currentPdfReaderInstance.getReaderFile().close(); - } catch (IOException ioe) { - // empty on purpose - } - currentPdfReaderInstance = reader.getPdfReaderInstance(this); - } - } else { - currentPdfReaderInstance = reader.getPdfReaderInstance(this); + return out; } - return currentPdfReaderInstance.getImportedPage(pageNumber); - } - - - /** - * Translate a PRIndirectReference to a PdfIndirectReference In addition, translates the object numbers, and copies the referenced object - * to the output file. NB: PRIndirectReferences (and PRIndirectObjects) really need to know what file they came from, because each file - * has its own namespace. The translation we do from their namespace to ours is *at best* heuristic, and guaranteed to fail under some - * circumstances. - * @param in the PRIndirectReference to translate - * @return the translated PRIndirectReference - * @throws IOException on error - * @throws BadPdfFormatException on error with the Pdf format - */ - protected PdfIndirectReference copyIndirect(PRIndirectReference in) throws IOException, BadPdfFormatException { - PdfIndirectReference theRef; - RefKey key = new RefKey(in); - IndirectReferences iRef = indirects.get(key); - if (iRef != null) { - theRef = iRef.getRef(); - if (iRef.getCopied()) { - return theRef; - } - } else { - theRef = body.getPdfIndirectReference(); - iRef = new IndirectReferences(theRef); - indirects.put(key, iRef); - } - PdfObject obj = PdfReader.getPdfObjectRelease(in); - if (obj != null && obj.isDictionary()) { - PdfObject type = PdfReader.getPdfObjectRelease(((PdfDictionary) obj).get(PdfName.TYPE)); - if (PdfName.PAGE.equals(type)) { - return theRef; - } - } - iRef.setCopied(); - obj = copyObject(obj); - addToBody(obj, theRef); - return theRef; - } - - /** - * Translate a PRDictionary to a PdfDictionary. Also translate all of the objects contained in it. - * @param in the PRDictionary to translate - * @return the translated PRDictionary - * @throws IOException on error - * @throws BadPdfFormatException on error with the Pdf format - */ - protected PdfDictionary copyDictionary(PdfDictionary in) - throws IOException, BadPdfFormatException { - PdfDictionary out = new PdfDictionary(); - PdfObject type = PdfReader.getPdfObjectRelease(in.get(PdfName.TYPE)); - - for (PdfName key : in.getKeys()) { - PdfObject value = in.get(key); - // System.out.println("Copy " + key); - if (PdfName.PAGE.equals(type)) { - if (!key.equals(PdfName.B) && !key.equals(PdfName.PARENT)) { - out.put(key, copyObject(value)); - } - } else { - out.put(key, copyObject(value)); - } - } - return out; - } - - /** - * Translate a PRStream to a PdfStream. The data part copies itself. - * @param in the PRStream to translate - * @return the translated PRStream - * @throws IOException on error - * @throws BadPdfFormatException on error with the Pdf format - */ - protected PdfStream copyStream(PRStream in) throws IOException, BadPdfFormatException { - PRStream out = new PRStream(in, null); - - for (PdfName key : in.getKeys()) { - PdfObject value = in.get(key); - out.put(key, copyObject(value)); - } - - return out; - } + /** + * Translate a PRArray to a PdfArray. Also translate all of the objects contained in it + * + * @param in the PdfArray to copy + * @return the newly generate PdfArray + * @throws IOException on error + */ + protected PdfArray copyArray(PdfArray in) throws IOException, BadPdfFormatException { + PdfArray out = new PdfArray(); - /** - * Translate a PRArray to a PdfArray. Also translate all of the objects contained in it - * @param in the PdfArray to copy - * @return the newly generate PdfArray - * @throws IOException on error - */ - protected PdfArray copyArray(PdfArray in) throws IOException, BadPdfFormatException { - PdfArray out = new PdfArray(); - - for (PdfObject value : in.getElements()) { - out.add(copyObject(value)); - } - return out; - } - - /** - * Translate a PR-object to a Pdf-object - * @param in the PdfObject to translate - * @throws IOException on error - * @throws BadPdfFormatException on error with the Pdf format - * @return the PdfObject - */ - protected PdfObject copyObject(PdfObject in) throws IOException, BadPdfFormatException { - if (in == null) { - return PdfNull.PDFNULL; + for (PdfObject value : in.getElements()) { + out.add(copyObject(value)); + } + return out; } - switch (in.type) { - case PdfObject.DICTIONARY: - // System.out.println("Dictionary: " + in.toString()); - return copyDictionary((PdfDictionary) in); - case PdfObject.INDIRECT: - PdfObject obj = copyIndirect((PRIndirectReference) in); - if (obj == null) { + + /** + * Translate a PR-object to a Pdf-object + * + * @param in the PdfObject to translate + * @return the PdfObject + * @throws IOException on error + * @throws BadPdfFormatException on error with the Pdf format + */ + protected PdfObject copyObject(PdfObject in) throws IOException, BadPdfFormatException { + if (in == null) { return PdfNull.PDFNULL; } - return obj; - case PdfObject.ARRAY: - return copyArray((PdfArray) in); - case PdfObject.NUMBER: - case PdfObject.NAME: - case PdfObject.STRING: - case PdfObject.NULL: - case PdfObject.BOOLEAN: - case 0: - return in; - case PdfObject.STREAM: - return copyStream((PRStream) in); - // return in; - default: - if (in.type < 0) { - String lit = in.toString(); - if (lit.equals("true") || lit.equals("false")) { - return new PdfBoolean(lit); - } - return new PdfLiteral(lit); - } - System.out.println("CANNOT COPY type " + in.type); - return null; - } - } - - /** - * convenience method. Given an imported page, set our "globals" - * @param iPage the imported page - * @return the page number - */ - protected int setFromIPage(PdfImportedPage iPage) { - int pageNum = iPage.getPageNumber(); - PdfReaderInstance inst = currentPdfReaderInstance = iPage.getPdfReaderInstance(); - reader = inst.getReader(); - setFromReader(reader); - return pageNum; - } - - /** - * convenience method. Given a reader, set our "globals" - * @param reader the PdfReader - */ - protected void setFromReader(PdfReader reader) { - this.reader = reader; - indirects = indirectMap.get(reader); - if (indirects == null) { - indirects = new HashMap<>(); - indirectMap.put(reader, indirects); - PdfDictionary catalog = reader.getCatalog(); - PRIndirectReference ref; - PdfObject o = catalog.get(PdfName.ACROFORM); - if (o == null || o.type() != PdfObject.INDIRECT) { - return; - } - ref = (PRIndirectReference) o; - if (acroForm == null) { - acroForm = body.getPdfIndirectReference(); - } - indirects.put(new RefKey(ref), new IndirectReferences(acroForm)); + switch (in.type) { + case PdfObject.DICTIONARY: + // System.out.println("Dictionary: " + in.toString()); + return copyDictionary((PdfDictionary) in); + case PdfObject.INDIRECT: + PdfObject obj = copyIndirect((PRIndirectReference) in); + if (obj == null) { + return PdfNull.PDFNULL; + } + return obj; + case PdfObject.ARRAY: + return copyArray((PdfArray) in); + case PdfObject.NUMBER: + case PdfObject.NAME: + case PdfObject.STRING: + case PdfObject.NULL: + case PdfObject.BOOLEAN: + case 0: + return in; + case PdfObject.STREAM: + return copyStream((PRStream) in); + // return in; + default: + if (in.type < 0) { + String lit = in.toString(); + if (lit.equals("true") || lit.equals("false")) { + return new PdfBoolean(lit); + } + return new PdfLiteral(lit); + } + System.out.println("CANNOT COPY type " + in.type); + return null; + } } - } - - /** - * Add an imported page to our output - * - * @param iPage an imported page - * @throws IOException on error - * @throws BadPdfFormatException on error - */ - public void addPage(PdfImportedPage iPage) throws IOException, BadPdfFormatException { - int pageNum = setFromIPage(iPage); - - PdfDictionary thePage = reader.getPageN(pageNum); - PRIndirectReference origRef = reader.getPageOrigRef(pageNum); - reader.releasePage(pageNum); - RefKey key = new RefKey(origRef); - PdfIndirectReference pageRef; - IndirectReferences iRef = indirects.get(key); - if (iRef != null && !iRef.getCopied()) { - pageReferences.add(iRef.getRef()); - iRef.setCopied(); + + /** + * convenience method. Given an imported page, set our "globals" + * + * @param iPage the imported page + * @return the page number + */ + protected int setFromIPage(PdfImportedPage iPage) { + int pageNum = iPage.getPageNumber(); + PdfReaderInstance inst = currentPdfReaderInstance = iPage.getPdfReaderInstance(); + reader = inst.getReader(); + setFromReader(reader); + return pageNum; } - pageRef = getCurrentPage(); - if (iRef == null) { - iRef = new IndirectReferences(pageRef); - indirects.put(key, iRef); + + /** + * convenience method. Given a reader, set our "globals" + * + * @param reader the PdfReader + */ + protected void setFromReader(PdfReader reader) { + this.reader = reader; + indirects = indirectMap.get(reader); + if (indirects == null) { + indirects = new HashMap<>(); + indirectMap.put(reader, indirects); + PdfDictionary catalog = reader.getCatalog(); + PRIndirectReference ref; + PdfObject o = catalog.get(PdfName.ACROFORM); + if (o == null || o.type() != PdfObject.INDIRECT) { + return; + } + ref = (PRIndirectReference) o; + if (acroForm == null) { + acroForm = body.getPdfIndirectReference(); + } + indirects.put(new RefKey(ref), new IndirectReferences(acroForm)); + } } - iRef.setCopied(); - PdfDictionary newPage = copyDictionary(thePage); - root.addPage(newPage); - ++currentPageNumber; - } - - /** - * Adds a blank page. - * - * @param rect The page dimension - * @param rotation The rotation angle in degrees - * @since 2.1.5 - */ - public void addPage(Rectangle rect, int rotation) { - PdfRectangle mediabox = new PdfRectangle(rect, rotation); - PageResources resources = new PageResources(); - PdfPage page = new PdfPage(mediabox, new HashMap<>(), - resources.getResources(), 0); - page.put(PdfName.TABS, getTabs()); - root.addPage(page); - ++currentPageNumber; - } - - /** - * Copy the acroform for an input document. Note that you can only have one, we make no effort to merge them. - * - * @param reader The reader of the input file that is being copied - * @throws IOException on error - * @throws BadPdfFormatException on error - */ - public void copyAcroForm(PdfReader reader) throws IOException, BadPdfFormatException { - setFromReader(reader); - - PdfDictionary catalog = reader.getCatalog(); - PRIndirectReference hisRef = null; - PdfObject o = catalog.get(PdfName.ACROFORM); - if (o != null && o.type() == PdfObject.INDIRECT) { - hisRef = (PRIndirectReference) o; + + /** + * Add an imported page to our output + * + * @param iPage an imported page + * @throws IOException on error + * @throws BadPdfFormatException on error + */ + public void addPage(PdfImportedPage iPage) throws IOException, BadPdfFormatException { + int pageNum = setFromIPage(iPage); + + PdfDictionary thePage = reader.getPageN(pageNum); + PRIndirectReference origRef = reader.getPageOrigRef(pageNum); + reader.releasePage(pageNum); + RefKey key = new RefKey(origRef); + PdfIndirectReference pageRef; + IndirectReferences iRef = indirects.get(key); + if (iRef != null && !iRef.getCopied()) { + pageReferences.add(iRef.getRef()); + iRef.setCopied(); + } + pageRef = getCurrentPage(); + if (iRef == null) { + iRef = new IndirectReferences(pageRef); + indirects.put(key, iRef); + } + iRef.setCopied(); + PdfDictionary newPage = copyDictionary(thePage); + root.addPage(newPage); + ++currentPageNumber; } - if (hisRef == null) { - return; // bugfix by John Englar + + /** + * Adds a blank page. + * + * @param rect The page dimension + * @param rotation The rotation angle in degrees + * @since 2.1.5 + */ + public void addPage(Rectangle rect, int rotation) { + PdfRectangle mediabox = new PdfRectangle(rect, rotation); + PageResources resources = new PageResources(); + PdfPage page = new PdfPage(mediabox, new HashMap<>(), + resources.getResources(), 0); + page.put(PdfName.TABS, getTabs()); + root.addPage(page); + ++currentPageNumber; } - RefKey key = new RefKey(hisRef); - PdfIndirectReference myRef; - IndirectReferences iRef = indirects.get(key); - if (iRef != null) { - acroForm = myRef = iRef.getRef(); - } else { - acroForm = myRef = body.getPdfIndirectReference(); - iRef = new IndirectReferences(myRef); - indirects.put(key, iRef); + + /** + * Copy the acroform for an input document. Note that you can only have one, we make no effort to merge them. + * + * @param reader The reader of the input file that is being copied + * @throws IOException on error + * @throws BadPdfFormatException on error + */ + public void copyAcroForm(PdfReader reader) throws IOException, BadPdfFormatException { + setFromReader(reader); + + PdfDictionary catalog = reader.getCatalog(); + PRIndirectReference hisRef = null; + PdfObject o = catalog.get(PdfName.ACROFORM); + if (o != null && o.type() == PdfObject.INDIRECT) { + hisRef = (PRIndirectReference) o; + } + if (hisRef == null) { + return; // bugfix by John Englar + } + RefKey key = new RefKey(hisRef); + PdfIndirectReference myRef; + IndirectReferences iRef = indirects.get(key); + if (iRef != null) { + acroForm = myRef = iRef.getRef(); + } else { + acroForm = myRef = body.getPdfIndirectReference(); + iRef = new IndirectReferences(myRef); + indirects.put(key, iRef); + } + if (!iRef.getCopied()) { + iRef.setCopied(); + PdfDictionary theForm = copyDictionary((PdfDictionary) PdfReader.getPdfObject(hisRef)); + addToBody(theForm, myRef); + } } - if (!iRef.getCopied()) { - iRef.setCopied(); - PdfDictionary theForm = copyDictionary((PdfDictionary) PdfReader.getPdfObject(hisRef)); - addToBody(theForm, myRef); + + /* + * the getCatalog method is part of PdfWriter. + * we wrap this so that we can extend it + */ + protected PdfDictionary getCatalog(PdfIndirectReference rootObj) { + try { + PdfDictionary theCat = pdf.getCatalog(rootObj); + if (fieldArray == null) { + if (acroForm != null) { + theCat.put(PdfName.ACROFORM, acroForm); + } + } else { + addFieldResources(theCat); + } + return theCat; + } catch (IOException e) { + throw new ExceptionConverter(e); + } } - } - - /* - * the getCatalog method is part of PdfWriter. - * we wrap this so that we can extend it - */ - protected PdfDictionary getCatalog(PdfIndirectReference rootObj) { - try { - PdfDictionary theCat = pdf.getCatalog(rootObj); - if (fieldArray == null) { - if (acroForm != null) { - theCat.put(PdfName.ACROFORM, acroForm); - } - } else { - addFieldResources(theCat); - } - return theCat; - } catch (IOException e) { - throw new ExceptionConverter(e); + + private void addFieldResources(PdfDictionary catalog) throws IOException { + if (fieldArray == null) { + return; + } + PdfDictionary acroForm = new PdfDictionary(); + catalog.put(PdfName.ACROFORM, acroForm); + acroForm.put(PdfName.FIELDS, fieldArray); + acroForm.put(PdfName.DA, new PdfString("/Helv 0 Tf 0 g ")); + if (fieldTemplates.isEmpty()) { + return; + } + PdfDictionary dr = new PdfDictionary(); + acroForm.put(PdfName.DR, dr); + for (Object o : fieldTemplates.keySet()) { + PdfTemplate template = (PdfTemplate) o; + PdfFormField.mergeResources(dr, (PdfDictionary) template.getResources()); + } + // if (dr.get(PdfName.ENCODING) == null) dr.put(PdfName.ENCODING, PdfName.WIN_ANSI_ENCODING); + PdfDictionary fonts = dr.getAsDict(PdfName.FONT); + if (fonts == null) { + fonts = new PdfDictionary(); + dr.put(PdfName.FONT, fonts); + } + if (!fonts.contains(PdfName.HELV)) { + PdfDictionary dic = new PdfDictionary(PdfName.FONT); + dic.put(PdfName.BASEFONT, PdfName.HELVETICA); + dic.put(PdfName.ENCODING, PdfName.WIN_ANSI_ENCODING); + dic.put(PdfName.NAME, PdfName.HELV); + dic.put(PdfName.SUBTYPE, PdfName.TYPE1); + fonts.put(PdfName.HELV, addToBody(dic).getIndirectReference()); + } + if (!fonts.contains(PdfName.ZADB)) { + PdfDictionary dic = new PdfDictionary(PdfName.FONT); + dic.put(PdfName.BASEFONT, PdfName.ZAPFDINGBATS); + dic.put(PdfName.NAME, PdfName.ZADB); + dic.put(PdfName.SUBTYPE, PdfName.TYPE1); + fonts.put(PdfName.ZADB, addToBody(dic).getIndirectReference()); + } } - } - private void addFieldResources(PdfDictionary catalog) throws IOException { - if (fieldArray == null) { - return; + /** + * Signals that the Document was closed and that no other + * Elements will be added. + *

      + * The pages-tree is built and written to the outputstream. A Catalog is constructed, as well as an Info-object, the + * reference table is composed and everything is written to the outputstream embedded in a Trailer. + */ + + public void close() { + if (open) { + PdfReaderInstance ri = currentPdfReaderInstance; + pdf.close(); + super.close(); + if (ri != null) { + try { + ri.getReader().close(); + ri.getReaderFile().close(); + } catch (IOException ioe) { + // empty on purpose + } + } + } } - PdfDictionary acroForm = new PdfDictionary(); - catalog.put(PdfName.ACROFORM, acroForm); - acroForm.put(PdfName.FIELDS, fieldArray); - acroForm.put(PdfName.DA, new PdfString("/Helv 0 Tf 0 g ")); - if (fieldTemplates.isEmpty()) { - return; + + public PdfIndirectReference add(PdfOutline outline) { + return null; } - PdfDictionary dr = new PdfDictionary(); - acroForm.put(PdfName.DR, dr); - for (Object o : fieldTemplates.keySet()) { - PdfTemplate template = (PdfTemplate) o; - PdfFormField.mergeResources(dr, (PdfDictionary) template.getResources()); + + public void addAnnotation(PdfAnnotation annot) { } - // if (dr.get(PdfName.ENCODING) == null) dr.put(PdfName.ENCODING, PdfName.WIN_ANSI_ENCODING); - PdfDictionary fonts = dr.getAsDict(PdfName.FONT); - if (fonts == null) { - fonts = new PdfDictionary(); - dr.put(PdfName.FONT, fonts); + + PdfIndirectReference add(PdfPage page, PdfContents contents) throws PdfException { + return null; } - if (!fonts.contains(PdfName.HELV)) { - PdfDictionary dic = new PdfDictionary(PdfName.FONT); - dic.put(PdfName.BASEFONT, PdfName.HELVETICA); - dic.put(PdfName.ENCODING, PdfName.WIN_ANSI_ENCODING); - dic.put(PdfName.NAME, PdfName.HELV); - dic.put(PdfName.SUBTYPE, PdfName.TYPE1); - fonts.put(PdfName.HELV, addToBody(dic).getIndirectReference()); + + public void freeReader(PdfReader reader) throws IOException { + indirectMap.remove(reader); + if (currentPdfReaderInstance != null) { + if (currentPdfReaderInstance.getReader() == reader) { + try { + currentPdfReaderInstance.getReader().close(); + currentPdfReaderInstance.getReaderFile().close(); + } catch (IOException ioe) { + // empty on purpose + } + currentPdfReaderInstance = null; + } + } } - if (!fonts.contains(PdfName.ZADB)) { - PdfDictionary dic = new PdfDictionary(PdfName.FONT); - dic.put(PdfName.BASEFONT, PdfName.ZAPFDINGBATS); - dic.put(PdfName.NAME, PdfName.ZADB); - dic.put(PdfName.SUBTYPE, PdfName.TYPE1); - fonts.put(PdfName.ZADB, addToBody(dic).getIndirectReference()); + + /** + * Create a page stamp. New content and annotations, including new fields, are allowed. The fields added cannot have + * parents in another pages. This method modifies the PdfReader instance. + *

      The general usage to stamp something in a page is:

      + * 
      +     * PdfImportedPage page = copy.getImportedPage(reader, 1);
+     * PdfCopy.PageStamp ps = copy.createPageStamp(page);
+     * ps.addAnnotation(PdfAnnotation.createText(copy, new Rectangle(50, 180, 70, 200), "Hello", "No Thanks", true, "Comment"));
+     * PdfContentByte under = ps.getUnderContent();
+     * under.addImage(img);
+     * PdfContentByte over = ps.getOverContent();
+     * over.beginText();
+     * over.setFontAndSize(bf, 18);
+     * over.setTextMatrix(30, 30);
+     * over.showText("total page " + totalPage);
+     * over.endText();
+     * ps.alterContents();
+     * copy.addPage(page);
+     *
      + * + * @param iPage an imported page + * @return the PageStamp + */ + public PageStamp createPageStamp(PdfImportedPage iPage) { + int pageNum = iPage.getPageNumber(); + PdfReader reader = iPage.getPdfReaderInstance().getReader(); + PdfDictionary pageN = reader.getPageN(pageNum); + return new PageStamp(reader, pageN, this); } - } - - /** - * Signals that the Document was closed and that no other - * Elements will be added. - *

      - * The pages-tree is built and written to the outputstream. A Catalog is constructed, as well as an Info-object, the reference table is - * composed and everything is written to the outputstream embedded in a Trailer. - */ - - public void close() { - if (open) { - PdfReaderInstance ri = currentPdfReaderInstance; - pdf.close(); - super.close(); - if (ri != null) { - try { - ri.getReader().close(); - ri.getReaderFile().close(); - } catch (IOException ioe) { - // empty on purpose + + /** + * This class holds information about indirect references, since they are renumbered by iText. + */ + static class IndirectReferences { + + PdfIndirectReference theRef; + boolean hasCopied; + + IndirectReferences(PdfIndirectReference ref) { + theRef = ref; + hasCopied = false; + } + + void setCopied() { + hasCopied = true; + } + + boolean getCopied() { + return hasCopied; + } + + PdfIndirectReference getRef() { + return theRef; } - } } - } - public PdfIndirectReference add(PdfOutline outline) { - return null; - } + /** + * A key to allow us to hash indirect references + */ + protected static class RefKey { - public void addAnnotation(PdfAnnotation annot) { - } + int num; + int gen; - PdfIndirectReference add(PdfPage page, PdfContents contents) throws PdfException { - return null; - } + RefKey(int num, int gen) { + this.num = num; + this.gen = gen; + } - public void freeReader(PdfReader reader) throws IOException { - indirectMap.remove(reader); - if (currentPdfReaderInstance != null) { - if (currentPdfReaderInstance.getReader() == reader) { - try { - currentPdfReaderInstance.getReader().close(); - currentPdfReaderInstance.getReaderFile().close(); - } catch (IOException ioe) { - // empty on purpose + RefKey(PdfIndirectReference ref) { + num = ref.getNumber(); + gen = ref.getGeneration(); } - currentPdfReaderInstance = null; - } - } - } - - /** - * Create a page stamp. New content and annotations, including new fields, are allowed. The fields added cannot have parents in another - * pages. This method modifies the PdfReader instance. - *

      The general usage to stamp something in a page is:

      - * 
      -   * PdfImportedPage page = copy.getImportedPage(reader, 1);
-   * PdfCopy.PageStamp ps = copy.createPageStamp(page);
-   * ps.addAnnotation(PdfAnnotation.createText(copy, new Rectangle(50, 180, 70, 200), "Hello", "No Thanks", true, "Comment"));
-   * PdfContentByte under = ps.getUnderContent();
-   * under.addImage(img);
-   * PdfContentByte over = ps.getOverContent();
-   * over.beginText();
-   * over.setFontAndSize(bf, 18);
-   * over.setTextMatrix(30, 30);
-   * over.showText("total page " + totalPage);
-   * over.endText();
-   * ps.alterContents();
-   * copy.addPage(page);
-   *
      - * - * @param iPage an imported page - * @return the PageStamp - */ - public PageStamp createPageStamp(PdfImportedPage iPage) { - int pageNum = iPage.getPageNumber(); - PdfReader reader = iPage.getPdfReaderInstance().getReader(); - PdfDictionary pageN = reader.getPageN(pageNum); - return new PageStamp(reader, pageN, this); - } - - public static class PageStamp { - - PdfDictionary pageN; - PdfCopy.StampContent under; - PdfCopy.StampContent over; - PageResources pageResources; - PdfReader reader; - PdfCopy cstp; - - PageStamp(PdfReader reader, PdfDictionary pageN, PdfCopy cstp) { - this.pageN = pageN; - this.reader = reader; - this.cstp = cstp; - } - public PdfContentByte getUnderContent() { - if (under == null) { - if (pageResources == null) { - pageResources = new PageResources(); - PdfDictionary resources = pageN.getAsDict(PdfName.RESOURCES); - pageResources.setOriginalResources(resources, cstp.namePtr); + RefKey(PRIndirectReference ref) { + num = ref.getNumber(); + gen = ref.getGeneration(); } - under = new PdfCopy.StampContent(cstp, pageResources); - } - return under; - } - public PdfContentByte getOverContent() { - if (over == null) { - if (pageResources == null) { - pageResources = new PageResources(); - PdfDictionary resources = pageN.getAsDict(PdfName.RESOURCES); - pageResources.setOriginalResources(resources, cstp.namePtr); + public int hashCode() { + return (gen << 16) + num; } - over = new PdfCopy.StampContent(cstp, pageResources); - } - return over; - } - public void alterContents() throws IOException { - if (over == null && under == null) { - return; - } - PdfArray ar = null; - PdfObject content = PdfReader.getPdfObject(pageN.get(PdfName.CONTENTS), pageN); - if (content == null) { - ar = new PdfArray(); - pageN.put(PdfName.CONTENTS, ar); - } else if (content.isArray()) { - ar = (PdfArray) content; - } else if (content.isStream()) { - ar = new PdfArray(); - ar.add(pageN.get(PdfName.CONTENTS)); - pageN.put(PdfName.CONTENTS, ar); - } else { - ar = new PdfArray(); - pageN.put(PdfName.CONTENTS, ar); - } - ByteBuffer out = new ByteBuffer(); - if (under != null) { - out.append(PdfContents.SAVESTATE); - applyRotation(pageN, out); - out.append(under.getInternalBuffer()); - out.append(PdfContents.RESTORESTATE); - } - if (over != null) { - out.append(PdfContents.SAVESTATE); - } - PdfStream stream = new PdfStream(out.toByteArray()); - stream.flateCompress(cstp.getCompressionLevel()); - PdfIndirectReference ref1 = cstp.addToBody(stream).getIndirectReference(); - ar.addFirst(ref1); - out.reset(); - if (over != null) { - out.append(' '); - out.append(PdfContents.RESTORESTATE); - out.append(PdfContents.SAVESTATE); - applyRotation(pageN, out); - out.append(over.getInternalBuffer()); - out.append(PdfContents.RESTORESTATE); - stream = new PdfStream(out.toByteArray()); - stream.flateCompress(cstp.getCompressionLevel()); - ar.add(cstp.addToBody(stream).getIndirectReference()); - } - pageN.put(PdfName.RESOURCES, pageResources.getResources()); - } + public boolean equals(Object o) { + if (!(o instanceof RefKey)) { + return false; + } + RefKey other = (RefKey) o; + return this.gen == other.gen && this.num == other.num; + } - void applyRotation(PdfDictionary pageN, ByteBuffer out) { - if (!cstp.rotateContents) { - return; - } - Rectangle page = reader.getPageSizeWithRotation(pageN); - int rotation = page.getRotation(); - switch (rotation) { - case 90: - out.append(PdfContents.ROTATE90); - out.append(page.getTop()); - out.append(' ').append('0').append(PdfContents.ROTATEFINAL); - break; - case 180: - out.append(PdfContents.ROTATE180); - out.append(page.getRight()); - out.append(' '); - out.append(page.getTop()); - out.append(PdfContents.ROTATEFINAL); - break; - case 270: - out.append(PdfContents.ROTATE270); - out.append('0').append(' '); - out.append(page.getRight()); - out.append(PdfContents.ROTATEFINAL); - break; - } + public String toString() { + return Integer.toString(num) + ' ' + gen; + } } - private void addDocumentField(PdfIndirectReference ref) { - if (cstp.fieldArray == null) { - cstp.fieldArray = new PdfArray(); - } - cstp.fieldArray.add(ref); - } + public static class PageStamp { - private void expandFields(PdfFormField field, List allAnnots) { - allAnnots.add(field); - List kids = field.getKidFields(); - if (kids != null) { - for (PdfFormField kid : kids) { - expandFields(kid, allAnnots); - } - } - } + PdfDictionary pageN; + PdfCopy.StampContent under; + PdfCopy.StampContent over; + PageResources pageResources; + PdfReader reader; + PdfCopy cstp; - public void addAnnotation(PdfAnnotation annot) { - try { - List allAnnots = new ArrayList<>(); - if (annot.isForm()) { - PdfFormField field = (PdfFormField) annot; - if (field.getParent() != null) { - return; - } - expandFields(field, allAnnots); - if (cstp.fieldTemplates == null) { - cstp.fieldTemplates = new HashMap<>(); - } - } else { - allAnnots.add(annot); - } - for (PdfAnnotation allAnnot : allAnnots) { - annot = allAnnot; - if (annot.isForm()) { - if (!annot.isUsed()) { - Map templates = annot.getTemplates(); - if (templates != null) { - cstp.fieldTemplates.putAll(templates); - } + PageStamp(PdfReader reader, PdfDictionary pageN, PdfCopy cstp) { + this.pageN = pageN; + this.reader = reader; + this.cstp = cstp; + } + + public PdfContentByte getUnderContent() { + if (under == null) { + if (pageResources == null) { + pageResources = new PageResources(); + PdfDictionary resources = pageN.getAsDict(PdfName.RESOURCES); + pageResources.setOriginalResources(resources, cstp.namePtr); + } + under = new PdfCopy.StampContent(cstp, pageResources); + } + return under; + } + + public PdfContentByte getOverContent() { + if (over == null) { + if (pageResources == null) { + pageResources = new PageResources(); + PdfDictionary resources = pageN.getAsDict(PdfName.RESOURCES); + pageResources.setOriginalResources(resources, cstp.namePtr); + } + over = new PdfCopy.StampContent(cstp, pageResources); } - PdfFormField field = (PdfFormField) annot; - if (field.getParent() == null) { - addDocumentField(field.getIndirectReference()); + return over; + } + + public void alterContents() throws IOException { + if (over == null && under == null) { + return; } - } - if (annot.isAnnotation()) { - PdfObject pdfobj = PdfReader.getPdfObject(pageN.get(PdfName.ANNOTS), pageN); - PdfArray annots; - if (pdfobj == null || !pdfobj.isArray()) { - annots = new PdfArray(); - pageN.put(PdfName.ANNOTS, annots); + PdfArray ar = null; + PdfObject content = PdfReader.getPdfObject(pageN.get(PdfName.CONTENTS), pageN); + if (content == null) { + ar = new PdfArray(); + pageN.put(PdfName.CONTENTS, ar); + } else if (content.isArray()) { + ar = (PdfArray) content; + } else if (content.isStream()) { + ar = new PdfArray(); + ar.add(pageN.get(PdfName.CONTENTS)); + pageN.put(PdfName.CONTENTS, ar); } else { - annots = (PdfArray) pdfobj; + ar = new PdfArray(); + pageN.put(PdfName.CONTENTS, ar); + } + ByteBuffer out = new ByteBuffer(); + if (under != null) { + out.append(PdfContents.SAVESTATE); + applyRotation(pageN, out); + out.append(under.getInternalBuffer()); + out.append(PdfContents.RESTORESTATE); } - annots.add(annot.getIndirectReference()); - if (!annot.isUsed()) { - PdfRectangle rect = (PdfRectangle) annot.get(PdfName.RECT); - if (rect != null && (rect.left() != 0 || rect.right() != 0 || rect.top() != 0 || rect.bottom() != 0)) { - int rotation = reader.getPageRotation(pageN); - Rectangle pageSize = reader.getPageSizeWithRotation(pageN); - switch (rotation) { - case 90: - annot.put(PdfName.RECT, new PdfRectangle( - pageSize.getTop() - rect.bottom(), - rect.left(), - pageSize.getTop() - rect.top(), - rect.right())); + if (over != null) { + out.append(PdfContents.SAVESTATE); + } + PdfStream stream = new PdfStream(out.toByteArray()); + stream.flateCompress(cstp.getCompressionLevel()); + PdfIndirectReference ref1 = cstp.addToBody(stream).getIndirectReference(); + ar.addFirst(ref1); + out.reset(); + if (over != null) { + out.append(' '); + out.append(PdfContents.RESTORESTATE); + out.append(PdfContents.SAVESTATE); + applyRotation(pageN, out); + out.append(over.getInternalBuffer()); + out.append(PdfContents.RESTORESTATE); + stream = new PdfStream(out.toByteArray()); + stream.flateCompress(cstp.getCompressionLevel()); + ar.add(cstp.addToBody(stream).getIndirectReference()); + } + pageN.put(PdfName.RESOURCES, pageResources.getResources()); + } + + void applyRotation(PdfDictionary pageN, ByteBuffer out) { + if (!cstp.rotateContents) { + return; + } + Rectangle page = reader.getPageSizeWithRotation(pageN); + int rotation = page.getRotation(); + switch (rotation) { + case 90: + out.append(PdfContents.ROTATE90); + out.append(page.getTop()); + out.append(' ').append('0').append(PdfContents.ROTATEFINAL); break; - case 180: - annot.put(PdfName.RECT, new PdfRectangle( - pageSize.getRight() - rect.left(), - pageSize.getTop() - rect.bottom(), - pageSize.getRight() - rect.right(), - pageSize.getTop() - rect.top())); + case 180: + out.append(PdfContents.ROTATE180); + out.append(page.getRight()); + out.append(' '); + out.append(page.getTop()); + out.append(PdfContents.ROTATEFINAL); break; - case 270: - annot.put(PdfName.RECT, new PdfRectangle( - rect.bottom(), - pageSize.getRight() - rect.left(), - rect.top(), - pageSize.getRight() - rect.right())); + case 270: + out.append(PdfContents.ROTATE270); + out.append('0').append(' '); + out.append(page.getRight()); + out.append(PdfContents.ROTATEFINAL); break; + } + } + + private void addDocumentField(PdfIndirectReference ref) { + if (cstp.fieldArray == null) { + cstp.fieldArray = new PdfArray(); + } + cstp.fieldArray.add(ref); + } + + private void expandFields(PdfFormField field, List allAnnots) { + allAnnots.add(field); + List kids = field.getKidFields(); + if (kids != null) { + for (PdfFormField kid : kids) { + expandFields(kid, allAnnots); + } + } + } + + public void addAnnotation(PdfAnnotation annot) { + try { + List allAnnots = new ArrayList<>(); + if (annot.isForm()) { + PdfFormField field = (PdfFormField) annot; + if (field.getParent() != null) { + return; + } + expandFields(field, allAnnots); + if (cstp.fieldTemplates == null) { + cstp.fieldTemplates = new HashMap<>(); + } + } else { + allAnnots.add(annot); } - } + for (PdfAnnotation allAnnot : allAnnots) { + annot = allAnnot; + if (annot.isForm()) { + if (!annot.isUsed()) { + Map templates = annot.getTemplates(); + if (templates != null) { + cstp.fieldTemplates.putAll(templates); + } + } + PdfFormField field = (PdfFormField) annot; + if (field.getParent() == null) { + addDocumentField(field.getIndirectReference()); + } + } + if (annot.isAnnotation()) { + PdfObject pdfobj = PdfReader.getPdfObject(pageN.get(PdfName.ANNOTS), pageN); + PdfArray annots; + if (pdfobj == null || !pdfobj.isArray()) { + annots = new PdfArray(); + pageN.put(PdfName.ANNOTS, annots); + } else { + annots = (PdfArray) pdfobj; + } + annots.add(annot.getIndirectReference()); + if (!annot.isUsed()) { + PdfRectangle rect = (PdfRectangle) annot.get(PdfName.RECT); + if (rect != null && (rect.left() != 0 || rect.right() != 0 || rect.top() != 0 + || rect.bottom() != 0)) { + int rotation = reader.getPageRotation(pageN); + Rectangle pageSize = reader.getPageSizeWithRotation(pageN); + switch (rotation) { + case 90: + annot.put(PdfName.RECT, new PdfRectangle( + pageSize.getTop() - rect.bottom(), + rect.left(), + pageSize.getTop() - rect.top(), + rect.right())); + break; + case 180: + annot.put(PdfName.RECT, new PdfRectangle( + pageSize.getRight() - rect.left(), + pageSize.getTop() - rect.bottom(), + pageSize.getRight() - rect.right(), + pageSize.getTop() - rect.top())); + break; + case 270: + annot.put(PdfName.RECT, new PdfRectangle( + rect.bottom(), + pageSize.getRight() - rect.left(), + rect.top(), + pageSize.getRight() - rect.right())); + break; + } + } + } + } + if (!annot.isUsed()) { + annot.setUsed(); + cstp.addToBody(annot, annot.getIndirectReference()); + } + } + } catch (IOException e) { + throw new ExceptionConverter(e); } - } - if (!annot.isUsed()) { - annot.setUsed(); - cstp.addToBody(annot, annot.getIndirectReference()); - } - } - } catch (IOException e) { - throw new ExceptionConverter(e); - } + } } - } - public static class StampContent extends PdfContentByte { + public static class StampContent extends PdfContentByte { - PageResources pageResources; + PageResources pageResources; - /** - * Creates a new instance of StampContent - */ - StampContent(PdfWriter writer, PageResources pageResources) { - super(writer); - this.pageResources = pageResources; - } + /** + * Creates a new instance of StampContent + */ + StampContent(PdfWriter writer, PageResources pageResources) { + super(writer); + this.pageResources = pageResources; + } - /** - * Gets a duplicate of this PdfContentByte. All the members are copied by reference but the buffer stays different. - * - * @return a copy of this PdfContentByte - */ - public PdfContentByte getDuplicate() { - return new PdfCopy.StampContent(writer, pageResources); - } + /** + * Gets a duplicate of this PdfContentByte. All the members are copied by reference but the buffer + * stays different. + * + * @return a copy of this PdfContentByte + */ + public PdfContentByte getDuplicate() { + return new PdfCopy.StampContent(writer, pageResources); + } - PageResources getPageResources() { - return pageResources; + PageResources getPageResources() { + return pageResources; + } } - } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java index 49661b125..a997d4f7c 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java @@ -46,134 +46,139 @@ */ package com.lowagie.text.pdf; -import java.io.IOException; -import java.io.OutputStream; -import java.security.cert.Certificate; -import java.util.List; - import com.lowagie.text.DocWriter; import com.lowagie.text.DocumentException; import com.lowagie.text.pdf.interfaces.PdfEncryptionSettings; import com.lowagie.text.pdf.interfaces.PdfViewerPreferences; +import java.io.IOException; +import java.io.OutputStream; +import java.security.cert.Certificate; +import java.util.List; /** - * Concatenates PDF documents including form fields. The rules for the form field - * concatenation are the same as in Acrobat. All the documents are kept in memory unlike - * PdfCopy. - * @author Paulo Soares (psoares@consiste.pt) + * Concatenates PDF documents including form fields. The rules for the form field concatenation are the same as in + * Acrobat. All the documents are kept in memory unlike PdfCopy. + * + * @author Paulo Soares (psoares@consiste.pt) */ public class PdfCopyFields - implements PdfViewerPreferences, PdfEncryptionSettings, AutoCloseable { - + implements PdfViewerPreferences, PdfEncryptionSettings, AutoCloseable { + private PdfCopyFieldsImp fc; - + /** * Creates a new instance. + * * @param os the output stream * @throws DocumentException on error - */ + */ public PdfCopyFields(OutputStream os) throws DocumentException { fc = new PdfCopyFieldsImp(os); } - + /** * Creates a new instance. - * @param os the output stream + * + * @param os the output stream * @param pdfVersion the pdf version the output will have * @throws DocumentException on error - */ + */ public PdfCopyFields(OutputStream os, char pdfVersion) throws DocumentException { fc = new PdfCopyFieldsImp(os, pdfVersion); } - + /** * Concatenates a PDF document. + * * @param reader the PDF document * @throws DocumentException on error - * @throws IOException on error - */ + * @throws IOException on error + */ public void addDocument(PdfReader reader) throws DocumentException, IOException { fc.addDocument(reader); } - + /** * Concatenates a PDF document selecting the pages to keep. The pages are described as a * List of Integer. The page ordering can be changed but * no page repetitions are allowed. - * @param reader the PDF document + * + * @param reader the PDF document * @param pagesToKeep the pages to keep * @throws DocumentException on error - * @throws IOException on error - */ + * @throws IOException on error + */ public void addDocument(PdfReader reader, List pagesToKeep) throws DocumentException, IOException { fc.addDocument(reader, pagesToKeep); } /** - * Concatenates a PDF document selecting the pages to keep. The pages are described as - * ranges. The page ordering can be changed but - * no page repetitions are allowed. + * Concatenates a PDF document selecting the pages to keep. The pages are described as ranges. The page ordering can + * be changed but no page repetitions are allowed. + * * @param reader the PDF document * @param ranges the comma separated ranges as described in {@link SequenceList} * @throws DocumentException on error - * @throws IOException on error - */ + * @throws IOException on error + */ public void addDocument(PdfReader reader, String ranges) throws DocumentException, IOException { fc.addDocument(reader, SequenceList.expand(ranges, reader.getNumberOfPages())); } - /** Sets the encryption options for this document. The userPassword and the - * ownerPassword can be null or have zero length. In this case the ownerPassword - * is replaced by a random string. The open permissions for the document can be - * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, - * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. - * The permissions can be combined by ORing them. - * @param userPassword the user password. Can be null or empty - * @param ownerPassword the owner password. Can be null or empty - * @param permissions the user permissions + /** + * Sets the encryption options for this document. The userPassword and the ownerPassword can be null or have zero + * length. In this case the ownerPassword is replaced by a random string. The open permissions for the document can + * be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn, AllowScreenReaders, + * AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them. + * + * @param userPassword the user password. Can be null or empty + * @param ownerPassword the owner password. Can be null or empty + * @param permissions the user permissions * @param strength128Bits true for 128 bit key length, false for 40 bit key length * @throws DocumentException if the document is already open */ - public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, boolean strength128Bits) throws DocumentException { - fc.setEncryption(userPassword, ownerPassword, permissions, strength128Bits ? PdfWriter.STANDARD_ENCRYPTION_128 : PdfWriter.STANDARD_ENCRYPTION_40); + public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, boolean strength128Bits) + throws DocumentException { + fc.setEncryption(userPassword, ownerPassword, permissions, + strength128Bits ? PdfWriter.STANDARD_ENCRYPTION_128 : PdfWriter.STANDARD_ENCRYPTION_40); } - + /** - * Sets the encryption options for this document. The userPassword and the - * ownerPassword can be null or have zero length. In this case the ownerPassword - * is replaced by a random string. The open permissions for the document can be - * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, - * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. - * The permissions can be combined by ORing them. - * @param strength true for 128 bit key length. false for 40 bit key length - * @param userPassword the user password. Can be null or empty + * Sets the encryption options for this document. The userPassword and the ownerPassword can be null or have zero + * length. In this case the ownerPassword is replaced by a random string. The open permissions for the document can + * be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn, AllowScreenReaders, + * AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them. + * + * @param strength true for 128 bit key length. false for 40 bit key length + * @param userPassword the user password. Can be null or empty * @param ownerPassword the owner password. Can be null or empty - * @param permissions the user permissions + * @param permissions the user permissions * @throws DocumentException if the document is already open */ - public void setEncryption(boolean strength, String userPassword, String ownerPassword, int permissions) throws DocumentException { + public void setEncryption(boolean strength, String userPassword, String ownerPassword, int permissions) + throws DocumentException { setEncryption(DocWriter.getISOBytes(userPassword), DocWriter.getISOBytes(ownerPassword), permissions, strength); } - + /** * Closes the output document. - */ + */ public void close() { fc.close(); } /** - * Opens the document. This is usually not needed as addDocument() will do it - * automatically. - */ + * Opens the document. This is usually not needed as addDocument() will do it automatically. + */ public void open() { fc.openDoc(); } /** * Adds JavaScript to the global document + * * @param js the JavaScript - */ + */ public void addJavaScript(String js) { fc.addJavaScript(js, !PdfEncodings.isPdfDocEncoding(js)); } @@ -181,30 +186,34 @@ public void addJavaScript(String js) { /** * Sets the bookmarks. The list structure is defined in * SimpleBookmark#. + * * @param outlines the bookmarks or null to remove any - */ + */ public void setOutlines(List outlines) { fc.setOutlines(outlines); } - - /** Gets the underlying PdfWriter. + + /** + * Gets the underlying PdfWriter. + * * @return the underlying PdfWriter - */ + */ public PdfWriter getWriter() { return fc; } /** * Gets the 1.5 compression status. + * * @return true if the 1.5 compression is on */ public boolean isFullCompression() { return fc.isFullCompression(); } - + /** - * Sets the document's compression to the new 1.5 mode with object streams and xref - * streams. It can be set at any time but once set it can't be unset. + * Sets the document's compression to the new 1.5 mode with object streams and xref streams. It can be set at any + * time but once set it can't be unset. *

      * If set before opening the document it will also set the pdf version to 1.5. */ @@ -215,15 +224,17 @@ public void setFullCompression() { /** * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(byte[], byte[], int, int) */ - public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType) throws DocumentException { + public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType) + throws DocumentException { fc.setEncryption(userPassword, ownerPassword, permissions, encryptionType); } /** - * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#addViewerPreference(com.lowagie.text.pdf.PdfName, com.lowagie.text.pdf.PdfObject) + * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#addViewerPreference(com.lowagie.text.pdf.PdfName, + * com.lowagie.text.pdf.PdfObject) */ public void addViewerPreference(PdfName key, PdfObject value) { - fc.addViewerPreference(key, value); + fc.addViewerPreference(key, value); } /** @@ -234,9 +245,10 @@ public void setViewerPreferences(int preferences) { } /** - * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(java.security.cert.Certificate[], int[], int) + * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(java.security.cert.Certificate[], int[], + * int) */ public void setEncryption(Certificate[] certs, int[] permissions, int encryptionType) throws DocumentException { fc.setEncryption(certs, permissions, encryptionType); - } + } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFieldsImp.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFieldsImp.java index 7947781c5..bf7c9f0fd 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFieldsImp.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFieldsImp.java @@ -47,6 +47,12 @@ */ package com.lowagie.text.pdf; +import com.lowagie.text.Document; +import com.lowagie.text.DocumentException; +import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.error_messages.MessageLocalization; +import com.lowagie.text.exceptions.BadPasswordException; +import com.lowagie.text.pdf.AcroFields.Item; import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; @@ -55,24 +61,58 @@ import java.util.Map; import java.util.StringTokenizer; -import com.lowagie.text.Document; -import com.lowagie.text.DocumentException; -import com.lowagie.text.ExceptionConverter; -import com.lowagie.text.error_messages.MessageLocalization; -import com.lowagie.text.exceptions.BadPasswordException; -import com.lowagie.text.pdf.AcroFields.Item; - /** * @author psoares */ class PdfCopyFieldsImp extends PdfWriter { + protected static final Map widgetKeys = new HashMap<>(); + protected static final Map fieldKeys = new HashMap<>(); private static final PdfName iTextTag = new PdfName("_iTextTag_"); private static final Integer zero = 0; + + static { + Integer one = 1; + widgetKeys.put(PdfName.SUBTYPE, one); + widgetKeys.put(PdfName.CONTENTS, one); + widgetKeys.put(PdfName.RECT, one); + widgetKeys.put(PdfName.NM, one); + widgetKeys.put(PdfName.M, one); + widgetKeys.put(PdfName.F, one); + widgetKeys.put(PdfName.BS, one); + widgetKeys.put(PdfName.BORDER, one); + widgetKeys.put(PdfName.AP, one); + widgetKeys.put(PdfName.AS, one); + widgetKeys.put(PdfName.C, one); + widgetKeys.put(PdfName.A, one); + widgetKeys.put(PdfName.STRUCTPARENT, one); + widgetKeys.put(PdfName.OC, one); + widgetKeys.put(PdfName.H, one); + widgetKeys.put(PdfName.MK, one); + widgetKeys.put(PdfName.DA, one); + widgetKeys.put(PdfName.Q, one); + fieldKeys.put(PdfName.AA, one); + fieldKeys.put(PdfName.FT, one); + fieldKeys.put(PdfName.TU, one); + fieldKeys.put(PdfName.TM, one); + fieldKeys.put(PdfName.FF, one); + fieldKeys.put(PdfName.V, one); + fieldKeys.put(PdfName.DV, one); + fieldKeys.put(PdfName.DS, one); + fieldKeys.put(PdfName.RV, one); + fieldKeys.put(PdfName.OPT, one); + fieldKeys.put(PdfName.MAXLEN, one); + fieldKeys.put(PdfName.TI, one); + fieldKeys.put(PdfName.I, one); + fieldKeys.put(PdfName.LOCK, one); + fieldKeys.put(PdfName.SV, one); + } + private final List readers = new ArrayList<>(); - Map readers2intrefs = new HashMap<>(); private final Map pages2intrefs = new HashMap<>(); private final Map visited = new HashMap<>(); + private final List calculationOrder = new ArrayList<>(); + Map readers2intrefs = new HashMap<>(); List fields = new ArrayList<>(); RandomAccessFileOrArray file; Map fieldTree = new HashMap<>(); @@ -83,44 +123,68 @@ class PdfCopyFieldsImp extends PdfWriter { boolean closing = false; Document nd; private Map> tabOrder; - private final List calculationOrder = new ArrayList<>(); private List calculationOrderRefs; private boolean hasSignature; - + PdfCopyFieldsImp(OutputStream os) throws DocumentException { this(os, '\0'); } - + PdfCopyFieldsImp(OutputStream os, char pdfVersion) throws DocumentException { super(new PdfDocument(), os); pdf.addWriter(this); - if (pdfVersion != 0) + if (pdfVersion != 0) { super.setPdfVersion(pdfVersion); + } nd = new Document(); nd.addDocListener(pdf); } - + + private static String getCOName(PRIndirectReference ref) { + StringBuilder name = new StringBuilder(); + while (ref != null) { + PdfObject obj = PdfReader.getPdfObject(ref); + if (obj == null || obj.type() != PdfObject.DICTIONARY) { + break; + } + PdfDictionary dic = (PdfDictionary) obj; + PdfString t = dic.getAsString(PdfName.T); + if (t != null) { + name.insert(0, t.toUnicodeString() + "."); + } + ref = (PRIndirectReference) dic.get(PdfName.PARENT); + } + if (name.toString().endsWith(".")) { + name = new StringBuilder(name.substring(0, name.length() - 1)); + } + return name.toString(); + } + void addDocument(PdfReader reader, List pagesToKeep) throws DocumentException, IOException { - if (!readers2intrefs.containsKey(reader) && reader.isTampered()) + if (!readers2intrefs.containsKey(reader) && reader.isTampered()) { throw new DocumentException(MessageLocalization.getComposedMessage("the.document.was.reused")); - reader = new PdfReader(reader); + } + reader = new PdfReader(reader); reader.selectPages(pagesToKeep); - if (reader.getNumberOfPages() == 0) + if (reader.getNumberOfPages() == 0) { return; + } reader.setTampered(false); addDocument(reader); } - + void addDocument(PdfReader reader) throws DocumentException, IOException { - if (!reader.isOpenedWithFullPermissions()) - throw new BadPasswordException(MessageLocalization.getComposedMessage("pdfreader.not.opened.with.owner.password")); + if (!reader.isOpenedWithFullPermissions()) { + throw new BadPasswordException( + MessageLocalization.getComposedMessage("pdfreader.not.opened.with.owner.password")); + } openDoc(); if (readers2intrefs.containsKey(reader)) { reader = new PdfReader(reader); - } - else { - if (reader.isTampered()) + } else { + if (reader.isTampered()) { throw new DocumentException(MessageLocalization.getComposedMessage("the.document.was.reused")); + } reader.consolidateNamedDestinations(); reader.setTampered(true); } @@ -139,48 +203,33 @@ void addDocument(PdfReader reader) throws DocumentException, IOException { updateCalculationOrder(reader); } - private static String getCOName(PRIndirectReference ref) { - StringBuilder name = new StringBuilder(); - while (ref != null) { - PdfObject obj = PdfReader.getPdfObject(ref); - if (obj == null || obj.type() != PdfObject.DICTIONARY) { - break; - } - PdfDictionary dic = (PdfDictionary) obj; - PdfString t = dic.getAsString(PdfName.T); - if (t != null) { - name.insert(0, t.toUnicodeString() + "."); - } - ref = (PRIndirectReference) dic.get(PdfName.PARENT); - } - if (name.toString().endsWith(".")) { - name = new StringBuilder(name.substring(0, name.length() - 1)); - } - return name.toString(); - } - /** - * @since 2.1.5; before 2.1.5 the method was private + * @since 2.1.5; before 2.1.5 the method was private */ protected void updateCalculationOrder(PdfReader reader) { PdfDictionary catalog = reader.getCatalog(); PdfDictionary acro = catalog.getAsDict(PdfName.ACROFORM); - if (acro == null) + if (acro == null) { return; + } PdfArray co = acro.getAsArray(PdfName.CO); - if (co == null || co.isEmpty()) + if (co == null || co.isEmpty()) { return; + } AcroFields af = reader.getAcroFields(); for (int k = 0; k < co.size(); ++k) { PdfObject obj = co.getPdfObject(k); - if (obj == null || !obj.isIndirect()) + if (obj == null || !obj.isIndirect()) { continue; + } String name = getCOName((PRIndirectReference) obj); - if (af.getFieldItem(name) == null) + if (af.getFieldItem(name) == null) { continue; + } name = "." + name; - if (calculationOrder.contains(name)) + if (calculationOrder.contains(name)) { continue; + } calculationOrder.add(name); } } @@ -197,8 +246,9 @@ private void propagate(PdfObject obj, boolean restricted) { case PdfObject.STREAM: { PdfDictionary dic = (PdfDictionary) obj; for (PdfName key : dic.getKeys()) { - if (restricted && (key.equals(PdfName.PARENT) || key.equals(PdfName.KIDS))) + if (restricted && (key.equals(PdfName.PARENT) || key.equals(PdfName.KIDS))) { continue; + } PdfObject ob = dic.get(key); if (ob != null && ob.isIndirect()) { PRIndirectReference ind = (PRIndirectReference) ob; @@ -214,10 +264,11 @@ private void propagate(PdfObject obj, boolean restricted) { } case PdfObject.ARRAY: { //PdfArray arr = new PdfArray(); - for (PdfObject ob : ((PdfArray)obj).getElements()) { + for (PdfObject ob : ((PdfArray) obj).getElements()) { if (ob != null && ob.isIndirect()) { PRIndirectReference ind = (PRIndirectReference) ob; - if (!isVisited(ind) && !isPage(ind) && ((PRIndirectReference) ob).getReader().getPdfObject(ind.getNumber()) != null) { + if (!isVisited(ind) && !isPage(ind) + && ((PRIndirectReference) ob).getReader().getPdfObject(ind.getNumber()) != null) { PdfIndirectReference ref = getNewReference(ind); propagate(PdfReader.getPdfObjectRelease(ind), restricted); } @@ -232,7 +283,7 @@ private void propagate(PdfObject obj, boolean restricted) { } } } - + private void adjustTabOrder(PdfArray annots, PdfIndirectReference ind, PdfNumber nn) { int v = nn.intValue(); List t = tabOrder.get(annots); @@ -245,8 +296,7 @@ private void adjustTabOrder(PdfArray annots, PdfIndirectReference ind, PdfNumber t.add(v); tabOrder.put(annots, t); annots.add(ind); - } - else { + } else { int size = t.size() - 1; for (int k = size; k >= 0; --k) { if (t.get(k) <= v) { @@ -263,19 +313,22 @@ private void adjustTabOrder(PdfArray annots, PdfIndirectReference ind, PdfNumber } } - protected PdfArray branchForm(Map level, PdfIndirectReference parent, String fname) throws IOException { + protected PdfArray branchForm(Map level, PdfIndirectReference parent, String fname) + throws IOException { PdfArray arr = new PdfArray(); for (Map.Entry entry : level.entrySet()) { String name = entry.getKey(); PdfIndirectReference ind = getPdfIndirectReference(); PdfDictionary dic = new PdfDictionary(); - if (parent != null) + if (parent != null) { dic.put(PdfName.PARENT, parent); + } dic.put(PdfName.T, new PdfString(name, PdfObject.TEXT_UNICODE)); String fname2 = fname + "." + name; int coidx = calculationOrder.indexOf(fname2); - if (coidx >= 0) + if (coidx >= 0) { calculationOrderRefs.set(coidx, ind); + } Object obj = entry.getValue(); if (obj instanceof Map) { @SuppressWarnings("unchecked") @@ -327,10 +380,11 @@ protected PdfArray branchForm(Map level, PdfIndirectReference pa } return arr; } - + protected void createAcroForms() throws IOException { - if (fieldTree.isEmpty()) + if (fieldTree.isEmpty()) { return; + } form = new PdfDictionary(); form.put(PdfName.DR, resources); propagate(resources, false); @@ -338,17 +392,20 @@ protected void createAcroForms() throws IOException { tabOrder = new HashMap<>(); calculationOrderRefs = new ArrayList<>(calculationOrder); form.put(PdfName.FIELDS, branchForm(fieldTree, null, "")); - if (hasSignature) + if (hasSignature) { form.put(PdfName.SIGFLAGS, new PdfNumber(3)); + } PdfArray co = new PdfArray(); for (Object obj : calculationOrderRefs) { - if (obj instanceof PdfIndirectReference) + if (obj instanceof PdfIndirectReference) { co.add((PdfIndirectReference) obj); + } } - if (co.size() > 0) + if (co.size() > 0) { form.put(PdfName.CO, co); + } } - + public void close() { if (closing) { super.close(); @@ -357,12 +414,11 @@ public void close() { closing = true; try { closeIt(); - } - catch (Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } } - + /** * Creates the new PDF by merging the fields and forms. */ @@ -409,10 +465,11 @@ protected void closeIt() throws IOException { } pdf.close(); } - + void addPageOffsetToField(Map fd, int pageOffset) { - if (pageOffset == 0) + if (pageOffset == 0) { return; + } for (Item item : fd.values()) { for (int k = 0; k < item.size(); ++k) { int p = item.getPage(k); @@ -426,12 +483,14 @@ void createWidgets(List list, Item item) { list.add(item.getPage(k)); // add an Integer PdfDictionary merged = item.getMerged(k); PdfObject dr = merged.get(PdfName.DR); - if (dr != null) - PdfFormField.mergeResources(resources, (PdfDictionary)PdfReader.getPdfObject(dr)); + if (dr != null) { + PdfFormField.mergeResources(resources, (PdfDictionary) PdfReader.getPdfObject(dr)); + } PdfDictionary widget = new PdfDictionary(); for (PdfName key : merged.getKeys()) { - if (widgetKeys.containsKey(key)) + if (widgetKeys.containsKey(key)) { widget.put(key, merged.get(key)); + } } widget.put(iTextTag, new PdfNumber(item.getTabOrder(k) + 1)); list.add(widget); // add a PdfDictionary @@ -441,8 +500,9 @@ void createWidgets(List list, Item item) { void mergeField(String name, Item item) { Map map = fieldTree; StringTokenizer tk = new StringTokenizer(name, "."); - if (!tk.hasMoreTokens()) + if (!tk.hasMoreTokens()) { return; + } while (true) { String s = tk.nextToken(); Object obj = map.get(s); @@ -455,53 +515,59 @@ void mergeField(String name, Item item) { @SuppressWarnings("unchecked") Map castMap = (Map) obj; map = castMap; - } - else + } else { return; - } - else { + } + } else { if (obj instanceof Map) { return; } PdfDictionary merged = item.getMerged(0); if (obj == null) { PdfDictionary field = new PdfDictionary(); - if (PdfName.SIG.equals(merged.get(PdfName.FT))) + if (PdfName.SIG.equals(merged.get(PdfName.FT))) { hasSignature = true; + } for (PdfName key : merged.getKeys()) { - if (fieldKeys.containsKey(key)) + if (fieldKeys.containsKey(key)) { field.put(key, merged.get(key)); + } } List list = new ArrayList<>(); list.add(field); createWidgets(list, item); map.put(s, list); - } - else { + } else { @SuppressWarnings("unchecked") List list = (List) obj; - PdfDictionary field = (PdfDictionary)list.get(0); - PdfName type1 = (PdfName)field.get(PdfName.FT); - PdfName type2 = (PdfName)merged.get(PdfName.FT); - if (type1 == null || !type1.equals(type2)) + PdfDictionary field = (PdfDictionary) list.get(0); + PdfName type1 = (PdfName) field.get(PdfName.FT); + PdfName type2 = (PdfName) merged.get(PdfName.FT); + if (type1 == null || !type1.equals(type2)) { return; + } int flag1 = 0; PdfObject f1 = field.get(PdfName.FF); - if (f1 != null && f1.isNumber()) - flag1 = ((PdfNumber)f1).intValue(); + if (f1 != null && f1.isNumber()) { + flag1 = ((PdfNumber) f1).intValue(); + } int flag2 = 0; PdfObject f2 = merged.get(PdfName.FF); - if (f2 != null && f2.isNumber()) - flag2 = ((PdfNumber)f2).intValue(); + if (f2 != null && f2.isNumber()) { + flag2 = ((PdfNumber) f2).intValue(); + } if (type1.equals(PdfName.BTN)) { - if (((flag1 ^ flag2) & PdfFormField.FF_PUSHBUTTON) != 0) + if (((flag1 ^ flag2) & PdfFormField.FF_PUSHBUTTON) != 0) { return; - if ((flag1 & PdfFormField.FF_PUSHBUTTON) == 0 && ((flag1 ^ flag2) & PdfFormField.FF_RADIO) != 0) + } + if ((flag1 & PdfFormField.FF_PUSHBUTTON) == 0 + && ((flag1 ^ flag2) & PdfFormField.FF_RADIO) != 0) { return; - } - else if (type1.equals(PdfName.CH)) { - if (((flag1 ^ flag2) & PdfFormField.FF_COMBO) != 0) + } + } else if (type1.equals(PdfName.CH)) { + if (((flag1 ^ flag2) & PdfFormField.FF_COMBO) != 0) { return; + } } createWidgets(list, item); } @@ -509,14 +575,14 @@ else if (type1.equals(PdfName.CH)) { } } } - + void mergeWithMaster(Map fd) { for (Map.Entry entry : fd.entrySet()) { String name = entry.getKey(); mergeField(name, entry.getValue()); } } - + void mergeFields() { int pageOffset = 0; for (int k = 0; k < fields.size(); ++k) { @@ -530,7 +596,7 @@ void mergeFields() { public PdfIndirectReference getPageReference(int page) { return pageRefs.get(page - 1); } - + protected PdfDictionary getCatalog(PdfIndirectReference rootObj) { try { PdfDictionary cat = pdf.getCatalog(rootObj); @@ -539,8 +605,7 @@ protected PdfDictionary getCatalog(PdfIndirectReference rootObj) { cat.put(PdfName.ACROFORM, ref); } return cat; - } - catch (IOException e) { + } catch (IOException e) { throw new ExceptionConverter(e); } } @@ -548,7 +613,7 @@ protected PdfDictionary getCatalog(PdfIndirectReference rootObj) { protected PdfIndirectReference getNewReference(PRIndirectReference ref) { return new PdfIndirectReference(0, getNewObjectNumber(ref.getReader(), ref.getNumber(), 0)); } - + protected int getNewObjectNumber(PdfReader reader, int number, int generation) { IntHashtable refs = readers2intrefs.get(reader); int n = refs.get(number); @@ -558,34 +623,37 @@ protected int getNewObjectNumber(PdfReader reader, int number, int generation) { } return n; } - - + /** * Sets a reference to "visited" in the copy process. - * @param ref the reference that needs to be set to "visited" - * @return true if the reference was set to visited + * + * @param ref the reference that needs to be set to "visited" + * @return true if the reference was set to visited */ protected boolean setVisited(PRIndirectReference ref) { IntHashtable refs = visited.get(ref.getReader()); - if (refs != null) + if (refs != null) { return (refs.put(ref.getNumber(), 1) != 0); - else + } else { return false; + } } - + /** * Checks if a reference has already been "visited" in the copy process. - * @param ref the reference that needs to be checked - * @return true if the reference was already visited + * + * @param ref the reference that needs to be checked + * @return true if the reference was already visited */ protected boolean isVisited(PRIndirectReference ref) { IntHashtable refs = visited.get(ref.getReader()); - if (refs != null) + if (refs != null) { return refs.containsKey(ref.getNumber()); - else + } else { return false; + } } - + protected boolean isVisited(PdfReader reader, int number) { IntHashtable refs = readers2intrefs.get(reader); return refs.containsKey(number); @@ -593,62 +661,26 @@ protected boolean isVisited(PdfReader reader, int number) { /** * Checks if a reference refers to a page object. - * @param ref the reference that needs to be checked - * @return true is the reference refers to a page object. + * + * @param ref the reference that needs to be checked + * @return true is the reference refers to a page object. */ protected boolean isPage(PRIndirectReference ref) { IntHashtable refs = pages2intrefs.get(ref.getReader()); - if (refs != null) + if (refs != null) { return refs.containsKey(ref.getNumber()); - else + } else { return false; + } } RandomAccessFileOrArray getReaderFile(PdfReader reader) { - return file; + return file; } public void openDoc() { - if (!nd.isOpen()) + if (!nd.isOpen()) { nd.open(); - } - - protected static final Map widgetKeys = new HashMap<>(); - protected static final Map fieldKeys = new HashMap<>(); - static { - Integer one = 1; - widgetKeys.put(PdfName.SUBTYPE, one); - widgetKeys.put(PdfName.CONTENTS, one); - widgetKeys.put(PdfName.RECT, one); - widgetKeys.put(PdfName.NM, one); - widgetKeys.put(PdfName.M, one); - widgetKeys.put(PdfName.F, one); - widgetKeys.put(PdfName.BS, one); - widgetKeys.put(PdfName.BORDER, one); - widgetKeys.put(PdfName.AP, one); - widgetKeys.put(PdfName.AS, one); - widgetKeys.put(PdfName.C, one); - widgetKeys.put(PdfName.A, one); - widgetKeys.put(PdfName.STRUCTPARENT, one); - widgetKeys.put(PdfName.OC, one); - widgetKeys.put(PdfName.H, one); - widgetKeys.put(PdfName.MK, one); - widgetKeys.put(PdfName.DA, one); - widgetKeys.put(PdfName.Q, one); - fieldKeys.put(PdfName.AA, one); - fieldKeys.put(PdfName.FT, one); - fieldKeys.put(PdfName.TU, one); - fieldKeys.put(PdfName.TM, one); - fieldKeys.put(PdfName.FF, one); - fieldKeys.put(PdfName.V, one); - fieldKeys.put(PdfName.DV, one); - fieldKeys.put(PdfName.DS, one); - fieldKeys.put(PdfName.RV, one); - fieldKeys.put(PdfName.OPT, one); - fieldKeys.put(PdfName.MAXLEN, one); - fieldKeys.put(PdfName.TI, one); - fieldKeys.put(PdfName.I, one); - fieldKeys.put(PdfName.LOCK, one); - fieldKeys.put(PdfName.SV, one); + } } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyForms.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyForms.java index 82c8367ca..77a572331 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyForms.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyForms.java @@ -49,134 +49,141 @@ package com.lowagie.text.pdf; -import java.io.IOException; -import java.io.OutputStream; -import java.security.cert.Certificate; -import java.util.List; - import com.lowagie.text.DocWriter; import com.lowagie.text.DocumentException; import com.lowagie.text.pdf.interfaces.PdfEncryptionSettings; import com.lowagie.text.pdf.interfaces.PdfViewerPreferences; +import java.io.IOException; +import java.io.OutputStream; +import java.security.cert.Certificate; +import java.util.List; /** - * Allows you to add one (or more) existing PDF document(s) to - * create a new PDF and add the form of another PDF document to - * this new PDF. + * Allows you to add one (or more) existing PDF document(s) to create a new PDF and add the form of another PDF document + * to this new PDF. + * * @since 2.1.5 */ public class PdfCopyForms - implements PdfViewerPreferences, PdfEncryptionSettings, AutoCloseable { - - /** The class with the actual implementations. */ + implements PdfViewerPreferences, PdfEncryptionSettings, AutoCloseable { + + /** + * The class with the actual implementations. + */ private PdfCopyFormsImp fc; - + /** * Creates a new instance. + * * @param os the output stream * @throws DocumentException on error - */ + */ public PdfCopyForms(OutputStream os) throws DocumentException { fc = new PdfCopyFormsImp(os); } - + /** * Concatenates a PDF document. + * * @param reader the PDF document * @throws DocumentException on error - * @throws IOException on error - */ + * @throws IOException on error + */ public void addDocument(PdfReader reader) throws DocumentException, IOException { fc.addDocument(reader); } - + /** * Concatenates a PDF document selecting the pages to keep. The pages are described as a * List of Integer. The page ordering can be changed but * no page repetitions are allowed. - * @param reader the PDF document + * + * @param reader the PDF document * @param pagesToKeep the pages to keep * @throws DocumentException on error - * @throws IOException on error - */ + * @throws IOException on error + */ public void addDocument(PdfReader reader, List pagesToKeep) throws DocumentException, IOException { fc.addDocument(reader, pagesToKeep); } /** - * Concatenates a PDF document selecting the pages to keep. The pages are described as - * ranges. The page ordering can be changed but - * no page repetitions are allowed. + * Concatenates a PDF document selecting the pages to keep. The pages are described as ranges. The page ordering can + * be changed but no page repetitions are allowed. + * * @param reader the PDF document * @param ranges the comma separated ranges as described in {@link SequenceList} * @throws DocumentException on error - * @throws IOException on error - */ + * @throws IOException on error + */ public void addDocument(PdfReader reader, String ranges) throws DocumentException, IOException { fc.addDocument(reader, SequenceList.expand(ranges, reader.getNumberOfPages())); } /** - *Copies the form fields of this PDFDocument onto the PDF-Document which was added + * Copies the form fields of this PDFDocument onto the PDF-Document which was added + * * @param reader the PDF document * @throws DocumentException on error */ - public void copyDocumentFields(PdfReader reader) throws DocumentException{ + public void copyDocumentFields(PdfReader reader) throws DocumentException { fc.copyDocumentFields(reader); } - /** Sets the encryption options for this document. The userPassword and the - * ownerPassword can be null or have zero length. In this case the ownerPassword - * is replaced by a random string. The open permissions for the document can be - * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, - * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. - * The permissions can be combined by ORing them. - * @param userPassword the user password. Can be null or empty - * @param ownerPassword the owner password. Can be null or empty - * @param permissions the user permissions + /** + * Sets the encryption options for this document. The userPassword and the ownerPassword can be null or have zero + * length. In this case the ownerPassword is replaced by a random string. The open permissions for the document can + * be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn, AllowScreenReaders, + * AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them. + * + * @param userPassword the user password. Can be null or empty + * @param ownerPassword the owner password. Can be null or empty + * @param permissions the user permissions * @param strength128Bits true for 128 bit key length, false for 40 bit key length * @throws DocumentException if the document is already open */ - public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, boolean strength128Bits) throws DocumentException { - fc.setEncryption(userPassword, ownerPassword, permissions, strength128Bits ? PdfWriter.STANDARD_ENCRYPTION_128 : PdfWriter.STANDARD_ENCRYPTION_40); + public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, boolean strength128Bits) + throws DocumentException { + fc.setEncryption(userPassword, ownerPassword, permissions, + strength128Bits ? PdfWriter.STANDARD_ENCRYPTION_128 : PdfWriter.STANDARD_ENCRYPTION_40); } - + /** - * Sets the encryption options for this document. The userPassword and the - * ownerPassword can be null or have zero length. In this case the ownerPassword - * is replaced by a random string. The open permissions for the document can be - * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, - * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. - * The permissions can be combined by ORing them. - * @param strength true for 128 bit key length. false for 40 bit key length - * @param userPassword the user password. Can be null or empty + * Sets the encryption options for this document. The userPassword and the ownerPassword can be null or have zero + * length. In this case the ownerPassword is replaced by a random string. The open permissions for the document can + * be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn, AllowScreenReaders, + * AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them. + * + * @param strength true for 128 bit key length. false for 40 bit key length + * @param userPassword the user password. Can be null or empty * @param ownerPassword the owner password. Can be null or empty - * @param permissions the user permissions + * @param permissions the user permissions * @throws DocumentException if the document is already open */ - public void setEncryption(boolean strength, String userPassword, String ownerPassword, int permissions) throws DocumentException { + public void setEncryption(boolean strength, String userPassword, String ownerPassword, int permissions) + throws DocumentException { setEncryption(DocWriter.getISOBytes(userPassword), DocWriter.getISOBytes(ownerPassword), permissions, strength); } - + /** * Closes the output document. - */ + */ public void close() { fc.close(); } /** - * Opens the document. This is usually not needed as addDocument() will do it - * automatically. - */ + * Opens the document. This is usually not needed as addDocument() will do it automatically. + */ public void open() { fc.openDoc(); } /** * Adds JavaScript to the global document + * * @param js the JavaScript - */ + */ public void addJavaScript(String js) { fc.addJavaScript(js, !PdfEncodings.isPdfDocEncoding(js)); } @@ -184,30 +191,34 @@ public void addJavaScript(String js) { /** * Sets the bookmarks. The list structure is defined in * SimpleBookmark#. + * * @param outlines the bookmarks or null to remove any - */ + */ public void setOutlines(List outlines) { fc.setOutlines(outlines); } - - /** Gets the underlying PdfWriter. + + /** + * Gets the underlying PdfWriter. + * * @return the underlying PdfWriter - */ + */ public PdfWriter getWriter() { return fc; } /** * Gets the 1.5 compression status. + * * @return true if the 1.5 compression is on */ public boolean isFullCompression() { return fc.isFullCompression(); } - + /** - * Sets the document's compression to the new 1.5 mode with object streams and xref - * streams. It can be set at any time but once set it can't be unset. + * Sets the document's compression to the new 1.5 mode with object streams and xref streams. It can be set at any + * time but once set it can't be unset. *

      * If set before opening the document it will also set the pdf version to 1.5. */ @@ -218,15 +229,17 @@ public void setFullCompression() { /** * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(byte[], byte[], int, int) */ - public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType) throws DocumentException { + public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType) + throws DocumentException { fc.setEncryption(userPassword, ownerPassword, permissions, encryptionType); } /** - * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#addViewerPreference(com.lowagie.text.pdf.PdfName, com.lowagie.text.pdf.PdfObject) + * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#addViewerPreference(com.lowagie.text.pdf.PdfName, + * com.lowagie.text.pdf.PdfObject) */ public void addViewerPreference(PdfName key, PdfObject value) { - fc.addViewerPreference(key, value); + fc.addViewerPreference(key, value); } /** @@ -237,9 +250,10 @@ public void setViewerPreferences(int preferences) { } /** - * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(java.security.cert.Certificate[], int[], int) + * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(java.security.cert.Certificate[], int[], + * int) */ public void setEncryption(Certificate[] certs, int[] permissions, int encryptionType) throws DocumentException { fc.setEncryption(certs, permissions, encryptionType); - } + } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFormsImp.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFormsImp.java index ca047a3c6..d49ee7441 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFormsImp.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFormsImp.java @@ -50,40 +50,43 @@ package com.lowagie.text.pdf; import com.lowagie.text.DocumentException; -import java.io.OutputStream; - import com.lowagie.text.error_messages.MessageLocalization; +import java.io.OutputStream; /** - * Allows you to add one (or more) existing PDF document(s) - * and add the form(s) of (an)other PDF document(s). + * Allows you to add one (or more) existing PDF document(s) and add the form(s) of (an)other PDF document(s). + * * @since 2.1.5 */ class PdfCopyFormsImp extends PdfCopyFieldsImp { /** - * This sets up the output document - * @param os The Outputstream pointing to the output document - * @throws DocumentException - */ + * This sets up the output document + * + * @param os The Outputstream pointing to the output document + * @throws DocumentException + */ PdfCopyFormsImp(OutputStream os) throws DocumentException { super(os); } - + /** * This method feeds in the source document + * * @param reader The PDF reader containing the source document * @throws DocumentException */ public void copyDocumentFields(PdfReader reader) throws DocumentException { - if (!reader.isOpenedWithFullPermissions()) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("pdfreader.not.opened.with.owner.password")); + if (!reader.isOpenedWithFullPermissions()) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("pdfreader.not.opened.with.owner.password")); + } if (readers2intrefs.containsKey(reader)) { reader = new PdfReader(reader); - } - else { - if (reader.isTampered()) + } else { + if (reader.isTampered()) { throw new DocumentException(MessageLocalization.getComposedMessage("the.document.was.reused")); + } reader.consolidateNamedDestinations(); reader.setTampered(true); } @@ -94,8 +97,7 @@ public void copyDocumentFields(PdfReader reader) throws DocumentException { } /** - * This merge fields is slightly different from the mergeFields method - * of PdfCopyFields. + * This merge fields is slightly different from the mergeFields method of PdfCopyFields. */ void mergeFields() { for (AcroFields field : fields) { diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDashPattern.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDashPattern.java index 4c9521092..657c29397 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDashPattern.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDashPattern.java @@ -53,35 +53,41 @@ import java.io.OutputStream; /** - * A PdfDashPattern defines a dash pattern as described in - * the PDF Reference Manual version 1.3 p 325 (section 8.4.3). + * A PdfDashPattern defines a dash pattern as described in the PDF Reference Manual version 1.3 p 325 + * (section 8.4.3). * - * @see PdfArray + * @see PdfArray */ public class PdfDashPattern extends PdfArray { - + // membervariables - -/** This is the length of a dash. */ + + /** + * This is the length of a dash. + */ private float dash = -1; - -/** This is the length of a gap. */ + + /** + * This is the length of a gap. + */ private float gap = -1; - -/** This is the phase. */ + + /** + * This is the phase. + */ private float phase = -1; - + // constructors - -/** - * Constructs a new PdfDashPattern. - */ - + + /** + * Constructs a new PdfDashPattern. + */ + public PdfDashPattern() { super(); } - + /** * Constructs a new PdfDashPattern. * @@ -91,12 +97,12 @@ public PdfDashPattern(float dash) { super(new PdfNumber(dash)); this.dash = dash; } - + /** * Constructs a new PdfDashPattern. * * @param dash {@link PdfDashPattern#dash} - * @param gap {@link PdfDashPattern#gap} + * @param gap {@link PdfDashPattern#gap} */ public PdfDashPattern(float dash, float gap) { super(new PdfNumber(dash)); @@ -104,12 +110,12 @@ public PdfDashPattern(float dash, float gap) { this.dash = dash; this.gap = gap; } - + /** * Constructs a new PdfDashPattern. * - * @param dash {@link PdfDashPattern#dash} - * @param gap {@link PdfDashPattern#gap} + * @param dash {@link PdfDashPattern#dash} + * @param gap {@link PdfDashPattern#gap} * @param phase {@link PdfDashPattern#phase} */ public PdfDashPattern(float dash, float gap, float phase) { @@ -119,15 +125,15 @@ public PdfDashPattern(float dash, float gap, float phase) { this.gap = gap; this.phase = phase; } - + public void add(float n) { add(new PdfNumber(n)); } - -/** - * Returns the PDF representation of this PdfArray. - */ - + + /** + * Returns the PDF representation of this PdfArray. + */ + public void toPdf(PdfWriter writer, OutputStream os) throws IOException { os.write('['); @@ -139,7 +145,7 @@ public void toPdf(PdfWriter writer, OutputStream os) throws IOException { } } os.write(']'); - if (phase >=0) { + if (phase >= 0) { os.write(' '); new PdfNumber(phase).toPdf(writer, os); } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDate.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDate.java index f79ee13a9..0226917ba 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDate.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDate.java @@ -55,33 +55,32 @@ /** * PdfDate is the PDF date object. - *

      - * PDF defines a standard date format. The PDF date format closely follows the format - * defined by the international standard ASN.1 (Abstract Syntax Notation One, defined - * in CCITT X.208 or ISO/IEC 8824). A date is a PdfString of the form: + *

      + * PDF defines a standard date format. The PDF date format closely follows the format defined by the international + * standard ASN.1 (Abstract Syntax Notation One, defined in CCITT X.208 or ISO/IEC 8824). A date is a + * PdfString of the form: *

      * (D:YYYYMMDDHHmmSSOHH'mm') *

      - * This object is described in the 'Portable Document Format Reference Manual version 1.3' - * section 7.2 (page 183-184) + * This object is described in the 'Portable Document Format Reference Manual version 1.3' section 7.2 (page 183-184) * - * @see PdfString - * @see java.util.GregorianCalendar + * @see PdfString + * @see java.util.GregorianCalendar */ public class PdfDate extends PdfString { private static final int[] DATE_SPACE = {Calendar.YEAR, 4, 0, Calendar.MONTH, 2, -1, Calendar.DAY_OF_MONTH, 2, 0, Calendar.HOUR_OF_DAY, 2, 0, Calendar.MINUTE, 2, 0, Calendar.SECOND, 2, 0}; - + // constructors - -/** - * Constructs a PdfDate-object. - * - * @param d the date that has to be turned into a PdfDate-object - */ - + + /** + * Constructs a PdfDate-object. + * + * @param d the date that has to be turned into a PdfDate-object + */ + public PdfDate(Calendar d) { super(); StringBuilder date = new StringBuilder("D:"); @@ -94,22 +93,21 @@ public PdfDate(Calendar d) { int timezone = (d.get(Calendar.ZONE_OFFSET) + d.get(Calendar.DST_OFFSET)) / (60 * 60 * 1000); if (timezone == 0) { date.append('Z'); - } - else if (timezone < 0) { + } else if (timezone < 0) { date.append('-'); timezone = -timezone; - } - else { + } else { date.append('+'); } if (timezone != 0) { date.append(setLength(timezone, 2)).append('\''); - int zone = Math.abs((d.get(Calendar.ZONE_OFFSET) + d.get(Calendar.DST_OFFSET)) / (60 * 1000)) - (timezone * 60); + int zone = Math.abs((d.get(Calendar.ZONE_OFFSET) + d.get(Calendar.DST_OFFSET)) / (60 * 1000)) - (timezone + * 60); date.append(setLength(zone, 2)).append('\''); } value = date.toString(); } - + /** * Constructs a PdfDate-object. * @@ -119,64 +117,43 @@ public PdfDate(String d) { super(); value = d; } - + /** * Constructs a PdfDate-object, representing the current day and time. */ public PdfDate() { this(new GregorianCalendar()); } - -/** - * Adds a number of leading zeros to a given String in order to get a String - * of a certain length. - * - * @param i a given number - * @param length the length of the resulting String - * @return the resulting String - */ - - private String setLength(int i, int length) { // 1.3-1.4 problem fixed by Finn Bock - StringBuilder tmp = new StringBuilder(); - tmp.append(i); - while (tmp.length() < length) { - tmp.insert(0, "0"); - } - tmp.setLength(length); - return tmp.toString(); - } - - /** - * Gives the W3C format of the PdfDate. - * @return a formatted date - */ - public String getW3CDate() { - return getW3CDate(value); - } - + /** * Gives the W3C format of the PdfDate. + * * @param d the date in the format D:YYYYMMDDHHmmSSOHH'mm' * @return a formatted date */ public static String getW3CDate(String d) { - if (d.startsWith("D:")) + if (d.startsWith("D:")) { d = d.substring(2); + } StringBuilder sb = new StringBuilder(); - if (d.length() < 4) + if (d.length() < 4) { return "0000"; + } sb.append(d, 0, 4); //year d = d.substring(4); - if (d.length() < 2) + if (d.length() < 2) { return sb.toString(); + } sb.append('-').append(d, 0, 2); //month d = d.substring(2); - if (d.length() < 2) + if (d.length() < 2) { return sb.toString(); + } sb.append('-').append(d, 0, 2); //day d = d.substring(2); - if (d.length() < 2) + if (d.length() < 2) { return sb.toString(); + } sb.append('T').append(d, 0, 2); //hour d = d.substring(2); if (d.length() < 2) { @@ -200,8 +177,9 @@ public static String getW3CDate(String d) { h = d.substring(0, 2); if (d.length() > 2) { d = d.substring(3); - if (d.length() >= 2) + if (d.length() >= 2) { m = d.substring(0, 2); + } } sb.append(sign).append(h).append(':').append(m); return sb.toString(); @@ -210,38 +188,40 @@ public static String getW3CDate(String d) { sb.append('Z'); return sb.toString(); } - + /** * Converts a PDF string representing a date into a Calendar. + * * @param s the PDF string representing a date - * @return a Calendar representing the date or null if the string - * was not a date - */ + * @return a Calendar representing the date or null if the string was not a date + */ public static Calendar decode(String s) { try { - if (s.startsWith("D:")) + if (s.startsWith("D:")) { s = s.substring(2); + } GregorianCalendar calendar; int slen = s.length(); int idx = s.indexOf('Z'); if (idx >= 0) { slen = idx; calendar = new GregorianCalendar(new SimpleTimeZone(0, "ZPDF")); - } - else { + } else { int sign = 1; idx = s.indexOf('+'); if (idx < 0) { idx = s.indexOf('-'); - if (idx >= 0) + if (idx >= 0) { sign = -1; + } } - if (idx < 0) + if (idx < 0) { calendar = new GregorianCalendar(); - else { + } else { int offset = Integer.parseInt(s.substring(idx + 1, idx + 3)) * 60; - if (idx + 5 < s.length()) + if (idx + 5 < s.length()) { offset += Integer.parseInt(s.substring(idx + 4, idx + 6)); + } calendar = new GregorianCalendar(new SimpleTimeZone(offset * sign * 60000, "ZPDF")); slen = idx; } @@ -249,15 +229,44 @@ public static Calendar decode(String s) { calendar.clear(); idx = 0; for (int k = 0; k < DATE_SPACE.length; k += 3) { - if (idx >= slen) + if (idx >= slen) { break; - calendar.set(DATE_SPACE[k], Integer.parseInt(s.substring(idx, idx + DATE_SPACE[k + 1])) + DATE_SPACE[k + 2]); + } + calendar.set(DATE_SPACE[k], + Integer.parseInt(s.substring(idx, idx + DATE_SPACE[k + 1])) + DATE_SPACE[k + 2]); idx += DATE_SPACE[k + 1]; } return calendar; - } - catch (Exception e) { + } catch (Exception e) { return null; } } + + /** + * Adds a number of leading zeros to a given String in order to get a String of a certain + * length. + * + * @param i a given number + * @param length the length of the resulting String + * @return the resulting String + */ + + private String setLength(int i, int length) { // 1.3-1.4 problem fixed by Finn Bock + StringBuilder tmp = new StringBuilder(); + tmp.append(i); + while (tmp.length() < length) { + tmp.insert(0, "0"); + } + tmp.setLength(length); + return tmp.toString(); + } + + /** + * Gives the W3C format of the PdfDate. + * + * @return a formatted date + */ + public String getW3CDate() { + return getW3CDate(value); + } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDestination.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDestination.java index ff38ca699..7eff5bfa2 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDestination.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDestination.java @@ -54,82 +54,97 @@ /** * A PdfColor defines a Color (it's a PdfArray containing 3 values). * - * @see PdfDictionary + * @see PdfDictionary */ public class PdfDestination extends PdfArray { - + // public static final member-variables - -/** This is a possible destination type */ + + /** + * This is a possible destination type + */ public static final int XYZ = 0; - -/** This is a possible destination type */ + + /** + * This is a possible destination type + */ public static final int FIT = 1; - -/** This is a possible destination type */ + + /** + * This is a possible destination type + */ public static final int FITH = 2; - -/** This is a possible destination type */ + + /** + * This is a possible destination type + */ public static final int FITV = 3; - -/** This is a possible destination type */ + + /** + * This is a possible destination type + */ public static final int FITR = 4; - -/** This is a possible destination type */ + + /** + * This is a possible destination type + */ public static final int FITB = 5; - -/** This is a possible destination type */ + + /** + * This is a possible destination type + */ public static final int FITBH = 6; - -/** This is a possible destination type */ + + /** + * This is a possible destination type + */ public static final int FITBV = 7; - + // member variables - -/** Is the indirect reference to a page already added? */ + + /** + * Is the indirect reference to a page already added? + */ private boolean status = false; - + // constructors - -/** - * Constructs a new PdfDestination. - *

      - * If type equals FITB, the bounding box of a page - * will fit the window of the Reader. Otherwise the type will be set to - * FIT so that the entire page will fit to the window. - * - * @param type The destination type - */ - + + /** + * Constructs a new PdfDestination. + *

      + * If type equals FITB, the bounding box of a page will fit the window of the Reader. + * Otherwise the type will be set to + * FIT so that the entire page will fit to the window. + * + * @param type The destination type + */ + public PdfDestination(int type) { super(); if (type == FITB) { add(PdfName.FITB); - } - else { + } else { add(PdfName.FIT); } } - -/** - * Constructs a new PdfDestination. - *

      - * If type equals FITBH / FITBV, - * the width / height of the bounding box of a page will fit the window - * of the Reader. The parameter will specify the y / x coordinate of the - * top / left edge of the window. If the type equals FITH - * or FITV the width / height of the entire page will fit - * the window and the parameter will specify the y / x coordinate of the - * top / left edge. In all other cases the type will be set to FITH. - * - * @param type the destination type - * @param parameter a parameter to combined with the destination type - */ - + + /** + * Constructs a new PdfDestination. + *

      + * If type equals FITBH / FITBV, the width / height of the bounding box of a page + * will fit the window of the Reader. The parameter will specify the y / x coordinate of the top / left edge of the + * window. If the type equals FITH or FITV the width / height of the entire page + * will fit the window and the parameter will specify the y / x coordinate of the top / left edge. In all other + * cases the type will be set to FITH. + * + * @param type the destination type + * @param parameter a parameter to combined with the destination type + */ + public PdfDestination(int type, float parameter) { super(new PdfNumber(parameter)); - switch(type) { + switch (type) { default: addFirst(PdfName.FITH); break; @@ -143,48 +158,51 @@ public PdfDestination(int type, float parameter) { addFirst(PdfName.FITBV); } } - -/** Constructs a new PdfDestination. - *

      - * Display the page, with the coordinates (left, top) positioned - * at the top-left corner of the window and the contents of the page magnified - * by the factor zoom. A negative value for any of the parameters left or top, or a - * zoom value of 0 specifies that the current value of that parameter is to be retained unchanged. - * @param type must be a PdfDestination.XYZ - * @param left the left value. Negative to place a null - * @param top the top value. Negative to place a null - * @param zoom The zoom factor. A value of 0 keeps the current value - */ - + + /** + * Constructs a new PdfDestination. + *

      + * Display the page, with the coordinates (left, top) positioned at the top-left corner of the window and the + * contents of the page magnified by the factor zoom. A negative value for any of the parameters left or top, or a + * zoom value of 0 specifies that the current value of that parameter is to be retained unchanged. + * + * @param type must be a PdfDestination.XYZ + * @param left the left value. Negative to place a null + * @param top the top value. Negative to place a null + * @param zoom The zoom factor. A value of 0 keeps the current value + */ + public PdfDestination(int type, float left, float top, float zoom) { super(PdfName.XYZ); - if (left < 0) + if (left < 0) { add(PdfNull.PDFNULL); - else + } else { add(new PdfNumber(left)); - if (top < 0) + } + if (top < 0) { add(PdfNull.PDFNULL); - else + } else { add(new PdfNumber(top)); + } add(new PdfNumber(zoom)); } - -/** Constructs a new PdfDestination. - *

      - * Display the page, with its contents magnified just enough - * to fit the rectangle specified by the coordinates left, bottom, right, and top - * entirely within the window both horizontally and vertically. If the required - * horizontal and vertical magnification factors are different, use the smaller of - * the two, centering the rectangle within the window in the other dimension. - * - * @param type must be PdfDestination.FITR - * @param left a parameter - * @param bottom a parameter - * @param right a parameter - * @param top a parameter - * @since iText0.38 - */ - + + /** + * Constructs a new PdfDestination. + *

      + * Display the page, with its contents magnified just enough to fit the rectangle specified by the coordinates left, + * bottom, right, and top entirely within the window both horizontally and vertically. If the required horizontal + * and vertical magnification factors are different, use the smaller of the two, centering the rectangle within the + * window in the other dimension. + * + * @param type must be PdfDestination.FITR + * @param left a parameter + * @param bottom a parameter + * @param right a parameter + * @param top a parameter + * @since iText0.38 + */ + public PdfDestination(int type, float left, float bottom, float right, float top) { super(PdfName.FITR); add(new PdfNumber(left)); @@ -192,13 +210,13 @@ public PdfDestination(int type, float left, float bottom, float right, float top add(new PdfNumber(right)); add(new PdfNumber(top)); } - + /** - * Creates a PdfDestination based on a String. - * Valid Strings are for instance the values returned by SimpleNamedDestination: - * "Fit", "XYZ 36 806 0",... - * @param dest a String notation of a destination. - * @since iText 5.0 + * Creates a PdfDestination based on a String. Valid Strings are for instance the values returned by + * SimpleNamedDestination: "Fit", "XYZ 36 806 0",... + * + * @param dest a String notation of a destination. + * @since iText 5.0 */ public PdfDestination(String dest) { super(); @@ -210,25 +228,26 @@ public PdfDestination(String dest) { add(new PdfNumber(tokens.nextToken())); } } - + // methods -/** - * Checks if an indirect reference to a page has been added. - * - * @return true or false - */ - + /** + * Checks if an indirect reference to a page has been added. + * + * @return true or false + */ + public boolean hasPage() { return status; } - -/** Adds the indirect reference of the destination page. - * - * @param page an indirect reference - * @return true if the page reference was added - */ - + + /** + * Adds the indirect reference of the destination page. + * + * @param page an indirect reference + * @return true if the page reference was added + */ + public boolean addPage(PdfIndirectReference page) { if (!status) { addFirst(page); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDeveloperExtension.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDeveloperExtension.java index b165cdf37..2498afdcf 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDeveloperExtension.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDeveloperExtension.java @@ -50,37 +50,43 @@ package com.lowagie.text.pdf; /** - * Beginning with BaseVersion 1.7, the extensions dictionary lets developers - * designate that a given document contains extensions to PDF. The presence - * of the extension dictionary in a document indicates that it may contain - * developer-specific PDF properties that extend a particular base version - * of the PDF specification. - * The extensions dictionary enables developers to identify their own extensions - * relative to a base version of PDF. Additionally, the convention identifies - * extension levels relative to that base version. The intent of this dictionary - * is to enable developers of PDF-producing applications to identify company-specific - * specifications (such as this one) that PDF-consuming applications use to - * interpret the extensions. - * @since 2.1.6 + * Beginning with BaseVersion 1.7, the extensions dictionary lets developers designate that a given document contains + * extensions to PDF. The presence of the extension dictionary in a document indicates that it may contain + * developer-specific PDF properties that extend a particular base version of the PDF specification. The extensions + * dictionary enables developers to identify their own extensions relative to a base version of PDF. Additionally, the + * convention identifies extension levels relative to that base version. The intent of this dictionary is to enable + * developers of PDF-producing applications to identify company-specific specifications (such as this one) that + * PDF-consuming applications use to interpret the extensions. + * + * @since 2.1.6 */ public class PdfDeveloperExtension { - /** An instance of this class for Adobe 1.7 Extension level 3. */ + /** + * An instance of this class for Adobe 1.7 Extension level 3. + */ public static final PdfDeveloperExtension ADOBE_1_7_EXTENSIONLEVEL3 = - new PdfDeveloperExtension(PdfName.ADBE, PdfWriter.PDF_VERSION_1_7, 3); - - /** The prefix used in the Extensions dictionary added to the Catalog. */ + new PdfDeveloperExtension(PdfName.ADBE, PdfWriter.PDF_VERSION_1_7, 3); + + /** + * The prefix used in the Extensions dictionary added to the Catalog. + */ protected PdfName prefix; - /** The base version. */ + /** + * The base version. + */ protected PdfName baseversion; - /** The extension level within the baseversion. */ + /** + * The extension level within the baseversion. + */ protected int extensionLevel; - + /** * Creates a PdfDeveloperExtension object. - * @param prefix the prefix referring to the developer + * + * @param prefix the prefix referring to the developer * @param baseversion the number of the base version - * @param extensionLevel the extension level within the baseverion. + * @param extensionLevel the extension level within the baseverion. */ public PdfDeveloperExtension(PdfName prefix, PdfName baseversion, int extensionLevel) { this.prefix = prefix; @@ -90,7 +96,8 @@ public PdfDeveloperExtension(PdfName prefix, PdfName baseversion, int extensionL /** * Gets the prefix name. - * @return a PdfName + * + * @return a PdfName */ public PdfName getPrefix() { return prefix; @@ -98,7 +105,8 @@ public PdfName getPrefix() { /** * Gets the baseversion name. - * @return a PdfName + * + * @return a PdfName */ public PdfName getBaseversion() { return baseversion; @@ -106,16 +114,17 @@ public PdfName getBaseversion() { /** * Gets the extension level within the baseversion. - * @return an integer + * + * @return an integer */ public int getExtensionLevel() { return extensionLevel; } - + /** - * Generations the developer extension dictionary corresponding - * with the prefix. - * @return a PdfDictionary + * Generations the developer extension dictionary corresponding with the prefix. + * + * @return a PdfDictionary */ public PdfDictionary getDeveloperExtensions() { PdfDictionary developerextensions = new PdfDictionary(); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDictionary.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDictionary.java index 4901cae4e..7de368379 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDictionary.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDictionary.java @@ -53,56 +53,64 @@ import java.io.OutputStream; import java.util.HashMap; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; /** * PdfDictionary is the Pdf dictionary object. - *

      - * A dictionary is an associative table containing pairs of objects. - * The first element of each pair is called the key and the second - * element is called the value. - * Unlike dictionaries in the PostScript language, a key must be a + *

      + * A dictionary is an associative table containing pairs of objects. The first element of each pair is called the + * key and the second element is called the value. Unlike dictionaries in the PostScript language, a key + * must be a * PdfName. - * A value can be any kind of PdfObject, including a dictionary. - * A dictionary is generally used to collect and tie together the attributes - * of a complex object, with each key-value pair specifying the name and value - * of an attribute.
      - * A dictionary is represented by two left angle brackets ({@literal <<}), followed by a - * sequence of key-value pairs, followed by two right angle brackets ({@literal >>}).
      - * This object is described in the 'Portable Document Format Reference Manual - * version 1.7' section 3.2.6 (page 59-60). + * A value can be any kind of PdfObject, including a dictionary. A dictionary is generally used to collect + * and tie together the attributes of a complex object, with each key-value pair specifying the name and value of an + * attribute.
      A dictionary is represented by two left angle brackets ({@literal <<}), followed by a sequence of + * key-value pairs, followed by two right angle brackets ({@literal >>}).
      This object is described in the 'Portable + * Document Format Reference Manual version 1.7' section 3.2.6 (page 59-60). * - * @see PdfObject - * @see PdfName - * @see BadPdfFormatException + * @see PdfObject + * @see PdfName + * @see BadPdfFormatException */ public class PdfDictionary extends PdfObject { // CONSTANTS - /** This is a possible type of dictionary */ + /** + * This is a possible type of dictionary + */ public static final PdfName FONT = PdfName.FONT; - /** This is a possible type of dictionary */ + /** + * This is a possible type of dictionary + */ public static final PdfName OUTLINES = PdfName.OUTLINES; - /** This is a possible type of dictionary */ + /** + * This is a possible type of dictionary + */ public static final PdfName PAGE = PdfName.PAGE; - /** This is a possible type of dictionary */ + /** + * This is a possible type of dictionary + */ public static final PdfName PAGES = PdfName.PAGES; - /** This is a possible type of dictionary */ + /** + * This is a possible type of dictionary + */ public static final PdfName CATALOG = PdfName.CATALOG; // CLASS VARIABLES - - /** This is the type of this dictionary */ - private PdfName dictionaryType = null; - - /** This is the hashmap that contains all the values and keys of the dictionary */ + /** + * This is the hashmap that contains all the values and keys of the dictionary + */ protected Map hashMap; + /** + * This is the type of this dictionary + */ + private PdfName dictionaryType = null; // CONSTRUCTORS @@ -128,11 +136,11 @@ public PdfDictionary(PdfName type) { // METHODS OVERRIDING SOME PDFOBJECT METHODS /** - * Writes the PDF representation of this PdfDictionary as an - * array of byte to the given OutputStream. + * Writes the PDF representation of this PdfDictionary as an array of byte to the given + * OutputStream. * * @param writer for backwards compatibility - * @param os the OutputStream to write the bytes to. + * @param os the OutputStream to write the bytes to. * @throws IOException on error */ public void toPdf(PdfWriter writer, OutputStream os) throws IOException { @@ -143,8 +151,10 @@ public void toPdf(PdfWriter writer, OutputStream os) throws IOException { PdfObject value = hashMap.get(pdfName); pdfName.toPdf(writer, os); int type = value.type(); - if (type != PdfObject.ARRAY && type != PdfObject.DICTIONARY && type != PdfObject.NAME && type != PdfObject.STRING) + if (type != PdfObject.ARRAY && type != PdfObject.DICTIONARY && type != PdfObject.NAME + && type != PdfObject.STRING) { os.write(' '); + } value.toPdf(writer, os); } os.write('>'); @@ -153,68 +163,69 @@ public void toPdf(PdfWriter writer, OutputStream os) throws IOException { /** * Returns a string representation of this PdfDictionary. - * - * The string doesn't contain any of the content of this dictionary. - * Rather the string "dictionary" is returned, possibly followed by the - * type of this PdfDictionary, if set. + *

      + * The string doesn't contain any of the content of this dictionary. Rather the string "dictionary" is returned, + * possibly followed by the type of this PdfDictionary, if set. * * @return the string representation of this PdfDictionary * @see com.lowagie.text.pdf.PdfObject#toString() */ public String toString() { - if (get(PdfName.TYPE) == null) + if (get(PdfName.TYPE) == null) { return "Dictionary"; + } return "Dictionary of type: " + get(PdfName.TYPE); } // DICTIONARY CONTENT METHODS /** - * Associates the specified PdfObject as value with - * the specified PdfName as key in this map. - * - * If the map previously contained a mapping for this key, the - * old value is replaced. If the value is + * Associates the specified PdfObject as value with the specified PdfName as + * key in this map. + *

      + * If the map previously contained a mapping for this key, the old value is replaced. If the + * value is * null or PdfNull the key is deleted. * - * @param key a PdfName + * @param key a PdfName * @param object the PdfObject to be associated with the - * key + * key */ public void put(PdfName key, PdfObject object) { - if (object == null || object.isNull()) + if (object == null || object.isNull()) { hashMap.remove(key); - else + } else { hashMap.put(key, object); + } } /** - * Associates the specified PdfObject as value to the - * specified PdfName as key in this map. - * - * If the value is a PdfNull, it is treated just as - * any other PdfObject. If the value is + * Associates the specified PdfObject as value to the specified PdfName as key in this + * map. + *

      + * If the value is a PdfNull, it is treated just as any other PdfObject. If + * the + * value is * null however nothing is done. * - * @param key a PdfName + * @param key a PdfName * @param value the PdfObject to be associated to the - * key + * key */ public void putEx(PdfName key, PdfObject value) { - if (value == null) + if (value == null) { return; + } put(key, value); } /** - * Copies all of the mappings from the specified PdfDictionary - * to this PdfDictionary. - * + * Copies all of the mappings from the specified PdfDictionary to this PdfDictionary. + *

      * These mappings will replace any mappings previously contained in this * PdfDictionary. * - * @param dic The PdfDictionary with the mappings to be - * copied over + * @param dic The PdfDictionary with the mappings to be copied over */ public void putAll(PdfDictionary dic) { hashMap.putAll(dic.hashMap); @@ -229,7 +240,7 @@ public void putAll(PdfDictionary dic) { public void remove(PdfName key) { hashMap.remove(key); } - + /** * Clears all values of a PdfDictionary. */ @@ -243,7 +254,7 @@ public void clear() { * * @param key a PdfName * @return the PdfObject previously associated to the - * key + * key */ public PdfObject get(PdfName key) { return hashMap.get(key); @@ -253,9 +264,8 @@ public PdfObject get(PdfName key) { * Returns the PdfObject associated to the specified * key, resolving a possible indirect reference to a direct * object. - * - * This method will never return a PdfIndirectReference - * object. + *

      + * This method will never return a PdfIndirectReference object. * * @param key A key for the PdfObject to be returned * @return A direct PdfObject or null @@ -272,9 +282,10 @@ public PdfObject getDirectObject(PdfName key) { public Set getKeys() { return hashMap.keySet(); } - + /** * Get all keys and values as Map.Entry + * * @return a {@code Set>} of keys and values */ public Set> getKeysAndValues() { @@ -286,15 +297,15 @@ public Set> getKeysAndValues() { * PdfDictionary. * * @return the number of key-value mappings in this - * PdfDictionary. + * PdfDictionary. */ public int size() { return hashMap.size(); } /** - * Returns true if this PdfDictionary contains a - * mapping for the specified key. + * Returns true if this PdfDictionary contains a mapping for the specified + * key. * * @param key key * @return true if the key is set, otherwise false. @@ -358,177 +369,157 @@ public void merge(PdfDictionary other) { public void mergeDifferent(PdfDictionary other) { for (PdfName key : other.hashMap.keySet()) { - if (!hashMap.containsKey(key)) + if (!hashMap.containsKey(key)) { hashMap.put(key, other.hashMap.get(key)); + } } } - // DOWNCASTING GETTERS - // @author Mark A Storer (2/17/06) + // DOWNCASTING GETTERS + // @author Mark A Storer (2/17/06) /** - * Returns a PdfObject as a PdfDictionary, - * resolving indirect references. - * - * The object associated with the PdfName given is retrieved - * and resolved to a direct object. - * If it is a PdfDictionary, it is cast down and returned as - * such. Otherwise null is returned. + * Returns a PdfObject as a PdfDictionary, resolving indirect references. + *

      + * The object associated with the PdfName given is retrieved and resolved to a direct object. If it is + * a PdfDictionary, it is cast down and returned as such. Otherwise null is returned. * * @param key A PdfName - * @return the associated PdfDictionary object, - * or null + * @return the associated PdfDictionary object, or null */ public PdfDictionary getAsDict(PdfName key) { PdfDictionary dict = null; PdfObject orig = getDirectObject(key); - if (orig != null && orig.isDictionary()) + if (orig != null && orig.isDictionary()) { dict = (PdfDictionary) orig; + } return dict; } /** - * Returns a PdfObject as a PdfArray, - * resolving indirect references. - * - * The object associated with the PdfName given is retrieved - * and resolved to a direct object. - * If it is a PdfArray, it is cast down and returned as such. - * Otherwise null is returned. + * Returns a PdfObject as a PdfArray, resolving indirect references. + *

      + * The object associated with the PdfName given is retrieved and resolved to a direct object. If it is + * a PdfArray, it is cast down and returned as such. Otherwise null is returned. * * @param key A PdfName - * @return the associated PdfArray object, - * or null + * @return the associated PdfArray object, or null */ public PdfArray getAsArray(PdfName key) { PdfArray array = null; PdfObject orig = getDirectObject(key); - if (orig != null && orig.isArray()) + if (orig != null && orig.isArray()) { array = (PdfArray) orig; + } return array; } /** - * Returns a PdfObject as a PdfStream, - * resolving indirect references. - * - * The object associated with the PdfName given is retrieved - * and resolved to a direct object. - * If it is a PdfStream, it is cast down and returned as such. - * Otherwise null is returned. + * Returns a PdfObject as a PdfStream, resolving indirect references. + *

      + * The object associated with the PdfName given is retrieved and resolved to a direct object. If it is + * a PdfStream, it is cast down and returned as such. Otherwise null is returned. * * @param key A PdfName - * @return the associated PdfStream object, - * or null + * @return the associated PdfStream object, or null */ public PdfStream getAsStream(PdfName key) { PdfStream stream = null; PdfObject orig = getDirectObject(key); - if (orig != null && orig.isStream()) + if (orig != null && orig.isStream()) { stream = (PdfStream) orig; + } return stream; } /** - * Returns a PdfObject as a PdfString, - * resolving indirect references. - * - * The object associated with the PdfName given is retrieved - * and resolved to a direct object. - * If it is a PdfString, it is cast down and returned as such. - * Otherwise null is returned. + * Returns a PdfObject as a PdfString, resolving indirect references. + *

      + * The object associated with the PdfName given is retrieved and resolved to a direct object. If it is + * a PdfString, it is cast down and returned as such. Otherwise null is returned. * * @param key A PdfName - * @return the associated PdfString object, - * or null + * @return the associated PdfString object, or null */ public PdfString getAsString(PdfName key) { PdfString string = null; PdfObject orig = getDirectObject(key); - if (orig != null && orig.isString()) + if (orig != null && orig.isString()) { string = (PdfString) orig; + } return string; } /** - * Returns a PdfObject as a PdfNumber, - * resolving indirect references. - * - * The object associated with the PdfName given is retrieved - * and resolved to a direct object. - * If it is a PdfNumber, it is cast down and returned as such. - * Otherwise null is returned. + * Returns a PdfObject as a PdfNumber, resolving indirect references. + *

      + * The object associated with the PdfName given is retrieved and resolved to a direct object. If it is + * a PdfNumber, it is cast down and returned as such. Otherwise null is returned. * * @param key A PdfName - * @return the associated PdfNumber object, - * or null + * @return the associated PdfNumber object, or null */ public PdfNumber getAsNumber(PdfName key) { PdfNumber number = null; PdfObject orig = getDirectObject(key); - if (orig != null && orig.isNumber()) + if (orig != null && orig.isNumber()) { number = (PdfNumber) orig; + } return number; } /** - * Returns a PdfObject as a PdfName, - * resolving indirect references. - * - * The object associated with the PdfName given is retrieved - * and resolved to a direct object. - * If it is a PdfName, it is cast down and returned as such. - * Otherwise null is returned. + * Returns a PdfObject as a PdfName, resolving indirect references. + *

      + * The object associated with the PdfName given is retrieved and resolved to a direct object. If it is + * a PdfName, it is cast down and returned as such. Otherwise null is returned. * * @param key A PdfName - * @return the associated PdfName object, - * or null + * @return the associated PdfName object, or null */ public PdfName getAsName(PdfName key) { PdfName name = null; PdfObject orig = getDirectObject(key); - if (orig != null && orig.isName()) + if (orig != null && orig.isName()) { name = (PdfName) orig; + } return name; } /** - * Returns a PdfObject as a PdfBoolean, - * resolving indirect references. - * - * The object associated with the PdfName given is retrieved - * and resolved to a direct object. - * If it is a PdfBoolean, it is cast down and returned as such. - * Otherwise null is returned. + * Returns a PdfObject as a PdfBoolean, resolving indirect references. + *

      + * The object associated with the PdfName given is retrieved and resolved to a direct object. If it is + * a PdfBoolean, it is cast down and returned as such. Otherwise null is returned. * * @param key A PdfName - * @return the associated PdfBoolean object, - * or null + * @return the associated PdfBoolean object, or null */ public PdfBoolean getAsBoolean(PdfName key) { PdfBoolean bool = null; PdfObject orig = getDirectObject(key); - if (orig != null && orig.isBoolean()) - bool = (PdfBoolean)orig; + if (orig != null && orig.isBoolean()) { + bool = (PdfBoolean) orig; + } return bool; } /** * Returns a PdfObject as a PdfIndirectReference. - * - * The object associated with the PdfName given is retrieved - * If it is a PdfIndirectReference, it is cast down and returned - * as such. Otherwise null is returned. + *

      + * The object associated with the PdfName given is retrieved If it is a + * PdfIndirectReference, it is cast down and returned as such. Otherwise null is + * returned. * * @param key A PdfName - * @return the associated PdfIndirectReference object, - * or null + * @return the associated PdfIndirectReference object, or null */ public PdfIndirectReference getAsIndirectObject(PdfName key) { PdfIndirectReference ref = null; PdfObject orig = get(key); // not getDirect this time. - if (orig != null && orig.isIndirect()) + if (orig != null && orig.isIndirect()) { ref = (PdfIndirectReference) orig; + } return ref; } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDocument.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDocument.java index 9f4de98e5..5b517ea63 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDocument.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDocument.java @@ -94,365 +94,335 @@ /** * PdfDocument is the class that is used by PdfWriter * to translate a Document into a PDF with different pages. - *

      - * A PdfDocument always listens to a Document - * and adds the Pdf representation of every Element that is - * added to the Document. + *

      + * A PdfDocument always listens to a Document and adds the Pdf representation of every + * Element that is added to the Document. * - * @see com.lowagie.text.Document - * @see com.lowagie.text.DocListener - * @see PdfWriter - * @since 2.0.8 (class was package-private before) + * @see com.lowagie.text.Document + * @see com.lowagie.text.DocListener + * @see PdfWriter + * @since 2.0.8 (class was package-private before) */ public class PdfDocument extends Document { + protected static final DecimalFormat SIXTEEN_DIGITS = new DecimalFormat("0000000000000000"); /** - * PdfInfo is the PDF InfoDictionary. - *

      - * A document's trailer may contain a reference to an Info dictionary that provides information - * about the document. This optional dictionary may contain one or more keys, whose values - * should be strings.
      - * This object is described in the 'Portable Document Format Reference Manual version 1.3' - * section 6.10 (page 120-121) - * @since 2.0.8 (PdfDocument was package-private before) - */ - - public static class PdfInfo extends PdfDictionary { - - /** - * Construct a PdfInfo-object. - */ - - PdfInfo() { - super(); - } - - /** - * Constructs a PdfInfo-object. - * - * @param author name of the author of the document - * @param title title of the document - * @param subject subject of the document - */ - - PdfInfo(String author, String title, String subject) { - this(); - addProducer(); - addCreationDate(); - addTitle(title); - addSubject(subject); - addAuthor(author); - } - - /** - * Adds the title of the document. - * - * @param title the title of the document - */ - - void addTitle(String title) { - put(PdfName.TITLE, new PdfString(title, PdfObject.TEXT_UNICODE)); - } - - /** - * Adds the subject to the document. - * - * @param subject the subject of the document - */ - - void addSubject(String subject) { - put(PdfName.SUBJECT, new PdfString(subject, PdfObject.TEXT_UNICODE)); - } - - /** - * Adds some keywords to the document. - * - * @param keywords the keywords of the document - */ - - void addKeywords(String keywords) { - put(PdfName.KEYWORDS, new PdfString(keywords, PdfObject.TEXT_UNICODE)); - } - - /** - * Adds the name of the author to the document. - * - * @param author the name of the author - */ - - void addAuthor(String author) { - put(PdfName.AUTHOR, new PdfString(author, PdfObject.TEXT_UNICODE)); - } - - /** - * Adds the name of the creator to the document. - * - * @param creator the name of the creator - */ - - void addCreator(String creator) { - put(PdfName.CREATOR, new PdfString(creator, PdfObject.TEXT_UNICODE)); - } - - /** - * Adds the name of the producer to the document. - */ - void addProducer() { - addProducer(getVersion()); - } - - /** - * Adds the name of the producer to the document. - * - * @param producer name of the producer - */ - void addProducer(final String producer) { - put(PdfName.PRODUCER, new PdfString(producer)); - } - - /** - * Adds the date of creation to the document. - */ - - void addCreationDate() { - PdfString date = new PdfDate(); - put(PdfName.CREATIONDATE, date); - } - - /** - * Adds the modification date (=current date and time) to the document. - */ - void addModificationDate() { - PdfString date = new PdfDate(); - put(PdfName.MODDATE, date); - } - - /** - * Adds the modification date to the document. - */ - void addModificationDate(PdfDate date) { - put(PdfName.MODDATE, date); - } - - void addkey(String key, String value) { - if (key.equals("Producer") || key.equals("CreationDate")) - return; - put(new PdfName(key), new PdfString(value, PdfObject.TEXT_UNICODE)); - } - } - - /** - * PdfCatalog is the PDF Catalog-object. - *

      - * The Catalog is a dictionary that is the root node of the document. It contains a reference - * to the tree of pages contained in the document, a reference to the tree of objects representing - * the document's outline, a reference to the document's article threads, and the list of named - * destinations. In addition, the Catalog indicates whether the document's outline or thumbnail - * page images should be displayed automatically when the document is viewed and whether some location - * other than the first page should be shown when the document is opened.
      - * In this class however, only the reference to the tree of pages is implemented.
      - * This object is described in the 'Portable Document Format Reference Manual version 1.3' - * section 6.2 (page 67-71) + * The characters to be applied the hanging punctuation. */ - - static class PdfCatalog extends PdfDictionary { - - /** The writer writing the PDF for which we are creating this catalog object. */ - PdfWriter writer; - - /** - * Constructs a PdfCatalog. - * - * @param pages an indirect reference to the root of the document's Pages tree. - * @param writer the writer the catalog applies to - */ - - PdfCatalog(PdfIndirectReference pages, PdfWriter writer) { - super(CATALOG); - this.writer = writer; - put(PdfName.PAGES, pages); - } - - /** - * Adds the names of the named destinations to the catalog. - * @param localDestinations the local destinations - * @param documentLevelJS the javascript used in the document - * @param documentFileAttachment the attached files - * @param writer the writer the catalog applies to - */ - void addNames(TreeMap localDestinations, Map documentLevelJS, Map documentFileAttachment, PdfWriter writer) { - if (localDestinations.isEmpty() && documentLevelJS.isEmpty() && documentFileAttachment.isEmpty()) - return; - try { - PdfDictionary names = new PdfDictionary(); - if (!localDestinations.isEmpty()) { - PdfArray ar = new PdfArray(); - for (Map.Entry entry : localDestinations.entrySet()) { - String name = entry.getKey(); - Object[] obj = entry.getValue(); - if (obj[2] == null) //no destination - continue; - PdfIndirectReference ref = (PdfIndirectReference) obj[1]; - ar.add(new PdfString(name, null)); - ar.add(ref); - } - if (ar.size() > 0) { - PdfDictionary dests = new PdfDictionary(); - dests.put(PdfName.NAMES, ar); - names.put(PdfName.DESTS, writer.addToBody(dests).getIndirectReference()); - } - } - if (!documentLevelJS.isEmpty()) { - PdfDictionary tree = PdfNameTree.writeTree(documentLevelJS, writer); - names.put(PdfName.JAVASCRIPT, writer.addToBody(tree).getIndirectReference()); - } - if (!documentFileAttachment.isEmpty()) { - names.put(PdfName.EMBEDDEDFILES, writer.addToBody(PdfNameTree.writeTree(documentFileAttachment, writer)).getIndirectReference()); - } - if (names.size() > 0) - put(PdfName.NAMES, writer.addToBody(names).getIndirectReference()); - } - catch (IOException e) { - throw new ExceptionConverter(e); - } - } - - /** - * Adds an open action to the catalog. - * @param action the action that will be triggered upon opening the document - */ - void setOpenAction(PdfAction action) { - put(PdfName.OPENACTION, action); - } - - - /** - * Sets the document level additional actions. - * @param actions dictionary of actions - */ - void setAdditionalActions(PdfDictionary actions) { - try { - put(PdfName.AA, writer.addToBody(actions).getIndirectReference()); - } catch (Exception e) { - throw new ExceptionConverter(e); - } - } - } + static final String hangingPunctuation = ".,;:'"; // CONSTRUCTING A PdfDocument/PdfWriter INSTANCE - /** - * Constructs a new PDF document. + * The PdfWriter. */ - public PdfDocument() { - super(); - addProducer(); - addCreationDate(); - } - - /** The PdfWriter. */ protected PdfWriter writer; - /** - * Adds a PdfWriter to the PdfDocument. - * - * @param writer the PdfWriter that writes everything - * what is added to this document to an outputstream. - * @throws DocumentException on error + * This is the PdfContentByte object, containing the text. */ - public void addWriter(PdfWriter writer) throws DocumentException { - if (this.writer == null) { - this.writer = writer; - annotationsImp = new PdfAnnotationsImp(writer); - return; - } - throw new DocumentException(MessageLocalization.getComposedMessage("you.can.only.add.a.writer.to.a.pdfdocument.once")); - } - -// LISTENER METHODS START - -// [L0] ElementListener interface - - /** This is the PdfContentByte object, containing the text. */ protected PdfContentByte text; - - /** This is the PdfContentByte object, containing the borders and other Graphics. */ + /** + * This is the PdfContentByte object, containing the borders and other Graphics. + */ protected PdfContentByte graphics; - /** This represents the leading of the lines. */ - protected float leading = 0; +// LISTENER METHODS START +// [L0] ElementListener interface /** - * Getter for the current leading. - * @return the current leading - * @since 2.1.2 + * This represents the leading of the lines. */ - public float getLeading() { - return leading; - } - + protected float leading = 0; /** - * Setter for the current leading. - * @param leading the current leading - * @since 2.1.6 + * This represents the current alignment of the PDF Elements. */ - void setLeading(float leading) { - this.leading = leading; - } - - /** This represents the current alignment of the PDF Elements. */ protected int alignment = Element.ALIGN_LEFT; - - /** This is the current height of the document. */ + /** + * This is the current height of the document. + */ protected float currentHeight = 0; - /** * Signals that onParagraph is valid (to avoid that a Chapter/Section title is treated as a Paragraph). + * * @since 2.1.2 */ protected boolean isSectionTitle = false; - /** * Signals that the current leading has to be subtracted from a YMark object when positive. + * * @since 2.1.2 */ protected int leadingCount = 0; - - /** The current active PdfAction when processing an Anchor. */ + /** + * The current active PdfAction when processing an Anchor. + */ protected PdfAction anchorAction = null; - + // [L3] DocListener interface + protected int textEmptySize; /** - * Signals that an Element was added to the Document. - * - * @param element the element to add - * @return true if the element was added, false if not. - * @throws DocumentException when a document isn't open yet, or has been closed + * XMP Metadata for the page. */ - public boolean add(Element element) throws DocumentException { - if (writer != null && writer.isPaused()) { - return false; - } - try { - switch(element.type()) { + protected byte[] xmpMetadata = null; + /** + * margin in x direction starting from the left. Will be valid in the next page + */ + protected float nextMarginLeft; + /** + * margin in x direction starting from the right. Will be valid in the next page + */ + protected float nextMarginRight; + /** + * margin in y direction starting from the top. Will be valid in the next page + */ + protected float nextMarginTop; + /** + * margin in y direction starting from the bottom. Will be valid in the next page + */ + protected float nextMarginBottom; + +// [L1] DocListener interface + /** + * Signals that OnOpenDocument should be called. + */ + protected boolean firstPageEvent = true; + +// [L2] DocListener interface + /** + * The line that is currently being written. + */ + protected PdfLine line = null; + /** + * The lines that are written until now. + */ + protected java.util.List lines = new ArrayList<>(); + + // [C9] Metadata for the page + /** + * Holds the type of the last element, that has been added to the document. + */ + protected int lastElementType = -1; + protected Indentation indentation = new Indentation(); + /** + * some meta information about the Document. + */ + protected PdfInfo info = new PdfInfo(); + +// [L4] DocListener interface + /** + * This is the root outline of the document. + */ + protected PdfOutline rootOutline; + +// [L5] DocListener interface + /** + * This is the current PdfOutline in the hierarchy of outlines. + */ + protected PdfOutline currentOutline; + /** + * Contains the Viewer preferences of this PDF document. + */ + protected PdfViewerPreferencesImp viewerPreferences = new PdfViewerPreferencesImp(); + protected PdfPageLabels pageLabels; + /** + * Stores the destinations keyed by name. Value is + * Object[]{PdfAction,PdfIndirectReference,PdfDestintion}. + */ + protected TreeMap localDestinations = new TreeMap<>(); + protected HashMap documentLevelJS = new HashMap<>(); + + // [L6] DocListener interface + protected HashMap documentFileAttachment = new HashMap<>(); + protected String openActionName; + + // [L7] DocListener interface + protected PdfAction openActionAction; + + // [L8] DocListener interface + protected PdfDictionary additionalActions; + + // [L9] DocListener interface + protected PdfCollection collection; + + // [L10] DocListener interface + protected int markPoint; + +// [L11] DocListener interface + /** + * This is the size of the next page. + */ + protected Rectangle nextPageSize = null; + +// [L12] DocListener interface + /** + * This is the size of the several boxes of the current Page. + */ + protected HashMap thisBoxSize = new HashMap<>(); + +// DOCLISTENER METHODS END + /** + * This is the size of the several boxes that will be used in the next page. + */ + protected HashMap boxSize = new HashMap<>(); + /** + * The duration of the page + */ + protected int duration = -1; // negative values will indicate no duration + /** + * The page transition + */ + protected PdfTransition transition = null; + protected PdfDictionary pageAA = null; + protected PdfIndirectReference thumb; + /** + * This are the page resources of the current Page. + */ + protected PageResources pageResources; + /** + * Holds value of property strictImageSequence. + */ + protected boolean strictImageSequence = false; + /** + * This is the position where the image ends. + */ + protected float imageEnd = -1; + /** + * This is the image that could not be shown on a previous page. + */ + protected Image imageWait = null; + /** + * Stores a list of document level JavaScript actions. + */ + int jsCounter; + PdfAnnotationsImp annotationsImp; + /** + * This checks if the page is empty. + */ + private boolean pageEmpty = true; + /** + * This is the flag meaning whether document is creating footer. + */ + private boolean isDoFooter = false; + + /** + * Constructs a new PDF document. + */ + public PdfDocument() { + super(); + addProducer(); + addCreationDate(); + } + + /** + * Integrate a paragraph into a table, so it can be a whole. + *

      Note: This is not a table with square, it's just like the paragraph, but + * it cannot be separated. + * + * @param paragraph the {@code Paragraph} incoming paragraphs to be consolidated + * @return {@code PdfPTable} the whole which will be used later + */ + static PdfPTable createInOneCell(Paragraph paragraph) { + PdfPTable table = new PdfPTable(1); + table.setWidthPercentage(100f); + PdfPCell cell = new PdfPCell(); + cell.setBorder(Table.NO_BORDER); + cell.setPadding(0); + for (int i = 0; i < paragraph.size(); i++) { + if (paragraph.get(i) instanceof Chunk) { + Paragraph subParagraph = new Paragraph(); + boolean hasNewLine = false; + do { + Chunk chunk = (Chunk) paragraph.get(i); + i++; + if (chunk.getContent().equals("\n")) { + hasNewLine = true; + break; + } else { + subParagraph.add(chunk); + } + } while (i < paragraph.size() && paragraph.get(i) instanceof Chunk); + i--; + // It's important to set the leading here. + subParagraph.setLeading(paragraph.getLeading()); + cell.addElement(subParagraph); + if (hasNewLine) { + cell.addElement(new Chunk("\n")); + } + } else { + cell.addElement(paragraph.get(i)); + } + } + table.addCell(cell); + return table; + } + + /** + * Adds a PdfWriter to the PdfDocument. + * + * @param writer the PdfWriter that writes everything what is added to this document to an + * outputstream. + * @throws DocumentException on error + */ + public void addWriter(PdfWriter writer) throws DocumentException { + if (this.writer == null) { + this.writer = writer; + annotationsImp = new PdfAnnotationsImp(writer); + return; + } + throw new DocumentException( + MessageLocalization.getComposedMessage("you.can.only.add.a.writer.to.a.pdfdocument.once")); + } + + /** + * Getter for the current leading. + * + * @return the current leading + * @since 2.1.2 + */ + public float getLeading() { + return leading; + } + + /** + * Setter for the current leading. + * + * @param leading the current leading + * @since 2.1.6 + */ + void setLeading(float leading) { + this.leading = leading; + } + + /** + * Signals that an Element was added to the Document. + * + * @param element the element to add + * @return true if the element was added, false if not. + * @throws DocumentException when a document isn't open yet, or has been closed + */ + public boolean add(Element element) throws DocumentException { + if (writer != null && writer.isPaused()) { + return false; + } + try { + switch (element.type()) { // Information (headers) case Element.HEADER: - info.addkey(((Meta)element).getName(), ((Meta)element).getContent()); + info.addkey(((Meta) element).getName(), ((Meta) element).getContent()); break; case Element.TITLE: - info.addTitle(((Meta)element).getContent()); + info.addTitle(((Meta) element).getContent()); break; case Element.SUBJECT: - info.addSubject(((Meta)element).getContent()); + info.addSubject(((Meta) element).getContent()); break; case Element.KEYWORDS: - info.addKeywords(((Meta)element).getContent()); + info.addKeywords(((Meta) element).getContent()); break; case Element.AUTHOR: - info.addAuthor(((Meta)element).getContent()); + info.addAuthor(((Meta) element).getContent()); break; case Element.CREATOR: - info.addCreator(((Meta)element).getContent()); + info.addCreator(((Meta) element).getContent()); break; case Element.PRODUCER: info.addProducer(((Meta) element).getContent()); @@ -462,7 +432,7 @@ public boolean add(Element element) throws DocumentException { info.addCreationDate(); break; case Element.MODIFICATIONDATE: - PdfDate date = new PdfDate(((Meta)element).getContent()); + PdfDate date = new PdfDate(((Meta) element).getContent()); info.addModificationDate(date); break; @@ -476,17 +446,16 @@ public boolean add(Element element) throws DocumentException { // we cast the element to a chunk PdfChunk chunk = new PdfChunk((Chunk) element, anchorAction); // we try to add the chunk to the line, until we succeed - if (!chunk.isTab()) - { + if (!chunk.isTab()) { PdfChunk overflow; while ((overflow = line.add(chunk)) != null) { carriageReturn(); chunk = overflow; chunk.trimFirstSpace(); } - } - else + } else { line.add(chunk); + } pageEmpty = false; if (chunk.isAttribute(Chunk.NEWPAGE)) { newPage(); @@ -513,8 +482,12 @@ public boolean add(Element element) throws DocumentException { } Annotation annot = (Annotation) element; Rectangle rect = new Rectangle(0, 0); - if (line != null) - rect = new Rectangle(annot.llx(indentRight() - line.widthLeft()), annot.ury(indentTop() - currentHeight - 20), annot.urx(indentRight() - line.widthLeft() + 20), annot.lly(indentTop() - currentHeight)); + if (line != null) { + rect = new Rectangle(annot.llx(indentRight() - line.widthLeft()), + annot.ury(indentTop() - currentHeight - 20), + annot.urx(indentRight() - line.widthLeft() + 20), + annot.lly(indentTop() - currentHeight)); + } PdfAnnotation an = PdfAnnotationsImp.convertAnnotation(writer, annot, rect); annotationsImp.addPlainAnnotation(an); pageEmpty = false; @@ -549,8 +522,9 @@ public boolean add(Element element) throws DocumentException { carriageReturn(); PdfPageEvent pageEvent = writer.getPageEvent(); - if (pageEvent != null && !isSectionTitle) + if (pageEvent != null && !isSectionTitle) { pageEvent.onParagraph(writer, this, indentTop() - currentHeight); + } // if a paragraph has to be kept together, we wrap it in a table object if (paragraph.getKeepTogether()) { @@ -563,16 +537,16 @@ public boolean add(Element element) throws DocumentException { this.add(table); indentation.indentLeft += paragraph.getIndentationLeft(); indentation.indentRight += paragraph.getIndentationRight(); - } - else { + } else { line.setExtraIndent(paragraph.getFirstLineIndent()); element.process(this); carriageReturn(); addSpacing(paragraph.getSpacingAfter(), paragraph.getTotalLeading(), paragraph.getFont()); } - if (pageEvent != null && !isSectionTitle) + if (pageEvent != null && !isSectionTitle) { pageEvent.onParagraphEnd(writer, this, indentTop() - currentHeight); + } alignment = Element.ALIGN_LEFT; indentation.indentLeft -= paragraph.getIndentationLeft(); @@ -589,7 +563,7 @@ public boolean add(Element element) throws DocumentException { PdfPageEvent pageEvent = writer.getPageEvent(); boolean hasTitle = section.isNotAddedYet() - && section.getTitle() != null; + && section.getTitle() != null; // if the section is a chapter, we begin a new page if (section.isTriggerNewPage()) { @@ -599,13 +573,15 @@ public boolean add(Element element) throws DocumentException { if (hasTitle) { float fith = indentTop() - currentHeight; int rotation = pageSize.getRotation(); - if (rotation == 90 || rotation == 180) + if (rotation == 90 || rotation == 180) { fith = pageSize.getHeight() - fith; + } PdfDestination destination = new PdfDestination(PdfDestination.FITH, fith); while (currentOutline.level() >= section.getDepth()) { currentOutline = currentOutline.parent(); } - PdfOutline outline = new PdfOutline(currentOutline, destination, section.getBookmarkTitle(), section.isBookmarkOpen()); + PdfOutline outline = new PdfOutline(currentOutline, destination, section.getBookmarkTitle(), + section.isBookmarkOpen()); currentOutline = outline; } @@ -614,11 +590,14 @@ public boolean add(Element element) throws DocumentException { indentation.sectionIndentLeft += section.getIndentationLeft(); indentation.sectionIndentRight += section.getIndentationRight(); - if (section.isNotAddedYet() && pageEvent != null) - if (element.type() == Element.CHAPTER) + if (section.isNotAddedYet() && pageEvent != null) { + if (element.type() == Element.CHAPTER) { pageEvent.onChapter(writer, this, indentTop() - currentHeight, section.getTitle()); - else - pageEvent.onSection(writer, this, indentTop() - currentHeight, section.getDepth(), section.getTitle()); + } else { + pageEvent.onSection(writer, this, indentTop() - currentHeight, section.getDepth(), + section.getTitle()); + } + } // the title of the section (if any has to be printed) if (hasTitle) { @@ -634,11 +613,13 @@ public boolean add(Element element) throws DocumentException { indentation.sectionIndentLeft -= (section.getIndentationLeft() + section.getIndentation()); indentation.sectionIndentRight -= section.getIndentationRight(); - if (section.isComplete() && pageEvent != null) - if (element.type() == Element.CHAPTER) + if (section.isComplete() && pageEvent != null) { + if (element.type() == Element.CHAPTER) { pageEvent.onChapterEnd(writer, this, indentTop() - currentHeight); - else + } else { pageEvent.onSectionEnd(writer, this, indentTop() - currentHeight); + } + } break; } @@ -699,10 +680,11 @@ public boolean add(Element element) throws DocumentException { } case Element.PTABLE: { PdfPTable ptable = (PdfPTable) element; - if (ptable.size() <= ptable.getHeaderRows()) + if (ptable.size() <= ptable.getHeaderRows()) { break; //nothing to do + } - if(isDoFooter) { + if (isDoFooter) { delayTableAddition(ptable); } else { // before every table, we add a new line and flush all lines @@ -722,15 +704,16 @@ public boolean add(Element element) throws DocumentException { MultiColumnText multiText = (MultiColumnText) element; float height = multiText.write(writer.getDirectContent(), this, indentTop() - currentHeight); currentHeight += height; - text.moveText(0, -1f* height); + text.moveText(0, -1f * height); pageEmpty = false; break; } - case Element.TABLE : { + case Element.TABLE: { if (element instanceof SimpleTable) { - PdfPTable ptable = ((SimpleTable)element).createPdfPTable(); - if (ptable.size() <= ptable.getHeaderRows()) + PdfPTable ptable = ((SimpleTable) element).createPdfPTable(); + if (ptable.size() <= ptable.getHeaderRows()) { break; //nothing to do + } // before every table, we add a new line and flush all lines ensureNewLine(); @@ -740,26 +723,27 @@ public boolean add(Element element) throws DocumentException { break; } else if (element instanceof Table) { try { - PdfPTable ptable = ((Table)element).createPdfPTable(); - if (ptable.size() <= ptable.getHeaderRows()) - break; //nothing to do - // before every table, we add a new line and flush all lines - ensureNewLine(); - flushLines(); - addPTable(ptable); - pageEmpty = false; - break; - } - catch(BadElementException bee) { + PdfPTable ptable = ((Table) element).createPdfPTable(); + if (ptable.size() <= ptable.getHeaderRows()) { + break; //nothing to do + } + // before every table, we add a new line and flush all lines + ensureNewLine(); + flushLines(); + addPTable(ptable); + pageEmpty = false; + break; + } catch (BadElementException bee) { // constructing the PdfTable // Before the table, add a blank line using offset or default leading - float offset = ((Table)element).getOffset(); - if (Float.isNaN(offset)) + float offset = ((Table) element).getOffset(); + if (Float.isNaN(offset)) { offset = leading; + } carriageReturn(); lines.add(new PdfLine(indentLeft(), indentRight(), alignment, offset)); currentHeight += offset; - addPdfTable((Table)element); + addPdfTable((Table) element); } } else { return false; @@ -772,29 +756,30 @@ public boolean add(Element element) throws DocumentException { case Element.IMGRAW: case Element.IMGTEMPLATE: { //carriageReturn(); suggestion by Marc Campforts - if(isDoFooter){ + if (isDoFooter) { addDelay((Image) element); - }else{ + } else { add((Image) element); } break; } case Element.YMARK: { - DrawInterface zh = (DrawInterface)element; - zh.draw(graphics, indentLeft(), indentBottom(), indentRight(), indentTop(), indentTop() - currentHeight - (leadingCount > 0 ? leading : 0)); + DrawInterface zh = (DrawInterface) element; + zh.draw(graphics, indentLeft(), indentBottom(), indentRight(), indentTop(), + indentTop() - currentHeight - (leadingCount > 0 ? leading : 0)); pageEmpty = false; break; } case Element.MARKED: { MarkedObject mo; if (element instanceof MarkedSection) { - mo = ((MarkedSection)element).getTitle(); + mo = ((MarkedSection) element).getTitle(); if (mo != null) { mo.process(this); } } - mo = (MarkedObject)element; + mo = (MarkedObject) element; mo.process(this); break; } @@ -803,62 +788,17 @@ public boolean add(Element element) throws DocumentException { } lastElementType = element.type(); return true; - } - catch(Exception e) { + } catch (Exception e) { throw new DocumentException(e); } } +// Info Dictionary and Catalog /** - * Integrate a paragraph into a table, so it can be a whole. - *

      Note: This is not a table with square, it's just like the paragraph, but - * it cannot be separated. - * @param paragraph the {@code Paragraph} incoming paragraphs to be consolidated - * @return {@code PdfPTable} the whole which will be used later - */ - static PdfPTable createInOneCell(Paragraph paragraph) { - PdfPTable table = new PdfPTable(1); - table.setWidthPercentage(100f); - PdfPCell cell = new PdfPCell(); - cell.setBorder(Table.NO_BORDER); - cell.setPadding(0); - for (int i = 0; i < paragraph.size(); i++) { - if (paragraph.get(i) instanceof Chunk) { - Paragraph subParagraph = new Paragraph(); - boolean hasNewLine = false; - do { - Chunk chunk = (Chunk) paragraph.get(i); - i++; - if (chunk.getContent().equals("\n")) { - hasNewLine = true; - break; - } else { - subParagraph.add(chunk); - } - } while (i < paragraph.size() && paragraph.get(i) instanceof Chunk); - i--; - // It's important to set the leading here. - subParagraph.setLeading(paragraph.getLeading()); - cell.addElement(subParagraph); - if (hasNewLine) { - cell.addElement(new Chunk("\n")); - } - } else { - cell.addElement(paragraph.get(i)); - } - } - table.addCell(cell); - return table; - } - -// [L1] DocListener interface - - /** - * Opens the document. - *

      - * You have to open the document before you can begin to add content - * to the body of the document. + * Opens the document. + *

      + * You have to open the document before you can begin to add content to the body of the document. */ public void open() { if (!open) { @@ -869,19 +809,16 @@ public void open() { } try { initPage(); - } - catch(DocumentException de) { + } catch (DocumentException de) { throw new ExceptionConverter(de); } } -// [L2] DocListener interface - /** * Closes the document. *

      - * Once all the content has been written in the body, you have to close - * the body. After that nothing can be written to the body anymore. + * Once all the content has been written in the body, you have to close the body. After that nothing can be written + * to the body anymore. *

      */ public void close() { @@ -891,39 +828,40 @@ public void close() { try { boolean wasImage = (imageWait != null); newPage(); - if (imageWait != null || wasImage) newPage(); - if (annotationsImp.hasUnusedAnnotations()) - throw new RuntimeException(MessageLocalization.getComposedMessage("not.all.annotations.could.be.added.to.the.document.the.document.doesn.t.have.enough.pages")); + if (imageWait != null || wasImage) { + newPage(); + } + if (annotationsImp.hasUnusedAnnotations()) { + throw new RuntimeException(MessageLocalization.getComposedMessage( + "not.all.annotations.could.be.added.to.the.document.the.document.doesn.t.have.enough.pages")); + } PdfPageEvent pageEvent = writer.getPageEvent(); - if (pageEvent != null) + if (pageEvent != null) { pageEvent.onCloseDocument(writer, this); + } super.close(); writer.addLocalDestinations(localDestinations); calculateOutlineCount(); writeOutlines(); - } - catch(Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } writer.close(); } -// [L3] DocListener interface - protected int textEmptySize; - - // [C9] Metadata for the page - /** XMP Metadata for the page. */ - protected byte[] xmpMetadata = null; /** * Use this method to set the XMP Metadata. + * * @param xmpMetadata The xmpMetadata to set. */ public void setXmpMetadata(byte[] xmpMetadata) { this.xmpMetadata = xmpMetadata; } +// [C1] outlines + /** * Makes a new page and sends it to the PdfWriter. * @@ -939,8 +877,9 @@ public boolean newPage() { throw new RuntimeException(MessageLocalization.getComposedMessage("the.document.is.not.open")); } PdfPageEvent pageEvent = writer.getPageEvent(); - if (pageEvent != null) + if (pageEvent != null) { pageEvent.onEndPage(writer, this); + } //Added to inform any listeners that we are moving to a new page (added by David Freels) super.newPage(); @@ -960,13 +899,16 @@ public boolean newPage() { // [C10] if (writer.isPdfX()) { - if (thisBoxSize.containsKey("art") && thisBoxSize.containsKey("trim")) - throw new PdfXConformanceException(MessageLocalization.getComposedMessage("only.one.of.artbox.or.trimbox.can.exist.in.the.page")); + if (thisBoxSize.containsKey("art") && thisBoxSize.containsKey("trim")) { + throw new PdfXConformanceException(MessageLocalization.getComposedMessage( + "only.one.of.artbox.or.trimbox.can.exist.in.the.page")); + } if (!thisBoxSize.containsKey("art") && !thisBoxSize.containsKey("trim")) { - if (thisBoxSize.containsKey("crop")) + if (thisBoxSize.containsKey("crop")) { thisBoxSize.put("trim", thisBoxSize.get("crop")); - else + } else { thisBoxSize.put("trim", new PdfRectangle(pageSize, pageSize.getRotation())); + } } } @@ -1001,12 +943,12 @@ public boolean newPage() { } // [U3] page actions: transition, duration, additional actions - if (this.transition!=null) { + if (this.transition != null) { page.put(PdfName.TRANS, this.transition.getTransitionDictionary()); transition = null; } - if (this.duration>0) { - page.put(PdfName.DUR,new PdfNumber(this.duration)); + if (this.duration > 0) { + page.put(PdfName.DUR, new PdfNumber(this.duration)); duration = 0; } if (pageAA != null) { @@ -1028,31 +970,32 @@ public boolean newPage() { // [C5] and [C8] we add the annotations if (annotationsImp.hasUnusedAnnotations()) { PdfArray array = annotationsImp.rotateAnnotations(writer, pageSize); - if (array.size() != 0) + if (array.size() != 0) { page.put(PdfName.ANNOTS, array); + } } // [F12] we add tag info - if (writer.isTagged()) + if (writer.isTagged()) { page.put(PdfName.STRUCTPARENTS, new PdfNumber(writer.getCurrentPageNumber() - 1)); + } - if (text.size() > textEmptySize) + if (text.size() > textEmptySize) { text.endText(); - else + } else { text = null; - writer.add(page, new PdfContents(writer.getDirectContentUnder(), graphics, text, writer.getDirectContent(), pageSize)); + } + writer.add(page, new PdfContents(writer.getDirectContentUnder(), graphics, text, writer.getDirectContent(), + pageSize)); // we initialize the new page initPage(); - } - catch(DocumentException | IOException de) { + } catch (DocumentException | IOException de) { // maybe this never happens, but it's better to check. throw new ExceptionConverter(de); } return true; } -// [L4] DocListener interface - /** * Sets the pagesize. * @@ -1067,28 +1010,14 @@ public boolean setPageSize(Rectangle pageSize) { return true; } -// [L5] DocListener interface - - /** margin in x direction starting from the left. Will be valid in the next page */ - protected float nextMarginLeft; - - /** margin in x direction starting from the right. Will be valid in the next page */ - protected float nextMarginRight; - - /** margin in y direction starting from the top. Will be valid in the next page */ - protected float nextMarginTop; - - /** margin in y direction starting from the bottom. Will be valid in the next page */ - protected float nextMarginBottom; - /** * Sets the margins. * - * @param marginLeft the margin on the left - * @param marginRight the margin on the right - * @param marginTop the margin on the top - * @param marginBottom the margin on the bottom - * @return a boolean + * @param marginLeft the margin on the left + * @param marginRight the margin on the right + * @param marginTop the margin on the top + * @param marginBottom the margin on the bottom + * @return a boolean */ public boolean setMargins(float marginLeft, float marginRight, float marginTop, float marginBottom) { if (writer != null && writer.isPaused()) { @@ -1101,8 +1030,6 @@ public boolean setMargins(float marginLeft, float marginRight, float marginTop, return true; } -// [L6] DocListener interface - /** * @see com.lowagie.text.DocListener#setMarginMirroring(boolean) */ @@ -1115,7 +1042,7 @@ public boolean setMarginMirroring(boolean MarginMirroring) { /** * @see com.lowagie.text.DocListener#setMarginMirroring(boolean) - * @since 2.1.6 + * @since 2.1.6 */ public boolean setMarginMirroringTopBottom(boolean MarginMirroringTopBottom) { if (writer != null && writer.isPaused()) { @@ -1124,12 +1051,10 @@ public boolean setMarginMirroringTopBottom(boolean MarginMirroringTopBottom) { return super.setMarginMirroringTopBottom(MarginMirroringTopBottom); } -// [L7] DocListener interface - /** * Sets the page number. * - * @param pageN the new page number + * @param pageN the new page number */ public void setPageCount(int pageN) { if (writer != null && writer.isPaused()) { @@ -1138,8 +1063,6 @@ public void setPageCount(int pageN) { super.setPageCount(pageN); } -// [L8] DocListener interface - /** * Sets the page number to 0. */ @@ -1150,8 +1073,6 @@ public void resetPageCount() { super.resetPageCount(); } -// [L9] DocListener interface - /** * Changes the header of this document. * @@ -1164,7 +1085,7 @@ public void setHeader(HeaderFooter header) { super.setHeader(header); } -// [L10] DocListener interface +// [C3] PdfViewerPreferences interface /** * Resets the header of this document. @@ -1176,12 +1097,10 @@ public void resetHeader() { super.resetHeader(); } -// [L11] DocListener interface - /** * Changes the footer of this document. * - * @param footer the new footer + * @param footer the new footer */ public void setFooter(HeaderFooter footer) { if (writer != null && writer.isPaused()) { @@ -1190,8 +1109,6 @@ public void setFooter(HeaderFooter footer) { super.setFooter(footer); } -// [L12] DocListener interface - /** * Resets the footer of this document. */ @@ -1202,15 +1119,13 @@ public void resetFooter() { super.resetFooter(); } -// DOCLISTENER METHODS END - - /** Signals that OnOpenDocument should be called. */ - protected boolean firstPageEvent = true; +// [C4] Page labels /** * Initializes a page. - *

      + *

      * If the footer/header is set, it is printed. + * * @throws DocumentException on error */ protected void initPage() throws DocumentException { @@ -1240,8 +1155,8 @@ protected void initPage() throws DocumentException { // backgroundcolors, etc... thisBoxSize = new HashMap<>(boxSize); if (pageSize.getBackgroundColor() != null - || pageSize.hasBorders() - || pageSize.getBorderColor() != null) { + || pageSize.hasBorders() + || pageSize.getBorderColor() != null) { add(pageSize); } @@ -1259,8 +1174,7 @@ protected void initPage() throws DocumentException { add(imageWait); imageWait = null; } - } - catch(Exception e) { + } catch (Exception e) { throw new ExceptionConverter(e); } leading = oldleading; @@ -1277,14 +1191,9 @@ protected void initPage() throws DocumentException { firstPageEvent = false; } - /** The line that is currently being written. */ - protected PdfLine line = null; - - /** The lines that are written until now. */ - protected java.util.List lines = new ArrayList<>(); - /** * Adds the current line to the list of lines and also adds an empty line. + * * @throws DocumentException on error */ protected void newLine() throws DocumentException { @@ -1297,9 +1206,10 @@ protected void newLine() throws DocumentException { line = new PdfLine(indentLeft(), indentRight(), alignment, leading); } +// [C5] named objects: local destinations, javascript, embedded files + /** - * If the current line is not empty or null, it is added to the arraylist - * of lines and a new empty line is added. + * If the current line is not empty or null, it is added to the arraylist of lines and a new empty line is added. */ protected void carriageReturn() { // the arraylist with lines may not be null @@ -1333,34 +1243,31 @@ protected void carriageReturn() { /** * Gets the current vertical page position. - * @param ensureNewLine Tells whether a new line shall be enforced. This may cause side effects - * for elements that do not terminate the lines they've started because those lines will get - * terminated. + * + * @param ensureNewLine Tells whether a new line shall be enforced. This may cause side effects for elements that do + * not terminate the lines they've started because those lines will get terminated. * @return The current vertical page position. */ public float getVerticalPosition(boolean ensureNewLine) { // ensuring that a new line has been started. if (ensureNewLine) { - ensureNewLine(); + ensureNewLine(); } - return top() - currentHeight - indentation.indentTop; + return top() - currentHeight - indentation.indentTop; } - /** Holds the type of the last element, that has been added to the document. */ - protected int lastElementType = -1; - /** * Ensures that a new line has been started. */ protected void ensureNewLine() { - try { - if ((lastElementType == Element.PHRASE) || - (lastElementType == Element.CHUNK)) { - newLine(); - flushLines(); - } - } catch (DocumentException ex) { - throw new ExceptionConverter(ex); + try { + if ((lastElementType == Element.PHRASE) || + (lastElementType == Element.CHUNK)) { + newLine(); + flushLines(); + } + } catch (DocumentException ex) { + throw new ExceptionConverter(ex); } } @@ -1398,11 +1305,13 @@ protected float flushLines() throws DocumentException { // this is a line in the loop l = line1; - float moveTextX = l.indentLeft() - indentLeft() + indentation.indentLeft + indentation.listIndentLeft + indentation.sectionIndentLeft; + float moveTextX = l.indentLeft() - indentLeft() + indentation.indentLeft + indentation.listIndentLeft + + indentation.sectionIndentLeft; text.moveText(moveTextX, -l.height()); // is the line preceded by a symbol? if (l.listSymbol() != null) { - ColumnText.showTextAligned(graphics, Element.ALIGN_LEFT, new Phrase(l.listSymbol()), text.getXTLM() - l.listIndent(), text.getYTLM(), 0); + ColumnText.showTextAligned(graphics, Element.ALIGN_LEFT, new Phrase(l.listSymbol()), + text.getXTLM() - l.listIndent(), text.getYTLM(), 0); } currentValues[0] = currentFont; @@ -1418,23 +1327,22 @@ protected float flushLines() throws DocumentException { return displacement; } - /** The characters to be applied the hanging punctuation. */ - static final String hangingPunctuation = ".,;:'"; - /** * Writes a text line to the document. It takes care of all the attributes. - *

      + *

      * Before entering the line position must have been established and the * text argument must be in text object scope (beginText()). - * @param line the line to be written - * @param text the PdfContentByte where the text will be written to - * @param graphics the PdfContentByte where the graphics will be written to + * + * @param line the line to be written + * @param text the PdfContentByte where the text will be written to + * @param graphics the PdfContentByte where the graphics will be written to * @param currentValues the current font and extra spacing values * @param ratio * @throws DocumentException on error */ - void writeLineToContent(PdfLine line, PdfContentByte text, PdfContentByte graphics, Object[] currentValues, float ratio) throws DocumentException { - PdfFont currentFont = (PdfFont)(currentValues[0]); + void writeLineToContent(PdfLine line, PdfContentByte text, PdfContentByte graphics, Object[] currentValues, + float ratio) throws DocumentException { + PdfFont currentFont = (PdfFont) (currentValues[0]); float lastBaseFactor = (Float) (currentValues[1]); PdfChunk chunk; int numberOfSpaces; @@ -1454,16 +1362,15 @@ void writeLineToContent(PdfLine line, PdfContentByte text, PdfContentByte graphi int separatorCount = line.getSeparatorCount(); if (separatorCount > 0) { glueWidth = line.widthLeft() / separatorCount; - } - else if (isJustified) { - if (line.isNewlineSplit() && line.widthLeft() >= (lastBaseFactor * (ratio * numberOfSpaces + lineLen - 1))) { + } else if (isJustified) { + if (line.isNewlineSplit() && line.widthLeft() >= (lastBaseFactor * (ratio * numberOfSpaces + lineLen + - 1))) { if (line.isRTL() || (LayoutProcessor.isEnabled() && LayoutProcessor.isSet(LAYOUT_RIGHT_TO_LEFT))) { text.moveText(line.widthLeft() - lastBaseFactor * (ratio * numberOfSpaces + lineLen - 1), 0); } baseWordSpacing = ratio * lastBaseFactor; baseCharacterSpacing = lastBaseFactor; - } - else { + } else { float width = line.widthLeft(); PdfChunk last = line.getChunk(line.size() - 1); if (last != null) { @@ -1503,30 +1410,30 @@ else if (isJustified) { float width; if (isJustified) { width = chunk.getWidthCorrected(baseCharacterSpacing, baseWordSpacing); - } - else { + } else { width = chunk.width(); } if (chunk.isStroked()) { PdfChunk nextChunk = line.getChunk(chunkStrokeIdx + 1); if (chunk.isSeparator()) { width = glueWidth; - Object[] sep = (Object[])chunk.getAttribute(Chunk.SEPARATOR); - DrawInterface di = (DrawInterface)sep[0]; - Boolean vertical = (Boolean)sep[1]; + Object[] sep = (Object[]) chunk.getAttribute(Chunk.SEPARATOR); + DrawInterface di = (DrawInterface) sep[0]; + Boolean vertical = (Boolean) sep[1]; float fontSize = chunk.font().size(); float ascender = chunk.font().getFont().getFontDescriptor(BaseFont.ASCENT, fontSize); float descender = chunk.font().getFont().getFontDescriptor(BaseFont.DESCENT, fontSize); if (vertical) { - di.draw(graphics, baseXMarker, yMarker + descender, baseXMarker + line.getOriginalWidth(), ascender - descender, yMarker); - } - else { - di.draw(graphics, xMarker, yMarker + descender, xMarker + width, ascender - descender, yMarker); + di.draw(graphics, baseXMarker, yMarker + descender, baseXMarker + line.getOriginalWidth(), + ascender - descender, yMarker); + } else { + di.draw(graphics, xMarker, yMarker + descender, xMarker + width, ascender - descender, + yMarker); } } if (chunk.isTab()) { - Object[] tab = (Object[])chunk.getAttribute(Chunk.TAB); - DrawInterface di = (DrawInterface)tab[0]; + Object[] tab = (Object[]) chunk.getAttribute(Chunk.TAB); + DrawInterface di = (DrawInterface) tab[0]; tabPosition = (Float) tab[1] + (Float) tab[3]; float fontSize = chunk.font().size(); float ascender = chunk.font().getFont().getFontDescriptor(BaseFont.ASCENT, fontSize); @@ -1542,10 +1449,12 @@ else if (isJustified) { graphics.saveState(); float subtract = lastBaseFactor; - if (nextChunk != null && nextChunk.isAttribute(Chunk.BACKGROUND)) + if (nextChunk != null && nextChunk.isAttribute(Chunk.BACKGROUND)) { subtract = 0; - if (nextChunk == null) + } + if (nextChunk == null) { subtract += hangingCorrection; + } float fontSize = chunk.font().size(); float ascender = chunk.font().getFont().getFontDescriptor(BaseFont.ASCENT, fontSize); float descender = chunk.font().getFont().getFontDescriptor(BaseFont.DESCENT, fontSize); @@ -1555,9 +1464,9 @@ else if (isJustified) { float[] extra = (float[]) bgr[1]; graphics.rectangle(xMarker - extra[0], - yMarker + descender - extra[1] + chunk.getTextRise(), - width - subtract + extra[0] + extra[2], - ascender - descender + extra[1] + extra[3]); + yMarker + descender - extra[1] + chunk.getTextRise(), + width - subtract + extra[0] + extra[2], + ascender - descender + extra[1] + extra[3]); graphics.fill(); graphics.setGrayFill(0); @@ -1565,108 +1474,140 @@ else if (isJustified) { } if (chunk.isAttribute(Chunk.UNDERLINE)) { float subtract = lastBaseFactor; - if (nextChunk != null && nextChunk.isAttribute(Chunk.UNDERLINE)) + if (nextChunk != null && nextChunk.isAttribute(Chunk.UNDERLINE)) { subtract = 0; - if (nextChunk == null) + } + if (nextChunk == null) { subtract += hangingCorrection; + } Object[][] unders = (Object[][]) chunk.getAttribute(Chunk.UNDERLINE); Color scolor; for (Object[] obj : unders) { scolor = (Color) obj[0]; float[] ps = (float[]) obj[1]; - if (scolor == null) + if (scolor == null) { scolor = color; - if (scolor != null) + } + if (scolor != null) { graphics.setColorStroke(scolor); + } float fsize = chunk.font().size(); graphics.setLineWidth(ps[0] + fsize * ps[1]); float shift = ps[2] + fsize * ps[3]; int cap2 = (int) ps[4]; - if (cap2 != 0) + if (cap2 != 0) { graphics.setLineCap(cap2); + } graphics.moveTo(xMarker, yMarker + shift); graphics.lineTo(xMarker + width - subtract, yMarker + shift); graphics.stroke(); - if (scolor != null) + if (scolor != null) { graphics.resetGrayStroke(); - if (cap2 != 0) + } + if (cap2 != 0) { graphics.setLineCap(0); + } } graphics.setLineWidth(1); } if (chunk.isAttribute(Chunk.ACTION)) { float subtract = lastBaseFactor; - if (nextChunk != null && nextChunk.isAttribute(Chunk.ACTION)) + if (nextChunk != null && nextChunk.isAttribute(Chunk.ACTION)) { subtract = 0; - if (nextChunk == null) + } + if (nextChunk == null) { subtract += hangingCorrection; - PdfAnnotation annotation = new PdfAnnotation(writer, xMarker, yMarker, xMarker + width - subtract, yMarker + chunk.font().size(), (PdfAction)chunk.getAttribute(Chunk.ACTION)); + } + PdfAnnotation annotation = new PdfAnnotation(writer, xMarker, yMarker, + xMarker + width - subtract, yMarker + chunk.font().size(), + (PdfAction) chunk.getAttribute(Chunk.ACTION)); annotation.setFlags(PdfAnnotation.FLAGS_PRINT); text.addAnnotation(annotation); } if (chunk.isAttribute(Chunk.REMOTEGOTO)) { float subtract = lastBaseFactor; - if (nextChunk != null && nextChunk.isAttribute(Chunk.REMOTEGOTO)) + if (nextChunk != null && nextChunk.isAttribute(Chunk.REMOTEGOTO)) { subtract = 0; - if (nextChunk == null) + } + if (nextChunk == null) { subtract += hangingCorrection; + } Object[] obj = (Object[]) chunk.getAttribute(Chunk.REMOTEGOTO); - String filename = (String)obj[0]; - if (obj[1] instanceof String) - remoteGoto(filename, (String)obj[1], xMarker, yMarker, xMarker + width - subtract, yMarker + chunk.font().size()); - else - remoteGoto(filename, (Integer) obj[1], xMarker, yMarker, xMarker + width - subtract, yMarker + chunk.font().size()); + String filename = (String) obj[0]; + if (obj[1] instanceof String) { + remoteGoto(filename, (String) obj[1], xMarker, yMarker, xMarker + width - subtract, + yMarker + chunk.font().size()); + } else { + remoteGoto(filename, (Integer) obj[1], xMarker, yMarker, xMarker + width - subtract, + yMarker + chunk.font().size()); + } } if (chunk.isAttribute(Chunk.LOCALGOTO)) { float subtract = lastBaseFactor; - if (nextChunk != null && nextChunk.isAttribute(Chunk.LOCALGOTO)) + if (nextChunk != null && nextChunk.isAttribute(Chunk.LOCALGOTO)) { subtract = 0; - if (nextChunk == null) + } + if (nextChunk == null) { subtract += hangingCorrection; - localGoto((String)chunk.getAttribute(Chunk.LOCALGOTO), xMarker, yMarker, xMarker + width - subtract, yMarker + chunk.font().size()); + } + localGoto((String) chunk.getAttribute(Chunk.LOCALGOTO), xMarker, yMarker, + xMarker + width - subtract, yMarker + chunk.font().size()); } if (chunk.isAttribute(Chunk.LOCALDESTINATION)) { float subtract = lastBaseFactor; - if (nextChunk != null && nextChunk.isAttribute(Chunk.LOCALDESTINATION)) + if (nextChunk != null && nextChunk.isAttribute(Chunk.LOCALDESTINATION)) { subtract = 0; - if (nextChunk == null) + } + if (nextChunk == null) { subtract += hangingCorrection; - localDestination((String)chunk.getAttribute(Chunk.LOCALDESTINATION), new PdfDestination(PdfDestination.XYZ, xMarker, yMarker + chunk.font().size(), 0)); + } + localDestination((String) chunk.getAttribute(Chunk.LOCALDESTINATION), + new PdfDestination(PdfDestination.XYZ, xMarker, yMarker + chunk.font().size(), 0)); } if (chunk.isAttribute(Chunk.GENERICTAG)) { float subtract = lastBaseFactor; - if (nextChunk != null && nextChunk.isAttribute(Chunk.GENERICTAG)) + if (nextChunk != null && nextChunk.isAttribute(Chunk.GENERICTAG)) { subtract = 0; - if (nextChunk == null) + } + if (nextChunk == null) { subtract += hangingCorrection; - Rectangle rect = new Rectangle(xMarker, yMarker, xMarker + width - subtract, yMarker + chunk.font().size()); + } + Rectangle rect = new Rectangle(xMarker, yMarker, xMarker + width - subtract, + yMarker + chunk.font().size()); PdfPageEvent pev = writer.getPageEvent(); - if (pev != null) - pev.onGenericTag(writer, this, rect, (String)chunk.getAttribute(Chunk.GENERICTAG)); + if (pev != null) { + pev.onGenericTag(writer, this, rect, (String) chunk.getAttribute(Chunk.GENERICTAG)); + } } if (chunk.isAttribute(Chunk.PDFANNOTATION)) { float subtract = lastBaseFactor; - if (nextChunk != null && nextChunk.isAttribute(Chunk.PDFANNOTATION)) + if (nextChunk != null && nextChunk.isAttribute(Chunk.PDFANNOTATION)) { subtract = 0; - if (nextChunk == null) + } + if (nextChunk == null) { subtract += hangingCorrection; + } float fontSize = chunk.font().size(); float ascender = chunk.font().getFont().getFontDescriptor(BaseFont.ASCENT, fontSize); float descender = chunk.font().getFont().getFontDescriptor(BaseFont.DESCENT, fontSize); - PdfAnnotation annot = PdfFormField.shallowDuplicate((PdfAnnotation)chunk.getAttribute(Chunk.PDFANNOTATION)); - annot.put(PdfName.RECT, new PdfRectangle(xMarker, yMarker + descender, xMarker + width - subtract, yMarker + ascender)); + PdfAnnotation annot = PdfFormField.shallowDuplicate( + (PdfAnnotation) chunk.getAttribute(Chunk.PDFANNOTATION)); + annot.put(PdfName.RECT, + new PdfRectangle(xMarker, yMarker + descender, xMarker + width - subtract, + yMarker + ascender)); text.addAnnotation(annot); } float[] params = (float[]) chunk.getAttribute(Chunk.SKEW); - Float hs = (Float)chunk.getAttribute(Chunk.HSCALE); + Float hs = (Float) chunk.getAttribute(Chunk.HSCALE); if (params != null || hs != null) { float b = 0, c = 0; if (params != null) { b = params[0]; c = params[1]; } - if (hs != null) + if (hs != null) { hScale = hs; + } text.setTextMatrix(hScale, b, c, 1, xMarker, yMarker); } if (chunk.isAttribute(Chunk.CHAR_SPACING)) { @@ -1695,40 +1636,44 @@ else if (isJustified) { int tr = 0; float strokeWidth = 1; Color strokeColor = null; - Float fr = (Float)chunk.getAttribute(Chunk.SUBSUPSCRIPT); + Float fr = (Float) chunk.getAttribute(Chunk.SUBSUPSCRIPT); if (textRender != null) { tr = (Integer) textRender[0] & 3; - if (tr != PdfContentByte.TEXT_RENDER_MODE_FILL) + if (tr != PdfContentByte.TEXT_RENDER_MODE_FILL) { text.setTextRenderingMode(tr); + } if (tr == PdfContentByte.TEXT_RENDER_MODE_STROKE || tr == PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE) { strokeWidth = (Float) textRender[1]; - if (strokeWidth != 1) + if (strokeWidth != 1) { text.setLineWidth(strokeWidth); - strokeColor = (Color)textRender[2]; - if (strokeColor == null) + } + strokeColor = (Color) textRender[2]; + if (strokeColor == null) { strokeColor = color; - if (strokeColor != null) + } + if (strokeColor != null) { text.setColorStroke(strokeColor); + } } } - if (fr != null) + if (fr != null) { rise = fr; - if (color != null) + } + if (color != null) { text.setColorFill(color); - if (rise != 0) + } + if (rise != 0) { text.setTextRise(rise); + } if (chunk.isImage()) { adjustMatrix = true; - } - else if (chunk.isVerticalSeparator()) { + } else if (chunk.isVerticalSeparator()) { // Did nothing here to avoid printing out OBJECT_REPLACEMENT_CHARACTER - } - else if (chunk.isHorizontalSeparator()) { + } else if (chunk.isHorizontalSeparator()) { PdfTextArray array = new PdfTextArray(); array.add(-glueWidth * 1000f / chunk.font.size() / hScale); text.showText(array); - } - else if (chunk.isTab()) { + } else if (chunk.isTab()) { PdfTextArray array = new PdfTextArray(); array.add((tabPosition - xMarker) * 1000f / chunk.font.size() / hScale); text.showText(array); @@ -1743,10 +1688,10 @@ else if (isJustified && numberOfSpaces > 0 && chunk.isSpecialEncoding()) { } String s = chunk.toString(); int idx = s.indexOf(' '); - if (idx < 0) + if (idx < 0) { text.showText(s); - else { - float spaceCorrection = - baseWordSpacing * 1000f / chunk.font.size() / hScale; + } else { + float spaceCorrection = -baseWordSpacing * 1000f / chunk.font.size() / hScale; PdfTextArray textArray = new PdfTextArray(); if (LayoutProcessor.isEnabled() && LayoutProcessor.isSet(LAYOUT_RIGHT_TO_LEFT)) { textArray.setRTL(true); @@ -1762,8 +1707,7 @@ else if (isJustified && numberOfSpaces > 0 && chunk.isSpecialEncoding()) { textArray.add(s.substring(lastIdx)); text.showText(textArray); } - } - else { + } else { if (isJustified && hScale != lastHScale) { lastHScale = hScale; text.setWordSpacing(baseWordSpacing / hScale); @@ -1772,16 +1716,21 @@ else if (isJustified && numberOfSpaces > 0 && chunk.isSpecialEncoding()) { text.showText(chunk.toString()); } - if (rise != 0) + if (rise != 0) { text.setTextRise(0); - if (color != null) + } + if (color != null) { text.resetRGBColorFill(); - if (tr != PdfContentByte.TEXT_RENDER_MODE_FILL) + } + if (tr != PdfContentByte.TEXT_RENDER_MODE_FILL) { text.setTextRenderingMode(PdfContentByte.TEXT_RENDER_MODE_FILL); - if (strokeColor != null) + } + if (strokeColor != null) { text.resetRGBColorStroke(); - if (strokeWidth != 1) + } + if (strokeWidth != 1) { text.setLineWidth(1); + } if (chunk.isAttribute(Chunk.SKEW) || chunk.isAttribute(Chunk.HSCALE)) { adjustMatrix = true; text.setTextMatrix(xMarker, yMarker); @@ -1793,64 +1742,32 @@ else if (isJustified && numberOfSpaces > 0 && chunk.isSpecialEncoding()) { if (isJustified) { text.setWordSpacing(0); text.setCharacterSpacing(0); - if (line.isNewlineSplit()) + if (line.isNewlineSplit()) { lastBaseFactor = 0; + } } - if (adjustMatrix) + if (adjustMatrix) { text.moveText(baseXMarker - text.getXTLM(), 0); + } currentValues[0] = currentFont; currentValues[1] = lastBaseFactor; } - protected Indentation indentation = new Indentation(); - - /** - * @since 2.0.8 (PdfDocument was package-private before) - */ - public static class Indentation { - - /** This represents the current indentation of the PDF Elements on the left side. */ - float indentLeft = 0; - - /** Indentation to the left caused by a section. */ - float sectionIndentLeft = 0; - - /** This represents the current indentation of the PDF Elements on the left side. */ - float listIndentLeft = 0; - - /** This is the indentation caused by an image on the left. */ - float imageIndentLeft = 0; - - /** This represents the current indentation of the PDF Elements on the right side. */ - float indentRight = 0; - - /** Indentation to the right caused by a section. */ - float sectionIndentRight = 0; - - /** This is the indentation caused by an image on the right. */ - float imageIndentRight = 0; - - /** This represents the current indentation of the PDF Elements on the top side. */ - float indentTop = 0; - - /** This represents the current indentation of the PDF Elements on the bottom side. */ - float indentBottom = 0; - } - /** * Gets the indentation on the left side. * - * @return a margin + * @return a margin */ protected float indentLeft() { - return left(indentation.indentLeft + indentation.listIndentLeft + indentation.imageIndentLeft + indentation.sectionIndentLeft); + return left(indentation.indentLeft + indentation.listIndentLeft + indentation.imageIndentLeft + + indentation.sectionIndentLeft); } /** * Gets the indentation on the right side. * - * @return a margin + * @return a margin */ protected float indentRight() { @@ -1860,7 +1777,7 @@ protected float indentRight() { /** * Gets the indentation on the top side. * - * @return a margin + * @return a margin */ protected float indentTop() { @@ -1870,7 +1787,7 @@ protected float indentTop() { /** * Gets the indentation on the bottom side. * - * @return a margin + * @return a margin */ float indentBottom() { @@ -1878,17 +1795,22 @@ float indentBottom() { } /** - * Adds extra space. - * This method should probably be rewritten. + * Adds extra space. This method should probably be rewritten. * * @param extraspace extra space * @param oldleading old leading - * @param f font + * @param f font */ protected void addSpacing(float extraspace, float oldleading, Font f) { - if (extraspace == 0) return; - if (pageEmpty) return; - if (currentHeight + line.height() + leading > indentTop() - indentBottom()) return; + if (extraspace == 0) { + return; + } + if (pageEmpty) { + return; + } + if (currentHeight + line.height() + leading > indentTop() - indentBottom()) { + return; + } leading = extraspace; carriageReturn(); if (f.isUnderlined() || f.isStrikethru()) { @@ -1904,15 +1826,10 @@ protected void addSpacing(float extraspace, float oldleading, Font f) { leading = oldleading; } -// Info Dictionary and Catalog - - /** some meta information about the Document. */ - protected PdfInfo info = new PdfInfo(); - /** * Gets the PdfInfo-object. * - * @return PdfInfo + * @return PdfInfo */ protected PdfInfo getInfo() { @@ -1953,10 +1870,10 @@ PdfCatalog getCatalog(PdfIndirectReference pages) { if (openActionName != null) { PdfAction action = getLocalGotoAction(openActionName); catalog.setOpenAction(action); - } - else if (openActionAction != null) + } else if (openActionAction != null) { catalog.setOpenAction(openActionAction); - if (additionalActions != null) { + } + if (additionalActions != null) { catalog.setAdditionalActions(additionalActions); } @@ -1969,8 +1886,7 @@ else if (openActionAction != null) if (annotationsImp.hasValidAcroForm()) { try { catalog.put(PdfName.ACROFORM, writer.addToBody(annotationsImp.getAcroForm()).getIndirectReference()); - } - catch (IOException e) { + } catch (IOException e) { throw new ExceptionConverter(e); } } @@ -1978,39 +1894,33 @@ else if (openActionAction != null) return catalog; } -// [C1] outlines - - /** This is the root outline of the document. */ - protected PdfOutline rootOutline; - - /** This is the current PdfOutline in the hierarchy of outlines. */ - protected PdfOutline currentOutline; - /** * Adds a named outline to the document . + * * @param outline the outline to be added - * @param name the name of this local destination + * @param name the name of this local destination */ void addOutline(PdfOutline outline, String name) { localDestination(name, outline.getPdfDestination()); } /** - * Gets the root outline. All the outlines must be created with a parent. - * The first level is created with this outline. + * Gets the root outline. All the outlines must be created with a parent. The first level is created with this + * outline. + * * @return the root outline */ public PdfOutline getRootOutline() { return rootOutline; } - /** * Updates the count in the outlines. */ void calculateOutlineCount() { - if (rootOutline.getKids().size() == 0) + if (rootOutline.getKids().size() == 0) { return; + } traverseOutlineCount(rootOutline); } @@ -2024,16 +1934,14 @@ void traverseOutlineCount(PdfOutline outline) { if (parent != null) { parent.setCount(parent.getCount() + 1); } - } - else { + } else { for (PdfOutline kid : kids) { traverseOutlineCount(kid); } if (parent != null) { if (outline.isOpen()) { parent.setCount(outline.getCount() + parent.getCount() + 1); - } - else { + } else { parent.setCount(parent.getCount() + 1); outline.setCount(-outline.getCount()); } @@ -2041,12 +1949,15 @@ void traverseOutlineCount(PdfOutline outline) { } } +// [C6] document level actions + /** * Writes the outline tree to the body of the PDF document. */ void writeOutlines() throws IOException { - if (rootOutline.getKids().size() == 0) + if (rootOutline.getKids().size() == 0) { return; + } outlineTree(rootOutline); writer.addToBody(rootOutline, rootOutline.indirectReference()); } @@ -2056,16 +1967,21 @@ void writeOutlines() throws IOException { */ void outlineTree(PdfOutline outline) throws IOException { outline.setIndirectReference(writer.getPdfIndirectReference()); - if (outline.parent() != null) + if (outline.parent() != null) { outline.put(PdfName.PARENT, outline.parent().indirectReference()); + } java.util.List kids = outline.getKids(); int size = kids.size(); - for (PdfOutline kid1 : kids) outlineTree(kid1); + for (PdfOutline kid1 : kids) { + outlineTree(kid1); + } for (int k = 0; k < size; ++k) { - if (k > 0) + if (k > 0) { kids.get(k).put(PdfName.PREV, kids.get(k - 1).indirectReference()); - if (k < size - 1) + } + if (k < size - 1) { kids.get(k).put(PdfName.NEXT, kids.get(k + 1).indirectReference()); + } } if (size > 0) { outline.put(PdfName.FIRST, kids.get(0).indirectReference()); @@ -2076,41 +1992,39 @@ void outlineTree(PdfOutline outline) throws IOException { } } -// [C3] PdfViewerPreferences interface - - /** Contains the Viewer preferences of this PDF document. */ - protected PdfViewerPreferencesImp viewerPreferences = new PdfViewerPreferencesImp(); - /** @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#setViewerPreferences(int) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#setViewerPreferences(int) + */ void setViewerPreferences(int preferences) { this.viewerPreferences.setViewerPreferences(preferences); } - /** @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#addViewerPreference(com.lowagie.text.pdf.PdfName, com.lowagie.text.pdf.PdfObject) */ + /** + * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#addViewerPreference(com.lowagie.text.pdf.PdfName, + * com.lowagie.text.pdf.PdfObject) + */ void addViewerPreference(PdfName key, PdfObject value) { this.viewerPreferences.addViewerPreference(key, value); } -// [C4] Page labels - - protected PdfPageLabels pageLabels; /** * Sets the page labels + * * @param pageLabels the page labels */ void setPageLabels(PdfPageLabels pageLabels) { this.pageLabels = pageLabels; } -// [C5] named objects: local destinations, javascript, embedded files - /** - * Implements a link to other part of the document. The jump will - * be made to a local destination with the same name, that must exist. + * Implements a link to other part of the document. The jump will be made to a local destination with the same name, + * that must exist. + * * @param name the name for this link - * @param llx the lower left x corner of the activation area - * @param lly the lower left y corner of the activation area - * @param urx the upper right x corner of the activation area - * @param ury the upper right y corner of the activation area + * @param llx the lower left x corner of the activation area + * @param lly the lower left y corner of the activation area + * @param urx the upper right x corner of the activation area + * @param ury the upper right y corner of the activation area */ void localGoto(String name, float llx, float lly, float urx, float ury) { PdfAction action = getLocalGotoAction(name); @@ -2119,14 +2033,17 @@ void localGoto(String name, float llx, float lly, float urx, float ury) { annotationsImp.addPlainAnnotation(pdfAnnotation); } +// [C7] portable collections + /** * Implements a link to another document. + * * @param filename the filename for the remote document - * @param name the name to jump to - * @param llx the lower left x corner of the activation area - * @param lly the lower left y corner of the activation area - * @param urx the upper right x corner of the activation area - * @param ury the upper right y corner of the activation area + * @param name the name to jump to + * @param llx the lower left x corner of the activation area + * @param lly the lower left y corner of the activation area + * @param urx the upper right x corner of the activation area + * @param ury the upper right y corner of the activation area */ void remoteGoto(String filename, String name, float llx, float lly, float urx, float ury) { annotationsImp.addPlainAnnotation(new PdfAnnotation(writer, llx, lly, urx, ury, new PdfAction(filename, name))); @@ -2134,57 +2051,56 @@ void remoteGoto(String filename, String name, float llx, float lly, float urx, f /** * Implements a link to another document. + * * @param filename the filename for the remote document - * @param page the page to jump to - * @param llx the lower left x corner of the activation area - * @param lly the lower left y corner of the activation area - * @param urx the upper right x corner of the activation area - * @param ury the upper right y corner of the activation area + * @param page the page to jump to + * @param llx the lower left x corner of the activation area + * @param lly the lower left y corner of the activation area + * @param urx the upper right x corner of the activation area + * @param ury the upper right y corner of the activation area */ void remoteGoto(String filename, int page, float llx, float lly, float urx, float ury) { addAnnotation(new PdfAnnotation(writer, llx, lly, urx, ury, new PdfAction(filename, page))); } - /** Implements an action in an area. +// [C8] AcroForm + + /** + * Implements an action in an area. + * * @param action the PdfAction - * @param llx the lower left x corner of the activation area - * @param lly the lower left y corner of the activation area - * @param urx the upper right x corner of the activation area - * @param ury the upper right y corner of the activation area + * @param llx the lower left x corner of the activation area + * @param lly the lower left y corner of the activation area + * @param urx the upper right x corner of the activation area + * @param ury the upper right y corner of the activation area */ void setAction(PdfAction action, float llx, float lly, float urx, float ury) { addAnnotation(new PdfAnnotation(writer, llx, lly, urx, ury, action)); } - /** - * Stores the destinations keyed by name. Value is - * Object[]{PdfAction,PdfIndirectReference,PdfDestintion}. - */ - protected TreeMap localDestinations = new TreeMap<>(); - PdfAction getLocalGotoAction(String name) { PdfAction action; Object[] obj = localDestinations.get(name); - if (obj == null) + if (obj == null) { obj = new Object[3]; + } if (obj[0] == null) { if (obj[1] == null) { obj[1] = writer.getPdfIndirectReference(); } - action = new PdfAction((PdfIndirectReference)obj[1]); + action = new PdfAction((PdfIndirectReference) obj[1]); obj[0] = action; localDestinations.put(name, obj); - } - else { - action = (PdfAction)obj[0]; + } else { + action = (PdfAction) obj[0]; } return action; } /** - * The local destination to where a local goto with the same - * name will jump to. - * @param name the name of this local destination + * The local destination to where a local goto with the same name will jump to. + * + * @param name the name of this local destination * @param destination the PdfDestination with the jump coordinates * @return true if the local destination was added, * false if a local destination with the same name @@ -2192,68 +2108,67 @@ PdfAction getLocalGotoAction(String name) { */ boolean localDestination(String name, PdfDestination destination) { Object[] obj = localDestinations.get(name); - if (obj == null) + if (obj == null) { obj = new Object[3]; - if (obj[2] != null) + } + if (obj[2] != null) { return false; + } obj[2] = destination; localDestinations.put(name, obj); - if (!destination.hasPage()) + if (!destination.hasPage()) { destination.addPage(writer.getCurrentPage()); + } return true; } - /** - * Stores a list of document level JavaScript actions. - */ - int jsCounter; - protected HashMap documentLevelJS = new HashMap<>(); - protected static final DecimalFormat SIXTEEN_DIGITS = new DecimalFormat("0000000000000000"); void addJavaScript(PdfAction js) { - if (js.get(PdfName.JS) == null) + if (js.get(PdfName.JS) == null) { throw new RuntimeException(MessageLocalization.getComposedMessage("only.javascript.actions.are.allowed")); + } try { documentLevelJS.put(SIXTEEN_DIGITS.format(jsCounter++), writer.addToBody(js).getIndirectReference()); - } - catch (IOException e) { + } catch (IOException e) { throw new ExceptionConverter(e); } } + void addJavaScript(String name, PdfAction js) { - if (js.get(PdfName.JS) == null) + if (js.get(PdfName.JS) == null) { throw new RuntimeException(MessageLocalization.getComposedMessage("only.javascript.actions.are.allowed")); + } try { documentLevelJS.put(name, writer.addToBody(js).getIndirectReference()); - } - catch (IOException e) { + } catch (IOException e) { throw new ExceptionConverter(e); } } +// [F12] tagged PDF + HashMap getDocumentLevelJS() { return documentLevelJS; } - protected HashMap documentFileAttachment = new HashMap<>(); - void addFileAttachment(String description, PdfFileSpecification fs) throws IOException { if (description == null) { - PdfString desc = (PdfString)fs.get(PdfName.DESC); + PdfString desc = (PdfString) fs.get(PdfName.DESC); if (desc == null) { description = ""; - } - else { + } else { description = PdfEncodings.convertToString(desc.getBytes(), null); } } fs.addDescription(description, true); - if (description.length() == 0) + if (description.length() == 0) { description = "Unnamed"; + } String fn = PdfEncodings.convertToString(new PdfString(description, PdfObject.TEXT_UNICODE).getBytes(), null); int k = 0; while (documentFileAttachment.containsKey(fn)) { ++k; - fn = PdfEncodings.convertToString(new PdfString(description + " " + k, PdfObject.TEXT_UNICODE).getBytes(), null); + fn = PdfEncodings.convertToString(new PdfString(description + " " + k, PdfObject.TEXT_UNICODE).getBytes(), + null); } documentFileAttachment.put(fn, fs.getReference()); } @@ -2262,52 +2177,44 @@ HashMap getDocumentFileAttachment() { return documentFileAttachment; } -// [C6] document level actions - - protected String openActionName; +// [U1] page sizes void setOpenAction(String name) { openActionName = name; openActionAction = null; } - protected PdfAction openActionAction; void setOpenAction(PdfAction action) { openActionAction = action; openActionName = null; } - protected PdfDictionary additionalActions; - void addAdditionalAction(PdfName actionType, PdfAction action) { - if (additionalActions == null) { + void addAdditionalAction(PdfName actionType, PdfAction action) { + if (additionalActions == null) { additionalActions = new PdfDictionary(); } - if (action == null) + if (action == null) { additionalActions.remove(actionType); - else + } else { additionalActions.put(actionType, action); - if (additionalActions.size() == 0) + } + if (additionalActions.size() == 0) { additionalActions = null; + } } -// [C7] portable collections - - protected PdfCollection collection; - /** * Sets the collection dictionary. + * * @param collection a dictionary of type PdfCollection */ public void setCollection(PdfCollection collection) { this.collection = collection; } -// [C8] AcroForm - - PdfAnnotationsImp annotationsImp; - /** * Gets the AcroForm object. + * * @return the PdfAcroform object of the PdfDocument */ PdfAcroForm getAcroForm() { @@ -2322,15 +2229,13 @@ void addCalculationOrder(PdfFormField formField) { annotationsImp.addCalculationOrder(formField); } +// [U2] empty pages + void addAnnotation(PdfAnnotation annot) { pageEmpty = false; annotationsImp.addAnnotation(annot); } -// [F12] tagged PDF - - protected int markPoint; - int getMarkPoint() { return markPoint; } @@ -2339,27 +2244,18 @@ void incMarkPoint() { ++markPoint; } -// [U1] page sizes - - /** This is the size of the next page. */ - protected Rectangle nextPageSize = null; - - /** This is the size of the several boxes of the current Page. */ - protected HashMap thisBoxSize = new HashMap<>(); - - /** This is the size of the several boxes that will be used in - * the next page. */ - protected HashMap boxSize = new HashMap<>(); +// [U3] page actions void setCropBoxSize(Rectangle crop) { setBoxSize("crop", crop); } void setBoxSize(String boxName, Rectangle size) { - if (size == null) + if (size == null) { boxSize.remove(boxName); - else + } else { boxSize.put(boxName, new PdfRectangle(size)); + } } protected void setNewPageSizeAndMargins() { @@ -2367,16 +2263,14 @@ protected void setNewPageSizeAndMargins() { if (marginMirroring && (getPageNumber() & 1) == 0) { marginRight = nextMarginLeft; marginLeft = nextMarginRight; - } - else { + } else { marginLeft = nextMarginLeft; marginRight = nextMarginRight; } if (marginMirroringTopBottom && (getPageNumber() & 1) == 0) { marginTop = nextMarginBottom; marginBottom = nextMarginTop; - } - else { + } else { marginTop = nextMarginTop; marginBottom = nextMarginBottom; } @@ -2390,51 +2284,47 @@ protected void setNewPageSizeAndMargins() { */ Rectangle getBoxSize(String boxName) { PdfRectangle r = thisBoxSize.get(boxName); - if (r != null) return r.getRectangle(); + if (r != null) { + return r.getRectangle(); + } return null; } -// [U2] empty pages - - /** This checks if the page is empty. */ - private boolean pageEmpty = true; + boolean isPageEmpty() { + return writer == null || (writer.getDirectContent().size() == 0 && writer.getDirectContentUnder().size() == 0 + && (pageEmpty || writer.isPaused())); + } void setPageEmpty(boolean pageEmpty) { this.pageEmpty = pageEmpty; } - boolean isPageEmpty() { - return writer == null || (writer.getDirectContent().size() == 0 && writer.getDirectContentUnder().size() == 0 && (pageEmpty || writer.isPaused())); - } - -// [U3] page actions - - /** The duration of the page */ - protected int duration=-1; // negative values will indicate no duration - - /** The page transition */ - protected PdfTransition transition=null; +// [U8] thumbnail images /** * Sets the display duration for the page (for presentations) - * @param seconds the number of seconds to display the page + * + * @param seconds the number of seconds to display the page */ void setDuration(int seconds) { - if (seconds > 0) - this.duration=seconds; - else - this.duration=-1; + if (seconds > 0) { + this.duration = seconds; + } else { + this.duration = -1; + } } /** * Sets the transition for the page - * @param transition the PdfTransition object + * + * @param transition the PdfTransition object */ void setTransition(PdfTransition transition) { - this.transition=transition; + this.transition = transition; } - protected PdfDictionary pageAA = null; +// [M0] Page resources contain references to fonts, extgstate, images,... + void setPageAction(PdfName actionType, PdfAction action) { if (pageAA == null) { pageAA = new PdfDictionary(); @@ -2442,46 +2332,34 @@ void setPageAction(PdfName actionType, PdfAction action) { pageAA.put(actionType, action); } -// [U8] thumbnail images - - protected PdfIndirectReference thumb; void setThumbnail(Image image) throws DocumentException { thumb = writer.getImageReference(writer.addDirectImageSimple(image)); } -// [M0] Page resources contain references to fonts, extgstate, images,... - - /** This are the page resources of the current Page. */ - protected PageResources pageResources; +// [M3] Images PageResources getPageResources() { return pageResources; } -// [M3] Images - - /** Holds value of property strictImageSequence. */ - protected boolean strictImageSequence = false; - - /** Getter for property strictImageSequence. - * @return Value of property strictImageSequence. + /** + * Getter for property strictImageSequence. * + * @return Value of property strictImageSequence. */ boolean isStrictImageSequence() { return this.strictImageSequence; } - /** Setter for property strictImageSequence. - * @param strictImageSequence New value of property strictImageSequence. + /** + * Setter for property strictImageSequence. * + * @param strictImageSequence New value of property strictImageSequence. */ void setStrictImageSequence(boolean strictImageSequence) { this.strictImageSequence = strictImageSequence; } - /** This is the position where the image ends. */ - protected float imageEnd = -1; - /** * Method added by Pelikan Stephan */ @@ -2496,13 +2374,11 @@ public void clearTextWrap() { } } - /** This is the image that could not be shown on a previous page. */ - protected Image imageWait = null; - /** * Adds an image to the document. + * * @param image the Image to add - * @throws PdfException on error + * @throws PdfException on error * @throws DocumentException on error */ @@ -2528,21 +2404,28 @@ protected void add(Image image) throws DocumentException { } pageEmpty = false; // avoid endless loops - if (image == imageWait) + if (image == imageWait) { imageWait = null; + } boolean textwrap = (image.getAlignment() & Image.TEXTWRAP) == Image.TEXTWRAP - && !((image.getAlignment() & Image.MIDDLE) == Image.MIDDLE); + && !((image.getAlignment() & Image.MIDDLE) == Image.MIDDLE); boolean underlying = (image.getAlignment() & Image.UNDERLYING) == Image.UNDERLYING; float diff = leading / 2; if (textwrap) { diff += leading; } - float lowerleft = indentTop() - currentHeight - image.getScaledHeight() -diff; + float lowerleft = indentTop() - currentHeight - image.getScaledHeight() - diff; float[] mt = image.matrix(); float startPosition = indentLeft() - mt[4]; - if ((image.getAlignment() & Image.RIGHT) == Image.RIGHT) startPosition = indentRight() - image.getScaledWidth() - mt[4]; - if ((image.getAlignment() & Image.MIDDLE) == Image.MIDDLE) startPosition = indentLeft() + ((indentRight() - indentLeft() - image.getScaledWidth()) / 2) - mt[4]; - if (image.hasAbsoluteX()) startPosition = image.getAbsoluteX(); + if ((image.getAlignment() & Image.RIGHT) == Image.RIGHT) { + startPosition = indentRight() - image.getScaledWidth() - mt[4]; + } + if ((image.getAlignment() & Image.MIDDLE) == Image.MIDDLE) { + startPosition = indentLeft() + ((indentRight() - indentLeft() - image.getScaledWidth()) / 2) - mt[4]; + } + if (image.hasAbsoluteX()) { + startPosition = image.getAbsoluteX(); + } if (textwrap) { if (imageEnd < 0 || imageEnd < currentHeight + image.getScaledHeight() + diff) { imageEnd = currentHeight + image.getScaledHeight() + diff; @@ -2550,22 +2433,24 @@ protected void add(Image image) throws DocumentException { if ((image.getAlignment() & Image.RIGHT) == Image.RIGHT) { // indentation suggested by Pelikan Stephan indentation.imageIndentRight += image.getScaledWidth() + image.getIndentationLeft(); - } - else { + } else { // indentation suggested by Pelikan Stephan indentation.imageIndentLeft += image.getScaledWidth() + image.getIndentationRight(); } - } - else { - if ((image.getAlignment() & Image.RIGHT) == Image.RIGHT) startPosition -= image.getIndentationRight(); - else if ((image.getAlignment() & Image.MIDDLE) == Image.MIDDLE) startPosition += image.getIndentationLeft() - image.getIndentationRight(); - else startPosition += image.getIndentationLeft(); + } else { + if ((image.getAlignment() & Image.RIGHT) == Image.RIGHT) { + startPosition -= image.getIndentationRight(); + } else if ((image.getAlignment() & Image.MIDDLE) == Image.MIDDLE) { + startPosition += image.getIndentationLeft() - image.getIndentationRight(); + } else { + startPosition += image.getIndentationLeft(); + } } graphics.addImage(image, mt[0], mt[1], mt[2], mt[3], startPosition, lowerleft - mt[5]); if (!(textwrap || underlying)) { currentHeight += image.getScaledHeight() + diff; flushLines(); - text.moveText(0, - (image.getScaledHeight() + diff)); + text.moveText(0, -(image.getScaledHeight() + diff)); newLine(); } } @@ -2575,7 +2460,7 @@ protected void add(Image image) throws DocumentException { */ protected void flushSpecial() { - if(footer.getSpecialContent() == null){ + if (footer.getSpecialContent() == null) { return; } for (Element element : footer.getSpecialContent()) { @@ -2596,18 +2481,25 @@ protected void flushSpecial() { float[] mt = image.matrix(); float startPosition = indentLeft() - mt[4]; - if ((image.getAlignment() & Image.RIGHT) == Image.RIGHT) + if ((image.getAlignment() & Image.RIGHT) == Image.RIGHT) { startPosition = indentRight() - image.getScaledWidth() - mt[4]; - if ((image.getAlignment() & Image.MIDDLE) == Image.MIDDLE) - startPosition = indentLeft() + ((indentRight() - indentLeft() - image.getScaledWidth()) / 2) - mt[4]; - if (image.hasAbsoluteX()) startPosition = image.getAbsoluteX(); + } + if ((image.getAlignment() & Image.MIDDLE) == Image.MIDDLE) { + startPosition = + indentLeft() + ((indentRight() - indentLeft() - image.getScaledWidth()) / 2) - mt[4]; + } + if (image.hasAbsoluteX()) { + startPosition = image.getAbsoluteX(); + } if (!textwrap) { - if ((image.getAlignment() & Image.RIGHT) == Image.RIGHT) + if ((image.getAlignment() & Image.RIGHT) == Image.RIGHT) { startPosition -= image.getIndentationRight(); - else if ((image.getAlignment() & Image.MIDDLE) == Image.MIDDLE) + } else if ((image.getAlignment() & Image.MIDDLE) == Image.MIDDLE) { startPosition += image.getIndentationLeft() - image.getIndentationRight(); - else startPosition += image.getIndentationLeft(); + } else { + startPosition += image.getIndentationLeft(); + } } graphics.addImage(image, mt[0], mt[1], mt[2], mt[3], startPosition, lowerleft - mt[5]); break; @@ -2683,9 +2575,9 @@ protected void delayTableAddition(PdfPTable table) { footer.addPadding(footerPadding); } - // [M4] Adding a PdfPTable - - /** Adds a PdfPTable to the document. + /** + * Adds a PdfPTable to the document. + * * @param ptable the PdfPTable to be added to the document. * @throws DocumentException on error */ @@ -2693,7 +2585,7 @@ void addPTable(PdfPTable ptable) throws DocumentException { ColumnText ct = new ColumnText(writer.getDirectContent()); // if the table prefers to be on a single page, and it wouldn't //fit on the current page, start a new page. - if (ptable.getKeepTogether() && !fitsPage(ptable, 0f) && currentHeight > 0) { + if (ptable.getKeepTogether() && !fitsPage(ptable, 0f) && currentHeight > 0) { newPage(); } // add dummy paragraph if we aren't at the top of a page, so that @@ -2715,10 +2607,11 @@ void addPTable(PdfPTable ptable) throws DocumentException { currentHeight = indentTop() - ct.getYLine(); break; } - if (indentTop() - currentHeight == ct.getYLine()) + if (indentTop() - currentHeight == ct.getYLine()) { ++loop; - else + } else { loop = 0; + } if (loop == 3) { add(new Paragraph("ERROR: Infinite table loop")); break; @@ -2731,9 +2624,9 @@ void addPTable(PdfPTable ptable) throws DocumentException { /** * Checks if a PdfPTable fits the current page of the PdfDocument. * - * @param table the table that has to be checked - * @param margin a certain margin - * @return true if the PdfPTable fits the page, false otherwise. + * @param table the table that has to be checked + * @param margin a certain margin + * @return true if the PdfPTable fits the page, false otherwise. */ boolean fitsPage(PdfPTable table, float margin) { @@ -2741,9 +2634,11 @@ boolean fitsPage(PdfPTable table, float margin) { // ensuring that a new line has been started. ensureNewLine(); return table.getTotalHeight() + ((currentHeight > 0) ? table.spacingBefore() : 0f) - <= indentTop() - currentHeight - indentBottom() - margin; + <= indentTop() - currentHeight - indentBottom() - margin; } + // [M4] Adding a PdfPTable + private void setTableWidth(final PdfPTable table) { if (!table.isLockedWidth()) { float totalWidth = (indentRight() - indentLeft()) * table.getWidthPercentage() / 100; @@ -2751,113 +2646,12 @@ private void setTableWidth(final PdfPTable table) { } } -// [M4'] Adding a Table - - /** - * This is a helper class for adding a Table to a document. - * @since 2.0.8 (PdfDocument was package-private before) - */ - protected static class RenderingContext { - float pagetop = -1; - float oldHeight = -1; - - PdfContentByte cellGraphics = null; - - float lostTableBottom; - - float maxCellBottom; - float maxCellHeight; - - Map rowspanMap = new HashMap<>(); - - // Possible keys and values are Set or Integer. Really? - Map pageMap = new HashMap<>(); - Map> pageCellSetMap = new HashMap<>(); - - /** - * A PdfPTable - */ - public PdfTable table; - - /** - * Consumes the rowspan - * @param c pdf cell - * @return a rowspan. - */ - public int consumeRowspan(PdfCell c) { - if (c.rowspan() == 1) { - return 1; - } - - Integer i = rowspanMap.get(c); - if (i == null) { - i = c.rowspan(); - } - - i = i - 1; - rowspanMap.put(c, i); - - if (i < 1) { - return 1; - } - return i; - } - - /** - * Looks at the current rowspan. - * @param c cell - * @return the current rowspan - */ - public int currentRowspan(PdfCell c) { - Integer i = rowspanMap.get(c); - if (i == null) { - return c.rowspan(); - } else { - return i; - } - } - - public int cellRendered(PdfCell cell, int pageNumber) { - Integer i = pageMap.get(cell); - if (i == null) { - i = 1; - } else { - i = i + 1; - } - pageMap.put(cell, i); - - Integer pageInteger = pageNumber; - Set set = pageCellSetMap.computeIfAbsent(pageInteger, k -> new HashSet<>()); - set.add(cell); - - return i; - } - - public int numCellRendered(PdfCell cell) { - Integer i = pageMap.get(cell); - if (i == null) { - i = 0; - } - return i; - } - - public boolean isCellRenderedOnPage(PdfCell cell, int pageNumber) { - Integer pageInteger = pageNumber; - Set set = pageCellSetMap.get(pageInteger); - - if (set != null) { - return set.contains(cell); - } - - return false; - } - } - /** * Adds a new table to the document. - * @param t Table to add. Rendered rows will be deleted after processing. + * + * @param t Table to add. Rendered rows will be deleted after processing. * @throws DocumentException - * @since iText 2.0.8 + * @since iText 2.0.8 */ private void addPdfTable(Table t) throws DocumentException { // before every table, we flush all lines @@ -2977,8 +2771,7 @@ private void addPdfTable(Table t) throws DocumentException { flushLines(); indentation.indentTop = currentHeight - leading; currentHeight = 0; - } - else { + } else { flushLines(); } @@ -3013,8 +2806,7 @@ private void addPdfTable(Table t) throws DocumentException { currentHeight = indentTop() - ctx.pagetop + table.cellspacing(); text.moveText(0, ctx.pagetop - indentTop() - currentHeight); - } - else { + } else { if (somethingAdded) { ctx.pagetop = indentTop(); text.moveText(0, -table.cellspacing()); @@ -3047,8 +2839,8 @@ private void addPdfTable(Table t) throws DocumentException { newTop = indentTop() - currentHeight; } - cell.setTop(newTop ); - cell.setBottom(newBottom ); + cell.setTop(newTop); + cell.setBottom(newBottom); } } } @@ -3088,7 +2880,9 @@ protected void analyzeRow(java.util.List> rows, Renderin useTop = false; } - if (rowIndex < 0 || rowIndex >= rows.size()) return; + if (rowIndex < 0 || rowIndex >= rows.size()) { + return; + } row = rows.get(rowIndex); iterator = row.iterator(); @@ -3105,6 +2899,8 @@ protected void analyzeRow(java.util.List> rows, Renderin } } +// [M4'] Adding a Table + protected boolean mayBeRemoved(java.util.List row) { Iterator iterator = row.iterator(); boolean mayBeRemoved = true; @@ -3177,10 +2973,11 @@ protected java.util.List> extractRows(java.util.List spannedRow = rows.get(i + k); - if (spannedRow.size() > j) + if (spannedRow.size() > j) { spannedRow.add(j, c); + } } } } @@ -3196,7 +2993,9 @@ protected void renderCells(RenderingContext ctx, java.util.List cells, boolean h while (iterator.hasNext()) { cell = (PdfCell) iterator.next(); if (!cell.isHeader()) { - if (cell.getBottom() < indentBottom()) return; + if (cell.getBottom() < indentBottom()) { + return; + } } } } @@ -3233,7 +3032,7 @@ protected void renderCells(RenderingContext ctx, java.util.List cells, boolean h // we paint the borders of the cells Rectangle cellRect = cell.rectangle(tableRect.getTop(), indentBottom); - //cellRect.setBottom(cellRect.bottom()); + //cellRect.setBottom(cellRect.bottom()); if (cellRect.getHeight() > 0) { ctx.lostTableBottom = indentBottom; ctx.cellGraphics.rectangle(cellRect); @@ -3253,8 +3052,8 @@ protected void renderCells(RenderingContext ctx, java.util.List cells, boolean h /** * Returns the bottomvalue of a Table if it were added to this document. * - * @param table the table that may or may not be added to this document - * @return a bottom value + * @param table the table that may or may not be added to this document + * @return a bottom value */ float bottom(Table table) { // constructing a PdfTable @@ -3262,12 +3061,10 @@ float bottom(Table table) { return tmp.getBottom(); } -// [M5] header/footer - /** This is the flag meaning whether document is creating footer. */ - private boolean isDoFooter = false; - protected void doFooter() throws DocumentException { - if (footer == null) return; + if (footer == null) { + return; + } isDoFooter = true; // Begin added by Edgar Leonardo Prieto Perilla // Avoid footer indentation @@ -3316,7 +3113,9 @@ protected void doFooter() throws DocumentException { protected void doHeader() throws DocumentException { // if there is a header, the header = added - if (header == null) return; + if (header == null) { + return; + } // Begin added by Edgar Leonardo Prieto Perilla // Avoid header indentation float tmpIndentLeft = indentation.indentLeft; @@ -3357,4 +3156,397 @@ protected void doHeader() throws DocumentException { // End added: Bonf (Marc Schneider) 2003-07-29 // End Added by Edgar Leonardo Prieto Perilla } + + /** + * PdfInfo is the PDF InfoDictionary. + *

      + * A document's trailer may contain a reference to an Info dictionary that provides information about the document. + * This optional dictionary may contain one or more keys, whose values should be strings.
      This object is + * described in the 'Portable Document Format Reference Manual version 1.3' section 6.10 (page 120-121) + * + * @since 2.0.8 (PdfDocument was package-private before) + */ + + public static class PdfInfo extends PdfDictionary { + + /** + * Construct a PdfInfo-object. + */ + + PdfInfo() { + super(); + } + + /** + * Constructs a PdfInfo-object. + * + * @param author name of the author of the document + * @param title title of the document + * @param subject subject of the document + */ + + PdfInfo(String author, String title, String subject) { + this(); + addProducer(); + addCreationDate(); + addTitle(title); + addSubject(subject); + addAuthor(author); + } + + /** + * Adds the title of the document. + * + * @param title the title of the document + */ + + void addTitle(String title) { + put(PdfName.TITLE, new PdfString(title, PdfObject.TEXT_UNICODE)); + } + + /** + * Adds the subject to the document. + * + * @param subject the subject of the document + */ + + void addSubject(String subject) { + put(PdfName.SUBJECT, new PdfString(subject, PdfObject.TEXT_UNICODE)); + } + + /** + * Adds some keywords to the document. + * + * @param keywords the keywords of the document + */ + + void addKeywords(String keywords) { + put(PdfName.KEYWORDS, new PdfString(keywords, PdfObject.TEXT_UNICODE)); + } + + /** + * Adds the name of the author to the document. + * + * @param author the name of the author + */ + + void addAuthor(String author) { + put(PdfName.AUTHOR, new PdfString(author, PdfObject.TEXT_UNICODE)); + } + + /** + * Adds the name of the creator to the document. + * + * @param creator the name of the creator + */ + + void addCreator(String creator) { + put(PdfName.CREATOR, new PdfString(creator, PdfObject.TEXT_UNICODE)); + } + + /** + * Adds the name of the producer to the document. + */ + void addProducer() { + addProducer(getVersion()); + } + + /** + * Adds the name of the producer to the document. + * + * @param producer name of the producer + */ + void addProducer(final String producer) { + put(PdfName.PRODUCER, new PdfString(producer)); + } + + /** + * Adds the date of creation to the document. + */ + + void addCreationDate() { + PdfString date = new PdfDate(); + put(PdfName.CREATIONDATE, date); + } + + /** + * Adds the modification date (=current date and time) to the document. + */ + void addModificationDate() { + PdfString date = new PdfDate(); + put(PdfName.MODDATE, date); + } + + /** + * Adds the modification date to the document. + */ + void addModificationDate(PdfDate date) { + put(PdfName.MODDATE, date); + } + + void addkey(String key, String value) { + if (key.equals("Producer") || key.equals("CreationDate")) { + return; + } + put(new PdfName(key), new PdfString(value, PdfObject.TEXT_UNICODE)); + } + } + +// [M5] header/footer + + /** + * PdfCatalog is the PDF Catalog-object. + *

      + * The Catalog is a dictionary that is the root node of the document. It contains a reference to the tree of pages + * contained in the document, a reference to the tree of objects representing the document's outline, a reference to + * the document's article threads, and the list of named destinations. In addition, the Catalog indicates whether + * the document's outline or thumbnail page images should be displayed automatically when the document is viewed and + * whether some location other than the first page should be shown when the document is opened.
      In this class + * however, only the reference to the tree of pages is implemented.
      This object is described in the 'Portable + * Document Format Reference Manual version 1.3' section 6.2 (page 67-71) + */ + + static class PdfCatalog extends PdfDictionary { + + /** + * The writer writing the PDF for which we are creating this catalog object. + */ + PdfWriter writer; + + /** + * Constructs a PdfCatalog. + * + * @param pages an indirect reference to the root of the document's Pages tree. + * @param writer the writer the catalog applies to + */ + + PdfCatalog(PdfIndirectReference pages, PdfWriter writer) { + super(CATALOG); + this.writer = writer; + put(PdfName.PAGES, pages); + } + + /** + * Adds the names of the named destinations to the catalog. + * + * @param localDestinations the local destinations + * @param documentLevelJS the javascript used in the document + * @param documentFileAttachment the attached files + * @param writer the writer the catalog applies to + */ + void addNames(TreeMap localDestinations, Map documentLevelJS, + Map documentFileAttachment, PdfWriter writer) { + if (localDestinations.isEmpty() && documentLevelJS.isEmpty() && documentFileAttachment.isEmpty()) { + return; + } + try { + PdfDictionary names = new PdfDictionary(); + if (!localDestinations.isEmpty()) { + PdfArray ar = new PdfArray(); + for (Map.Entry entry : localDestinations.entrySet()) { + String name = entry.getKey(); + Object[] obj = entry.getValue(); + if (obj[2] == null) //no destination + { + continue; + } + PdfIndirectReference ref = (PdfIndirectReference) obj[1]; + ar.add(new PdfString(name, null)); + ar.add(ref); + } + if (ar.size() > 0) { + PdfDictionary dests = new PdfDictionary(); + dests.put(PdfName.NAMES, ar); + names.put(PdfName.DESTS, writer.addToBody(dests).getIndirectReference()); + } + } + if (!documentLevelJS.isEmpty()) { + PdfDictionary tree = PdfNameTree.writeTree(documentLevelJS, writer); + names.put(PdfName.JAVASCRIPT, writer.addToBody(tree).getIndirectReference()); + } + if (!documentFileAttachment.isEmpty()) { + names.put(PdfName.EMBEDDEDFILES, + writer.addToBody(PdfNameTree.writeTree(documentFileAttachment, writer)) + .getIndirectReference()); + } + if (names.size() > 0) { + put(PdfName.NAMES, writer.addToBody(names).getIndirectReference()); + } + } catch (IOException e) { + throw new ExceptionConverter(e); + } + } + + /** + * Adds an open action to the catalog. + * + * @param action the action that will be triggered upon opening the document + */ + void setOpenAction(PdfAction action) { + put(PdfName.OPENACTION, action); + } + + + /** + * Sets the document level additional actions. + * + * @param actions dictionary of actions + */ + void setAdditionalActions(PdfDictionary actions) { + try { + put(PdfName.AA, writer.addToBody(actions).getIndirectReference()); + } catch (Exception e) { + throw new ExceptionConverter(e); + } + } + } + + /** + * @since 2.0.8 (PdfDocument was package-private before) + */ + public static class Indentation { + + /** + * This represents the current indentation of the PDF Elements on the left side. + */ + float indentLeft = 0; + + /** + * Indentation to the left caused by a section. + */ + float sectionIndentLeft = 0; + + /** + * This represents the current indentation of the PDF Elements on the left side. + */ + float listIndentLeft = 0; + + /** + * This is the indentation caused by an image on the left. + */ + float imageIndentLeft = 0; + + /** + * This represents the current indentation of the PDF Elements on the right side. + */ + float indentRight = 0; + + /** + * Indentation to the right caused by a section. + */ + float sectionIndentRight = 0; + + /** + * This is the indentation caused by an image on the right. + */ + float imageIndentRight = 0; + + /** + * This represents the current indentation of the PDF Elements on the top side. + */ + float indentTop = 0; + + /** + * This represents the current indentation of the PDF Elements on the bottom side. + */ + float indentBottom = 0; + } + + /** + * This is a helper class for adding a Table to a document. + * + * @since 2.0.8 (PdfDocument was package-private before) + */ + protected static class RenderingContext { + + /** + * A PdfPTable + */ + public PdfTable table; + float pagetop = -1; + float oldHeight = -1; + PdfContentByte cellGraphics = null; + float lostTableBottom; + float maxCellBottom; + float maxCellHeight; + Map rowspanMap = new HashMap<>(); + // Possible keys and values are Set or Integer. Really? + Map pageMap = new HashMap<>(); + Map> pageCellSetMap = new HashMap<>(); + + /** + * Consumes the rowspan + * + * @param c pdf cell + * @return a rowspan. + */ + public int consumeRowspan(PdfCell c) { + if (c.rowspan() == 1) { + return 1; + } + + Integer i = rowspanMap.get(c); + if (i == null) { + i = c.rowspan(); + } + + i = i - 1; + rowspanMap.put(c, i); + + if (i < 1) { + return 1; + } + return i; + } + + /** + * Looks at the current rowspan. + * + * @param c cell + * @return the current rowspan + */ + public int currentRowspan(PdfCell c) { + Integer i = rowspanMap.get(c); + if (i == null) { + return c.rowspan(); + } else { + return i; + } + } + + public int cellRendered(PdfCell cell, int pageNumber) { + Integer i = pageMap.get(cell); + if (i == null) { + i = 1; + } else { + i = i + 1; + } + pageMap.put(cell, i); + + Integer pageInteger = pageNumber; + Set set = pageCellSetMap.computeIfAbsent(pageInteger, k -> new HashSet<>()); + set.add(cell); + + return i; + } + + public int numCellRendered(PdfCell cell) { + Integer i = pageMap.get(cell); + if (i == null) { + i = 0; + } + return i; + } + + public boolean isCellRenderedOnPage(PdfCell cell, int pageNumber) { + Integer pageInteger = pageNumber; + Set set = pageCellSetMap.get(pageInteger); + + if (set != null) { + return set.contains(cell); + } + + return false; + } + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfEFStream.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfEFStream.java index 30c1d3116..5141ad244 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfEFStream.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfEFStream.java @@ -56,17 +56,18 @@ import java.util.zip.DeflaterOutputStream; /** - * Extends PdfStream and should be used to create Streams for Embedded Files - * (file attachments). - * @since 2.1.3 + * Extends PdfStream and should be used to create Streams for Embedded Files (file attachments). + * + * @since 2.1.3 */ public class PdfEFStream extends PdfStream { /** * Creates a Stream object using an InputStream and a PdfWriter object - * @param in the InputStream that will be read to get the Stream object - * @param writer the writer to which the stream will be added + * + * @param in the InputStream that will be read to get the Stream object + * @param writer the writer to which the stream will be added */ public PdfEFStream(InputStream in, PdfWriter writer) { super(in, writer); @@ -74,7 +75,8 @@ public PdfEFStream(InputStream in, PdfWriter writer) { /** * Creates a Stream object using a byte array - * @param fileStore the bytes for the stream + * + * @param fileStore the bytes for the stream */ public PdfEFStream(byte[] fileStore) { super(fileStore); @@ -84,20 +86,23 @@ public PdfEFStream(byte[] fileStore) { * @see com.lowagie.text.pdf.PdfDictionary#toPdf(com.lowagie.text.pdf.PdfWriter, java.io.OutputStream) */ public void toPdf(PdfWriter writer, OutputStream os) throws IOException { - if (inputStream != null && compressed) + if (inputStream != null && compressed) { put(PdfName.FILTER, PdfName.FLATEDECODE); + } PdfEncryption crypto = null; - if (writer != null) + if (writer != null) { crypto = writer.getEncryption(); + } if (crypto != null) { PdfObject filter = get(PdfName.FILTER); if (filter != null) { - if (PdfName.CRYPT.equals(filter)) + if (PdfName.CRYPT.equals(filter)) { crypto = null; - else if (filter.isArray()) { - PdfArray a = (PdfArray)filter; - if (!a.isEmpty() && PdfName.CRYPT.equals(a.getPdfObject(0))) + } else if (filter.isArray()) { + PdfArray a = (PdfArray) filter; + if (!a.isEmpty() && PdfName.CRYPT.equals(a.getPdfObject(0))) { crypto = null; + } } } } @@ -117,13 +122,13 @@ else if (filter.isArray()) { } PdfObject nn = get(PdfName.LENGTH); if (crypto != null && nn != null && nn.isNumber()) { - int sz = ((PdfNumber)nn).intValue(); + int sz = ((PdfNumber) nn).intValue(); put(PdfName.LENGTH, new PdfNumber(crypto.calculateStreamSize(sz))); superToPdf(writer, os); put(PdfName.LENGTH, nn); - } - else + } else { superToPdf(writer, os); + } os.write(STARTSTREAM); if (inputStream != null) { @@ -132,8 +137,9 @@ else if (filter.isArray()) { OutputStreamCounter osc = new OutputStreamCounter(os); OutputStreamEncryption ose = null; OutputStream fout = osc; - if (crypto != null) + if (crypto != null) { fout = ose = crypto.getEncryptionStream(fout); + } Deflater deflater = null; if (compressed) { deflater = new Deflater(compressionLevel); @@ -143,8 +149,9 @@ else if (filter.isArray()) { byte[] buf = new byte[4192]; while (true) { int n = inputStream.read(buf); - if (n <= 0) + if (n <= 0) { break; + } fout.write(buf, 0, n); rawLength += n; } @@ -152,23 +159,22 @@ else if (filter.isArray()) { def.finish(); deflater.end(); } - if (ose != null) + if (ose != null) { ose.finish(); + } inputStreamLength = osc.getCounter(); - } - else { + } else { if (crypto == null) { - if (streamBytes != null) + if (streamBytes != null) { streamBytes.writeTo(os); - else + } else { os.write(bytes); - } - else { + } + } else { byte[] b; if (streamBytes != null) { b = crypto.encryptByteArray(streamBytes.toByteArray()); - } - else { + } else { b = crypto.encryptByteArray(bytes); } os.write(b); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncodings.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncodings.java index d6cd1e5b4..a3504a831 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncodings.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncodings.java @@ -48,9 +48,8 @@ package com.lowagie.text.pdf; -import com.lowagie.text.error_messages.MessageLocalization; import com.lowagie.text.ExceptionConverter; - +import com.lowagie.text.error_messages.MessageLocalization; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -63,16 +62,22 @@ import java.util.concurrent.ConcurrentHashMap; /** - * Supports fast encodings for winansi and PDFDocEncoding. Supports conversions - * from CJK encodings to CID. Supports custom encodings. - * + * Supports fast encodings for winansi and PDFDocEncoding. Supports conversions from CJK encodings to CID. Supports + * custom encodings. + * * @author Paulo Soares (psoares@consiste.pt) */ public class PdfEncodings { + + /** + * Assumes that '\\n' and '\\r\\n' are the newline sequences. It may not work for all CJK encodings. To be used with + * loadCmap(). + */ + public static final byte[][] CRLF_CID_NEWLINE = new byte[][]{ + {(byte) '\n'}, {(byte) '\r', (byte) '\n'}}; protected static final int CIDNONE = 0; protected static final int CIDRANGE = 1; protected static final int CIDCHAR = 2; - static final char[] winansiByteToChar = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, @@ -92,7 +97,6 @@ public class PdfEncodings { 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255}; - static final char[] pdfEncodingByteToChar = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, @@ -113,11 +117,10 @@ public class PdfEncodings { 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255}; - static final IntHashtable winansi = new IntHashtable(); - static final IntHashtable pdfEncoding = new IntHashtable(); - + static final ConcurrentHashMap cmaps = new ConcurrentHashMap<>( + 100, 0.85f, 64); static ConcurrentHashMap extraEncodings = new ConcurrentHashMap<>( 200, 0.85f, 64); @@ -144,15 +147,11 @@ public class PdfEncodings { } /** - * Converts a String to a byte array according to - * the font's encoding. - * - * @return an array of byte representing the conversion - * according to the font's encoding - * @param encoding - * the encoding - * @param text - * the String to be converted + * Converts a String to a byte array according to the font's encoding. + * + * @param encoding the encoding + * @param text the String to be converted + * @return an array of byte representing the conversion according to the font's encoding */ public static final byte[] convertToBytes(String text, String encoding) { if (text == null) { @@ -224,19 +223,15 @@ public static final byte[] convertToBytes(String text, String encoding) { } /** - * Converts a String to a byte array according to - * the font's encoding. - * - * @return an array of byte representing the conversion - * according to the font's encoding - * @param encoding - * the encoding - * @param char1 - * the char to be converted + * Converts a String to a byte array according to the font's encoding. + * + * @param encoding the encoding + * @param char1 the char to be converted + * @return an array of byte representing the conversion according to the font's encoding */ public static final byte[] convertToBytes(char char1, String encoding) { if (encoding == null || encoding.length() == 0) { - return new byte[] { (byte) char1 }; + return new byte[]{(byte) char1}; } ExtraEncoding extra = extraEncodings.get(encoding.toLowerCase(Locale.ROOT)); if (extra != null) { @@ -259,7 +254,7 @@ public static final byte[] convertToBytes(char char1, String encoding) { c = hash.get(char1); } if (c != 0) { - return new byte[] { (byte) c }; + return new byte[]{(byte) c}; } else { return new byte[0]; } @@ -281,13 +276,10 @@ public static final byte[] convertToBytes(char char1, String encoding) { } /** - * Converts a byte array to a String according to - * the some encoding. - * - * @param bytes - * the bytes to convert - * @param encoding - * the encoding + * Converts a byte array to a String according to the some encoding. + * + * @param bytes the bytes to convert + * @param encoding the encoding * @return the converted String */ public static final String convertToString(byte[] bytes, String encoding) { @@ -331,9 +323,8 @@ public static final String convertToString(byte[] bytes, String encoding) { /** * Checks is text only has PdfDocEncoding characters. - * - * @param text - * the String to test + * + * @param text the String to test * @return true if only PdfDocEncoding characters are present */ public static boolean isPdfDocEncoding(String text) { @@ -353,23 +344,11 @@ public static boolean isPdfDocEncoding(String text) { return true; } - static final ConcurrentHashMap cmaps = new ConcurrentHashMap<>( - 100, 0.85f, 64); - /** - * Assumes that '\\n' and '\\r\\n' are the newline sequences. It may not - * work for all CJK encodings. To be used with loadCmap(). - */ - public static final byte[][] CRLF_CID_NEWLINE = new byte[][]{ - {(byte) '\n'}, {(byte) '\r', (byte) '\n'}}; - /** - * Clears the CJK cmaps from the cache. If name is the empty - * string then all the cache is cleared. Calling this method has no - * consequences other than the need to reload the cmap if needed. - * - * @param name - * the name of the cmap to clear or all the cmaps if the empty - * string + * Clears the CJK cmaps from the cache. If name is the empty string then all the cache is cleared. + * Calling this method has no consequences other than the need to reload the cmap if needed. + * + * @param name the name of the cmap to clear or all the cmaps if the empty string */ public static void clearCmap(String name) { if (name.length() == 0) { @@ -380,14 +359,10 @@ public static void clearCmap(String name) { } /** - * Loads a CJK cmap to the cache with the option of associating sequences to - * the newline. - * - * @param name - * the CJK cmap name - * @param newline - * the sequences to be replaced by a newline in the resulting - * CID. See CRLF_CID_NEWLINE + * Loads a CJK cmap to the cache with the option of associating sequences to the newline. + * + * @param name the CJK cmap name + * @param newline the sequences to be replaced by a newline in the resulting CID. See CRLF_CID_NEWLINE */ public static void loadCmap(String name, byte[][] newline) { try { @@ -403,16 +378,12 @@ public static void loadCmap(String name, byte[][] newline) { } /** - * Converts a byte array encoded as name to a CID - * string. This is needed to reach some CJK characters that don't exist in - * 16 bit Unicode.

      The font to use this result must use the encoding - * "Identity-H" or "Identity-V".

      See - * ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/. - * - * @param name - * the CJK encoding name - * @param seq - * the byte array to be decoded + * Converts a byte array encoded as name to a CID string. This is needed to reach some CJK + * characters that don't exist in 16 bit Unicode.

      The font to use this result must use the encoding "Identity-H" + * or "Identity-V".

      See ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/. + * + * @param name the CJK encoding name + * @param seq the byte array to be decoded * @return the CID string */ public static String convertCmap(String name, byte[] seq) { @@ -420,24 +391,18 @@ public static String convertCmap(String name, byte[] seq) { } /** - * Converts a byte array encoded as name to a CID - * string. This is needed to reach some CJK characters that don't exist in - * 16 bit Unicode.

      The font to use this result must use the encoding - * "Identity-H" or "Identity-V".

      See - * ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/. - * - * @param name - * the CJK encoding name - * @param start - * the start offset in the data - * @param length - * the number of bytes to convert - * @param seq - * the byte array to be decoded + * Converts a byte array encoded as name to a CID string. This is needed to reach some CJK + * characters that don't exist in 16 bit Unicode.

      The font to use this result must use the encoding "Identity-H" + * or "Identity-V".

      See ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/. + * + * @param name the CJK encoding name + * @param start the start offset in the data + * @param length the number of bytes to convert + * @param seq the byte array to be decoded * @return the CID string */ public static String convertCmap(String name, byte[] seq, int start, - int length) { + int length) { try { char[][] planes = null; planes = cmaps.get(name); @@ -452,7 +417,7 @@ public static String convertCmap(String name, byte[] seq, int start, } static String decodeSequence(byte[] seq, int start, int length, - char[][] planes) { + char[][] planes) { StringBuilder buf = new StringBuilder(); int end = start + length; int currentPlane = 0; @@ -508,53 +473,53 @@ static void encodeStream(InputStream in, ArrayList planes) continue; } switch (state) { - case CIDNONE: { - if (line.contains("begincidrange")) { - state = CIDRANGE; - } else if (line.contains("begincidchar")) { - state = CIDCHAR; - } else if (line.contains("usecmap")) { + case CIDNONE: { + if (line.contains("begincidrange")) { + state = CIDRANGE; + } else if (line.contains("begincidchar")) { + state = CIDCHAR; + } else if (line.contains("usecmap")) { + StringTokenizer tk = new StringTokenizer(line); + String t = tk.nextToken(); + readCmap(t.substring(1), planes); + } + break; + } + case CIDRANGE: { + if (line.contains("endcidrange")) { + state = CIDNONE; + break; + } StringTokenizer tk = new StringTokenizer(line); String t = tk.nextToken(); - readCmap(t.substring(1), planes); - } - break; - } - case CIDRANGE: { - if (line.contains("endcidrange")) { - state = CIDNONE; + int size = t.length() / 2 - 1; + long start = Long.parseLong(t.substring(1, t.length() - 1), 16); + t = tk.nextToken(); + long end = Long.parseLong(t.substring(1, t.length() - 1), 16); + t = tk.nextToken(); + int cid = Integer.parseInt(t); + for (long k = start; k <= end; ++k) { + breakLong(k, size, seqs); + encodeSequence(size, seqs, (char) cid, planes); + ++cid; + } break; } - StringTokenizer tk = new StringTokenizer(line); - String t = tk.nextToken(); - int size = t.length() / 2 - 1; - long start = Long.parseLong(t.substring(1, t.length() - 1), 16); - t = tk.nextToken(); - long end = Long.parseLong(t.substring(1, t.length() - 1), 16); - t = tk.nextToken(); - int cid = Integer.parseInt(t); - for (long k = start; k <= end; ++k) { - breakLong(k, size, seqs); + case CIDCHAR: { + if (line.contains("endcidchar")) { + state = CIDNONE; + break; + } + StringTokenizer tk = new StringTokenizer(line); + String t = tk.nextToken(); + int size = t.length() / 2 - 1; + long start = Long.parseLong(t.substring(1, t.length() - 1), 16); + t = tk.nextToken(); + int cid = Integer.parseInt(t); + breakLong(start, size, seqs); encodeSequence(size, seqs, (char) cid, planes); - ++cid; - } - break; - } - case CIDCHAR: { - if (line.contains("endcidchar")) { - state = CIDNONE; break; } - StringTokenizer tk = new StringTokenizer(line); - String t = tk.nextToken(); - int size = t.length() / 2 - 1; - long start = Long.parseLong(t.substring(1, t.length() - 1), 16); - t = tk.nextToken(); - int cid = Integer.parseInt(t); - breakLong(start, size, seqs); - encodeSequence(size, seqs, (char) cid, planes); - break; - } } } } @@ -566,7 +531,7 @@ static void breakLong(long n, int size, byte[] seqs) { } static void encodeSequence(int size, byte[] seqs, char cid, - ArrayList planes) { + ArrayList planes) { --size; int nextPlane = 0; for (int idx = 0; idx < size; ++idx) { @@ -598,12 +563,9 @@ static void encodeSequence(int size, byte[] seqs, char cid, /** * Adds an extra encoding. - * - * @param name - * the name of the encoding. The encoding recognition is case - * insensitive - * @param enc - * the conversion class + * + * @param name the name of the encoding. The encoding recognition is case insensitive + * @param enc the conversion class */ public static void addExtraEncoding(String name, ExtraEncoding enc) { extraEncodings.putIfAbsent(name.toLowerCase(Locale.ROOT), enc); @@ -611,14 +573,28 @@ public static void addExtraEncoding(String name, ExtraEncoding enc) { private static class WingdingsConversion implements ExtraEncoding { + private final static byte[] table = {0, 35, 34, 0, 0, 0, 41, 62, 81, + 42, 0, 0, 65, 63, 0, 0, 0, 0, 0, -4, 0, 0, 0, -5, 0, 0, 0, 0, + 0, 0, 86, 0, 88, 89, 0, 0, 0, 0, 0, 0, 0, 0, -75, 0, 0, 0, 0, + 0, -74, 0, 0, 0, -83, -81, -84, 0, 0, 0, 0, 0, 0, 0, 0, 124, + 123, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, -90, 0, 0, 0, 113, + 114, 0, 0, 0, 117, 0, 0, 0, 0, 0, 0, 125, 126, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -116, + -115, -114, -113, -112, -111, -110, -109, -108, -107, -127, + -126, -125, -124, -123, -122, -121, -120, -119, -118, -116, + -115, -114, -113, -112, -111, -110, -109, -108, -107, -24, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -24, -40, 0, 0, -60, -58, 0, + 0, -16, 0, 0, 0, 0, 0, 0, 0, 0, 0, -36, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0}; + @Override public byte[] charToByte(char char1, String encoding) { if (char1 == ' ') { - return new byte[] { (byte) char1 }; + return new byte[]{(byte) char1}; } else if (char1 >= '\u2701' && char1 <= '\u27BE') { byte v = table[char1 - 0x2700]; if (v != 0) { - return new byte[] { v }; + return new byte[]{v}; } } return new byte[0]; @@ -652,25 +628,40 @@ public byte[] charToByte(String text, String encoding) { public String byteToChar(byte[] b, String encoding) { return null; } - - private final static byte[] table = {0, 35, 34, 0, 0, 0, 41, 62, 81, - 42, 0, 0, 65, 63, 0, 0, 0, 0, 0, -4, 0, 0, 0, -5, 0, 0, 0, 0, - 0, 0, 86, 0, 88, 89, 0, 0, 0, 0, 0, 0, 0, 0, -75, 0, 0, 0, 0, - 0, -74, 0, 0, 0, -83, -81, -84, 0, 0, 0, 0, 0, 0, 0, 0, 124, - 123, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, -90, 0, 0, 0, 113, - 114, 0, 0, 0, 117, 0, 0, 0, 0, 0, 0, 125, 126, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -116, - -115, -114, -113, -112, -111, -110, -109, -108, -107, -127, - -126, -125, -124, -123, -122, -121, -120, -119, -118, -116, - -115, -114, -113, -112, -111, -110, -109, -108, -107, -24, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -24, -40, 0, 0, -60, -58, 0, - 0, -16, 0, 0, 0, 0, 0, 0, 0, 0, 0, -36, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0}; } private static class Cp437Conversion implements ExtraEncoding { + + private final static char[] table = {'\u00C7', '\u00FC', '\u00E9', + '\u00E2', '\u00E4', '\u00E0', '\u00E5', '\u00E7', '\u00EA', + '\u00EB', '\u00E8', '\u00EF', '\u00EE', '\u00EC', '\u00C4', + '\u00C5', '\u00C9', '\u00E6', '\u00C6', '\u00F4', '\u00F6', + '\u00F2', '\u00FB', '\u00F9', '\u00FF', '\u00D6', '\u00DC', + '\u00A2', '\u00A3', '\u00A5', '\u20A7', '\u0192', '\u00E1', + '\u00ED', '\u00F3', '\u00FA', '\u00F1', '\u00D1', '\u00AA', + '\u00BA', '\u00BF', '\u2310', '\u00AC', '\u00BD', '\u00BC', + '\u00A1', '\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', + '\u2502', '\u2524', '\u2561', '\u2562', '\u2556', '\u2555', + '\u2563', '\u2551', '\u2557', '\u255D', '\u255C', '\u255B', + '\u2510', '\u2514', '\u2534', '\u252C', '\u251C', '\u2500', + '\u253C', '\u255E', '\u255F', '\u255A', '\u2554', '\u2569', + '\u2566', '\u2560', '\u2550', '\u256C', '\u2567', '\u2568', + '\u2564', '\u2565', '\u2559', '\u2558', '\u2552', '\u2553', + '\u256B', '\u256A', '\u2518', '\u250C', '\u2588', '\u2584', + '\u258C', '\u2590', '\u2580', '\u03B1', '\u00DF', '\u0393', + '\u03C0', '\u03A3', '\u03C3', '\u00B5', '\u03C4', '\u03A6', + '\u0398', '\u03A9', '\u03B4', '\u221E', '\u03C6', '\u03B5', + '\u2229', '\u2261', '\u00B1', '\u2265', '\u2264', '\u2320', + '\u2321', '\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', + '\u221A', '\u207F', '\u00B2', '\u25A0', '\u00A0'}; private static IntHashtable c2b = new IntHashtable(); + static { + for (int k = 0; k < table.length; ++k) { + c2b.put(table[k], k + 128); + } + } + @Override public byte[] charToByte(String text, String encoding) { char[] cc = text.toCharArray(); @@ -698,11 +689,11 @@ public byte[] charToByte(String text, String encoding) { @Override public byte[] charToByte(char char1, String encoding) { if (char1 < 128) { - return new byte[] { (byte) char1 }; + return new byte[]{(byte) char1}; } else { byte v = (byte) c2b.get(char1); if (v != 0) { - return new byte[] { v }; + return new byte[]{v}; } else { return new byte[0]; } @@ -728,98 +719,12 @@ public String byteToChar(byte[] b, String encoding) { } return new String(cc, 0, ptr); } - - private final static char[] table = {'\u00C7', '\u00FC', '\u00E9', - '\u00E2', '\u00E4', '\u00E0', '\u00E5', '\u00E7', '\u00EA', - '\u00EB', '\u00E8', '\u00EF', '\u00EE', '\u00EC', '\u00C4', - '\u00C5', '\u00C9', '\u00E6', '\u00C6', '\u00F4', '\u00F6', - '\u00F2', '\u00FB', '\u00F9', '\u00FF', '\u00D6', '\u00DC', - '\u00A2', '\u00A3', '\u00A5', '\u20A7', '\u0192', '\u00E1', - '\u00ED', '\u00F3', '\u00FA', '\u00F1', '\u00D1', '\u00AA', - '\u00BA', '\u00BF', '\u2310', '\u00AC', '\u00BD', '\u00BC', - '\u00A1', '\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', - '\u2502', '\u2524', '\u2561', '\u2562', '\u2556', '\u2555', - '\u2563', '\u2551', '\u2557', '\u255D', '\u255C', '\u255B', - '\u2510', '\u2514', '\u2534', '\u252C', '\u251C', '\u2500', - '\u253C', '\u255E', '\u255F', '\u255A', '\u2554', '\u2569', - '\u2566', '\u2560', '\u2550', '\u256C', '\u2567', '\u2568', - '\u2564', '\u2565', '\u2559', '\u2558', '\u2552', '\u2553', - '\u256B', '\u256A', '\u2518', '\u250C', '\u2588', '\u2584', - '\u258C', '\u2590', '\u2580', '\u03B1', '\u00DF', '\u0393', - '\u03C0', '\u03A3', '\u03C3', '\u00B5', '\u03C4', '\u03A6', - '\u0398', '\u03A9', '\u03B4', '\u221E', '\u03C6', '\u03B5', - '\u2229', '\u2261', '\u00B1', '\u2265', '\u2264', '\u2320', - '\u2321', '\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', - '\u221A', '\u207F', '\u00B2', '\u25A0', '\u00A0'}; - - static { - for (int k = 0; k < table.length; ++k) { - c2b.put(table[k], k + 128); - } - } } private static class SymbolConversion implements ExtraEncoding { private static final IntHashtable t1 = new IntHashtable(); private static final IntHashtable t2 = new IntHashtable(); - private IntHashtable translation; - private char[] revTranslation; - - SymbolConversion(boolean symbol) { - if (symbol) { - translation = t1; - revTranslation = table1; - } else { - translation = t2; - revTranslation = table2; - } - } - - @Override - public byte[] charToByte(String text, String encoding) { - char[] cc = text.toCharArray(); - byte[] b = new byte[cc.length]; - int ptr = 0; - int len = cc.length; - for (char c : cc) { - byte v = (byte) translation.get(c); - if (v != 0) { - b[ptr++] = v; - } - } - if (ptr == len) { - return b; - } - byte[] b2 = new byte[ptr]; - System.arraycopy(b, 0, b2, 0, ptr); - return b2; - } - - @Override - public byte[] charToByte(char char1, String encoding) { - byte v = (byte) translation.get(char1); - if (v != 0) { - return new byte[] { v }; - } else { - return new byte[0]; - } - } - - @Override - public String byteToChar(byte[] b, String encoding) { - int len = b.length; - char[] chars = new char[len]; - for(int i = 0; i < len; i++) { - int pos = b[i]&0xff; - if(pos < 32) - chars[i] = 0; - else - chars[i] = revTranslation[pos - 32]; - } - return new String(chars); - } - private final static char[] table1 = {' ', '!', '\u2200', '#', '\u2203', '%', '&', '\u220b', '(', ')', '*', '+', ',', '-', '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', @@ -853,7 +758,6 @@ public String byteToChar(byte[] b, String encoding) { '\0', '\u232a', '\u222b', '\u2320', '\u23ae', '\u2321', '\u239e', '\u239f', '\u23a0', '\u23a4', '\u23a5', '\u23a6', '\u23ab', '\u23ac', '\u23ad', '\0'}; - private final static char[] table2 = {'\u0020', '\u2701', '\u2702', '\u2703', '\u2704', '\u260e', '\u2706', '\u2707', '\u2708', '\u2709', '\u261b', '\u261e', '\u270C', '\u270D', '\u270E', @@ -905,6 +809,64 @@ public String byteToChar(byte[] b, String encoding) { } } } + + private IntHashtable translation; + private char[] revTranslation; + + SymbolConversion(boolean symbol) { + if (symbol) { + translation = t1; + revTranslation = table1; + } else { + translation = t2; + revTranslation = table2; + } + } + + @Override + public byte[] charToByte(String text, String encoding) { + char[] cc = text.toCharArray(); + byte[] b = new byte[cc.length]; + int ptr = 0; + int len = cc.length; + for (char c : cc) { + byte v = (byte) translation.get(c); + if (v != 0) { + b[ptr++] = v; + } + } + if (ptr == len) { + return b; + } + byte[] b2 = new byte[ptr]; + System.arraycopy(b, 0, b2, 0, ptr); + return b2; + } + + @Override + public byte[] charToByte(char char1, String encoding) { + byte v = (byte) translation.get(char1); + if (v != 0) { + return new byte[]{v}; + } else { + return new byte[0]; + } + } + + @Override + public String byteToChar(byte[] b, String encoding) { + int len = b.length; + char[] chars = new char[len]; + for (int i = 0; i < len; i++) { + int pos = b[i] & 0xff; + if (pos < 32) { + chars[i] = 0; + } else { + chars[i] = revTranslation[pos - 32]; + } + } + return new String(chars); + } } private static class SymbolTTConversion implements ExtraEncoding { @@ -912,7 +874,7 @@ private static class SymbolTTConversion implements ExtraEncoding { @Override public byte[] charToByte(char char1, String encoding) { if ((char1 & 0xff00) == 0 || (char1 & 0xff00) == 0xf000) { - return new byte[] { (byte) char1 }; + return new byte[]{(byte) char1}; } else { return new byte[0]; } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncryption.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncryption.java index b2b1c1070..a6f57fbf9 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncryption.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncryption.java @@ -53,10 +53,6 @@ import com.lowagie.text.error_messages.MessageLocalization; import com.lowagie.text.pdf.crypto.ARCFOUREncryption; import com.lowagie.text.pdf.crypto.IVGenerator; - -import javax.crypto.Cipher; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -65,11 +61,12 @@ import java.security.MessageDigest; import java.security.cert.Certificate; import java.util.Arrays; - +import javax.crypto.Cipher; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; /** - * * @author Paulo Soares (psoares@consiste.pt) * @author Kazuya Ujihara */ @@ -83,78 +80,74 @@ public class PdfEncryption { public static final int AES_256_V3 = 6; - private static final byte[] pad = { (byte) 0x28, (byte) 0xBF, (byte) 0x4E, + private static final byte[] pad = {(byte) 0x28, (byte) 0xBF, (byte) 0x4E, (byte) 0x5E, (byte) 0x4E, (byte) 0x75, (byte) 0x8A, (byte) 0x41, (byte) 0x64, (byte) 0x00, (byte) 0x4E, (byte) 0x56, (byte) 0xFF, (byte) 0xFA, (byte) 0x01, (byte) 0x08, (byte) 0x2E, (byte) 0x2E, (byte) 0x00, (byte) 0xB6, (byte) 0xD0, (byte) 0x68, (byte) 0x3E, (byte) 0x80, (byte) 0x2F, (byte) 0x0C, (byte) 0xA9, (byte) 0xFE, - (byte) 0x64, (byte) 0x53, (byte) 0x69, (byte) 0x7A }; - - private static final byte[] salt = { (byte) 0x73, (byte) 0x41, (byte) 0x6c, - (byte) 0x54 }; + (byte) 0x64, (byte) 0x53, (byte) 0x69, (byte) 0x7A}; - private static final byte[] metadataPad = { (byte) 255, (byte) 255, - (byte) 255, (byte) 255 }; + private static final byte[] salt = {(byte) 0x73, (byte) 0x41, (byte) 0x6c, + (byte) 0x54}; + private static final byte[] metadataPad = {(byte) 255, (byte) 255, + (byte) 255, (byte) 255}; + static long seq = System.currentTimeMillis(); + /** + * The public key security handler for certificate encryption + */ + protected PdfPublicKeySecurityHandler publicKeyHandler = null; /** * The encryption key for a particular object/generation */ byte[] key; - - /** The encryption key length for a particular object/generation */ + /** + * The encryption key length for a particular object/generation + */ int keySize; - /** * The global encryption key */ byte[] mkey; - /** * Work area to prepare the object/generation bytes */ byte[] extra = new byte[5]; - - /** The message digest algorithm MD5 */ + /** + * The message digest algorithm MD5 + */ MessageDigest md5; - /** * The encryption key for the owner */ byte[] ownerKey = new byte[32]; - /** * The encryption key for the user */ byte[] userKey = new byte[32]; - /** * Additional keys for AES_256_V3 */ byte[] oeKey; byte[] ueKey; byte[] perms; - - /** The public key security handler for certificate encryption */ - protected PdfPublicKeySecurityHandler publicKeyHandler = null; - int permissions; - byte[] documentID; - - static long seq = System.currentTimeMillis(); - private int revision; private ARCFOUREncryption arcfour = new ARCFOUREncryption(); - /** The generic key length. It may be 40 or 128. */ + /** + * The generic key length. It may be 40 or 128. + */ private int keyLength; private boolean encryptMetadata; - + /** * Indicates if the encryption is only necessary for embedded files. + * * @since 2.1.3 */ private boolean embeddedFilesOnly; @@ -172,60 +165,166 @@ public PdfEncryption() { public PdfEncryption(PdfEncryption enc) { this(); - if (enc.mkey != null) + if (enc.mkey != null) { mkey = enc.mkey.clone(); + } ownerKey = enc.ownerKey.clone(); userKey = enc.userKey.clone(); permissions = enc.permissions; - if (enc.documentID != null) + if (enc.documentID != null) { documentID = enc.documentID.clone(); + } revision = enc.revision; keyLength = enc.keyLength; encryptMetadata = enc.encryptMetadata; embeddedFilesOnly = enc.embeddedFilesOnly; publicKeyHandler = enc.publicKeyHandler; - if (enc.ueKey != null) + if (enc.ueKey != null) { ueKey = enc.ueKey.clone(); - if (enc.oeKey != null) + } + if (enc.oeKey != null) { oeKey = enc.oeKey.clone(); - if (enc.perms != null) + } + if (enc.perms != null) { perms = enc.perms.clone(); - if (enc.key != null) + } + if (enc.key != null) { key = enc.key.clone(); + } keySize = enc.keySize; } + public static byte[] createDocumentId() { + MessageDigest md5; + try { + md5 = MessageDigest.getInstance("MD5"); + } catch (Exception e) { + throw new ExceptionConverter(e); + } + long time = System.currentTimeMillis(); + long mem = Runtime.getRuntime().freeMemory(); + String s = time + "+" + mem + "+" + (seq++); + return md5.digest(s.getBytes()); + } + + public static PdfObject createInfoId(byte[] id) { + return createInfoId(id, createDocumentId()); + } + + public static PdfObject createInfoId(byte[] idPartOne, byte[] idPartTwo) { + try (ByteBuffer buf = new ByteBuffer(90)) { + buf.append('[').append('<'); + for (int k = 0; k < 16 && k < idPartOne.length; ++k) { + buf.appendHex(idPartOne[k]); + } + buf.append('>').append('<'); + for (int k = 0; k < 16 && k < idPartTwo.length; ++k) { + buf.appendHex(idPartTwo[k]); + } + buf.append('>').append(']'); + return new PdfLiteral(buf.toByteArray()); + + } catch (IOException e) { + throw new ExceptionConverter(e); + } + } + + /** + * This method returns a changing part of the {@code fileId} when can be identified. Returns a complete + * {@code fileId} of the changing part is not found. + * + * @param fileId {@link PdfObject} + * @return byte array representing the changing part of the document identifier + */ + public static byte[] getFileIdChangingPart(PdfObject fileId) { + byte[] bytes = fileId.getBytes(); + boolean firstPartFound = false; + int start = 0; + int end = bytes.length; + for (int i = 0; i < bytes.length; i++) { + if (bytes[i] == '<') { + if (firstPartFound) { + start = i + 1; + } + firstPartFound = true; + } else if (start > 0 && bytes[i] == '>') { + end = i; + break; + } + } + if (firstPartFound && start > 0) { + byte[] secondPartValue = new byte[end - start]; + System.arraycopy(bytes, start, secondPartValue, 0, end - start); + if (isHexEncoded(secondPartValue)) { + return decodeHex(secondPartValue); + } else { + return secondPartValue; + } + + } else { + // otherwise return provided value + return bytes; + } + } + + private static boolean isHexEncoded(byte[] str) { + if (str.length == 0 || str.length % 2 != 0) { + return false; + } + for (int c : str) { + if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'))) { + return false; + } + } + return true; + } + + private static byte[] decodeHex(byte[] hexEncoded) { + try (ByteBuffer byteBuffer = new ByteBuffer(hexEncoded.length / 2)) { + for (int i = 0; i < hexEncoded.length; i += 2) { + int firstDigit = Character.digit(hexEncoded[i], 16); + int secondDigit = Character.digit(hexEncoded[i + 1], 16); + byteBuffer.append((byte) ((firstDigit << 4) + secondDigit)); + } + return byteBuffer.toByteArray(); + + } catch (IOException e) { + throw new ExceptionConverter(e); + } + } + public void setCryptoMode(int mode, int kl) { cryptoMode = mode; encryptMetadata = (mode & PdfWriter.DO_NOT_ENCRYPT_METADATA) == 0; embeddedFilesOnly = (mode & PdfWriter.EMBEDDED_FILES_ONLY) != 0; mode &= PdfWriter.ENCRYPTION_MASK; switch (mode) { - case PdfWriter.STANDARD_ENCRYPTION_40: - encryptMetadata = true; - embeddedFilesOnly = false; - keyLength = 40; - revision = STANDARD_ENCRYPTION_40; - break; - case PdfWriter.STANDARD_ENCRYPTION_128: - embeddedFilesOnly = false; - if (kl > 0) - keyLength = kl; - else + case PdfWriter.STANDARD_ENCRYPTION_40: + encryptMetadata = true; + embeddedFilesOnly = false; + keyLength = 40; + revision = STANDARD_ENCRYPTION_40; + break; + case PdfWriter.STANDARD_ENCRYPTION_128: + embeddedFilesOnly = false; + if (kl > 0) { + keyLength = kl; + } else { + keyLength = 128; + } + revision = STANDARD_ENCRYPTION_128; + break; + case PdfWriter.ENCRYPTION_AES_128: keyLength = 128; - revision = STANDARD_ENCRYPTION_128; - break; - case PdfWriter.ENCRYPTION_AES_128: - keyLength = 128; - revision = AES_128; - break; - case PdfWriter.ENCRYPTION_AES_256_V3: - keyLength = 256; - keySize = 32; - revision = AES_256_V3; - break; - default: - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("no.valid.encryption.mode")); + revision = AES_128; + break; + case PdfWriter.ENCRYPTION_AES_256_V3: + keyLength = 256; + keySize = 32; + revision = AES_256_V3; + break; + default: + throw new IllegalArgumentException(MessageLocalization.getComposedMessage("no.valid.encryption.mode")); } } @@ -239,14 +338,16 @@ public boolean isMetadataEncrypted() { /** * Indicates if only the embedded files have to be encrypted. - * @return if true only the embedded files will be encrypted - * @since 2.1.3 + * + * @return if true only the embedded files will be encrypted + * @since 2.1.3 */ public boolean isEmbeddedFilesOnly() { return embeddedFilesOnly; } /** + * */ private byte[] padPassword(byte[] userPassword) { byte[] userPad = new byte[32]; @@ -255,15 +356,17 @@ private byte[] padPassword(byte[] userPassword) { } else { System.arraycopy(userPassword, 0, userPad, 0, Math.min( userPassword.length, 32)); - if (userPassword.length < 32) + if (userPassword.length < 32) { System.arraycopy(pad, 0, userPad, userPassword.length, 32 - userPassword.length); + } } return userPad; } /** + * */ private byte[] computeOwnerKey(byte[] userPad, byte[] ownerPad) { byte[] ownerKey = new byte[32]; @@ -272,12 +375,14 @@ private byte[] computeOwnerKey(byte[] userPad, byte[] ownerPad) { if (revision == STANDARD_ENCRYPTION_128 || revision == AES_128) { byte[] mkey = new byte[keyLength / 8]; // only use for the input as many bit as the key consists of - for (int k = 0; k < 50; ++k) + for (int k = 0; k < 50; ++k) { System.arraycopy(md5.digest(digest), 0, digest, 0, mkey.length); + } System.arraycopy(userPad, 0, ownerKey, 0, 32); for (int i = 0; i < 20; ++i) { - for (int j = 0; j < mkey.length; ++j) + for (int j = 0; j < mkey.length; ++j) { mkey[j] = (byte) (digest[j] ^ i); + } arcfour.prepareARCFOURKey(mkey); arcfour.encryptARCFOUR(ownerKey); } @@ -290,11 +395,10 @@ private byte[] computeOwnerKey(byte[] userPad, byte[] ownerPad) { } /** - * * ownerKey, documentID must be setup */ private void setupGlobalEncryptionKey(byte[] documentID, byte[] userPad, - byte[] ownerKey, int permissions) { + byte[] ownerKey, int permissions) { this.documentID = documentID; this.ownerKey = ownerKey; this.permissions = permissions; @@ -312,25 +416,27 @@ private void setupGlobalEncryptionKey(byte[] documentID, byte[] userPad, ext[2] = (byte) (permissions >> 16); ext[3] = (byte) (permissions >> 24); md5.update(ext, 0, 4); - if (documentID != null) + if (documentID != null) { md5.update(documentID); - if (!encryptMetadata) + } + if (!encryptMetadata) { md5.update(metadataPad); + } byte[] digest = new byte[mkey.length]; System.arraycopy(md5.digest(), 0, digest, 0, mkey.length); // only use the really needed bits as input for the hash if (revision == STANDARD_ENCRYPTION_128 || revision == AES_128) { - for (int k = 0; k < 50; ++k) + for (int k = 0; k < 50; ++k) { System.arraycopy(md5.digest(digest), 0, digest, 0, mkey.length); + } } System.arraycopy(digest, 0, mkey, 0, mkey.length); } /** - * * mkey must be setup */ // use the revision to choose the setup method @@ -339,11 +445,13 @@ private void setupUserKey() { md5.update(pad); byte[] digest = md5.digest(documentID); System.arraycopy(digest, 0, userKey, 0, 16); - for (int k = 16; k < 32; ++k) + for (int k = 16; k < 32; ++k) { userKey[k] = 0; + } for (int i = 0; i < 20; ++i) { - for (int j = 0; j < mkey.length; ++j) + for (int j = 0; j < mkey.length; ++j) { digest[j] = (byte) (mkey[j] ^ i); + } arcfour.prepareARCFOURKey(digest, 0, mkey.length); arcfour.encryptARCFOUR(userKey, 0, 16); } @@ -356,16 +464,17 @@ private void setupUserKey() { // gets keylength and revision and uses revision to choose the initial values // for permissions public void setupAllKeys(byte[] userPassword, byte[] ownerPassword, - int permissions) { - if (ownerPassword == null || ownerPassword.length == 0) + int permissions) { + if (ownerPassword == null || ownerPassword.length == 0) { ownerPassword = md5.digest(createDocumentId()); - permissions |= (revision == STANDARD_ENCRYPTION_128 || revision == AES_128 || revision == AES_256_V3) ? 0xfffff0c0 - : 0xffffffc0; + } + permissions |= + (revision == STANDARD_ENCRYPTION_128 || revision == AES_128 || revision == AES_256_V3) ? 0xfffff0c0 + : 0xffffffc0; permissions &= 0xfffffffc; this.permissions = permissions; documentID = createDocumentId(); - if (revision < AES_256_V3) - { + if (revision < AES_256_V3) { // PDF reference 3.5.2 Standard Security Handler, Algorithm 3.3-1 // If there is no owner password, use the user password instead. byte[] userPad = padPassword(userPassword); @@ -386,61 +495,47 @@ public void setupAllKeys(byte[] userPassword, byte[] ownerPassword, } } - public static byte[] createDocumentId() { - MessageDigest md5; - try { - md5 = MessageDigest.getInstance("MD5"); - } catch (Exception e) { - throw new ExceptionConverter(e); - } - long time = System.currentTimeMillis(); - long mem = Runtime.getRuntime().freeMemory(); - String s = time + "+" + mem + "+" + (seq++); - return md5.digest(s.getBytes()); - } - /** - * - * @param documentID byte array of document id + * @param documentID byte array of document id * @param userPassword byte array of user password - * @param ownerKey byte array of owner key - * @param permissions permissions + * @param ownerKey byte array of owner key + * @param permissions permissions */ public void setupByUserPassword(byte[] documentID, byte[] userPassword, - byte[] ownerKey, int permissions) { + byte[] ownerKey, int permissions) { setupByUserPad(documentID, padPassword(userPassword), ownerKey, permissions); } /** + * */ private void setupByUserPad(byte[] documentID, byte[] userPad, - byte[] ownerKey, int permissions) { + byte[] ownerKey, int permissions) { setupGlobalEncryptionKey(documentID, userPad, ownerKey, permissions); setupUserKey(); } /** - * - * @param documentID byte array of document id + * @param documentID byte array of document id * @param ownerPassword byte array of owner password - * @param userKey byte array of user key - * @param ownerKey byte array of owner key - * @param permissions permissions + * @param userKey byte array of user key + * @param ownerKey byte array of owner key + * @param permissions permissions */ public void setupByOwnerPassword(byte[] documentID, byte[] ownerPassword, - byte[] userKey, byte[] ownerKey, int permissions) { + byte[] userKey, byte[] ownerKey, int permissions) { setupByOwnerPad(documentID, padPassword(ownerPassword), userKey, ownerKey, permissions); } private void setupByOwnerPad(byte[] documentID, byte[] ownerPad, - byte[] userKey, byte[] ownerKey, int permissions) { + byte[] userKey, byte[] ownerKey, int permissions) { byte[] userPad = computeOwnerKey(ownerKey, ownerPad); // userPad will - // be set in - // this.ownerKey + // be set in + // this.ownerKey setupGlobalEncryptionKey(documentID, userPad, ownerKey, permissions); // step - // 3 + // 3 setupUserKey(); } @@ -450,8 +545,9 @@ public void setupByEncryptionKey(byte[] key, int keylength) { } public void setHashKey(int number, int generation) { - if (revision >= AES_256_V3) + if (revision >= AES_256_V3) { return; + } md5.reset(); // added by ujihara extra[0] = (byte) number; @@ -461,98 +557,13 @@ public void setHashKey(int number, int generation) { extra[4] = (byte) (generation >> 8); md5.update(mkey); md5.update(extra); - if (revision == AES_128) + if (revision == AES_128) { md5.update(salt); + } key = md5.digest(); keySize = mkey.length + 5; - if (keySize > 16) + if (keySize > 16) { keySize = 16; - } - - public static PdfObject createInfoId(byte[] id) { - return createInfoId(id, createDocumentId()); - } - - public static PdfObject createInfoId(byte[] idPartOne, byte[] idPartTwo) { - try (ByteBuffer buf = new ByteBuffer(90)) { - buf.append('[').append('<'); - for (int k = 0; k < 16 && k < idPartOne.length; ++k) - buf.appendHex(idPartOne[k]); - buf.append('>').append('<'); - for (int k = 0; k < 16 && k < idPartTwo.length; ++k) - buf.appendHex(idPartTwo[k]); - buf.append('>').append(']'); - return new PdfLiteral(buf.toByteArray()); - - } catch (IOException e) { - throw new ExceptionConverter(e); - } - } - - /** - * This method returns a changing part of the {@code fileId} when can be identified. - * Returns a complete {@code fileId} of the changing part is not found. - * - * @param fileId {@link PdfObject} - * @return byte array representing the changing part of the document identifier - */ - public static byte[] getFileIdChangingPart(PdfObject fileId) { - byte[] bytes = fileId.getBytes(); - boolean firstPartFound = false; - int start = 0; - int end = bytes.length; - for (int i = 0; i < bytes.length; i++) { - if (bytes[i] == '<') { - if (firstPartFound) { - start = i + 1; - } - firstPartFound = true; - } - else if (start > 0 && bytes[i] == '>') { - end = i; - break; - } - } - if (firstPartFound && start > 0) { - byte[] secondPartValue = new byte[end - start]; - System.arraycopy(bytes, start, secondPartValue, 0, end - start); - if (isHexEncoded(secondPartValue)) { - return decodeHex(secondPartValue); - } - else { - return secondPartValue; - } - - } - else { - // otherwise return provided value - return bytes; - } - } - - private static boolean isHexEncoded(byte[] str) { - if (str.length == 0 || str.length % 2 != 0) { - return false; - } - for (int c : str) { - if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'))) { - return false; - } - } - return true; - } - - private static byte[] decodeHex(byte[] hexEncoded) { - try (ByteBuffer byteBuffer = new ByteBuffer(hexEncoded.length / 2)) { - for (int i = 0; i < hexEncoded.length; i += 2) { - int firstDigit = Character.digit(hexEncoded[i], 16); - int secondDigit = Character.digit(hexEncoded[i + 1], 16); - byteBuffer.append((byte) ((firstDigit << 4) + secondDigit)); - } - return byteBuffer.toByteArray(); - - } catch (IOException e) { - throw new ExceptionConverter(e); } } @@ -587,21 +598,23 @@ public PdfDictionary getEncryptionDictionary() { PdfDictionary stdcf = new PdfDictionary(); stdcf.put(PdfName.RECIPIENTS, recipients); - if (!encryptMetadata) + if (!encryptMetadata) { stdcf.put(PdfName.ENCRYPTMETADATA, PdfBoolean.PDFFALSE); + } - if (revision == AES_128) + if (revision == AES_128) { stdcf.put(PdfName.CFM, PdfName.AESV2); - else + } else { stdcf.put(PdfName.CFM, PdfName.V2); + } PdfDictionary cf = new PdfDictionary(); cf.put(PdfName.DEFAULTCRYPTFILTER, stdcf); - dic.put(PdfName.CF, cf);if (embeddedFilesOnly) { + dic.put(PdfName.CF, cf); + if (embeddedFilesOnly) { dic.put(PdfName.EFF, PdfName.DEFAULTCRYPTFILTER); dic.put(PdfName.STRF, PdfName.IDENTITY); dic.put(PdfName.STMF, PdfName.IDENTITY); - } - else { + } else { dic.put(PdfName.STRF, PdfName.DEFAULTCRYPTFILTER); dic.put(PdfName.STMF, PdfName.DEFAULTCRYPTFILTER); } @@ -617,9 +630,10 @@ public PdfDictionary getEncryptionDictionary() { encodedRecipient = publicKeyHandler.getEncodedRecipient(i); md.update(encodedRecipient); } - if (!encryptMetadata) - md.update(new byte[] { (byte) 255, (byte) 255, (byte) 255, - (byte) 255 }); + if (!encryptMetadata) { + md.update(new byte[]{(byte) 255, (byte) 255, (byte) 255, + (byte) 255}); + } } catch (Exception f) { throw new ExceptionConverter(f); } @@ -642,8 +656,9 @@ public PdfDictionary getEncryptionDictionary() { dic.put(PdfName.V, new PdfNumber(2)); dic.put(PdfName.LENGTH, new PdfNumber(128)); } else if (revision == STANDARD_ENCRYPTION_128 || revision == AES_128) { - if (!encryptMetadata) + if (!encryptMetadata) { dic.put(PdfName.ENCRYPTMETADATA, PdfBoolean.PDFFALSE); + } dic.put(PdfName.R, new PdfNumber(AES_128)); dic.put(PdfName.V, new PdfNumber(4)); dic.put(PdfName.LENGTH, new PdfNumber(128)); @@ -654,22 +669,23 @@ public PdfDictionary getEncryptionDictionary() { dic.put(PdfName.EFF, PdfName.STDCF); dic.put(PdfName.STRF, PdfName.IDENTITY); dic.put(PdfName.STMF, PdfName.IDENTITY); - } - else { + } else { stdcf.put(PdfName.AUTHEVENT, PdfName.DOCOPEN); dic.put(PdfName.STRF, PdfName.STDCF); dic.put(PdfName.STMF, PdfName.STDCF); } - if (revision == AES_128) + if (revision == AES_128) { stdcf.put(PdfName.CFM, PdfName.AESV2); - else + } else { stdcf.put(PdfName.CFM, PdfName.V2); + } PdfDictionary cf = new PdfDictionary(); cf.put(PdfName.STDCF, stdcf); dic.put(PdfName.CF, cf); } else if (revision == AES_256_V3) { - if (!encryptMetadata) + if (!encryptMetadata) { dic.put(PdfName.ENCRYPTMETADATA, PdfBoolean.PDFFALSE); + } dic.put(PdfName.V, new PdfNumber(5)); dic.put(PdfName.OE, new PdfLiteral(PdfContentByte.escapeString(oeKey))); dic.put(PdfName.UE, new PdfLiteral(PdfContentByte.escapeString(ueKey))); @@ -706,10 +722,11 @@ public OutputStreamEncryption getEncryptionStream(OutputStream os) { } public int calculateStreamSize(int n) { - if (revision == AES_128 || revision == AES_256_V3) + if (revision == AES_128 || revision == AES_256_V3) { return (n & 0x7ffffff0) + 32; - else + } else { return n; + } } public byte[] encryptByteArray(byte[] b) { @@ -733,11 +750,13 @@ public byte[] decryptByteArray(byte[] b) { ByteArrayOutputStream ba = new ByteArrayOutputStream(); StandardDecryption dec = getDecryptor(); byte[] b2 = dec.update(b, 0, b.length); - if (b2 != null) + if (b2 != null) { ba.write(b2); + } b2 = dec.finish(); - if (b2 != null) + if (b2 != null) { ba.write(b2); + } return ba.toByteArray(); } catch (IOException ex) { throw new ExceptionConverter(ex); @@ -760,7 +779,9 @@ public byte[] computeUserPassword(byte[] ownerPassword) { break; } } - if (!match) continue; + if (!match) { + continue; + } byte[] userPassword = new byte[i]; System.arraycopy(userPad, 0, userPassword, 0, i); return userPassword; @@ -771,11 +792,14 @@ public byte[] computeUserPassword(byte[] ownerPassword) { // // AESv3 (AES256 according to ISO 32000-2) support // + /** - * implements step d of Algorithm 2.A: Retrieving the file encryption key from an encrypted document in order to decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3 + * implements step d of Algorithm 2.A: Retrieving the file encryption key from an encrypted document in order to + * decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3 */ public void setupByOwnerPassword(byte[] documentID, byte[] ownerPassword, - byte[] uValue, byte[] ueValue, byte[] oValue, byte[] oeValue, int permissions) throws GeneralSecurityException { + byte[] uValue, byte[] ueValue, byte[] oValue, byte[] oeValue, int permissions) + throws GeneralSecurityException { final Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding"); byte[] hashAlg2B = hashAlg2B(ownerPassword, Arrays.copyOfRange(oValue, 40, 48), uValue); @@ -791,10 +815,12 @@ public void setupByOwnerPassword(byte[] documentID, byte[] ownerPassword, } /** - * implements step e of Algorithm 2.A: Retrieving the file encryption key from an encrypted document in order to decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3 + * implements step e of Algorithm 2.A: Retrieving the file encryption key from an encrypted document in order to + * decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3 */ public void setupByUserPassword(byte[] documentID, byte[] userPassword, - byte[] uValue, byte[] ueValue, byte[] oValue, byte[] oeValue, int permissions) throws GeneralSecurityException { + byte[] uValue, byte[] ueValue, byte[] oValue, byte[] oeValue, int permissions) + throws GeneralSecurityException { final Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding"); byte[] hashAlg2B = hashAlg2B(userPassword, Arrays.copyOfRange(uValue, 40, 48), null); @@ -810,7 +836,8 @@ public void setupByUserPassword(byte[] documentID, byte[] userPassword, } /** - * implements step f of Algorithm 2.A: Retrieving the file encryption key from an encrypted document in order to decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3 + * implements step f of Algorithm 2.A: Retrieving the file encryption key from an encrypted document in order to + * decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3 */ public boolean decryptAndCheckPerms(byte[] permsValue) throws GeneralSecurityException { final Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding"); @@ -822,9 +849,9 @@ public boolean decryptAndCheckPerms(byte[] permsValue) throws GeneralSecurityExc permissions = (decPerms[0] & 0xff) | ((decPerms[1] & 0xff) << 8) | ((decPerms[2] & 0xff) << 16) | ((decPerms[2] & 0xff) << 24); - encryptMetadata = decPerms[8] == (byte)'T'; + encryptMetadata = decPerms[8] == (byte) 'T'; - return decPerms[9] == (byte)'a' && decPerms[10] == (byte)'d' && decPerms[11] == (byte)'b'; + return decPerms[9] == (byte) 'a' && decPerms[10] == (byte) 'd' && decPerms[11] == (byte) 'b'; } /** @@ -836,22 +863,24 @@ byte[] hashAlg2B(byte[] input, byte[] salt, byte[] userKey) throws GeneralSecuri final MessageDigest sha512 = MessageDigest.getInstance("SHA-512"); final Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding"); - if (userKey == null) + if (userKey == null) { userKey = new byte[0]; + } sha256.update(input); sha256.update(salt); sha256.update(userKey); byte[] k = sha256.digest(); - for (int round = 0, lastEByte = 0; round < 64 || lastEByte > round-32; round++) { + for (int round = 0, lastEByte = 0; round < 64 || lastEByte > round - 32; round++) { int singleSequenceSize = input.length + k.length + userKey.length; byte[] k1 = new byte[singleSequenceSize * 64]; System.arraycopy(input, 0, k1, 0, input.length); System.arraycopy(k, 0, k1, input.length, k.length); System.arraycopy(userKey, 0, k1, input.length + k.length, userKey.length); - for (int i = 1; i < 64; i++) + for (int i = 1; i < 64; i++) { System.arraycopy(k1, 0, k1, singleSequenceSize * i, singleSequenceSize); + } cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(Arrays.copyOf(k, 16), "AES"), @@ -860,15 +889,15 @@ byte[] hashAlg2B(byte[] input, byte[] salt, byte[] userKey) throws GeneralSecuri lastEByte = e[e.length - 1] & 0xFF; switch (new BigInteger(1, Arrays.copyOf(e, 16)).remainder(BigInteger.valueOf(3)).intValue()) { - case 0: - k = sha256.digest(e); - break; - case 1: - k = sha384.digest(e); - break; - case 2: - k = sha512.digest(e); - break; + case 0: + k = sha256.digest(e); + break; + case 1: + k = sha384.digest(e); + break; + case 2: + k = sha512.digest(e); + break; } } @@ -876,16 +905,17 @@ byte[] hashAlg2B(byte[] input, byte[] salt, byte[] userKey) throws GeneralSecuri } /** - * implements Algorithm 8: Computing the encryption dictionary’s U (user password) and - * UE (user encryption) values (Security handlers of revision 6) - ISO 32000-2 section 7.6.4.4.7 + * implements Algorithm 8: Computing the encryption dictionary’s U (user password) and UE (user encryption) values + * (Security handlers of revision 6) - ISO 32000-2 section 7.6.4.4.7 */ void computeUAndUeAlg8(byte[] userPassword) throws GeneralSecurityException { final Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding"); - if (userPassword == null) + if (userPassword == null) { userPassword = new byte[0]; - else if (userPassword.length > 127) + } else if (userPassword.length > 127) { userPassword = Arrays.copyOf(userPassword, 127); + } byte[] userSalts = IVGenerator.getIV(16); @@ -902,16 +932,17 @@ else if (userPassword.length > 127) } /** - * implements Algorithm 9: Computing the encryption dictionary’s O (owner password) and - * OE (owner encryption) values (Security handlers of revision 6) - ISO 32000-2 section 7.6.4.4.8 + * implements Algorithm 9: Computing the encryption dictionary’s O (owner password) and OE (owner encryption) values + * (Security handlers of revision 6) - ISO 32000-2 section 7.6.4.4.8 */ void computeOAndOeAlg9(byte[] ownerPassword) throws GeneralSecurityException { final Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding"); - if (ownerPassword == null) + if (ownerPassword == null) { ownerPassword = new byte[0]; - else if (ownerPassword.length > 127) + } else if (ownerPassword.length > 127) { ownerPassword = Arrays.copyOf(ownerPassword, 127); + } byte[] ownerSalts = IVGenerator.getIV(16); @@ -928,8 +959,8 @@ else if (ownerPassword.length > 127) } /** - * implements Algorithm 10: Computing the encryption dictionary’s Perms (permissions) - * value (Security handlers of revision 6) - ISO 32000-2 section 7.6.4.4.9 + * implements Algorithm 10: Computing the encryption dictionary’s Perms (permissions) value (Security handlers of + * revision 6) - ISO 32000-2 section 7.6.4.4.9 */ void computePermsAlg10(int permissions) throws GeneralSecurityException { final Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding"); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncryptor.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncryptor.java index 3e8f000ef..cd5161ad3 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncryptor.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfEncryptor.java @@ -48,267 +48,296 @@ package com.lowagie.text.pdf; +import com.lowagie.text.DocumentException; import java.io.IOException; import java.io.OutputStream; import java.util.Map; -import com.lowagie.text.DocumentException; - -/** This class takes any PDF and returns exactly the same but - * encrypted. All the content, links, outlines, etc, are kept. +/** + * This class takes any PDF and returns exactly the same but encrypted. All the content, links, outlines, etc, are kept. * It is also possible to change the info dictionary. */ public final class PdfEncryptor { - - private PdfEncryptor(){ + + private PdfEncryptor() { } - - /** Entry point to encrypt a PDF document. The encryption parameters are the same as in + + /** + * Entry point to encrypt a PDF document. The encryption parameters are the same as in * PdfWriter. The userPassword and the - * ownerPassword can be null or have zero length. In this case the ownerPassword - * is replaced by a random string. The open permissions for the document can be - * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, - * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. - * The permissions can be combined by ORing them. - * @param reader the read PDF - * @param os the output destination - * @param userPassword the user password. Can be null or empty - * @param ownerPassword the owner password. Can be null or empty - * @param permissions the user permissions + * ownerPassword can be null or have zero length. In this case the ownerPassword is replaced by a random string. The + * open permissions for the document can be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, + * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. The permissions can be combined by + * ORing them. + * + * @param reader the read PDF + * @param os the output destination + * @param userPassword the user password. Can be null or empty + * @param ownerPassword the owner password. Can be null or empty + * @param permissions the user permissions * @param strength128Bits true for 128 bit key length, false for 40 bit key length * @throws DocumentException on error - * @throws IOException on error */ - public static void encrypt(PdfReader reader, OutputStream os, byte[] userPassword, byte[] ownerPassword, int permissions, boolean strength128Bits) throws DocumentException, IOException { + * @throws IOException on error + */ + public static void encrypt(PdfReader reader, OutputStream os, byte[] userPassword, byte[] ownerPassword, + int permissions, boolean strength128Bits) throws DocumentException, IOException { PdfStamper stamper = new PdfStamper(reader, os); stamper.setEncryption(userPassword, ownerPassword, permissions, strength128Bits); stamper.close(); } - - /** Entry point to encrypt a PDF document. The encryption parameters are the same as in + + /** + * Entry point to encrypt a PDF document. The encryption parameters are the same as in * PdfWriter. The userPassword and the - * ownerPassword can be null or have zero length. In this case the ownerPassword - * is replaced by a random string. The open permissions for the document can be - * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, - * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. - * The permissions can be combined by ORing them. - * @param reader the read PDF - * @param os the output destination - * @param userPassword the user password. Can be null or empty - * @param ownerPassword the owner password. Can be null or empty - * @param permissions the user permissions + * ownerPassword can be null or have zero length. In this case the ownerPassword is replaced by a random string. The + * open permissions for the document can be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, + * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. The permissions can be combined by + * ORing them. + * + * @param reader the read PDF + * @param os the output destination + * @param userPassword the user password. Can be null or empty + * @param ownerPassword the owner password. Can be null or empty + * @param permissions the user permissions * @param strength128Bits true for 128 bit key length, false for 40 bit key length - * @param newInfo an optional String map to add or change - * the info dictionary. Entries with null - * values delete the key in the original info dictionary + * @param newInfo an optional String map to add or change the info dictionary. Entries with + * null values delete the key in the original info dictionary * @throws DocumentException on error - * @throws IOException on error + * @throws IOException on error */ - public static void encrypt(PdfReader reader, OutputStream os, byte[] userPassword, byte[] ownerPassword, int permissions, boolean strength128Bits, Map newInfo) throws DocumentException, IOException { + public static void encrypt(PdfReader reader, OutputStream os, byte[] userPassword, byte[] ownerPassword, + int permissions, boolean strength128Bits, Map newInfo) + throws DocumentException, IOException { PdfStamper stamper = new PdfStamper(reader, os); stamper.setEncryption(userPassword, ownerPassword, permissions, strength128Bits); stamper.setInfoDictionary(newInfo); stamper.close(); } - - /** Entry point to encrypt a PDF document. The encryption parameters are the same as in + + /** + * Entry point to encrypt a PDF document. The encryption parameters are the same as in * PdfWriter. The userPassword and the - * ownerPassword can be null or have zero length. In this case the ownerPassword - * is replaced by a random string. The open permissions for the document can be - * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, - * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. - * The permissions can be combined by ORing them. - * @param reader the read PDF - * @param os the output destination - * @param strength true for 128 bit key length, false for 40 bit key length - * @param userPassword the user password. Can be null or empty + * ownerPassword can be null or have zero length. In this case the ownerPassword is replaced by a random string. The + * open permissions for the document can be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, + * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. The permissions can be combined by + * ORing them. + * + * @param reader the read PDF + * @param os the output destination + * @param strength true for 128 bit key length, false for 40 bit key length + * @param userPassword the user password. Can be null or empty * @param ownerPassword the owner password. Can be null or empty - * @param permissions the user permissions + * @param permissions the user permissions * @throws DocumentException on error - * @throws IOException on error */ - public static void encrypt(PdfReader reader, OutputStream os, boolean strength, String userPassword, String ownerPassword, int permissions) throws DocumentException, IOException { + * @throws IOException on error + */ + public static void encrypt(PdfReader reader, OutputStream os, boolean strength, String userPassword, + String ownerPassword, int permissions) throws DocumentException, IOException { PdfStamper stamper = new PdfStamper(reader, os); stamper.setEncryption(strength, userPassword, ownerPassword, permissions); stamper.close(); } - - /** Entry point to encrypt a PDF document. The encryption parameters are the same as in + + /** + * Entry point to encrypt a PDF document. The encryption parameters are the same as in * PdfWriter. The userPassword and the - * ownerPassword can be null or have zero length. In this case the ownerPassword - * is replaced by a random string. The open permissions for the document can be - * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, - * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. - * The permissions can be combined by ORing them. - * @param reader the read PDF - * @param os the output destination - * @param strength true for 128 bit key length, false for 40 bit key length - * @param userPassword the user password. Can be null or empty + * ownerPassword can be null or have zero length. In this case the ownerPassword is replaced by a random string. The + * open permissions for the document can be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, + * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. The permissions can be combined by + * ORing them. + * + * @param reader the read PDF + * @param os the output destination + * @param strength true for 128 bit key length, false for 40 bit key length + * @param userPassword the user password. Can be null or empty * @param ownerPassword the owner password. Can be null or empty - * @param permissions the user permissions - * @param newInfo an optional String map to add or change - * the info dictionary. Entries with null - * values delete the key in the original info dictionary + * @param permissions the user permissions + * @param newInfo an optional String map to add or change the info dictionary. Entries with + * null values delete the key in the original info dictionary * @throws DocumentException on error - * @throws IOException on error + * @throws IOException on error */ - public static void encrypt(PdfReader reader, OutputStream os, boolean strength, String userPassword, String ownerPassword, int permissions, Map newInfo) throws DocumentException, IOException { + public static void encrypt(PdfReader reader, OutputStream os, boolean strength, String userPassword, + String ownerPassword, int permissions, Map newInfo) throws DocumentException, IOException { PdfStamper stamper = new PdfStamper(reader, os); stamper.setEncryption(strength, userPassword, ownerPassword, permissions); stamper.setInfoDictionary(newInfo); stamper.close(); } - - /** Entry point to encrypt a PDF document. The encryption parameters are the same as in + + /** + * Entry point to encrypt a PDF document. The encryption parameters are the same as in * PdfWriter. The userPassword and the - * ownerPassword can be null or have zero length. In this case the ownerPassword - * is replaced by a random string. The open permissions for the document can be - * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, - * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. - * The permissions can be combined by ORing them. - * @param reader the read PDF - * @param os the output destination - * @param type the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or ENCRYPTION_AES128. - * Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in cleartext - * @param userPassword the user password. Can be null or empty + * ownerPassword can be null or have zero length. In this case the ownerPassword is replaced by a random string. The + * open permissions for the document can be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, + * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. The permissions can be combined by + * ORing them. + * + * @param reader the read PDF + * @param os the output destination + * @param type the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or + * ENCRYPTION_AES128. Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in + * cleartext + * @param userPassword the user password. Can be null or empty * @param ownerPassword the owner password. Can be null or empty - * @param permissions the user permissions - * @param newInfo an optional String map to add or change - * the info dictionary. Entries with null - * values delete the key in the original info dictionary + * @param permissions the user permissions + * @param newInfo an optional String map to add or change the info dictionary. Entries with + * null values delete the key in the original info dictionary * @throws DocumentException on error - * @throws IOException on error + * @throws IOException on error */ - public static void encrypt(PdfReader reader, OutputStream os, int type, String userPassword, String ownerPassword, int permissions, Map newInfo) throws DocumentException, IOException { + public static void encrypt(PdfReader reader, OutputStream os, int type, String userPassword, String ownerPassword, + int permissions, Map newInfo) throws DocumentException, IOException { PdfStamper stamper = new PdfStamper(reader, os); stamper.setEncryption(type, userPassword, ownerPassword, permissions); stamper.setInfoDictionary(newInfo); stamper.close(); } - - /** Entry point to encrypt a PDF document. The encryption parameters are the same as in + + /** + * Entry point to encrypt a PDF document. The encryption parameters are the same as in * PdfWriter. The userPassword and the - * ownerPassword can be null or have zero length. In this case the ownerPassword - * is replaced by a random string. The open permissions for the document can be - * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, - * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. - * The permissions can be combined by ORing them. - * @param reader the read PDF - * @param os the output destination - * @param type the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or ENCRYPTION_AES128. - * Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in cleartext - * @param userPassword the user password. Can be null or empty + * ownerPassword can be null or have zero length. In this case the ownerPassword is replaced by a random string. The + * open permissions for the document can be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, + * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. The permissions can be combined by + * ORing them. + * + * @param reader the read PDF + * @param os the output destination + * @param type the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or + * ENCRYPTION_AES128. Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in + * cleartext + * @param userPassword the user password. Can be null or empty * @param ownerPassword the owner password. Can be null or empty - * @param permissions the user permissions - * values delete the key in the original info dictionary + * @param permissions the user permissions values delete the key in the original info dictionary * @throws DocumentException on error - * @throws IOException on error + * @throws IOException on error */ - public static void encrypt(PdfReader reader, OutputStream os, int type, String userPassword, String ownerPassword, int permissions) throws DocumentException, IOException { + public static void encrypt(PdfReader reader, OutputStream os, int type, String userPassword, String ownerPassword, + int permissions) throws DocumentException, IOException { PdfStamper stamper = new PdfStamper(reader, os); stamper.setEncryption(type, userPassword, ownerPassword, permissions); stamper.close(); } - + /** * Give you a verbose analysis of the permissions. + * * @param permissions the permissions value of a PDF file * @return a String that explains the meaning of the permissions value */ public static String getPermissionsVerbose(int permissions) { StringBuilder buf = new StringBuilder("Allowed:"); - if ((PdfWriter.ALLOW_PRINTING & permissions) == PdfWriter.ALLOW_PRINTING) buf.append(" Printing"); - if ((PdfWriter.ALLOW_MODIFY_CONTENTS & permissions) == PdfWriter.ALLOW_MODIFY_CONTENTS) buf.append(" Modify contents"); - if ((PdfWriter.ALLOW_COPY & permissions) == PdfWriter.ALLOW_COPY) buf.append(" Copy"); - if ((PdfWriter.ALLOW_MODIFY_ANNOTATIONS & permissions) == PdfWriter.ALLOW_MODIFY_ANNOTATIONS) buf.append(" Modify annotations"); - if ((PdfWriter.ALLOW_FILL_IN & permissions) == PdfWriter.ALLOW_FILL_IN) buf.append(" Fill in"); - if ((PdfWriter.ALLOW_SCREENREADERS & permissions) == PdfWriter.ALLOW_SCREENREADERS) buf.append(" Screen readers"); - if ((PdfWriter.ALLOW_ASSEMBLY & permissions) == PdfWriter.ALLOW_ASSEMBLY) buf.append(" Assembly"); - if ((PdfWriter.ALLOW_DEGRADED_PRINTING & permissions) == PdfWriter.ALLOW_DEGRADED_PRINTING) buf.append(" Degraded printing"); + if ((PdfWriter.ALLOW_PRINTING & permissions) == PdfWriter.ALLOW_PRINTING) { + buf.append(" Printing"); + } + if ((PdfWriter.ALLOW_MODIFY_CONTENTS & permissions) == PdfWriter.ALLOW_MODIFY_CONTENTS) { + buf.append(" Modify contents"); + } + if ((PdfWriter.ALLOW_COPY & permissions) == PdfWriter.ALLOW_COPY) { + buf.append(" Copy"); + } + if ((PdfWriter.ALLOW_MODIFY_ANNOTATIONS & permissions) == PdfWriter.ALLOW_MODIFY_ANNOTATIONS) { + buf.append(" Modify annotations"); + } + if ((PdfWriter.ALLOW_FILL_IN & permissions) == PdfWriter.ALLOW_FILL_IN) { + buf.append(" Fill in"); + } + if ((PdfWriter.ALLOW_SCREENREADERS & permissions) == PdfWriter.ALLOW_SCREENREADERS) { + buf.append(" Screen readers"); + } + if ((PdfWriter.ALLOW_ASSEMBLY & permissions) == PdfWriter.ALLOW_ASSEMBLY) { + buf.append(" Assembly"); + } + if ((PdfWriter.ALLOW_DEGRADED_PRINTING & permissions) == PdfWriter.ALLOW_DEGRADED_PRINTING) { + buf.append(" Degraded printing"); + } return buf.toString(); } - + /** * Tells you if printing is allowed. - * @param permissions the permissions value of a PDF file - * @return true if printing is allowed * + * @param permissions the permissions value of a PDF file + * @return true if printing is allowed * @since 2.0.7 */ public static boolean isPrintingAllowed(int permissions) { return (PdfWriter.ALLOW_PRINTING & permissions) == PdfWriter.ALLOW_PRINTING; } - + /** * Tells you if modifying content is allowed. - * @param permissions the permissions value of a PDF file - * @return true if modifying content is allowed * + * @param permissions the permissions value of a PDF file + * @return true if modifying content is allowed * @since 2.0.7 */ public static boolean isModifyContentsAllowed(int permissions) { return (PdfWriter.ALLOW_MODIFY_CONTENTS & permissions) == PdfWriter.ALLOW_MODIFY_CONTENTS; - } - + } + /** * Tells you if copying is allowed. - * @param permissions the permissions value of a PDF file - * @return true if copying is allowed * + * @param permissions the permissions value of a PDF file + * @return true if copying is allowed * @since 2.0.7 */ public static boolean isCopyAllowed(int permissions) { return (PdfWriter.ALLOW_COPY & permissions) == PdfWriter.ALLOW_COPY; } - + /** * Tells you if modifying annotations is allowed. - * @param permissions the permissions value of a PDF file - * @return true if modifying annotations is allowed * + * @param permissions the permissions value of a PDF file + * @return true if modifying annotations is allowed * @since 2.0.7 */ public static boolean isModifyAnnotationsAllowed(int permissions) { return (PdfWriter.ALLOW_MODIFY_ANNOTATIONS & permissions) == PdfWriter.ALLOW_MODIFY_ANNOTATIONS; } - + /** * Tells you if filling in fields is allowed. - * @param permissions the permissions value of a PDF file - * @return true if filling in fields is allowed * + * @param permissions the permissions value of a PDF file + * @return true if filling in fields is allowed * @since 2.0.7 */ public static boolean isFillInAllowed(int permissions) { return (PdfWriter.ALLOW_FILL_IN & permissions) == PdfWriter.ALLOW_FILL_IN; } - + /** * Tells you if repurposing for screenreaders is allowed. - * @param permissions the permissions value of a PDF file - * @return true if repurposing for screenreaders is allowed * + * @param permissions the permissions value of a PDF file + * @return true if repurposing for screenreaders is allowed * @since 2.0.7 */ public static boolean isScreenReadersAllowed(int permissions) { return (PdfWriter.ALLOW_SCREENREADERS & permissions) == PdfWriter.ALLOW_SCREENREADERS; } - + /** * Tells you if document assembly is allowed. - * @param permissions the permissions value of a PDF file - * @return true if document assembly is allowed * + * @param permissions the permissions value of a PDF file + * @return true if document assembly is allowed * @since 2.0.7 */ public static boolean isAssemblyAllowed(int permissions) { return (PdfWriter.ALLOW_ASSEMBLY & permissions) == PdfWriter.ALLOW_ASSEMBLY; } - + /** * Tells you if degraded printing is allowed. - * @param permissions the permissions value of a PDF file - * @return true if degraded printing is allowed * + * @param permissions the permissions value of a PDF file + * @return true if degraded printing is allowed * @since 2.0.7 */ public static boolean isDegradedPrintingAllowed(int permissions) { diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfException.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfException.java index d172e3142..fea8dc901 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfException.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfException.java @@ -54,33 +54,33 @@ /** * Signals that an unspecified problem while constructing a PDF document. * - * @see BadPdfFormatException + * @see BadPdfFormatException */ public class PdfException extends DocumentException { - + // constructors - + private static final long serialVersionUID = 6767433960955483999L; public PdfException(Exception ex) { super(ex); } - /** - * Constructs a PdfException without a message. - */ - + /** + * Constructs a PdfException without a message. + */ + PdfException() { super(); } - -/** - * Constructs a PdfException with a message. - * - * @param message a message describing the exception - */ - + + /** + * Constructs a PdfException with a message. + * + * @param message a message describing the exception + */ + PdfException(String message) { super(message); } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfFileSpecification.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfFileSpecification.java index 37b6b3dea..41acb9fa4 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfFileSpecification.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfFileSpecification.java @@ -47,33 +47,38 @@ package com.lowagie.text.pdf; +import com.lowagie.text.error_messages.MessageLocalization; +import com.lowagie.text.pdf.collection.PdfCollectionItem; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import com.lowagie.text.error_messages.MessageLocalization; -import com.lowagie.text.pdf.collection.PdfCollectionItem; -/** Specifies a file or an URL. The file can be extern or embedded. +/** + * Specifies a file or an URL. The file can be extern or embedded. * * @author Paulo Soares (psoares@consiste.pt) */ public class PdfFileSpecification extends PdfDictionary { + protected PdfWriter writer; protected PdfIndirectReference ref; - - /** Creates a new instance of PdfFileSpecification. The static methods are preferred. */ + + /** + * Creates a new instance of PdfFileSpecification. The static methods are preferred. + */ public PdfFileSpecification() { super(PdfName.FILESPEC); } - + /** * Creates a file specification of type URL. + * * @param writer the PdfWriter - * @param url the URL + * @param url the URL * @return the file specification - */ + */ public static PdfFileSpecification url(PdfWriter writer, String url) { PdfFileSpecification fs = new PdfFileSpecification(); fs.writer = writer; @@ -83,91 +88,101 @@ public static PdfFileSpecification url(PdfWriter writer, String url) { } /** - * Creates a file specification with the file embedded. The file may - * come from the file system or from a byte array. The data is flate compressed. - * @param writer the PdfWriter - * @param filePath the file path + * Creates a file specification with the file embedded. The file may come from the file system or from a byte array. + * The data is flate compressed. + * + * @param writer the PdfWriter + * @param filePath the file path * @param fileDisplay the file information that is presented to the user - * @param fileStore the byte array with the file. If it is not null - * it takes precedence over filePath - * @throws IOException on error + * @param fileStore the byte array with the file. If it is not null it takes precedence over + * filePath * @return the file specification - */ - public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePath, String fileDisplay, byte[] fileStore) throws IOException { + * @throws IOException on error + */ + public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePath, String fileDisplay, + byte[] fileStore) throws IOException { return fileEmbedded(writer, filePath, fileDisplay, fileStore, PdfStream.BEST_COMPRESSION); } /** - * Creates a file specification with the file embedded. The file may - * come from the file system or from a byte array. The data is flate compressed. - * @param writer the PdfWriter - * @param filePath the file path - * @param fileDisplay the file information that is presented to the user - * @param fileStore the byte array with the file. If it is not null - * it takes precedence over filePath - * @param compressionLevel the compression level to be used for compressing the file - * it takes precedence over filePath - * @throws IOException on error + * Creates a file specification with the file embedded. The file may come from the file system or from a byte array. + * The data is flate compressed. + * + * @param writer the PdfWriter + * @param filePath the file path + * @param fileDisplay the file information that is presented to the user + * @param fileStore the byte array with the file. If it is not null it takes precedence over + * filePath + * @param compressionLevel the compression level to be used for compressing the file it takes precedence over + * filePath * @return the file specification - * @since 2.1.3 - */ - public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePath, String fileDisplay, byte[] fileStore, int compressionLevel) throws IOException { + * @throws IOException on error + * @since 2.1.3 + */ + public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePath, String fileDisplay, + byte[] fileStore, int compressionLevel) throws IOException { return fileEmbedded(writer, filePath, fileDisplay, fileStore, null, null, compressionLevel); } - - + + /** - * Creates a file specification with the file embedded. The file may - * come from the file system or from a byte array. - * @param writer the PdfWriter - * @param filePath the file path + * Creates a file specification with the file embedded. The file may come from the file system or from a byte + * array. + * + * @param writer the PdfWriter + * @param filePath the file path * @param fileDisplay the file information that is presented to the user - * @param fileStore the byte array with the file. If it is not null - * it takes precedence over filePath - * @param compress sets the compression on the data. Multimedia content will benefit little - * from compression - * @throws IOException on error + * @param fileStore the byte array with the file. If it is not null it takes precedence over + * filePath + * @param compress sets the compression on the data. Multimedia content will benefit little from compression * @return the file specification - */ - public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePath, String fileDisplay, byte[] fileStore, boolean compress) throws IOException { - return fileEmbedded(writer, filePath, fileDisplay, fileStore, null, null, compress ? PdfStream.BEST_COMPRESSION : PdfStream.NO_COMPRESSION); + * @throws IOException on error + */ + public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePath, String fileDisplay, + byte[] fileStore, boolean compress) throws IOException { + return fileEmbedded(writer, filePath, fileDisplay, fileStore, null, null, + compress ? PdfStream.BEST_COMPRESSION : PdfStream.NO_COMPRESSION); } - + /** - * Creates a file specification with the file embedded. The file may - * come from the file system or from a byte array. - * @param writer the PdfWriter - * @param filePath the file path - * @param fileDisplay the file information that is presented to the user - * @param fileStore the byte array with the file. If it is not null - * it takes precedence over filePath - * @param compress sets the compression on the data. Multimedia content will benefit little - * from compression - * @param mimeType the optional mimeType + * Creates a file specification with the file embedded. The file may come from the file system or from a byte + * array. + * + * @param writer the PdfWriter + * @param filePath the file path + * @param fileDisplay the file information that is presented to the user + * @param fileStore the byte array with the file. If it is not null it takes precedence over + * filePath + * @param compress sets the compression on the data. Multimedia content will benefit little from compression + * @param mimeType the optional mimeType * @param fileParameter the optional extra file parameters such as the creation or modification date - * @throws IOException on error * @return the file specification - */ - public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePath, String fileDisplay, byte[] fileStore, boolean compress, String mimeType, PdfDictionary fileParameter) throws IOException { - return fileEmbedded(writer, filePath, fileDisplay, fileStore, mimeType, fileParameter, compress ? PdfStream.BEST_COMPRESSION : PdfStream.NO_COMPRESSION); + * @throws IOException on error + */ + public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePath, String fileDisplay, + byte[] fileStore, boolean compress, String mimeType, PdfDictionary fileParameter) throws IOException { + return fileEmbedded(writer, filePath, fileDisplay, fileStore, mimeType, fileParameter, + compress ? PdfStream.BEST_COMPRESSION : PdfStream.NO_COMPRESSION); } - + /** - * Creates a file specification with the file embedded. The file may - * come from the file system or from a byte array. - * @param writer the PdfWriter - * @param filePath the file path - * @param fileDisplay the file information that is presented to the user - * @param fileStore the byte array with the file. If it is not null - * it takes precedence over filePath - * @param mimeType the optional mimeType - * @param fileParameter the optional extra file parameters such as the creation or modification date + * Creates a file specification with the file embedded. The file may come from the file system or from a byte + * array. + * + * @param writer the PdfWriter + * @param filePath the file path + * @param fileDisplay the file information that is presented to the user + * @param fileStore the byte array with the file. If it is not null it takes precedence over + * filePath + * @param mimeType the optional mimeType + * @param fileParameter the optional extra file parameters such as the creation or modification date * @param compressionLevel the level of compression - * @throws IOException on error * @return the file specification - * @since 2.1.3 - */ - public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePath, String fileDisplay, byte[] fileStore, String mimeType, PdfDictionary fileParameter, int compressionLevel) throws IOException { + * @throws IOException on error + * @since 2.1.3 + */ + public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePath, String fileDisplay, + byte[] fileStore, String mimeType, PdfDictionary fileParameter, int compressionLevel) throws IOException { PdfFileSpecification fs = new PdfFileSpecification(); fs.writer = writer; fs.put(PdfName.F, new PdfString(fileDisplay)); @@ -182,20 +197,21 @@ public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePat File file = new File(filePath); if (file.canRead()) { in = new FileInputStream(filePath); - } - else { - if (filePath.startsWith("file:/") || filePath.startsWith("http://") || filePath.startsWith("https://") || filePath.startsWith("jar:")) { + } else { + if (filePath.startsWith("file:/") || filePath.startsWith("http://") || filePath.startsWith( + "https://") || filePath.startsWith("jar:")) { in = new URL(filePath).openStream(); - } - else { + } else { in = BaseFont.getResourceStream(filePath); - if (in == null) - throw new IOException(MessageLocalization.getComposedMessage("1.not.found.as.file.or.resource", filePath)); + if (in == null) { + throw new IOException( + MessageLocalization.getComposedMessage("1.not.found.as.file.or.resource", + filePath)); + } } } stream = new PdfEFStream(in, writer); - } - else { + } else { stream = new PdfEFStream(fileStore); } stream.put(PdfName.TYPE, PdfName.EMBEDDEDFILE); @@ -208,12 +224,13 @@ public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePat if (fileStore != null) { param.put(PdfName.SIZE, new PdfNumber(stream.getRawLength())); stream.put(PdfName.PARAMS, param); - } - else + } else { stream.put(PdfName.PARAMS, refFileLength); + } - if (mimeType != null) + if (mimeType != null) { stream.put(PdfName.SUBTYPE, new PdfName(mimeType)); + } ref = writer.addToBody(stream).getIndirectReference(); if (fileStore == null) { @@ -221,10 +238,13 @@ public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePat param.put(PdfName.SIZE, new PdfNumber(stream.getRawLength())); writer.addToBody(param, refFileLength); } - } - finally { - if (in != null) - try{in.close();}catch(Exception e){} + } finally { + if (in != null) { + try { + in.close(); + } catch (Exception e) { + } + } } PdfDictionary f = new PdfDictionary(); f.put(PdfName.F, ref); @@ -232,10 +252,11 @@ public static PdfFileSpecification fileEmbedded(PdfWriter writer, String filePat fs.put(PdfName.EF, f); return fs; } - + /** * Creates a file specification for an external file. - * @param writer the PdfWriter + * + * @param writer the PdfWriter * @param filePath the file path * @return the file specification */ @@ -246,62 +267,65 @@ public static PdfFileSpecification fileExtern(PdfWriter writer, String filePath) fs.setUnicodeFileName(filePath, !PdfEncodings.isPdfDocEncoding(filePath)); return fs; } - + /** - * Gets the indirect reference to this file specification. - * Multiple invocations will retrieve the same value. - * @throws IOException on error + * Gets the indirect reference to this file specification. Multiple invocations will retrieve the same value. + * * @return the indirect reference - */ + * @throws IOException on error + */ public PdfIndirectReference getReference() throws IOException { - if (ref != null) + if (ref != null) { return ref; + } ref = writer.addToBody(this).getIndirectReference(); return ref; } - + /** - * Sets the file name (the key /F) string as an hex representation - * to support multi byte file names. The name must have the slash and - * backslash escaped according to the file specification rules + * Sets the file name (the key /F) string as an hex representation to support multi byte file names. The name must + * have the slash and backslash escaped according to the file specification rules + * * @param fileName the file name as a byte array - */ + */ public void setMultiByteFileName(byte[] fileName) { put(PdfName.F, new PdfString(fileName).setHexWriting(true)); } - + /** - * Adds the unicode file name (the key /UF). This entry was introduced - * in PDF 1.7. The filename must have the slash and backslash escaped - * according to the file specification rules. - * @param filename the filename - * @param unicode if true, the filename is UTF-16BE encoded; otherwise PDFDocEncoding is used; - */ + * Adds the unicode file name (the key /UF). This entry was introduced in PDF 1.7. The filename must have the slash + * and backslash escaped according to the file specification rules. + * + * @param filename the filename + * @param unicode if true, the filename is UTF-16BE encoded; otherwise PDFDocEncoding is used; + */ public void setUnicodeFileName(String filename, boolean unicode) { put(PdfName.UF, new PdfString(filename, unicode ? PdfObject.TEXT_UNICODE : PdfObject.TEXT_PDFDOCENCODING)); } - + /** - * Sets a flag that indicates whether an external file referenced by the file - * specification is volatile. If the value is true, applications should never - * cache a copy of the file. - * @param volatile_file if true, the external file should not be cached + * Sets a flag that indicates whether an external file referenced by the file specification is volatile. If the + * value is true, applications should never cache a copy of the file. + * + * @param volatile_file if true, the external file should not be cached */ public void setVolatile(boolean volatile_file) { put(PdfName.V, new PdfBoolean(volatile_file)); } - + /** * Adds a description for the file that is specified here. - * @param description some text - * @param unicode if true, the text is added as a unicode string + * + * @param description some text + * @param unicode if true, the text is added as a unicode string */ public void addDescription(String description, boolean unicode) { put(PdfName.DESC, new PdfString(description, unicode ? PdfObject.TEXT_UNICODE : PdfObject.TEXT_PDFDOCENCODING)); } - + /** * Adds the Collection item dictionary. + * * @param ci the PdfCollectionItem to add */ public void addCollectionItem(PdfCollectionItem ci) { diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfFont.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfFont.java index 7654f6cba..5d4dc3aa9 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfFont.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfFont.java @@ -50,57 +50,69 @@ package com.lowagie.text.pdf; -import com.lowagie.text.Image; import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.Image; /** * PdfFont is the Pdf Font object. - *

      - * Limitation: in this class only base 14 Type 1 fonts (courier, courier bold, courier oblique, - * courier boldoblique, helvetica, helvetica bold, helvetica oblique, helvetica boldoblique, - * symbol, times roman, times bold, times italic, times bolditalic, zapfdingbats) and their - * standard encoding (standard, MacRoman, (MacExpert,) WinAnsi) are supported.
      - * This object is described in the 'Portable Document Format Reference Manual version 1.3' - * section 7.7 (page 198-203). + *

      + * Limitation: in this class only base 14 Type 1 fonts (courier, courier bold, courier oblique, courier boldoblique, + * helvetica, helvetica bold, helvetica oblique, helvetica boldoblique, symbol, times roman, times bold, times italic, + * times bolditalic, zapfdingbats) and their standard encoding (standard, MacRoman, (MacExpert,) WinAnsi) are + * supported.
      This object is described in the 'Portable Document Format Reference Manual version 1.3' section 7.7 + * (page 198-203). * - * @see PdfName - * @see PdfDictionary - * @see BadPdfFormatException + * @see PdfName + * @see PdfDictionary + * @see BadPdfFormatException */ class PdfFont implements Comparable { - - - /** the font metrics. */ - private BaseFont font; - - /** the size. */ - private float size; - - /** an image. */ + + + /** + * an image. + */ protected Image image; - protected float hScale = 1; - + /** + * the font metrics. + */ + private BaseFont font; + /** + * the size. + */ + private float size; + // constructors - + PdfFont(BaseFont bf, float size) { this.size = size; font = bf; } - + // methods - + + static PdfFont getDefaultFont() { + try { + BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.WINANSI, false); + return new PdfFont(bf, 12); + } catch (Exception ee) { + throw new ExceptionConverter(ee); + } + } + /** * Compares this PdfFont with another * - * @param object the other PdfFont - * @return a value + * @param object the other PdfFont + * @return a value */ - + public int compareTo(Object object) { - if (image != null) + if (image != null) { return 0; + } if (object == null) { return -1; } @@ -114,74 +126,66 @@ public int compareTo(Object object) { return 2; } return 0; - } - catch(ClassCastException cce) { + } catch (ClassCastException cce) { return -2; } } - + /** * Returns the size of this font. * - * @return a size + * @return a size */ - + float size() { - if (image == null) + if (image == null) { return size; - else { + } else { return image.getScaledHeight(); } } - + /** * Returns the approximative width of 1 character of this font. * - * @return a width in Text Space + * @return a width in Text Space */ - + float width() { return width(' '); } - + /** * Returns the width of a certain character of this font. * - * @param character a certain character - * @return a width in Text Space + * @param character a certain character + * @return a width in Text Space */ - + float width(int character) { - if (image == null) + if (image == null) { return font.getWidthPoint(character, size) * hScale; - else + } else { return image.getScaledWidth(); + } } - + float width(String s) { - if (image == null) + if (image == null) { return font.getWidthPoint(s, size) * hScale; - else + } else { return image.getScaledWidth(); + } } - + BaseFont getFont() { return font; } - + void setImage(Image image) { this.image = image; } - - static PdfFont getDefaultFont() { - try { - BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.WINANSI, false); - return new PdfFont(bf, 12); - } - catch (Exception ee) { - throw new ExceptionConverter(ee); - } - } + void setHorizontalScaling(float hScale) { this.hScale = hScale; } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfFormField.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfFormField.java index 3fa1b9278..9de6ac855 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfFormField.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfFormField.java @@ -46,12 +46,13 @@ */ package com.lowagie.text.pdf; -import java.util.ArrayList; -import java.util.List; import com.lowagie.text.Rectangle; +import java.util.ArrayList; +import java.util.List; -/** Implements form fields. +/** + * Implements form fields. * * @author Paulo Soares (psoares@consiste.pt) */ @@ -94,20 +95,23 @@ public class PdfFormField extends PdfAnnotation { public static final boolean PLAINTEXT = false; public static final boolean PASSWORD = true; static PdfName[] mergeTarget = {PdfName.FONT, PdfName.XOBJECT, PdfName.COLORSPACE, PdfName.PATTERN}; - - /** Holds value of property parent. */ + + /** + * Holds value of property parent. + */ protected PdfFormField parent; - + protected List kids; /** * Constructs a new PdfAnnotation of subtype link (Action). - * @param writer the PdfWriter - * @param llx lower-left x-coordinated - * @param lly lower-left y-coordinate - * @param urx upper-right x-coordinate - * @param ury upper-right y-coordinate - * @param action the PdfAction + * + * @param writer the PdfWriter + * @param llx lower-left x-coordinated + * @param lly lower-left y-coordinate + * @param urx upper-right x-coordinate + * @param ury upper-right y-coordinate + * @param action the PdfAction */ public PdfFormField(PdfWriter writer, float llx, float lly, float urx, float ury, PdfAction action) { super(writer, llx, lly, urx, ury, action); @@ -116,40 +120,28 @@ public PdfFormField(PdfWriter writer, float llx, float lly, float urx, float ury annotation = true; } - /** Creates new PdfFormField - * @param writer the PdfWriter to associated to the PdfFormField */ + /** + * Creates new PdfFormField + * + * @param writer the PdfWriter to associated to the PdfFormField + */ protected PdfFormField(PdfWriter writer) { super(writer, null); form = true; annotation = false; } - - public void setWidget(Rectangle rect, PdfName highlight) { - put(PdfName.TYPE, PdfName.ANNOT); - put(PdfName.SUBTYPE, PdfName.WIDGET); - put(PdfName.RECT, new PdfRectangle(rect)); - annotation = true; - if (highlight != null && !highlight.equals(HIGHLIGHT_INVERT)) - put(PdfName.H, highlight); - } - + public static PdfFormField createEmpty(PdfWriter writer) { PdfFormField field = new PdfFormField(writer); return field; } - - public void setButton(int flags) { - put(PdfName.FT, PdfName.BTN); - if (flags != 0) - put(PdfName.FF, new PdfNumber(flags)); - } - + protected static PdfFormField createButton(PdfWriter writer, int flags) { PdfFormField field = new PdfFormField(writer); field.setButton(flags); return field; } - + public static PdfFormField createPushButton(PdfWriter writer) { return createButton(writer, FF_PUSHBUTTON); } @@ -161,40 +153,42 @@ public static PdfFormField createCheckBox(PdfWriter writer) { public static PdfFormField createRadioButton(PdfWriter writer, boolean noToggleToOff) { return createButton(writer, FF_RADIO + (noToggleToOff ? FF_NO_TOGGLE_TO_OFF : 0)); } - + public static PdfFormField createTextField(PdfWriter writer, boolean multiline, boolean password, int maxLen) { PdfFormField field = new PdfFormField(writer); field.put(PdfName.FT, PdfName.TX); int flags = (multiline ? FF_MULTILINE : 0); flags += (password ? FF_PASSWORD : 0); field.put(PdfName.FF, new PdfNumber(flags)); - if (maxLen > 0) + if (maxLen > 0) { field.put(PdfName.MAXLEN, new PdfNumber(maxLen)); + } return field; } - + /** * Allows creation of a simple textfield. - * + * * @param writer pdf writer object - * @return PdfFormField the created textfield + * @return PdfFormField the created textfield */ public static PdfFormField createTextField(PdfWriter writer) { PdfFormField field = new PdfFormField(writer); field.put(PdfName.FT, PdfName.TX); return field; } - + protected static PdfFormField createChoice(PdfWriter writer, int flags, PdfArray options, int topIndex) { PdfFormField field = new PdfFormField(writer); field.put(PdfName.FT, PdfName.CH); field.put(PdfName.FF, new PdfNumber(flags)); field.put(PdfName.OPT, options); - if (topIndex > 0) + if (topIndex > 0) { field.put(PdfName.TI, new PdfNumber(topIndex)); + } return field; } - + public static PdfFormField createList(PdfWriter writer, String[] options, int topIndex) { return createChoice(writer, 0, processOptions(options), topIndex); } @@ -206,11 +200,11 @@ public static PdfFormField createList(PdfWriter writer, String[][] options, int public static PdfFormField createCombo(PdfWriter writer, boolean edit, String[] options, int topIndex) { return createChoice(writer, FF_COMBO + (edit ? FF_EDIT : 0), processOptions(options), topIndex); } - + public static PdfFormField createCombo(PdfWriter writer, boolean edit, String[][] options, int topIndex) { return createChoice(writer, FF_COMBO + (edit ? FF_EDIT : 0), processOptions(options), topIndex); } - + protected static PdfArray processOptions(String[] options) { PdfArray array = new PdfArray(); for (String option : options) { @@ -218,7 +212,7 @@ protected static PdfArray processOptions(String[] options) { } return array; } - + protected static PdfArray processOptions(String[][] options) { PdfArray array = new PdfArray(); for (String[] subOption : options) { @@ -228,43 +222,106 @@ protected static PdfArray processOptions(String[][] options) { } return array; } - + public static PdfFormField createSignature(PdfWriter writer) { PdfFormField field = new PdfFormField(writer); field.put(PdfName.FT, PdfName.SIG); return field; } - - /** Getter for property parent. + + static void mergeResources(PdfDictionary result, PdfDictionary source, PdfStamperImp writer) { + PdfDictionary dic = null; + PdfDictionary res = null; + PdfName target = null; + for (PdfName pdfName : mergeTarget) { + target = pdfName; + PdfDictionary pdfDict = source.getAsDict(target); + if ((dic = pdfDict) != null) { + if ((res = (PdfDictionary) PdfReader.getPdfObject(result.get(target), result)) == null) { + res = new PdfDictionary(); + } + res.mergeDifferent(dic); + result.put(target, res); + if (writer != null) { + writer.markUsed(res); + } + } + } + } + + static void mergeResources(PdfDictionary result, PdfDictionary source) { + mergeResources(result, source, null); + } + + public static PdfAnnotation shallowDuplicate(PdfAnnotation annot) { + PdfAnnotation dup; + if (annot.isForm()) { + dup = new PdfFormField(annot.writer); + PdfFormField dupField = (PdfFormField) dup; + PdfFormField srcField = (PdfFormField) annot; + dupField.parent = srcField.parent; + dupField.kids = srcField.kids; + } else { + dup = new PdfAnnotation(annot.writer, null); + } + dup.merge(annot); + dup.form = annot.form; + dup.annotation = annot.annotation; + dup.templates = annot.templates; + return dup; + } + + public void setWidget(Rectangle rect, PdfName highlight) { + put(PdfName.TYPE, PdfName.ANNOT); + put(PdfName.SUBTYPE, PdfName.WIDGET); + put(PdfName.RECT, new PdfRectangle(rect)); + annotation = true; + if (highlight != null && !highlight.equals(HIGHLIGHT_INVERT)) { + put(PdfName.H, highlight); + } + } + + public void setButton(int flags) { + put(PdfName.FT, PdfName.BTN); + if (flags != 0) { + put(PdfName.FF, new PdfNumber(flags)); + } + } + + /** + * Getter for property parent. + * * @return Value of property parent. */ public PdfFormField getParent() { return parent; } - + public void addKid(PdfFormField field) { field.parent = this; - if (kids == null) + if (kids == null) { kids = new ArrayList<>(); + } kids.add(field); } - + public List getKidFields() { return kids; } - + public int setFieldFlags(int flags) { - PdfNumber obj = (PdfNumber)get(PdfName.FF); + PdfNumber obj = (PdfNumber) get(PdfName.FF); int old; - if (obj == null) + if (obj == null) { old = 0; - else + } else { old = obj.intValue(); + } int v = old | flags; put(PdfName.FF, new PdfNumber(v)); return old; } - + public void setValueAsString(String s) { put(PdfName.V, new PdfString(s, PdfObject.TEXT_UNICODE)); } @@ -284,51 +341,30 @@ public void setDefaultValueAsString(String s) { public void setDefaultValueAsName(String s) { put(PdfName.DV, new PdfName(s)); } - + public void setFieldName(String s) { - if (s != null) + if (s != null) { put(PdfName.T, new PdfString(s, PdfObject.TEXT_UNICODE)); + } } - + public void setUserName(String s) { put(PdfName.TU, new PdfString(s, PdfObject.TEXT_UNICODE)); } - + public void setMappingName(String s) { put(PdfName.TM, new PdfString(s, PdfObject.TEXT_UNICODE)); } - + public void setQuadding(int v) { put(PdfName.Q, new PdfNumber(v)); } - - static void mergeResources(PdfDictionary result, PdfDictionary source, PdfStamperImp writer) { - PdfDictionary dic = null; - PdfDictionary res = null; - PdfName target = null; - for (PdfName pdfName : mergeTarget) { - target = pdfName; - PdfDictionary pdfDict = source.getAsDict(target); - if ((dic = pdfDict) != null) { - if ((res = (PdfDictionary) PdfReader.getPdfObject(result.get(target), result)) == null) { - res = new PdfDictionary(); - } - res.mergeDifferent(dic); - result.put(target, res); - if (writer != null) - writer.markUsed(res); - } - } - } - - static void mergeResources(PdfDictionary result, PdfDictionary source) { - mergeResources(result, source, null); - } public void setUsed() { used = true; - if (parent != null) + if (parent != null) { put(PdfName.PARENT, parent.getIndirectReference()); + } if (kids != null) { PdfArray array = new PdfArray(); for (PdfFormField kid : kids) { @@ -336,30 +372,13 @@ public void setUsed() { } put(PdfName.KIDS, array); } - if (templates == null) + if (templates == null) { return; + } PdfDictionary dic = new PdfDictionary(); for (PdfTemplate template : templates.keySet()) { mergeResources(dic, (PdfDictionary) template.getResources()); } put(PdfName.DR, dic); } - - public static PdfAnnotation shallowDuplicate(PdfAnnotation annot) { - PdfAnnotation dup; - if (annot.isForm()) { - dup = new PdfFormField(annot.writer); - PdfFormField dupField = (PdfFormField)dup; - PdfFormField srcField = (PdfFormField)annot; - dupField.parent = srcField.parent; - dupField.kids = srcField.kids; - } - else - dup = new PdfAnnotation(annot.writer, null); - dup.merge(annot); - dup.form = annot.form; - dup.annotation = annot.annotation; - dup.templates = annot.templates; - return dup; - } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfFormXObject.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfFormXObject.java index 443a808ca..4f9fd86cc 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfFormXObject.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfFormXObject.java @@ -54,26 +54,32 @@ */ public class PdfFormXObject extends PdfStream { - + // public static final variables - -/** This is a PdfNumber representing 0. */ + + /** + * This is a PdfNumber representing 0. + */ public static final PdfNumber ZERO = new PdfNumber(0); - -/** This is a PdfNumber representing 1. */ + + /** + * This is a PdfNumber representing 1. + */ public static final PdfNumber ONE = new PdfNumber(1); - -/** This is the 1 - matrix. */ + + /** + * This is the 1 - matrix. + */ public static final PdfLiteral MATRIX = new PdfLiteral("[1 0 0 1 0 0]"); - -/** - * Constructs a PdfFormXObject-object. - * - * @param template the template - * @param compressionLevel the compression level for the stream - * @since 2.1.3 (Replacing the existing constructor with param compressionLevel) - */ - + + /** + * Constructs a PdfFormXObject-object. + * + * @param template the template + * @param compressionLevel the compression level for the stream + * @since 2.1.3 (Replacing the existing constructor with param compressionLevel) + */ + PdfFormXObject(PdfTemplate template, int compressionLevel) // throws BadPdfFormatException { super(); @@ -82,18 +88,21 @@ public class PdfFormXObject extends PdfStream { put(PdfName.RESOURCES, template.getResources()); put(PdfName.BBOX, new PdfRectangle(template.getBoundingBox())); put(PdfName.FORMTYPE, ONE); - if (template.getLayer() != null) + if (template.getLayer() != null) { put(PdfName.OC, template.getLayer().getRef()); - if (template.getGroup() != null) + } + if (template.getGroup() != null) { put(PdfName.GROUP, template.getGroup()); + } PdfArray matrix = template.getMatrix(); - if (matrix == null) + if (matrix == null) { put(PdfName.MATRIX, MATRIX); - else + } else { put(PdfName.MATRIX, matrix); + } bytes = template.toPdf(null); put(PdfName.LENGTH, new PdfNumber(bytes.length)); flateCompress(compressionLevel); } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfFunction.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfFunction.java index 6d423cd62..1f1f2eaa0 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfFunction.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfFunction.java @@ -47,56 +47,50 @@ package com.lowagie.text.pdf; import com.lowagie.text.ExceptionConverter; - import java.io.IOException; -/** Implements PDF functions. +/** + * Implements PDF functions. * * @author Paulo Soares (psoares@consiste.pt) */ public class PdfFunction { - + protected PdfWriter writer; - + protected PdfIndirectReference reference; - + protected PdfDictionary dictionary; - - /** Creates new PdfFunction - * @param writer the PdfWriter to associate to the PdfFunction */ + + /** + * Creates new PdfFunction + * + * @param writer the PdfWriter to associate to the PdfFunction + */ protected PdfFunction(PdfWriter writer) { this.writer = writer; } - - PdfIndirectReference getReference() { - try { - if (reference == null) { - reference = writer.addToBody(dictionary).getIndirectReference(); - } - } - catch (IOException ioe) { - throw new ExceptionConverter(ioe); - } - return reference; - } - + public static PdfFunction type0(PdfWriter writer, float[] domain, float[] range, int[] size, - int bitsPerSample, int order, float[] encode, float[] decode, byte[] stream) { + int bitsPerSample, int order, float[] encode, float[] decode, byte[] stream) { PdfFunction func = new PdfFunction(writer); func.dictionary = new PdfStream(stream); - ((PdfStream)func.dictionary).flateCompress(writer.getCompressionLevel()); + ((PdfStream) func.dictionary).flateCompress(writer.getCompressionLevel()); func.dictionary.put(PdfName.FUNCTIONTYPE, new PdfNumber(0)); func.dictionary.put(PdfName.DOMAIN, new PdfArray(domain)); func.dictionary.put(PdfName.RANGE, new PdfArray(range)); func.dictionary.put(PdfName.SIZE, new PdfArray(size)); func.dictionary.put(PdfName.BITSPERSAMPLE, new PdfNumber(bitsPerSample)); - if (order != 1) + if (order != 1) { func.dictionary.put(PdfName.ORDER, new PdfNumber(order)); - if (encode != null) + } + if (encode != null) { func.dictionary.put(PdfName.ENCODE, new PdfArray(encode)); - if (decode != null) + } + if (decode != null) { func.dictionary.put(PdfName.DECODE, new PdfArray(decode)); + } return func; } @@ -105,41 +99,60 @@ public static PdfFunction type2(PdfWriter writer, float[] domain, float[] range, func.dictionary = new PdfDictionary(); func.dictionary.put(PdfName.FUNCTIONTYPE, new PdfNumber(2)); func.dictionary.put(PdfName.DOMAIN, new PdfArray(domain)); - if (range != null) + if (range != null) { func.dictionary.put(PdfName.RANGE, new PdfArray(range)); - if (c0 != null) + } + if (c0 != null) { func.dictionary.put(PdfName.C0, new PdfArray(c0)); - if (c1 != null) + } + if (c1 != null) { func.dictionary.put(PdfName.C1, new PdfArray(c1)); + } func.dictionary.put(PdfName.N, new PdfNumber(n)); return func; } - public static PdfFunction type3(PdfWriter writer, float[] domain, float[] range, PdfFunction[] functions, float[] bounds, float[] encode) { + public static PdfFunction type3(PdfWriter writer, float[] domain, float[] range, PdfFunction[] functions, + float[] bounds, float[] encode) { PdfFunction func = new PdfFunction(writer); func.dictionary = new PdfDictionary(); func.dictionary.put(PdfName.FUNCTIONTYPE, new PdfNumber(3)); func.dictionary.put(PdfName.DOMAIN, new PdfArray(domain)); - if (range != null) + if (range != null) { func.dictionary.put(PdfName.RANGE, new PdfArray(range)); + } PdfArray array = new PdfArray(); - for (PdfFunction function : functions) array.add(function.getReference()); + for (PdfFunction function : functions) { + array.add(function.getReference()); + } func.dictionary.put(PdfName.FUNCTIONS, array); func.dictionary.put(PdfName.BOUNDS, new PdfArray(bounds)); func.dictionary.put(PdfName.ENCODE, new PdfArray(encode)); return func; } - + public static PdfFunction type4(PdfWriter writer, float[] domain, float[] range, String postscript) { byte[] b = new byte[postscript.length()]; - for (int k = 0; k < b.length; ++k) - b[k] = (byte)postscript.charAt(k); + for (int k = 0; k < b.length; ++k) { + b[k] = (byte) postscript.charAt(k); + } PdfFunction func = new PdfFunction(writer); func.dictionary = new PdfStream(b); - ((PdfStream)func.dictionary).flateCompress(writer.getCompressionLevel()); + ((PdfStream) func.dictionary).flateCompress(writer.getCompressionLevel()); func.dictionary.put(PdfName.FUNCTIONTYPE, new PdfNumber(4)); func.dictionary.put(PdfName.DOMAIN, new PdfArray(domain)); func.dictionary.put(PdfName.RANGE, new PdfArray(range)); return func; } + + PdfIndirectReference getReference() { + try { + if (reference == null) { + reference = writer.addToBody(dictionary).getIndirectReference(); + } + } catch (IOException ioe) { + throw new ExceptionConverter(ioe); + } + return reference; + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfGState.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfGState.java index 05da499eb..9eca9fe09 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfGState.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfGState.java @@ -46,42 +46,70 @@ */ package com.lowagie.text.pdf; -/** The graphic state dictionary. +/** + * The graphic state dictionary. * * @author Paulo Soares (psoares@consiste.pt) */ public class PdfGState extends PdfDictionary { - /** A possible blend mode */ + + /** + * A possible blend mode + */ public static final PdfName BM_NORMAL = new PdfName("Normal"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_COMPATIBLE = new PdfName("Compatible"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_MULTIPLY = new PdfName("Multiply"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_SCREEN = new PdfName("Screen"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_OVERLAY = new PdfName("Overlay"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_DARKEN = new PdfName("Darken"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_LIGHTEN = new PdfName("Lighten"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_COLORDODGE = new PdfName("ColorDodge"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_COLORBURN = new PdfName("ColorBurn"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_HARDLIGHT = new PdfName("HardLight"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_SOFTLIGHT = new PdfName("SoftLight"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_DIFFERENCE = new PdfName("Difference"); - /** A possible blend mode */ + /** + * A possible blend mode + */ public static final PdfName BM_EXCLUSION = new PdfName("Exclusion"); - + /** * Sets the flag whether to apply overprint for stroking. - * @param ov true to apply overprint for stroking - * false otherwise + * + * @param ov true to apply overprint for stroking false otherwise */ public void setOverPrintStroking(boolean ov) { put(PdfName.OP, ov ? PdfBoolean.PDFTRUE : PdfBoolean.PDFFALSE); @@ -89,8 +117,8 @@ public void setOverPrintStroking(boolean ov) { /** * Sets the flag whether to apply overprint for non stroking painting operations. - * @param ov true to apply overprint for non stroking painting operations - * false otherwise + * + * @param ov true to apply overprint for non stroking painting operations false otherwise */ public void setOverPrintNonStroking(boolean ov) { put(PdfName.op, ov ? PdfBoolean.PDFTRUE : PdfBoolean.PDFFALSE); @@ -98,58 +126,60 @@ public void setOverPrintNonStroking(boolean ov) { /** * Sets the flag whether to toggle knockout behavior for overprinted objects. + * * @param ov - accepts 0 or 1 */ public void setOverPrintMode(int ov) { - put(PdfName.OPM, new PdfNumber(ov==0 ? 0 : 1)); + put(PdfName.OPM, new PdfNumber(ov == 0 ? 0 : 1)); } - + /** - * Sets the current stroking alpha constant, specifying the constant shape or - * constant opacity value to be used for stroking operations in the transparent - * imaging model. + * Sets the current stroking alpha constant, specifying the constant shape or constant opacity value to be used for + * stroking operations in the transparent imaging model. + * * @param n the stroking alpha constant */ public void setStrokeOpacity(float n) { put(PdfName.CA, new PdfNumber(n)); } - + /** - * Sets the current fill alpha constant, specifying the constant shape or - * constant opacity value to be used for filling operations in the transparent - * imaging model. + * Sets the current fill alpha constant, specifying the constant shape or constant opacity value to be used for + * filling operations in the transparent imaging model. + * * @param n the fll alpha constant */ public void setFillOpacity(float n) { put(PdfName.ca, new PdfNumber(n)); } - + /** - * The alpha source flag specifying whether the current soft mask - * and alpha constant are to be interpreted as shape values (true) - * or opacity values (false). - * @param v true if the alpha source flag and alpha constant should be interpreted as shape value - * false if they should be interpreted as opacity values + * The alpha source flag specifying whether the current soft mask and alpha constant are to be interpreted as shape + * values (true) or opacity values (false). + * + * @param v true if the alpha source flag and alpha constant should be interpreted as shape value false if they + * should be interpreted as opacity values */ public void setAlphaIsShape(boolean v) { put(PdfName.AIS, v ? PdfBoolean.PDFTRUE : PdfBoolean.PDFFALSE); } - + /** - * Determines the behavior of overlapping glyphs within a text object - * in the transparent imaging model. + * Determines the behavior of overlapping glyphs within a text object in the transparent imaging model. + * * @param v boolean for overlapping glyphs behavior */ public void setTextKnockout(boolean v) { put(PdfName.TK, v ? PdfBoolean.PDFTRUE : PdfBoolean.PDFFALSE); } - + /** * The current blend mode to be used in the transparent imaging model. + * * @param bm the blend mode */ public void setBlendMode(PdfName bm) { put(PdfName.BM, bm); } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfGraphics2D.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfGraphics2D.java index 2ecbe520a..1017dbfb7 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfGraphics2D.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfGraphics2D.java @@ -51,7 +51,6 @@ import com.lowagie.text.pdf.internal.PolylineShape; import com.lowagie.text.utils.SystemPropertyUtil; - import java.awt.AlphaComposite; import java.awt.BasicStroke; import java.awt.Color; @@ -118,18 +117,25 @@ import javax.imageio.stream.ImageOutputStream; public class PdfGraphics2D extends Graphics2D { - + + public static final int AFM_DIVISOR = 1000; // used to calculate coordinates private static final int FILL = 1; private static final int STROKE = 2; private static final int CLIP = 3; - private BasicStroke strokeOne = new BasicStroke(1); - private static final AffineTransform IDENTITY = new AffineTransform(); - - private static final Set LOGICAL_FONT_NAMES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList("Dialog", "DialogInput", "Monospaced", "Serif", "SansSerif"))); - private static final String BOLD_FONT_FACE_NAME_SUFFIX = ".bold"; - private static final String BOLD_ITALIC_FONT_FACE_NAME_SUFFIX = ".bolditalic"; - + + private static final Set LOGICAL_FONT_NAMES = Collections.unmodifiableSet( + new HashSet<>(Arrays.asList("Dialog", "DialogInput", "Monospaced", "Serif", "SansSerif"))); + private static final String BOLD_FONT_FACE_NAME_SUFFIX = ".bold"; + private static final String BOLD_ITALIC_FONT_FACE_NAME_SUFFIX = ".bolditalic"; + private final CompositeFontDrawer compositeFontDrawer = new CompositeFontDrawer(); + // Added by Jurij Bilas + protected boolean underline; // indicates if the font style is underlined + protected PdfGState[] fillGState = new PdfGState[256]; + protected PdfGState[] strokeGState = new PdfGState[256]; + protected int currentFillGState = 255; + protected int currentStrokeGState = 255; + private BasicStroke strokeOne = new BasicStroke(1); private Font font; private BaseFont baseFont; private float fontSize; @@ -138,64 +144,37 @@ public class PdfGraphics2D extends Graphics2D { private Color background; private float width; private float height; - private Area clip; - private RenderingHints rhints = new RenderingHints(null); - private Stroke stroke; private Stroke originalStroke; - private PdfContentByte cb; - - /** Storage for BaseFont objects created. */ + /** + * Storage for BaseFont objects created. + */ private Map baseFonts; - private boolean disposeCalled = false; - private FontMapper fontMapper; - private List kids; - private boolean kid = false; - private Graphics2D dg2 = new BufferedImage(2, 2, BufferedImage.TYPE_INT_RGB).createGraphics(); - private boolean onlyShapes = false; - private Stroke oldStroke; private Paint paintFill; private Paint paintStroke; - private MediaTracker mediaTracker; - - // Added by Jurij Bilas - protected boolean underline; // indicates if the font style is underlined - - protected PdfGState[] fillGState = new PdfGState[256]; - protected PdfGState[] strokeGState = new PdfGState[256]; - protected int currentFillGState = 255; - protected int currentStrokeGState = 255; - - public static final int AFM_DIVISOR = 1000; // used to calculate coordinates - private boolean convertImagesToJPEG = false; private float jpegQuality = .95f; - // Added by Alexej Suchov private float alpha; - // Added by Alexej Suchov private Composite composite; - // Added by Alexej Suchov private Paint realPaint; - - private final CompositeFontDrawer compositeFontDrawer = new CompositeFontDrawer(); - // make use of compositeFontDrawer configurable ... may be set via property or directly via setter - private boolean isCompositeFontDrawerEnabled = SystemPropertyUtil.getBoolean("com.github.librepdf.openpdf.compositeFontDrawerEnabled", true); - + private boolean isCompositeFontDrawerEnabled = SystemPropertyUtil.getBoolean( + "com.github.librepdf.openpdf.compositeFontDrawerEnabled", true); + private PdfGraphics2D() { dg2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON); setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON); @@ -204,8 +183,9 @@ private PdfGraphics2D() { /** * Shortcut constructor for PDFGraphics2D. - * @param cb the PdfContentByte - * @param width the width + * + * @param cb the PdfContentByte + * @param width the width * @param height the height */ public PdfGraphics2D(PdfContentByte cb, float width, float height) { @@ -214,15 +194,17 @@ public PdfGraphics2D(PdfContentByte cb, float width, float height) { /** * Constructor for PDFGraphics2D. - * @param cb The PdfContentByte - * @param width The width - * @param height The height - * @param fontMapper The fonts to put in the BaseFont Map - * @param onlyShapes True if there are only shapes, false otherwise - * @param convertImagesToJPEG True to convert to JPEG, false otherwise - * @param quality The JPEG quality - */ - public PdfGraphics2D(PdfContentByte cb, float width, float height, FontMapper fontMapper, boolean onlyShapes, boolean convertImagesToJPEG, float quality) { + * + * @param cb The PdfContentByte + * @param width The width + * @param height The height + * @param fontMapper The fonts to put in the BaseFont Map + * @param onlyShapes True if there are only shapes, false otherwise + * @param convertImagesToJPEG True to convert to JPEG, false otherwise + * @param quality The JPEG quality + */ + public PdfGraphics2D(PdfContentByte cb, float width, float height, FontMapper fontMapper, boolean onlyShapes, + boolean convertImagesToJPEG, float quality) { super(); dg2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON); setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON); @@ -234,8 +216,9 @@ public PdfGraphics2D(PdfContentByte cb, float width, float height, FontMapper fo this.baseFonts = new HashMap<>(); if (!onlyShapes) { this.fontMapper = fontMapper; - if (this.fontMapper == null) + if (this.fontMapper == null) { this.fontMapper = new DefaultFontMapper(); + } } paint = Color.black; background = Color.white; @@ -250,21 +233,32 @@ public PdfGraphics2D(PdfContentByte cb, float width, float height, FontMapper fo setStrokeDiff(stroke, null); cb.saveState(); } - + + /** + * Calculates position and/or stroke thickness depending on the font size + * + * @param d value to be converted + * @param i font size + * @return position and/or stroke thickness depending on the font size + */ + public static double asPoints(double d, int i) { + return d * i / AFM_DIVISOR; + } + /** * @see Graphics2D#draw(Shape) */ public void draw(Shape s) { followPath(s, STROKE); } - + /** * @see Graphics2D#drawImage(Image, AffineTransform, ImageObserver) */ public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) { return drawImage(img, null, xform, null, obs); } - + /** * @see Graphics2D#drawImage(BufferedImage, BufferedImageOp, int, int) */ @@ -276,14 +270,14 @@ public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y) { } drawImage(result, x, y, null); } - + /** * @see Graphics2D#drawRenderedImage(RenderedImage, AffineTransform) */ public void drawRenderedImage(RenderedImage img, AffineTransform xform) { BufferedImage image = null; if (img instanceof BufferedImage) { - image = (BufferedImage)img; + image = (BufferedImage) img; } else { ColorModel cm = img.getColorModel(); int width = img.getWidth(); @@ -292,60 +286,53 @@ public void drawRenderedImage(RenderedImage img, AffineTransform xform) { boolean isAlphaPremultiplied = cm.isAlphaPremultiplied(); Hashtable properties = new Hashtable<>(); String[] keys = img.getPropertyNames(); - if (keys!=null) { + if (keys != null) { for (String key : keys) { properties.put(key, img.getProperty(key)); } } BufferedImage result = new BufferedImage(cm, raster, isAlphaPremultiplied, properties); img.copyData(raster); - image=result; + image = result; } drawImage(image, xform, null); } - + /** * @see Graphics2D#drawRenderableImage(RenderableImage, AffineTransform) */ public void drawRenderableImage(RenderableImage img, AffineTransform xform) { drawRenderedImage(img.createDefaultRendering(), xform); } - + /** * @see Graphics#drawString(String, int, int) */ public void drawString(String s, int x, int y) { - drawString(s, (float)x, (float)y); - } - - /** - * Calculates position and/or stroke thickness depending on the font size - * @param d value to be converted - * @param i font size - * @return position and/or stroke thickness depending on the font size - */ - public static double asPoints(double d, int i) { - return d * i / AFM_DIVISOR; + drawString(s, (float) x, (float) y); } + /** - * This routine goes through the attributes and sets the font - * before calling the actual string drawing routine - * @param iter the AttributedCharacterIterator + * This routine goes through the attributes and sets the font before calling the actual string drawing routine + * + * @param iter the AttributedCharacterIterator */ @SuppressWarnings("unchecked") protected void doAttributes(AttributedCharacterIterator iter) { underline = false; Set set = iter.getAttributes().keySet(); for (AttributedCharacterIterator.Attribute attribute : set) { - if (!(attribute instanceof TextAttribute)) + if (!(attribute instanceof TextAttribute)) { continue; + } TextAttribute textattribute = (TextAttribute) attribute; if (textattribute.equals(TextAttribute.FONT)) { Font font = (Font) iter.getAttributes().get(textattribute); setFont(font); } else if (textattribute.equals(TextAttribute.UNDERLINE)) { - if (iter.getAttributes().get(textattribute) == TextAttribute.UNDERLINE_ON) + if (iter.getAttributes().get(textattribute) == TextAttribute.UNDERLINE_ON) { underline = true; + } } else if (textattribute.equals(TextAttribute.SIZE)) { Object obj = iter.getAttributes().get(textattribute); if (obj instanceof Integer) { @@ -359,17 +346,17 @@ protected void doAttributes(AttributedCharacterIterator iter) { setColor((Color) iter.getAttributes().get(textattribute)); } else if (textattribute.equals(TextAttribute.FAMILY)) { Font font = getFont(); - Map fontAttributes = (Map)font.getAttributes(); + Map fontAttributes = (Map) font.getAttributes(); fontAttributes.put(TextAttribute.FAMILY, iter.getAttributes().get(textattribute)); setFont(font.deriveFont(fontAttributes)); } else if (textattribute.equals(TextAttribute.POSTURE)) { Font font = getFont(); - Map fontAttributes = (Map)font.getAttributes(); + Map fontAttributes = (Map) font.getAttributes(); fontAttributes.put(TextAttribute.POSTURE, iter.getAttributes().get(textattribute)); setFont(font.deriveFont(fontAttributes)); } else if (textattribute.equals(TextAttribute.WEIGHT)) { Font font = getFont(); - Map fontAttributes = (Map)font.getAttributes(); + Map fontAttributes = (Map) font.getAttributes(); fontAttributes.put(TextAttribute.WEIGHT, iter.getAttributes().get(textattribute)); setFont(font.deriveFont(fontAttributes)); } @@ -385,7 +372,8 @@ public void drawString(String s, float x, float y) { } setFillPaint(); if (onlyShapes) { - drawGlyphVector(this.font.layoutGlyphVector(getFontRenderContext(), s.toCharArray(), 0, s.length(), java.awt.Font.LAYOUT_LEFT_TO_RIGHT), x, y); + drawGlyphVector(this.font.layoutGlyphVector(getFontRenderContext(), s.toCharArray(), 0, s.length(), + java.awt.Font.LAYOUT_LEFT_TO_RIGHT), x, y); // Use the following line to compile in JDK 1.3 // drawGlyphVector(this.font.createGlyphVector(getFontRenderContext(), s), x, y); } else { @@ -393,7 +381,8 @@ public void drawString(String s, float x, float y) { return; } double width = 0; - if (isCompositeFontDrawerEnabled && CompositeFontDrawer.isSupported() && compositeFontDrawer.isCompositeFont(font)) { + if (isCompositeFontDrawerEnabled && CompositeFontDrawer.isSupported() + && compositeFontDrawer.isCompositeFont(font)) { width = compositeFontDrawer.drawString(s, font, x, y, this::getCachedBaseFont, this::drawString); } else { // Splitting string to the parts depending on they visibility preserves @@ -404,22 +393,22 @@ public void drawString(String s, float x, float y) { width += drawString(str, baseFont, x + width, y); } } - if(underline) { + if (underline) { // These two are supposed to be taken from the .AFM file //int UnderlinePosition = -100; int UnderlineThickness = 50; // - double d = asPoints(UnderlineThickness, (int)fontSize); + double d = asPoints(UnderlineThickness, (int) fontSize); Stroke savedStroke = originalStroke; - setStroke(new BasicStroke((float)d)); - y = (float)(y + asPoints(UnderlineThickness, (int)fontSize)); - Line2D line = new Line2D.Double(x, y, width+x, y); + setStroke(new BasicStroke((float) d)); + y = (float) (y + asPoints(UnderlineThickness, (int) fontSize)); + Line2D line = new Line2D.Double(x, y, width + x, y); draw(line); setStroke(savedStroke); } } } - + private double drawString(String s, BaseFont baseFont, double x, double y) { boolean restoreTextRenderingMode = false; AffineTransform at = getTransform(); @@ -429,7 +418,7 @@ private double drawString(String s, BaseFont baseFont, double x, double y) { at2.concatenate(font.getTransform()); setTransform(at2); AffineTransform inverse = this.normalizeMatrix(); - AffineTransform flipper = AffineTransform.getScaleInstance(1,-1); + AffineTransform flipper = AffineTransform.getScaleInstance(1, -1); inverse.concatenate(flipper); double[] mx = new double[6]; inverse.getMatrix(mx); @@ -459,15 +448,15 @@ private double drawString(String s, BaseFont baseFont, double x, double y) { angle2 = -angle2; } if (angle == 0) { - mx[2] = angle2 / 100.0f; + mx[2] = angle2 / 100.0f; } } - } - cb.setTextMatrix((float)mx[0], (float)mx[1], (float)mx[2], (float)mx[3], (float)mx[4], (float)mx[5]); - Float fontTextAttributeWidth = (Float)font.getAttributes().get(TextAttribute.WIDTH); - fontTextAttributeWidth = (fontTextAttributeWidth == null) - ? TextAttribute.WIDTH_REGULAR - : fontTextAttributeWidth; + } + cb.setTextMatrix((float) mx[0], (float) mx[1], (float) mx[2], (float) mx[3], (float) mx[4], (float) mx[5]); + Float fontTextAttributeWidth = (Float) font.getAttributes().get(TextAttribute.WIDTH); + fontTextAttributeWidth = (fontTextAttributeWidth == null) + ? TextAttribute.WIDTH_REGULAR + : fontTextAttributeWidth; if (!TextAttribute.WIDTH_REGULAR.equals(fontTextAttributeWidth)) { cb.setHorizontalScaling(100.0f / fontTextAttributeWidth); @@ -481,24 +470,24 @@ private double drawString(String s, BaseFont baseFont, double x, double y) { Float weight = (Float) font.getAttributes().get(TextAttribute.WEIGHT); if (weight == null) { weight = (font.isBold()) ? TextAttribute.WEIGHT_BOLD - : TextAttribute.WEIGHT_REGULAR; + : TextAttribute.WEIGHT_REGULAR; } String fontFaceName = font.getFontName(); String fontLogicalName = font.getName(); if ((font.isBold() || (weight >= TextAttribute.WEIGHT_SEMIBOLD)) - && (fontFaceName.equals(fontLogicalName) || - // bold logical font face name has suffix ".bold" / ".bolditalic" - (LOGICAL_FONT_NAMES.contains(fontLogicalName) && - (fontFaceName.equals(fontLogicalName + BOLD_FONT_FACE_NAME_SUFFIX) || - fontFaceName.equals(fontLogicalName + BOLD_ITALIC_FONT_FACE_NAME_SUFFIX))))) { + && (fontFaceName.equals(fontLogicalName) || + // bold logical font face name has suffix ".bold" / ".bolditalic" + (LOGICAL_FONT_NAMES.contains(fontLogicalName) && + (fontFaceName.equals(fontLogicalName + BOLD_FONT_FACE_NAME_SUFFIX) || + fontFaceName.equals(fontLogicalName + BOLD_ITALIC_FONT_FACE_NAME_SUFFIX))))) { // Simulate a bold font. float strokeWidth = font.getSize2D() * (weight - TextAttribute.WEIGHT_REGULAR) / 30f; if (strokeWidth != 1) { - if(realPaint instanceof Color){ + if (realPaint instanceof Color) { cb.setTextRenderingMode(PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE); oldStroke = new BasicStroke(strokeWidth); cb.setLineWidth(strokeWidth); - Color color = (Color)realPaint; + Color color = (Color) realPaint; int alpha = color.getAlpha(); if (alpha != currentStrokeGState) { currentStrokeGState = alpha; @@ -537,11 +526,11 @@ private double drawString(String s, BaseFont baseFont, double x, double y) { } double leftX = cb.getXTLM(); double leftY = cb.getYTLM(); - PdfAction action = new PdfAction(url.toString()); - cb.setAction(action, (float)leftX, (float)leftY, (float)(leftX+width), (float)(leftY+height)); + PdfAction action = new PdfAction(url.toString()); + cb.setAction(action, (float) leftX, (float) leftY, (float) (leftX + width), (float) (leftY + height)); } if (s.length() > 1) { - float adv = ((float)width - baseFont.getWidthPoint(s, fontSize)) / (s.length() - 1); + float adv = ((float) width - baseFont.getWidthPoint(s, fontSize)) / (s.length() - 1); cb.setCharacterSpacing(adv); } cb.showText(s); @@ -568,9 +557,9 @@ private double drawString(String s, BaseFont baseFont, double x, double y) { * @see Graphics#drawString(AttributedCharacterIterator, int, int) */ public void drawString(AttributedCharacterIterator iterator, int x, int y) { - drawString(iterator, (float)x, (float)y); + drawString(iterator, (float) x, (float) y); } - + /** * @see Graphics2D#drawString(AttributedCharacterIterator, float, float) */ @@ -583,26 +572,23 @@ public void drawString(AttributedCharacterIterator iter, float x, float y) { drawString(sb.toString(),x,y); */ StringBuilder stringbuffer = new StringBuilder(iter.getEndIndex()); - for(char c = iter.first(); c != '\uFFFF'; c = iter.next()) - { - if(iter.getIndex() == iter.getRunStart()) - { - if(stringbuffer.length() > 0) - { + for (char c = iter.first(); c != '\uFFFF'; c = iter.next()) { + if (iter.getIndex() == iter.getRunStart()) { + if (stringbuffer.length() > 0) { drawString(stringbuffer.toString(), x, y); FontMetrics fontmetrics = getFontMetrics(); - x = (float)(x + fontmetrics.getStringBounds(stringbuffer.toString(), this).getWidth()); + x = (float) (x + fontmetrics.getStringBounds(stringbuffer.toString(), this).getWidth()); stringbuffer.delete(0, stringbuffer.length()); } doAttributes(iter); } stringbuffer.append(c); } - + drawString(stringbuffer.toString(), x, y); underline = false; } - + /** * @see Graphics2D#drawGlyphVector(GlyphVector, float, float) */ @@ -610,14 +596,14 @@ public void drawGlyphVector(GlyphVector g, float x, float y) { Shape s = g.getOutline(x, y); fill(s); } - + /** * @see Graphics2D#fill(Shape) */ public void fill(Shape s) { followPath(s, FILL); } - + /** * @see Graphics2D#hit(Rectangle, Shape, boolean) */ @@ -627,140 +613,97 @@ public boolean hit(Rectangle rect, Shape s, boolean onStroke) { } s = transform.createTransformedShape(s); Area area = new Area(s); - if (clip != null) + if (clip != null) { area.intersect(clip); + } return area.intersects(rect.x, rect.y, rect.width, rect.height); } - + /** * @see Graphics2D#getDeviceConfiguration() */ public GraphicsConfiguration getDeviceConfiguration() { return dg2.getDeviceConfiguration(); } - - /** - * Method contributed by Alexej Suchov - * @see Graphics2D#setComposite(Composite) - */ - public void setComposite(Composite comp) { - - if (comp instanceof AlphaComposite) { - - AlphaComposite composite = (AlphaComposite) comp; - - if (composite.getRule() == 3) { - - alpha = composite.getAlpha(); - this.composite = composite; - - if (realPaint != null && (realPaint instanceof Color)) { - - Color c = (Color) realPaint; - paint = new Color(c.getRed(), c.getGreen(), c.getBlue(), - (int) (c.getAlpha() * alpha)); - } - return; - } - } - - this.composite = comp; - alpha = 1.0F; - - } - - /** - * Method contributed by Alexej Suchov - * @see Graphics2D#setPaint(Paint) - */ - public void setPaint(Paint paint) { - if (paint == null) - return; - this.paint = paint; - realPaint = paint; - - if ((composite instanceof AlphaComposite) && (paint instanceof Color)) { - - AlphaComposite co = (AlphaComposite) composite; - - if (co.getRule() == 3) { - Color c = (Color) paint; - this.paint = new Color(c.getRed(), c.getGreen(), c.getBlue(), (int) (c.getAlpha() * alpha)); - realPaint = paint; - } - } - - } private Stroke transformStroke(Stroke stroke) { - if (!(stroke instanceof BasicStroke)) + if (!(stroke instanceof BasicStroke)) { return stroke; - BasicStroke st = (BasicStroke)stroke; - float scale = (float)Math.sqrt(Math.abs(transform.getDeterminant())); + } + BasicStroke st = (BasicStroke) stroke; + float scale = (float) Math.sqrt(Math.abs(transform.getDeterminant())); float[] dash = st.getDashArray(); if (dash != null) { - for (int k = 0; k < dash.length; ++k) + for (int k = 0; k < dash.length; ++k) { dash[k] *= scale; + } } - return new BasicStroke(st.getLineWidth() * scale, st.getEndCap(), st.getLineJoin(), st.getMiterLimit(), dash, st.getDashPhase() * scale); + return new BasicStroke(st.getLineWidth() * scale, st.getEndCap(), st.getLineJoin(), st.getMiterLimit(), dash, + st.getDashPhase() * scale); } - + private void setStrokeDiff(Stroke newStroke, Stroke oldStroke) { - if (newStroke == oldStroke) + if (newStroke == oldStroke) { return; - if (!(newStroke instanceof BasicStroke)) + } + if (!(newStroke instanceof BasicStroke)) { return; - BasicStroke nStroke = (BasicStroke)newStroke; + } + BasicStroke nStroke = (BasicStroke) newStroke; boolean oldOk = (oldStroke instanceof BasicStroke); BasicStroke oStroke = null; - if (oldOk) - oStroke = (BasicStroke)oldStroke; - if (!oldOk || nStroke.getLineWidth() != oStroke.getLineWidth()) + if (oldOk) { + oStroke = (BasicStroke) oldStroke; + } + if (!oldOk || nStroke.getLineWidth() != oStroke.getLineWidth()) { cb.setLineWidth(nStroke.getLineWidth()); + } if (!oldOk || nStroke.getEndCap() != oStroke.getEndCap()) { switch (nStroke.getEndCap()) { - case BasicStroke.CAP_BUTT: - cb.setLineCap(0); - break; - case BasicStroke.CAP_SQUARE: - cb.setLineCap(2); - break; - default: - cb.setLineCap(1); + case BasicStroke.CAP_BUTT: + cb.setLineCap(0); + break; + case BasicStroke.CAP_SQUARE: + cb.setLineCap(2); + break; + default: + cb.setLineCap(1); } } if (!oldOk || nStroke.getLineJoin() != oStroke.getLineJoin()) { switch (nStroke.getLineJoin()) { - case BasicStroke.JOIN_MITER: - cb.setLineJoin(0); - break; - case BasicStroke.JOIN_BEVEL: - cb.setLineJoin(2); - break; - default: - cb.setLineJoin(1); + case BasicStroke.JOIN_MITER: + cb.setLineJoin(0); + break; + case BasicStroke.JOIN_BEVEL: + cb.setLineJoin(2); + break; + default: + cb.setLineJoin(1); } } - if (!oldOk || nStroke.getMiterLimit() != oStroke.getMiterLimit()) + if (!oldOk || nStroke.getMiterLimit() != oStroke.getMiterLimit()) { cb.setMiterLimit(nStroke.getMiterLimit()); + } boolean makeDash; if (oldOk) { if (nStroke.getDashArray() != null) { if (nStroke.getDashPhase() != oStroke.getDashPhase()) { makeDash = true; + } else { + makeDash = !java.util.Arrays.equals(nStroke.getDashArray(), oStroke.getDashArray()); } - else makeDash = !java.util.Arrays.equals(nStroke.getDashArray(), oStroke.getDashArray()); + } else { + makeDash = oStroke.getDashArray() != null; } - else makeDash = oStroke.getDashArray() != null; - } - else { + } else { makeDash = true; } if (makeDash) { float[] dash = nStroke.getDashArray(); - if (dash == null) + if (dash == null) { cb.setLiteral("[]0 d\n"); - else { + } else { cb.setLiteral('['); int lim = dash.length; for (float dash1 : dash) { @@ -773,36 +716,25 @@ private void setStrokeDiff(Stroke newStroke, Stroke oldStroke) { } } } - - /** - * @see Graphics2D#setStroke(Stroke) - */ - public void setStroke(Stroke s) { - originalStroke = s; - this.stroke = transformStroke(s); - } - - + /** * Sets a rendering hint + * * @param arg0 the Key * @param arg1 the Object to associate to it */ public void setRenderingHint(Key arg0, Object arg1) { - if (arg1 != null) { - rhints.put(arg0, arg1); - } else { - if (arg0 instanceof HyperLinkKey) - { - rhints.put(arg0, HyperLinkKey.VALUE_HYPERLINKKEY_OFF); - } - else - { - rhints.remove(arg0); - } - } - } - + if (arg1 != null) { + rhints.put(arg0, arg1); + } else { + if (arg0 instanceof HyperLinkKey) { + rhints.put(arg0, HyperLinkKey.VALUE_HYPERLINKKEY_OFF); + } else { + rhints.remove(arg0); + } + } + } + /** * @param arg0 a key * @return the rendering hint @@ -810,57 +742,57 @@ public void setRenderingHint(Key arg0, Object arg1) { public Object getRenderingHint(Key arg0) { return rhints.get(arg0); } - - /** - * @see Graphics2D#setRenderingHints(Map) - */ - public void setRenderingHints(Map hints) { - rhints.clear(); - rhints.putAll(hints); - } - + /** * @see Graphics2D#addRenderingHints(Map) */ public void addRenderingHints(Map hints) { rhints.putAll(hints); } - + /** * @see Graphics2D#getRenderingHints() */ public RenderingHints getRenderingHints() { return rhints; } - + + /** + * @see Graphics2D#setRenderingHints(Map) + */ + public void setRenderingHints(Map hints) { + rhints.clear(); + rhints.putAll(hints); + } + /** * @see Graphics#translate(int, int) */ public void translate(int x, int y) { - translate((double)x, (double)y); + translate((double) x, (double) y); } - + /** * @see Graphics2D#translate(double, double) */ public void translate(double tx, double ty) { - transform.translate(tx,ty); + transform.translate(tx, ty); } - + /** * @see Graphics2D#rotate(double) */ public void rotate(double theta) { transform.rotate(theta); } - + /** * @see Graphics2D#rotate(double, double, double) */ public void rotate(double theta, double x, double y) { transform.rotate(theta, x, y); } - + /** * @see Graphics2D#scale(double, double) */ @@ -868,14 +800,14 @@ public void scale(double sx, double sy) { transform.scale(sx, sy); this.stroke = transformStroke(originalStroke); } - + /** * @see Graphics2D#shear(double, double) */ public void shear(double shx, double shy) { transform.shear(shx, shy); } - + /** * @see Graphics2D#transform(AffineTransform) */ @@ -883,7 +815,14 @@ public void transform(AffineTransform tx) { transform.concatenate(tx); this.stroke = transformStroke(originalStroke); } - + + /** + * @see Graphics2D#getTransform() + */ + public AffineTransform getTransform() { + return new AffineTransform(transform); + } + /** * @see Graphics2D#setTransform(AffineTransform) */ @@ -891,16 +830,10 @@ public void setTransform(AffineTransform t) { transform = new AffineTransform(t); this.stroke = transformStroke(originalStroke); } - - /** - * @see Graphics2D#getTransform() - */ - public AffineTransform getTransform() { - return new AffineTransform(transform); - } - + /** * Method contributed by Alexej Suchov + * * @see Graphics2D#getPaint() */ public Paint getPaint() { @@ -910,51 +843,116 @@ public Paint getPaint() { return paint; } } - + + /** + * Method contributed by Alexej Suchov + * + * @see Graphics2D#setPaint(Paint) + */ + public void setPaint(Paint paint) { + if (paint == null) { + return; + } + this.paint = paint; + realPaint = paint; + + if ((composite instanceof AlphaComposite) && (paint instanceof Color)) { + + AlphaComposite co = (AlphaComposite) composite; + + if (co.getRule() == 3) { + Color c = (Color) paint; + this.paint = new Color(c.getRed(), c.getGreen(), c.getBlue(), (int) (c.getAlpha() * alpha)); + realPaint = paint; + } + } + + } + /** * @see Graphics2D#getComposite() */ public Composite getComposite() { return composite; } - + /** - * @see Graphics2D#setBackground(Color) + * Method contributed by Alexej Suchov + * + * @see Graphics2D#setComposite(Composite) */ - public void setBackground(Color color) { - background = color; + public void setComposite(Composite comp) { + + if (comp instanceof AlphaComposite) { + + AlphaComposite composite = (AlphaComposite) comp; + + if (composite.getRule() == 3) { + + alpha = composite.getAlpha(); + this.composite = composite; + + if (realPaint != null && (realPaint instanceof Color)) { + + Color c = (Color) realPaint; + paint = new Color(c.getRed(), c.getGreen(), c.getBlue(), + (int) (c.getAlpha() * alpha)); + } + return; + } + } + + this.composite = comp; + alpha = 1.0F; + } - + /** * @see Graphics2D#getBackground() */ public Color getBackground() { return background; } - + + /** + * @see Graphics2D#setBackground(Color) + */ + public void setBackground(Color color) { + background = color; + } + /** * @see Graphics2D#getStroke() */ public Stroke getStroke() { return originalStroke; } - - + + /** + * @see Graphics2D#setStroke(Stroke) + */ + public void setStroke(Stroke s) { + originalStroke = s; + this.stroke = transformStroke(s); + } + /** * @see Graphics2D#getFontRenderContext() */ public FontRenderContext getFontRenderContext() { - boolean antialias = RenderingHints.VALUE_TEXT_ANTIALIAS_ON.equals(getRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING)); - boolean fractions = RenderingHints.VALUE_FRACTIONALMETRICS_ON.equals(getRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS)); + boolean antialias = RenderingHints.VALUE_TEXT_ANTIALIAS_ON.equals( + getRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING)); + boolean fractions = RenderingHints.VALUE_FRACTIONALMETRICS_ON.equals( + getRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS)); return new FontRenderContext(new AffineTransform(), antialias, fractions); } - + /** * @see Graphics#create() */ public Graphics create() { PdfGraphics2D g2 = new PdfGraphics2D(); - g2.rhints.putAll( this.rhints ); + g2.rhints.putAll(this.rhints); g2.onlyShapes = this.onlyShapes; g2.transform = new AffineTransform(this.transform); g2.baseFonts = this.baseFonts; @@ -974,65 +972,70 @@ public Graphics create() { g2.width = this.width; g2.height = this.height; g2.followPath(new Area(new Rectangle2D.Float(0, 0, width, height)), CLIP); - if (this.clip != null) + if (this.clip != null) { g2.clip = new Area(this.clip); + } g2.composite = composite; g2.stroke = stroke; g2.originalStroke = originalStroke; - g2.strokeOne = (BasicStroke)g2.transformStroke(g2.strokeOne); + g2.strokeOne = (BasicStroke) g2.transformStroke(g2.strokeOne); g2.oldStroke = g2.strokeOne; g2.setStrokeDiff(g2.oldStroke, null); g2.cb.saveState(); - if (g2.clip != null) + if (g2.clip != null) { g2.followPath(g2.clip, CLIP); + } g2.kid = true; - if (this.kids == null) + if (this.kids == null) { this.kids = new ArrayList<>(); + } this.kids.add(cb.getInternalBuffer().size()); this.kids.add(g2); return g2; } - + public PdfContentByte getContent() { return this.cb; } + /** * @see Graphics#getColor() */ public Color getColor() { if (paint instanceof Color) { - return (Color)paint; + return (Color) paint; } else { return Color.black; } } - + /** * @see Graphics#setColor(Color) */ public void setColor(Color color) { setPaint(color); } - + /** * @see Graphics#setPaintMode() */ - public void setPaintMode() {} - + public void setPaintMode() { + } + /** * @see Graphics#setXORMode(Color) */ public void setXORMode(Color c1) { - + } - + /** * @see Graphics#getFont() */ public Font getFont() { return font; } - + /** * @see Graphics#setFont(Font) */ @@ -1040,19 +1043,21 @@ public Font getFont() { * Sets the current font. */ public void setFont(Font f) { - if (f == null) + if (f == null) { return; + } if (onlyShapes) { font = f; return; } - if (f == font) + if (f == font) { return; + } font = f; fontSize = f.getSize2D(); baseFont = getCachedBaseFont(f); } - + private BaseFont getCachedBaseFont(Font f) { synchronized (baseFonts) { BaseFont bf = baseFonts.get(f.getFontName()); @@ -1063,39 +1068,40 @@ private BaseFont getCachedBaseFont(Font f) { return bf; } } - + /** * @see Graphics#getFontMetrics(Font) */ public FontMetrics getFontMetrics(Font f) { return dg2.getFontMetrics(f); } - + /** * @see Graphics#getClipBounds() */ public Rectangle getClipBounds() { - if (clip == null) + if (clip == null) { return null; + } return getClip().getBounds(); } - + /** * @see Graphics#clipRect(int, int, int, int) */ public void clipRect(int x, int y, int width, int height) { - Rectangle2D rect = new Rectangle2D.Double(x,y,width,height); + Rectangle2D rect = new Rectangle2D.Double(x, y, width, height); clip(rect); } - + /** * @see Graphics#setClip(int, int, int, int) */ public void setClip(int x, int y, int width, int height) { - Rectangle2D rect = new Rectangle2D.Double(x,y,width,height); + Rectangle2D rect = new Rectangle2D.Double(x, y, width, height); setClip(rect); } - + /** * @see Graphics2D#clip(Shape) */ @@ -1105,37 +1111,37 @@ public void clip(Shape s) { return; } s = transform.createTransformedShape(s); - if (clip == null) + if (clip == null) { clip = new Area(s); - else + } else { clip.intersect(new Area(s)); + } followPath(s, CLIP); } - + /** * @see Graphics#getClip() */ public Shape getClip() { try { return transform.createInverse().createTransformedShape(clip); - } - catch (NoninvertibleTransformException e) { + } catch (NoninvertibleTransformException e) { return null; } } - + /** * @see Graphics#setClip(Shape) */ public void setClip(Shape s) { cb.restoreState(); cb.saveState(); - if (s != null) + if (s != null) { s = transform.createTransformedShape(s); + } if (s == null) { clip = null; - } - else { + } else { clip = new Area(s); followPath(s, CLIP); } @@ -1143,14 +1149,14 @@ public void setClip(Shape s) { currentFillGState = currentStrokeGState = -1; oldStroke = strokeOne; } - + /** * @see Graphics#copyArea(int, int, int, int, int, int) */ public void copyArea(int x, int y, int width, int height, int dx, int dy) { - + } - + /** * @see Graphics#drawLine(int, int, int, int) */ @@ -1158,47 +1164,47 @@ public void drawLine(int x1, int y1, int x2, int y2) { Line2D line = new Line2D.Double(x1, y1, x2, y2); draw(line); } - + /** * @see Graphics#fillRect(int, int, int, int) */ public void drawRect(int x, int y, int width, int height) { draw(new Rectangle(x, y, width, height)); } - + /** * @see Graphics#fillRect(int, int, int, int) */ public void fillRect(int x, int y, int width, int height) { - fill(new Rectangle(x,y,width,height)); + fill(new Rectangle(x, y, width, height)); } - + /** * @see Graphics#clearRect(int, int, int, int) */ public void clearRect(int x, int y, int width, int height) { Paint temp = paint; setPaint(background); - fillRect(x,y,width,height); + fillRect(x, y, width, height); setPaint(temp); } - + /** * @see Graphics#drawRoundRect(int, int, int, int, int, int) */ public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) { - RoundRectangle2D rect = new RoundRectangle2D.Double(x,y,width,height,arcWidth, arcHeight); + RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, arcWidth, arcHeight); draw(rect); } - + /** * @see Graphics#fillRoundRect(int, int, int, int, int, int) */ public void fillRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) { - RoundRectangle2D rect = new RoundRectangle2D.Double(x,y,width,height,arcWidth, arcHeight); + RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, arcWidth, arcHeight); fill(rect); } - + /** * @see Graphics#drawOval(int, int, int, int) */ @@ -1206,7 +1212,7 @@ public void drawOval(int x, int y, int width, int height) { Ellipse2D oval = new Ellipse2D.Float(x, y, width, height); draw(oval); } - + /** * @see Graphics#fillOval(int, int, int, int) */ @@ -1214,24 +1220,24 @@ public void fillOval(int x, int y, int width, int height) { Ellipse2D oval = new Ellipse2D.Float(x, y, width, height); fill(oval); } - + /** * @see Graphics#drawArc(int, int, int, int, int, int) */ public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) { - Arc2D arc = new Arc2D.Double(x,y,width,height,startAngle, arcAngle, Arc2D.OPEN); + Arc2D arc = new Arc2D.Double(x, y, width, height, startAngle, arcAngle, Arc2D.OPEN); draw(arc); } - + /** * @see Graphics#fillArc(int, int, int, int, int, int) */ public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) { - Arc2D arc = new Arc2D.Double(x,y,width,height,startAngle, arcAngle, Arc2D.PIE); + Arc2D arc = new Arc2D.Double(x, y, width, height, startAngle, arcAngle, Arc2D.PIE); fill(arc); } - + /** * @see Graphics#drawPolyline(int[], int[], int) */ @@ -1239,7 +1245,7 @@ public void drawPolyline(int[] x, int[] y, int nPoints) { PolylineShape polyline = new PolylineShape(x, y, nPoints); draw(polyline); } - + /** * @see Graphics#drawPolygon(int[], int[], int) */ @@ -1247,7 +1253,7 @@ public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) { Polygon poly = new Polygon(xPoints, yPoints, nPoints); draw(poly); } - + /** * @see Graphics#fillPolygon(int[], int[], int) */ @@ -1258,21 +1264,21 @@ public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) { } fill(poly); } - + /** * @see Graphics#drawImage(Image, int, int, ImageObserver) */ public boolean drawImage(Image img, int x, int y, ImageObserver observer) { return drawImage(img, x, y, null, observer); } - + /** * @see Graphics#drawImage(Image, int, int, int, int, ImageObserver) */ public boolean drawImage(Image img, int x, int y, int width, int height, ImageObserver observer) { return drawImage(img, x, y, width, height, null, observer); } - + /** * @see Graphics#drawImage(Image, int, int, Color, ImageObserver) */ @@ -1280,61 +1286,67 @@ public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver o waitForImage(img); return drawImage(img, x, y, img.getWidth(observer), img.getHeight(observer), bgcolor, observer); } - + /** * @see Graphics#drawImage(Image, int, int, int, int, Color, ImageObserver) */ public boolean drawImage(Image img, int x, int y, int width, int height, Color bgcolor, ImageObserver observer) { waitForImage(img); - double scalex = width/(double)img.getWidth(observer); - double scaley = height/(double)img.getHeight(observer); - AffineTransform tx = AffineTransform.getTranslateInstance(x,y); - tx.scale(scalex,scaley); + double scalex = width / (double) img.getWidth(observer); + double scaley = height / (double) img.getHeight(observer); + AffineTransform tx = AffineTransform.getTranslateInstance(x, y); + tx.scale(scalex, scaley); return drawImage(img, null, tx, bgcolor, observer); } - + /** * @see Graphics#drawImage(Image, int, int, int, int, int, int, int, int, ImageObserver) */ - public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, ImageObserver observer) { + public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, + ImageObserver observer) { return drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null, observer); } - + /** * @see Graphics#drawImage(Image, int, int, int, int, int, int, int, int, Color, ImageObserver) */ - public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, Color bgcolor, ImageObserver observer) { + public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer) { waitForImage(img); - double dwidth = (double)dx2-dx1; - double dheight = (double)dy2-dy1; - double swidth = (double)sx2-sx1; - double sheight = (double)sy2-sy1; - + double dwidth = (double) dx2 - dx1; + double dheight = (double) dy2 - dy1; + double swidth = (double) sx2 - sx1; + double sheight = (double) sy2 - sy1; + //if either width or height is 0, then there is nothing to draw - if (dwidth == 0 || dheight == 0 || swidth == 0 || sheight == 0) return true; - - double scalex = dwidth/swidth; - double scaley = dheight/sheight; - - double transx = sx1*scalex; - double transy = sy1*scaley; - AffineTransform tx = AffineTransform.getTranslateInstance(dx1-transx,dy1-transy); - tx.scale(scalex,scaley); - - BufferedImage mask = new BufferedImage(img.getWidth(observer), img.getHeight(observer), BufferedImage.TYPE_BYTE_BINARY); + if (dwidth == 0 || dheight == 0 || swidth == 0 || sheight == 0) { + return true; + } + + double scalex = dwidth / swidth; + double scaley = dheight / sheight; + + double transx = sx1 * scalex; + double transy = sy1 * scaley; + AffineTransform tx = AffineTransform.getTranslateInstance(dx1 - transx, dy1 - transy); + tx.scale(scalex, scaley); + + BufferedImage mask = new BufferedImage(img.getWidth(observer), img.getHeight(observer), + BufferedImage.TYPE_BYTE_BINARY); Graphics g = mask.getGraphics(); - g.fillRect(sx1,sy1, (int)swidth, (int)sheight); + g.fillRect(sx1, sy1, (int) swidth, (int) sheight); drawImage(img, mask, tx, null, observer); g.dispose(); return true; } - + /** * @see Graphics#dispose() */ public void dispose() { - if (kid) + if (kid) { return; + } if (!disposeCalled) { disposeCalled = true; cb.restoreState(); @@ -1350,7 +1362,7 @@ public void dispose() { } } } - + private void internalDispose(ByteBuffer buf) { int last = 0; int pos = 0; @@ -1358,7 +1370,7 @@ private void internalDispose(ByteBuffer buf) { if (kids != null) { for (int k = 0; k < kids.size(); k += 2) { pos = (Integer) kids.get(k); - PdfGraphics2D g2 = (PdfGraphics2D)kids.get(k + 1); + PdfGraphics2D g2 = (PdfGraphics2D) kids.get(k + 1); g2.cb.restoreState(); g2.cb.restoreState(); buf.append(buf2.getBuffer(), last, pos - last); @@ -1370,7 +1382,7 @@ private void internalDispose(ByteBuffer buf) { } buf.append(buf2.getBuffer(), last, buf2.size() - last); } - + /////////////////////////////////////////////// // // @@ -1379,7 +1391,9 @@ private void internalDispose(ByteBuffer buf) { // /** - * Enables/Disables the composite font drawer due to issues with custom font mappers that do not always default to one specific font but allow custom fonts. + * Enables/Disables the composite font drawer due to issues with custom font mappers that do not always default to + * one specific font but allow custom fonts. + * * @param compositeFontDrawerEnabled true if the composite font drawer should be used else false. */ public void setCompositeFontDrawerEnabled(boolean compositeFontDrawerEnabled) { @@ -1387,33 +1401,36 @@ public void setCompositeFontDrawerEnabled(boolean compositeFontDrawerEnabled) { } private void followPath(Shape s, int drawType) { - if (s==null) return; - if (drawType==STROKE) { + if (s == null) { + return; + } + if (drawType == STROKE) { if (!(stroke instanceof BasicStroke)) { s = stroke.createStrokedShape(s); followPath(s, FILL); return; } } - if (drawType==STROKE) { + if (drawType == STROKE) { setStrokeDiff(stroke, oldStroke); oldStroke = stroke; setStrokePaint(); - } - else if (drawType==FILL) + } else if (drawType == FILL) { setFillPaint(); + } PathIterator points; int traces = 0; - if (drawType == CLIP) + if (drawType == CLIP) { points = s.getPathIterator(IDENTITY); - else + } else { points = s.getPathIterator(transform); + } float[] coords = new float[6]; - while(!points.isDone()) { + while (!points.isDone()) { ++traces; int segtype = points.currentSegment(coords); normalizeY(coords); - switch(segtype) { + switch (segtype) { case PathIterator.SEG_CLOSE: cb.closePath(); break; @@ -1437,63 +1454,68 @@ else if (drawType==FILL) points.next(); } switch (drawType) { - case FILL: - if (traces > 0) { - if (points.getWindingRule() == PathIterator.WIND_EVEN_ODD) - cb.eoFill(); - else - cb.fill(); - } - break; - case STROKE: - if (traces > 0) - cb.stroke(); - break; - default: //drawType==CLIP - if (traces == 0) - cb.rectangle(0, 0, 0, 0); - if (points.getWindingRule() == PathIterator.WIND_EVEN_ODD) - cb.eoClip(); - else - cb.clip(); - cb.newPath(); - } - } - + case FILL: + if (traces > 0) { + if (points.getWindingRule() == PathIterator.WIND_EVEN_ODD) { + cb.eoFill(); + } else { + cb.fill(); + } + } + break; + case STROKE: + if (traces > 0) { + cb.stroke(); + } + break; + default: //drawType==CLIP + if (traces == 0) { + cb.rectangle(0, 0, 0, 0); + } + if (points.getWindingRule() == PathIterator.WIND_EVEN_ODD) { + cb.eoClip(); + } else { + cb.clip(); + } + cb.newPath(); + } + } + private float normalizeY(float y) { return this.height - y; } - + private void normalizeY(float[] coords) { coords[1] = normalizeY(coords[1]); coords[3] = normalizeY(coords[3]); coords[5] = normalizeY(coords[5]); } - + private AffineTransform normalizeMatrix() { double[] mx = new double[6]; - AffineTransform result = AffineTransform.getTranslateInstance(0,0); + AffineTransform result = AffineTransform.getTranslateInstance(0, 0); result.getMatrix(mx); - mx[3]=-1; - mx[5]=height; + mx[3] = -1; + mx[5] = height; result = new AffineTransform(mx); result.concatenate(transform); return result; } - + private boolean drawImage(Image img, Image mask, AffineTransform xform, Color bgColor, ImageObserver obs) { - if (xform==null) + if (xform == null) { xform = new AffineTransform(); - else + } else { xform = new AffineTransform(xform); + } xform.translate(0, img.getHeight(obs)); xform.scale(img.getWidth(obs), img.getHeight(obs)); - + AffineTransform inverse = this.normalizeMatrix(); - AffineTransform flipper = AffineTransform.getScaleInstance(1,-1); + AffineTransform flipper = AffineTransform.getScaleInstance(1, -1); inverse.concatenate(xform); inverse.concatenate(flipper); - + double[] mx = new double[6]; inverse.getMatrix(mx); if (currentFillGState != 255) { @@ -1505,18 +1527,18 @@ private boolean drawImage(Image img, Image mask, AffineTransform xform, Color bg } cb.setGState(gs); } - + try { com.lowagie.text.Image image = null; - if(!convertImagesToJPEG){ + if (!convertImagesToJPEG) { image = com.lowagie.text.Image.getInstance(img, bgColor); - } - else{ - BufferedImage scaled = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_RGB); + } else { + BufferedImage scaled = new BufferedImage(img.getWidth(null), img.getHeight(null), + BufferedImage.TYPE_INT_RGB); Graphics2D g3 = scaled.createGraphics(); g3.drawImage(img, 0, 0, img.getWidth(null), img.getHeight(null), null); g3.dispose(); - + ByteArrayOutputStream baos = new ByteArrayOutputStream(); ImageWriteParam iwparam = new JPEGImageWriteParam(Locale.getDefault()); iwparam.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); @@ -1531,19 +1553,20 @@ private boolean drawImage(Image img, Image mask, AffineTransform xform, Color bg scaled.flush(); scaled = null; image = com.lowagie.text.Image.getInstance(baos.toByteArray()); - + } - if (mask!=null) { + if (mask != null) { com.lowagie.text.Image msk = com.lowagie.text.Image.getInstance(mask, null, true); msk.makeMask(); msk.setInverted(true); image.setImageMask(msk); } - cb.addImage(image, (float)mx[0], (float)mx[1], (float)mx[2], (float)mx[3], (float)mx[4], (float)mx[5]); + cb.addImage(image, (float) mx[0], (float) mx[1], (float) mx[2], (float) mx[3], (float) mx[4], + (float) mx[5]); Object url = getRenderingHint(HyperLinkKey.KEY_INSTANCE); if (url != null && !url.equals(HyperLinkKey.VALUE_HYPERLINKKEY_OFF)) { - PdfAction action = new PdfAction(url.toString()); - cb.setAction(action, (float)mx[4], (float)mx[5], (float)(mx[0]+mx[4]), (float)(mx[3]+mx[5])); + PdfAction action = new PdfAction(url.toString()); + cb.setAction(action, (float) mx[4], (float) mx[5], (float) (mx[0] + mx[4]), (float) (mx[3] + mx[5])); } } catch (Exception ex) { throw new IllegalArgumentException(); @@ -1551,33 +1574,34 @@ private boolean drawImage(Image img, Image mask, AffineTransform xform, Color bg if (currentFillGState != 255 && currentFillGState != -1) { PdfGState gs = fillGState[currentFillGState]; cb.setGState(gs); - } + } return true; } - + private boolean checkNewPaint(Paint oldPaint) { - if (paint == oldPaint) + if (paint == oldPaint) { return false; + } return !((paint instanceof Color) && paint.equals(oldPaint)); } - + private void setFillPaint() { if (checkNewPaint(paintFill)) { paintFill = paint; setPaint(false, 0, 0, true); } } - + private void setStrokePaint() { if (checkNewPaint(paintStroke)) { paintStroke = paint; setPaint(false, 0, 0, false); } } - + private void setPaint(boolean invert, double xoffset, double yoffset, boolean fill) { if (paint instanceof Color) { - Color color = (Color)paint; + Color color = (Color) paint; int alpha = color.getAlpha(); if (fill) { if (alpha != currentFillGState) { @@ -1591,8 +1615,7 @@ private void setPaint(boolean invert, double xoffset, double yoffset, boolean fi cb.setGState(gs); } cb.setColorFill(color); - } - else { + } else { if (alpha != currentStrokeGState) { currentStrokeGState = alpha; PdfGState gs = strokeGState[alpha]; @@ -1605,25 +1628,25 @@ private void setPaint(boolean invert, double xoffset, double yoffset, boolean fi } cb.setColorStroke(color); } - } - else if (paint instanceof GradientPaint) { - GradientPaint gp = (GradientPaint)paint; + } else if (paint instanceof GradientPaint) { + GradientPaint gp = (GradientPaint) paint; Point2D p1 = gp.getPoint1(); transform.transform(p1, p1); Point2D p2 = gp.getPoint2(); transform.transform(p2, p2); Color c1 = gp.getColor1(); Color c2 = gp.getColor2(); - PdfShading shading = PdfShading.simpleAxial(cb.getPdfWriter(), (float)p1.getX(), normalizeY((float)p1.getY()), (float)p2.getX(), normalizeY((float)p2.getY()), c1, c2); + PdfShading shading = PdfShading.simpleAxial(cb.getPdfWriter(), (float) p1.getX(), + normalizeY((float) p1.getY()), (float) p2.getX(), normalizeY((float) p2.getY()), c1, c2); PdfShadingPattern pat = new PdfShadingPattern(shading); - if (fill) + if (fill) { cb.setShadingFill(pat); - else + } else { cb.setShadingStroke(pat); - } - else if (paint instanceof TexturePaint) { + } + } else if (paint instanceof TexturePaint) { try { - TexturePaint tp = (TexturePaint)paint; + TexturePaint tp = (TexturePaint) paint; BufferedImage img = tp.getImage(); Rectangle2D rect = tp.getAnchorRect(); com.lowagie.text.Image image = com.lowagie.text.Image.getInstance(img, null); @@ -1633,50 +1656,52 @@ else if (paint instanceof TexturePaint) { inverse.scale(rect.getWidth() / image.getWidth(), -rect.getHeight() / image.getHeight()); double[] mx = new double[6]; inverse.getMatrix(mx); - pattern.setPatternMatrix((float)mx[0], (float)mx[1], (float)mx[2], (float)mx[3], (float)mx[4], (float)mx[5]) ; - image.setAbsolutePosition(0,0); + pattern.setPatternMatrix((float) mx[0], (float) mx[1], (float) mx[2], (float) mx[3], (float) mx[4], + (float) mx[5]); + image.setAbsolutePosition(0, 0); pattern.addImage(image); - if (fill) + if (fill) { cb.setPatternFill(pattern); - else + } else { cb.setPatternStroke(pattern); + } } catch (Exception ex) { - if (fill) + if (fill) { cb.setColorFill(Color.gray); - else + } else { cb.setColorStroke(Color.gray); + } } - } - else { + } else { try { BufferedImage img = null; int type = BufferedImage.TYPE_4BYTE_ABGR; if (paint.getTransparency() == Transparency.OPAQUE) { type = BufferedImage.TYPE_3BYTE_BGR; } - img = new BufferedImage((int)width, (int)height, type); - Graphics2D g = (Graphics2D)img.getGraphics(); + img = new BufferedImage((int) width, (int) height, type); + Graphics2D g = (Graphics2D) img.getGraphics(); g.transform(transform); AffineTransform inv = transform.createInverse(); - Shape fillRect = new Rectangle2D.Double(0,0,img.getWidth(),img.getHeight()); + Shape fillRect = new Rectangle2D.Double(0, 0, img.getWidth(), img.getHeight()); fillRect = inv.createTransformedShape(fillRect); g.setPaint(paint); g.fill(fillRect); if (invert) { AffineTransform tx = new AffineTransform(); - tx.scale(1,-1); - tx.translate(-xoffset,-yoffset); - g.drawImage(img,tx,null); + tx.scale(1, -1); + tx.translate(-xoffset, -yoffset); + g.drawImage(img, tx, null); } g.dispose(); g = null; com.lowagie.text.Image image = com.lowagie.text.Image.getInstance(img, null); PdfPatternPainter pattern = cb.createPattern(width, height); - image.setAbsolutePosition(0,0); + image.setAbsolutePosition(0, 0); pattern.addImage(image); if (fill) { - if (currentFillGState != 255){ + if (currentFillGState != 255) { currentFillGState = 255; PdfGState gs = fillGState[255]; if (gs == null) { @@ -1687,40 +1712,38 @@ else if (paint instanceof TexturePaint) { cb.setGState(gs); } cb.setPatternFill(pattern); - } - else { + } else { cb.setPatternStroke(pattern); } } catch (Exception ex) { - if (fill) + if (fill) { cb.setColorFill(Color.gray); - else + } else { cb.setColorStroke(Color.gray); + } } } } - + private synchronized void waitForImage(java.awt.Image image) { - if (mediaTracker == null) + if (mediaTracker == null) { mediaTracker = new MediaTracker(new PdfGraphics2D.FakeComponent()); + } mediaTracker.addImage(image, 0); try { mediaTracker.waitForID(0); - } - catch (InterruptedException e) { + } catch (InterruptedException e) { // empty on purpose } mediaTracker.removeImage(image); } /** - * Split the given string into substrings depending on if all characters of substring can be - * displayed with the defined font or not. + * Split the given string into substrings depending on if all characters of substring can be displayed with the + * defined font or not. * - * @param s - * given string + * @param s given string * @return list of substrings that can be displayed by with the defined font or not. - * */ private List splitIntoSubstringsByVisibility(String s) { List stringParts = new ArrayList<>(); @@ -1740,7 +1763,7 @@ private List splitIntoSubstringsByVisibility(String s) { return stringParts; } - + static private class FakeComponent extends Component { private static final long serialVersionUID = 6450197945596086638L; @@ -1749,70 +1772,59 @@ static private class FakeComponent extends Component { /** * @since 2.0.8 */ - public static class HyperLinkKey extends RenderingHints.Key - { - public static final HyperLinkKey KEY_INSTANCE = new HyperLinkKey(9999); - public static final Object VALUE_HYPERLINKKEY_OFF = "0"; - + public static class HyperLinkKey extends RenderingHints.Key { + + public static final HyperLinkKey KEY_INSTANCE = new HyperLinkKey(9999); + public static final Object VALUE_HYPERLINKKEY_OFF = "0"; + protected HyperLinkKey(int arg0) { super(arg0); } - - public boolean isCompatibleValue(Object val) - { + + public boolean isCompatibleValue(Object val) { return true; } - public String toString() - { + + public String toString() { return "HyperLinkKey"; } } /** - * Wrapper class that helps to draw string with sun.font.CompositeFont (Windows logical - * fonts).
      - * If the given font is a sun.font.CompositeFont than try to find some font (an implementation - * of sun.font.Font2D) that will display current text. For some symbols that cannot be displayed - * with the font from the first slot of the composite font all other font will be checked.
      + * Wrapper class that helps to draw string with sun.font.CompositeFont (Windows logical fonts).
      If the given + * font is a sun.font.CompositeFont than try to find some font (an implementation of sun.font.Font2D) that will + * display current text. For some symbols that cannot be displayed with the font from the first slot of the + * composite font all other font will be checked.
      *
      - * This processing is not necessary only for Mac OS - there isn't used "sun.font.CompositeFont", - * but "sun.font.CFont".
      + * This processing is not necessary only for Mac OS - there isn't used "sun.font.CompositeFont", but + * "sun.font.CFont".
      *
      - * Since the sun.* packages are not part of the supported, public interface the - * reflection will be used. - */ - private static class CompositeFontDrawer - { - - static boolean isSupported() { - return SUPPORTED; - } - - private static final String GET_MODULE_METHOD_NAME = "getModule"; - private static final String IS_OPEN_METHOD_NAME = "isOpen"; - private static final String ADD_OPENS_METHOD_NAME = "addOpens"; - - private static final String COMPOSITE_FONT_CLASS_NAME = "sun.font.CompositeFont"; - private static final Class COMPOSITE_FONT_CLASS; - private static final String GET_NUM_SLOTS_METHOD_NAME = "getNumSlots"; - private static final Method GET_NUM_SLOTS_METHOD; - private static final String GET_SLOT_FONT_METHOD_NAME = "getSlotFont"; - private static final Method GET_SLOT_FONT_METHOD; - - private static final String FONT_UTILITIES_CLASS_NAME = "sun.font.FontUtilities"; - private static final Class FONT_UTILITIES_CLASS; - private static final String GET_FONT2D_METHOD_NAME = "getFont2D"; - private static final Method GET_FONT2D_METHOD; - - private static final String FONT2D_CLASS_NAME = "sun.font.Font2D"; - private static final Class FONT2D_CLASS; - private static final String CAN_DISPLAY_METHOD_NAME = "canDisplay"; - private static final Method CAN_DYSPLAY_METHOD; - private static final String GET_FONT_NAME_METHOD_NAME = "getFontName"; - private static final Method GET_FONT_NAME_METHOD; - - private static final boolean SUPPORTED; + * Since the sun.* packages are not part of the supported, public interface the reflection will be + * used. + */ + private static class CompositeFontDrawer { + + private static final String GET_MODULE_METHOD_NAME = "getModule"; + private static final String IS_OPEN_METHOD_NAME = "isOpen"; + private static final String ADD_OPENS_METHOD_NAME = "addOpens"; + private static final String COMPOSITE_FONT_CLASS_NAME = "sun.font.CompositeFont"; + private static final Class COMPOSITE_FONT_CLASS; + private static final String GET_NUM_SLOTS_METHOD_NAME = "getNumSlots"; + private static final Method GET_NUM_SLOTS_METHOD; + private static final String GET_SLOT_FONT_METHOD_NAME = "getSlotFont"; + private static final Method GET_SLOT_FONT_METHOD; + private static final String FONT_UTILITIES_CLASS_NAME = "sun.font.FontUtilities"; + private static final Class FONT_UTILITIES_CLASS; + private static final String GET_FONT2D_METHOD_NAME = "getFont2D"; + private static final Method GET_FONT2D_METHOD; + private static final String FONT2D_CLASS_NAME = "sun.font.Font2D"; + private static final Class FONT2D_CLASS; + private static final String CAN_DISPLAY_METHOD_NAME = "canDisplay"; + private static final Method CAN_DYSPLAY_METHOD; + private static final String GET_FONT_NAME_METHOD_NAME = "getFontName"; + private static final Method GET_FONT_NAME_METHOD; + private static final boolean SUPPORTED; static { String osName = System.getProperty("os.name", "unknownOS"); @@ -1843,14 +1855,27 @@ static boolean isSupported() { GET_SLOT_FONT_METHOD != null && CAN_DYSPLAY_METHOD != null && GET_FONT_NAME_METHOD != null; } + private final transient StringBuilder sb = new StringBuilder(); + /** + * Splitted parts of the string. + */ + private final transient List stringParts = new ArrayList<>(); + /** + * {@link BaseFont Base fonts} that corresponds to the splitted part of the string + */ + private final transient List correspondingBaseFontsForParts = new ArrayList<>(); + private final transient Map fontFamilyComposite = new HashMap<>(); + + static boolean isSupported() { + return SUPPORTED; + } + /** - * Update module of the given class to open the given - * package to the target module if the target module - * is opened for the current module.
      - * This helps to avoid warnings for the --illegal-access=permit. - * Actually (java 9-13) "permit" is default mode, but in the future java - * releases the default mode will be "deny". It's also important to - * add --add-opens for the given package if it's need. + * Update module of the given class to open the given package to the target module if the target module is + * opened for the current module.
      This helps to avoid warnings for the + * --illegal-access=permit. Actually (java 9-13) "permit" is default mode, but in the future java + * releases the default mode will be "deny". It's also important to add --add-opens for the given + * package if it's need. */ private static void updateModuleToOpenPackage(Class classInModule, String packageName) { if (classInModule == null || packageName == null) { @@ -1907,25 +1932,12 @@ private static Method getMethod(Class clazz, String methodName, Class... p return method; } - private final transient StringBuilder sb = new StringBuilder(); - /** - * Splitted parts of the string. - */ - private final transient List stringParts = new ArrayList<>(); - /** - * {@link BaseFont Base fonts} that corresponds to the splitted part of the string - */ - private final transient List correspondingBaseFontsForParts = new ArrayList<>(); - - private final transient Map fontFamilyComposite = new HashMap<>(); - /** * Check if the given font is a composite font. * - * @param font - * given font + * @param font given font * @return true if the given font is sun.font.CompositeFont. False - * otherwise. + * otherwise. */ boolean isCompositeFont(Font font) { if (!isSupported() || font == null) { @@ -1950,29 +1962,23 @@ boolean isCompositeFont(Font font) { } /** - * Draw text with the given font at the specified position. This method splits the string - * into parts so that it can be displayed with a matching (font that can display all symbols - * of this part of string) slot font.
      - * If some class/method cannot be found or throw exception the default drawing string - * function will be used for a drawing string. + * Draw text with the given font at the specified position. This method splits the string into parts so that it + * can be displayed with a matching (font that can display all symbols of this part of string) slot font.
      + * If some class/method cannot be found or throw exception the default drawing string function will be used for + * a drawing string. * - * @param s - * given string that should be drawn - * @param compositeFont - * composite font. This font should be an instance of composite font, otherwise - * the default drawing function will be called. - * @param x - * the x coordinate of the location - * @param y - * the y coordinate of the location - * @param fontConverter - * function that convert {@link java.awt.Font font} to the needed - * {@link com.lowagie.text.pdf.BaseFont base font} - * @param defaultDrawingFunction - * default drawing function that will be used for drawing string. + * @param s given string that should be drawn + * @param compositeFont composite font. This font should be an instance of composite font, otherwise + * the default drawing function will be called. + * @param x the x coordinate of the location + * @param y the y coordinate of the location + * @param fontConverter function that convert {@link java.awt.Font font} to the needed + * {@link com.lowagie.text.pdf.BaseFont base font} + * @param defaultDrawingFunction default drawing function that will be used for drawing string. * @return width of the drawn string. */ - double drawString(String s, Font compositeFont, double x, double y, Function fontConverter, DrawStringFunction defaultDrawingFunction) { + double drawString(String s, Font compositeFont, double x, double y, Function fontConverter, + DrawStringFunction defaultDrawingFunction) { String fontFamily = compositeFont.getFamily(); if (!isSupported() || (fontFamily != null && !fontFamilyComposite.get(fontFamily))) { assert false; @@ -1998,21 +2004,22 @@ boolean isCompositeFont(Font font) { } } - /** - * Split string into visible and not visible parts.
      - * This method split string into substring parts. For each splitted part - * correspond found {@link BaseFont base font} from the slots of the composite - * font witch can display all characters of the part of string. If no font found - * the {@link BaseFont base font} from the own composite font will be used. - * - * @param s - * @param compositeFont - * @param fontConverter - * @throws IllegalAccessException - * @throws IllegalArgumentException - * @throws InvocationTargetException - */ - private void splitStringIntoDisplayableParts(String s, Font compositeFont, Function fontConverter) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException { + /** + * Split string into visible and not visible parts.
      This method split string into substring parts. For each + * splitted part correspond found {@link BaseFont base font} from the slots of the composite font witch can + * display all characters of the part of string. If no font found the {@link BaseFont base font} from the own + * composite font will be used. + * + * @param s + * @param compositeFont + * @param fontConverter + * @throws IllegalAccessException + * @throws IllegalArgumentException + * @throws InvocationTargetException + */ + private void splitStringIntoDisplayableParts(String s, Font compositeFont, + Function fontConverter) + throws IllegalAccessException, IllegalArgumentException, InvocationTargetException { Object result = GET_FONT2D_METHOD.invoke(null, compositeFont); if (result.getClass() != COMPOSITE_FONT_CLASS) { throw new IllegalArgumentException("Given font isn't a composite font."); @@ -2034,13 +2041,14 @@ private void splitStringIntoDisplayableParts(String s, Font compositeFont, Funct } Boolean canBeDysplayedByPhysicalFont = (Boolean) CAN_DYSPLAY_METHOD.invoke(phFont, c); if (canBeDysplayedByPhysicalFont) { - Object fontNameResult = GET_FONT_NAME_METHOD.invoke(phFont, (Locale) null); - Font font = new Font((String) fontNameResult, compositeFont.getStyle(), compositeFont.getSize()); - BaseFont correspondingBaseFont = fontConverter.apply(font); - if (correspondingBaseFont != null && correspondingBaseFont.charExists(c)) { - if (sb.length() == 0) { - correspondingBaseFontsForParts.add(correspondingBaseFont); - lastBaseFont = correspondingBaseFont; + Object fontNameResult = GET_FONT_NAME_METHOD.invoke(phFont, (Locale) null); + Font font = new Font((String) fontNameResult, compositeFont.getStyle(), + compositeFont.getSize()); + BaseFont correspondingBaseFont = fontConverter.apply(font); + if (correspondingBaseFont != null && correspondingBaseFont.charExists(c)) { + if (sb.length() == 0) { + correspondingBaseFontsForParts.add(correspondingBaseFont); + lastBaseFont = correspondingBaseFont; } else if (!Objects.equals(lastBaseFont, correspondingBaseFont)) { stringParts.add(sb.toString()); sb.setLength(0); @@ -2050,13 +2058,13 @@ private void splitStringIntoDisplayableParts(String s, Font compositeFont, Funct sb.append(c); found = true; break; - } + } } } if (!found) { if (sb.length() == 0) { - correspondingBaseFontsForParts.add(baseFontFromCompositeFont); - lastBaseFont = null; + correspondingBaseFontsForParts.add(baseFontFromCompositeFont); + lastBaseFont = null; } else if (lastBaseFont != null) { stringParts.add(sb.toString()); sb.setLength(0); @@ -2071,8 +2079,8 @@ private void splitStringIntoDisplayableParts(String s, Font compositeFont, Funct } @FunctionalInterface - public interface DrawStringFunction - { + public interface DrawStringFunction { + double drawString(String s, BaseFont basicFont, double x, double y); } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfICCBased.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfICCBased.java index 61542644b..751dea76d 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfICCBased.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfICCBased.java @@ -46,34 +46,34 @@ */ package com.lowagie.text.pdf; -import java.awt.color.ICC_Profile; -import com.lowagie.text.error_messages.MessageLocalization; import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.error_messages.MessageLocalization; +import java.awt.color.ICC_Profile; /** * A PdfICCBased defines a ColorSpace * - * @see PdfStream + * @see PdfStream */ public class PdfICCBased extends PdfStream { /** * Creates an ICC stream. - * @param profile an ICC profile + * + * @param profile an ICC profile */ public PdfICCBased(ICC_Profile profile) { this(profile, DEFAULT_COMPRESSION); } - + /** * Creates an ICC stream. * - * @param compressionLevel the compressionLevel - * - * @param profile an ICC profile - * @since 2.1.3 (replacing the constructor without param compressionLevel) + * @param compressionLevel the compressionLevel + * @param profile an ICC profile + * @since 2.1.3 (replacing the constructor without param compressionLevel) */ public PdfICCBased(ICC_Profile profile, int compressionLevel) { super(); @@ -90,7 +90,8 @@ public PdfICCBased(ICC_Profile profile, int compressionLevel) { put(PdfName.ALTERNATE, PdfName.DEVICECMYK); break; default: - throw new PdfException(MessageLocalization.getComposedMessage("1.component.s.is.not.supported", numberOfComponents)); + throw new PdfException(MessageLocalization.getComposedMessage("1.component.s.is.not.supported", + numberOfComponents)); } put(PdfName.N, new PdfNumber(numberOfComponents)); bytes = profile.getData(); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfImage.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfImage.java index 351a96d96..5a7427a05 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfImage.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfImage.java @@ -49,37 +49,38 @@ package com.lowagie.text.pdf; +import com.lowagie.text.Image; +import com.lowagie.text.error_messages.MessageLocalization; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import com.lowagie.text.error_messages.MessageLocalization; - -import com.lowagie.text.Image; /** * PdfImage is a PdfStream containing an image-Dictionary and -stream. */ public class PdfImage extends PdfStream { - + static final int TRANSFERSIZE = 4096; // membervariables - - /** This is the PdfName of the image. */ + + /** + * This is the PdfName of the image. + */ protected PdfName name = null; - + // constructor - + /** * Constructs a PdfImage-object. * - * @param image the Image-object - * @param name the PdfName for this image + * @param image the Image-object + * @param name the PdfName for this image * @param maskRef the PdfIndirectReference * @throws BadPdfFormatException on error */ - + public PdfImage(Image image, String name, PdfIndirectReference maskRef) throws BadPdfFormatException { super(); this.name = new PdfName(name); @@ -87,20 +88,25 @@ public PdfImage(Image image, String name, PdfIndirectReference maskRef) throws B put(PdfName.SUBTYPE, PdfName.IMAGE); put(PdfName.WIDTH, new PdfNumber(image.getWidth())); put(PdfName.HEIGHT, new PdfNumber(image.getHeight())); - if (image.getLayer() != null) + if (image.getLayer() != null) { put(PdfName.OC, image.getLayer().getRef()); - if (image.isMask() && (image.getBpc() == 1 || image.getBpc() > 0xff)) + } + if (image.isMask() && (image.getBpc() == 1 || image.getBpc() > 0xff)) { put(PdfName.IMAGEMASK, PdfBoolean.PDFTRUE); + } if (maskRef != null) { - if (image.isSmask()) + if (image.isSmask()) { put(PdfName.SMASK, maskRef); - else + } else { put(PdfName.MASK, maskRef); + } } - if (image.isMask() && image.isInverted()) + if (image.isMask() && image.isInverted()) { put(PdfName.DECODE, new PdfLiteral("[1 0]")); - if (image.isInterpolation()) + } + if (image.isInterpolation()) { put(PdfName.INTERPOLATE, PdfBoolean.PDFTRUE); + } InputStream is = null; try { // Raw Image data @@ -110,7 +116,9 @@ public PdfImage(Image image, String name, PdfIndirectReference maskRef) throws B int[] transparency = image.getTransparency(); if (transparency != null && !image.isMask() && maskRef == null) { String s = "["; - for (int i : transparency) s += i + " "; + for (int i : transparency) { + s += i + " "; + } s += "]"; put(PdfName.MASK, new PdfLiteral(s)); } @@ -118,53 +126,63 @@ public PdfImage(Image image, String name, PdfIndirectReference maskRef) throws B put(PdfName.LENGTH, new PdfNumber(bytes.length)); int bpc = image.getBpc(); if (bpc > 0xff) { - if (!image.isMask()) + if (!image.isMask()) { put(PdfName.COLORSPACE, PdfName.DEVICEGRAY); + } put(PdfName.BITSPERCOMPONENT, new PdfNumber(1)); put(PdfName.FILTER, PdfName.CCITTFAXDECODE); int k = bpc - Image.CCITTG3_1D; PdfDictionary decodeparms = new PdfDictionary(); - if (k != 0) + if (k != 0) { decodeparms.put(PdfName.K, new PdfNumber(k)); - if ((colorspace & Image.CCITT_BLACKIS1) != 0) + } + if ((colorspace & Image.CCITT_BLACKIS1) != 0) { decodeparms.put(PdfName.BLACKIS1, PdfBoolean.PDFTRUE); - if ((colorspace & Image.CCITT_ENCODEDBYTEALIGN) != 0) + } + if ((colorspace & Image.CCITT_ENCODEDBYTEALIGN) != 0) { decodeparms.put(PdfName.ENCODEDBYTEALIGN, PdfBoolean.PDFTRUE); - if ((colorspace & Image.CCITT_ENDOFLINE) != 0) + } + if ((colorspace & Image.CCITT_ENDOFLINE) != 0) { decodeparms.put(PdfName.ENDOFLINE, PdfBoolean.PDFTRUE); - if ((colorspace & Image.CCITT_ENDOFBLOCK) != 0) + } + if ((colorspace & Image.CCITT_ENDOFBLOCK) != 0) { decodeparms.put(PdfName.ENDOFBLOCK, PdfBoolean.PDFFALSE); + } decodeparms.put(PdfName.COLUMNS, new PdfNumber(image.getWidth())); decodeparms.put(PdfName.ROWS, new PdfNumber(image.getHeight())); put(PdfName.DECODEPARMS, decodeparms); - } - else { - switch(colorspace) { + } else { + switch (colorspace) { case 1: put(PdfName.COLORSPACE, PdfName.DEVICEGRAY); - if (image.isInverted()) + if (image.isInverted()) { put(PdfName.DECODE, new PdfLiteral("[1 0]")); + } break; case 3: put(PdfName.COLORSPACE, PdfName.DEVICERGB); - if (image.isInverted()) + if (image.isInverted()) { put(PdfName.DECODE, new PdfLiteral("[1 0 1 0 1 0]")); + } break; case 4: default: put(PdfName.COLORSPACE, PdfName.DEVICECMYK); - if (image.isInverted()) + if (image.isInverted()) { put(PdfName.DECODE, new PdfLiteral("[1 0 1 0 1 0 1 0]")); + } } PdfDictionary additional = image.getAdditional(); - if (additional != null) + if (additional != null) { putAll(additional); - if (image.isMask() && (image.getBpc() == 1 || image.getBpc() > 8)) + } + if (image.isMask() && (image.getBpc() == 1 || image.getBpc() > 8)) { remove(PdfName.COLORSPACE); + } put(PdfName.BITSPERCOMPONENT, new PdfNumber(image.getBpc())); - if (image.isDeflated()) + if (image.isDeflated()) { put(PdfName.FILTER, PdfName.FLATEDECODE); - else { + } else { flateCompress(image.getCompressionLevel()); } } @@ -172,18 +190,17 @@ public PdfImage(Image image, String name, PdfIndirectReference maskRef) throws B } // GIF, JPEG or PNG String errorID; - if (image.getRawData() == null){ + if (image.getRawData() == null) { is = image.getUrl().openStream(); errorID = image.getUrl().toString(); - } - else{ + } else { is = new java.io.ByteArrayInputStream(image.getRawData()); errorID = "Byte array"; } - switch(image.type()) { + switch (image.type()) { case Image.JPEG: put(PdfName.FILTER, PdfName.DCTDECODE); - switch(image.getColorspace()) { + switch (image.getColorspace()) { case 1: put(PdfName.COLORSPACE, PdfName.DEVICEGRAY); break; @@ -197,7 +214,7 @@ public PdfImage(Image image, String name, PdfIndirectReference maskRef) throws B } } put(PdfName.BITSPERCOMPONENT, new PdfNumber(8)); - if (image.getRawData() != null){ + if (image.getRawData() != null) { bytes = image.getRawData(); put(PdfName.LENGTH, new PdfNumber(bytes.length)); return; @@ -208,7 +225,7 @@ public PdfImage(Image image, String name, PdfIndirectReference maskRef) throws B case Image.JPEG2000: put(PdfName.FILTER, PdfName.JPXDECODE); if (image.getColorspace() > 0) { - switch(image.getColorspace()) { + switch (image.getColorspace()) { case 1: put(PdfName.COLORSPACE, PdfName.DEVICEGRAY); break; @@ -220,7 +237,7 @@ public PdfImage(Image image, String name, PdfIndirectReference maskRef) throws B } put(PdfName.BITSPERCOMPONENT, new PdfNumber(image.getBpc())); } - if (image.getRawData() != null){ + if (image.getRawData() != null) { bytes = image.getRawData(); put(PdfName.LENGTH, new PdfNumber(bytes.length)); return; @@ -232,7 +249,7 @@ public PdfImage(Image image, String name, PdfIndirectReference maskRef) throws B put(PdfName.FILTER, PdfName.JBIG2DECODE); put(PdfName.COLORSPACE, PdfName.DEVICEGRAY); put(PdfName.BITSPERCOMPONENT, new PdfNumber(1)); - if (image.getRawData() != null){ + if (image.getRawData() != null) { bytes = image.getRawData(); put(PdfName.LENGTH, new PdfNumber(bytes.length)); return; @@ -241,49 +258,49 @@ public PdfImage(Image image, String name, PdfIndirectReference maskRef) throws B transferBytes(is, streamBytes, -1); break; default: - throw new BadPdfFormatException(MessageLocalization.getComposedMessage("1.is.an.unknown.image.format", errorID)); + throw new BadPdfFormatException( + MessageLocalization.getComposedMessage("1.is.an.unknown.image.format", errorID)); } put(PdfName.LENGTH, new PdfNumber(streamBytes.size())); - } - catch(IOException ioe) { + } catch (IOException ioe) { throw new BadPdfFormatException(ioe.getMessage()); - } - finally { + } finally { if (is != null) { - try{ + try { is.close(); - } - catch (Exception ee) { + } catch (Exception ee) { // empty on purpose } } } } - - /** - * Returns the PdfName of the image. - * - * @return the name - */ - - public PdfName name() { - return name; - } - + static void transferBytes(InputStream in, OutputStream out, int len) throws IOException { byte[] buffer = new byte[TRANSFERSIZE]; - if (len < 0) + if (len < 0) { len = 0x7fff0000; + } int size; while (len != 0) { size = in.read(buffer, 0, Math.min(len, TRANSFERSIZE)); - if (size < 0) + if (size < 0) { return; + } out.write(buffer, 0, size); len -= size; } } - + + /** + * Returns the PdfName of the image. + * + * @return the name + */ + + public PdfName name() { + return name; + } + protected void importAll(PdfImage dup) { name = dup.name; compressed = dup.compressed; diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfImportedPage.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfImportedPage.java index 9e9cabf3f..268b2172f 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfImportedPage.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfImportedPage.java @@ -48,13 +48,14 @@ */ package com.lowagie.text.pdf; -import java.io.IOException; -import com.lowagie.text.error_messages.MessageLocalization; import com.lowagie.text.DocumentException; import com.lowagie.text.Image; +import com.lowagie.text.error_messages.MessageLocalization; +import java.io.IOException; -/** Represents an imported page. +/** + * Represents an imported page. * * @author Paulo Soares (psoares@consiste.pt) */ @@ -62,7 +63,7 @@ public class PdfImportedPage extends com.lowagie.text.pdf.PdfTemplate { PdfReaderInstance readerInstance; int pageNumber; - + PdfImportedPage(PdfReaderInstance readerInstance, PdfWriter writer, int pageNumber) { this.readerInstance = readerInstance; this.pageNumber = pageNumber; @@ -72,13 +73,13 @@ public class PdfImportedPage extends com.lowagie.text.pdf.PdfTemplate { type = TYPE_IMPORTED; } - /** Reads the content from this PdfImportedPage-object from a reader. + /** + * Reads the content from this PdfImportedPage-object from a reader. * * @return self - * */ public PdfImportedPage getFromReader() { - return this; + return this; } public int getPageNumber() { @@ -86,33 +87,42 @@ public int getPageNumber() { } - /** Always throws an error. This operation is not allowed. + /** + * Always throws an error. This operation is not allowed. + * * @param image dummy - * @param a dummy - * @param b dummy - * @param c dummy - * @param d dummy - * @param e dummy - * @param f dummy - * @throws DocumentException dummy */ + * @param a dummy + * @param b dummy + * @param c dummy + * @param d dummy + * @param e dummy + * @param f dummy + * @throws DocumentException dummy + */ public void addImage(Image image, float a, float b, float c, float d, float e, float f) throws DocumentException { throwError(); } - - /** Always throws an error. This operation is not allowed. + + /** + * Always throws an error. This operation is not allowed. + * * @param template dummy - * @param a dummy - * @param b dummy - * @param c dummy - * @param d dummy - * @param e dummy - * @param f dummy */ + * @param a dummy + * @param b dummy + * @param c dummy + * @param d dummy + * @param e dummy + * @param f dummy + */ public void addTemplate(PdfTemplate template, float a, float b, float c, float d, float e, float f) { throwError(); } - - /** Always throws an error. This operation is not allowed. - * @return dummy */ + + /** + * Always throws an error. This operation is not allowed. + * + * @return dummy + */ public PdfContentByte getDuplicate() { throwError(); return null; @@ -121,46 +131,51 @@ public PdfContentByte getDuplicate() { /** * Gets the stream representing this page. * - * @param compressionLevel the compressionLevel + * @param compressionLevel the compressionLevel * @return the stream representing this page - * @since 2.1.3 (replacing the method without param compressionLevel) + * @since 2.1.3 (replacing the method without param compressionLevel) */ PdfStream getFormXObject(int compressionLevel) throws IOException { - return readerInstance.getFormXObject(pageNumber, compressionLevel); + return readerInstance.getFormXObject(pageNumber, compressionLevel); } - + public void setColorFill(PdfSpotColor sp, float tint) { throwError(); } - + public void setColorStroke(PdfSpotColor sp, float tint) { throwError(); } - + PdfObject getResources() { return readerInstance.getResources(pageNumber); } - - /** Always throws an error. This operation is not allowed. - * @param bf dummy - * @param size dummy */ + + /** + * Always throws an error. This operation is not allowed. + * + * @param bf dummy + * @param size dummy + */ public void setFontAndSize(BaseFont bf, float size) { throwError(); } - + /** * Always throws an error. This operation is not allowed. + * * @param group New value of property group. - * @since 2.1.6 - */ + * @since 2.1.6 + */ public void setGroup(PdfTransparencyGroup group) { throwError(); } void throwError() { - throw new RuntimeException(MessageLocalization.getComposedMessage("content.can.not.be.added.to.a.pdfimportedpage")); + throw new RuntimeException( + MessageLocalization.getComposedMessage("content.can.not.be.added.to.a.pdfimportedpage")); } - + PdfReaderInstance getPdfReaderInstance() { return readerInstance; } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfIndirectObject.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfIndirectObject.java index 519527b97..2493d9b83 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfIndirectObject.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfIndirectObject.java @@ -50,113 +50,114 @@ package com.lowagie.text.pdf; +import com.lowagie.text.DocWriter; import java.io.IOException; import java.io.OutputStream; -import com.lowagie.text.DocWriter; - /** * PdfIndirectObject is the Pdf indirect object. - *

      - * An indirect object is an object that has been labeled so that it can be referenced by - * other objects. Any type of PdfObject may be labeled as an indirect object.
      - * An indirect object consists of an object identifier, a direct object, and the endobj - * keyword. The object identifier consists of an integer object number, an integer + *

      + * An indirect object is an object that has been labeled so that it can be referenced by other objects. Any type + * of PdfObject may be labeled as an indirect object.
      An indirect object consists of an object + * identifier, a direct object, and the endobj keyword. The object identifier consists of an integer + * object number, an integer * generation number, and the obj keyword.
      - * This object is described in the 'Portable Document Format Reference Manual version 1.7' - * section 3.2.9 (page 63-65). + * This object is described in the 'Portable Document Format Reference Manual version 1.7' section 3.2.9 (page 63-65). * - * @see PdfObject - * @see PdfIndirectReference + * @see PdfObject + * @see PdfIndirectReference */ public class PdfIndirectObject { - + // membervariables - -/** The object number */ - protected int number; - -/** the generation number */ - protected int generation = 0; static final byte[] STARTOBJ = DocWriter.getISOBytes(" obj\n"); static final byte[] ENDOBJ = DocWriter.getISOBytes("\nendobj\n"); static final int SIZEOBJ = STARTOBJ.length + ENDOBJ.length; + /** + * The object number + */ + protected int number; + /** + * the generation number + */ + protected int generation = 0; PdfObject object; PdfWriter writer; - + // constructors - -/** - * Constructs a PdfIndirectObject. - * - * @param number the object number - * @param object the direct object - */ - + + /** + * Constructs a PdfIndirectObject. + * + * @param number the object number + * @param object the direct object + */ + PdfIndirectObject(int number, PdfObject object, PdfWriter writer) { this(number, 0, object, writer); } - + PdfIndirectObject(PdfIndirectReference ref, PdfObject object, PdfWriter writer) { - this(ref.getNumber(),ref.getGeneration(),object,writer); + this(ref.getNumber(), ref.getGeneration(), object, writer); } -/** - * Constructs a PdfIndirectObject. - * - * @param number the object number - * @param generation the generation number - * @param object the direct object - */ - + + /** + * Constructs a PdfIndirectObject. + * + * @param number the object number + * @param generation the generation number + * @param object the direct object + */ + PdfIndirectObject(int number, int generation, PdfObject object, PdfWriter writer) { this.writer = writer; this.number = number; this.generation = generation; this.object = object; PdfEncryption crypto = null; - if (writer != null) + if (writer != null) { crypto = writer.getEncryption(); + } if (crypto != null) { crypto.setHashKey(number, generation); } } - + // methods - + /** * Return the length of this PdfIndirectObject. * - * @return the length of the PDF-representation of this indirect object. + * @return the length of the PDF-representation of this indirect object. */ - + // public int length() { // if (isStream) // return bytes.size() + SIZEOBJ + stream.getStreamLength(writer); // else // return bytes.size(); // } - - -/** - * Returns a PdfIndirectReference to this PdfIndirectObject. - * - * @return a PdfIndirectReference - */ - + + + /** + * Returns a PdfIndirectReference to this PdfIndirectObject. + * + * @return a PdfIndirectReference + */ + public PdfIndirectReference getIndirectReference() { return new PdfIndirectReference(object.type(), number, generation); } - -/** - * Writes efficiently to a stream - * - * @param os the stream to write to - * @throws IOException on write error - */ - void writeTo(OutputStream os) throws IOException - { + + /** + * Writes efficiently to a stream + * + * @param os the stream to write to + * @throws IOException on write error + */ + void writeTo(OutputStream os) throws IOException { os.write(DocWriter.getISOBytes(String.valueOf(number))); os.write(' '); os.write(DocWriter.getISOBytes(String.valueOf(generation))); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfIndirectReference.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfIndirectReference.java index 3387822b3..2e7de0cff 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfIndirectReference.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfIndirectReference.java @@ -51,81 +51,83 @@ /** * PdfIndirectReference contains a reference to a PdfIndirectObject. - *

      - * Any object used as an element of an array or as a value in a dictionary may be specified - * by either a direct object of an indirect reference. An indirect reference is a reference - * to an indirect object, and consists of the indirect object's object number, generation number - * and the R keyword.
      - * This object is described in the 'Portable Document Format Reference Manual version 1.3' - * section 4.11 (page 54). + *

      + * Any object used as an element of an array or as a value in a dictionary may be specified by either a direct object of + * an indirect reference. An indirect reference is a reference to an indirect object, and consists of the + * indirect object's object number, generation number and the R keyword.
      This object is described in the + * 'Portable Document Format Reference Manual version 1.3' section 4.11 (page 54). * - * @see PdfObject - * @see PdfIndirectObject + * @see PdfObject + * @see PdfIndirectObject */ public class PdfIndirectReference extends PdfObject { - + // membervariables - -/** the object number */ + + /** + * the object number + */ protected int number; - -/** the generation number */ + + /** + * the generation number + */ protected int generation = 0; - + // constructors - + protected PdfIndirectReference() { super(0); } - -/** - * Constructs a PdfIndirectReference. - * - * @param type the type of the PdfObject that is referenced to - * @param number the object number. - * @param generation the generation number. - */ - + + /** + * Constructs a PdfIndirectReference. + * + * @param type the type of the PdfObject that is referenced to + * @param number the object number. + * @param generation the generation number. + */ + PdfIndirectReference(int type, int number, int generation) { super(0, number + " " + generation + " R"); this.number = number; this.generation = generation; } - -/** - * Constructs a PdfIndirectReference. - * - * @param type the type of the PdfObject that is referenced to - * @param number the object number. - */ - + + /** + * Constructs a PdfIndirectReference. + * + * @param type the type of the PdfObject that is referenced to + * @param number the object number. + */ + PdfIndirectReference(int type, int number) { this(type, number, 0); } - + // methods - -/** - * Returns the number of the object. - * - * @return a number. - */ - + + /** + * Returns the number of the object. + * + * @return a number. + */ + public int getNumber() { return number; } - -/** - * Returns the generation of the object. - * - * @return a number. - */ - + + /** + * Returns the generation of the object. + * + * @return a number. + */ + public int getGeneration() { return generation; } - + public String toString() { return new StringBuffer().append(number).append(" ").append(generation).append(" R").toString(); } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfLayer.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfLayer.java index 2cfb30a0b..bbee8088d 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfLayer.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfLayer.java @@ -47,16 +47,17 @@ package com.lowagie.text.pdf; -import java.util.ArrayList; import com.lowagie.text.error_messages.MessageLocalization; +import java.util.ArrayList; + /** - * An optional content group is a dictionary representing a collection of graphics - * that can be made visible or invisible dynamically by users of viewer applications. - * In iText they are referenced as layers. + * An optional content group is a dictionary representing a collection of graphics that can be made visible or invisible + * dynamically by users of viewer applications. In iText they are referenced as layers. * * @author Paulo Soares (psoares@consiste.pt) */ public class PdfLayer extends PdfDictionary implements PdfOCG { + protected PdfIndirectReference ref; protected ArrayList children; protected PdfLayer parent; @@ -66,149 +67,163 @@ public class PdfLayer extends PdfDictionary implements PdfOCG { * Holds value of property on. */ private boolean on = true; - + /** * Holds value of property onPanel. */ private boolean onPanel = true; - + PdfLayer(String title) { this.title = title; } - - /** - * Creates a title layer. A title layer is not really a layer but a collection of layers - * under the same title heading. - * @param title the title text - * @param writer the PdfWriter - * @return the title layer - */ - public static PdfLayer createTitle(String title, PdfWriter writer) { - if (title == null) - throw new NullPointerException(MessageLocalization.getComposedMessage("title.cannot.be.null")); - PdfLayer layer = new PdfLayer(title); - writer.registerLayer(layer); - return layer; - } + /** * Creates a new layer. - * @param name the name of the layer + * + * @param name the name of the layer * @param writer the writer - */ + */ public PdfLayer(String name, PdfWriter writer) { super(PdfName.OCG); setName(name); ref = writer.getPdfIndirectReference(); writer.registerLayer(this); } - + + /** + * Creates a title layer. A title layer is not really a layer but a collection of layers under the same title + * heading. + * + * @param title the title text + * @param writer the PdfWriter + * @return the title layer + */ + public static PdfLayer createTitle(String title, PdfWriter writer) { + if (title == null) { + throw new NullPointerException(MessageLocalization.getComposedMessage("title.cannot.be.null")); + } + PdfLayer layer = new PdfLayer(title); + writer.registerLayer(layer); + return layer; + } + String getTitle() { return title; } - + /** * Adds a child layer. Nested layers can only have one parent. + * * @param child the child layer - */ + */ public void addChild(PdfLayer child) { if (child.parent != null) { String name = null; PdfString pdfName = child.getAsString(PdfName.NAME); - if (pdfName != null) + if (pdfName != null) { name = pdfName.toUnicodeString(); - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.layer.1.already.has.a.parent", name)); + } + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("the.layer.1.already.has.a.parent", name)); } child.parent = this; - if (children == null) + if (children == null) { children = new ArrayList<>(); + } children.add(child); } - + /** * Gets the parent layer. + * * @return the parent layer or null if the layer has no parent - */ + */ public PdfLayer getParent() { return parent; } - + /** * Gets the children layers. + * * @return the children layers or null if the layer has no children - */ + */ public ArrayList getChildren() { return children; } - + /** * Gets the PdfIndirectReference that represents this layer. + * * @return the PdfIndirectReference that represents this layer - */ + */ public PdfIndirectReference getRef() { return ref; } - + /** - * Sets the PdfIndirectReference that represents this layer. - * This can only be done from PdfStamperImp. - * @param ref The reference to the OCG object - * @since 2.1.2 + * Sets the PdfIndirectReference that represents this layer. This can only be done from PdfStamperImp. + * + * @param ref The reference to the OCG object + * @since 2.1.2 */ void setRef(PdfIndirectReference ref) { this.ref = ref; } - + /** * Sets the name of this layer. + * * @param name the name of this layer - */ + */ public void setName(String name) { put(PdfName.NAME, new PdfString(name, PdfObject.TEXT_UNICODE)); } - + /** * Gets the dictionary representing the layer. It just returns this. + * * @return the dictionary representing the layer - */ + */ public PdfObject getPdfObject() { return this; } - + /** * Gets the initial visibility of the layer. + * * @return the initial visibility of the layer */ public boolean isOn() { return this.on; } - + /** * Sets the initial visibility of the layer. + * * @param on the initial visibility of the layer */ public void setOn(boolean on) { this.on = on; } - + private PdfDictionary getUsage() { - PdfDictionary usage = (PdfDictionary)get(PdfName.USAGE); + PdfDictionary usage = (PdfDictionary) get(PdfName.USAGE); if (usage == null) { usage = new PdfDictionary(); put(PdfName.USAGE, usage); } return usage; } - + /** - * Used by the creating application to store application-specific - * data associated with this optional content group. + * Used by the creating application to store application-specific data associated with this optional content group. + * * @param creator a text string specifying the application that created the group - * @param subtype a string defining the type of content controlled by the group. Suggested - * values include but are not limited to Artwork, for graphic-design or publishing - * applications, and Technical, for technical designs such as building plans or - * schematics - */ + * @param subtype a string defining the type of content controlled by the group. Suggested values include but are + * not limited to Artwork, for graphic-design or publishing applications, and + * Technical, for technical designs such as building plans or schematics + */ public void setCreatorInfo(String creator, String subtype) { PdfDictionary usage = getUsage(); PdfDictionary dic = new PdfDictionary(); @@ -216,67 +231,70 @@ public void setCreatorInfo(String creator, String subtype) { dic.put(PdfName.SUBTYPE, new PdfName(subtype)); usage.put(PdfName.CREATORINFO, dic); } - + /** - * Specifies the language of the content controlled by this - * optional content group - * @param lang a language string which specifies a language and possibly a locale - * (for example, es-MX represents Mexican Spanish) - * @param preferred used by viewer applications when there is a partial match but no exact - * match between the system language and the language strings in all usage dictionaries - */ + * Specifies the language of the content controlled by this optional content group + * + * @param lang a language string which specifies a language and possibly a locale (for example, es-MX + * represents Mexican Spanish) + * @param preferred used by viewer applications when there is a partial match but no exact match between the system + * language and the language strings in all usage dictionaries + */ public void setLanguage(String lang, boolean preferred) { PdfDictionary usage = getUsage(); PdfDictionary dic = new PdfDictionary(); dic.put(PdfName.LANG, new PdfString(lang, PdfObject.TEXT_UNICODE)); - if (preferred) + if (preferred) { dic.put(PdfName.PREFERRED, PdfName.ON); + } usage.put(PdfName.LANGUAGE, dic); } - + /** - * Specifies the recommended state for content in this - * group when the document (or part of it) is saved by a viewer application to a format - * that does not support optional content (for example, an earlier version of - * PDF or a raster image format). + * Specifies the recommended state for content in this group when the document (or part of it) is saved by a viewer + * application to a format that does not support optional content (for example, an earlier version of PDF or a + * raster image format). + * * @param export the export state - */ + */ public void setExport(boolean export) { PdfDictionary usage = getUsage(); PdfDictionary dic = new PdfDictionary(); dic.put(PdfName.EXPORTSTATE, export ? PdfName.ON : PdfName.OFF); usage.put(PdfName.EXPORT, dic); } - + /** - * Specifies a range of magnifications at which the content - * in this optional content group is best viewed. - * @param min the minimum recommended magnification factors at which the group - * should be ON. A negative value will set the default to 0 - * @param max the maximum recommended magnification factor at which the group - * should be ON. A negative value will set the largest possible magnification supported by the - * viewer application - */ + * Specifies a range of magnifications at which the content in this optional content group is best viewed. + * + * @param min the minimum recommended magnification factors at which the group should be ON. A negative value will + * set the default to 0 + * @param max the maximum recommended magnification factor at which the group should be ON. A negative value will + * set the largest possible magnification supported by the viewer application + */ public void setZoom(float min, float max) { - if (min <= 0 && max < 0) + if (min <= 0 && max < 0) { return; + } PdfDictionary usage = getUsage(); PdfDictionary dic = new PdfDictionary(); - if (min > 0) + if (min > 0) { dic.put(PdfName.MIN_LOWER_CASE, new PdfNumber(min)); - if (max >= 0) + } + if (max >= 0) { dic.put(PdfName.MAX_LOWER_CASE, new PdfNumber(max)); + } usage.put(PdfName.ZOOM, dic); } /** - * Specifies that the content in this group is intended for - * use in printing - * @param subtype a name specifying the kind of content controlled by the group; - * for example, Trapping, PrintersMarks and Watermark - * @param printstate indicates that the group should be - * set to that state when the document is printed from a viewer application - */ + * Specifies that the content in this group is intended for use in printing + * + * @param subtype a name specifying the kind of content controlled by the group; for example, Trapping, + * PrintersMarks and Watermark + * @param printstate indicates that the group should be set to that state when the document is printed from a viewer + * application + */ public void setPrint(String subtype, boolean printstate) { PdfDictionary usage = getUsage(); PdfDictionary dic = new PdfDictionary(); @@ -286,33 +304,34 @@ public void setPrint(String subtype, boolean printstate) { } /** - * Indicates that the group should be set to that state when the - * document is opened in a viewer application. + * Indicates that the group should be set to that state when the document is opened in a viewer application. + * * @param view the view state - */ + */ public void setView(boolean view) { PdfDictionary usage = getUsage(); PdfDictionary dic = new PdfDictionary(); dic.put(PdfName.VIEWSTATE, view ? PdfName.ON : PdfName.OFF); usage.put(PdfName.VIEW, dic); } - + /** * Gets the layer visibility in Acrobat's layer panel + * * @return the layer visibility in Acrobat's layer panel */ public boolean isOnPanel() { return this.onPanel; } - + /** - * Sets the visibility of the layer in Acrobat's layer panel. If false - * the layer cannot be directly manipulated by the user. Note that any children layers will - * also be absent from the panel. + * Sets the visibility of the layer in Acrobat's layer panel. If false the layer cannot be directly + * manipulated by the user. Note that any children layers will also be absent from the panel. + * * @param onPanel the visibility of the layer in Acrobat's layer panel */ public void setOnPanel(boolean onPanel) { this.onPanel = onPanel; } - + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfLayerMembership.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfLayerMembership.java index a32a3db43..d1944b50a 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfLayerMembership.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfLayerMembership.java @@ -52,88 +52,92 @@ import java.util.Set; /** - * Content typically belongs to a single optional content group, - * and is visible when the group is ON and invisible when it is OFF. To express more - * complex visibility policies, content should not declare itself to belong to an optional - * content group directly, but rather to an optional content membership dictionary - * represented by this class. + * Content typically belongs to a single optional content group, and is visible when the group is ON and + * invisible when it is OFF. To express more complex visibility policies, content should not declare itself to + * belong to an optional content group directly, but rather to an optional content membership dictionary represented by + * this class. * * @author Paulo Soares (psoares@consiste.pt) */ public class PdfLayerMembership extends PdfDictionary implements PdfOCG { - + /** * Visible only if all of the entries are ON. - */ + */ public static final PdfName ALLON = new PdfName("AllOn"); /** * Visible if any of the entries are ON. - */ + */ public static final PdfName ANYON = new PdfName("AnyOn"); /** * Visible if any of the entries are OFF. - */ + */ public static final PdfName ANYOFF = new PdfName("AnyOff"); /** * Visible only if all of the entries are OFF. - */ + */ public static final PdfName ALLOFF = new PdfName("AllOff"); PdfIndirectReference ref; PdfArray members = new PdfArray(); Set layers = new HashSet<>(); - + /** * Creates a new, empty, membership layer. + * * @param writer the writer - */ + */ public PdfLayerMembership(PdfWriter writer) { super(PdfName.OCMD); put(PdfName.OCGS, members); ref = writer.getPdfIndirectReference(); } - + /** * Gets the PdfIndirectReference that represents this membership layer. + * * @return the PdfIndirectReference that represents this layer - */ + */ public PdfIndirectReference getRef() { return ref; } - + /** * Adds a new member to the layer. + * * @param layer the new member to the layer - */ + */ public void addMember(PdfLayer layer) { if (!layers.contains(layer)) { members.add(layer.getRef()); layers.add(layer); } } - + /** * Gets the member layers. + * * @return the member layers - */ + */ public Collection getLayers() { return layers; } - + /** - * Sets the visibility policy for content belonging to this - * membership dictionary. Possible values are ALLON, ANYON, ANYOFF and ALLOFF. - * The default value is ANYON. + * Sets the visibility policy for content belonging to this membership dictionary. Possible values are ALLON, ANYON, + * ANYOFF and ALLOFF. The default value is ANYON. + * * @param type the visibility policy - */ + */ public void setVisibilityPolicy(PdfName type) { put(PdfName.P, type); } - + /** * Gets the dictionary representing the membership layer. It just returns this. + * * @return the dictionary representing the layer - */ + */ public PdfObject getPdfObject() { return this; } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfLine.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfLine.java index 09c184248..3cf9d53bf 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfLine.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfLine.java @@ -49,12 +49,11 @@ package com.lowagie.text.pdf; -import java.util.ArrayList; -import java.util.Iterator; - import com.lowagie.text.Chunk; import com.lowagie.text.Element; import com.lowagie.text.ListItem; +import java.util.ArrayList; +import java.util.Iterator; /** * PdfLine defines an array with PdfChunk-objects @@ -62,49 +61,67 @@ */ public class PdfLine { - + // membervariables - - /** The arraylist containing the chunks. */ + + /** + * The arraylist containing the chunks. + */ protected ArrayList line; - - /** The left indentation of the line. */ + + /** + * The left indentation of the line. + */ protected float left; - - /** The width of the line. */ + + /** + * The width of the line. + */ protected float width; - - /** The alignment of the line. */ + + /** + * The alignment of the line. + */ protected int alignment; - - /** The height of the line. */ + + /** + * The height of the line. + */ protected float height; - - /** The listsymbol (if necessary). */ + + /** + * The listsymbol (if necessary). + */ protected Chunk listSymbol = null; - - /** The listsymbol (if necessary). */ + + /** + * The listsymbol (if necessary). + */ protected float symbolIndent; - - /** true if the chunk splitting was caused by a newline. */ + + /** + * true if the chunk splitting was caused by a newline. + */ protected boolean newlineSplit = false; - - /** The original width. */ + + /** + * The original width. + */ protected float originalWidth; - + protected boolean isRTL = false; - + // constructors - + /** * Constructs a new PdfLine-object. * - * @param left the limit of the line at the left - * @param right the limit of the line at the right - * @param alignment the alignment of the line - * @param height the height of the line + * @param left the limit of the line at the left + * @param right the limit of the line at the right + * @param alignment the alignment of the line + * @param height the height of the line */ - + PdfLine(float left, float right, int alignment, float height) { this.left = left; this.width = right - left; @@ -113,18 +130,20 @@ public class PdfLine { this.height = height; this.line = new ArrayList<>(); } - + /** * Creates a PdfLine object. - * @param left the left offset - * @param originalWidth the original width of the line - * @param remainingWidth bigger than 0 if the line isn't completely filled - * @param alignment the alignment of the line - * @param newlineSplit was the line splitted (or does the paragraph end with this line) - * @param line an array of PdfChunk objects - * @param isRTL do you have to read the line from Right to Left? - */ - PdfLine(float left, float originalWidth, float remainingWidth, int alignment, boolean newlineSplit, ArrayList line, boolean isRTL) { + * + * @param left the left offset + * @param originalWidth the original width of the line + * @param remainingWidth bigger than 0 if the line isn't completely filled + * @param alignment the alignment of the line + * @param newlineSplit was the line splitted (or does the paragraph end with this line) + * @param line an array of PdfChunk objects + * @param isRTL do you have to read the line from Right to Left? + */ + PdfLine(float left, float originalWidth, float remainingWidth, int alignment, boolean newlineSplit, + ArrayList line, boolean isRTL) { this.left = left; this.originalWidth = originalWidth; this.width = remainingWidth; @@ -133,31 +152,30 @@ public class PdfLine { this.newlineSplit = newlineSplit; this.isRTL = isRTL; } - + // methods - + /** * Adds a PdfChunk to the PdfLine. * - * @param chunk the PdfChunk to add - * @return null if the chunk could be added completely; if not - * a PdfChunk containing the part of the chunk that could - * not be added is returned + * @param chunk the PdfChunk to add + * @return null if the chunk could be added completely; if not + * a PdfChunk containing the part of the chunk that could not be added is returned */ - + PdfChunk add(PdfChunk chunk) { // nothing happens if the chunk is null. if (chunk == null || chunk.toString().equals("")) { return null; } - + // we split the chunk to be added PdfChunk overflow = chunk.split(width); newlineSplit = (chunk.isNewlineSplit() || overflow == null); // if (chunk.isNewlineSplit() && alignment == Element.ALIGN_JUSTIFIED) // alignment = Element.ALIGN_LEFT; if (chunk.isTab()) { - Object[] tab = (Object[])chunk.getAttribute(Chunk.TAB); + Object[] tab = (Object[]) chunk.getAttribute(Chunk.TAB); float tabPosition = (Float) tab[1]; boolean newline = (Boolean) tab[2]; if (newline && tabPosition < originalWidth - width) { @@ -169,8 +187,9 @@ PdfChunk add(PdfChunk chunk) { } // if the length of the chunk > 0 we add it to the line else if (chunk.length() > 0 || chunk.isImage()) { - if (overflow != null) + if (overflow != null) { chunk.trimLastSpace(); + } width -= chunk.width(); addToLine(chunk); } @@ -186,63 +205,66 @@ else if (line.size() < 1) { } // if the chunk couldn't even be truncated, we add everything, so be it else { - if (overflow != null) + if (overflow != null) { addToLine(overflow); + } return null; } - } - else { + } else { width += line.get(line.size() - 1).trimLastSpace(); } return overflow; } - + private void addToLine(PdfChunk chunk) { if (chunk.changeLeading && chunk.isImage()) { - float f = chunk.getImage().getScaledHeight() + chunk.getImageOffsetY() + chunk.getImage().getBorderWidthTop(); - if (f > height) height = f; + float f = + chunk.getImage().getScaledHeight() + chunk.getImageOffsetY() + chunk.getImage().getBorderWidthTop(); + if (f > height) { + height = f; + } } line.add(chunk); } - + // methods to retrieve information - + /** * Returns the number of chunks in the line. * - * @return a value + * @return a value */ - + public int size() { return line.size(); } - + /** * Returns an iterator of PdfChunks. * - * @return an Iterator + * @return an Iterator */ - + public Iterator iterator() { return line.iterator(); } - + /** * Returns the height of the line. * - * @return a value + * @return a value */ - + float height() { return height; } - + /** * Returns the left indentation of the line taking the alignment of the line into account. * - * @return a value + * @return a value */ - + float indentLeft() { if (isRTL) { switch (alignment) { @@ -253,8 +275,7 @@ float indentLeft() { default: return left; } - } - else if (this.getSeparatorCount() == 0) { + } else if (this.getSeparatorCount() == 0) { switch (alignment) { case Element.ALIGN_RIGHT: return left + width; @@ -264,54 +285,57 @@ else if (this.getSeparatorCount() == 0) { } return left; } - + /** * Checks if this line has to be justified. * - * @return true if the alignment equals ALIGN_JUSTIFIED and there is some width left. + * @return true if the alignment equals ALIGN_JUSTIFIED and there is some width left. */ - + public boolean hasToBeJustified() { return ((alignment == Element.ALIGN_JUSTIFIED || alignment == Element.ALIGN_JUSTIFIED_ALL) && width != 0); } - + /** * Resets the alignment of this line. - *

      - * The alignment of the last line of for instance a Paragraph - * that has to be justified, has to be reset to ALIGN_LEFT. + *

      + * The alignment of the last line of for instance a Paragraph that has to be justified, has to be reset + * to ALIGN_LEFT. */ - + public void resetAlignment() { if (alignment == Element.ALIGN_JUSTIFIED) { alignment = Element.ALIGN_LEFT; } } - - /** Adds extra indentation to the left (for Paragraph.setFirstLineIndent). */ + + /** + * Adds extra indentation to the left (for Paragraph.setFirstLineIndent). + */ void setExtraIndent(float extra) { left += extra; width -= extra; - if (extra < 0.0f) + if (extra < 0.0f) { originalWidth -= extra; + } } - + /** * Returns the width that is left, after a maximum of characters is added to the line. * - * @return a value + * @return a value */ - + float widthLeft() { return width; } - + /** * Returns the number of space-characters in this line. * - * @return a value + * @return a value */ - + int numberOfSpaces() { String string = toString(); int length = string.length(); @@ -323,46 +347,46 @@ int numberOfSpaces() { } return numberOfSpaces; } - + /** * Sets the listsymbol of this line. - *

      + *

      * This is only necessary for the first line of a ListItem. * * @param listItem the list symbol */ - + public void setListItem(ListItem listItem) { this.listSymbol = listItem.getListSymbol(); this.symbolIndent = listItem.getIndentationLeft(); } - + /** * Returns the listsymbol of this line. * - * @return a PdfChunk if the line has a listsymbol; null otherwise + * @return a PdfChunk if the line has a listsymbol; null otherwise */ - + public Chunk listSymbol() { return listSymbol; } - + /** * Return the indentation needed to show the listsymbol. * - * @return a value + * @return a value */ - + public float listIndent() { return symbolIndent; } - + /** * Get the string representation of what is in this line. * - * @return a String + * @return a String */ - + public String toString() { StringBuilder tmp = new StringBuilder(); for (Object o : line) { @@ -370,11 +394,12 @@ public String toString() { } return tmp.toString(); } - + /** * Returns the length of a line in UTF32 characters - * @return the length in UTF32 characters - * @since 2.1.2 + * + * @return the length in UTF32 characters + * @since 2.1.2 */ public int GetLineLengthUtf32() { int total = 0; @@ -383,42 +408,48 @@ public int GetLineLengthUtf32() { } return total; } - + /** * Checks if a newline caused the line split. + * * @return true if a newline caused the line split */ public boolean isNewlineSplit() { return newlineSplit && (alignment != Element.ALIGN_JUSTIFIED_ALL); } - + /** * Gets the index of the last PdfChunk with metric attributes + * * @return the last PdfChunk with metric attributes */ public int getLastStrokeChunk() { int lastIdx = line.size() - 1; for (; lastIdx >= 0; --lastIdx) { PdfChunk chunk = line.get(lastIdx); - if (chunk.isStroked()) + if (chunk.isStroked()) { break; + } } return lastIdx; } - + /** * Gets a PdfChunk by index. + * * @param idx the index * @return the PdfChunk or null if beyond the array */ public PdfChunk getChunk(int idx) { - if (idx < 0 || idx >= line.size()) + if (idx < 0 || idx >= line.size()) { return null; + } return line.get(idx); } - + /** * Gets the original width of the line. + * * @return the original width of the line */ public float getOriginalWidth() { @@ -426,10 +457,11 @@ public float getOriginalWidth() { } /** - * Gets the difference between the "normal" leading and the maximum - * size (for instance when there are images in the chunk). - * @return an extra leading for images - * @since 2.1.5 + * Gets the difference between the "normal" leading and the maximum size (for instance when there are images in the + * chunk). + * + * @return an extra leading for images + * @since 2.1.5 */ float[] getMaxSize() { float normal_leading = 0; @@ -445,15 +477,16 @@ float[] getMaxSize() { } return new float[]{normal_leading, image_leading}; } - + boolean isRTL() { return isRTL; } - + /** * Gets the number of separators in the line. - * @return the number of separators in the line - * @since 2.1.2 + * + * @return the number of separators in the line + * @since 2.1.2 */ int getSeparatorCount() { int s = 0; @@ -469,9 +502,10 @@ int getSeparatorCount() { } return s; } - + /** * Gets a width corrected with a charSpacing and wordSpacing. + * * @param charSpacing the spacing between characters * @param wordSpacing the spacing between words * @return a corrected width @@ -484,38 +518,38 @@ public float getWidthCorrected(float charSpacing, float wordSpacing) { } return total; } - -/** - * Gets the maximum size of the ascender for all the fonts used - * in this line. - * @return maximum size of all the ascenders used in this line - */ - public float getAscender() { - float ascender = 0; - for (Object o : line) { - PdfChunk ck = (PdfChunk) o; - if (ck.isImage()) - ascender = Math.max(ascender, ck.getImage().getScaledHeight() + ck.getImageOffsetY()); - else { - PdfFont font = ck.font(); - ascender = Math.max(ascender, font.getFont().getFontDescriptor(BaseFont.ASCENT, font.size())); - } - } - return ascender; - } -/** - * Gets the biggest descender for all the fonts used - * in this line. Note that this is a negative number. - * @return maximum size of all the ascenders used in this line - */ + /** + * Gets the maximum size of the ascender for all the fonts used in this line. + * + * @return maximum size of all the ascenders used in this line + */ + public float getAscender() { + float ascender = 0; + for (Object o : line) { + PdfChunk ck = (PdfChunk) o; + if (ck.isImage()) { + ascender = Math.max(ascender, ck.getImage().getScaledHeight() + ck.getImageOffsetY()); + } else { + PdfFont font = ck.font(); + ascender = Math.max(ascender, font.getFont().getFontDescriptor(BaseFont.ASCENT, font.size())); + } + } + return ascender; + } + + /** + * Gets the biggest descender for all the fonts used in this line. Note that this is a negative number. + * + * @return maximum size of all the ascenders used in this line + */ public float getDescender() { float descender = 0; for (Object o : line) { PdfChunk ck = (PdfChunk) o; - if (ck.isImage()) + if (ck.isImage()) { descender = Math.min(descender, ck.getImageOffsetY()); - else { + } else { PdfFont font = ck.font(); descender = Math.min(descender, font.getFont().getFontDescriptor(BaseFont.DESCENT, font.size())); } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfLister.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfLister.java index 9e47d2edc..6476d4f7a 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfLister.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfLister.java @@ -49,22 +49,27 @@ * https://github.com/LibrePDF/OpenPDF */ - package com.lowagie.text.pdf; +package com.lowagie.text.pdf; import java.io.IOException; import java.io.PrintStream; + /** * List a PDF file in human-readable form (for debugging reasons mostly) + * * @author Mark Thompson */ public class PdfLister { - /** the printStream you want to write the output to. */ + /** + * the printStream you want to write the output to. + */ PrintStream out; /** * Create a new lister object. + * * @param out the PrintStream to write the output to */ public PdfLister(PrintStream out) { @@ -73,31 +78,32 @@ public PdfLister(PrintStream out) { /** * Visualizes a PDF object. - * @param object a com.lowagie.text.pdf object + * + * @param object a com.lowagie.text.pdf object */ - public void listAnyObject(PdfObject object) - { + public void listAnyObject(PdfObject object) { switch (object.type()) { - case PdfObject.ARRAY: - listArray((PdfArray)object); - break; - case PdfObject.DICTIONARY: - listDict((PdfDictionary) object); - break; - case PdfObject.STRING: - out.println("(" + object.toString() + ")"); - break; - default: - out.println(object.toString()); - break; + case PdfObject.ARRAY: + listArray((PdfArray) object); + break; + case PdfObject.DICTIONARY: + listDict((PdfDictionary) object); + break; + case PdfObject.STRING: + out.println("(" + object.toString() + ")"); + break; + default: + out.println(object.toString()); + break; } } + /** * Visualizes a PdfDictionary object. - * @param dictionary a com.lowagie.text.pdf.PdfDictionary object + * + * @param dictionary a com.lowagie.text.pdf.PdfDictionary object */ - public void listDict(PdfDictionary dictionary) - { + public void listDict(PdfDictionary dictionary) { out.println("<<"); PdfName key; PdfObject value; @@ -113,21 +119,22 @@ public void listDict(PdfDictionary dictionary) /** * Visualizes a PdfArray object. - * @param array a com.lowagie.text.pdf.PdfArray object + * + * @param array a com.lowagie.text.pdf.PdfArray object */ - public void listArray(PdfArray array) - { + public void listArray(PdfArray array) { out.println('['); array.getElements().forEach(this::listAnyObject); out.println(']'); } + /** * Visualizes a Stream. + * * @param stream the stream to read from * @param reader not used currently */ - public void listStream(PRStream stream, PdfReaderInstance reader) - { + public void listStream(PRStream stream, PdfReaderInstance reader) { try { listDict(stream); out.println("startstream"); @@ -143,8 +150,9 @@ public void listStream(PRStream stream, PdfReaderInstance reader) // stream.closeStream(); int len = b.length - 1; for (int k = 0; k < len; ++k) { - if (b[k] == '\r' && b[k + 1] != '\n') - b[k] = (byte)'\n'; + if (b[k] == '\r' && b[k + 1] != '\n') { + b[k] = (byte) '\n'; + } } out.println(new String(b)); out.println("endstream"); @@ -154,8 +162,10 @@ public void listStream(PRStream stream, PdfReaderInstance reader) // System.err.println("Data Format Exception: " + e); } } + /** * Visualizes an imported page + * * @param iPage the imported page */ public void listPage(PdfImportedPage iPage) { @@ -166,19 +176,20 @@ public void listPage(PdfImportedPage iPage) { PdfDictionary page = reader.getPageN(pageNum); listDict(page); PdfObject obj = PdfReader.getPdfObject(page.get(PdfName.CONTENTS)); - if (obj == null) + if (obj == null) { return; + } switch (obj.type) { - case PdfObject.STREAM: - listStream((PRStream)obj, readerInst); - break; - case PdfObject.ARRAY: - for (PdfObject pdfObject : ((PdfArray)obj).getElements()) { - PdfObject o = PdfReader.getPdfObject(pdfObject); - listStream((PRStream)o, readerInst); - out.println("-----------"); - } - break; + case PdfObject.STREAM: + listStream((PRStream) obj, readerInst); + break; + case PdfObject.ARRAY: + for (PdfObject pdfObject : ((PdfArray) obj).getElements()) { + PdfObject o = PdfReader.getPdfObject(pdfObject); + listStream((PRStream) o, readerInst); + out.println("-----------"); + } + break; } } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfLiteral.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfLiteral.java index ff75d6c35..4a32aee83 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfLiteral.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfLiteral.java @@ -54,57 +54,61 @@ */ public class PdfLiteral extends PdfObject { - + /** * Holds value of property position. */ private long position; - + public PdfLiteral(String text) { super(0, text); } - + public PdfLiteral(byte[] b) { super(0, b); } public PdfLiteral(int size) { - super(0, (byte[])null); + super(0, (byte[]) null); bytes = new byte[size]; - java.util.Arrays.fill(bytes, (byte)32); + java.util.Arrays.fill(bytes, (byte) 32); } public PdfLiteral(int type, String text) { super(type, text); } - + public PdfLiteral(int type, byte[] b) { super(type, b); } - + public void toPdf(PdfWriter writer, java.io.OutputStream os) throws java.io.IOException { - if (os instanceof OutputStreamCounter) - position = ((OutputStreamCounter)os).getCounter(); + if (os instanceof OutputStreamCounter) { + position = ((OutputStreamCounter) os).getCounter(); + } super.toPdf(writer, os); } - + /** * Getter for property position. + * * @return Value of property position. */ public long getPosition() { return this.position; } - + /** * Getter for property posLength. + * * @return Value of property posLength. */ public int getPosLength() { - if (bytes != null) + if (bytes != null) { return bytes.length; - else + } else { return 0; + } } - + } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfMediaClipData.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfMediaClipData.java index 5c5d7e59b..f15787efb 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfMediaClipData.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfMediaClipData.java @@ -49,11 +49,11 @@ import java.io.IOException; public class PdfMediaClipData extends PdfDictionary { - + PdfMediaClipData(String file, PdfFileSpecification fs, String mimeType) throws IOException { - put(PdfName.TYPE,new PdfName("MediaClip")); + put(PdfName.TYPE, new PdfName("MediaClip")); put(PdfName.S, new PdfName("MCD")); - put(PdfName.N, new PdfString("Media clip for "+file)); + put(PdfName.N, new PdfString("Media clip for " + file)); put(new PdfName("CT"), new PdfString(mimeType)); PdfDictionary dic = new PdfDictionary(); dic.put(new PdfName("TF"), new PdfString("TEMPACCESS")); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfName.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfName.java index 1100faba2..82abca951 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfName.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfName.java @@ -49,30 +49,26 @@ package com.lowagie.text.pdf; +import com.lowagie.text.error_messages.MessageLocalization; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import com.lowagie.text.error_messages.MessageLocalization; - /** * PdfName is an object that can be used as a name in a PDF-file. - *

      - * A name, like a string, is a sequence of characters. - * It must begin with a slash followed by a sequence of ASCII characters in - * the range 32 through 136 except %, (, ), [, ], <, >, {, }, / and #. - * Any character except 0x00 may be included in a name by writing its - * two character hex code, preceded by #. The maximum number of characters - * in a name is 127.
      - * This object is described in the 'Portable Document Format Reference Manual - * version 1.7' section 3.2.4 (page 56-58). + *

      + * A name, like a string, is a sequence of characters. It must begin with a slash followed by a sequence of ASCII + * characters in the range 32 through 136 except %, (, ), [, ], <, >, {, }, / and #. Any character except 0x00 may + * be included in a name by writing its two character hex code, preceded by #. The maximum number of characters in a + * name is 127.
      This object is described in the 'Portable Document Format Reference Manual version 1.7' section + * 3.2.4 (page 56-58). *

      * - * @see PdfObject - * @see PdfDictionary - * @see BadPdfFormatException + * @see PdfObject + * @see PdfDictionary + * @see BadPdfFormatException */ public class PdfName extends PdfObject implements Comparable { @@ -84,10 +80,14 @@ public class PdfName extends PdfObject implements Comparable { * @since 2.1.6 */ public static final PdfName _3D = new PdfName("3D"); - /** (Optional) An action that shall be performed when the annotation is activated. */ + /** + * (Optional) An action that shall be performed when the annotation is activated. + */ public static final PdfName A = new PdfName("A"); - /** (Optional) An additional-actions dictionary defining the field's / annotations's behaviour in response to various trigger events. - * This entry has exactly the same meaning as the AA entry in an annotation dictionary. */ + /** + * (Optional) An additional-actions dictionary defining the field's / annotations's behaviour in response to various + * trigger events. This entry has exactly the same meaning as the AA entry in an annotation dictionary. + */ public static final PdfName AA = new PdfName("AA"); /** * A name @@ -103,7 +103,10 @@ public class PdfName extends PdfObject implements Comparable { * A name */ public static final PdfName ACROFORM = new PdfName("AcroForm"); - /** (Required) A name which, in conjunction with Fields, indicates the set of fields that should be locked. The value shall be one of the following: All, include or exclude. */ + /** + * (Required) A name which, in conjunction with Fields, indicates the set of fields that should be locked. The value + * shall be one of the following: All, include or exclude. + */ public static final PdfName ACTION = new PdfName("Action"); /** * A name. @@ -113,27 +116,43 @@ public class PdfName extends PdfObject implements Comparable { public static final PdfName ACTIVATION = new PdfName("Activation"); /** * A name. + * * @since 2.1.6 */ public static final PdfName ADBE = new PdfName("ADBE"); /** * a name used in PDF structure + * * @since 2.1.6 */ public static final PdfName ACTUALTEXT = new PdfName("ActualText"); - /** A name */ + /** + * A name + */ public static final PdfName ADBE_PKCS7_DETACHED = new PdfName("adbe.pkcs7.detached"); - /** A name */ - public static final PdfName ADBE_PKCS7_S4 =new PdfName("adbe.pkcs7.s4"); - /** A name */ - public static final PdfName ADBE_PKCS7_S5 =new PdfName("adbe.pkcs7.s5"); - /** A name */ + /** + * A name + */ + public static final PdfName ADBE_PKCS7_S4 = new PdfName("adbe.pkcs7.s4"); + /** + * A name + */ + public static final PdfName ADBE_PKCS7_S5 = new PdfName("adbe.pkcs7.s5"); + /** + * A name + */ public static final PdfName ADBE_PKCS7_SHA1 = new PdfName("adbe.pkcs7.sha1"); - /** A name */ + /** + * A name + */ public static final PdfName ADBE_X509_RSA_SHA1 = new PdfName("adbe.x509.rsa_sha1"); - /** A name */ + /** + * A name + */ public static final PdfName ADOBE_PPKLITE = new PdfName("Adobe.PPKLite"); - /** A name */ + /** + * A name + */ public static final PdfName ADOBE_PPKMS = new PdfName("Adobe.PPKMS"); /** * (PDF 1.6; deprecated) The application shall ask the security handler for the file encryption key and shall @@ -151,759 +170,1225 @@ public class PdfName extends PdfObject implements Comparable { * bits. */ public static final PdfName AESV3 = new PdfName("AESV3"); - /**(Optional; PDF 2.0) An array of one or more file specification dictionaries which denote the associated files for this annotation.*/ + /** + * (Optional; PDF 2.0) An array of one or more file specification dictionaries which denote the associated files for + * this annotation. + */ public static final PdfName AF = new PdfName("AF"); - /** A name */ + /** + * A name + */ public static final PdfName AIS = new PdfName("AIS"); - - /** Stands for "Lock all fields in the document" which is one possible value of the Action attribute in a signature field lock dictionary */ + + /** + * Stands for "Lock all fields in the document" which is one possible value of the Action attribute in a signature + * field lock dictionary + */ public static final PdfName ALL = new PdfName("All"); - - /** A name */ + + /** + * A name + */ public static final PdfName ALLPAGES = new PdfName("AllPages"); - /** A name */ + /** + * A name + */ public static final PdfName ALT = new PdfName("Alt"); - /** A name */ + /** + * A name + */ public static final PdfName ALTERNATE = new PdfName("Alternate"); /** * A name. + * * @since 2.1.6 */ public static final PdfName ANIMATION = new PdfName("Animation"); - /** A name */ + /** + * A name + */ public static final PdfName ANNOT = new PdfName("Annot"); - /** A name */ + /** + * A name + */ public static final PdfName ANNOTS = new PdfName("Annots"); - /** A name */ + /** + * A name + */ public static final PdfName ANTIALIAS = new PdfName("AntiAlias"); - /** (Optional) An appearance dictionary specifying how the annotation shall be presented visually on the page. A PDF writer shall - * include an appearance dictionary when writing or updating an annotation dictionary except for the two cases listed below. - * Every annotation (including those whose Subtype value is Widget, as used for form fields), except for the two cases listed below, - * shall have at least one appearance dictionary. - * Exclusions: + /** + * (Optional) An appearance dictionary specifying how the annotation shall be presented visually on the page. A PDF + * writer shall include an appearance dictionary when writing or updating an annotation dictionary except for the + * two cases listed below. Every annotation (including those whose Subtype value is Widget, as used for form + * fields), except for the two cases listed below, shall have at least one appearance dictionary. Exclusions: *
        *
      • Annotations where the value of the Rect key consists of an array where the value at index 1 is equal to the value at index 3 or the value at index 2 is equal to the value at index 4
        • *
      • Annotations whose Subtype value is Popup, Projection or Link.
        • *
      - * - * */ + */ public static final PdfName AP = new PdfName("AP"); - + /** - * A build data dictionary for a description of the signature APP. + * A build data dictionary for a description of the signature APP. */ public static final PdfName APP = new PdfName("App"); - - /** A name */ + + /** + * A name + */ public static final PdfName APPDEFAULT = new PdfName("AppDefault"); /** * A name + * * @since 2.1.6 */ public static final PdfName ART = new PdfName("Art"); - /** A name */ + /** + * A name + */ public static final PdfName ARTBOX = new PdfName("ArtBox"); - /** A name */ + /** + * A name + */ public static final PdfName ASCENT = new PdfName("Ascent"); - /** (Required if the appearance dictionary AP contains one or more subdictionaries) The annotation's appearance state, which - * selects the applicable appearance stream from an appearance subdictionary. */ + /** + * (Required if the appearance dictionary AP contains one or more subdictionaries) The annotation's appearance + * state, which selects the applicable appearance stream from an appearance subdictionary. + */ public static final PdfName AS = new PdfName("AS"); - /** A name */ + /** + * A name + */ public static final PdfName ASCII85DECODE = new PdfName("ASCII85Decode"); - /** A name */ + /** + * A name + */ public static final PdfName ASCIIHEXDECODE = new PdfName("ASCIIHexDecode"); /** * A name. + * * @since 2.1.6 */ public static final PdfName ASSET = new PdfName("Asset"); /** * A name. + * * @since 2.1.6 */ public static final PdfName ASSETS = new PdfName("Assets"); - /** A name */ + /** + * A name + */ public static final PdfName AUTHEVENT = new PdfName("AuthEvent"); - /** A name */ + /** + * A name + */ public static final PdfName AUTHOR = new PdfName("Author"); - /** A name */ + /** + * A name + */ public static final PdfName B = new PdfName("B"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName BACKGROUND = new PdfName("Background"); - /** A name */ + /** + * A name + */ public static final PdfName BASEENCODING = new PdfName("BaseEncoding"); - /** A name */ + /** + * A name + */ public static final PdfName BASEFONT = new PdfName("BaseFont"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName BASEVERSION = new PdfName("BaseVersion"); - /** A name */ + /** + * A name + */ public static final PdfName BBOX = new PdfName("BBox"); - /** A name */ + /** + * A name + */ public static final PdfName BC = new PdfName("BC"); - /** A name */ + /** + * A name + */ public static final PdfName BG = new PdfName("BG"); /** * A name + * * @since 2.1.6 */ public static final PdfName BIBENTRY = new PdfName("BibEntry"); - /** A name */ + /** + * A name + */ public static final PdfName BIGFIVE = new PdfName("BigFive"); /** * A name. + * * @since 2.1.6 */ public static final PdfName BINDING = new PdfName("Binding"); /** * A name. + * * @since 2.1.6 */ public static final PdfName BINDINGMATERIALNAME = new PdfName("BindingMaterialName"); - /** A name */ + /** + * A name + */ public static final PdfName BITSPERCOMPONENT = new PdfName("BitsPerComponent"); - /** A name */ + /** + * A name + */ public static final PdfName BITSPERSAMPLE = new PdfName("BitsPerSample"); - /** A name */ + /** + * A name + */ public static final PdfName BL = new PdfName("Bl"); - /** A name */ + /** + * A name + */ public static final PdfName BLACKIS1 = new PdfName("BlackIs1"); - /** A name */ + /** + * A name + */ public static final PdfName BLACKPOINT = new PdfName("BlackPoint"); /** * A name + * * @since 2.1.6 */ public static final PdfName BLOCKQUOTE = new PdfName("BlockQuote"); - /** A name */ + /** + * A name + */ public static final PdfName BLEEDBOX = new PdfName("BleedBox"); - /** A name */ + /** + * A name + */ public static final PdfName BLINDS = new PdfName("Blinds"); - /** (Optional; PDF 2.0) The blend mode that shall be used when painting the annotation onto the page. If this key is not present, - * blending shall take place using the Normal blend mode. The value shall be a name object, designating one of the standard blend - * modes. */ + /** + * (Optional; PDF 2.0) The blend mode that shall be used when painting the annotation onto the page. If this key is + * not present, blending shall take place using the Normal blend mode. The value shall be a name object, designating + * one of the standard blend modes. + */ public static final PdfName BM = new PdfName("BM"); - /** - * Optional) An array specifying the characteristics of the annotation's border, which shall be drawn as a rounded rectangle. + /** + * Optional) An array specifying the characteristics of the annotation's border, which shall be drawn as a rounded + * rectangle. */ public static final PdfName BORDER = new PdfName("Border"); - /** A name */ + /** + * A name + */ public static final PdfName BOUNDS = new PdfName("Bounds"); - /** A name */ + /** + * A name + */ public static final PdfName BOX = new PdfName("Box"); - /** A name */ + /** + * A name + */ public static final PdfName BS = new PdfName("BS"); - /** A name */ + /** + * A name + */ public static final PdfName BTN = new PdfName("Btn"); - /** An array of pairs of integers (starting byte offset, length in bytes) describing the exact - byte range for the digest calculation. (Required)*/ + /** + * An array of pairs of integers (starting byte offset, length in bytes) describing the exact byte range for the + * digest calculation. (Required) + */ public static final PdfName BYTERANGE = new PdfName("ByteRange"); - /**(Optional) An array of numbers in the range 0.0 to 1.0, representing a colour used for the following purposes: + /** + * (Optional) An array of numbers in the range 0.0 to 1.0, representing a colour used for the following purposes: *
      • The background of the annotation's icon when closed
        • *
      • The title bar of the annotation's popup window
        • *
      • The border of a link annotation
        • *
      - * - * The number of array elements determines the colour space in which the colour shall be defined: - * 0=No colour; transparent 1=DeviceGray 3=DeviceRGB 4=DeviceCMYK*/ + *

      + * The number of array elements determines the colour space in which the colour shall be defined: + * 0=No colour; transparent 1=DeviceGray 3=DeviceRGB 4=DeviceCMYK + */ public static final PdfName C = new PdfName("C"); - /** A name */ + /** + * A name + */ public static final PdfName C0 = new PdfName("C0"); - /** A name */ + /** + * A name + */ public static final PdfName C1 = new PdfName("C1"); - /** (Optional; PDF 2.0) When regenerating the annotation's appearance stream, this is the opacity value that shall be used for - * stroking all visiblea elements of the annotation in its closed state, including its background and border, but not the popup - * window that appears when the annotation is opened. If a ca entry is not present in this dictionary, then the value of this CA - * entry shall also be used for nonstroking operations as well.

      - * Default Value: 1.0

      The specified value shall not be used if the annotation has an appearance stream; in that case, the - * appearance stream shall specify any transparency.*/ + /** + * (Optional; PDF 2.0) When regenerating the annotation's appearance stream, this is the opacity value that shall be + * used for stroking all visiblea elements of the annotation in its closed state, including its background and + * border, but not the popup window that appears when the annotation is opened. If a ca entry is not present in this + * dictionary, then the value of this CA entry shall also be used for nonstroking operations as well.

      Default + * Value: 1.0

      The specified value shall not be used if the annotation has an appearance stream; in that case, the + * appearance stream shall specify any transparency. + */ public static final PdfName CA = new PdfName("CA"); - /** (Optional; PDF 2.0) When regenerating the annotation's appearance stream, this is the opacity value that shall be used for all - * nonstroking operations on all visible elements of the annotation in its closed state (including its background and border) - * but not the popup window that appears when the annotation is opened. Default value: 1.0 - * The specified value shall not be used if the annotation has an appearance stream in that case, the appearance stream shall specify - * any transparency.*/ + /** + * (Optional; PDF 2.0) When regenerating the annotation's appearance stream, this is the opacity value that shall be + * used for all nonstroking operations on all visible elements of the annotation in its closed state (including its + * background and border) but not the popup window that appears when the annotation is opened. Default value: 1.0 + * The specified value shall not be used if the annotation has an appearance stream in that case, the appearance + * stream shall specify any transparency. + */ public static final PdfName ca = new PdfName("ca"); - /** A name */ + /** + * A name + */ public static final PdfName CALGRAY = new PdfName("CalGray"); - /** A name */ + /** + * A name + */ public static final PdfName CALRGB = new PdfName("CalRGB"); - /** A name */ + /** + * A name + */ public static final PdfName CAPHEIGHT = new PdfName("CapHeight"); /** * A name + * * @since 2.1.6 */ public static final PdfName CAPTION = new PdfName("Caption"); - /** A name */ + /** + * A name + */ public static final PdfName CATALOG = new PdfName("Catalog"); - /** A name */ + /** + * A name + */ public static final PdfName CATEGORY = new PdfName("Category"); - /** A name */ + /** + * A name + */ public static final PdfName CCITTFAXDECODE = new PdfName("CCITTFaxDecode"); /** * A name. + * * @since 2.1.6 */ public static final PdfName CENTER = new PdfName("Center"); - /** A name */ + /** + * A name + */ public static final PdfName CENTERWINDOW = new PdfName("CenterWindow"); - /** A name */ + /** + * A name + */ public static final PdfName CERT = new PdfName("Cert"); - + /** - * An array of indirect reference to streams, each containing one DER-encoded X.509 certificate (see RFC 5280). - * This array contains certificates that maybe used in the validation of any signatures in the document. - * + * An array of indirect reference to streams, each containing one DER-encoded X.509 certificate (see RFC 5280). This + * array contains certificates that maybe used in the validation of any signatures in the document. */ public static final PdfName CERTS = new PdfName("Certs"); - - /** A name */ + + /** + * A name + */ public static final PdfName CF = new PdfName("CF"); - /** A name */ + /** + * A name + */ public static final PdfName CFM = new PdfName("CFM"); - /** A name */ + /** + * A name + */ public static final PdfName CH = new PdfName("Ch"); - /** A name */ + /** + * A name + */ public static final PdfName CHARPROCS = new PdfName("CharProcs"); - /** A name */ + /** + * A name + */ public static final PdfName CHECKSUM = new PdfName("CheckSum"); - /** A name */ + /** + * A name + */ public static final PdfName CI = new PdfName("CI"); - /** A name */ + /** + * A name + */ public static final PdfName CIDFONTTYPE0 = new PdfName("CIDFontType0"); - /** A name */ + /** + * A name + */ public static final PdfName CIDFONTTYPE2 = new PdfName("CIDFontType2"); /** * A name + * * @since 2.0.7 */ public static final PdfName CIDSET = new PdfName("CIDSet"); - /** A name */ + /** + * A name + */ public static final PdfName CIDSYSTEMINFO = new PdfName("CIDSystemInfo"); - /** A name */ + /** + * A name + */ public static final PdfName CIDTOGIDMAP = new PdfName("CIDToGIDMap"); - /** A name */ + /** + * A name + */ public static final PdfName CIRCLE = new PdfName("Circle"); /** * A name. + * * @since 2.1.6 */ public static final PdfName CMD = new PdfName("CMD"); - /** A name */ + /** + * A name + */ public static final PdfName CO = new PdfName("CO"); /** * A name + * * @since 2.1.6 */ public static final PdfName CODE = new PdfName("Code"); - /** A name */ + /** + * A name + */ public static final PdfName COLORS = new PdfName("Colors"); - /** A name */ + /** + * A name + */ public static final PdfName COLORSPACE = new PdfName("ColorSpace"); - /** A name */ + /** + * A name + */ public static final PdfName COLLECTION = new PdfName("Collection"); - /** A name */ - public static final PdfName COLLECTIONFIELD = new PdfName("CollectionField"); - /** A name */ - public static final PdfName COLLECTIONITEM = new PdfName("CollectionItem"); - /** A name */ - public static final PdfName COLLECTIONSCHEMA = new PdfName("CollectionSchema"); - /** A name */ - public static final PdfName COLLECTIONSORT = new PdfName("CollectionSort"); - /** A name */ - public static final PdfName COLLECTIONSUBITEM = new PdfName("CollectionSubitem"); - /** A name */ - public static final PdfName COLUMNS = new PdfName("Columns"); /** - * A name. - * @since 2.1.6 + * A name */ - public static final PdfName CONDITION = new PdfName("Condition"); + public static final PdfName COLLECTIONFIELD = new PdfName("CollectionField"); + /** + * A name + */ + public static final PdfName COLLECTIONITEM = new PdfName("CollectionItem"); + /** + * A name + */ + public static final PdfName COLLECTIONSCHEMA = new PdfName("CollectionSchema"); + /** + * A name + */ + public static final PdfName COLLECTIONSORT = new PdfName("CollectionSort"); + /** + * A name + */ + public static final PdfName COLLECTIONSUBITEM = new PdfName("CollectionSubitem"); + /** + * A name + */ + public static final PdfName COLUMNS = new PdfName("Columns"); /** * A name. + * + * @since 2.1.6 + */ + public static final PdfName CONDITION = new PdfName("Condition"); + /** + * A name. + * * @since 2.1.6 */ public static final PdfName CONFIGURATION = new PdfName("Configuration"); /** * A name. + * * @since 2.1.6 */ public static final PdfName CONFIGURATIONS = new PdfName("Configurations"); - /** A name */ + /** + * A name + */ public static final PdfName CONTACTINFO = new PdfName("ContactInfo"); - /** A name */ + /** + * A name + */ public static final PdfName CONTENT = new PdfName("Content"); - /** + /** * Used in several places: *

      • - * 1) Annotations: (Optional) Text that shall be displayed for the annotation or, if this type of annotation does not display text, - * an alternative description of the annotation's contents in human-readable form. In either case, this text is useful when extracting - * the document's contents in support of accessibility to users with disabilities or for other purposes. Might be different for each + * 1) Annotations: (Optional) Text that shall be displayed for the annotation or, if this type of annotation does not display text, + * an alternative description of the annotation's contents in human-readable form. In either case, this text is useful when extracting + * the document's contents in support of accessibility to users with disabilities or for other purposes. Might be different for each * annotation type.
        • *
      • * 2) Part of the signature dictionary. The signature value. The value is a hexadecimal string representing the - value of the byte range digest. (Required)
      */ + * value of the byte range digest. (Required) + */ public static final PdfName CONTENTS = new PdfName("Contents"); - /** A name */ + /** + * A name + */ public static final PdfName COORDS = new PdfName("Coords"); - /** A name */ + /** + * A name + */ public static final PdfName COUNT = new PdfName("Count"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName COURIER = new PdfName("Courier"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName COURIER_BOLD = new PdfName("Courier-Bold"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName COURIER_OBLIQUE = new PdfName("Courier-Oblique"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName COURIER_BOLDOBLIQUE = new PdfName("Courier-BoldOblique"); - /** A name */ + /** + * A name + */ public static final PdfName CREATIONDATE = new PdfName("CreationDate"); - /** A name */ + /** + * A name + */ public static final PdfName CREATOR = new PdfName("Creator"); - /** A name */ + /** + * A name + */ public static final PdfName CREATORINFO = new PdfName("CreatorInfo"); - + /** - * An array of indirect references to streams, each containing a DER-encoded Certificate Revocation List (CRL) (see RFC 5280). - * This array contains CRLs that may be used in the validation of the signatures in the document. - * + * An array of indirect references to streams, each containing a DER-encoded Certificate Revocation List (CRL) (see + * RFC 5280). This array contains CRLs that may be used in the validation of the signatures in the document. */ public static final PdfName CRLS = new PdfName("CRLs"); - - /** A name */ + + /** + * A name + */ public static final PdfName CROPBOX = new PdfName("CropBox"); - /** A name */ + /** + * A name + */ public static final PdfName CRYPT = new PdfName("Crypt"); - /** A name */ + /** + * A name + */ public static final PdfName CS = new PdfName("CS"); /** * A name. + * * @since 2.1.6 */ public static final PdfName CUEPOINT = new PdfName("CuePoint"); /** * A name. + * * @since 2.1.6 */ public static final PdfName CUEPOINTS = new PdfName("CuePoints"); - /** A name */ + /** + * A name + */ public static final PdfName D = new PdfName("D"); - /** (Required; inheritable) The default appearance string containing a sequence of valid page-content graphics or text state operators - * that define such properties as the field's text size and colour. */ + /** + * (Required; inheritable) The default appearance string containing a sequence of valid page-content graphics or + * text state operators that define such properties as the field's text size and colour. + */ public static final PdfName DA = new PdfName("DA"); - /** A name */ + /** + * A name + */ public static final PdfName DATA = new PdfName("Data"); - + /** * Part of the Build Data Dictionary. The software module build date. */ public static final PdfName DATE = new PdfName("Date"); - - /** A name */ + + /** + * A name + */ public static final PdfName DC = new PdfName("DC"); - /** A name */ + /** + * A name + */ public static final PdfName DCTDECODE = new PdfName("DCTDecode"); /** * A name. + * * @since 2.1.6 */ public static final PdfName DEACTIVATION = new PdfName("Deactivation"); - /** A name */ + /** + * A name + */ public static final PdfName DECODE = new PdfName("Decode"); - /** A name */ + /** + * A name + */ public static final PdfName DECODEPARMS = new PdfName("DecodeParms"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName DEFAULT = new PdfName("Default"); /** * A name - * @since 2.1.5 renamed from DEFAULTCRYPTFILER + * + * @since 2.1.5 renamed from DEFAULTCRYPTFILER */ public static final PdfName DEFAULTCRYPTFILTER = new PdfName("DefaultCryptFilter"); - /** A name */ + /** + * A name + */ public static final PdfName DEFAULTCMYK = new PdfName("DefaultCMYK"); - /** A name */ + /** + * A name + */ public static final PdfName DEFAULTGRAY = new PdfName("DefaultGray"); - /** A name */ + /** + * A name + */ public static final PdfName DEFAULTRGB = new PdfName("DefaultRGB"); - /** A name */ + /** + * A name + */ public static final PdfName DESC = new PdfName("Desc"); - /** A name */ + /** + * A name + */ public static final PdfName DESCENDANTFONTS = new PdfName("DescendantFonts"); - /** A name */ + /** + * A name + */ public static final PdfName DESCENT = new PdfName("Descent"); - /** A name */ + /** + * A name + */ public static final PdfName DEST = new PdfName("Dest"); - /** A name */ + /** + * A name + */ public static final PdfName DESTOUTPUTPROFILE = new PdfName("DestOutputProfile"); - /** A name */ + /** + * A name + */ public static final PdfName DESTS = new PdfName("Dests"); - /** A name */ + /** + * A name + */ public static final PdfName DEVICEGRAY = new PdfName("DeviceGray"); - /** A name */ + /** + * A name + */ public static final PdfName DEVICERGB = new PdfName("DeviceRGB"); - /** A name */ + /** + * A name + */ public static final PdfName DEVICECMYK = new PdfName("DeviceCMYK"); - /** A name */ + /** + * A name + */ public static final PdfName DI = new PdfName("Di"); - /** A name */ + /** + * A name + */ public static final PdfName DIFFERENCES = new PdfName("Differences"); - /** A name */ + /** + * A name + */ public static final PdfName DISSOLVE = new PdfName("Dissolve"); - /** A name */ + /** + * A name + */ public static final PdfName DIRECTION = new PdfName("Direction"); - /** A name */ + /** + * A name + */ public static final PdfName DISPLAYDOCTITLE = new PdfName("DisplayDocTitle"); - /** A name */ + /** + * A name + */ public static final PdfName DIV = new PdfName("Div"); - /** A name */ + /** + * A name + */ public static final PdfName DL = new PdfName("DL"); - /** A name */ + /** + * A name + */ public static final PdfName DM = new PdfName("Dm"); - /** A name */ + /** + * A name + */ public static final PdfName DOCMDP = new PdfName("DocMDP"); - /** A name */ + /** + * A name + */ public static final PdfName DOCOPEN = new PdfName("DocOpen"); /** * A name. + * * @since 2.1.6 */ - public static final PdfName DOCUMENT = new PdfName( "Document" ); - /** A name */ + public static final PdfName DOCUMENT = new PdfName("Document"); + /** + * A name + */ public static final PdfName DOMAIN = new PdfName("Domain"); - /** A name */ + /** + * A name + */ public static final PdfName DP = new PdfName("DP"); - /** A name */ + /** + * A name + */ public static final PdfName DR = new PdfName("DR"); - /** (Optional) A default style string; described in the PDF Annex M. */ + /** + * (Optional) A default style string; described in the PDF Annex M. + */ public static final PdfName DS = new PdfName("DS"); - + /** - * A DSS dictionary containing document-wide security information. See PDF 2.0 specification ch. 12.8.4.3 for further details. + * A DSS dictionary containing document-wide security information. See PDF 2.0 specification ch. 12.8.4.3 for + * further details. */ public static final PdfName DSS = new PdfName("DSS"); - - /** A name */ + + /** + * A name + */ public static final PdfName DUR = new PdfName("Dur"); - /** A name */ + /** + * A name + */ public static final PdfName DUPLEX = new PdfName("Duplex"); - /** A name */ + /** + * A name + */ public static final PdfName DUPLEXFLIPSHORTEDGE = new PdfName("DuplexFlipShortEdge"); - /** A name */ + /** + * A name + */ public static final PdfName DUPLEXFLIPLONGEDGE = new PdfName("DuplexFlipLongEdge"); - /** (Optional; inheritable) The default value to which the field reverts when a reset-form action is executed. The format of this - * value is the same as that of V. */ + /** + * (Optional; inheritable) The default value to which the field reverts when a reset-form action is executed. The + * format of this value is the same as that of V. + */ public static final PdfName DV = new PdfName("DV"); - /** A name */ + /** + * A name + */ public static final PdfName DW = new PdfName("DW"); - /** - * Entry in a structure element dictionary: The expanded form of an abbreviation or an acronym. + /** + * Entry in a structure element dictionary: The expanded form of an abbreviation or an acronym. *

      OR

      - * Entry in an annotation’s additional-actions dictionary: An action that shall be performed when - * the cursor enters theannotation’s active area. + * Entry in an annotation’s additional-actions dictionary: An action that shall be performed when the cursor enters + * theannotation’s active area. *

      OR

      - * Entry in a collection field dictionary: A flag indicating whether the interactive PDF processor - * should provide support for editing the field value. + * Entry in a collection field dictionary: A flag indicating whether the interactive PDF processor should provide + * support for editing the field value. *

      OR more... - * */ + */ public static final PdfName E = new PdfName("E"); - /** A name */ + /** + * A name + */ public static final PdfName EARLYCHANGE = new PdfName("EarlyChange"); - /** A name */ + /** + * A name + */ public static final PdfName EF = new PdfName("EF"); /** * A name - * @since 2.1.3 + * + * @since 2.1.3 */ public static final PdfName EFF = new PdfName("EFF"); /** * A name - * @since 2.1.3 + * + * @since 2.1.3 */ public static final PdfName EFOPEN = new PdfName("EFOpen"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName EMBEDDED = new PdfName("Embedded"); - /** A name */ + /** + * A name + */ public static final PdfName EMBEDDEDFILE = new PdfName("EmbeddedFile"); - /** A name */ + /** + * A name + */ public static final PdfName EMBEDDEDFILES = new PdfName("EmbeddedFiles"); - /** A name */ + /** + * A name + */ public static final PdfName ENCODE = new PdfName("Encode"); - /** A name */ + /** + * A name + */ public static final PdfName ENCODEDBYTEALIGN = new PdfName("EncodedByteAlign"); - /** A name */ + /** + * A name + */ public static final PdfName ENCODING = new PdfName("Encoding"); - /** A name */ + /** + * A name + */ public static final PdfName ENCRYPT = new PdfName("Encrypt"); - /** A name */ + /** + * A name + */ public static final PdfName ENCRYPTMETADATA = new PdfName("EncryptMetadata"); - /** A name */ + /** + * A name + */ public static final PdfName ENDOFBLOCK = new PdfName("EndOfBlock"); - /** A name */ + /** + * A name + */ public static final PdfName ENDOFLINE = new PdfName("EndOfLine"); - + /** * Extension supplied by ETSI TS 102 778-4 V1.1.2 (2009-12) */ public static final PdfName ESIC = new PdfName("ESIC"); - - /** Stands for "Exclude all fields except those specified in Fields array" which is one possible value of the Action attribute in a signature field lock dictionary */ + + /** + * Stands for "Exclude all fields except those specified in Fields array" which is one possible value of the Action + * attribute in a signature field lock dictionary + */ public static final PdfName EXCLUDE = new PdfName("Exclude"); - - /** A name */ + + /** + * A name + */ public static final PdfName EXTEND = new PdfName("Extend"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName EXTENSIONS = new PdfName("Extensions"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName EXTENSIONLEVEL = new PdfName("ExtensionLevel"); - /** A name */ + /** + * A name + */ public static final PdfName EXTGSTATE = new PdfName("ExtGState"); - /** A name */ + /** + * A name + */ public static final PdfName EXPORT = new PdfName("Export"); - /** A name */ + /** + * A name + */ public static final PdfName EXPORTSTATE = new PdfName("ExportState"); - /** A name */ + /** + * A name + */ public static final PdfName EVENT = new PdfName("Event"); - /** (Optional) A set of flags specifying various characteristics of the annotation Default value: 0. */ + /** + * (Optional) A set of flags specifying various characteristics of the annotation Default value: 0. + */ public static final PdfName F = new PdfName("F"); /** * A name. + * * @since 2.1.6 */ public static final PdfName FAR = new PdfName("Far"); - /** A name */ + /** + * A name + */ public static final PdfName FB = new PdfName("FB"); - /** A name */ + /** + * A name + */ public static final PdfName FDECODEPARMS = new PdfName("FDecodeParms"); - /** A name */ + /** + * A name + */ public static final PdfName FDF = new PdfName("FDF"); - /** (Optional; inheritable) A set of flags specifying various characteristics of the field. Default value: 0. */ + /** + * (Optional; inheritable) A set of flags specifying various characteristics of the field. Default value: 0. + */ public static final PdfName FF = new PdfName("Ff"); - /** A name */ + /** + * A name + */ public static final PdfName FFILTER = new PdfName("FFilter"); - + /** - * The FieldMDP transform method shall be used to detect changes to the values of a list of form fields. - * The entries in its transform parameters dictionary are Type, Actions, Field and V. + * The FieldMDP transform method shall be used to detect changes to the values of a list of form fields. The entries + * in its transform parameters dictionary are Type, Actions, Field and V. */ public static final PdfName FIELDMDP = new PdfName("FieldMDP"); - - /** A name */ + + /** + * A name + */ public static final PdfName FIELDS = new PdfName("Fields"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 + */ + public static final PdfName FIGURE = new PdfName("Figure"); + /** + * A name + */ + public static final PdfName FILEATTACHMENT = new PdfName("FileAttachment"); + /** + * A name + */ + public static final PdfName FILEID = new PdfName("FileId"); + /** + * A name + */ + public static final PdfName FILESPEC = new PdfName("Filespec"); + /** + * A name + */ + public static final PdfName FILTER = new PdfName("Filter"); + /** + * A name + */ + public static final PdfName FIRST = new PdfName("First"); + /** + * A name + */ + public static final PdfName FIRSTCHAR = new PdfName("FirstChar"); + /** + * A name */ - public static final PdfName FIGURE = new PdfName( "Figure" ); - /** A name */ - public static final PdfName FILEATTACHMENT = new PdfName("FileAttachment"); - /** A name */ - public static final PdfName FILEID = new PdfName("FileId"); - /** A name */ - public static final PdfName FILESPEC = new PdfName("Filespec"); - /** A name */ - public static final PdfName FILTER = new PdfName("Filter"); - /** A name */ - public static final PdfName FIRST = new PdfName("First"); - /** A name */ - public static final PdfName FIRSTCHAR = new PdfName("FirstChar"); - /** A name */ public static final PdfName FIRSTPAGE = new PdfName("FirstPage"); - /** A name */ + /** + * A name + */ public static final PdfName FIT = new PdfName("Fit"); - /** A name */ + /** + * A name + */ public static final PdfName FITH = new PdfName("FitH"); - /** A name */ + /** + * A name + */ public static final PdfName FITV = new PdfName("FitV"); - /** A name */ + /** + * A name + */ public static final PdfName FITR = new PdfName("FitR"); - /** A name */ + /** + * A name + */ public static final PdfName FITB = new PdfName("FitB"); - /** A name */ + /** + * A name + */ public static final PdfName FITBH = new PdfName("FitBH"); - /** A name */ + /** + * A name + */ public static final PdfName FITBV = new PdfName("FitBV"); - /** A name */ + /** + * A name + */ public static final PdfName FITWINDOW = new PdfName("FitWindow"); - /** A name */ + /** + * A name + */ public static final PdfName FLAGS = new PdfName("Flags"); /** * A name. + * * @since 2.1.6 */ public static final PdfName FLASH = new PdfName("Flash"); /** * A name. + * * @since 2.1.6 */ public static final PdfName FLASHVARS = new PdfName("FlashVars"); - /** A name */ + /** + * A name + */ public static final PdfName FLATEDECODE = new PdfName("FlateDecode"); - /** A name */ + /** + * A name + */ public static final PdfName FO = new PdfName("Fo"); - /** A name */ + /** + * A name + */ public static final PdfName FONT = new PdfName("Font"); - /** A name */ + /** + * A name + */ public static final PdfName FONTBBOX = new PdfName("FontBBox"); - /** A name */ + /** + * A name + */ public static final PdfName FONTDESCRIPTOR = new PdfName("FontDescriptor"); - /** A byte string specifying the preferred font family name. E.g. for the font Times Bold Italic, the FontFamily is Times. */ + /** + * A byte string specifying the preferred font family name. E.g. for the font Times Bold Italic, the FontFamily is + * Times. + */ public static final PdfName FONTFAMILY = new PdfName("FontFamily"); - /** A name */ + /** + * A name + */ public static final PdfName FONTFILE = new PdfName("FontFile"); - /** A name */ + /** + * A name + */ public static final PdfName FONTFILE2 = new PdfName("FontFile2"); - /** A name */ + /** + * A name + */ public static final PdfName FONTFILE3 = new PdfName("FontFile3"); - /** A name */ + /** + * A name + */ public static final PdfName FONTMATRIX = new PdfName("FontMatrix"); - /** (Required) The PostScript name of the font. This name shall be the same as the value of BaseFont in the font or CIDFont dictionary that refers to this font descriptor. */ + /** + * (Required) The PostScript name of the font. This name shall be the same as the value of BaseFont in the font or + * CIDFont dictionary that refers to this font descriptor. + */ public static final PdfName FONTNAME = new PdfName("FontName"); - - /** (Optional); PDF 1.5; The weight (thickness) component of the fully-qualified font name or font specifier. - * The possible values shall be 100, 200, 300, 400, 500, 600, 700, 800, or 900, where each number indicates a weight - * that is at least as dark as its predecessor. A value of 400 shall indicate a normal weight; 700 shall indicate bold. - * The specific interpretation of these values varies from font to font. E.g. 300 in one font may appear most similar - * to 500 in another. + + /** + * (Optional); PDF 1.5; The weight (thickness) component of the fully-qualified font name or font specifier. The + * possible values shall be 100, 200, 300, 400, 500, 600, 700, 800, or 900, where each number indicates a weight + * that is at least as dark as its predecessor. A value of 400 shall indicate a normal weight; 700 shall indicate + * bold. The specific interpretation of these values varies from font to font. E.g. 300 in one font may appear most + * similar to 500 in another. */ - public static final PdfName FONTWEIGHT = new PdfName("FontWeight"); + public static final PdfName FONTWEIGHT = new PdfName("FontWeight"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName FOREGROUND = new PdfName("Foreground"); - /** A name */ + /** + * A name + */ public static final PdfName FORM = new PdfName("Form"); - /** A name */ + /** + * A name + */ public static final PdfName FORMTYPE = new PdfName("FormType"); /** * A name + * * @since 2.1.6 */ - public static final PdfName FORMULA = new PdfName( "Formula" ); - /** A name */ + public static final PdfName FORMULA = new PdfName("Formula"); + /** + * A name + */ public static final PdfName FREETEXT = new PdfName("FreeText"); - /** A name */ + /** + * A name + */ public static final PdfName FRM = new PdfName("FRM"); - /** A name */ + /** + * A name + */ public static final PdfName FS = new PdfName("FS"); - /** The type of field that this dictionary describes: Btn Button, Tx Text, Ch Choice, Sig Signature - * (Required; inheritable)*/ + /** + * The type of field that this dictionary describes: Btn Button, Tx Text, Ch Choice, Sig Signature (Required; + * inheritable) + */ public static final PdfName FT = new PdfName("FT"); - /** A name */ + /** + * A name + */ public static final PdfName FULLSCREEN = new PdfName("FullScreen"); - /** A name */ + /** + * A name + */ public static final PdfName FUNCTION = new PdfName("Function"); - /** A name */ + /** + * A name + */ public static final PdfName FUNCTIONS = new PdfName("Functions"); - /** A name */ + /** + * A name + */ public static final PdfName FUNCTIONTYPE = new PdfName("FunctionType"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName GAMMA = new PdfName("Gamma"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName GBK = new PdfName("GBK"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName GLITTER = new PdfName("Glitter"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName GOTO = new PdfName("GoTo"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName GOTOE = new PdfName("GoToE"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName GOTOR = new PdfName("GoToR"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName GROUP = new PdfName("Group"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName GTS_PDFA1 = new PdfName("GTS_PDFA1"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName GTS_PDFX = new PdfName("GTS_PDFX"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName GTS_PDFXVERSION = new PdfName("GTS_PDFXVersion"); - /** Optional) The annotation's highlighting mode, the visual effect that shall be used when the mouse button is pressed or held - * down inside its active area:

        - *
      • N (None) No highlighting. - *
      • I (Invert) Invert the colours used to display the contents of the annotation rectangle. - *
      • O (Outline) Stroke the colours used to display the annotation border. - *
      • P (Push) Display the annotation's down appearance, if any. If no down appearance is defined, the contents of the annotation rectangle shall be offset to appear as if it were beingpushed below the surface of the page. - *
      • T (Toggle) Same as P (which is preferred). + /** + * Optional) The annotation's highlighting mode, the visual effect that shall be used when the mouse button is + * pressed or held down inside its active area:
          + *
        • N (None) No highlighting. + *
        • I (Invert) Invert the colours used to display the contents of the annotation rectangle. + *
        • O (Outline) Stroke the colours used to display the annotation border. + *
        • P (Push) Display the annotation's down appearance, if any. If no down appearance is defined, the contents of + * the annotation rectangle shall be offset to appear as if it were beingpushed below the surface of the page. + *
        • T (Toggle) Same as P (which is preferred). *
        - * A highlighting mode other than P shall override any down appearance defined for the annotation. Default value: I. */ + * A highlighting mode other than P shall override any down appearance defined for the annotation. Default value: + * I. + */ public static final PdfName H = new PdfName("H"); /** * A name + * * @since 2.1.6 */ - public static final PdfName H1 = new PdfName( "H1" ); + public static final PdfName H1 = new PdfName("H1"); /** * A name + * * @since 2.1.6 */ public static final PdfName H2 = new PdfName("H2"); /** * A name + * * @since 2.1.6 */ public static final PdfName H3 = new PdfName("H3"); /** * A name + * * @since 2.1.6 */ public static final PdfName H4 = new PdfName("H4"); /** * A name + * * @since 2.1.6 */ public static final PdfName H5 = new PdfName("H5"); /** * A name + * * @since 2.1.6 */ public static final PdfName H6 = new PdfName("H6"); /** * A name. + * * @since 2.1.6 */ public static final PdfName HALIGN = new PdfName("HAlign"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName HEIGHT = new PdfName("Height"); - /** A name */ + /** + * A name + */ public static final PdfName HELV = new PdfName("Helv"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName HELVETICA = new PdfName("Helvetica"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName HELVETICA_BOLD = new PdfName("Helvetica-Bold"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName HELVETICA_OBLIQUE = new PdfName("Helvetica-Oblique"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName HELVETICA_BOLDOBLIQUE = new PdfName("Helvetica-BoldOblique"); - /** A name */ + /** + * A name + */ public static final PdfName HID = new PdfName("Hid"); - /** A name */ + /** + * A name + */ public static final PdfName HIDE = new PdfName("Hide"); - /** A name */ + /** + * A name + */ public static final PdfName HIDEMENUBAR = new PdfName("HideMenubar"); - /** A name */ + /** + * A name + */ public static final PdfName HIDETOOLBAR = new PdfName("HideToolbar"); - /** A name */ + /** + * A name + */ public static final PdfName HIDEWINDOWUI = new PdfName("HideWindowUI"); - /** A name */ + /** + * A name + */ public static final PdfName HIGHLIGHT = new PdfName("Highlight"); /** * A name. @@ -911,41 +1396,75 @@ public class PdfName extends PdfObject implements Comparable { * @since 2.1.6 */ public static final PdfName HOFFSET = new PdfName("HOffset"); - /**(Sometimes required, otherwise optional) For choice fields that allow multiple selection (MultiSelect flag set), - * an array of integers, sorted in ascending order, representing the zero-based indices in the Opt array of the currently - * selected option items. This entry shall be used when two or more elements in the Opt array have different names but the - * same export value or when the value of the choice field is an array. If the items identified by this entry differ from - * those in the V entry of the field dictionary (see discussion following this Table), the V entry shall be used. */ + /** + * (Sometimes required, otherwise optional) For choice fields that allow multiple selection (MultiSelect flag set), + * an array of integers, sorted in ascending order, representing the zero-based indices in the Opt array of the + * currently selected option items. This entry shall be used when two or more elements in the Opt array have + * different names but the same export value or when the value of the choice field is an array. If the items + * identified by this entry differ from those in the V entry of the field dictionary (see discussion following this + * Table), the V entry shall be used. + */ public static final PdfName I = new PdfName("I"); - /** A name */ + /** + * A name + */ public static final PdfName ICCBASED = new PdfName("ICCBased"); - /** A name */ + /** + * A name + */ public static final PdfName ID = new PdfName("ID"); - /** A name */ + /** + * A name + */ public static final PdfName IDENTITY = new PdfName("Identity"); - /** A name */ + /** + * A name + */ public static final PdfName IF = new PdfName("IF"); - /** A name */ + /** + * A name + */ public static final PdfName IMAGE = new PdfName("Image"); - /** A name */ + /** + * A name + */ public static final PdfName IMAGEB = new PdfName("ImageB"); - /** A name */ + /** + * A name + */ public static final PdfName IMAGEC = new PdfName("ImageC"); - /** A name */ + /** + * A name + */ public static final PdfName IMAGEI = new PdfName("ImageI"); - /** A name */ + /** + * A name + */ public static final PdfName IMAGEMASK = new PdfName("ImageMask"); - /** Stands for "Include all fields specified in Fields array" which is one possible value of the Action attribute in a signature field lock dictionary */ + /** + * Stands for "Include all fields specified in Fields array" which is one possible value of the Action attribute in + * a signature field lock dictionary + */ public static final PdfName INCLUDE = new PdfName("Include"); - /** A name */ + /** + * A name + */ public static final PdfName INDEX = new PdfName("Index"); - /** A name */ + /** + * A name + */ public static final PdfName INDEXED = new PdfName("Indexed"); - /** A name */ + /** + * A name + */ public static final PdfName INFO = new PdfName("Info"); - /** A name */ + /** + * A name + */ public static final PdfName INK = new PdfName("Ink"); - /** A name */ + /** + * A name + */ public static final PdfName INKLIST = new PdfName("InkList"); /** * A name. @@ -953,11 +1472,17 @@ public class PdfName extends PdfObject implements Comparable { * @since 2.1.6 */ public static final PdfName INSTANCES = new PdfName("Instances"); - /** A name */ + /** + * A name + */ public static final PdfName IMPORTDATA = new PdfName("ImportData"); - /** A name */ + /** + * A name + */ public static final PdfName INTENT = new PdfName("Intent"); - /** A name */ + /** + * A name + */ public static final PdfName INTERPOLATE = new PdfName("Interpolate"); /** * A name @@ -988,192 +1513,308 @@ public class PdfName extends PdfObject implements Comparable { public static final PdfName JBIG2DECODE = new PdfName("JBIG2Decode"); /** * A name - * @since 2.1.5 + * + * @since 2.1.5 */ public static final PdfName JBIG2GLOBALS = new PdfName("JBIG2Globals"); - /** A name */ + /** + * A name + */ public static final PdfName JPXDECODE = new PdfName("JPXDecode"); - /** A name */ + /** + * A name + */ public static final PdfName JS = new PdfName("JS"); - /** A name */ + /** + * A name + */ public static final PdfName K = new PdfName("K"); - /** A name */ + /** + * A name + */ public static final PdfName KEYWORDS = new PdfName("Keywords"); - /** (Sometimes required, as described) An array of indirect references to the immediate children of this field. - * In a non-terminal field, the Kids array shall refer to field dictionaries that are immediate descendants of this field. - * In a terminal field, the Kids array ordinarily shall refer to one or more separate widget annotations that are associated - * with this field. However, if there is only one associated widget annotation, and its contents have been merged into the - * field dictionary, Kids shall be omitted. */ + /** + * (Sometimes required, as described) An array of indirect references to the immediate children of this field. In a + * non-terminal field, the Kids array shall refer to field dictionaries that are immediate descendants of this + * field. In a terminal field, the Kids array ordinarily shall refer to one or more separate widget annotations that + * are associated with this field. However, if there is only one associated widget annotation, and its contents have + * been merged into the field dictionary, Kids shall be omitted. + */ public static final PdfName KIDS = new PdfName("Kids"); - /** A name */ + /** + * A name + */ public static final PdfName L = new PdfName("L"); - /** A name */ + /** + * A name + */ public static final PdfName L2R = new PdfName("L2R"); - /** (Optional; PDF 2.0) A language identifier overriding the document's language identifier to specify the natural language for all - * text in the annotation except where overridden by other explicit language specifications.*/ + /** + * (Optional; PDF 2.0) A language identifier overriding the document's language identifier to specify the natural + * language for all text in the annotation except where overridden by other explicit language specifications. + */ public static final PdfName LANG = new PdfName("Lang"); - /** A name */ + /** + * A name + */ public static final PdfName LANGUAGE = new PdfName("Language"); - /** A name */ + /** + * A name + */ public static final PdfName LAST = new PdfName("Last"); - /** A name */ + /** + * A name + */ public static final PdfName LASTCHAR = new PdfName("LastChar"); - /** A name */ + /** + * A name + */ public static final PdfName LASTPAGE = new PdfName("LastPage"); - /** A name */ + /** + * A name + */ public static final PdfName LAUNCH = new PdfName("Launch"); /** * A name + * * @since 2.1.6 */ public static final PdfName LBL = new PdfName("Lbl"); /** * A name + * * @since 2.1.6 */ public static final PdfName LBODY = new PdfName("LBody"); - /** A name */ + /** + * A name + */ public static final PdfName LENGTH = new PdfName("Length"); - /** A name */ + /** + * A name + */ public static final PdfName LENGTH1 = new PdfName("Length1"); /** * A name + * * @since 2.1.6 */ public static final PdfName LI = new PdfName("LI"); - /** A name */ + /** + * A name + */ public static final PdfName LIMITS = new PdfName("Limits"); - /** A name */ + /** + * A name + */ public static final PdfName LINE = new PdfName("Line"); /** * A name. + * * @since 2.1.6 */ public static final PdfName LINEAR = new PdfName("Linear"); - /** A name */ + /** + * A name + */ public static final PdfName LINK = new PdfName("Link"); - /** A name */ + /** + * A name + */ public static final PdfName LISTMODE = new PdfName("ListMode"); - /** A name */ + /** + * A name + */ public static final PdfName LOCATION = new PdfName("Location"); - /** (Optional; shall be an indirect reference) A signature field lock dictionary that specifies a set of form fields that shall be - * locked when this signature field is signed.*/ + /** + * (Optional; shall be an indirect reference) A signature field lock dictionary that specifies a set of form fields + * that shall be locked when this signature field is signed. + */ public static final PdfName LOCK = new PdfName("Lock"); /** * A name - * @since 2.1.2 + * + * @since 2.1.2 */ public static final PdfName LOCKED = new PdfName("Locked"); - /** A name */ + /** + * A name + */ public static final PdfName LZWDECODE = new PdfName("LZWDecode"); - /** (Optional) The date and time when the annotation was most recently modified. The format should be a date string (a text string - * containing no whitespace, of the form (D:YYYYMMDDHHmmSSOHH'mm)) but interactive PDF processors shall accept and display a string - * in any format. */ + /** + * (Optional) The date and time when the annotation was most recently modified. The format should be a date string + * (a text string containing no whitespace, of the form (D:YYYYMMDDHHmmSSOHH'mm)) but interactive PDF processors + * shall accept and display a string in any format. + */ public static final PdfName M = new PdfName("M"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName MATERIAL = new PdfName("Material"); - /** A name */ + /** + * A name + */ public static final PdfName MATRIX = new PdfName("Matrix"); - /** A name of an encoding */ + /** + * A name of an encoding + */ public static final PdfName MAC_EXPERT_ENCODING = new PdfName("MacExpertEncoding"); - /** A name of an encoding */ + /** + * A name of an encoding + */ public static final PdfName MAC_ROMAN_ENCODING = new PdfName("MacRomanEncoding"); - /** A name */ + /** + * A name + */ public static final PdfName MARKED = new PdfName("Marked"); - /** A name */ + /** + * A name + */ public static final PdfName MARKINFO = new PdfName("MarkInfo"); - /** A name */ + /** + * A name + */ public static final PdfName MASK = new PdfName("Mask"); /** * A name - * @since 2.1.6 renamed from MAX + * + * @since 2.1.6 renamed from MAX */ public static final PdfName MAX_LOWER_CASE = new PdfName("max"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName MAX_CAMEL_CASE = new PdfName("Max"); - /** (Optional; inheritable) The maximum length of the field's text, in characters */ + /** + * (Optional; inheritable) The maximum length of the field's text, in characters + */ public static final PdfName MAXLEN = new PdfName("MaxLen"); - /** A name */ + /** + * A name + */ public static final PdfName MEDIABOX = new PdfName("MediaBox"); - /** A name */ + /** + * A name + */ public static final PdfName MCID = new PdfName("MCID"); - /** A name */ + /** + * A name + */ public static final PdfName MCR = new PdfName("MCR"); - /** A name */ + /** + * A name + */ public static final PdfName METADATA = new PdfName("Metadata"); /** * A name - * @since 2.1.6 renamed from MIN + * + * @since 2.1.6 renamed from MIN */ public static final PdfName MIN_LOWER_CASE = new PdfName("min"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName MIN_CAMEL_CASE = new PdfName("Min"); - /** (Optional) An appearance characteristics dictionary that shall be used in constructing a dynamic appearance stream - * specifying the annotation's visual presentation on the page.*/ + /** + * (Optional) An appearance characteristics dictionary that shall be used in constructing a dynamic appearance + * stream specifying the annotation's visual presentation on the page. + */ public static final PdfName MK = new PdfName("MK"); - /** A name */ + /** + * A name + */ public static final PdfName MMTYPE1 = new PdfName("MMType1"); - /** A name */ + /** + * A name + */ public static final PdfName MODDATE = new PdfName("ModDate"); - /** A name */ + /** + * A name + */ public static final PdfName N = new PdfName("N"); - /** A name */ + /** + * A name + */ public static final PdfName N0 = new PdfName("n0"); - /** A name */ + /** + * A name + */ public static final PdfName N1 = new PdfName("n1"); - /** A name */ + /** + * A name + */ public static final PdfName N2 = new PdfName("n2"); - /** A name */ + /** + * A name + */ public static final PdfName N3 = new PdfName("n3"); - /** A name */ + /** + * A name + */ public static final PdfName N4 = new PdfName("n4"); - /** (optional) The name of the person or authority signing the document. This value should be used only when - * it is not possible to extract the name from the signature. */ + /** + * (optional) The name of the person or authority signing the document. This value should be used only when it is + * not possible to extract the name from the signature. + */ public static final PdfName NAME = new PdfName("Name"); - /** A name */ + /** + * A name + */ public static final PdfName NAMED = new PdfName("Named"); - /** A name */ + /** + * A name + */ public static final PdfName NAMES = new PdfName("Names"); /** * A name. + * * @since 2.1.6 */ public static final PdfName NAVIGATION = new PdfName("Navigation"); /** * A name. + * * @since 2.1.6 */ public static final PdfName NAVIGATIONPANE = new PdfName("NavigationPane"); /** * A name. + * * @since 2.1.6 */ public static final PdfName NEAR = new PdfName("Near"); - /** A name */ + /** + * A name + */ public static final PdfName NEEDAPPEARANCES = new PdfName("NeedAppearances"); - /** A name */ + /** + * A name + */ public static final PdfName NEWWINDOW = new PdfName("NewWindow"); - /** A name */ + /** + * A name + */ public static final PdfName NEXT = new PdfName("Next"); - /** A name */ + /** + * A name + */ public static final PdfName NEXTPAGE = new PdfName("NextPage"); - + /** - *The annotation name, a text string uniquely identifying it among all the annotations on its page. + * The annotation name, a text string uniquely identifying it among all the annotations on its page. */ public static final PdfName NM = new PdfName("NM"); - /** A name */ + /** + * A name + */ public static final PdfName NONE = new PdfName("None"); - + /** * If there is a Legal dictionary in the catalog of the PDF file, and the NonEmbeddedFonts attribute (which * specifies the number of fonts not embedded) in that dictionary has a non-zero value, and the viewing application @@ -1181,181 +1822,291 @@ public class PdfName extends PdfObject implements Comparable { * this attribute will be set to true (meaning that no warning need be displayed) */ public static final PdfName NONEFONTNOWARN = new PdfName("NonEFontNoWarn"); - - /** A name */ + + /** + * A name + */ public static final PdfName NONFULLSCREENPAGEMODE = new PdfName("NonFullScreenPageMode"); /** * A name + * * @since 2.1.6 */ public static final PdfName NONSTRUCT = new PdfName("NonStruct"); /** * A name + * * @since 2.1.6 */ public static final PdfName NOTE = new PdfName("Note"); - /** A name */ + /** + * A name + */ public static final PdfName NUMCOPIES = new PdfName("NumCopies"); - /** A name */ + /** + * A name + */ public static final PdfName NUMS = new PdfName("Nums"); - /** A name */ + /** + * A name + */ public static final PdfName O = new PdfName("O"); /** * A name used with Document Structure + * * @since 2.1.5 */ public static final PdfName OBJ = new PdfName("Obj"); /** * a name used with Doucment Structure + * * @since 2.1.5 */ public static final PdfName OBJR = new PdfName("OBJR"); - /** A name */ + /** + * A name + */ public static final PdfName OBJSTM = new PdfName("ObjStm"); - /** (Optional) An optional content group or optional content membership dictionary specifying the optional content properties for the - * annotation. Before the annotation is drawn, its visibility shall be determined based on this entry as well as the annotation flags - * specified in the F entry. If it is determined to be invisible, the annotation shall not be drawn.*/ + /** + * (Optional) An optional content group or optional content membership dictionary specifying the optional content + * properties for the annotation. Before the annotation is drawn, its visibility shall be determined based on this + * entry as well as the annotation flags specified in the F entry. If it is determined to be invisible, the + * annotation shall not be drawn. + */ public static final PdfName OC = new PdfName("OC"); - /** A name */ + /** + * A name + */ public static final PdfName OCG = new PdfName("OCG"); - /** A name */ + /** + * A name + */ public static final PdfName OCGS = new PdfName("OCGs"); - /** A name */ + /** + * A name + */ public static final PdfName OCMD = new PdfName("OCMD"); - /** A name */ + /** + * A name + */ public static final PdfName OCPROPERTIES = new PdfName("OCProperties"); - /** (Optional) The checked value for the Checkbox form field. The recommended name for the on state is Yes, but this is not required.*/ + /** + * (Optional) The checked value for the Checkbox form field. The recommended name for the on state is Yes, but this + * is not required. + */ public static final PdfName YES = new PdfName("Yes"); - + /** - * An array of indirect references to streams, each containing a DER-encoded Online Certificate Status Protocol (OCSP) response - * (see RFC 6960). This array contains OCSPs that may be used in the validation of the signatures in the document. + * An array of indirect references to streams, each containing a DER-encoded Online Certificate Status Protocol + * (OCSP) response (see RFC 6960). This array contains OCSPs that may be used in the validation of the signatures in + * the document. */ public static final PdfName OCSPS = new PdfName("OCSPs"); - - /** (Required if R is 6 (PDF 2.0)) A 32-byte string, based on the owner and userpassword, that shall be used in computing the file encryption key.*/ + + /** + * (Required if R is 6 (PDF 2.0)) A 32-byte string, based on the owner and userpassword, that shall be used in + * computing the file encryption key. + */ public static final PdfName OE = new PdfName("OE"); - /** A name */ + /** + * A name + */ public static final PdfName Off = new PdfName("Off"); - /** A name */ + /** + * A name + */ public static final PdfName OFF = new PdfName("OFF"); - /** A name */ + /** + * A name + */ public static final PdfName ON = new PdfName("ON"); - /** A name */ + /** + * A name + */ public static final PdfName ONECOLUMN = new PdfName("OneColumn"); - /** A name */ + /** + * A name + */ public static final PdfName OPEN = new PdfName("Open"); - /** A name */ + /** + * A name + */ public static final PdfName OPENACTION = new PdfName("OpenAction"); - /** A name */ + /** + * A name + */ public static final PdfName OP = new PdfName("OP"); - /** A name */ + /** + * A name + */ public static final PdfName op = new PdfName("op"); - /** A name */ + /** + * A name + */ public static final PdfName OPM = new PdfName("OPM"); - /** (Optional; inheritable) An array containing one entry for each widget annotation in the Kids array of the radio button or check - * box field. Each entry shall be a text string representing the on state of the corresponding widget annotation. - * When this entry is present, the names used to represent the on state in the AP dictionary of each annotation may use numerical - * position (starting with 0) of the annotation in the Kids array, encoded as a name object (for example: /0, /1). - * This allows distinguishing between the annotations even if two or more of them have the same value in the Opt array. */ + /** + * (Optional; inheritable) An array containing one entry for each widget annotation in the Kids array of the radio + * button or check box field. Each entry shall be a text string representing the on state of the corresponding + * widget annotation. When this entry is present, the names used to represent the on state in the AP dictionary of + * each annotation may use numerical position (starting with 0) of the annotation in the Kids array, encoded as a + * name object (for example: /0, /1). This allows distinguishing between the annotations even if two or more of them + * have the same value in the Opt array. + */ public static final PdfName OPT = new PdfName("Opt"); - /** A name */ + /** + * A name + */ public static final PdfName ORDER = new PdfName("Order"); - /** A name */ + /** + * A name + */ public static final PdfName ORDERING = new PdfName("Ordering"); /** - * Parts of the Build Data Dictionary. Indicates the operating system, such as Win10. - * Currently there is no specific string format defined for the value of this attribute. - * + * Parts of the Build Data Dictionary. Indicates the operating system, such as Win10. Currently there is no specific + * string format defined for the value of this attribute. */ public static final PdfName OS = new PdfName("OS"); - + /** * A name. + * * @since 2.1.6 */ public static final PdfName OSCILLATING = new PdfName("Oscillating"); - /** A name */ + /** + * A name + */ public static final PdfName OUTLINES = new PdfName("Outlines"); - /** A name */ + /** + * A name + */ public static final PdfName OUTPUTCONDITION = new PdfName("OutputCondition"); - /** A name */ + /** + * A name + */ public static final PdfName OUTPUTCONDITIONIDENTIFIER = new PdfName("OutputConditionIdentifier"); - /** A name */ + /** + * A name + */ public static final PdfName OUTPUTINTENT = new PdfName("OutputIntent"); - /** A name */ + /** + * A name + */ public static final PdfName OUTPUTINTENTS = new PdfName("OutputIntents"); - /** (Optional) An indirect reference to the page object with which this annotation is associated. This entry shall be present in - * screen annotations associated with rendition actions. OR - * (Optional; PDF 2.0) The access permissions granted for this document. Valid values shall be 1,2,3 - * */ + /** + * (Optional) An indirect reference to the page object with which this annotation is associated. This entry shall be + * present in screen annotations associated with rendition actions. OR (Optional; PDF 2.0) The access permissions + * granted for this document. Valid values shall be 1,2,3 + */ public static final PdfName P = new PdfName("P"); - /** A name */ + /** + * A name + */ public static final PdfName PAGE = new PdfName("Page"); - /** A name */ + /** + * A name + */ public static final PdfName PAGELABELS = new PdfName("PageLabels"); - /** A name */ + /** + * A name + */ public static final PdfName PAGELAYOUT = new PdfName("PageLayout"); - /** A name */ + /** + * A name + */ public static final PdfName PAGEMODE = new PdfName("PageMode"); - /** A name */ + /** + * A name + */ public static final PdfName PAGES = new PdfName("Pages"); - /** A name */ + /** + * A name + */ public static final PdfName PAINTTYPE = new PdfName("PaintType"); - /** A name */ + /** + * A name + */ public static final PdfName PANOSE = new PdfName("Panose"); - /** A name */ + /** + * A name + */ public static final PdfName PARAMS = new PdfName("Params"); - /**(Required if this field is the child of another in the field hierarchy; absent otherwise) The field that is the immediate - * parent of this one (the field, if any, whose Kids array includes this field). A field can have at most one parent; that is, - * it can be included in the Kids array of at most one other field. */ + /** + * (Required if this field is the child of another in the field hierarchy; absent otherwise) The field that is the + * immediate parent of this one (the field, if any, whose Kids array includes this field). A field can have at most + * one parent; that is, it can be included in the Kids array of at most one other field. + */ public static final PdfName PARENT = new PdfName("Parent"); - /** A name */ + /** + * A name + */ public static final PdfName PARENTTREE = new PdfName("ParentTree"); /** * A name used in defining Document Structure. + * * @since 2.1.5 */ - public static final PdfName PARENTTREENEXTKEY = new PdfName( "ParentTreeNextKey" ); + public static final PdfName PARENTTREENEXTKEY = new PdfName("ParentTreeNextKey"); /** * A name + * * @since 2.1.6 */ - public static final PdfName PART = new PdfName( "Part" ); + public static final PdfName PART = new PdfName("Part"); /** * A name. + * * @since 2.1.6 */ public static final PdfName PASSCONTEXTCLICK = new PdfName("PassContextClick"); - /** A name */ + /** + * A name + */ public static final PdfName PATTERN = new PdfName("Pattern"); - /** A name */ + /** + * A name + */ public static final PdfName PATTERNTYPE = new PdfName("PatternType"); /** * A name. + * * @since 2.1.6 */ public static final PdfName PC = new PdfName("PC"); - /** A name */ + /** + * A name + */ public static final PdfName PDF = new PdfName("PDF"); - /** A name */ + /** + * A name + */ public static final PdfName PDFDOCENCODING = new PdfName("PDFDocEncoding"); - /** A name */ + /** + * A name + */ public static final PdfName PERCEPTUAL = new PdfName("Perceptual"); - /** A name */ + /** + * A name + */ public static final PdfName PERMS = new PdfName("Perms"); - /** A name */ + /** + * A name + */ public static final PdfName PG = new PdfName("Pg"); /** * A name. + * * @since 2.1.6 */ public static final PdfName PI = new PdfName("PI"); - /** A name */ + /** + * A name + */ public static final PdfName PICKTRAYBYPDFSIZE = new PdfName("PickTrayByPDFSize"); /** * A name. + * * @since 2.1.6 */ public static final PdfName PLAYCOUNT = new PdfName("PlayCount"); @@ -1367,416 +2118,655 @@ public class PdfName extends PdfObject implements Comparable { public static final PdfName PMD = new PdfName("PMD"); /** * A name. + * * @since 2.1.6 */ public static final PdfName PO = new PdfName("PO"); - /** A name */ + /** + * A name + */ public static final PdfName POPUP = new PdfName("Popup"); /** * A name. + * * @since 2.1.6 */ public static final PdfName POSITION = new PdfName("Position"); - /** A name */ + /** + * A name + */ public static final PdfName PREDICTOR = new PdfName("Predictor"); - /** A name */ + /** + * A name + */ public static final PdfName PREFERRED = new PdfName("Preferred"); /** - * Parts of the Build Data Dictionary. A flag that can be used by the signature handler or software module to indicate that this signature was created with unreleased software. + * Parts of the Build Data Dictionary. A flag that can be used by the signature handler or software module to + * indicate that this signature was created with unreleased software. */ public static final PdfName PRERELEASE = new PdfName("PreRelease"); - + /** * A name. + * * @since 2.1.6 */ public static final PdfName PRESENTATION = new PdfName("Presentation"); - /** A name */ + /** + * A name + */ public static final PdfName PRESERVERB = new PdfName("PreserveRB"); - /** A name */ + /** + * A name + */ public static final PdfName PREV = new PdfName("Prev"); - /** A name */ + /** + * A name + */ public static final PdfName PREVPAGE = new PdfName("PrevPage"); - /** A name */ + /** + * A name + */ public static final PdfName PRINT = new PdfName("Print"); - /** A name */ + /** + * A name + */ public static final PdfName PRINTAREA = new PdfName("PrintArea"); - /** A name */ + /** + * A name + */ public static final PdfName PRINTCLIP = new PdfName("PrintClip"); - /** A name */ + /** + * A name + */ public static final PdfName PRINTPAGERANGE = new PdfName("PrintPageRange"); - /** A name */ + /** + * A name + */ public static final PdfName PRINTSCALING = new PdfName("PrintScaling"); - /** A name */ + /** + * A name + */ public static final PdfName PRINTSTATE = new PdfName("PrintState"); /** * A name + * * @since 2.1.6 */ public static final PdfName PRIVATE = new PdfName("Private"); - /** A name */ + /** + * A name + */ public static final PdfName PROCSET = new PdfName("ProcSet"); - /** A name */ + /** + * A name + */ public static final PdfName PRODUCER = new PdfName("Producer"); - + /** - * The build properties dictionary and all of its contents are required to be direct objects. - * The use of a build properties dictionary is optional but highly recommended. - * The build properties dictionary may contain a build data dictionary entry for each unique software module used to - * create the signature. The software modules involved in the signing process will vary depending on the viewing application. - * All signing implementations should include at least a Filter entry in the build properties dictionary. - * + * The build properties dictionary and all of its contents are required to be direct objects. The use of a build + * properties dictionary is optional but highly recommended. The build properties dictionary may contain a build + * data dictionary entry for each unique software module used to create the signature. The software modules involved + * in the signing process will vary depending on the viewing application. All signing implementations should include + * at least a Filter entry in the build properties dictionary. */ public static final PdfName PROP_BUILD = new PdfName("Prop_Build"); - - /** A name */ + + /** + * A name + */ public static final PdfName PROPERTIES = new PdfName("Properties"); - /** A name */ + /** + * A name + */ public static final PdfName PS = new PdfName("PS"); - /** A name */ + /** + * A name + */ public static final PdfName PUBSEC = new PdfName("Adobe.PubSec"); /** * A name. + * * @since 2.1.6 */ public static final PdfName PV = new PdfName("PV"); - /** (Optional; inheritable) A code specifying the form of quadding (justification) that shall be used in displaying the text: + /** + * (Optional; inheritable) A code specifying the form of quadding (justification) that shall be used in displaying + * the text: *
          - *
        • 0 Left-justified (default)
          • + *
        • 0 Left-justified (default)
          • *
        • 1 Centered
          • - *
        • 2 Right-justified
          • + *
        • 2 Right-justified
          • *
        - * */ + */ public static final PdfName Q = new PdfName("Q"); - /** A name */ + /** + * A name + */ public static final PdfName QUADPOINTS = new PdfName("QuadPoints"); /** * A name + * * @since 2.1.6 */ public static final PdfName QUOTE = new PdfName("Quote"); - /** Part of the Build Data Dictionary. The software module revision number */ + /** + * Part of the Build Data Dictionary. The software module revision number + */ public static final PdfName R = new PdfName("R"); - /** A name */ + /** + * A name + */ public static final PdfName R2L = new PdfName("R2L"); - /** A name */ + /** + * A name + */ public static final PdfName RANGE = new PdfName("Range"); - /** A name */ + /** + * A name + */ public static final PdfName RC = new PdfName("RC"); - /** A name */ + /** + * A name + */ public static final PdfName RBGROUPS = new PdfName("RBGroups"); - /** A name */ + /** + * A name + */ public static final PdfName REASON = new PdfName("Reason"); - /** A name */ + /** + * A name + */ public static final PdfName RECIPIENTS = new PdfName("Recipients"); - /** (Required) The annotation rectangle, defining the location of the annotation on the page in default user space units. */ + /** + * (Required) The annotation rectangle, defining the location of the annotation on the page in default user space + * units. + */ public static final PdfName RECT = new PdfName("Rect"); - /** A name */ + /** + * A name + */ public static final PdfName REFERENCE = new PdfName("Reference"); - /** A name */ + /** + * A name + */ public static final PdfName REGISTRY = new PdfName("Registry"); - /** A name */ + /** + * A name + */ public static final PdfName REGISTRYNAME = new PdfName("RegistryName"); /** * A name - * @since 2.1.5 renamed from RELATIVECALORIMETRIC + * + * @since 2.1.5 renamed from RELATIVECALORIMETRIC */ public static final PdfName RELATIVECOLORIMETRIC = new PdfName("RelativeColorimetric"); - /** A name */ + /** + * A name + */ public static final PdfName RENDITION = new PdfName("Rendition"); - /** A name */ + /** + * A name + */ public static final PdfName RESETFORM = new PdfName("ResetForm"); - /** A name */ + /** + * A name + */ public static final PdfName RESOURCES = new PdfName("Resources"); - /** A name */ + /** + * A name + */ public static final PdfName RI = new PdfName("RI"); /** - * Part of the Build Data Dictionary when used as the App dictionary. - * A text string indicating the version of the application implementation, as described by the Name attribute in this dictionary. When set by Adobe Acrobat, this entry is in the format: major.minor.micro (for example 7.0.7). - * + * Part of the Build Data Dictionary when used as the App dictionary. A text string indicating the version of the + * application implementation, as described by the Name attribute in this dictionary. When set by Adobe Acrobat, + * this entry is in the format: major.minor.micro (for example 7.0.7). */ public static final PdfName REX = new PdfName("REx"); - + /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIA = new PdfName("RichMedia"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIAACTIVATION = new PdfName("RichMediaActivation"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIAANIMATION = new PdfName("RichMediaAnimation"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName RICHMEDIACOMMAND = new PdfName("RichMediaCommand"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIACONFIGURATION = new PdfName("RichMediaConfiguration"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIACONTENT = new PdfName("RichMediaContent"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIADEACTIVATION = new PdfName("RichMediaDeactivation"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIAEXECUTE = new PdfName("RichMediaExecute"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIAINSTANCE = new PdfName("RichMediaInstance"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIAPARAMS = new PdfName("RichMediaParams"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIAPOSITION = new PdfName("RichMediaPosition"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIAPRESENTATION = new PdfName("RichMediaPresentation"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIASETTINGS = new PdfName("RichMediaSettings"); /** * A name. + * * @since 2.1.6 */ public static final PdfName RICHMEDIAWINDOW = new PdfName("RichMediaWindow"); - /** A name */ + /** + * A name + */ public static final PdfName ROLEMAP = new PdfName("RoleMap"); - /** A name */ + /** + * A name + */ public static final PdfName ROOT = new PdfName("Root"); - /** A name */ + /** + * A name + */ public static final PdfName ROTATE = new PdfName("Rotate"); - /** A name */ + /** + * A name + */ public static final PdfName ROWS = new PdfName("Rows"); /** * A name + * * @since 2.1.6 */ - public static final PdfName RUBY = new PdfName( "Ruby" ); - /** A name */ + public static final PdfName RUBY = new PdfName("Ruby"); + /** + * A name + */ public static final PdfName RUNLENGTHDECODE = new PdfName("RunLengthDecode"); - /** (Optional) A rich text string; described in the PDF Specification Annex M*/ + /** + * (Optional) A rich text string; described in the PDF Specification Annex M + */ public static final PdfName RV = new PdfName("RV"); - /** A name */ + /** + * A name + */ public static final PdfName S = new PdfName("S"); - /** A name */ + /** + * A name + */ public static final PdfName SATURATION = new PdfName("Saturation"); - /** A name */ + /** + * A name + */ public static final PdfName SCHEMA = new PdfName("Schema"); - /** A name */ + /** + * A name + */ public static final PdfName SCREEN = new PdfName("Screen"); /** * A name. + * * @since 2.1.6 */ public static final PdfName SCRIPTS = new PdfName("Scripts"); - /** A name */ + /** + * A name + */ public static final PdfName SECT = new PdfName("Sect"); - /** A name */ + /** + * A name + */ public static final PdfName SEPARATION = new PdfName("Separation"); - /** A name */ + /** + * A name + */ public static final PdfName SETOCGSTATE = new PdfName("SetOCGState"); /** * A name. + * * @since 2.1.6 */ public static final PdfName SETTINGS = new PdfName("Settings"); - /** A name */ + /** + * A name + */ public static final PdfName SHADING = new PdfName("Shading"); - /** A name */ + /** + * A name + */ public static final PdfName SHADINGTYPE = new PdfName("ShadingType"); - /** A name */ + /** + * A name + */ public static final PdfName SHIFT_JIS = new PdfName("Shift-JIS"); - /** A name */ + /** + * A name + */ public static final PdfName SIG = new PdfName("Sig"); - - /**The type name of a signature field lock dictionary */ + + /** + * The type name of a signature field lock dictionary + */ public static final PdfName SIGFIELDLOCK = new PdfName("SigFieldLock"); - - /** A name */ + + /** + * A name + */ public static final PdfName SIGFLAGS = new PdfName("SigFlags"); - /** A name */ + /** + * A name + */ public static final PdfName SIGREF = new PdfName("SigRef"); - /** A name */ + /** + * A name + */ public static final PdfName SIMPLEX = new PdfName("Simplex"); - /** A name */ + /** + * A name + */ public static final PdfName SINGLEPAGE = new PdfName("SinglePage"); - /** A name */ + /** + * A name + */ public static final PdfName SIZE = new PdfName("Size"); - /** A name */ + /** + * A name + */ public static final PdfName SMASK = new PdfName("SMask"); - /** A name */ + /** + * A name + */ public static final PdfName SORT = new PdfName("Sort"); /** * A name. + * * @since 2.1.6 */ public static final PdfName SOUND = new PdfName("Sound"); - /** A name */ + /** + * A name + */ public static final PdfName SPAN = new PdfName("Span"); /** * A name. + * * @since 2.1.6 */ public static final PdfName SPEED = new PdfName("Speed"); - /** A name */ + /** + * A name + */ public static final PdfName SPLIT = new PdfName("Split"); - /** A name */ + /** + * A name + */ public static final PdfName SQUARE = new PdfName("Square"); /** * A name + * * @since 2.1.3 */ public static final PdfName SQUIGGLY = new PdfName("Squiggly"); - /** A name */ + /** + * A name + */ public static final PdfName ST = new PdfName("St"); - /** A name */ + /** + * A name + */ public static final PdfName STAMP = new PdfName("Stamp"); - /** A name */ + /** + * A name + */ public static final PdfName STANDARD = new PdfName("Standard"); - /** (Optional; PDF 1.5) The state to which the original annotation should be set. Default: "Unmarked" if StateModel is "Marked"; - * "None" if StateModel is "Review". (Additional entries specific to a text annotation)*/ + /** + * (Optional; PDF 1.5) The state to which the original annotation should be set. Default: "Unmarked" if StateModel + * is "Marked"; "None" if StateModel is "Review". (Additional entries specific to a text annotation) + */ public static final PdfName STATE = new PdfName("State"); - /** (Required if State is present, otherwise optional; PDF 1.5) The state model corresponding to State; see "Annotation States" above. (Additional entries specific to a text annotation)*/ + /** + * (Required if State is present, otherwise optional; PDF 1.5) The state model corresponding to State; see + * "Annotation States" above. (Additional entries specific to a text annotation) + */ public static final PdfName STATEMODEL = new PdfName("StateModel"); - /** A name */ + /** + * A name + */ public static final PdfName STDCF = new PdfName("StdCF"); - /** A name */ + /** + * A name + */ public static final PdfName STEMV = new PdfName("StemV"); - /** A name */ + /** + * A name + */ public static final PdfName STMF = new PdfName("StmF"); - /** A name */ + /** + * A name + */ public static final PdfName STRF = new PdfName("StrF"); - /** A name */ + /** + * A name + */ public static final PdfName STRIKEOUT = new PdfName("StrikeOut"); - /** (Required if the annotation is a structural content item) The integer key of the annotation's entry in the structural parent tree.*/ + /** + * (Required if the annotation is a structural content item) The integer key of the annotation's entry in the + * structural parent tree. + */ public static final PdfName STRUCTPARENT = new PdfName("StructParent"); - /** A name */ + /** + * A name + */ public static final PdfName STRUCTPARENTS = new PdfName("StructParents"); - /** A name */ + /** + * A name + */ public static final PdfName STRUCTTREEROOT = new PdfName("StructTreeRoot"); - /** A name */ + /** + * A name + */ public static final PdfName STYLE = new PdfName("Style"); - /** A name */ + /** + * A name + */ public static final PdfName SUBFILTER = new PdfName("SubFilter"); - /** (Optional; PDF 1.5) Text representing a short description of the subject being addressed by the annotation. (Additional entry specific to markup annotations)*/ + /** + * (Optional; PDF 1.5) Text representing a short description of the subject being addressed by the annotation. + * (Additional entry specific to markup annotations) + */ public static final PdfName SUBJ = new PdfName("Subj"); - /** A name */ + /** + * A name + */ public static final PdfName SUBJECT = new PdfName("Subject"); - /** A name */ + /** + * A name + */ public static final PdfName SUBMITFORM = new PdfName("SubmitForm"); - /** (Required) The type of annotation that this dictionary describes.*/ + /** + * (Required) The type of annotation that this dictionary describes. + */ public static final PdfName SUBTYPE = new PdfName("Subtype"); - /** A name */ + /** + * A name + */ public static final PdfName SUPPLEMENT = new PdfName("Supplement"); - /** (Optional; shall be an indirect reference) A seed value dictionary containing information that constrains the properties of a - * signature that is applied to this field. */ + /** + * (Optional; shall be an indirect reference) A seed value dictionary containing information that constrains the + * properties of a signature that is applied to this field. + */ public static final PdfName SV = new PdfName("SV"); - /** A name */ + /** + * A name + */ public static final PdfName SW = new PdfName("SW"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName SYMBOL = new PdfName("Symbol"); - /** (Required; ExtensionLevel 3) Specifies which barcode or glyph technology is to be used on this annotation. Supported values are PDF417, QRCode, and DataMatrix. (Entries in a PaperMetaData generation parameters dictionary)*/ + /** + * (Required; ExtensionLevel 3) Specifies which barcode or glyph technology is to be used on this annotation. + * Supported values are PDF417, QRCode, and DataMatrix. (Entries in a PaperMetaData generation parameters + * dictionary) + */ public static final PdfName SYMBOLOGY = new PdfName("Symbology"); - /** (Required) The partial field name. */ + /** + * (Required) The partial field name. + */ public static final PdfName T = new PdfName("T"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName TA = new PdfName("TA"); /** * A name + * * @since 2.1.6 */ public static final PdfName TABLE = new PdfName("Table"); /** * A name - * @since 2.1.5 + * + * @since 2.1.5 */ public static final PdfName TABS = new PdfName("Tabs"); /** * A name + * * @since 2.1.6 */ public static final PdfName TBODY = new PdfName("TBody"); /** * A name + * * @since 2.1.6 */ public static final PdfName TD = new PdfName("TD"); - /** A name */ + /** + * A name + */ public static final PdfName TEXT = new PdfName("Text"); /** * A name + * * @since 2.1.6 */ public static final PdfName TFOOT = new PdfName("TFoot"); /** * A name + * * @since 2.1.6 */ public static final PdfName TH = new PdfName("TH"); /** * A name + * * @since 2.1.6 */ public static final PdfName THEAD = new PdfName("THead"); - /** A name */ + /** + * A name + */ public static final PdfName THUMB = new PdfName("Thumb"); - /** A name */ + /** + * A name + */ public static final PdfName THREADS = new PdfName("Threads"); - /** (Optional) For scrollable list boxes, the top index (the index in the Opt array of the first option visible in the list). Default value: 0. */ + /** + * (Optional) For scrollable list boxes, the top index (the index in the Opt array of the first option visible in + * the list). Default value: 0. + */ public static final PdfName TI = new PdfName("TI"); /** * A name - * @since 2.1.6 + * + * @since 2.1.6 */ public static final PdfName TIME = new PdfName("Time"); - /** A name */ + /** + * A name + */ public static final PdfName TILINGTYPE = new PdfName("TilingType"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName TIMES_ROMAN = new PdfName("Times-Roman"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName TIMES_BOLD = new PdfName("Times-Bold"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName TIMES_ITALIC = new PdfName("Times-Italic"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName TIMES_BOLDITALIC = new PdfName("Times-BoldItalic"); - /** A name */ + /** + * A name + */ public static final PdfName TITLE = new PdfName("Title"); /** * A name */ public static final PdfName TK = new PdfName("TK"); - /** Optional) The mapping name that shall be used when exporting interactive form field data from the document.*/ + /** + * Optional) The mapping name that shall be used when exporting interactive form field data from the document. + */ public static final PdfName TM = new PdfName("TM"); /** * A name @@ -1786,45 +2776,69 @@ public class PdfName extends PdfObject implements Comparable { public static final PdfName TOC = new PdfName("TOC"); /** * A name + * * @since 2.1.6 */ public static final PdfName TOCI = new PdfName("TOCI"); - /** A name */ + /** + * A name + */ public static final PdfName TOGGLE = new PdfName("Toggle"); /** * A name. + * * @since 2.1.6 */ public static final PdfName TOOLBAR = new PdfName("Toolbar"); - /** A name */ + /** + * A name + */ public static final PdfName TOUNICODE = new PdfName("ToUnicode"); - /** A name */ + /** + * A name + */ public static final PdfName TP = new PdfName("TP"); /** * A name + * * @since 2.1.6 */ - public static final PdfName TABLEROW = new PdfName( "TR" ); - /** A name */ + public static final PdfName TABLEROW = new PdfName("TR"); + /** + * A name + */ public static final PdfName TRANS = new PdfName("Trans"); - /** A name */ + /** + * A name + */ public static final PdfName TRANSFORMPARAMS = new PdfName("TransformParams"); - /** A name */ + /** + * A name + */ public static final PdfName TRANSFORMMETHOD = new PdfName("TransformMethod"); - /** A name */ + /** + * A name + */ public static final PdfName TRANSPARENCY = new PdfName("Transparency"); /** * A name. + * * @since 2.1.6 */ public static final PdfName TRANSPARENT = new PdfName("Transparent"); - /** A name */ + /** + * A name + */ public static final PdfName TRAPPED = new PdfName("Trapped"); - /** A name */ + /** + * A name + */ public static final PdfName TRIMBOX = new PdfName("TrimBox"); - /** A name */ + /** + * A name + */ public static final PdfName TRUETYPE = new PdfName("TrueType"); - + /** * Parts of the Build Data Dictionary If the value is true, the application was in trusted mode when signing took * place. The default value is false. A viewing application is in trusted mode when only reviewed code is executing, @@ -1832,23 +2846,37 @@ public class PdfName extends PdfObject implements Comparable { * PDF Reference. */ public static final PdfName TRUSTEDMODE = new PdfName("TrustedMode"); - - /** (Optional) An alternative field name that shall be used in place of the actual field name wherever the field shall be identified - * in the user interface (such as in error or status messages referring to the field). This text is also useful when extracting - * the document's contents in support of accessibility to users with disabilities or for other purposes. */ + + /** + * (Optional) An alternative field name that shall be used in place of the actual field name wherever the field + * shall be identified in the user interface (such as in error or status messages referring to the field). This text + * is also useful when extracting the document's contents in support of accessibility to users with disabilities or + * for other purposes. + */ public static final PdfName TU = new PdfName("TU"); - /** A name */ + /** + * A name + */ public static final PdfName TWOCOLUMNLEFT = new PdfName("TwoColumnLeft"); - /** A name */ + /** + * A name + */ public static final PdfName TWOCOLUMNRIGHT = new PdfName("TwoColumnRight"); - /** A name */ + /** + * A name + */ public static final PdfName TWOPAGELEFT = new PdfName("TwoPageLeft"); - /** A name */ + /** + * A name + */ public static final PdfName TWOPAGERIGHT = new PdfName("TwoPageRight"); - /** A name */ + /** + * A name + */ public static final PdfName TX = new PdfName("Tx"); - /** There are lots of Type s in the PDF specification. The following dictionaries use Type: - * + /** + * There are lots of Type s in the PDF specification. The following dictionaries use Type: + * *
          *
        • Crypt filters
          • *
        • object stream dictionary
          • @@ -1879,54 +2907,99 @@ public class PdfName extends PdfObject implements Comparable { *
        • annotation dictionaries
          • *
        • field lock dictionary
          • *
        • ...
          • - * + * *
        - * */ + */ public static final PdfName TYPE = new PdfName("Type"); - /** A name */ + /** + * A name + */ public static final PdfName TYPE0 = new PdfName("Type0"); - /** A name */ + /** + * A name + */ public static final PdfName TYPE1 = new PdfName("Type1"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName TYPE3 = new PdfName("Type3"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName U = new PdfName("U"); - /** (Required if R=6 (PDF 2.0)) A 32-byte string, based on the user password, that shall be used in computing the file encryption key.*/ + /** + * (Required if R=6 (PDF 2.0)) A 32-byte string, based on the user password, that shall be used in computing the + * file encryption key. + */ public static final PdfName UE = new PdfName("UE"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName UF = new PdfName("UF"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName UHC = new PdfName("UHC"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName UNDERLINE = new PdfName("Underline"); - /** A name */ + /** + * A name + */ public static final PdfName UR = new PdfName("UR"); - /** A name */ + /** + * A name + */ public static final PdfName UR3 = new PdfName("UR3"); - /** A name */ + /** + * A name + */ public static final PdfName URI = new PdfName("URI"); - /** A name */ + /** + * A name + */ public static final PdfName URL = new PdfName("URL"); - /** A name */ + /** + * A name + */ public static final PdfName USAGE = new PdfName("Usage"); - /** A name */ + /** + * A name + */ public static final PdfName USEATTACHMENTS = new PdfName("UseAttachments"); - /** A name */ + /** + * A name + */ public static final PdfName USENONE = new PdfName("UseNone"); - /** A name */ + /** + * A name + */ public static final PdfName USEOC = new PdfName("UseOC"); - /** A name */ + /** + * A name + */ public static final PdfName USEOUTLINES = new PdfName("UseOutlines"); - /** A name */ + /** + * A name + */ public static final PdfName USER = new PdfName("User"); - /** A name */ + /** + * A name + */ public static final PdfName USERPROPERTIES = new PdfName("UserProperties"); - /** A name */ + /** + * A name + */ public static final PdfName USERUNIT = new PdfName("UserUnit"); - /** A name */ + /** + * A name + */ public static final PdfName USETHUMBS = new PdfName("UseThumbs"); - /** (Optional; inheritable) The field value, whose format varies depending on the field type. See the descriptions of individual - * field types for further information. */ + /** + * (Optional; inheritable) The field value, whose format varies depending on the field type. See the descriptions of + * individual field types for further information. + */ public static final PdfName V = new PdfName("V"); /** * (Deprecated) The application shall ask the security handler for the file encryption key and shall implicitly @@ -1936,127 +3009,202 @@ public class PdfName extends PdfObject implements Comparable { public static final PdfName V2 = new PdfName("V2"); /** * A name. + * * @since 2.1.6 */ public static final PdfName VALIGN = new PdfName("VAlign"); - /** A name */ + /** + * A name + */ public static final PdfName VERISIGN_PPKVS = new PdfName("VeriSign.PPKVS"); - /** A name */ + /** + * A name + */ public static final PdfName VERSION = new PdfName("Version"); /** * A name. + * * @since 2.1.6 */ public static final PdfName VIDEO = new PdfName("Video"); - /** A name */ + /** + * A name + */ public static final PdfName VIEW = new PdfName("View"); /** * A name. + * * @since 2.1.6 */ public static final PdfName VIEWS = new PdfName("Views"); - /** A name */ + /** + * A name + */ public static final PdfName VIEWAREA = new PdfName("ViewArea"); - /** A name */ + /** + * A name + */ public static final PdfName VIEWCLIP = new PdfName("ViewClip"); - /** A name */ + /** + * A name + */ public static final PdfName VIEWERPREFERENCES = new PdfName("ViewerPreferences"); - /** A name */ + /** + * A name + */ public static final PdfName VIEWSTATE = new PdfName("ViewState"); - /** A name */ + /** + * A name + */ public static final PdfName VISIBLEPAGES = new PdfName("VisiblePages"); /** * A name. + * * @since 2.1.6 */ public static final PdfName VOFFSET = new PdfName("VOffset"); /** - * This dictionary contains Signature VRI dictionaries (see PDF 2.0 ch. 12.8.4.4,"Validation-related information (VRI)"). - * The key of each entry in this dictionary is the base-16-encoded (uppercase) SHA1 digest of the signature to which it applies - * a and the value is the Signature VRI dictionary which contains the validation-related information for that signature. + * This dictionary contains Signature VRI dictionaries (see PDF 2.0 ch. 12.8.4.4,"Validation-related information + * (VRI)"). The key of each entry in this dictionary is the base-16-encoded (uppercase) SHA1 digest of the signature + * to which it applies a and the value is the Signature VRI dictionary which contains the validation-related + * information for that signature. */ public static final PdfName VRI = new PdfName("VRI"); - - /** A name of an attribute. */ + + /** + * A name of an attribute. + */ public static final PdfName W = new PdfName("W"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName W2 = new PdfName("W2"); /** * A name + * * @since 2.1.6 */ public static final PdfName WARICHU = new PdfName("Warichu"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName WC = new PdfName("WC"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName WIDGET = new PdfName("Widget"); - /** A name of an attribute. */ + /** + * A name of an attribute. + */ public static final PdfName WIDTH = new PdfName("Width"); - /** A name */ + /** + * A name + */ public static final PdfName WIDTHS = new PdfName("Widths"); - /** A name of an encoding */ + /** + * A name of an encoding + */ public static final PdfName WIN = new PdfName("Win"); - /** A name of an encoding */ + /** + * A name of an encoding + */ public static final PdfName WIN_ANSI_ENCODING = new PdfName("WinAnsiEncoding"); /** * A name. + * * @since 2.1.6 */ public static final PdfName WINDOW = new PdfName("Window"); /** * A name. + * * @since 2.1.6 */ public static final PdfName WINDOWED = new PdfName("Windowed"); - /** A name of an encoding */ + /** + * A name of an encoding + */ public static final PdfName WIPE = new PdfName("Wipe"); - /** A name */ + /** + * A name + */ public static final PdfName WHITEPOINT = new PdfName("WhitePoint"); - /** A name */ + /** + * A name + */ public static final PdfName WP = new PdfName("WP"); - /** A name of an encoding */ + /** + * A name of an encoding + */ public static final PdfName WS = new PdfName("WS"); - /** A name */ + /** + * A name + */ public static final PdfName X = new PdfName("X"); /** * A name. + * * @since 2.1.6 */ public static final PdfName XA = new PdfName("XA"); /** * A name. + * * @since 2.1.6 */ public static final PdfName XD = new PdfName("XD"); - /** A name */ + /** + * A name + */ public static final PdfName XFA = new PdfName("XFA"); - /** A name */ + /** + * A name + */ public static final PdfName XML = new PdfName("XML"); - /** A name */ + /** + * A name + */ public static final PdfName XOBJECT = new PdfName("XObject"); - /** A name */ + /** + * A name + */ public static final PdfName XSTEP = new PdfName("XStep"); - /** A name */ + /** + * A name + */ public static final PdfName XREF = new PdfName("XRef"); - /** A name */ + /** + * A name + */ public static final PdfName XREFSTM = new PdfName("XRefStm"); - /** A name */ + /** + * A name + */ public static final PdfName XYZ = new PdfName("XYZ"); - /** A name */ + /** + * A name + */ public static final PdfName YSTEP = new PdfName("YStep"); - /** A name */ + /** + * A name + */ public static final PdfName ZADB = new PdfName("ZaDb"); - /** A name of a base 14 type 1 font */ + /** + * A name of a base 14 type 1 font + */ public static final PdfName ZAPFDINGBATS = new PdfName("ZapfDingbats"); - /** A name */ + /** + * A name + */ public static final PdfName ZOOM = new PdfName("Zoom"); /** * map strings to all known static names + * * @since 2.1.6 */ public static Map staticNames; - + /** * List of names used for widget annotations */ @@ -2067,6 +3215,77 @@ public class PdfName extends PdfObject implements Comparable { */ private static ArrayList formfieldNames; + /* + * Use reflection to cache all the static public final names so + * future PdfName additions don't have to be "added twice". + * A bit less efficient (around 50ms spent here on a 2.2ghz machine), + * but Much Less error prone. + * @since 2.1.6 + */ + static { + Field[] fields = PdfName.class.getDeclaredFields(); + staticNames = new HashMap<>(fields.length); + final int flags = Modifier.STATIC | Modifier.PUBLIC | Modifier.FINAL; + try { + for (Field curFld : fields) { + if ((curFld.getModifiers() & flags) == flags && + curFld.getType().equals(PdfName.class)) { + PdfName name = (PdfName) curFld.get(null); + staticNames.put(decodeName(name.toString()), name); + } + } + } catch (Exception e) { + throw new IllegalStateException("The pdfname map could not be initialized!", e); + } + + widgetNames = new ArrayList<>(); + formfieldNames = new ArrayList<>(); + initLists(); + } + + private int hash = 0; + + /** + * Constructs a new PdfName. The name length will be checked. + * + * @param name the new name + */ + public PdfName(String name) { + this(name, true); + } + + /** + * Constructs a new PdfName. + * + * @param name the new name + * @param lengthCheck if true check the length validity, if false the name can have any + * length + */ + public PdfName(String name, boolean lengthCheck) { + super(PdfObject.NAME); + // The minimum number of characters in a name is 0, the maximum is 127 (the '/' not included) + int length = name.length(); + if (lengthCheck && length > 127) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("the.name.1.is.too.long.2.characters", name, + String.valueOf(length))); + } + bytes = encodeName(name); + } + + // CLASS VARIABLES + + /** + * Constructs a PdfName. + * + * @param bytes the byte representation of the name + */ + public PdfName(byte[] bytes) { + super(PdfObject.NAME, bytes); + } + + // CONSTRUCTORS + private static void initLists() { //All possible values for an annotation dictionary widgetNames.add(PdfName.TYPE); @@ -2097,7 +3316,7 @@ private static void initLists() { widgetNames.add(PdfName.BS); //When separating a merged dictionary the Parent stays in the field thus it is disabled here //widgetNames.add(PdfName.PARENT); - + //All possible values for an form field dictionary formfieldNames.add(PdfName.FT); formfieldNames.add(PdfName.PARENT); @@ -2128,34 +3347,6 @@ private static void initLists() { } - /* - * Use reflection to cache all the static public final names so - * future PdfName additions don't have to be "added twice". - * A bit less efficient (around 50ms spent here on a 2.2ghz machine), - * but Much Less error prone. - * @since 2.1.6 - */ - static { - Field[] fields = PdfName.class.getDeclaredFields(); - staticNames = new HashMap<>(fields.length); - final int flags = Modifier.STATIC | Modifier.PUBLIC | Modifier.FINAL; - try { - for (Field curFld : fields) { - if ((curFld.getModifiers() & flags) == flags && - curFld.getType().equals(PdfName.class)) { - PdfName name = (PdfName) curFld.get(null); - staticNames.put(decodeName(name.toString()), name); - } - } - } catch (Exception e) { - throw new IllegalStateException("The pdfname map could not be initialized!",e); - } - - widgetNames = new ArrayList<>(); - formfieldNames = new ArrayList<>(); - initLists(); - } - public static ArrayList getWidgetNames() { return widgetNames; } @@ -2163,112 +3354,15 @@ public static ArrayList getWidgetNames() { public static ArrayList getFormfieldNames() { return formfieldNames; } - - // CLASS VARIABLES - - private int hash = 0; - - // CONSTRUCTORS - - /** - * Constructs a new PdfName. The name length will be checked. - * - * @param name the new name - */ - public PdfName(String name) { - this(name, true); - } - - /** - * Constructs a new PdfName. - * @param name the new name - * @param lengthCheck if true check the length validity, - * if false the name can have any length - */ - public PdfName(String name, boolean lengthCheck) { - super(PdfObject.NAME); - // The minimum number of characters in a name is 0, the maximum is 127 (the '/' not included) - int length = name.length(); - if (lengthCheck && length > 127) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.name.1.is.too.long.2.characters", name, String.valueOf(length))); - bytes = encodeName(name); - } - - /** - * Constructs a PdfName. - * - * @param bytes the byte representation of the name - */ - public PdfName(byte[] bytes) { - super(PdfObject.NAME, bytes); - } // CLASS METHODS - /** - * Compares this object with the specified object for order. - * Returns a negative integer, zero, or a positive integer as this object - * is less than, equal to, or greater than the specified object.

        - * - * @param name the Object to be compared. - * @return a negative integer, zero, or a positive integer as this object - * is less than, equal to, or greater than the specified object. - * @throws ClassCastException if the specified object's type prevents it - * from being compared to this Object. - */ - public int compareTo(PdfName name) { - byte[] myBytes = bytes; - byte[] objBytes = name.bytes; - int len = Math.min(myBytes.length, objBytes.length); - for (int i = 0; i < len; i++) { - if (myBytes[i] > objBytes[i]) - return 1; - if (myBytes[i] < objBytes[i]) - return -1; - } - return Integer.compare(myBytes.length, objBytes.length); - } - - /** - * Indicates whether some other object is "equal to" this one. - * - * @param obj the reference object with which to compare. - * @return true if this object is the same as the obj - * argument; false otherwise. - */ - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj instanceof PdfName) - return compareTo((PdfName) obj) == 0; - return false; - } - - /** - * Returns a hash code value for the object. - * This method is supported for the benefit of hashtables such as those provided by - * java.util.Hashtable. - * - * @return a hash code value for this object. - */ - public int hashCode() { - int h = hash; - if (h == 0) { - int ptr = 0; - int len = bytes.length; - for (int i = 0; i < len; i++) - h = 31*h + (bytes[ptr++] & 0xff); - hash = h; - } - return h; - } - /** * Encodes a plain name given in the unescaped form "AB CD" into "/AB#20CD". * * @param name the name to encode * @return the encoded name - * @since 2.1.5 + * @since 2.1.5 */ public static byte[] encodeName(String name) { int length = name.length(); @@ -2277,7 +3371,7 @@ public static byte[] encodeName(String name) { char c; char[] chars = name.toCharArray(); for (int k = 0; k < length; k++) { - c = (char)(chars[k] & 0xff); + c = (char) (chars[k] & 0xff); // Escape special characters switch (c) { case ' ': @@ -2296,17 +3390,18 @@ public static byte[] encodeName(String name) { buf.append(Integer.toString(c, 16)); break; default: - if (c >= 32 && c <= 126) + if (c >= 32 && c <= 126) { buf.append(c); - else { + } else { buf.append('#'); - if (c < 16) + if (c < 16) { buf.append('0'); + } buf.append(Integer.toString(c, 16)); } break; - } } + } return buf.toByteArray(); } @@ -2325,15 +3420,75 @@ public static String decodeName(String name) { if (c == '#') { char c1 = name.charAt(k + 1); char c2 = name.charAt(k + 2); - c = (char)((PRTokeniser.getHex(c1) << 4) + PRTokeniser.getHex(c2)); + c = (char) ((PRTokeniser.getHex(c1) << 4) + PRTokeniser.getHex(c2)); k += 2; } buf.append(c); } - } - catch (IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // empty on purpose } return buf.toString(); } + + /** + * Compares this object with the specified object for order. Returns a negative integer, zero, or a positive integer + * as this object is less than, equal to, or greater than the specified object.

        + * + * @param name the Object to be compared. + * @return a negative integer, zero, or a positive integer as this object is less than, equal to, or greater than + * the specified object. + * @throws ClassCastException if the specified object's type prevents it from being compared to this Object. + */ + public int compareTo(PdfName name) { + byte[] myBytes = bytes; + byte[] objBytes = name.bytes; + int len = Math.min(myBytes.length, objBytes.length); + for (int i = 0; i < len; i++) { + if (myBytes[i] > objBytes[i]) { + return 1; + } + if (myBytes[i] < objBytes[i]) { + return -1; + } + } + return Integer.compare(myBytes.length, objBytes.length); + } + + /** + * Indicates whether some other object is "equal to" this one. + * + * @param obj the reference object with which to compare. + * @return true if this object is the same as the obj + * argument; false otherwise. + */ + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj instanceof PdfName) { + return compareTo((PdfName) obj) == 0; + } + return false; + } + + /** + * Returns a hash code value for the object. This method is supported for the benefit of hashtables such as those + * provided by + * java.util.Hashtable. + * + * @return a hash code value for this object. + */ + public int hashCode() { + int h = hash; + if (h == 0) { + int ptr = 0; + int len = bytes.length; + for (int i = 0; i < len; i++) { + h = 31 * h + (bytes[ptr++] & 0xff); + } + hash = h; + } + return h; + } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfNameTree.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfNameTree.java index 8a9e1d54f..6f6be24de 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfNameTree.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfNameTree.java @@ -58,118 +58,124 @@ */ public class PdfNameTree { - private static final int leafSize = 64; + private static final int leafSize = 64; - - /** - * Writes a name tree to a PdfWriter. - * - * @param items the item of the name tree. The key is a String and the value is a PdfObject. Note that although - * the keys are strings only the lower byte is used and no check is made for chars with the same lower byte and different upper byte. This - * will generate a wrong tree name. - * @param writer the writer - * @return the dictionary with the name tree. This dictionary is the one generally pointed to by the key /Dests, for example - * @throws IOException on error - */ - public static PdfDictionary writeTree(HashMap items, PdfWriter writer) throws IOException { - return writeTree((Map) items, writer); - } - /** - * Writes a name tree to a PdfWriter. - * - * @param items the item of the name tree. The key is a String and the value is a PdfObject. Note that although - * the keys are strings only the lower byte is used and no check is made for chars with the same lower byte and different upper byte. This - * will generate a wrong tree name. - * @param writer the writer - * @return the dictionary with the name tree. This dictionary is the one generally pointed to by the key /Dests, for example - * @throws IOException on error - */ - public static PdfDictionary writeTree(Map items, PdfWriter writer) throws IOException { - if (items.isEmpty()) { - return null; - } - String[] names = items.keySet().toArray(new String[0]); - Arrays.sort(names); - if (names.length <= leafSize) { - PdfDictionary dic = new PdfDictionary(); - PdfArray ar = new PdfArray(); - for (String name : names) { - ar.add(new PdfString(name, null)); - ar.add(items.get(name)); - } - dic.put(PdfName.NAMES, ar); - return dic; - } - int skip = leafSize; - PdfIndirectReference[] kids = new PdfIndirectReference[(names.length + leafSize - 1) / leafSize]; - for (int k = 0; k < kids.length; ++k) { - int offset = k * leafSize; - int end = Math.min(offset + leafSize, names.length); - PdfDictionary dic = new PdfDictionary(); - PdfArray arr = new PdfArray(); - arr.add(new PdfString(names[offset], null)); - arr.add(new PdfString(names[end - 1], null)); - dic.put(PdfName.LIMITS, arr); - arr = new PdfArray(); - for (; offset < end; ++offset) { - arr.add(new PdfString(names[offset], null)); - arr.add(items.get(names[offset])); - } - dic.put(PdfName.NAMES, arr); - kids[k] = writer.addToBody(dic).getIndirectReference(); + + /** + * Writes a name tree to a PdfWriter. + * + * @param items the item of the name tree. The key is a String and the value is a + * PdfObject. Note that although the keys are strings only the lower byte is used and no + * check is made for chars with the same lower byte and different upper byte. This will generate a + * wrong tree name. + * @param writer the writer + * @return the dictionary with the name tree. This dictionary is the one generally pointed to by the key /Dests, for + * example + * @throws IOException on error + */ + public static PdfDictionary writeTree(HashMap items, PdfWriter writer) + throws IOException { + return writeTree((Map) items, writer); } - int top = kids.length; - while (true) { - if (top <= leafSize) { - PdfArray arr = new PdfArray(); - for (int k = 0; k < top; ++k) { - arr.add(kids[k]); + + /** + * Writes a name tree to a PdfWriter. + * + * @param items the item of the name tree. The key is a String and the value is a + * PdfObject. Note that although the keys are strings only the lower byte is used and no + * check is made for chars with the same lower byte and different upper byte. This will generate a + * wrong tree name. + * @param writer the writer + * @return the dictionary with the name tree. This dictionary is the one generally pointed to by the key /Dests, for + * example + * @throws IOException on error + */ + public static PdfDictionary writeTree(Map items, PdfWriter writer) throws IOException { + if (items.isEmpty()) { + return null; } - PdfDictionary dic = new PdfDictionary(); - dic.put(PdfName.KIDS, arr); - return dic; - } - skip *= leafSize; - int tt = (names.length + skip - 1) / skip; - for (int k = 0; k < tt; ++k) { - int offset = k * leafSize; - int end = Math.min(offset + leafSize, top); - PdfDictionary dic = new PdfDictionary(); - PdfArray arr = new PdfArray(); - arr.add(new PdfString(names[k * skip], null)); - arr.add(new PdfString(names[Math.min((k + 1) * skip, names.length) - 1], null)); - dic.put(PdfName.LIMITS, arr); - arr = new PdfArray(); - for (; offset < end; ++offset) { - arr.add(kids[offset]); + String[] names = items.keySet().toArray(new String[0]); + Arrays.sort(names); + if (names.length <= leafSize) { + PdfDictionary dic = new PdfDictionary(); + PdfArray ar = new PdfArray(); + for (String name : names) { + ar.add(new PdfString(name, null)); + ar.add(items.get(name)); + } + dic.put(PdfName.NAMES, ar); + return dic; + } + int skip = leafSize; + PdfIndirectReference[] kids = new PdfIndirectReference[(names.length + leafSize - 1) / leafSize]; + for (int k = 0; k < kids.length; ++k) { + int offset = k * leafSize; + int end = Math.min(offset + leafSize, names.length); + PdfDictionary dic = new PdfDictionary(); + PdfArray arr = new PdfArray(); + arr.add(new PdfString(names[offset], null)); + arr.add(new PdfString(names[end - 1], null)); + dic.put(PdfName.LIMITS, arr); + arr = new PdfArray(); + for (; offset < end; ++offset) { + arr.add(new PdfString(names[offset], null)); + arr.add(items.get(names[offset])); + } + dic.put(PdfName.NAMES, arr); + kids[k] = writer.addToBody(dic).getIndirectReference(); + } + int top = kids.length; + while (true) { + if (top <= leafSize) { + PdfArray arr = new PdfArray(); + for (int k = 0; k < top; ++k) { + arr.add(kids[k]); + } + PdfDictionary dic = new PdfDictionary(); + dic.put(PdfName.KIDS, arr); + return dic; + } + skip *= leafSize; + int tt = (names.length + skip - 1) / skip; + for (int k = 0; k < tt; ++k) { + int offset = k * leafSize; + int end = Math.min(offset + leafSize, top); + PdfDictionary dic = new PdfDictionary(); + PdfArray arr = new PdfArray(); + arr.add(new PdfString(names[k * skip], null)); + arr.add(new PdfString(names[Math.min((k + 1) * skip, names.length) - 1], null)); + dic.put(PdfName.LIMITS, arr); + arr = new PdfArray(); + for (; offset < end; ++offset) { + arr.add(kids[offset]); + } + dic.put(PdfName.KIDS, arr); + kids[k] = writer.addToBody(dic).getIndirectReference(); + } + top = tt; } - dic.put(PdfName.KIDS, arr); - kids[k] = writer.addToBody(dic).getIndirectReference(); - } - top = tt; } - } - private static void iterateItems(PdfDictionary dic, HashMap items) { - PdfArray nn = (PdfArray) PdfReader.getPdfObjectRelease(dic.get(PdfName.NAMES)); - if (nn != null) { - for (int k = 0; k < nn.size(); ++k) { - PdfString s = (PdfString) PdfReader.getPdfObjectRelease(nn.getPdfObject(k++)); - items.put(PdfEncodings.convertToString(s.getBytes(), null), nn.getPdfObject(k)); - } - } else if ((nn = (PdfArray) PdfReader.getPdfObjectRelease(dic.get(PdfName.KIDS))) != null) { - for (int k = 0; k < nn.size(); ++k) { - PdfDictionary kid = (PdfDictionary) PdfReader.getPdfObjectRelease(nn.getPdfObject(k)); - iterateItems(kid, items); - } + private static void iterateItems(PdfDictionary dic, HashMap items) { + PdfArray nn = (PdfArray) PdfReader.getPdfObjectRelease(dic.get(PdfName.NAMES)); + if (nn != null) { + for (int k = 0; k < nn.size(); ++k) { + PdfString s = (PdfString) PdfReader.getPdfObjectRelease(nn.getPdfObject(k++)); + items.put(PdfEncodings.convertToString(s.getBytes(), null), nn.getPdfObject(k)); + } + } else if ((nn = (PdfArray) PdfReader.getPdfObjectRelease(dic.get(PdfName.KIDS))) != null) { + for (int k = 0; k < nn.size(); ++k) { + PdfDictionary kid = (PdfDictionary) PdfReader.getPdfObjectRelease(nn.getPdfObject(k)); + iterateItems(kid, items); + } + } } - } - public static HashMap readTree(PdfDictionary dic) { - HashMap items = new HashMap<>(); - if (dic != null) { - iterateItems(dic, items); + public static HashMap readTree(PdfDictionary dic) { + HashMap items = new HashMap<>(); + if (dic != null) { + iterateItems(dic, items); + } + return items; } - return items; - } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfNull.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfNull.java index 41177d6f8..1eda0e861 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfNull.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfNull.java @@ -51,36 +51,39 @@ /** * PdfNull is the Null object represented by the keyword null. - *

        - * This object is described in the 'Portable Document Format Reference Manual version 1.7' - * section 3.2.8 (page 63). + *

        + * This object is described in the 'Portable Document Format Reference Manual version 1.7' section 3.2.8 (page 63). * - * @see PdfObject + * @see PdfObject */ public class PdfNull extends PdfObject { - + // CLASS CONSTANTS - - /** An instance of the PdfNull-object. */ - public static final PdfNull PDFNULL = new PdfNull(); - - /** The content of the PdfNull-object. */ + + /** + * An instance of the PdfNull-object. + */ + public static final PdfNull PDFNULL = new PdfNull(); + + /** + * The content of the PdfNull-object. + */ private static final String CONTENT = "null"; - + // CONSTRUCTOR - + /** * Constructs a PdfNull-object. - *

        + *

        * You never need to do this yourself, you can always use the static final object PDFNULL. */ public PdfNull() { super(NULL, CONTENT); } - + // CLASS METHOD - + public String toString() { return "null"; } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfNumber.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfNumber.java index 66d76b588..6f8fd3fe7 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfNumber.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfNumber.java @@ -50,63 +50,60 @@ package com.lowagie.text.pdf; import com.lowagie.text.error_messages.MessageLocalization; - import java.util.Objects; /** * PdfNumber provides two types of numbers, integer and real. - *

        - * Integers may be specified by signed or unsigned constants. Reals may only be - * in decimal format.
        - * This object is described in the 'Portable Document Format Reference Manual - * version 1.7' section 3.3.2 (page 52-53). + *

        + * Integers may be specified by signed or unsigned constants. Reals may only be in decimal format.
        This object is + * described in the 'Portable Document Format Reference Manual version 1.7' section 3.3.2 (page 52-53). * - * @see PdfObject - * @see BadPdfFormatException + * @see PdfObject + * @see BadPdfFormatException */ public class PdfNumber extends PdfObject implements Comparable { // CLASS VARIABLES - + /** * actual value of this PdfNumber, represented as a * double */ private double value; - + // CONSTRUCTORS - + /** * Constructs a PdfNumber-object. * - * @param content value of the new PdfNumber-object + * @param content value of the new PdfNumber-object */ public PdfNumber(String content) { super(NUMBER); try { value = Double.parseDouble(content.trim()); setContent(content); - } - catch (NumberFormatException nfe){ - throw new RuntimeException(MessageLocalization.getComposedMessage("1.is.not.a.valid.number.2", content, nfe.toString())); + } catch (NumberFormatException nfe) { + throw new RuntimeException( + MessageLocalization.getComposedMessage("1.is.not.a.valid.number.2", content, nfe.toString())); } } - + /** * Constructs a new PdfNumber-object of type integer. * - * @param value value of the new PdfNumber-object + * @param value value of the new PdfNumber-object */ public PdfNumber(int value) { super(NUMBER); this.value = value; setContent(String.valueOf(value)); } - + /** * Constructs a new PdfNumber-object of type long. * - * @param value value of the new PdfNumber-object + * @param value value of the new PdfNumber-object */ public PdfNumber(long value) { super(NUMBER); @@ -117,25 +114,25 @@ public PdfNumber(long value) { /** * Constructs a new PdfNumber-object of type real. * - * @param value value of the new PdfNumber-object + * @param value value of the new PdfNumber-object */ public PdfNumber(double value) { super(NUMBER); this.value = value; setContent(ByteBuffer.formatDouble(value)); } - + /** * Constructs a new PdfNumber-object of type real. * - * @param value value of the new PdfNumber-object + * @param value value of the new PdfNumber-object */ public PdfNumber(float value) { - this((double)value); + this((double) value); } - + // methods returning the value of this object - + /** * Returns the primitive int value of this object. * @@ -144,7 +141,7 @@ public PdfNumber(float value) { public int intValue() { return (int) value; } - + /** * Returns the primitive double value of this object. * @@ -153,18 +150,18 @@ public int intValue() { public double doubleValue() { return value; } - + /** * Returns the primitive float value of this object. * * @return The value as float */ public float floatValue() { - return (float)value; + return (float) value; } - + // other methods - + /** * Increments the value of the PdfNumber-object by 1. */ @@ -193,7 +190,9 @@ public int hashCode() { @Override public int compareTo(PdfNumber o) { Objects.requireNonNull(o, "PdfNumber is null, can't be compared to current instance."); - if (this == o) return 0; + if (this == o) { + return 0; + } return Double.compare(o.value, value); } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfNumberTree.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfNumberTree.java index 79b88b21f..278f34f23 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfNumberTree.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfNumberTree.java @@ -53,23 +53,27 @@ /** * Creates a number tree. + * * @author Paulo Soares (psoares@consiste.pt) */ public class PdfNumberTree { - + private static final int leafSize = 64; - + /** * Creates a number tree. - * @param items the item of the number tree. The key is an Integer - * and the value is a PdfObject. + * + * @param items the item of the number tree. The key is an Integer and the value is a + * PdfObject. * @param writer the writer - * @throws IOException on error * @return the dictionary with the number tree. + * @throws IOException on error */ - public static PdfDictionary writeTree(Map items, PdfWriter writer) throws IOException { - if (items.isEmpty()) + public static PdfDictionary writeTree(Map items, PdfWriter writer) + throws IOException { + if (items.isEmpty()) { return null; + } Integer[] numbers = new Integer[items.size()]; numbers = items.keySet().toArray(numbers); Arrays.sort(numbers); @@ -105,14 +109,15 @@ public static PdfDictionary writeTree(Map items, P while (true) { if (top <= leafSize) { PdfArray arr = new PdfArray(); - for (int k = 0; k < top; ++k) + for (int k = 0; k < top; ++k) { arr.add(kids[k]); + } PdfDictionary dic = new PdfDictionary(); dic.put(PdfName.KIDS, arr); return dic; } skip *= leafSize; - int tt = (numbers.length + skip - 1 )/ skip; + int tt = (numbers.length + skip - 1) / skip; for (int k = 0; k < tt; ++k) { int offset = k * leafSize; int end = Math.min(offset + leafSize, top); @@ -131,27 +136,27 @@ public static PdfDictionary writeTree(Map items, P top = tt; } } - + private static void iterateItems(PdfDictionary dic, Map items) { - PdfArray nn = (PdfArray)PdfReader.getPdfObjectRelease(dic.get(PdfName.NUMS)); + PdfArray nn = (PdfArray) PdfReader.getPdfObjectRelease(dic.get(PdfName.NUMS)); if (nn != null) { for (int k = 0; k < nn.size(); ++k) { - PdfNumber s = (PdfNumber)PdfReader.getPdfObjectRelease(nn.getPdfObject(k++)); + PdfNumber s = (PdfNumber) PdfReader.getPdfObjectRelease(nn.getPdfObject(k++)); items.put(s.intValue(), nn.getPdfObject(k)); } - } - else if ((nn = (PdfArray)PdfReader.getPdfObjectRelease(dic.get(PdfName.KIDS))) != null) { + } else if ((nn = (PdfArray) PdfReader.getPdfObjectRelease(dic.get(PdfName.KIDS))) != null) { for (int k = 0; k < nn.size(); ++k) { - PdfDictionary kid = (PdfDictionary)PdfReader.getPdfObjectRelease(nn.getPdfObject(k)); + PdfDictionary kid = (PdfDictionary) PdfReader.getPdfObjectRelease(nn.getPdfObject(k)); iterateItems(kid, items); } } } - + public static HashMap readTree(PdfDictionary dic) { HashMap items = new HashMap<>(); - if (dic != null) + if (dic != null) { iterateItems(dic, items); + } return items; } } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfOCG.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfOCG.java index 6fa3eeb84..b9bf1a792 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfOCG.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfOCG.java @@ -55,12 +55,14 @@ public interface PdfOCG { /** * Gets the PdfIndirectReference that represents this layer. + * * @return the PdfIndirectReference that represents this layer */ PdfIndirectReference getRef(); - + /** * Gets the object representing the layer. + * * @return the object representing the layer */ PdfObject getPdfObject(); diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfOCProperties.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfOCProperties.java index bc76b4693..bb5e09c6c 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfOCProperties.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfOCProperties.java @@ -47,13 +47,12 @@ package com.lowagie.text.pdf; /** - * This class represents the /OCProperties entry in the document catalog - * and holds the optional content properties dictionary, which contains - * a list of all the optional content groups in the document, as well as information - * about the default and alternate configurations for optional content. + * This class represents the /OCProperties entry in the document catalog and holds the optional content properties + * dictionary, which contains a list of all the optional content groups in the document, as well as information about + * the default and alternate configurations for optional content. * * @author Paulo Soares (psoares@consiste.pt) */ public class PdfOCProperties extends PdfDictionary { - + } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfObject.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfObject.java index 5d246198c..ab28e6c72 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfObject.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfObject.java @@ -48,101 +48,127 @@ */ package com.lowagie.text.pdf; + import java.io.IOException; import java.io.OutputStream; /** * PdfObject is the abstract superclass of all PDF objects. - *

        - * PDF supports seven basic types of objects: Booleans, numbers, strings, names, - * arrays, dictionaries and streams. In addition, PDF provides a null object. - * Objects may be labeled so that they can be referred to by other objects.
        - * All these basic PDF objects are described in the 'Portable Document Format - * Reference Manual version 1.3' Chapter 4 (pages 37-54). + *

        + * PDF supports seven basic types of objects: Booleans, numbers, strings, names, arrays, dictionaries and streams. In + * addition, PDF provides a null object. Objects may be labeled so that they can be referred to by other objects.
        + * All these basic PDF objects are described in the 'Portable Document Format Reference Manual version 1.3' Chapter 4 + * (pages 37-54). * - * @see PdfNull - * @see PdfBoolean - * @see PdfNumber - * @see PdfString - * @see PdfName - * @see PdfArray - * @see PdfDictionary - * @see PdfStream - * @see PdfIndirectReference + * @see PdfNull + * @see PdfBoolean + * @see PdfNumber + * @see PdfString + * @see PdfName + * @see PdfArray + * @see PdfDictionary + * @see PdfStream + * @see PdfIndirectReference */ public abstract class PdfObject { // CONSTANTS - /** A possible type of PdfObject */ + /** + * A possible type of PdfObject + */ public static final int BOOLEAN = 1; - /** A possible type of PdfObject */ + /** + * A possible type of PdfObject + */ public static final int NUMBER = 2; - /** A possible type of PdfObject */ + /** + * A possible type of PdfObject + */ public static final int STRING = 3; - /** A possible type of PdfObject */ + /** + * A possible type of PdfObject + */ public static final int NAME = 4; - /** A possible type of PdfObject */ + /** + * A possible type of PdfObject + */ public static final int ARRAY = 5; - /** A possible type of PdfObject */ + /** + * A possible type of PdfObject + */ public static final int DICTIONARY = 6; - /** A possible type of PdfObject */ + /** + * A possible type of PdfObject + */ public static final int STREAM = 7; - /** A possible type of PdfObject */ + /** + * A possible type of PdfObject + */ public static final int NULL = 8; - /** A possible type of PdfObject */ + /** + * A possible type of PdfObject + */ public static final int INDIRECT = 10; - /** An empty string used for the PdfNull-object and for an empty PdfString-object. */ + /** + * An empty string used for the PdfNull-object and for an empty PdfString-object. + */ public static final String NOTHING = ""; /** - * This is the default encoding to be used for converting Strings into - * bytes and vice versa. The default encoding is PdfDocEncoding. + * This is the default encoding to be used for converting Strings into bytes and vice versa. The default encoding is + * PdfDocEncoding. */ public static final String TEXT_PDFDOCENCODING = "PDF"; - /** This is the encoding to be used to output text in Unicode. */ + /** + * This is the encoding to be used to output text in Unicode. + */ public static final String TEXT_UNICODE = "UnicodeBig"; // CLASS VARIABLES - /** The content of this PdfObject */ + /** + * The content of this PdfObject + */ protected byte[] bytes; - /** The type of this PdfObject */ + /** + * The type of this PdfObject + */ protected int type; - /** Holds the indirect reference. */ + /** + * Holds the indirect reference. + */ protected PRIndirectReference indRef; // CONSTRUCTORS /** - * Constructs a PdfObject of a certain type - * without any content. + * Constructs a PdfObject of a certain type without any content. * - * @param type type of the new PdfObject + * @param type type of the new PdfObject */ protected PdfObject(int type) { this.type = type; } /** - * Constructs a PdfObject of a certain type - * with a certain content. + * Constructs a PdfObject of a certain type with a certain content. * - * @param type type of the new PdfObject - * @param content content of the new PdfObject as a - * String. + * @param type type of the new PdfObject + * @param content content of the new PdfObject as a + * String. */ protected PdfObject(int type, String content) { this.type = type; @@ -150,12 +176,11 @@ protected PdfObject(int type, String content) { } /** - * Constructs a PdfObject of a certain type - * with a certain content. + * Constructs a PdfObject of a certain type with a certain content. * - * @param type type of the new PdfObject - * @param bytes content of the new PdfObject as an array of - * byte. + * @param type type of the new PdfObject + * @param bytes content of the new PdfObject as an array of + * byte. */ protected PdfObject(int type, byte[] bytes) { this.bytes = bytes; @@ -165,33 +190,34 @@ protected PdfObject(int type, byte[] bytes) { // methods dealing with the content of this object /** - * Writes the PDF representation of this PdfObject as an - * array of bytes to the writer. + * Writes the PDF representation of this PdfObject as an array of bytes to the writer. * * @param writer for backwards compatibility * @param os The OutputStream to write the bytes to. * @throws IOException on error */ public void toPdf(PdfWriter writer, OutputStream os) throws IOException { - if (bytes != null) + if (bytes != null) { os.write(bytes); + } } /** * Returns the String-representation of this * PdfObject. * - * @return a String + * @return a String */ public String toString() { - if (bytes == null) + if (bytes == null) { return super.toString(); + } return PdfEncodings.convertToString(bytes, null); } /** * Gets the presentation of this object in a byte array - * + * * @return a byte array */ public byte[] getBytes() { @@ -200,12 +226,11 @@ public byte[] getBytes() { /** * Whether this object can be contained in an object stream. - * - * PdfObjects of type STREAM OR INDIRECT can not be contained in an - * object stream. - * + *

        + * PdfObjects of type STREAM OR INDIRECT can not be contained in an object stream. + * * @return true if this object can be in an object stream. - * Otherwise false + * Otherwise false */ public boolean canBeInObjStm() { switch (type) { @@ -234,7 +259,7 @@ public boolean canBeInObjStm() { * Remark: the actual content of an object is in most cases identical to its representation. * The following statement is always true: length() >= pdfLength().

        * - * @return a length + * @return a length */ // public int pdfLength() { // return toPdf(null).length; @@ -242,14 +267,13 @@ public boolean canBeInObjStm() { /** * Returns the length of the actual content of the PdfObject. - *

        - * In some cases, namely for PdfString and PdfStream, - * this method differs from the method pdfLength because pdfLength - * returns the length of the PDF representation of the object, not of the actual content - * as does the method length.

        - *

        - * Remark: the actual content of an object is in some cases identical to its representation. - * The following statement is always true: length() >= pdfLength().

        + *

        + * In some cases, namely for PdfString and PdfStream, this method differs from the method + * pdfLength because pdfLength returns the length of the PDF representation of the + * object, not of the actual content as does the method length.

        + *

        + * Remark: the actual content of an object is in some cases identical to its representation. The following statement + * is always true: length() >= pdfLength().

        * * @return The length as int */ @@ -260,7 +284,7 @@ public int length() { /** * Changes the content of this PdfObject. * - * @param content the new content of this PdfObject + * @param content the new content of this PdfObject */ protected void setContent(String content) { bytes = PdfEncodings.convertToBytes(content, null); @@ -270,17 +294,12 @@ protected void setContent(String content) { /** * Returns the type of this PdfObject. - * - * May be either of: - * - NULL: A PdfNull - * - BOOLEAN: A PdfBoolean - * - NUMBER: A PdfNumber - * - STRING: A PdfString - * - NAME: A PdfName - * - ARRAY: A PdfArray - * - DICTIONARY: A PdfDictionary - * - STREAM: A PdfStream - * - INDIRECT: {@literal >} PdfIndirectObject + *

        + * May be either of: - NULL: A PdfNull - BOOLEAN: A PdfBoolean - + * NUMBER: A PdfNumber - STRING: A PdfString - NAME: A + * PdfName - ARRAY: A PdfArray - DICTIONARY: A + * PdfDictionary - STREAM: A PdfStream - INDIRECT: {@literal >} + * PdfIndirectObject * * @return The type */ @@ -371,9 +390,9 @@ public boolean isStream() { /** * Checks if this PdfObject is of the type * PdfIndirectObject. - * + * * @return true if this is an indirect object, - * otherwise false + * otherwise false */ public boolean isIndirect() { return (type == INDIRECT); @@ -381,7 +400,7 @@ public boolean isIndirect() { /** * Get the indirect reference - * + * * @return A PdfIndirectReference */ public PRIndirectReference getIndRef() { @@ -390,7 +409,7 @@ public PRIndirectReference getIndRef() { /** * Set the indirect reference - * + * * @param indRef New value as a PdfIndirectReference */ public void setIndRef(PRIndirectReference indRef) { diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfOutline.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfOutline.java index ab7b40d30..267a94d60 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfOutline.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfOutline.java @@ -49,222 +49,230 @@ package com.lowagie.text.pdf; +import com.lowagie.text.Chunk; +import com.lowagie.text.Font; +import com.lowagie.text.Paragraph; import java.awt.Color; import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import com.lowagie.text.Chunk; -import com.lowagie.text.Font; -import com.lowagie.text.Paragraph; - /** * PdfOutline is an object that represents a PDF outline entry. - *

        - * An outline allows a user to access views of a document by name.
        - * This object is described in the 'Portable Document Format Reference Manual version 1.3' - * section 6.7 (page 104-106) + *

        + * An outline allows a user to access views of a document by name.
        This object is described in the 'Portable + * Document Format Reference Manual version 1.3' section 6.7 (page 104-106) * - * @see PdfDictionary + * @see PdfDictionary */ public class PdfOutline extends PdfDictionary { - + // membervariables - - /** the PdfIndirectReference of this object */ + + protected List kids = new ArrayList<>(); + protected PdfWriter writer; + /** + * the PdfIndirectReference of this object + */ private PdfIndirectReference reference; - - /** value of the Count-key */ + /** + * value of the Count-key + */ private int count = 0; - - /** value of the Parent-key */ + /** + * value of the Parent-key + */ private PdfOutline parent; - - /** value of the Destination-key */ + /** + * value of the Destination-key + */ private PdfDestination destination; - - /** The PdfAction for this outline. + /** + * The PdfAction for this outline. */ private PdfAction action; - - protected List kids = new ArrayList<>(); - - protected PdfWriter writer; - - /** Holds value of property tag. */ + /** + * Holds value of property tag. + */ private String tag; - - /** Holds value of property open. */ + + /** + * Holds value of property open. + */ private boolean open; - - /** Holds value of property color. */ + + /** + * Holds value of property color. + */ private Color color; - - /** Holds value of property style. */ + + /** + * Holds value of property style. + */ private int style = 0; - + // constructors - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for the outlines object. - * + * * @param writer The PdfWriter you are adding the outline to */ - + PdfOutline(PdfWriter writer) { super(OUTLINES); open = true; parent = null; this.writer = writer; } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. The open mode is * true. * * @param parent the parent of this outline item * @param action the PdfAction for this outline item - * @param title the title of this outline item + * @param title the title of this outline item */ - + public PdfOutline(PdfOutline parent, PdfAction action, String title) { this(parent, action, title, true); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. * * @param parent the parent of this outline item * @param action the PdfAction for this outline item - * @param title the title of this outline item - * @param open true if the children are visible + * @param title the title of this outline item + * @param open true if the children are visible */ public PdfOutline(PdfOutline parent, PdfAction action, String title, boolean open) { super(); this.action = action; initOutline(parent, title, open); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. The open mode is * true. * - * @param parent the parent of this outline item + * @param parent the parent of this outline item * @param destination the destination for this outline item - * @param title the title of this outline item + * @param title the title of this outline item */ - + public PdfOutline(PdfOutline parent, PdfDestination destination, String title) { this(parent, destination, title, true); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. * - * @param parent the parent of this outline item + * @param parent the parent of this outline item * @param destination the destination for this outline item - * @param title the title of this outline item - * @param open true if the children are visible + * @param title the title of this outline item + * @param open true if the children are visible */ public PdfOutline(PdfOutline parent, PdfDestination destination, String title, boolean open) { super(); this.destination = destination; initOutline(parent, title, open); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. The open mode is * true. * * @param parent the parent of this outline item * @param action the PdfAction for this outline item - * @param title the title of this outline item + * @param title the title of this outline item */ public PdfOutline(PdfOutline parent, PdfAction action, PdfString title) { this(parent, action, title, true); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. * * @param parent the parent of this outline item * @param action the PdfAction for this outline item - * @param title the title of this outline item - * @param open true if the children are visible + * @param title the title of this outline item + * @param open true if the children are visible */ public PdfOutline(PdfOutline parent, PdfAction action, PdfString title, boolean open) { this(parent, action, title.toString(), open); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. The open mode is * true. * - * @param parent the parent of this outline item + * @param parent the parent of this outline item * @param destination the destination for this outline item - * @param title the title of this outline item + * @param title the title of this outline item */ - + public PdfOutline(PdfOutline parent, PdfDestination destination, PdfString title) { this(parent, destination, title, true); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. * - * @param parent the parent of this outline item + * @param parent the parent of this outline item * @param destination the destination for this outline item - * @param title the title of this outline item - * @param open true if the children are visible + * @param title the title of this outline item + * @param open true if the children are visible */ public PdfOutline(PdfOutline parent, PdfDestination destination, PdfString title, boolean open) { this(parent, destination, title.toString(), true); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. The open mode is * true. * * @param parent the parent of this outline item * @param action the PdfAction for this outline item - * @param title the title of this outline item + * @param title the title of this outline item */ - + public PdfOutline(PdfOutline parent, PdfAction action, Paragraph title) { this(parent, action, title, true); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. * * @param parent the parent of this outline item * @param action the PdfAction for this outline item - * @param title the title of this outline item - * @param open true if the children are visible + * @param title the title of this outline item + * @param open true if the children are visible */ public PdfOutline(PdfOutline parent, PdfAction action, Paragraph title, boolean open) { super(); @@ -276,31 +284,31 @@ public PdfOutline(PdfOutline parent, PdfAction action, Paragraph title, boolean this.action = action; initOutline(parent, buf.toString(), open); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. The open mode is * true. * - * @param parent the parent of this outline item + * @param parent the parent of this outline item * @param destination the destination for this outline item - * @param title the title of this outline item + * @param title the title of this outline item */ - + public PdfOutline(PdfOutline parent, PdfDestination destination, Paragraph title) { this(parent, destination, title, true); } - + /** * Constructs a PdfOutline. - *

        + *

        * This is the constructor for an outline entry. * - * @param parent the parent of this outline item + * @param parent the parent of this outline item * @param destination the destination for this outline item - * @param title the title of this outline item - * @param open true if the children are visible + * @param title the title of this outline item + * @param open true if the children are visible */ public PdfOutline(PdfOutline parent, PdfDestination destination, Paragraph title, boolean open) { super(); @@ -312,14 +320,15 @@ public PdfOutline(PdfOutline parent, PdfDestination destination, Paragraph title this.destination = destination; initOutline(parent, buf.toString(), open); } - - + // methods - - /** Helper for the constructors. + + /** + * Helper for the constructors. + * * @param parent the parent outline - * @param title the title for this outline - * @param open true if the children are visible + * @param title the title for this outline + * @param open true if the children are visible */ void initOutline(PdfOutline parent, String title, boolean open) { this.open = open; @@ -328,61 +337,64 @@ void initOutline(PdfOutline parent, String title, boolean open) { put(PdfName.TITLE, new PdfString(title, PdfObject.TEXT_UNICODE)); parent.addKid(this); if (destination != null && !destination.hasPage()) // bugfix Finn Bock + { setDestinationPage(writer.getCurrentPage()); + } } - + /** * Sets the indirect reference of this PdfOutline. * * @param reference the PdfIndirectReference to this outline. */ - + public void setIndirectReference(PdfIndirectReference reference) { this.reference = reference; } - + /** * Gets the indirect reference of this PdfOutline. * - * @return the PdfIndirectReference to this outline. + * @return the PdfIndirectReference to this outline. */ - + public PdfIndirectReference indirectReference() { return reference; } - + /** * Gets the parent of this PdfOutline. * - * @return the PdfOutline that is the parent of this outline. + * @return the PdfOutline that is the parent of this outline. */ - + public PdfOutline parent() { return parent; } - + /** * Set the page of the PdfDestination-object. * * @param pageReference indirect reference to the page * @return true if this page was set as the PdfDestination-page. */ - + public boolean setDestinationPage(PdfIndirectReference pageReference) { if (destination == null) { return false; } return destination.addPage(pageReference); } - + /** * Gets the destination for this outline. + * * @return the destination */ public PdfDestination getPdfDestination() { return destination; } - + int getCount() { return count; } @@ -390,152 +402,174 @@ int getCount() { void setCount(int count) { this.count = count; } - + /** * returns the level of this outline. * - * @return a level + * @return a level */ - + public int level() { if (parent == null) { return 0; } return (parent.level() + 1); } - + /** * Returns the PDF representation of this PdfOutline. * * @param writer the encryption information - * @param os the OutputStream o write the bytes to + * @param os the OutputStream o write the bytes to * @throws IOException on error of super.toPdf() */ - + public void toPdf(PdfWriter writer, OutputStream os) throws IOException { if (color != null && !color.equals(Color.black)) { - put(PdfName.C, new PdfArray(new float[]{color.getRed()/255f,color.getGreen()/255f,color.getBlue()/255f})); + put(PdfName.C, + new PdfArray(new float[]{color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f})); } int flag = 0; - if ((style & Font.BOLD) != 0) + if ((style & Font.BOLD) != 0) { flag |= 2; - if ((style & Font.ITALIC) != 0) + } + if ((style & Font.ITALIC) != 0) { flag |= 1; - if (flag != 0) + } + if (flag != 0) { put(PdfName.F, new PdfNumber(flag)); + } if (parent != null) { put(PdfName.PARENT, parent.indirectReference()); } if (destination != null && destination.hasPage()) { put(PdfName.DEST, destination); } - if (action != null) + if (action != null) { put(PdfName.A, action); + } if (count != 0) { put(PdfName.COUNT, new PdfNumber(count)); } super.toPdf(writer, os); } - + /** * Adds a kid to the outline + * * @param outline the PdfOutline to add a kid to */ public void addKid(PdfOutline outline) { kids.add(outline); } - + /** * Returns the kids of this outline + * * @return an ArrayList with PdfOutlines */ public List getKids() { return kids; } - + /** * Sets the kids of this outline + * * @param kids the kids of the outline */ public void setKids(List kids) { this.kids = kids; } - - /** Getter for property tag. + + /** + * Getter for property tag. + * * @return Value of property tag. */ public String getTag() { return tag; } - - /** Setter for property tag. + + /** + * Setter for property tag. + * * @param tag New value of property tag. */ public void setTag(String tag) { this.tag = tag; } - + /** * Gets the title of this outline + * * @return the title as a String */ public String getTitle() { - PdfString title = (PdfString)get(PdfName.TITLE); + PdfString title = (PdfString) get(PdfName.TITLE); return title.toString(); } - + /** * Sets the title of this outline + * * @param title the title of the outline */ public void setTitle(String title) { put(PdfName.TITLE, new PdfString(title, PdfObject.TEXT_UNICODE)); } - - /** Getter for property open. + + /** + * Getter for property open. + * * @return Value of property open. */ public boolean isOpen() { return open; } - - /** Setter for property open. + + /** + * Setter for property open. + * * @param open New value of property open. */ public void setOpen(boolean open) { this.open = open; } - - /** Getter for property color. - * @return Value of property color. + + /** + * Getter for property color. * + * @return Value of property color. */ public Color getColor() { return this.color; } - - /** Setter for property color. - * @param color New value of property color. + + /** + * Setter for property color. * + * @param color New value of property color. */ public void setColor(Color color) { this.color = color; } - - /** Getter for property style. - * @return Value of property style. + + /** + * Getter for property style. * + * @return Value of property style. */ public int getStyle() { return this.style; } - - /** Setter for property style. - * @param style New value of property style. + + /** + * Setter for property style. * + * @param style New value of property style. */ public void setStyle(int style) { this.style = style; } - + } \ No newline at end of file diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPCell.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPCell.java index 056f5a1f0..0f2680521 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPCell.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPCell.java @@ -49,87 +49,97 @@ package com.lowagie.text.pdf; -import java.util.List; -import com.lowagie.text.error_messages.MessageLocalization; - import com.lowagie.text.Chunk; import com.lowagie.text.DocumentException; import com.lowagie.text.Element; - +import com.lowagie.text.ExceptionConverter; import com.lowagie.text.Image; import com.lowagie.text.Phrase; import com.lowagie.text.Rectangle; -import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.error_messages.MessageLocalization; import com.lowagie.text.pdf.events.PdfPCellEventForwarder; +import java.util.List; /** * A cell in a PdfPTable. */ -public class PdfPCell extends Rectangle{ - +public class PdfPCell extends Rectangle { + + /** + * The text in the cell. + */ + protected Phrase phrase; private ColumnText column = new ColumnText(null); - - /** Vertical alignment of the cell. */ + /** + * Vertical alignment of the cell. + */ private int verticalAlignment = Element.ALIGN_TOP; - - /** Left padding of the cell. */ + /** + * Left padding of the cell. + */ private float paddingLeft = 2; - - /** Right padding of the cell. */ + /** + * Right padding of the cell. + */ private float paddingRight = 2; - - /** Top padding of the cell. */ + /** + * Top padding of the cell. + */ private float paddingTop = 2; - - /** Bottom padding of the cell. */ + /** + * Bottom padding of the cell. + */ private float paddingBottom = 2; - - /** Fixed height of the cell. */ + /** + * Fixed height of the cell. + */ private float fixedHeight = 0; - - /** Minimum height of the cell. */ + /** + * Minimum height of the cell. + */ private float minimumHeight; - - /** Holds value of property noWrap. */ + /** + * Holds value of property noWrap. + */ private boolean noWrap = false; - - /** Holds value of property table. */ + /** + * Holds value of property table. + */ private PdfPTable table; - - /** Holds value of property colspan. */ + /** + * Holds value of property colspan. + */ private int colspan = 1; - /** * Holds value of property rowspan. - * @since 2.1.6 + * + * @since 2.1.6 */ private int rowspan = 1; - - /** Holds value of property image. */ + /** + * Holds value of property image. + */ private Image image; - - /** Holds value of property cellEvent. */ + /** + * Holds value of property cellEvent. + */ private PdfPCellEvent cellEvent; - - /** Holds value of property useDescender. */ + /** + * Holds value of property useDescender. + */ private boolean useDescender; - - /** Increases padding to include border if true */ + /** + * Increases padding to include border if true + */ private boolean useBorderPadding = false; - - /** The text in the cell. */ - protected Phrase phrase; - /** - * The rotation of the cell. Possible values are - * 0, 90, 180 and 270. + * The rotation of the cell. Possible values are 0, 90, 180 and 270. */ private int rotation; /** - * Constructs an empty PdfPCell. - * The default padding is 2. + * Constructs an empty PdfPCell. The default padding is 2. */ public PdfPCell() { super(0, 0, 0, 0); @@ -139,9 +149,8 @@ public PdfPCell() { } /** - * Constructs a PdfPCell with a Phrase. - * The default padding is 2. - * + * Constructs a PdfPCell with a Phrase. The default padding is 2. + * * @param phrase the text */ public PdfPCell(Phrase phrase) { @@ -151,23 +160,22 @@ public PdfPCell(Phrase phrase) { column.addText(this.phrase = phrase); column.setLeading(0, 1); } - + /** - * Constructs a PdfPCell with an Image. - * The default padding is 0. - * + * Constructs a PdfPCell with an Image. The default padding is 0. + * * @param image the Image */ public PdfPCell(Image image) { this(image, false); } - + /** - * Constructs a PdfPCell with an Image. - * The default padding is 0.25 for a border width of 0.5. - * + * Constructs a PdfPCell with an Image. The default padding is 0.25 for a border width of + * 0.5. + * * @param image the Image - * @param fit true to fit the image to the cell + * @param fit true to fit the image to the cell */ public PdfPCell(Image image, boolean fit) { super(0, 0, 0, 0); @@ -177,31 +185,28 @@ public PdfPCell(Image image, boolean fit) { this.image = image; column.setLeading(0, 1); setPadding(borderWidth / 2); - } - else { + } else { column.addText(this.phrase = new Phrase(new Chunk(image, 0, 0))); column.setLeading(0, 1); setPadding(0); } } - + /** - * Constructs a PdfPCell with a PdfPtable. - * This constructor allows nested tables. - * The default padding is 0. - * + * Constructs a PdfPCell with a PdfPtable. This constructor allows nested tables. The + * default padding is 0. + * * @param table The PdfPTable */ public PdfPCell(PdfPTable table) { this(table, null); } - + /** - * Constructs a PdfPCell with a PdfPtable. - * This constructor allows nested tables. - * + * Constructs a PdfPCell with a PdfPtable. This constructor allows nested tables. + * * @param table The PdfPTable - * @param style The style to apply to the cell (you could use getDefaultCell()) + * @param style The style to apply to the cell (you could use getDefaultCell()) * @since 2.1.0 */ public PdfPCell(PdfPTable table, PdfPCell style) { @@ -226,14 +231,14 @@ public PdfPCell(PdfPTable table, PdfPCell style) { useDescender = style.useDescender; useBorderPadding = style.useBorderPadding; rotation = style.rotation; - } - else + } else { setPadding(0); + } } - + /** * Constructs a deep copy of a PdfPCell. - * + * * @param cell the PdfPCell to duplicate */ public PdfPCell(PdfPCell cell) { @@ -250,8 +255,9 @@ public PdfPCell(PdfPCell cell) { noWrap = cell.noWrap; colspan = cell.colspan; rowspan = cell.rowspan; - if (cell.table != null) + if (cell.table != null) { table = new PdfPTable(cell.table); + } image = Image.getInstance(cell.image); cellEvent = cell.cellEvent; useDescender = cell.useDescender; @@ -259,10 +265,10 @@ public PdfPCell(PdfPCell cell) { useBorderPadding = cell.useBorderPadding; rotation = cell.rotation; } - + /** * Adds an iText element to the cell. - * + * * @param element the iText element to add to the cell */ public void addElement(Element element) { @@ -272,19 +278,19 @@ public void addElement(Element element) { } column.addElement(element); } - + /** * Gets the Phrase from this cell. - * + * * @return the Phrase */ public Phrase getPhrase() { return phrase; } - + /** * Sets the Phrase for this cell. - * + * * @param phrase the Phrase */ public void setPhrase(Phrase phrase) { @@ -292,52 +298,52 @@ public void setPhrase(Phrase phrase) { image = null; column.setText(this.phrase = phrase); } - + /** * Gets the horizontal alignment for the cell. - * + * * @return the horizontal alignment for the cell */ public int getHorizontalAlignment() { return column.getAlignment(); } - + /** * Sets the horizontal alignment for the cell. It could be * Element.ALIGN_CENTER for example. - * + * * @param horizontalAlignment The horizontal alignment */ public void setHorizontalAlignment(int horizontalAlignment) { column.setAlignment(horizontalAlignment); } - + /** * Gets the vertical alignment for the cell. - * + * * @return the vertical alignment for the cell */ public int getVerticalAlignment() { return verticalAlignment; } - + /** * Sets the vertical alignment for the cell. It could be * Element.ALIGN_MIDDLE for example. - * + * * @param verticalAlignment The vertical alignment */ public void setVerticalAlignment(int verticalAlignment) { - if (table != null) + if (table != null) { table.setExtendLastRow(verticalAlignment == Element.ALIGN_TOP); + } this.verticalAlignment = verticalAlignment; } - + /** - * Gets the effective left padding. - * This will include the left border width if - * {@link #isUseBorderPadding()} is true. - * + * Gets the effective left padding. This will include the left border width if {@link #isUseBorderPadding()} is + * true. + * * @return effective value of property paddingLeft. */ public float getEffectivePaddingLeft() { @@ -347,7 +353,7 @@ public float getEffectivePaddingLeft() { } return paddingLeft; } - + /** * @return Value of property paddingLeft. */ @@ -357,17 +363,17 @@ public float getPaddingLeft() { /** * Setter for property paddingLeft. - * + * * @param paddingLeft New value of property paddingLeft. */ public void setPaddingLeft(float paddingLeft) { this.paddingLeft = paddingLeft; } - + /** - * Gets the effective right padding. This will include - * the right border width if {@link #isUseBorderPadding()} is true. - * + * Gets the effective right padding. This will include the right border width if {@link #isUseBorderPadding()} is + * true. + * * @return effective value of property paddingRight. */ public float getEffectivePaddingRight() { @@ -377,10 +383,10 @@ public float getEffectivePaddingRight() { } return paddingRight; } - + /** * Getter for property paddingRight. - * + * * @return Value of property paddingRight. */ public float getPaddingRight() { @@ -389,30 +395,30 @@ public float getPaddingRight() { /** * Setter for property paddingRight. - * + * * @param paddingRight New value of property paddingRight. */ public void setPaddingRight(float paddingRight) { this.paddingRight = paddingRight; } - - /** - * Gets the effective top padding. This will include - * the top border width if {@link #isUseBorderPadding()} is true. - * + + /** + * Gets the effective top padding. This will include the top border width if {@link #isUseBorderPadding()} is + * true. + * * @return effective value of property paddingTop. */ public float getEffectivePaddingTop() { if (isUseBorderPadding()) { - float border = getBorderWidthTop()/(isUseVariableBorders()?1f:2f); + float border = getBorderWidthTop() / (isUseVariableBorders() ? 1f : 2f); return paddingTop + border; } return paddingTop; } - + /** * Getter for property paddingTop. - * + * * @return Value of property paddingTop. */ public float getPaddingTop() { @@ -421,31 +427,30 @@ public float getPaddingTop() { /** * Setter for property paddingTop. - * + * * @param paddingTop New value of property paddingTop. */ public void setPaddingTop(float paddingTop) { this.paddingTop = paddingTop; } - + /** - * Gets the effective bottom padding. - * This will include the bottom border width if - * {@link #isUseBorderPadding()} is true. - * + * Gets the effective bottom padding. This will include the bottom border width if {@link #isUseBorderPadding()} is + * true. + * * @return effective value of property paddingBottom. */ public float getEffectivePaddingBottom() { if (isUseBorderPadding()) { - float border = getBorderWidthBottom()/(isUseVariableBorders()?1f:2f); + float border = getBorderWidthBottom() / (isUseVariableBorders() ? 1f : 2f); return paddingBottom + border; } return paddingBottom; } - + /** * Getter for property paddingBottom. - * + * * @return Value of property paddingBottom. */ public float getPaddingBottom() { @@ -454,16 +459,16 @@ public float getPaddingBottom() { /** * Setter for property paddingBottom. - * + * * @param paddingBottom New value of property paddingBottom. */ public void setPaddingBottom(float paddingBottom) { this.paddingBottom = paddingBottom; } - + /** * Sets the padding of the contents in the cell (space between content and border). - * + * * @param padding the padding */ public void setPadding(float padding) { @@ -475,7 +480,7 @@ public void setPadding(float padding) { /** * If true, then effective padding will include border widths - * + * * @return true if effective padding includes border widths */ public boolean isUseBorderPadding() { @@ -484,7 +489,7 @@ public boolean isUseBorderPadding() { /** * Adjusts effective padding to include border widths. - * + * * @param use adjust effective padding if true */ public void setUseBorderPadding(boolean use) { @@ -492,113 +497,99 @@ public void setUseBorderPadding(boolean use) { } /** - * Sets the leading fixed and variable. - * The resultant leading will be: - * fixedLeading+multipliedLeading*maxFontSize + * Sets the leading fixed and variable. The resultant leading will be: fixedLeading+multipliedLeading*maxFontSize * where maxFontSize is the size of the biggest font in the line. - * - * @param fixedLeading the fixed leading + * + * @param fixedLeading the fixed leading * @param multipliedLeading the variable leading */ public void setLeading(float fixedLeading, float multipliedLeading) { column.setLeading(fixedLeading, multipliedLeading); } - + /** * Gets the fixed leading. - * + * * @return the leading */ public float getLeading() { return column.getLeading(); } - + /** * Gets the variable leading. - * + * * @return the leading */ public float getMultipliedLeading() { return column.getMultipliedLeading(); } - - /** - * Sets the first paragraph line indent. - * - * @param indent the indent - */ - public void setIndent(float indent) { - column.setIndent(indent); - } - + /** * Gets the first paragraph line indent. - * + * * @return the indent */ public float getIndent() { return column.getIndent(); } - + + /** + * Sets the first paragraph line indent. + * + * @param indent the indent + */ + public void setIndent(float indent) { + column.setIndent(indent); + } + /** * Gets the extra space between paragraphs. - * + * * @return the extra space between paragraphs */ public float getExtraParagraphSpace() { return column.getExtraParagraphSpace(); } - + /** * Sets the extra space between paragraphs. - * + * * @param extraParagraphSpace the extra space between paragraphs */ public void setExtraParagraphSpace(float extraParagraphSpace) { column.setExtraParagraphSpace(extraParagraphSpace); } - - /** - * Set a fixed height for the cell. - * This will automatically unset minimumHeight, if set. - * - * @param fixedHeight New value of property fixedHeight. - */ - public void setFixedHeight(float fixedHeight) { - this.fixedHeight = fixedHeight; - minimumHeight = 0; - } - + /** * Get the fixed height of the cell. - * + * * @return Value of property fixedHeight. */ public float getFixedHeight() { return fixedHeight; } + /** + * Set a fixed height for the cell. This will automatically unset minimumHeight, if set. + * + * @param fixedHeight New value of property fixedHeight. + */ + public void setFixedHeight(float fixedHeight) { + this.fixedHeight = fixedHeight; + minimumHeight = 0; + } + /** * Tells you whether the cell has a fixed height. - * - * @return true is a fixed height was set. + * + * @return true is a fixed height was set. * @since 2.1.5 */ public boolean hasFixedHeight() { return getFixedHeight() > 0; } - - /** - * Set a minimum height for the cell. - * This will automatically unset fixedHeight, if set. - * - * @param minimumHeight New value of property minimumHeight. - */ - public void setMinimumHeight(float minimumHeight) { - this.minimumHeight = minimumHeight; - fixedHeight = 0; - } - + /** * Get the minimum height of the cell. * @@ -608,44 +599,54 @@ public float getMinimumHeight() { return minimumHeight; } + /** + * Set a minimum height for the cell. This will automatically unset fixedHeight, if set. + * + * @param minimumHeight New value of property minimumHeight. + */ + public void setMinimumHeight(float minimumHeight) { + this.minimumHeight = minimumHeight; + fixedHeight = 0; + } + /** * Tells you whether the cell has a minimum height. - * - * @return true if a minimum height was set. + * + * @return true if a minimum height was set. * @since 2.1.5 */ public boolean hasMinimumHeight() { return getMinimumHeight() > 0; } - + /** * Getter for property noWrap. - * + * * @return Value of property noWrap. */ public boolean isNoWrap() { return noWrap; } - + /** * Setter for property noWrap. - * + * * @param noWrap New value of property noWrap. */ public void setNoWrap(boolean noWrap) { this.noWrap = noWrap; } - + /** * Getter for property table. - * + * * @return Value of property table. * @since 2.x */ public PdfPTable getTable() { return table; } - + void setTable(PdfPTable table) { this.table = table; column.setText(null); @@ -659,134 +660,131 @@ void setTable(PdfPTable table) { /** * Getter for property colspan. - * + * * @return Value of property colspan. */ public int getColspan() { return colspan; } - + /** * Setter for property colspan. - * + * * @param colspan New value of property colspan. */ public void setColspan(int colspan) { this.colspan = colspan; } - + /** * Getter for property rowspan. - * + * * @return Value of property rowspan. - * @since 2.1.6 + * @since 2.1.6 */ public int getRowspan() { return rowspan; } - + /** * Setter for property rowspan. - * + * * @param rowspan New value of property rowspan. - * @since 2.1.6 + * @since 2.1.6 */ public void setRowspan(int rowspan) { this.rowspan = rowspan; } - /** - * Sets the following paragraph lines indent. - * - * @param indent the indent - */ - public void setFollowingIndent(float indent) { - column.setFollowingIndent(indent); - } - /** * Gets the following paragraph lines indent. - * + * * @return the indent */ public float getFollowingIndent() { return column.getFollowingIndent(); } - + /** - * Sets the right paragraph lines indent. - * + * Sets the following paragraph lines indent. + * * @param indent the indent */ - public void setRightIndent(float indent) { - column.setRightIndent(indent); + public void setFollowingIndent(float indent) { + column.setFollowingIndent(indent); } - + /** * Gets the right paragraph lines indent. - * + * * @return the indent */ public float getRightIndent() { return column.getRightIndent(); } - + + /** + * Sets the right paragraph lines indent. + * + * @param indent the indent + */ + public void setRightIndent(float indent) { + column.setRightIndent(indent); + } + /** * Gets the space/character extra spacing ratio for fully justified text. - * + * * @return the space/character extra spacing ratio */ public float getSpaceCharRatio() { return column.getSpaceCharRatio(); } - - /** Sets the ratio between the extra word spacing and the - * extra character spacing when the text is fully justified. - * Extra word spacing will grow spaceCharRatio times more - * than extra character spacing. - * If the ratio is PdfWriter.NO_SPACE_CHAR_RATIO then the - * extra character spacing will be zero. - * + + /** + * Sets the ratio between the extra word spacing and the extra character spacing when the text is fully justified. + * Extra word spacing will grow spaceCharRatio times more than extra character spacing. If the ratio + * is + * PdfWriter.NO_SPACE_CHAR_RATIO then the extra character spacing will be zero. + * * @param spaceCharRatio the ratio between the extra word spacing and the extra character spacing */ public void setSpaceCharRatio(float spaceCharRatio) { column.setSpaceCharRatio(spaceCharRatio); } - - /** - * Sets the run direction of the text content in the cell. - * May be either of: - * PdfWriter.RUN_DIRECTION_DEFAULT, PdfWriter.RUN_DIRECTION_NO_BIDI, - * PdfWriter.RUN_DIRECTION_LTR or PdfWriter.RUN_DIRECTION_RTL. - * @param runDirection the run direction (see above) - */ - public void setRunDirection(int runDirection) { - column.setRunDirection(runDirection); - } - + /** * Gets the run direction of the text content in the cell - * - * @return One of the following values: - * PdfWriter.RUN_DIRECTION_DEFAULT, PdfWriter.RUN_DIRECTION_NO_BIDI, + * + * @return One of the following values: PdfWriter.RUN_DIRECTION_DEFAULT, PdfWriter.RUN_DIRECTION_NO_BIDI, * PdfWriter.RUN_DIRECTION_LTR or PdfWriter.RUN_DIRECTION_RTL. */ public int getRunDirection() { return column.getRunDirection(); } - + + /** + * Sets the run direction of the text content in the cell. May be either of: PdfWriter.RUN_DIRECTION_DEFAULT, + * PdfWriter.RUN_DIRECTION_NO_BIDI, PdfWriter.RUN_DIRECTION_LTR or PdfWriter.RUN_DIRECTION_RTL. + * + * @param runDirection the run direction (see above) + */ + public void setRunDirection(int runDirection) { + column.setRunDirection(runDirection); + } + /** * Getter for property image. - * + * * @return Value of property image. */ public Image getImage() { return image; } - + /** * Setter for property image. - * + * * @param image New value of property image. */ public void setImage(Image image) { @@ -794,58 +792,57 @@ public void setImage(Image image) { table = null; this.image = image; } - + /** * Gets the cell event for this cell. - * + * * @return the cell event */ public PdfPCellEvent getCellEvent() { return cellEvent; } - + /** * Sets the cell event for this cell. - * + * * @param cellEvent the cell event */ public void setCellEvent(PdfPCellEvent cellEvent) { - if (cellEvent == null) + if (cellEvent == null) { this.cellEvent = null; - else if (this.cellEvent == null) + } else if (this.cellEvent == null) { this.cellEvent = cellEvent; - else if (this.cellEvent instanceof PdfPCellEventForwarder) - ((PdfPCellEventForwarder)this.cellEvent).addCellEvent(cellEvent); - else { + } else if (this.cellEvent instanceof PdfPCellEventForwarder) { + ((PdfPCellEventForwarder) this.cellEvent).addCellEvent(cellEvent); + } else { PdfPCellEventForwarder forward = new PdfPCellEventForwarder(); forward.addCellEvent(this.cellEvent); forward.addCellEvent(cellEvent); this.cellEvent = forward; } } - + /** * Gets the arabic shaping options. - * + * * @return the arabic shaping options */ public int getArabicOptions() { return column.getArabicOptions(); } - - /** - * Sets the arabic shaping options. - * The option can be AR_NOVOWEL, AR_COMPOSEDTASHKEEL and AR_LIG. - * + + /** + * Sets the arabic shaping options. The option can be AR_NOVOWEL, AR_COMPOSEDTASHKEEL and AR_LIG. + * * @param arabicOptions the arabic shaping options */ public void setArabicOptions(int arabicOptions) { column.setArabicOptions(arabicOptions); } - + /** * Gets state of first line height based on max ascender - * + * * @return true if an ascender is to be used. */ public boolean isUseAscender() { @@ -864,7 +861,7 @@ public void setUseAscender(boolean useAscender) { /** * Getter for property useDescender. - * + * * @return Value of property useDescender. */ public boolean isUseDescender() { @@ -873,7 +870,7 @@ public boolean isUseDescender() { /** * Setter for property useDescender. - * + * * @param useDescender New value of property useDescender. */ public void setUseDescender(boolean useDescender) { @@ -882,23 +879,13 @@ public void setUseDescender(boolean useDescender) { /** * Gets the ColumnText with the content of the cell. - * + * * @return a columntext object */ public ColumnText getColumn() { return column; } - - /** - * Returns the list of composite elements of the column. - * - * @return a List object. - * @since 2.1.1 - */ - public List getCompositeElements() { - return getColumn().compositeElements; - } - + /** * Sets the ColumnText in the cell. * @@ -908,6 +895,16 @@ public void setColumn(ColumnText column) { this.column = column; } + /** + * Returns the list of composite elements of the column. + * + * @return a List object. + * @since 2.1.1 + */ + public List getCompositeElements() { + return getColumn().compositeElements; + } + /** * Gets the rotation of the cell. * @@ -918,33 +915,35 @@ public int getRotation() { } /** - * Sets the rotation of the cell. - * Possible values are 0, 90, 180 and 270. + * Sets the rotation of the cell. Possible values are 0, 90, 180 and 270. * * @param rotation the rotation of the cell */ public void setRotation(int rotation) { rotation %= 360; - if (rotation < 0) + if (rotation < 0) { rotation += 360; - if ((rotation % 90) != 0) - throw new IllegalArgumentException(MessageLocalization.getComposedMessage("rotation.must.be.a.multiple.of.90")); + } + if ((rotation % 90) != 0) { + throw new IllegalArgumentException( + MessageLocalization.getComposedMessage("rotation.must.be.a.multiple.of.90")); + } this.rotation = rotation; } - + /** * Consumes part of the content of the cell. - * @param height the hight of the part that has to be consumed - * @since 2.1.6 + * + * @param height the hight of the part that has to be consumed + * @since 2.1.6 */ void consumeHeight(float height) { float rightLimit = getRight() - getEffectivePaddingRight(); float leftLimit = getLeft() + getEffectivePaddingLeft(); float bry = height - getEffectivePaddingTop() - getEffectivePaddingBottom(); if (getRotation() != 90 && getRotation() != 270) { - column.setSimpleColumn(leftLimit, bry + 0.001f, rightLimit, 0); - } - else { + column.setSimpleColumn(leftLimit, bry + 0.001f, rightLimit, 0); + } else { column.setSimpleColumn(0, leftLimit, bry + 0.001f, rightLimit); } try { @@ -953,11 +952,12 @@ void consumeHeight(float height) { // do nothing } } - + /** * Returns the height of the cell. - * @return the height of the cell - * @since 3.0.0 + * + * @return the height of the cell + * @since 3.0.0 */ public float getMaxHeight() { boolean pivoted = (getRotation() == 90 || getRotation() == 270); @@ -970,11 +970,10 @@ public float getMaxHeight() { img.scalePercent(scale * 100); float refHeight = pivoted ? img.getScaledWidth() : img.getScaledHeight(); setBottom(getTop() - getEffectivePaddingTop() - getEffectivePaddingBottom() - refHeight); - } - else { - if ((pivoted && hasFixedHeight()) || getColumn() == null) + } else { + if ((pivoted && hasFixedHeight()) || getColumn() == null) { setBottom(getTop() - getFixedHeight()); - else { + } else { ColumnText ct = ColumnText.duplicate(getColumn()); float right, top, left, bottom; if (pivoted) { @@ -982,12 +981,12 @@ public float getMaxHeight() { top = getRight() - getEffectivePaddingRight(); left = 0; bottom = getLeft() + getEffectivePaddingLeft(); - } - else { + } else { right = isNoWrap() ? PdfPRow.RIGHT_LIMIT : getRight() - getEffectivePaddingRight(); top = getTop() - getEffectivePaddingTop(); left = getLeft() + getEffectivePaddingLeft(); - bottom = hasFixedHeight() ? getTop() + getEffectivePaddingBottom() - getFixedHeight() : PdfPRow.BOTTOM_LIMIT; + bottom = hasFixedHeight() ? getTop() + getEffectivePaddingBottom() - getFixedHeight() + : PdfPRow.BOTTOM_LIMIT; } PdfPRow.setColumn(ct, left, bottom, right, top); try { @@ -995,21 +994,23 @@ public float getMaxHeight() { } catch (DocumentException e) { throw new ExceptionConverter(e); } - if (pivoted) + if (pivoted) { setBottom(getTop() - getEffectivePaddingTop() - getEffectivePaddingBottom() - ct.getFilledWidth()); - else { + } else { float yLine = ct.getYLine(); - if (isUseDescender()) + if (isUseDescender()) { yLine += ct.getDescender(); + } setBottom(yLine - getEffectivePaddingBottom()); } } } float height = getHeight(); - if (hasFixedHeight()) + if (hasFixedHeight()) { height = getFixedHeight(); - else if (height < getMinimumHeight()) + } else if (height < getMinimumHeight()) { height = getMinimumHeight(); + } return height; } } diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPCellEvent.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPCellEvent.java index 9f5f43768..181e33e75 100644 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPCellEvent.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPCellEvent.java @@ -48,12 +48,16 @@ import com.lowagie.text.Rectangle; -/** An event called for a single cell. +/** + * An event called for a single cell. + * * @author Paulo Soares (psoares@consiste.pt) */ public interface PdfPCellEvent { - /** This method is called at the end of the cell rendering. The text or graphics are added to - * one of the 4 PdfContentByte contained in + + /** + * This method is called at the end of the cell rendering. The text or graphics are added to one of the 4 + * PdfContentByte contained in * canvases.
        * The indexes to canvases are: *

          @@ -66,7 +70,8 @@ public interface PdfPCellEvent { *
        * The layers are placed in sequence on top of each other. *

        - * @param cell the cell + * + * @param cell the cell * @param position the coordinates of the cell * @param canvases an array of PdfContentByte */ diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPKCS7.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPKCS7.java index 8ec38d085..a77b01fe6 100755 --- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPKCS7.java +++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPKCS7.java @@ -48,6 +48,8 @@ import static org.bouncycastle.asn1.x509.Extension.authorityInfoAccess; +import com.lowagie.text.ExceptionConverter; +import com.lowagie.text.error_messages.MessageLocalization; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -118,37 +120,13 @@ import org.bouncycastle.tsp.TimeStampToken; import org.bouncycastle.tsp.TimeStampTokenInfo; -import com.lowagie.text.ExceptionConverter; -import com.lowagie.text.error_messages.MessageLocalization; - /** - * This class does all the processing related to signing and verifying a PKCS#7 - * signature. + * This class does all the processing related to signing and verifying a PKCS#7 signature. *

        * It's based in code found at org.bouncycastle. */ public class PdfPKCS7 { - private byte[] sigAttr; - private byte[] digestAttr; - private int version, signerversion; - private Set digestalgos; - private final List certs; - private List signCerts; - private final List crls; - private X509Certificate signCert; - private byte[] digest; - private MessageDigest messageDigest; - private String digestAlgorithm, digestEncryptionAlgorithm; - private Signature sig; - private transient PrivateKey privKey; - private byte[] RSAdata; - private boolean verified; - private boolean verifyResult; - private byte[] externalDigest; - private byte[] externalRSAdata; - private final String provider; - private static final String ID_PKCS7_DATA = "1.2.840.113549.1.7.1"; private static final String ID_PKCS7_SIGNED_DATA = "1.2.840.113549.1.7.2"; private static final String ID_RSA = "1.2.840.113549.1.1.1"; @@ -158,28 +136,6 @@ public class PdfPKCS7 { private static final String ID_MESSAGE_DIGEST = "1.2.840.113549.1.9.4"; private static final String ID_SIGNING_TIME = "1.2.840.113549.1.9.5"; private static final String ID_ADBE_REVOCATION = "1.2.840.113583.1.1.8"; - /** - * Holds value of property reason. - */ - private String reason; - - /** - * Holds value of property location. - */ - private String location; - - /** - * Holds value of property signDate. - */ - private Calendar signDate; - - /** - * Holds value of property signName. - */ - private String signName; - - private TimeStampToken timeStampToken; - private static final Map digestNames = new HashMap<>(); private static final Map algorithmNames = new HashMap<>(); private static final Map allowedDigests = new HashMap<>(); @@ -227,8 +183,8 @@ public class PdfPKCS7 { algorithmNames.put("1.3.36.3.3.1.2", "RSA"); algorithmNames.put("1.3.36.3.3.1.4", "RSA"); algorithmNames.put(ID_ECDSA, "ECDSA"); - algorithmNames.put("1.2.840.10045.4.1", "ECDSA"); - algorithmNames.put("1.2.840.10045.4.3", "ECDSA"); + algorithmNames.put("1.2.840.10045.4.1", "ECDSA"); + algorithmNames.put("1.2.840.10045.4.3", "ECDSA"); algorithmNames.put("1.2.840.10045.4.3.2", "ECDSA"); algorithmNames.put("1.2.840.10045.4.3.3", "ECDSA"); algorithmNames.put("1.2.840.10045.4.3.4", "ECDSA"); @@ -255,64 +211,43 @@ public class PdfPKCS7 { allowedDigests.put("RIPEMD-256", "1.3.36.3.2.3"); } + private final List certs; + private final List crls; + private final String provider; + private byte[] sigAttr; + private byte[] digestAttr; + private int version, signerversion; + private Set digestalgos; + private List signCerts; + private X509Certificate signCert; + private byte[] digest; + private MessageDigest messageDigest; + private String digestAlgorithm, digestEncryptionAlgorithm; + private Signature sig; + private transient PrivateKey privKey; + private byte[] RSAdata; + private boolean verified; + private boolean verifyResult; + private byte[] externalDigest; + private byte[] externalRSAdata; /** - * Gets the digest name for a certain id - * - * @param oid an id (for instance "1.2.840.113549.2.5") - * @return a digest name (for instance "MD5") - * @since 2.1.6 - */ - public static String getDigest(String oid) { - return Optional.ofNullable(digestNames.get(oid)) - .orElse(oid); - } - - /** - * Gets the algorithm name for a certain id. - * - * @param oid an id (for instance "1.2.840.113549.1.1.1") - * @return an algorithm name (for instance "RSA") - * @since 2.1.6 + * Holds value of property reason. */ - public static String getAlgorithm(String oid) { - return Optional.ofNullable(algorithmNames.get(oid)) - .orElse(oid); - } - + private String reason; /** - * Gets the oid for given digest name. - * - * @param digestName digest name (for instance "SHA-256") - * @return a digest OID (for instance "2.16.840.1.101.3.4.2.1") or {@code null} if the oid for provided name is not found + * Holds value of property location. */ - public static String getDigestOid(String digestName) { - return digestName != null ? allowedDigests.get(digestName) : null; - } - + private String location; /** - * Gets the timestamp token if there is one. - * - * @return the timestamp token or null - * @since 2.1.6 + * Holds value of property signDate. */ - public TimeStampToken getTimeStampToken() { - return timeStampToken; - } - + private Calendar signDate; /** - * Gets the timestamp date - * - * @return a date - * @since 2.1.6 + * Holds value of property signName. */ - public Calendar getTimeStampDate() { - if (timeStampToken == null) - return null; - Calendar cal = new GregorianCalendar(); - Date date = timeStampToken.getTimeStampInfo().getGenTime(); - cal.setTime(date); - return cal; - } + private String signName; + private TimeStampToken timeStampToken; + private BasicOCSPResp basicResp; /** * Verifies a signature using the sub-filter adbe.x509.rsa_sha1. @@ -326,7 +261,8 @@ public PdfPKCS7(byte[] contentsKey, byte[] certsKey, String provider) { try { this.provider = provider; CertificateFactory certificateFactory = new CertificateFactory(); - Collection certificates = certificateFactory.engineGenerateCertificates(new ByteArrayInputStream(certsKey)); + Collection certificates = certificateFactory.engineGenerateCertificates( + new ByteArrayInputStream(certsKey)); certs = new ArrayList<>(certificates); signCerts = certs; signCert = (X509Certificate) certs.iterator().next(); @@ -344,54 +280,8 @@ public PdfPKCS7(byte[] contentsKey, byte[] certsKey, String provider) { } } - private BasicOCSPResp basicResp; - - /** - * Gets the OCSP basic response if there is one. - * - * @return the OCSP basic response or null - * @since 2.1.6 - */ - public BasicOCSPResp getOcsp() { - return basicResp; - } - - private void findOcsp(ASN1Sequence seq) throws IOException { - basicResp = null; - while ((!(seq.getObjectAt(0) instanceof ASN1ObjectIdentifier)) - || !((ASN1ObjectIdentifier) seq.getObjectAt(0)).getId().equals( - OCSPObjectIdentifiers.id_pkix_ocsp_basic.getId())) { - boolean ret = true; - int k = 0; - while (k < seq.size()) { - if (seq.getObjectAt(k) instanceof ASN1Sequence) { - seq = (ASN1Sequence) seq.getObjectAt(0); - ret = false; - break; - } - if (seq.getObjectAt(k) instanceof ASN1TaggedObject) { - ASN1TaggedObject tag = (ASN1TaggedObject) seq.getObjectAt(k); - if (tag.getBaseObject() instanceof ASN1Sequence) { - seq = (ASN1Sequence) tag.getBaseObject(); - ret = false; - break; - } else - return; - } - ++k; - } - if (ret) - return; - } - DEROctetString os = (DEROctetString) seq.getObjectAt(1); - ASN1InputStream inp = new ASN1InputStream(os.getOctets()); - BasicOCSPResponse resp = BasicOCSPResponse.getInstance(inp.readObject()); - basicResp = new BasicOCSPResp(resp); - } - /** - * Verifies a signature using the sub-filter adbe.pkcs7.detached or - * adbe.pkcs7.sha1. + * Verifies a signature using the sub-filter adbe.pkcs7.detached or adbe.pkcs7.sha1. * * @param contentsKey the /Contents key * @param provider the provider or null for the default provider @@ -423,11 +313,13 @@ public PdfPKCS7(byte[] contentsKey, String provider) { ASN1Sequence signedData = (ASN1Sequence) pkcs; ASN1ObjectIdentifier objId = (ASN1ObjectIdentifier) signedData .getObjectAt(0); - if (!objId.getId().equals(ID_PKCS7_SIGNED_DATA)) + if (!objId.getId().equals(ID_PKCS7_SIGNED_DATA)) { throw new IllegalArgumentException( MessageLocalization .getComposedMessage("not.a.valid.pkcs.7.object.not.signed.data")); - ASN1Sequence content = (ASN1Sequence)((ASN1TaggedObject)signedData.getObjectAt(1)).getBaseObject(); // the positions that we care are: + } + ASN1Sequence content = (ASN1Sequence) ((ASN1TaggedObject) signedData.getObjectAt( + 1)).getBaseObject(); // the positions that we care are: // the positions that we care are: // 0 - version // 1 - digestAlgorithms @@ -449,7 +341,8 @@ public PdfPKCS7(byte[] contentsKey, String provider) { // the certificates and crls CertificateFactory certificateFactory = new CertificateFactory(); - Collection certificates = certificateFactory.engineGenerateCertificates(new ByteArrayInputStream(contentsKey)); + Collection certificates = certificateFactory.engineGenerateCertificates( + new ByteArrayInputStream(contentsKey)); this.certs = new ArrayList<>(certificates); X509CRLParser cl = new X509CRLParser(); cl.engineInit(new ByteArrayInputStream(contentsKey)); @@ -458,20 +351,24 @@ public PdfPKCS7(byte[] contentsKey, String provider) { // the possible ID_PKCS7_DATA ASN1Sequence rsaData = (ASN1Sequence) content.getObjectAt(2); if (rsaData.size() > 1) { - ASN1OctetString rsaDataContent = (ASN1OctetString)((ASN1TaggedObject)rsaData.getObjectAt(1)).getBaseObject(); + ASN1OctetString rsaDataContent = (ASN1OctetString) ((ASN1TaggedObject) rsaData.getObjectAt( + 1)).getBaseObject(); RSAdata = rsaDataContent.getOctets(); } int next = 3; - while (content.getObjectAt(next) instanceof ASN1TaggedObject) - ++next; + while (content.getObjectAt(next) instanceof ASN1TaggedObject) { + ++next; + } // the signerInfos ASN1Set signerInfos = (ASN1Set) content.getObjectAt(next); - if (signerInfos.size() != 1) + if (signerInfos.size() != 1) { throw new IllegalArgumentException( MessageLocalization - .getComposedMessage("this.pkcs.7.object.has.multiple.signerinfos.only.one.is.supported.at.this.time")); + .getComposedMessage( + "this.pkcs.7.object.has.multiple.signerinfos.only.one.is.supported.at.this.time")); + } ASN1Sequence signerInfo = (ASN1Sequence) signerInfos.getObjectAt(0); // the positions that we care are // 0 - version @@ -521,24 +418,26 @@ public PdfPKCS7(byte[] contentsKey, String provider) { ASN1Sequence seqout = (ASN1Sequence) setout.getObjectAt(0); for (int j = 0; j < seqout.size(); ++j) { ASN1TaggedObject tg = (ASN1TaggedObject) seqout.getObjectAt(j); - if (tg.getTagNo() != 1) + if (tg.getTagNo() != 1) { continue; + } ASN1Sequence seqin = (ASN1Sequence) tg.getBaseObject(); findOcsp(seqin); } } } - if (digestAttr == null) + if (digestAttr == null) { throw new IllegalArgumentException( MessageLocalization .getComposedMessage("authenticated.attribute.is.missing.the.digest")); + } ++next; } digestEncryptionAlgorithm = ((ASN1ObjectIdentifier) ((ASN1Sequence) signerInfo .getObjectAt(next++)).getObjectAt(0)).getId(); digest = ((DEROctetString) signerInfo.getObjectAt(next++)).getOctets(); if (next < signerInfo.size() && (signerInfo.getObjectAt(next) instanceof ASN1TaggedObject)) { - ASN1TaggedObject taggedObject = (ASN1TaggedObject) signerInfo.getObjectAt(next); + ASN1TaggedObject taggedObject = (ASN1TaggedObject) signerInfo.getObjectAt(next); ASN1Set unat = ASN1Set.getInstance(taggedObject, false); AttributeTable attble = new AttributeTable(unat); Attribute ts = attble.get(PKCSObjectIdentifiers.id_aa_signatureTimeStampToken); @@ -550,16 +449,18 @@ public PdfPKCS7(byte[] contentsKey, String provider) { } } if (RSAdata != null || digestAttr != null) { - if (provider == null || provider.startsWith("SunPKCS11")) + if (provider == null || provider.startsWith("SunPKCS11")) { messageDigest = MessageDigest.getInstance(getStandardJavaName(getHashAlgorithm())); - else + } else { messageDigest = MessageDigest.getInstance(getStandardJavaName(getHashAlgorithm()), provider); + } } - if (provider == null) + if (provider == null) { sig = Signature.getInstance(getDigestAlgorithm()); - else + } else { sig = Signature.getInstance(getDigestAlgorithm(), provider); + } sig.initVerify(signCert.getPublicKey()); } catch (Exception e) { throw new ExceptionConverter(e); @@ -580,17 +481,18 @@ public PdfPKCS7(byte[] contentsKey, String provider) { * @throws NoSuchAlgorithmException on error */ public PdfPKCS7(PrivateKey privKey, Certificate[] certChain, CRL[] crlList, - String hashAlgorithm, String provider, boolean hasRSAdata) + String hashAlgorithm, String provider, boolean hasRSAdata) throws InvalidKeyException, NoSuchProviderException, NoSuchAlgorithmException { this.privKey = privKey; this.provider = provider; digestAlgorithm = allowedDigests.get(hashAlgorithm.toUpperCase()); - if (digestAlgorithm == null) + if (digestAlgorithm == null) { throw new NoSuchAlgorithmException( MessageLocalization.getComposedMessage("unknown.hash.algorithm.1", hashAlgorithm)); + } version = signerversion = 1; certs = new ArrayList<>(); @@ -628,215 +530,73 @@ public PdfPKCS7(PrivateKey privKey, Certificate[] certChain, CRL[] crlList, } if (hasRSAdata) { RSAdata = new byte[0]; - if (provider == null || provider.startsWith("SunPKCS11")) + if (provider == null || provider.startsWith("SunPKCS11")) { messageDigest = MessageDigest.getInstance(getStandardJavaName(getHashAlgorithm())); - else + } else { messageDigest = MessageDigest.getInstance(getStandardJavaName(getHashAlgorithm()), provider); + } } if (privKey != null) { - if (provider == null) + if (provider == null) { sig = Signature.getInstance(getDigestAlgorithm()); - else + } else { sig = Signature.getInstance(getDigestAlgorithm(), provider); + } sig.initSign(privKey); } } /** - * Update the digest with the specified bytes. This method is used both for - * signing and verifying + * Gets the digest name for a certain id * - * @param buf the data buffer - * @param off the offset in the data buffer - * @param len the data length - * @throws SignatureException on error + * @param oid an id (for instance "1.2.840.113549.2.5") + * @return a digest name (for instance "MD5") + * @since 2.1.6 */ - public void update(byte[] buf, int off, int len) throws SignatureException { - if (RSAdata != null || digestAttr != null) - messageDigest.update(buf, off, len); - else - sig.update(buf, off, len); + public static String getDigest(String oid) { + return Optional.ofNullable(digestNames.get(oid)) + .orElse(oid); } /** - * Verify the digest. + * Gets the algorithm name for a certain id. * - * @return true if the signature checks out, false - * otherwise - * @throws SignatureException on error + * @param oid an id (for instance "1.2.840.113549.1.1.1") + * @return an algorithm name (for instance "RSA") + * @since 2.1.6 */ - public boolean verify() throws SignatureException { - if (verified) - return verifyResult; - if (sigAttr != null) { - sig.update(sigAttr); - if (RSAdata != null) { - byte[] msd = messageDigest.digest(); - messageDigest.update(msd); - } - verifyResult = (Arrays.equals(messageDigest.digest(), digestAttr) && sig - .verify(digest)); - } else { - if (RSAdata != null) - sig.update(messageDigest.digest()); - verifyResult = sig.verify(digest); - } - verified = true; - return verifyResult; + public static String getAlgorithm(String oid) { + return Optional.ofNullable(algorithmNames.get(oid)) + .orElse(oid); } /** - * Checks if the timestamp refers to this document. + * Gets the oid for given digest name. * - * @return true if it checks false otherwise - * @throws java.security.NoSuchAlgorithmException on error - * @since 2.1.6 + * @param digestName digest name (for instance "SHA-256") + * @return a digest OID (for instance "2.16.840.1.101.3.4.2.1") or {@code null} if the oid for provided name is not + * found */ - public boolean verifyTimestampImprint() throws NoSuchAlgorithmException { - if (timeStampToken == null) - return false; - MessageImprint imprint = timeStampToken.getTimeStampInfo().toASN1Structure() - .getMessageImprint(); - TimeStampTokenInfo info = timeStampToken.getTimeStampInfo(); - String algOID = info.getMessageImprintAlgOID().getId(); - byte[] md = MessageDigest.getInstance(getStandardJavaName(getDigest(algOID))).digest(digest); - byte[] imphashed = imprint.getHashedMessage(); - return Arrays.equals(md, imphashed); + public static String getDigestOid(String digestName) { + return digestName != null ? allowedDigests.get(digestName) : null; } /** - * Get all the X.509 certificates associated with this PKCS#7 object in no - * particular order. Other certificates, from OCSP for example, will also be - * included. + * Loads the default root certificates at <java.home>/lib/security/cacerts with the default provider. * - * @return the X.509 certificates associated with this PKCS#7 object + * @return a KeyStore */ - public Certificate[] getCertificates() { - return certs.toArray(new Certificate[0]); + public static KeyStore loadCacertsKeyStore() { + return loadCacertsKeyStore(null); } /** - * Get the X.509 sign certificate chain associated with this PKCS#7 object. - * Only the certificates used for the main signature will be returned, with - * the signing certificate first. + * Loads the default root certificates at <java.home>/lib/security/cacerts. * - * @return the X.509 certificates associated with this PKCS#7 object - * @since 2.1.6 - */ - public Certificate[] getSignCertificateChain() { - return signCerts.toArray(new X509Certificate[0]); - } - - private void signCertificateChain() { - List cc = new ArrayList<>(); - cc.add(signCert); - List oc = new ArrayList<>(certs); - for (int k = 0; k < oc.size(); ++k) { - if (signCert.getSerialNumber().equals( - ((X509Certificate) oc.get(k)).getSerialNumber())) { - oc.remove(k); - --k; - } - } - boolean found = true; - while (found) { - X509Certificate v = (X509Certificate) cc.get(cc.size() - 1); - found = false; - for (int k = 0; k < oc.size(); ++k) { - try { - if (provider == null) - v.verify(oc.get(k).getPublicKey()); - else - v.verify(oc.get(k).getPublicKey(), provider); - found = true; - cc.add(oc.get(k)); - oc.remove(k); - break; - } catch (Exception ignored) { - } - } - } - signCerts = cc; - } - - /** - * Get the X.509 certificate revocation lists associated with this PKCS#7 - * object - * - * @return the X.509 certificate revocation lists associated with this PKCS#7 - * object - */ - public Collection getCRLs() { - return crls; - } - - /** - * Get the X.509 certificate actually used to sign the digest. - * - * @return the X.509 certificate actually used to sign the digest - */ - public X509Certificate getSigningCertificate() { - return signCert; - } - - /** - * Get the version of the PKCS#7 object. Always 1 - * - * @return the version of the PKCS#7 object. Always 1 - */ - public int getVersion() { - return version; - } - - /** - * Get the version of the PKCS#7 "SignerInfo" object. Always 1 - * - * @return the version of the PKCS#7 "SignerInfo" object. Always 1 - */ - public int getSigningInfoVersion() { - return signerversion; - } - - /** - * Get the algorithm used to calculate the message digest - * - * @return the algorithm used to calculate the message digest - */ - public String getDigestAlgorithm() { - String dea = getAlgorithm(digestEncryptionAlgorithm); - if (dea == null) - dea = digestEncryptionAlgorithm; - - return getHashAlgorithm() + "with" + dea; - } - - /** - * Returns the algorithm. - * - * @return the digest algorithm - */ - public String getHashAlgorithm() { - return getDigest(digestAlgorithm); - } - - /** - * Loads the default root certificates at - * <java.home>/lib/security/cacerts with the default provider. - * - * @return a KeyStore - */ - public static KeyStore loadCacertsKeyStore() { - return loadCacertsKeyStore(null); - } - - /** - * Loads the default root certificates at - * <java.home>/lib/security/cacerts. - * - * @param provider the provider or null for the default provider - * @return a KeyStore + * @param provider the provider or null for the default provider + * @return a KeyStore */ public static KeyStore loadCacertsKeyStore(String provider) { File file = new File(System.getProperty("java.home"), "lib"); @@ -844,10 +604,11 @@ public static KeyStore loadCacertsKeyStore(String provider) { file = new File(file, "cacerts"); try (FileInputStream fin = new FileInputStream(file)) { KeyStore k; - if (provider == null) + if (provider == null) { k = KeyStore.getInstance("JKS"); - else + } else { k = KeyStore.getInstance("JKS", provider); + } k.load(fin, null); return k; } catch (Exception e) { @@ -865,11 +626,13 @@ public static KeyStore loadCacertsKeyStore(String provider) { * null if no error */ public static String verifyCertificate(X509Certificate cert, Collection crls, - Calendar calendar) { - if (calendar == null) + Calendar calendar) { + if (calendar == null) { calendar = new GregorianCalendar(); - if (cert.hasUnsupportedCriticalExtension()) + } + if (cert.hasUnsupportedCriticalExtension()) { return "Has unsupported critical extension"; + } try { cert.checkValidity(calendar.getTime()); } catch (Exception e) { @@ -877,8 +640,9 @@ public static String verifyCertificate(X509Certificate cert, Collection crls, } if (crls != null) { for (Object crl : crls) { - if (((CRL) crl).isRevoked(cert)) + if (((CRL) crl).isRevoked(cert)) { return "Certificate revoked"; + } } } return null; @@ -896,25 +660,29 @@ public static String verifyCertificate(X509Certificate cert, Collection crls, * failed certificate and error is the error message */ public static Object[] verifyCertificates(Certificate[] certs, - KeyStore keystore, Collection crls, Calendar calendar) { - if (calendar == null) + KeyStore keystore, Collection crls, Calendar calendar) { + if (calendar == null) { calendar = new GregorianCalendar(); + } for (int k = 0; k < certs.length; ++k) { X509Certificate cert = (X509Certificate) certs[k]; String err = verifyCertificate(cert, crls, calendar); - if (err != null) + if (err != null) { return new Object[]{cert, err}; + } try { for (Enumeration aliases = keystore.aliases(); aliases .hasMoreElements(); ) { try { String alias = (String) aliases.nextElement(); - if (!keystore.isCertificateEntry(alias)) + if (!keystore.isCertificateEntry(alias)) { continue; + } X509Certificate certStoreX509 = (X509Certificate) keystore .getCertificate(alias); - if (verifyCertificate(certStoreX509, crls, calendar) != null) + if (verifyCertificate(certStoreX509, crls, calendar) != null) { continue; + } try { cert.verify(certStoreX509.getPublicKey()); return null; @@ -925,23 +693,303 @@ public static Object[] verifyCertificates(Certificate[] certs, } } catch (Exception ignored) { } - int j; - for (j = 0; j < certs.length; ++j) { - if (j == k) - continue; - X509Certificate certNext = (X509Certificate) certs[j]; - try { - cert.verify(certNext.getPublicKey()); - break; - } catch (Exception ignored) { - } + int j; + for (j = 0; j < certs.length; ++j) { + if (j == k) { + continue; + } + X509Certificate certNext = (X509Certificate) certs[j]; + try { + cert.verify(certNext.getPublicKey()); + break; + } catch (Exception ignored) { + } + } + if (j == certs.length) { + return new Object[]{cert, + "Cannot be verified against the KeyStore or the certificate chain"}; + } + } + return new Object[]{null, + "Invalid state. Possible circular certificate chain"}; + } + + /** + * Retrieves the OCSP URL from the given certificate. + * + * @param certificate the certificate + * @return the URL or null + * @since 2.1.6 + */ + public static String getOCSPURL(X509Certificate certificate) { + try { + ASN1Primitive obj = getExtensionValue(certificate, authorityInfoAccess.getId()); + if (obj == null) { + return null; + } + + ASN1Sequence AccessDescriptions = (ASN1Sequence) obj; + for (int i = 0; i < AccessDescriptions.size(); i++) { + ASN1Sequence AccessDescription = (ASN1Sequence) AccessDescriptions + .getObjectAt(i); + if (AccessDescription.size() == 2) { + if ((AccessDescription.getObjectAt(0) instanceof ASN1ObjectIdentifier) + && ((ASN1ObjectIdentifier) AccessDescription.getObjectAt(0)) + .getId().equals("1.3.6.1.5.5.7.48.1")) { + return getStringFromGeneralName((ASN1Primitive) AccessDescription + .getObjectAt(1)); + } + } + } + } catch (Exception ignored) { + } + return null; + } + + private static ASN1Primitive getExtensionValue(X509Certificate cert, + String oid) throws IOException { + byte[] bytes = cert.getExtensionValue(oid); + if (bytes == null) { + return null; + } + ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(bytes)); + ASN1OctetString octs = (ASN1OctetString) aIn.readObject(); + aIn = new ASN1InputStream(new ByteArrayInputStream(octs.getOctets())); + return aIn.readObject(); + } + + private static String getStringFromGeneralName(ASN1Primitive names) { + ASN1TaggedObject taggedObject = (ASN1TaggedObject) names; + return new String(ASN1OctetString.getInstance(taggedObject, false) + .getOctets(), StandardCharsets.ISO_8859_1); + } + + /** + * Get the "issuer" from the TBSCertificate bytes that are passed in + * + * @param enc a TBSCertificate in a byte array + * @return a ASN1Primitive + */ + private static ASN1Primitive getIssuer(byte[] enc) { + try { + ASN1InputStream in = new ASN1InputStream(new ByteArrayInputStream(enc)); + ASN1Sequence seq = (ASN1Sequence) in.readObject(); + return (ASN1Primitive) seq + .getObjectAt(seq.getObjectAt(0) instanceof ASN1TaggedObject ? 3 : 2); + } catch (IOException e) { + throw new ExceptionConverter(e); + } + } + + /** + * Get the "subject" from the TBSCertificate bytes that are passed in + * + * @param enc A TBSCertificate in a byte array + * @return a ASN1Primitive + */ + private static ASN1Primitive getSubject(byte[] enc) { + try { + ASN1InputStream in = new ASN1InputStream(new ByteArrayInputStream(enc)); + ASN1Sequence seq = (ASN1Sequence) in.readObject(); + return (ASN1Primitive) seq + .getObjectAt(seq.getObjectAt(0) instanceof ASN1TaggedObject ? 5 : 4); + } catch (IOException e) { + throw new ExceptionConverter(e); + } + } + + /** + * Get the issuer fields from an X509 Certificate + * + * @param cert an X509Certificate + * @return an X509Name + */ + public static X509Name getIssuerFields(X509Certificate cert) { + try { + return new X509Name((ASN1Sequence) getIssuer(cert.getTBSCertificate())); + } catch (Exception e) { + throw new ExceptionConverter(e); + } + } + + /** + * Get the subject fields from an X509 Certificate + * + * @param cert an X509Certificate + * @return an X509Name + */ + public static X509Name getSubjectFields(X509Certificate cert) { + try { + return new X509Name((ASN1Sequence) getSubject(cert.getTBSCertificate())); + } catch (Exception e) { + throw new ExceptionConverter(e); + } + } + + private static String getStandardJavaName(String algName) { + if ("SHA1".equals(algName)) { + return "SHA-1"; + } + if ("SHA224".equals(algName)) { + return "SHA-224"; + } + if ("SHA256".equals(algName)) { + return "SHA-256"; + } + if ("SHA384".equals(algName)) { + return "SHA-384"; + } + if ("SHA512".equals(algName)) { + return "SHA-512"; + } + return algName; + + } + + /** + * Gets the timestamp token if there is one. + * + * @return the timestamp token or null + * @since 2.1.6 + */ + public TimeStampToken getTimeStampToken() { + return timeStampToken; + } + + /** + * Gets the timestamp date + * + * @return a date + * @since 2.1.6 + */ + public Calendar getTimeStampDate() { + if (timeStampToken == null) { + return null; + } + Calendar cal = new GregorianCalendar(); + Date date = timeStampToken.getTimeStampInfo().getGenTime(); + cal.setTime(date); + return cal; + } + + /** + * Gets the OCSP basic response if there is one. + * + * @return the OCSP basic response or null + * @since 2.1.6 + */ + public BasicOCSPResp getOcsp() { + return basicResp; + } + + private void findOcsp(ASN1Sequence seq) throws IOException { + basicResp = null; + while ((!(seq.getObjectAt(0) instanceof ASN1ObjectIdentifier)) + || !((ASN1ObjectIdentifier) seq.getObjectAt(0)).getId().equals( + OCSPObjectIdentifiers.id_pkix_ocsp_basic.getId())) { + boolean ret = true; + int k = 0; + while (k < seq.size()) { + if (seq.getObjectAt(k) instanceof ASN1Sequence) { + seq = (ASN1Sequence) seq.getObjectAt(0); + ret = false; + break; + } + if (seq.getObjectAt(k) instanceof ASN1TaggedObject) { + ASN1TaggedObject tag = (ASN1TaggedObject) seq.getObjectAt(k); + if (tag.getBaseObject() instanceof ASN1Sequence) { + seq = (ASN1Sequence) tag.getBaseObject(); + ret = false; + break; + } else { + return; + } + } + ++k; + } + if (ret) { + return; + } + } + DEROctetString os = (DEROctetString) seq.getObjectAt(1); + ASN1InputStream inp = new ASN1InputStream(os.getOctets()); + BasicOCSPResponse resp = BasicOCSPResponse.getInstance(inp.readObject()); + basicResp = new BasicOCSPResp(resp); + } + + /** + * Update the digest with the specified bytes. This method is used both for signing and verifying + * + * @param buf the data buffer + * @param off the offset in the data buffer + * @param len the data length + * @throws SignatureException on error + */ + public void update(byte[] buf, int off, int len) throws SignatureException { + if (RSAdata != null || digestAttr != null) { + messageDigest.update(buf, off, len); + } else { + sig.update(buf, off, len); + } + } + + /** + * Verify the digest. + * + * @return true if the signature checks out, false + * otherwise + * @throws SignatureException on error + */ + public boolean verify() throws SignatureException { + if (verified) { + return verifyResult; + } + if (sigAttr != null) { + sig.update(sigAttr); + if (RSAdata != null) { + byte[] msd = messageDigest.digest(); + messageDigest.update(msd); + } + verifyResult = (Arrays.equals(messageDigest.digest(), digestAttr) && sig + .verify(digest)); + } else { + if (RSAdata != null) { + sig.update(messageDigest.digest()); } - if (j == certs.length) - return new Object[]{cert, - "Cannot be verified against the KeyStore or the certificate chain"}; + verifyResult = sig.verify(digest); } - return new Object[]{null, - "Invalid state. Possible circular certificate chain"}; + verified = true; + return verifyResult; + } + + /** + * Checks if the timestamp refers to this document. + * + * @return true if it checks false otherwise + * @throws java.security.NoSuchAlgorithmException on error + * @since 2.1.6 + */ + public boolean verifyTimestampImprint() throws NoSuchAlgorithmException { + if (timeStampToken == null) { + return false; + } + MessageImprint imprint = timeStampToken.getTimeStampInfo().toASN1Structure() + .getMessageImprint(); + TimeStampTokenInfo info = timeStampToken.getTimeStampInfo(); + String algOID = info.getMessageImprintAlgOID().getId(); + byte[] md = MessageDigest.getInstance(getStandardJavaName(getDigest(algOID))).digest(digest); + byte[] imphashed = imprint.getHashedMessage(); + return Arrays.equals(md, imphashed); + } + + /** + * Get all the X.509 certificates associated with this PKCS#7 object in no particular order. Other certificates, + * from OCSP for example, will also be included. + * + * @return the X.509 certificates associated with this PKCS#7 object + */ + public Certificate[] getCertificates() { + return certs.toArray(new Certificate[0]); } // OJO... Modificacion de @@ -1017,149 +1065,142 @@ public static Object[] verifyCertificates(Certificate[] certs, // ****************************************************************************** /** - * Retrieves the OCSP URL from the given certificate. + * Get the X.509 sign certificate chain associated with this PKCS#7 object. Only the certificates used for the main + * signature will be returned, with the signing certificate first. * - * @param certificate the certificate - * @return the URL or null + * @return the X.509 certificates associated with this PKCS#7 object * @since 2.1.6 */ - public static String getOCSPURL(X509Certificate certificate) { - try { - ASN1Primitive obj = getExtensionValue(certificate, authorityInfoAccess.getId()); - if (obj == null) { - return null; - } + public Certificate[] getSignCertificateChain() { + return signCerts.toArray(new X509Certificate[0]); + } - ASN1Sequence AccessDescriptions = (ASN1Sequence) obj; - for (int i = 0; i < AccessDescriptions.size(); i++) { - ASN1Sequence AccessDescription = (ASN1Sequence) AccessDescriptions - .getObjectAt(i); - if (AccessDescription.size() == 2) { - if ((AccessDescription.getObjectAt(0) instanceof ASN1ObjectIdentifier) - && ((ASN1ObjectIdentifier) AccessDescription.getObjectAt(0)) - .getId().equals("1.3.6.1.5.5.7.48.1")) { - return getStringFromGeneralName((ASN1Primitive) AccessDescription - .getObjectAt(1)); + private void signCertificateChain() { + List cc = new ArrayList<>(); + cc.add(signCert); + List oc = new ArrayList<>(certs); + for (int k = 0; k < oc.size(); ++k) { + if (signCert.getSerialNumber().equals( + ((X509Certificate) oc.get(k)).getSerialNumber())) { + oc.remove(k); + --k; + } + } + boolean found = true; + while (found) { + X509Certificate v = (X509Certificate) cc.get(cc.size() - 1); + found = false; + for (int k = 0; k < oc.size(); ++k) { + try { + if (provider == null) { + v.verify(oc.get(k).getPublicKey()); + } else { + v.verify(oc.get(k).getPublicKey(), provider); } + found = true; + cc.add(oc.get(k)); + oc.remove(k); + break; + } catch (Exception ignored) { } } - } catch (Exception ignored) { } - return null; + signCerts = cc; } /** - * Checks if OCSP revocation refers to the document signing certificate. + * Get the X.509 certificate revocation lists associated with this PKCS#7 object * - * @return true if it checks false otherwise - * @since 2.1.6 + * @return the X.509 certificate revocation lists associated with this PKCS#7 object */ - public boolean isRevocationValid() { - if (basicResp == null) - return false; - if (signCerts.size() < 2) - return false; - try { - X509Certificate[] cs = (X509Certificate[]) getSignCertificateChain(); - SingleResp sr = basicResp.getResponses()[0]; - CertificateID cid = sr.getCertID(); - X509Certificate sigcer = getSigningCertificate(); - X509Certificate isscer = cs[1]; - // OJO... Modificacion de - // Felix-------------------------------------------------- - // CertificateID tis = new CertificateID(CertificateID.HASH_SHA1, isscer, - // sigcer.getSerialNumber()); - DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder() - .setProvider(provider).build(); - CertificateID id = new CertificateID( - digCalcProv.get(CertificateID.HASH_SHA1), - new JcaX509CertificateHolder(isscer), sigcer.getSerialNumber()); - - return id.equals(cid); - // ****************************************************************************** - } catch (Exception ignored) { - } - return false; + public Collection getCRLs() { + return crls; } - private static ASN1Primitive getExtensionValue(X509Certificate cert, - String oid) throws IOException { - byte[] bytes = cert.getExtensionValue(oid); - if (bytes == null) { - return null; - } - ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(bytes)); - ASN1OctetString octs = (ASN1OctetString) aIn.readObject(); - aIn = new ASN1InputStream(new ByteArrayInputStream(octs.getOctets())); - return aIn.readObject(); + /** + * Get the X.509 certificate actually used to sign the digest. + * + * @return the X.509 certificate actually used to sign the digest + */ + public X509Certificate getSigningCertificate() { + return signCert; } - private static String getStringFromGeneralName(ASN1Primitive names) { - ASN1TaggedObject taggedObject = (ASN1TaggedObject) names ; - return new String(ASN1OctetString.getInstance(taggedObject, false) - .getOctets(), StandardCharsets.ISO_8859_1); + /** + * Get the version of the PKCS#7 object. Always 1 + * + * @return the version of the PKCS#7 object. Always 1 + */ + public int getVersion() { + return version; } /** - * Get the "issuer" from the TBSCertificate bytes that are passed in + * Get the version of the PKCS#7 "SignerInfo" object. Always 1 * - * @param enc a TBSCertificate in a byte array - * @return a ASN1Primitive + * @return the version of the PKCS#7 "SignerInfo" object. Always 1 */ - private static ASN1Primitive getIssuer(byte[] enc) { - try { - ASN1InputStream in = new ASN1InputStream(new ByteArrayInputStream(enc)); - ASN1Sequence seq = (ASN1Sequence) in.readObject(); - return (ASN1Primitive) seq - .getObjectAt(seq.getObjectAt(0) instanceof ASN1TaggedObject ? 3 : 2); - } catch (IOException e) { - throw new ExceptionConverter(e); - } + public int getSigningInfoVersion() { + return signerversion; } /** - * Get the "subject" from the TBSCertificate bytes that are passed in + * Get the algorithm used to calculate the message digest * - * @param enc A TBSCertificate in a byte array - * @return a ASN1Primitive + * @return the algorithm used to calculate the message digest */ - private static ASN1Primitive getSubject(byte[] enc) { - try { - ASN1InputStream in = new ASN1InputStream(new ByteArrayInputStream(enc)); - ASN1Sequence seq = (ASN1Sequence) in.readObject(); - return (ASN1Primitive) seq - .getObjectAt(seq.getObjectAt(0) instanceof ASN1TaggedObject ? 5 : 4); - } catch (IOException e) { - throw new ExceptionConverter(e); + public String getDigestAlgorithm() { + String dea = getAlgorithm(digestEncryptionAlgorithm); + if (dea == null) { + dea = digestEncryptionAlgorithm; } + + return getHashAlgorithm() + "with" + dea; } /** - * Get the issuer fields from an X509 Certificate + * Returns the algorithm. * - * @param cert an X509Certificate - * @return an X509Name + * @return the digest algorithm */ - public static X509Name getIssuerFields(X509Certificate cert) { - try { - return new X509Name((ASN1Sequence) getIssuer(cert.getTBSCertificate())); - } catch (Exception e) { - throw new ExceptionConverter(e); - } + public String getHashAlgorithm() { + return getDigest(digestAlgorithm); } /** - * Get the subject fields from an X509 Certificate + * Checks if OCSP revocation refers to the document signing certificate. * - * @param cert an X509Certificate - * @return an X509Name + * @return true if it checks false otherwise + * @since 2.1.6 */ - public static X509Name getSubjectFields(X509Certificate cert) { + public boolean isRevocationValid() { + if (basicResp == null) { + return false; + } + if (signCerts.size() < 2) { + return false; + } try { - return new X509Name((ASN1Sequence) getSubject(cert.getTBSCertificate())); - } catch (Exception e) { - throw new ExceptionConverter(e); + X509Certificate[] cs = (X509Certificate[]) getSignCertificateChain(); + SingleResp sr = basicResp.getResponses()[0]; + CertificateID cid = sr.getCertID(); + X509Certificate sigcer = getSigningCertificate(); + X509Certificate isscer = cs[1]; + // OJO... Modificacion de + // Felix-------------------------------------------------- + // CertificateID tis = new CertificateID(CertificateID.HASH_SHA1, isscer, + // sigcer.getSerialNumber()); + DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder() + .setProvider(provider).build(); + CertificateID id = new CertificateID( + digCalcProv.get(CertificateID.HASH_SHA1), + new JcaX509CertificateHolder(isscer), sigcer.getSerialNumber()); + + return id.equals(cid); + // ****************************************************************************** + } catch (Exception ignored) { } + return false; } /** @@ -1169,10 +1210,11 @@ public static X509Name getSubjectFields(X509Certificate cert) { */ public byte[] getEncodedPKCS1() { try { - if (externalDigest != null) + if (externalDigest != null) { digest = externalDigest; - else + } else { digest = sig.sign(); + } ByteArrayOutputStream bOut = new ByteArrayOutputStream(); ASN1OutputStream dout = ASN1OutputStream.create(bOut); @@ -1196,7 +1238,7 @@ public byte[] getEncodedPKCS1() { * or "DSA" */ public void setExternalDigest(byte[] digest, byte[] RSAdata, - String digestEncryptionAlgorithm) { + String digestEncryptionAlgorithm) { externalDigest = digest; externalRSAdata = RSAdata; if (digestEncryptionAlgorithm != null) { @@ -1206,10 +1248,11 @@ public void setExternalDigest(byte[] digest, byte[] RSAdata, this.digestEncryptionAlgorithm = ID_DSA; } else if (digestEncryptionAlgorithm.equals("EC")) { digestEncryptionAlgorithm = ID_ECDSA; - } else + } else { throw new ExceptionConverter(new NoSuchAlgorithmException( MessageLocalization.getComposedMessage("unknown.key.algorithm.1", digestEncryptionAlgorithm))); + } } } @@ -1223,9 +1266,8 @@ public byte[] getEncodedPKCS7() { } /** - * Gets the bytes for the PKCS7SignedData object. Optionally the - * authenticatedAttributes in the signerInfo can also be set. If either of the - * parameters is null, none will be used. + * Gets the bytes for the PKCS7SignedData object. Optionally the authenticatedAttributes in the signerInfo can also + * be set. If either of the parameters is null, none will be used. * * @param secondDigest the digest in the authenticatedAttributes * @param signingTime the signing time in the authenticatedAttributes @@ -1236,24 +1278,24 @@ public byte[] getEncodedPKCS7(byte[] secondDigest, Calendar signingTime) { } /** - * Gets the bytes for the PKCS7SignedData object. Optionally the - * authenticatedAttributes in the signerInfo can also be set, OR a - * time-stamp-authority client may be provided. + * Gets the bytes for the PKCS7SignedData object. Optionally the authenticatedAttributes in the signerInfo can also + * be set, OR a time-stamp-authority client may be provided. * * @param secondDigest the digest in the authenticatedAttributes * @param signingTime the signing time in the authenticatedAttributes * @param tsaClient TSAClient - null or an optional time stamp authority client - * @param ocsp a byte array + * @param ocsp a byte array * @return byte[] the bytes for the PKCS7SignedData object * @since 2.1.6 */ public byte[] getEncodedPKCS7(byte[] secondDigest, Calendar signingTime, - TSAClient tsaClient, byte[] ocsp) { + TSAClient tsaClient, byte[] ocsp) { try { if (externalDigest != null) { digest = externalDigest; - if (RSAdata != null) + if (RSAdata != null) { RSAdata = externalRSAdata; + } } else if (externalRSAdata != null && RSAdata != null) { RSAdata = externalRSAdata; sig.update(RSAdata); @@ -1278,8 +1320,9 @@ public byte[] getEncodedPKCS7(byte[] secondDigest, Calendar signingTime, // Create the contentInfo. ASN1EncodableVector v = new ASN1EncodableVector(); v.add(new ASN1ObjectIdentifier(ID_PKCS7_DATA)); - if (RSAdata != null) + if (RSAdata != null) { v.add(new DERTaggedObject(0, new DEROctetString(RSAdata))); + } DERSequence contentinfo = new DERSequence(v); // Get all the certificates @@ -1369,10 +1412,9 @@ public byte[] getEncodedPKCS7(byte[] secondDigest, Calendar signingTime, } /** - * Added by Aiken Sam, 2006-11-15, modifed by Martin Brunecky 07/12/2007 to - * start with the timeStampToken (signedData 1.2.840.113549.1.7.2). Token is - * the TSA response without response status, which is usually handled by the - * (vendor supplied) TSA request/response interface). + * Added by Aiken Sam, 2006-11-15, modifed by Martin Brunecky 07/12/2007 to start with the timeStampToken + * (signedData 1.2.840.113549.1.7.2). Token is the TSA response without response status, which is usually handled by + * the (vendor supplied) TSA request/response interface). * * @param timeStampToken byte[] - time stamp token, DER encoded signedData * @return ASN1EncodableVector @@ -1380,8 +1422,9 @@ public byte[] getEncodedPKCS7(byte[] secondDigest, Calendar signingTime, */ private ASN1EncodableVector buildUnauthenticatedAttributes( byte[] timeStampToken) throws IOException { - if (timeStampToken == null) + if (timeStampToken == null) { return null; + } // @todo: move this together with the rest of the defintions String ID_TIME_STAMP_TOKEN = "1.2.840.113549.1.9.16.2.14"; // RFC 3161 @@ -1401,12 +1444,10 @@ private ASN1EncodableVector buildUnauthenticatedAttributes( } /** - * When using authenticatedAttributes the authentication process is different. - * The document digest is generated and put inside the attribute. The signing - * is done over the DER encoded authenticatedAttributes. This method provides - * that encoding and the parameters must be exactly the same as in - * {@link #getEncodedPKCS7(byte[], Calendar)}. - * A simple example: + * When using authenticatedAttributes the authentication process is different. The document digest is generated and + * put inside the attribute. The signing is done over the DER encoded authenticatedAttributes. This method provides + * that encoding and the parameters must be exactly the same as in {@link #getEncodedPKCS7(byte[], Calendar)}. A + * simple example: * * 

              * Calendar cal = Calendar.getInstance();
@@ -1426,12 +1467,11 @@ private ASN1EncodableVector buildUnauthenticatedAttributes(
      *
      * @param secondDigest the content digest
      * @param signingTime  the signing time
-     * @param ocsp a byte array
-     * @return the byte array representation of the authenticatedAttributes ready
-     * to be signed
+     * @param ocsp         a byte array
+     * @return the byte array representation of the authenticatedAttributes ready to be signed
      */
     public byte[] getAuthenticatedAttributeBytes(byte[] secondDigest,
-                                                 Calendar signingTime, byte[] ocsp) {
+            Calendar signingTime, byte[] ocsp) {
         try {
             return getAuthenticatedAttributeSet(secondDigest, signingTime, ocsp)
                     .getEncoded(ASN1Encoding.DER);
@@ -1441,7 +1481,7 @@ public byte[] getAuthenticatedAttributeBytes(byte[] secondDigest,
     }
 
     private DERSet getAuthenticatedAttributeSet(byte[] secondDigest,
-                                                Calendar signingTime, byte[] ocsp) {
+            Calendar signingTime, byte[] ocsp) {
         try {
             ASN1EncodableVector attribute = new ASN1EncodableVector();
             ASN1EncodableVector v = new ASN1EncodableVector();
@@ -1563,31 +1603,11 @@ public void setSignName(String signName) {
         this.signName = signName;
     }
 
-
-    private static String getStandardJavaName(String algName) {
-    	if ("SHA1".equals(algName)) {
-    		return "SHA-1";
-    	}
-    	if ("SHA224".equals(algName)) {
-    		return "SHA-224";
-    	}
-    	if ("SHA256".equals(algName)) {
-    		return "SHA-256";
-    	}
-    	if ("SHA384".equals(algName)) {
-    		return "SHA-384";
-    	}
-    	if ("SHA512".equals(algName)) {
-    		return "SHA-512";
-    	}
-    	return algName;
-
-    }
-
     /**
      * a class that holds an X509 name
      */
     public static class X509Name {
+
         /**
          * country code - StringType(SIZE(2))
          */
@@ -1665,8 +1685,7 @@ public static class X509Name {
         /**
          * Email address (RSA PKCS#9 extension) - IA5String.
          * 
        
-         * Note: if you're trying to be ultra orthodox, don't use this! It shouldn't
-         * be in here.
+         * Note: if you're trying to be ultra orthodox, don't use this! It shouldn't be in here.
          */
         public static final ASN1ObjectIdentifier EmailAddress = new ASN1ObjectIdentifier(
                 "1.2.840.113549.1.9.1");
@@ -1732,8 +1751,9 @@ public X509Name(ASN1Sequence seq) {
                     ASN1Sequence s = (ASN1Sequence) set.getObjectAt(i);
                     ASN1Encodable encodable = s.getObjectAt(0);
                     String id = defaultSymbols.get(encodable);
-                    if (id == null)
+                    if (id == null) {
                         continue;
+                    }
                     List vs = valuesMap.computeIfAbsent(id, k -> new ArrayList<>());
                     vs.add(((ASN1String) s.getObjectAt(1)).getString());
                 }
@@ -1774,7 +1794,7 @@ public String getField(String name) {
         /**
          * gets a field array from the values Hashmap
          *
-         * @param name  the name of the field array to get
+         * @param name the name of the field array to get
          * @return an ArrayList
          */
         public List getFieldsByName(String name) {
@@ -1801,14 +1821,14 @@ public String toString() {
     }
 
     /**
-     * class for breaking up an X500 Name into it's component tokens, ala
-     * java.util.StringTokenizer. We need this class as some of the lightweight
-     * Java environment don't support classes like StringTokenizer.
+     * class for breaking up an X500 Name into it's component tokens, ala java.util.StringTokenizer. We need this class
+     * as some of the lightweight Java environment don't support classes like StringTokenizer.
      */
     public static class X509NameTokenizer {
+
         private final String oid;
-        private int index;
         private final StringBuffer buf = new StringBuffer();
+        private int index;
 
         public X509NameTokenizer(String oid) {
             this.oid = oid;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPRow.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPRow.java
index 557d5db3a..8731b77e3 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPRow.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPRow.java
@@ -49,27 +49,28 @@
 
 package com.lowagie.text.pdf;
 
-import java.awt.Color;
-
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
-
+import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.Image;
 import com.lowagie.text.Rectangle;
-import com.lowagie.text.ExceptionConverter;
+import java.awt.Color;
 
 /**
  * A row in a PdfPTable.
- * 
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class PdfPRow {
 
-    /** the bottom limit (bottom right y) */
+    /**
+     * the bottom limit (bottom right y)
+     */
     public static final float BOTTOM_LIMIT = -(1 << 30);
     /**
      * the right limit
-     * @since    2.1.5
+     *
+     * @since 2.1.5
      */
     public static final float RIGHT_LIMIT = 20000;
 
@@ -85,15 +86,14 @@ public class PdfPRow {
     protected float[] extraHeights;
 
     protected float maxHeight = 0;
-    
+
     protected boolean calculated = false;
-    
+
     private int[] canvasesPos;
 
     /**
-     * Constructs a new PdfPRow with the cells in the array that was passed
-     * as a parameter.
-     * 
+     * Constructs a new PdfPRow with the cells in the array that was passed as a parameter.
+     *
      * @param cells an array of PdfCell to put into the PdfRow
      */
     public PdfPRow(PdfPCell[] cells) {
@@ -104,7 +104,7 @@ public PdfPRow(PdfPCell[] cells) {
 
     /**
      * Makes a copy of an existing row.
-     * 
+     *
      * @param row the PdfRow to copy
      */
     public PdfPRow(PdfPRow row) {
@@ -112,38 +112,61 @@ public PdfPRow(PdfPRow row) {
         calculated = row.calculated;
         cells = new PdfPCell[row.cells.length];
         for (int k = 0; k < cells.length; ++k) {
-            if (row.cells[k] != null)
+            if (row.cells[k] != null) {
                 cells[k] = new PdfPCell(row.cells[k]);
+            }
         }
         widths = new float[cells.length];
         System.arraycopy(row.widths, 0, widths, 0, cells.length);
         initExtraHeights();
     }
 
+    /**
+     * @param ct     the ColumnText
+     * @param left   the left position
+     * @param bottom the bottom position
+     * @param right  the right position
+     * @param top    the top position
+     * @return a float of the top position
+     * @since 3.0.0 protected is now public static
+     */
+    public static float setColumn(ColumnText ct, float left, float bottom, float right, float top) {
+        if (left > right) {
+            right = left;
+        }
+        if (bottom > top) {
+            top = bottom;
+        }
+        ct.setSimpleColumn(left, bottom, right, top);
+        return top;
+    }
+
     /**
      * Sets the widths of the columns in the row.
-     * 
-     * @param widths    The width of the columns
+     *
+     * @param widths The width of the columns
      * @return true if everything went right
      */
     public boolean setWidths(float[] widths) {
-        if (widths.length != cells.length)
+        if (widths.length != cells.length) {
             return false;
+        }
         System.arraycopy(widths, 0, this.widths, 0, cells.length);
         float total = 0;
         calculated = false;
         for (int k = 0; k < widths.length; ++k) {
             PdfPCell cell = cells[k];
-            
+
             if (cell == null) {
                 total += widths[k];
                 continue;
             }
-            
+
             cell.setLeft(total);
             int last = k + cell.getColspan();
-            for (; k < last; ++k)
+            for (; k < last; ++k) {
                 total += widths[k];
+            }
             --k;
             cell.setRight(total);
             cell.setTop(0);
@@ -153,7 +176,8 @@ public boolean setWidths(float[] widths) {
 
     /**
      * Initializes the extra heights array.
-     * @since    2.1.6
+     *
+     * @since 2.1.6
      */
     public void initExtraHeights() {
         extraHeights = new float[cells.length];
@@ -161,22 +185,24 @@ public void initExtraHeights() {
             extraHeights[i] = 0;
         }
     }
-    
+
     /**
      * Sets an extra height for a cell.
-     * @param    cell    the index of the cell that needs an extra height
-     * @param    height    the extra height
-     * @since    2.1.6
+     *
+     * @param cell   the index of the cell that needs an extra height
+     * @param height the extra height
+     * @since 2.1.6
      */
     public void setExtraHeight(int cell, float height) {
-        if (cell < 0 || cell >= cells.length)
+        if (cell < 0 || cell >= cells.length) {
             return;
+        }
         extraHeights[cell] = height;
     }
-    
+
     /**
      * Calculates the heights of each cell in the row.
-     * 
+     *
      * @return the maximum height of the row.
      */
     public float calculateHeights() {
@@ -187,8 +213,9 @@ public float calculateHeights() {
                 continue;
             } else {
                 height = cell.getMaxHeight();
-                if ((height > maxHeight) && (cell.getRowspan() == 1))
+                if ((height > maxHeight) && (cell.getRowspan() == 1)) {
                     maxHeight = height;
+                }
             }
         }
         calculated = true;
@@ -197,15 +224,16 @@ public float calculateHeights() {
 
     /**
      * Writes the border and background of one cell in the row.
-     * 
-     * @param xPos The x-coordinate where the table starts on the canvas
-     * @param yPos The y-coordinate where the table starts on the canvas
+     *
+     * @param xPos             The x-coordinate where the table starts on the canvas
+     * @param yPos             The y-coordinate where the table starts on the canvas
      * @param currentMaxHeight The height of the cell to be drawn.
-     * @param cell  The cell to change
-     * @param canvases  The canvases
-     * @since    2.1.6    extra parameter currentMaxHeight
+     * @param cell             The cell to change
+     * @param canvases         The canvases
+     * @since 2.1.6    extra parameter currentMaxHeight
      */
-    public void writeBorderAndBackground(float xPos, float yPos, float currentMaxHeight, PdfPCell cell, PdfContentByte[] canvases) {
+    public void writeBorderAndBackground(float xPos, float yPos, float currentMaxHeight, PdfPCell cell,
+            PdfContentByte[] canvases) {
         Color background = cell.getBackgroundColor();
         if (background != null || cell.hasBorders()) {
             // Add xPos resp. yPos to the cell's coordinates for absolute coordinates
@@ -213,7 +241,7 @@ public void writeBorderAndBackground(float xPos, float yPos, float currentMaxHei
             float top = cell.getTop() + yPos;
             float left = cell.getLeft() + xPos;
             float bottom = top - currentMaxHeight;
-            
+
             if (background != null) {
                 PdfContentByte backgr = canvases[PdfPTable.BACKGROUNDCANVAS];
                 backgr.setColorFill(background);
@@ -233,19 +261,21 @@ public void writeBorderAndBackground(float xPos, float yPos, float currentMaxHei
     }
 
     /**
-     * @since    2.1.6 private is now protected
      * @param canvases The canvases to save and rotate
-     * @param a an element of the transformation matrix
-     * @param b an element of the transformation matrix
-     * @param c an element of the transformation matrix
-     * @param d an element of the transformation matrix
-     * @param e an element of the transformation matrix
-     * @param f an element of the transformation matrix
+     * @param a        an element of the transformation matrix
+     * @param b        an element of the transformation matrix
+     * @param c        an element of the transformation matrix
+     * @param d        an element of the transformation matrix
+     * @param e        an element of the transformation matrix
+     * @param f        an element of the transformation matrix
+     * @since 2.1.6 private is now protected
      */
-    protected void saveAndRotateCanvases(PdfContentByte[] canvases, float a, float b, float c, float d, float e, float f) {
+    protected void saveAndRotateCanvases(PdfContentByte[] canvases, float a, float b, float c, float d, float e,
+            float f) {
         int last = PdfPTable.TEXTCANVAS + 1;
-        if (canvasesPos == null)
+        if (canvasesPos == null) {
             canvasesPos = new int[last * 2];
+        }
         for (int k = 0; k < last; ++k) {
             ByteBuffer bb = canvases[k].getInternalBuffer();
             canvasesPos[k * 2] = bb.size();
@@ -256,8 +286,8 @@ protected void saveAndRotateCanvases(PdfContentByte[] canvases, float a, float b
     }
 
     /**
-     * @since    2.1.6 private is now protected
      * @param canvases a array of PdfContentByte
+     * @since 2.1.6 private is now protected
      */
     protected void restoreCanvases(PdfContentByte[] canvases) {
         int last = PdfPTable.TEXTCANVAS + 1;
@@ -265,95 +295,85 @@ protected void restoreCanvases(PdfContentByte[] canvases) {
             ByteBuffer bb = canvases[k].getInternalBuffer();
             int p1 = bb.size();
             canvases[k].restoreState();
-            if (p1 == canvasesPos[k * 2 + 1])
+            if (p1 == canvasesPos[k * 2 + 1]) {
                 bb.setSize(canvasesPos[k * 2]);
+            }
         }
     }
 
-    /**
-     * @since    3.0.0 protected is now public static
-     * @param ct    the ColumnText
-     * @param left  the left position
-     * @param bottom the bottom position
-     * @param right the right position
-     * @param top the top position
-     * @return a float of the top position
-     */
-    public static float setColumn(ColumnText ct, float left, float bottom, float right, float top) {
-        if (left > right)
-            right = left;
-        if (bottom > top)
-            top = bottom;
-        ct.setSimpleColumn(left, bottom, right, top);
-        return top;
-    }
-    
     /**
      * Writes a number of cells (not necessarily all cells).
-     * 
-     * @param    colStart The first column to be written.
-     * Remember that the column index starts with 0.
-     * @param    colEnd The last column to be written.
-     * Remember that the column index starts with 0.
-     * If -1, all the columns to the end are written.
-     * @param    xPos The x-coordinate where the table starts on the canvas
-     * @param    yPos The y-coordinate where the table starts on the canvas
+     *
+     * @param colStart The first column to be written. Remember that the column index starts with 0.
+     * @param colEnd   The last column to be written. Remember that the column index starts with 0. If -1, all the
+     *                 columns to the end are written.
+     * @param xPos     The x-coordinate where the table starts on the canvas
+     * @param yPos     The y-coordinate where the table starts on the canvas
      * @param canvases a PdfContentByte array of the canvases
      */
     public void writeCells(int colStart, int colEnd, float xPos, float yPos, PdfContentByte[] canvases) {
-        if (!calculated)
+        if (!calculated) {
             calculateHeights();
-        if (colEnd < 0)
+        }
+        if (colEnd < 0) {
             colEnd = cells.length;
-        else
+        } else {
             colEnd = Math.min(colEnd, cells.length);
-        if (colStart < 0)
+        }
+        if (colStart < 0) {
             colStart = 0;
-        if (colStart >= colEnd)
+        }
+        if (colStart >= colEnd) {
             return;
-        
+        }
+
         int newStart;
         for (newStart = colStart; newStart >= 0; --newStart) {
-            if (cells[newStart] != null)
+            if (cells[newStart] != null) {
                 break;
-            if (newStart > 0)
+            }
+            if (newStart > 0) {
                 xPos -= widths[newStart - 1];
+            }
         }
-        
-        if (newStart < 0)
+
+        if (newStart < 0) {
             newStart = 0;
-        if (cells[newStart] != null)
+        }
+        if (cells[newStart] != null) {
             xPos -= cells[newStart].getLeft();
-        
+        }
+
         for (int k = newStart; k < colEnd; ++k) {
             PdfPCell cell = cells[k];
-            if (cell == null)
+            if (cell == null) {
                 continue;
+            }
             float currentMaxHeight = maxHeight + extraHeights[k];
-            
+
             writeBorderAndBackground(xPos, yPos, currentMaxHeight, cell, canvases);
 
             Image img = cell.getImage();
-            
+
             float tly = cell.getTop() + yPos - cell.getEffectivePaddingTop();
             if (cell.getHeight() <= currentMaxHeight) {
                 switch (cell.getVerticalAlignment()) {
-                case Element.ALIGN_BOTTOM:
-                    tly = cell.getTop() + yPos - currentMaxHeight + cell.getHeight()
-                            - cell.getEffectivePaddingTop();
-                    break;
-                case Element.ALIGN_MIDDLE:
-                    tly = cell.getTop() + yPos + (cell.getHeight() - currentMaxHeight) / 2
-                            - cell.getEffectivePaddingTop();
-                    break;
-                default:
-                    break;
+                    case Element.ALIGN_BOTTOM:
+                        tly = cell.getTop() + yPos - currentMaxHeight + cell.getHeight()
+                                - cell.getEffectivePaddingTop();
+                        break;
+                    case Element.ALIGN_MIDDLE:
+                        tly = cell.getTop() + yPos + (cell.getHeight() - currentMaxHeight) / 2
+                                - cell.getEffectivePaddingTop();
+                        break;
+                    default:
+                        break;
                 }
             }
             if (img != null) {
                 if (cell.getRotation() != 0) {
                     img = Image.getInstance(img);
-                    img.setRotation(img.getImageRotation() + (float)(cell.getRotation() * Math.PI / 180.0));
+                    img.setRotation(img.getImageRotation() + (float) (cell.getRotation() * Math.PI / 180.0));
                 }
                 boolean vf = false;
                 if (cell.getHeight() > currentMaxHeight) {
@@ -368,20 +388,20 @@ public void writeCells(int colStart, int colEnd, float xPos, float yPos, PdfCont
                         + cell.getEffectivePaddingLeft();
                 if (vf) {
                     switch (cell.getHorizontalAlignment()) {
-                    case Element.ALIGN_CENTER:
-                        left = xPos
-                                + (cell.getLeft() + cell.getEffectivePaddingLeft()
-                                        + cell.getRight()
-                                        - cell.getEffectivePaddingRight() - img
-                                        .getScaledWidth()) / 2;
-                        break;
-                    case Element.ALIGN_RIGHT:
-                        left = xPos + cell.getRight()
-                                - cell.getEffectivePaddingRight()
-                                - img.getScaledWidth();
-                        break;
-                    default:
-                        break;
+                        case Element.ALIGN_CENTER:
+                            left = xPos
+                                    + (cell.getLeft() + cell.getEffectivePaddingLeft()
+                                    + cell.getRight()
+                                    - cell.getEffectivePaddingRight() - img
+                                    .getScaledWidth()) / 2;
+                            break;
+                        case Element.ALIGN_RIGHT:
+                            left = xPos + cell.getRight()
+                                    - cell.getEffectivePaddingRight()
+                                    - img.getScaledWidth();
+                            break;
+                        default:
+                            break;
                     }
                     tly = cell.getTop() + yPos - cell.getEffectivePaddingTop();
                 }
@@ -394,8 +414,10 @@ public void writeCells(int colStart, int colEnd, float xPos, float yPos, PdfCont
             } else {
                 // rotation sponsored by Connection GmbH
                 if (cell.getRotation() == 90 || cell.getRotation() == 270) {
-                    float netWidth = currentMaxHeight - cell.getEffectivePaddingTop() - cell.getEffectivePaddingBottom();
-                    float netHeight = cell.getWidth() - cell.getEffectivePaddingLeft() - cell.getEffectivePaddingRight();
+                    float netWidth =
+                            currentMaxHeight - cell.getEffectivePaddingTop() - cell.getEffectivePaddingBottom();
+                    float netHeight =
+                            cell.getWidth() - cell.getEffectivePaddingLeft() - cell.getEffectivePaddingRight();
                     ColumnText ct = ColumnText.duplicate(cell.getColumn());
                     ct.setCanvases(canvases);
                     ct.setSimpleColumn(0, 0, netWidth + 0.001f, -netHeight);
@@ -405,11 +427,13 @@ public void writeCells(int colStart, int colEnd, float xPos, float yPos, PdfCont
                         throw new ExceptionConverter(e);
                     }
                     float calcHeight = -ct.getYLine();
-                    if (netWidth <= 0 || netHeight <= 0)
+                    if (netWidth <= 0 || netHeight <= 0) {
                         calcHeight = 0;
+                    }
                     if (calcHeight > 0) {
-                        if (cell.isUseDescender())
+                        if (cell.isUseDescender()) {
                             calcHeight -= ct.getDescender();
+                        }
                         ct = ColumnText.duplicate(cell.getColumn());
                         ct.setCanvases(canvases);
                         ct.setSimpleColumn(-0.003f, -0.001f, netWidth + 0.003f, calcHeight);
@@ -418,32 +442,34 @@ public void writeCells(int colStart, int colEnd, float xPos, float yPos, PdfCont
                         if (cell.getRotation() == 90) {
                             pivotY = cell.getTop() + yPos - currentMaxHeight + cell.getEffectivePaddingBottom();
                             switch (cell.getVerticalAlignment()) {
-                            case Element.ALIGN_BOTTOM:
-                                pivotX = cell.getLeft() + xPos + cell.getWidth() - cell.getEffectivePaddingRight();
-                                break;
-                            case Element.ALIGN_MIDDLE:
-                                pivotX = cell.getLeft() + xPos + (cell.getWidth() + cell.getEffectivePaddingLeft() - cell.getEffectivePaddingRight() + calcHeight) / 2;
-                                break;
-                            default: //top
-                                pivotX = cell.getLeft() + xPos + cell.getEffectivePaddingLeft() + calcHeight;
-                                break;
+                                case Element.ALIGN_BOTTOM:
+                                    pivotX = cell.getLeft() + xPos + cell.getWidth() - cell.getEffectivePaddingRight();
+                                    break;
+                                case Element.ALIGN_MIDDLE:
+                                    pivotX = cell.getLeft() + xPos + (cell.getWidth() + cell.getEffectivePaddingLeft()
+                                            - cell.getEffectivePaddingRight() + calcHeight) / 2;
+                                    break;
+                                default: //top
+                                    pivotX = cell.getLeft() + xPos + cell.getEffectivePaddingLeft() + calcHeight;
+                                    break;
                             }
-                            saveAndRotateCanvases(canvases, 0,1,-1,0,pivotX,pivotY);
-                        }
-                        else {
+                            saveAndRotateCanvases(canvases, 0, 1, -1, 0, pivotX, pivotY);
+                        } else {
                             pivotY = cell.getTop() + yPos - cell.getEffectivePaddingTop();
                             switch (cell.getVerticalAlignment()) {
-                            case Element.ALIGN_BOTTOM:
-                                pivotX = cell.getLeft() + xPos + cell.getEffectivePaddingLeft();
-                                break;
-                            case Element.ALIGN_MIDDLE:
-                                pivotX = cell.getLeft() + xPos + (cell.getWidth() + cell.getEffectivePaddingLeft() - cell.getEffectivePaddingRight() - calcHeight) / 2;
-                                break;
-                            default: //top
-                                pivotX = cell.getLeft() + xPos + cell.getWidth() - cell.getEffectivePaddingRight() - calcHeight;
-                                break;
+                                case Element.ALIGN_BOTTOM:
+                                    pivotX = cell.getLeft() + xPos + cell.getEffectivePaddingLeft();
+                                    break;
+                                case Element.ALIGN_MIDDLE:
+                                    pivotX = cell.getLeft() + xPos + (cell.getWidth() + cell.getEffectivePaddingLeft()
+                                            - cell.getEffectivePaddingRight() - calcHeight) / 2;
+                                    break;
+                                default: //top
+                                    pivotX = cell.getLeft() + xPos + cell.getWidth() - cell.getEffectivePaddingRight()
+                                            - calcHeight;
+                                    break;
                             }
-                            saveAndRotateCanvases(canvases, 0,-1,1,0,pivotX,pivotY);
+                            saveAndRotateCanvases(canvases, 0, -1, 1, 0, pivotX, pivotY);
                         }
                         try {
                             ct.go();
@@ -453,8 +479,7 @@ public void writeCells(int colStart, int colEnd, float xPos, float yPos, PdfCont
                             restoreCanvases(canvases);
                         }
                     }
-                } 
-                else {
+                } else {
                     float fixedHeight = cell.getFixedHeight();
                     float rightLimit = cell.getRight() + xPos
                             - cell.getEffectivePaddingRight();
@@ -469,16 +494,14 @@ public void writeCells(int colStart, int colEnd, float xPos, float yPos, PdfCont
                             case Element.ALIGN_RIGHT:
                                 if (cell.getRotation() == 180) {
                                     rightLimit += RIGHT_LIMIT;
-                                }
-                                else {
+                                } else {
                                     leftLimit -= RIGHT_LIMIT;
                                 }
                                 break;
                             default:
                                 if (cell.getRotation() == 180) {
                                     leftLimit -= RIGHT_LIMIT;
-                                }
-                                else {
+                                } else {
                                     rightLimit += RIGHT_LIMIT;
                                 }
                                 break;
@@ -496,11 +519,12 @@ public void writeCells(int colStart, int colEnd, float xPos, float yPos, PdfCont
                         }
                     }
                     if ((tly > bry || ct.zeroHeightElement()) && leftLimit < rightLimit) {
-                        ct.setSimpleColumn(leftLimit, bry - 0.001f,    rightLimit, tly);
+                        ct.setSimpleColumn(leftLimit, bry - 0.001f, rightLimit, tly);
                         if (cell.getRotation() == 180) {
                             float shx = leftLimit + rightLimit;
-                            float shy = yPos + yPos - currentMaxHeight + cell.getEffectivePaddingBottom() - cell.getEffectivePaddingTop();
-                            saveAndRotateCanvases(canvases, -1,0,0,-1,shx,shy);
+                            float shy = yPos + yPos - currentMaxHeight + cell.getEffectivePaddingBottom()
+                                    - cell.getEffectivePaddingTop();
+                            saveAndRotateCanvases(canvases, -1, 0, 0, -1, shx, shy);
                         }
                         try {
                             ct.go();
@@ -523,10 +547,10 @@ public void writeCells(int colStart, int colEnd, float xPos, float yPos, PdfCont
             }
         }
     }
-    
+
     /**
      * Checks if the dimensions of the columns were calculated.
-     * 
+     *
      * @return true if the dimensions of the columns were calculated
      */
     public boolean isCalculated() {
@@ -535,19 +559,19 @@ public boolean isCalculated() {
 
     /**
      * Gets the maximum height of the row (i.e. of the 'highest' cell).
-     * 
+     *
      * @return the maximum height of the row
      */
     public float getMaxHeights() {
-        if (calculated)
+        if (calculated) {
             return maxHeight;
+        }
         return calculateHeights();
     }
 
     /**
-     * Changes the maximum height of the row (to make it higher).
-     * (added by Jin-Hsia Yang)
-     * 
+     * Changes the maximum height of the row (to make it higher). (added by Jin-Hsia Yang)
+     *
      * @param maxHeight the new maximum height
      */
     public void setMaxHeights(float maxHeight) {
@@ -559,8 +583,9 @@ public void setMaxHeights(float maxHeight) {
     float[] getEventWidth(float xPos) {
         int n = 0;
         for (PdfPCell cell1 : cells) {
-            if (cell1 != null)
+            if (cell1 != null) {
                 ++n;
+            }
         }
         float[] width = new float[n + 1];
         n = 0;
@@ -575,15 +600,13 @@ float[] getEventWidth(float xPos) {
     }
 
     /**
-     * Splits a row to newHeight.
-     * The returned row is the remainder. It will return null if the newHeight
-     * was so small that only an empty row would result.
+     * Splits a row to newHeight. The returned row is the remainder. It will return null if the newHeight was so small
+     * that only an empty row would result.
      *
-     * @param rowIndex the row index
-     * @param table the PdfTable to get the row from
-     * @param new_height    the new height
-     * @return the remainder row or null if the newHeight was so small that only
-     * an empty row would result
+     * @param rowIndex   the row index
+     * @param table      the PdfTable to get the row from
+     * @param new_height the new height
+     * @return the remainder row or null if the newHeight was so small that only an empty row would result
      */
     public PdfPRow splitRow(PdfPTable table, int rowIndex, float new_height) {
         PdfPCell[] newCells = new PdfPCell[cells.length];
@@ -619,8 +642,7 @@ public PdfPRow splitRow(PdfPTable table, int rowIndex, float new_height) {
                     newCell.setPhrase(null);
                     allEmpty = false;
                 }
-            }
-            else {
+            } else {
                 float y;
                 ColumnText ct = ColumnText.duplicate(cell.getColumn());
                 float left = cell.getLeft() + cell.getEffectivePaddingLeft();
@@ -639,21 +661,19 @@ public PdfPRow splitRow(PdfPTable table, int rowIndex, float new_height) {
                 int status;
                 try {
                     status = ct.go(true);
-                }
-                catch (DocumentException e) {
+                } catch (DocumentException e) {
                     throw new ExceptionConverter(e);
                 }
                 boolean thisEmpty = (ct.getYLine() == y);
                 if (thisEmpty) {
                     newCell.setColumn(ColumnText.duplicate(cell.getColumn()));
                     ct.setFilledWidth(0);
-                }
-                else if ((status & ColumnText.NO_MORE_TEXT) == 0) {
+                } else if ((status & ColumnText.NO_MORE_TEXT) == 0) {
                     newCell.setColumn(ct);
                     ct.setFilledWidth(0);
-                }
-                else
+                } else {
                     newCell.setPhrase(null);
+                }
                 allEmpty = (allEmpty && thisEmpty);
             }
             newCells[k] = newCell;
@@ -662,12 +682,14 @@ else if ((status & ColumnText.NO_MORE_TEXT) == 0) {
         if (allEmpty) {
             for (int k = 0; k < cells.length; ++k) {
                 PdfPCell cell = cells[k];
-                if (cell == null)
+                if (cell == null) {
                     continue;
-                if (fixHs[k] > 0)
+                }
+                if (fixHs[k] > 0) {
                     cell.setFixedHeight(fixHs[k]);
-                else
+                } else {
                     cell.setMinimumHeight(minHs[k]);
+                }
             }
             return null;
         }
@@ -677,14 +699,13 @@ else if ((status & ColumnText.NO_MORE_TEXT) == 0) {
         split.calculateHeights();
         return split;
     }
-    
+
     /**
-     * Returns the array of cells in the row.
-     * Please be extremely careful with this method.
-     * Use the cells as read only objects.
-     * 
-     * @return    an array of cells
-     * @since    2.1.1
+     * Returns the array of cells in the row. Please be extremely careful with this method. Use the cells as read only
+     * objects.
+     *
+     * @return an array of cells
+     * @since 2.1.1
      */
     public PdfPCell[] getCells() {
         return cells;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPSXObject.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPSXObject.java
index 396840007..e118dfeea 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPSXObject.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPSXObject.java
@@ -50,14 +50,17 @@
  * Implements the PostScript XObject.
  */
 public class PdfPSXObject extends PdfTemplate {
-    
-    /** Creates a new instance of PdfPSXObject */
+
+    /**
+     * Creates a new instance of PdfPSXObject
+     */
     protected PdfPSXObject() {
         super();
     }
-    
+
     /**
      * Constructs a PSXObject
+     *
      * @param wr the PdfWriter
      */
     public PdfPSXObject(PdfWriter wr) {
@@ -67,11 +70,11 @@ public PdfPSXObject(PdfWriter wr) {
     /**
      * Gets the stream representing this object.
      *
-     * @param    compressionLevel    the compressionLevel
+     * @param compressionLevel the compressionLevel
      * @return the stream representing this template
-     * @since    2.1.3    (replacing the method without param compressionLevel)
+     * @since 2.1.3    (replacing the method without param compressionLevel)
      */
-    
+
     PdfStream getFormXObject(int compressionLevel) {
         PdfStream s = new PdfStream(content.toByteArray());
         s.put(PdfName.TYPE, PdfName.XOBJECT);
@@ -79,13 +82,14 @@ PdfStream getFormXObject(int compressionLevel) {
         s.flateCompress(compressionLevel);
         return s;
     }
-        
+
     /**
-     * Gets a duplicate of this PdfPSXObject. All
-     * the members are copied by reference but the buffer stays different.
+     * Gets a duplicate of this PdfPSXObject. All the members are copied by reference but the buffer stays
+     * different.
+     *
      * @return a copy of this PdfPSXObject
      */
-    
+
     public PdfContentByte getDuplicate() {
         PdfPSXObject tpl = new PdfPSXObject();
         tpl.writer = writer;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPTable.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPTable.java
index 2d25dbc08..df82d1539 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPTable.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPTable.java
@@ -49,11 +49,6 @@
 
 package com.lowagie.text.pdf;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-
-import com.lowagie.text.error_messages.MessageLocalization;
-
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
 import com.lowagie.text.ElementListener;
@@ -61,152 +56,144 @@
 import com.lowagie.text.LargeElement;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.Rectangle;
+import com.lowagie.text.error_messages.MessageLocalization;
 import com.lowagie.text.pdf.events.PdfPTableEventForwarder;
+import java.util.ArrayList;
+import java.util.Comparator;
 
 /**
- * This is a table that can be put at an absolute position but can also
- * be added to the document as the class Table.
- * In the last case when crossing pages the table always break at full rows; if a
- * row is bigger than the page it is dropped silently to avoid infinite loops.
- * 
        
- * A PdfPTableEvent can be associated to the table to do custom drawing
- * when the table is rendered.
+ * This is a table that can be put at an absolute position but can also be added to the document as the class
+ * Table. In the last case when crossing pages the table always break at full rows; if a row is bigger
+ * than the page it is dropped silently to avoid infinite loops.
+ * 
        
+ * A PdfPTableEvent can be associated to the table to do custom drawing when the table is rendered.
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 
-public class PdfPTable implements LargeElement{
-    
+public class PdfPTable implements LargeElement {
+
     /**
      * The index of the original PdfcontentByte.
-     */    
+     */
     public static final int BASECANVAS = 0;
-    
+
     /**
      * The index of the duplicate PdfContentByte where the background will be drawn.
-     */    
+     */
     public static final int BACKGROUNDCANVAS = 1;
-    
+
     /**
      * The index of the duplicate PdfContentByte where the border lines will be drawn.
-     */    
+     */
     public static final int LINECANVAS = 2;
-    
+
     /**
      * The index of the duplicate PdfContentByte where the text will be drawn.
-     */    
+     */
     public static final int TEXTCANVAS = 3;
-    
+
     protected ArrayList rows = new ArrayList<>();
     protected float totalHeight = 0;
     protected PdfPCell[] currentRow;
     protected int currentRowIdx = 0;
-    protected PdfPCell defaultCell = new PdfPCell((Phrase)null);
+    protected PdfPCell defaultCell = new PdfPCell((Phrase) null);
     protected float totalWidth = 0;
     protected float[] relativeWidths;
     protected float[] absoluteWidths;
     protected PdfPTableEvent tableEvent;
-    
+
     /**
      * Holds value of property headerRows.
      */
     protected int headerRows;
-    
+
     /**
      * Holds value of property widthPercentage.
      */
     protected float widthPercentage = 80;
-    
+    protected boolean isColspan = false;
+    protected int runDirection = PdfWriter.RUN_DIRECTION_DEFAULT;
+    /**
+     * The spacing before the table.
+     */
+    protected float spacingBefore;
+    /**
+     * The spacing after the table.
+     */
+    protected float spacingAfter;
+    /**
+     * Indicates if the PdfPTable is complete once added to the document.
+     *
+     * @since iText 2.0.8
+     */
+    protected boolean complete = true;
+    /**
+     * Keeps track of the completeness of the current row.
+     *
+     * @since 2.1.6
+     */
+    protected boolean rowCompleted = true;
     /**
      * Holds value of property horizontalAlignment.
      */
     private int horizontalAlignment = Element.ALIGN_CENTER;
-    
     /**
      * Holds value of property skipFirstHeader.
      */
     private boolean skipFirstHeader = false;
     /**
      * Holds value of property skipLastFooter.
-     * @since    2.1.6
+     *
+     * @since 2.1.6
      */
     private boolean skipLastFooter = false;
-
-    protected boolean isColspan = false;
-    
-    protected int runDirection = PdfWriter.RUN_DIRECTION_DEFAULT;
-
     /**
      * Holds value of property lockedWidth.
      */
     private boolean lockedWidth = false;
-    
     /**
      * Holds value of property splitRows.
      */
     private boolean splitRows = true;
-    
-    /**
-     * The spacing before the table.
-     */
-    protected float spacingBefore;
-    
-    /**
-     * The spacing after the table.
-     */
-    protected float spacingAfter;
-    
     /**
      * Holds value of property extendLastRow.
      */
-    private boolean[] extendLastRow = { false, false };
-    
+    private boolean[] extendLastRow = {false, false};
     /**
      * Holds value of property headersInEvent.
      */
     private boolean headersInEvent;
-    
     /**
      * Holds value of property splitLate.
      */
     private boolean splitLate = true;
-    
     /**
-     * Defines if the table should be kept
-     * on one page if possible
+     * Defines if the table should be kept on one page if possible
      */
     private boolean keepTogether;
-    
-    /**
-     * Indicates if the PdfPTable is complete once added to the document.
-     * 
-     * @since    iText 2.0.8
-     */
-    protected boolean complete = true;
-    
     /**
      * Holds value of property footerRows.
      */
     private int footerRows;
-    
-    /**
-     * Keeps track of the completeness of the current row.
-     * @since    2.1.6
-     */
-    protected boolean rowCompleted = true;
-    
+
     protected PdfPTable() {
     }
-    
-    /** 
+
+    /**
      * Constructs a PdfPTable with the relative column widths.
-     * 
+     *
      * @param relativeWidths the relative column widths
-     */    
+     */
     public PdfPTable(float[] relativeWidths) {
-        if (relativeWidths == null)
-            throw new NullPointerException(MessageLocalization.getComposedMessage("the.widths.array.in.pdfptable.constructor.can.not.be.null"));
-        if (relativeWidths.length == 0)
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.widths.array.in.pdfptable.constructor.can.not.have.zero.length"));
+        if (relativeWidths == null) {
+            throw new NullPointerException(MessageLocalization.getComposedMessage(
+                    "the.widths.array.in.pdfptable.constructor.can.not.be.null"));
+        }
+        if (relativeWidths.length == 0) {
+            throw new IllegalArgumentException(MessageLocalization.getComposedMessage(
+                    "the.widths.array.in.pdfptable.constructor.can.not.have.zero.length"));
+        }
         this.relativeWidths = new float[relativeWidths.length];
         System.arraycopy(relativeWidths, 0, this.relativeWidths, 0, relativeWidths.length);
         absoluteWidths = new float[relativeWidths.length];
@@ -214,47 +201,52 @@ public PdfPTable(float[] relativeWidths) {
         currentRow = new PdfPCell[absoluteWidths.length];
         keepTogether = false;
     }
-    
-    /** 
+
+    /**
      * Constructs a PdfPTable with numColumns columns.
-     * 
+     *
      * @param numColumns the number of columns
-     */    
+     */
     public PdfPTable(int numColumns) {
-        if (numColumns <= 0)
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.number.of.columns.in.pdfptable.constructor.must.be.greater.than.zero"));
+        if (numColumns <= 0) {
+            throw new IllegalArgumentException(MessageLocalization.getComposedMessage(
+                    "the.number.of.columns.in.pdfptable.constructor.must.be.greater.than.zero"));
+        }
         relativeWidths = new float[numColumns];
-        for (int k = 0; k < numColumns; ++k)
+        for (int k = 0; k < numColumns; ++k) {
             relativeWidths[k] = 1;
+        }
         absoluteWidths = new float[relativeWidths.length];
         calculateWidths();
         currentRow = new PdfPCell[absoluteWidths.length];
         keepTogether = false;
     }
-    
-    /** 
+
+    /**
      * Constructs a copy of a PdfPTable.
-     * 
+     *
      * @param table the PdfPTable to be copied
-     */    
+     */
     public PdfPTable(PdfPTable table) {
         copyFormat(table);
         for (int k = 0; k < currentRow.length; ++k) {
-            if (table.currentRow[k] == null)
+            if (table.currentRow[k] == null) {
                 break;
+            }
             currentRow[k] = new PdfPCell(table.currentRow[k]);
         }
         for (int k = 0; k < table.rows.size(); ++k) {
             PdfPRow row = table.rows.get(k);
-            if (row != null)
+            if (row != null) {
                 row = new PdfPRow(row);
+            }
             rows.add(row);
         }
     }
-    
+
     /**
      * Makes a shallow copy of a table (format without content).
-     * 
+     *
      * @param table the PdfTable to copy
      * @return a shallow copy of the table
      */
@@ -264,11 +256,55 @@ public static PdfPTable shallowCopy(PdfPTable table) {
         return nt;
     }
 
+    /**
+     * Gets and initializes the 4 layers where the table is written to. The text or graphics are added to one of the 4
+     * PdfContentByte returned with the following order:
+     * 
          
+     * 
        • PdfPtable.BASECANVAS - the original PdfContentByte. Anything placed here
+     * will be under the table.
+     * 
        • PdfPtable.BACKGROUNDCANVAS - the layer where the background goes to.
+     * 
        • PdfPtable.LINECANVAS - the layer where the lines go to.
+     * 
        • PdfPtable.TEXTCANVAS - the layer where the text go to. Anything placed here
+     * will be over the table.
+     * 
        
+     * The layers are placed in sequence on top of each other.
+     *
+     * @param canvas the PdfContentByte where the rows will be written to
+     * @return an array of 4 PdfContentByte
+     * @see #writeSelectedRows(int, int, float, float, PdfContentByte[])
+     */
+    public static PdfContentByte[] beginWritingRows(PdfContentByte canvas) {
+        return new PdfContentByte[]{
+                canvas,
+                canvas.getDuplicate(),
+                canvas.getDuplicate(),
+                canvas.getDuplicate(),
+        };
+    }
+
+    /**
+     * Finishes writing the table.
+     *
+     * @param canvases the array returned by beginWritingRows()
+     */
+    public static void endWritingRows(PdfContentByte[] canvases) {
+        PdfContentByte canvas = canvases[BASECANVAS];
+        canvas.saveState();
+        canvas.add(canvases[BACKGROUNDCANVAS]);
+        canvas.restoreState();
+        canvas.saveState();
+        canvas.setLineCap(2);
+        canvas.resetRGBColorStroke();
+        canvas.add(canvases[LINECANVAS]);
+        canvas.restoreState();
+        canvas.add(canvases[TEXTCANVAS]);
+    }
+
     /**
      * Copies the format of the sourceTable without copying the content.
-     *  
+     *
      * @param sourceTable the PdfTable to copy the format of
-     * @since    2.1.6 private is now protected
+     * @since 2.1.6 private is now protected
      */
     protected void copyFormat(PdfPTable sourceTable) {
         relativeWidths = new float[sourceTable.getNumberOfColumns()];
@@ -302,14 +338,14 @@ protected void copyFormat(PdfPTable sourceTable) {
 
     /**
      * Sets the relative widths of the table.
-     * 
+     *
      * @param relativeWidths the relative widths of the table.
-     * @throws DocumentException if the number of widths is different than the number
-     * of columns
-     */    
+     * @throws DocumentException if the number of widths is different than the number of columns
+     */
     public void setWidths(float[] relativeWidths) throws DocumentException {
-        if (relativeWidths.length != getNumberOfColumns())
+        if (relativeWidths.length != getNumberOfColumns()) {
             throw new DocumentException(MessageLocalization.getComposedMessage("wrong.number.of.columns"));
+        }
         this.relativeWidths = new float[relativeWidths.length];
         System.arraycopy(relativeWidths, 0, this.relativeWidths, 0, relativeWidths.length);
         absoluteWidths = new float[relativeWidths.length];
@@ -320,40 +356,72 @@ public void setWidths(float[] relativeWidths) throws DocumentException {
 
     /**
      * Sets the relative widths of the table.
-     * 
+     *
      * @param relativeWidths the relative widths of the table.
-     * @throws DocumentException if the number of widths is different than the number
-     * of columns
-     */    
+     * @throws DocumentException if the number of widths is different than the number of columns
+     */
     public void setWidths(int[] relativeWidths) throws DocumentException {
         float[] tb = new float[relativeWidths.length];
-        for (int k = 0; k < relativeWidths.length; ++k)
+        for (int k = 0; k < relativeWidths.length; ++k) {
             tb[k] = relativeWidths[k];
+        }
         setWidths(tb);
     }
 
     /**
-     * @since    2.1.6 private is now protected
+     * @since 2.1.6 private is now protected
      */
     protected void calculateWidths() {
-        if (totalWidth <= 0)
+        if (totalWidth <= 0) {
             return;
+        }
         float total = 0;
         int numCols = getNumberOfColumns();
-        for (int k = 0; k < numCols; ++k)
+        for (int k = 0; k < numCols; ++k) {
             total += relativeWidths[k];
-        for (int k = 0; k < numCols; ++k)
+        }
+        for (int k = 0; k < numCols; ++k) {
             absoluteWidths[k] = totalWidth * relativeWidths[k] / total;
+        }
     }
-    
+
+    /**
+     * Sets the percentage width of the table from the absolute column width.
+     *
+     * @param columnWidth the absolute width of each column
+     * @param pageSize    the page size
+     * @throws DocumentException on error
+     */
+    public void setWidthPercentage(float[] columnWidth, Rectangle pageSize) throws DocumentException {
+        if (columnWidth.length != getNumberOfColumns()) {
+            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("wrong.number.of.columns"));
+        }
+        float totalWidth = 0;
+        for (float v : columnWidth) {
+            totalWidth += v;
+        }
+        widthPercentage = totalWidth / (pageSize.getRight() - pageSize.getLeft()) * 100f;
+        setWidths(columnWidth);
+    }
+
+    /**
+     * Gets the full width of the table.
+     *
+     * @return the full width of the table
+     */
+    public float getTotalWidth() {
+        return totalWidth;
+    }
+
     /**
      * Sets the full width of the table.
-     * 
+     *
      * @param totalWidth the full width of the table.
-     */    
+     */
     public void setTotalWidth(float totalWidth) {
-        if (this.totalWidth == totalWidth)
+        if (this.totalWidth == totalWidth) {
             return;
+        }
         this.totalWidth = totalWidth;
         totalHeight = 0;
         calculateWidths();
@@ -362,63 +430,39 @@ public void setTotalWidth(float totalWidth) {
 
     /**
      * Sets the full width of the table from the absolute column width.
-     * 
+     *
      * @param columnWidth the absolute width of each column
-     * @throws DocumentException if the number of widths is different than the number
-     * of columns
-     */    
+     * @throws DocumentException if the number of widths is different than the number of columns
+     */
     public void setTotalWidth(float[] columnWidth) throws DocumentException {
-        if (columnWidth.length != getNumberOfColumns())
+        if (columnWidth.length != getNumberOfColumns()) {
             throw new DocumentException(MessageLocalization.getComposedMessage("wrong.number.of.columns"));
+        }
         totalWidth = 0;
-        for (float v : columnWidth) totalWidth += v;
-        setWidths(columnWidth);
-    }
-
-    /**
-     * Sets the percentage width of the table from the absolute column width.
-     * 
-     * @param columnWidth the absolute width of each column
-     * @param pageSize the page size
-     * @throws DocumentException on error
-     */    
-    public void setWidthPercentage(float[] columnWidth, Rectangle pageSize) throws DocumentException {
-        if (columnWidth.length != getNumberOfColumns())
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("wrong.number.of.columns"));
-        float totalWidth = 0;
-        for (float v : columnWidth) totalWidth += v;
-        widthPercentage = totalWidth / (pageSize.getRight() - pageSize.getLeft()) * 100f;
+        for (float v : columnWidth) {
+            totalWidth += v;
+        }
         setWidths(columnWidth);
     }
 
-    /**
-     * Gets the full width of the table.
-     * 
-     * @return the full width of the table
-     */    
-    public float getTotalWidth() {
-        return totalWidth;
-    }
-    
     /**
      * Calculates the heights of the table.
-     * 
-     * @param    firsttime    if true, the heights of the rows will be recalculated.
-     * This takes time; normally the heights of the rows are already calcultated,
-     * so in most cases, it's save to use false as parameter.
-     * @return    the total height of the table. Note that it will be 0 if you didn't
-     * specify the width of the table with setTotalWidth().
-     * @since    2.1.5    added a parameter and a return type to an existing method,
-     * and made it public
+     *
+     * @param firsttime if true, the heights of the rows will be recalculated. This takes time; normally the heights of
+     *                  the rows are already calcultated, so in most cases, it's save to use false as parameter.
+     * @return the total height of the table. Note that it will be 0 if you didn't specify the width of the table with
+     * setTotalWidth().
+     * @since 2.1.5    added a parameter and a return type to an existing method, and made it public
      */
     public float calculateHeights(boolean firsttime) {
-        if (totalWidth <= 0)
+        if (totalWidth <= 0) {
             return 0;
+        }
         totalHeight = 0;
         for (int k = 0; k < rows.size(); ++k) {
             totalHeight += getRowHeight(k, firsttime);
         }
-        if(firsttime) {
+        if (firsttime) {
             // Redistribute row height for row span once
             try {
                 this.redistributeRowspanHeight();
@@ -429,56 +473,58 @@ public float calculateHeights(boolean firsttime) {
         }
         return totalHeight;
     }
-    
+
     /**
      * Calculates the heights of the table.
      */
     public void calculateHeightsFast() {
         calculateHeights(false);
     }
-    
+
     /**
-     * Gets the default PdfPCell that will be used as
-     * reference for all the addCell methods except
+     * Gets the default PdfPCell that will be used as reference for all the addCell methods
+     * except
      * addCell(PdfPCell).
-     * 
+     *
      * @return default PdfPCell
-     */    
+     */
     public PdfPCell getDefaultCell() {
         return defaultCell;
     }
-    
+
     /**
      * Adds a cell element.
-     * 
+     *
      * @param cell the cell element
-     */    
+     */
     public PdfPCell addCell(PdfPCell cell) {
         rowCompleted = false;
         PdfPCell ncell = new PdfPCell(cell);
-        
+
         int colspan = ncell.getColspan();
         colspan = Math.max(colspan, 1);
         colspan = Math.min(colspan, currentRow.length - currentRowIdx);
         ncell.setColspan(colspan);
 
-        if (colspan != 1)
+        if (colspan != 1) {
             isColspan = true;
+        }
         int rdir = ncell.getRunDirection();
-        if (rdir == PdfWriter.RUN_DIRECTION_DEFAULT)
+        if (rdir == PdfWriter.RUN_DIRECTION_DEFAULT) {
             ncell.setRunDirection(runDirection);
-        
+        }
+
         skipColsWithRowspanAbove();
-        
+
         boolean cellAdded = false;
-        if (currentRowIdx < currentRow.length) {  
+        if (currentRowIdx < currentRow.length) {
             currentRow[currentRowIdx] = ncell;
             currentRowIdx += colspan;
             cellAdded = true;
         }
 
         skipColsWithRowspanAbove();
-        
+
         while (currentRowIdx >= currentRow.length) {
             int numCols = getNumberOfColumns();
             if (runDirection == PdfWriter.RUN_DIRECTION_RTL) {
@@ -504,7 +550,7 @@ public PdfPCell addCell(PdfPCell cell) {
             skipColsWithRowspanAbove();
             rowCompleted = true;
         }
-        
+
         if (!cellAdded) {
             currentRow[currentRowIdx] = ncell;
             currentRowIdx += colspan;
@@ -512,20 +558,23 @@ public PdfPCell addCell(PdfPCell cell) {
 
         return ncell;
     }
-    
+
     /**
-     * When updating the row index, cells with rowspan should be taken into account.
-     * This is what happens in this method.
-     * @since    2.1.6
+     * When updating the row index, cells with rowspan should be taken into account. This is what happens in this
+     * method.
+     *
+     * @since 2.1.6
      */
     private void skipColsWithRowspanAbove() {
         int direction = 1;
-        if (runDirection == PdfWriter.RUN_DIRECTION_RTL)
+        if (runDirection == PdfWriter.RUN_DIRECTION_RTL) {
             direction = -1;
-        while (rowSpanAbove(rows.size(), currentRowIdx))
+        }
+        while (rowSpanAbove(rows.size(), currentRowIdx)) {
             currentRowIdx += direction;
+        }
     }
-    
+
     PdfPCell obtainCell(final int row, final int col) {
         PdfPCell[] cells = rows.get(row).getCells();
         for (int i = 0; i < cells.length; i++) {
@@ -537,163 +586,172 @@ PdfPCell obtainCell(final int row, final int col) {
         }
         return null;
     }
+
     /**
      * Checks if there are rows above belonging to a rowspan.
-     * @param    currRow    the current row to check
-     * @param    currCol    the current column to check
-     * @return    true if there's a cell above that belongs to a rowspan
-     * @since    2.1.6
+     *
+     * @param currRow the current row to check
+     * @param currCol the current column to check
+     * @return true if there's a cell above that belongs to a rowspan
+     * @since 2.1.6
      */
     boolean rowSpanAbove(int currRow, int currCol) {
-        
-        if ((currCol >= getNumberOfColumns()) 
-                || (currCol < 0) 
-                || (currRow < 1))
+
+        if ((currCol >= getNumberOfColumns())
+                || (currCol < 0)
+                || (currRow < 1)) {
             return false;
-        
+        }
+
         int row = currRow - 1;
         PdfPRow aboveRow = rows.get(row);
-        if (aboveRow == null)
+        if (aboveRow == null) {
             return false;
-        PdfPCell aboveCell = obtainCell(row,currCol);
+        }
+        PdfPCell aboveCell = obtainCell(row, currCol);
         while ((aboveCell == null) && (row > 0)) {
-            aboveRow  = rows.get(--row);
-            if (aboveRow == null)
+            aboveRow = rows.get(--row);
+            if (aboveRow == null) {
                 return false;
-            aboveCell = obtainCell(row,currCol);
+            }
+            aboveCell = obtainCell(row, currCol);
         }
-        
+
         int distance = currRow - row;
 
         if (aboveCell == null) {
             int col = currCol - 1;
-            aboveCell = obtainCell(row,col);
-            while ((aboveCell == null) && (row > 0))
-                aboveCell = obtainCell(row,--col);
+            aboveCell = obtainCell(row, col);
+            while ((aboveCell == null) && (row > 0)) {
+                aboveCell = obtainCell(row, --col);
+            }
             return aboveCell != null && aboveCell.getRowspan() > distance;
         }
-        
+
         if ((aboveCell.getRowspan() == 1) && (distance > 1)) {
             int col = currCol - 1;
             aboveRow = rows.get(row + 1);
             distance--;
             aboveCell = aboveRow.getCells()[col];
-            while ((aboveCell == null) && (col > 0))
+            while ((aboveCell == null) && (col > 0)) {
                 aboveCell = aboveRow.getCells()[--col];
+            }
         }
-        
+
         return aboveCell != null && aboveCell.getRowspan() > distance;
     }
-    
-    
+
     /**
      * Adds a cell element.
-     * 
+     *
      * @param text the text for the cell
-     */    
+     */
     public PdfPCell addCell(String text) {
         return addCell(new Phrase(text));
     }
-    
+
     /**
      * Adds a nested table.
-     * 
+     *
      * @param table the table to be added to the cell
-     */    
+     */
     public PdfPCell addCell(PdfPTable table) {
         defaultCell.setTable(table);
         addCell(defaultCell);
         defaultCell.setTable(null);
         return defaultCell;
     }
-    
+
     /**
      * Adds an Image as Cell.
-     * 
-     * @param image the Image to add to the table.
-     * This image will fit in the cell
-     */    
+     *
+     * @param image the Image to add to the table. This image will fit in the cell
+     */
     public PdfPCell addCell(Image image) {
         defaultCell.setImage(image);
         addCell(defaultCell);
         defaultCell.setImage(null);
         return defaultCell;
     }
-    
+
     /**
      * Adds a cell element.
-     * 
+     *
      * @param phrase the Phrase to be added to the cell
-     */    
+     */
     public PdfPCell addCell(Phrase phrase) {
         defaultCell.setPhrase(phrase);
         addCell(defaultCell);
         defaultCell.setPhrase(null);
         return defaultCell;
     }
-    
+
     /**
      * Writes the selected rows to the document.
      * canvases is obtained from beginWritingRows().
-     * 
+     *
      * @param rowStart the first row to be written, zero index
-     * @param rowEnd the last row to be written + 1. If it is -1 all the
-     * rows to the end are written
-     * @param xPos the x write coordinate
-     * @param yPos the y write coordinate
+     * @param rowEnd   the last row to be written + 1. If it is -1 all the rows to the end are written
+     * @param xPos     the x write coordinate
+     * @param yPos     the y write coordinate
      * @param canvases an array of 4 PdfContentByte obtained from
-     * beginWrittingRows()
+     *                 beginWrittingRows()
      * @return the y coordinate position of the bottom of the last row
      * @see #beginWritingRows(com.lowagie.text.pdf.PdfContentByte)
-     */    
+     */
     public float writeSelectedRows(int rowStart, int rowEnd, float xPos, float yPos, PdfContentByte[] canvases) {
         return writeSelectedRows(0, -1, rowStart, rowEnd, xPos, yPos, canvases);
     }
-    
+
     /**
-     * Writes the selected rows and columns to the document.
-     * This method does not clip the columns; this is only important
-     * if there are columns with colspan at boundaries.
+     * Writes the selected rows and columns to the document. This method does not clip the columns; this is only
+     * important if there are columns with colspan at boundaries.
      * canvases is obtained from beginWritingRows().
      * The table event is only fired for complete rows.
-     * 
+     *
      * @param colStart the first column to be written, zero index
-     * @param colEnd the last column to be written + 1. If it is -1 all the
-     * columns to the end are written
+     * @param colEnd   the last column to be written + 1. If it is -1 all the columns to the end are written
      * @param rowStart the first row to be written, zero index
-     * @param rowEnd the last row to be written + 1. If it is -1 all the
-     * rows to the end are written
-     * @param xPos the x write coordinate
-     * @param yPos the y write coordinate
+     * @param rowEnd   the last row to be written + 1. If it is -1 all the rows to the end are written
+     * @param xPos     the x write coordinate
+     * @param yPos     the y write coordinate
      * @param canvases an array of 4 PdfContentByte obtained from
-     * beginWritingRows()
+     *                 beginWritingRows()
      * @return the y coordinate position of the bottom of the last row
      * @see #beginWritingRows(com.lowagie.text.pdf.PdfContentByte)
-     */    
-    public float writeSelectedRows(int colStart, int colEnd, int rowStart, int rowEnd, float xPos, float yPos, PdfContentByte[] canvases) {
-        if (totalWidth <= 0)
-            throw new RuntimeException(MessageLocalization.getComposedMessage("the.table.width.must.be.greater.than.zero"));
-        
+     */
+    public float writeSelectedRows(int colStart, int colEnd, int rowStart, int rowEnd, float xPos, float yPos,
+            PdfContentByte[] canvases) {
+        if (totalWidth <= 0) {
+            throw new RuntimeException(
+                    MessageLocalization.getComposedMessage("the.table.width.must.be.greater.than.zero"));
+        }
+
         int totalRows = rows.size();
-        if (rowStart < 0)
+        if (rowStart < 0) {
             rowStart = 0;
-        if (rowEnd < 0)
+        }
+        if (rowEnd < 0) {
             rowEnd = totalRows;
-        else
+        } else {
             rowEnd = Math.min(rowEnd, totalRows);
-        if (rowStart >= rowEnd)
+        }
+        if (rowStart >= rowEnd) {
             return yPos;
-        
+        }
+
         int totalCols = getNumberOfColumns();
-        if (colStart < 0)
+        if (colStart < 0) {
             colStart = 0;
-        else
+        } else {
             colStart = Math.min(colStart, totalCols);
-        if (colEnd < 0)
+        }
+        if (colEnd < 0) {
             colEnd = totalCols;
-        else
+        } else {
             colEnd = Math.min(colEnd, totalCols);
-        
+        }
+
         float yPosStart = yPos;
         for (int k = rowStart; k < rowEnd; ++k) {
             PdfPRow row = rows.get(k);
@@ -702,75 +760,74 @@ public float writeSelectedRows(int colStart, int colEnd, int rowStart, int rowEn
                 yPos -= row.getMaxHeights();
             }
         }
-        
+
         if (tableEvent != null && colStart == 0 && colEnd == totalCols) {
             float[] heights = new float[rowEnd - rowStart + 1];
             heights[0] = yPosStart;
             for (int k = rowStart; k < rowEnd; ++k) {
                 PdfPRow row = rows.get(k);
                 float hr = 0;
-                if (row != null)
+                if (row != null) {
                     hr = row.getMaxHeights();
+                }
                 heights[k - rowStart + 1] = heights[k - rowStart] - hr;
             }
-            tableEvent.tableLayout(this, getEventWidths(xPos, rowStart, rowEnd, headersInEvent), heights, headersInEvent ? headerRows : 0, rowStart, canvases);
+            tableEvent.tableLayout(this, getEventWidths(xPos, rowStart, rowEnd, headersInEvent), heights,
+                    headersInEvent ? headerRows : 0, rowStart, canvases);
         }
-        
+
         return yPos;
     }
-    
+
     /**
      * Writes the selected rows to the document.
-     * 
+     *
      * @param rowStart the first row to be written, zero index
-     * @param rowEnd the last row to be written + 1. If it is -1 all the
-     * rows to the end are written
-     * @param xPos the x write coordinate
-     * @param yPos the y write coordinate
-     * @param canvas the PdfContentByte where the rows will
-     * be written to
+     * @param rowEnd   the last row to be written + 1. If it is -1 all the rows to the end are written
+     * @param xPos     the x write coordinate
+     * @param yPos     the y write coordinate
+     * @param canvas   the PdfContentByte where the rows will be written to
      * @return the y coordinate position of the bottom of the last row
-     */    
+     */
     public float writeSelectedRows(int rowStart, int rowEnd, float xPos, float yPos, PdfContentByte canvas) {
         return writeSelectedRows(0, -1, rowStart, rowEnd, xPos, yPos, canvas);
     }
-    
+
     /**
-     * Writes the selected rows and columns to the document.
-     * This method clips the columns; this is only important
-     * if there are columns with colspan at boundaries.
-     * The table event is only fired for complete rows.
-     * 
+     * Writes the selected rows and columns to the document. This method clips the columns; this is only important if
+     * there are columns with colspan at boundaries. The table event is only fired for complete rows.
+     *
      * @param colStart the first column to be written, zero index
-     * @param colEnd the last column to be written + 1. If it is -1 all the
-     * columns to the end are written
+     * @param colEnd   the last column to be written + 1. If it is -1 all the columns to the end are written
      * @param rowStart the first row to be written, zero index
-     * @param rowEnd the last row to be written + 1. If it is -1 all the
-     * rows to the end are written
-     * @param xPos the x write coordinate
-     * @param yPos the y write coordinate
-     * @param canvas the PdfContentByte where the rows will
-     * be written to
+     * @param rowEnd   the last row to be written + 1. If it is -1 all the rows to the end are written
+     * @param xPos     the x write coordinate
+     * @param yPos     the y write coordinate
+     * @param canvas   the PdfContentByte where the rows will be written to
      * @return the y coordinate position of the bottom of the last row
-     */    
-    public float writeSelectedRows(int colStart, int colEnd, int rowStart, int rowEnd, float xPos, float yPos, PdfContentByte canvas) {
+     */
+    public float writeSelectedRows(int colStart, int colEnd, int rowStart, int rowEnd, float xPos, float yPos,
+            PdfContentByte canvas) {
         int totalCols = getNumberOfColumns();
-        if (colStart < 0)
+        if (colStart < 0) {
             colStart = 0;
-        else
+        } else {
             colStart = Math.min(colStart, totalCols);
-        
-        if (colEnd < 0)
+        }
+
+        if (colEnd < 0) {
             colEnd = totalCols;
-        else
+        } else {
             colEnd = Math.min(colEnd, totalCols);
-        
+        }
+
         boolean clip = (colStart != 0 || colEnd != totalCols);
-        
+
         if (clip) {
             float w = 0;
-            for (int k = colStart; k < colEnd; ++k)
+            for (int k = colStart; k < colEnd; ++k) {
                 w += absoluteWidths[k];
+            }
             canvas.saveState();
             float lx = (colStart == 0) ? 10000 : 0;
             float rx = (colEnd == totalCols) ? 10000 : 0;
@@ -778,98 +835,58 @@ public float writeSelectedRows(int colStart, int colEnd, int rowStart, int rowEn
             canvas.clip();
             canvas.newPath();
         }
-        
+
         PdfContentByte[] canvases = beginWritingRows(canvas);
         float y = writeSelectedRows(colStart, colEnd, rowStart, rowEnd, xPos, yPos, canvases);
         endWritingRows(canvases);
-        
-        if (clip)
+
+        if (clip) {
             canvas.restoreState();
-        
+        }
+
         return y;
     }
-    
-    /**
-     * Gets and initializes the 4 layers where the table is written to. The text or graphics are added to
-     * one of the 4 PdfContentByte returned with the following order:
-     * 
          
-     * 
        • PdfPtable.BASECANVAS - the original PdfContentByte. Anything placed here
-     * will be under the table.
-     * 
        • PdfPtable.BACKGROUNDCANVAS - the layer where the background goes to.
-     * 
        • PdfPtable.LINECANVAS - the layer where the lines go to.
-     * 
        • PdfPtable.TEXTCANVAS - the layer where the text go to. Anything placed here
-     * will be over the table.
-     * 
        
-     * The layers are placed in sequence on top of each other.
-     * 
-     * @param canvas the PdfContentByte where the rows will
-     * be written to
-     * @return an array of 4 PdfContentByte
-     * @see #writeSelectedRows(int, int, float, float, PdfContentByte[])
-     */    
-    public static PdfContentByte[] beginWritingRows(PdfContentByte canvas) {
-        return new PdfContentByte[]{
-            canvas,
-            canvas.getDuplicate(),
-            canvas.getDuplicate(),
-            canvas.getDuplicate(),
-        };
-    }
-    
-    /**
-     * Finishes writing the table.
-     * 
-     * @param canvases the array returned by beginWritingRows()
-     */    
-    public static void endWritingRows(PdfContentByte[] canvases) {
-        PdfContentByte canvas = canvases[BASECANVAS];
-        canvas.saveState();
-        canvas.add(canvases[BACKGROUNDCANVAS]);
-        canvas.restoreState();
-        canvas.saveState();
-        canvas.setLineCap(2);
-        canvas.resetRGBColorStroke();
-        canvas.add(canvases[LINECANVAS]);
-        canvas.restoreState();
-        canvas.add(canvases[TEXTCANVAS]);
-    }
-    
+
     /**
      * Gets the number of rows in this table.
-     * 
+     *
      * @return the number of rows in this table
-     */    
+     */
     public int size() {
         return rows.size();
     }
-    
+
     /**
      * Gets the total height of the table.
-     * 
+     *
      * @return the total height of the table
-     */    
+     */
     public float getTotalHeight() {
         return totalHeight;
     }
 
     /**
      * Gets the height of a particular row.
-     * 
+     *
      * @param idx the row index (starts at 0)
      * @return the height of a particular row
-     */    
+     */
     public float getRowHeight(int idx) {
         return getRowHeight(idx, false);
     }
 
     private void redistributeRowspanHeight() {
         float delta = 0.001f;
-        if (rows == null) return;
+        if (rows == null) {
+            return;
+        }
 
         for (int rowIdx = 0; rowIdx < rows.size(); rowIdx++) {
             PdfPRow row = rows.get(rowIdx);
 
-            if (row == null) continue;
+            if (row == null) {
+                continue;
+            }
 
             PdfPCell[] cells = row.getCells();
             for (PdfPCell cell : cells) {
@@ -878,7 +895,9 @@ private void redistributeRowspanHeight() {
                     for (int r = rowIdx; r < rows.size() && r < rowIdx + cell.getRowspan(); r++) {
                         PdfPRow currentRow = rows.get(r);
 
-                        if (currentRow == null) continue;
+                        if (currentRow == null) {
+                            continue;
+                        }
 
                         existingHeights += currentRow.getMaxHeights();
                     }
@@ -886,12 +905,16 @@ private void redistributeRowspanHeight() {
                     if (heightToDistribute > delta) {
                         ArrayList rowsByHeight = new ArrayList<>(cell.getRowspan());
                         for (int r = rowIdx; r < rows.size() && r < rowIdx + cell.getRowspan(); r++) {
-                            if(rows.get(r) == null) continue;
+                            if (rows.get(r) == null) {
+                                continue;
+                            }
                             rowsByHeight.add(r);
                         }
                         rowsByHeight.sort(Comparator.comparing(r -> rows.get(r).getMaxHeights()));
                         for (int i = 0; i < rowsByHeight.size(); i++) {
-                            if (heightToDistribute < delta) break;
+                            if (heightToDistribute < delta) {
+                                break;
+                            }
                             float additionalHeightPerRow = heightToDistribute / (i + 1);
                             if (i + 1 < rowsByHeight.size()) {
                                 float currentRowHeight = rows.get(rowsByHeight.get(i)).getMaxHeights();
@@ -899,7 +922,8 @@ private void redistributeRowspanHeight() {
                                 if (Math.abs(currentRowHeight - nextRowHeight) < delta) {
                                     continue;
                                 } else {
-                                    additionalHeightPerRow = Math.min(additionalHeightPerRow, nextRowHeight - currentRowHeight);
+                                    additionalHeightPerRow = Math.min(additionalHeightPerRow,
+                                            nextRowHeight - currentRowHeight);
                                 }
                             }
                             for (int j = 0; j <= i; j++) {
@@ -917,136 +941,148 @@ private void redistributeRowspanHeight() {
 
     /**
      * Gets the height of a particular row.
-     * 
-     * @param idx the row index (starts at 0)
-     * @param firsttime    is this the first time the row heigh is calculated?
+     *
+     * @param idx       the row index (starts at 0)
+     * @param firsttime is this the first time the row heigh is calculated?
      * @return the height of a particular row
-     * @since    5.0.0
-     */    
+     * @since 5.0.0
+     */
     public float getRowHeight(int idx, boolean firsttime) {
-        if (totalWidth <= 0 || idx < 0 || idx >= rows.size())
+        if (totalWidth <= 0 || idx < 0 || idx >= rows.size()) {
             return 0;
+        }
         PdfPRow row = rows.get(idx);
-        if (row == null)
+        if (row == null) {
             return 0;
+        }
         if (firsttime) {
             row.setWidths(absoluteWidths);
             row.calculateHeights();
         }
         return row.getMaxHeights();
     }
-    
+
     /**
-     * Gets the maximum height of a cell in a particular row (will only be different
-     * from getRowHeight is one of the cells in the row has a rowspan {@literal >} 1).
-     * 
-     * @param    rowIndex    the row index
-     * @param    cellIndex    the cell index
+     * Gets the maximum height of a cell in a particular row (will only be different from getRowHeight is one of the
+     * cells in the row has a rowspan {@literal >} 1).
+     *
+     * @param rowIndex  the row index
+     * @param cellIndex the cell index
      * @return the height of a particular row including rowspan
-     * @since    2.1.6
-     */    
+     * @since 2.1.6
+     */
     public float getRowspanHeight(int rowIndex, int cellIndex) {
-        if (totalWidth <= 0 || rowIndex < 0 || rowIndex >= rows.size())
+        if (totalWidth <= 0 || rowIndex < 0 || rowIndex >= rows.size()) {
             return 0;
+        }
         PdfPRow row = rows.get(rowIndex);
-        if (row == null || cellIndex >= row.getCells().length)
+        if (row == null || cellIndex >= row.getCells().length) {
             return 0;
+        }
         PdfPCell cell = row.getCells()[cellIndex];
-        if (cell == null)
+        if (cell == null) {
             return 0;
+        }
         float rowspanHeight = 0;
         for (int j = 0; j < cell.getRowspan(); j++) {
             rowspanHeight += getRowHeight(rowIndex + j);
         }
         return rowspanHeight;
     }
-    
+
     /**
      * Gets the height of the rows that constitute the header as defined by
      * setHeaderRows().
-     * 
+     *
      * @return the height of the rows that constitute the header and footer
-     */    
+     */
     public float getHeaderHeight() {
         float total = 0;
         int size = Math.min(rows.size(), headerRows);
         for (int k = 0; k < size; ++k) {
             PdfPRow row = rows.get(k);
-            if (row != null)
+            if (row != null) {
                 total += row.getMaxHeights();
+            }
         }
         return total;
     }
-    
+
     /**
      * Gets the height of the rows that constitute the footer as defined by
      * setFooterRows().
-     * 
+     *
      * @return the height of the rows that constitute the footer
      * @since 2.1.1
-     */    
+     */
     public float getFooterHeight() {
         float total = 0;
         int start = Math.max(0, headerRows - footerRows);
         int size = Math.min(rows.size(), headerRows);
         for (int k = start; k < size; ++k) {
             PdfPRow row = rows.get(k);
-            if (row != null)
+            if (row != null) {
                 total += row.getMaxHeights();
+            }
         }
         return total;
     }
-    
+
     /**
      * Deletes a row from the table.
-     * 
+     *
      * @param rowNumber the row to be deleted
      * @return true if the row was deleted
-     */    
+     */
     public boolean deleteRow(int rowNumber) {
-        if (rowNumber < 0 || rowNumber >= rows.size())
+        if (rowNumber < 0 || rowNumber >= rows.size()) {
             return false;
+        }
         if (totalWidth > 0) {
             PdfPRow row = rows.get(rowNumber);
-            if (row != null)
+            if (row != null) {
                 totalHeight -= row.getMaxHeights();
+            }
         }
         rows.remove(rowNumber);
         if (rowNumber < headerRows) {
             --headerRows;
-            if (rowNumber >= (headerRows - footerRows))
+            if (rowNumber >= (headerRows - footerRows)) {
                 --footerRows;
+            }
         }
         return true;
     }
-    
+
     /**
      * Deletes the last row in the table.
-     * 
+     *
      * @return true if the last row was deleted
-     */    
+     */
     public boolean deleteLastRow() {
         return deleteRow(rows.size() - 1);
     }
-    
+
     /**
      * Removes all of the rows except headers
      */
     public void deleteBodyRows() {
         ArrayList rows2 = new ArrayList<>();
-        for (int k = 0; k < headerRows; ++k)
+        for (int k = 0; k < headerRows; ++k) {
             rows2.add(rows.get(k));
+        }
         rows = rows2;
         totalHeight = 0;
-        if (totalWidth > 0)
+        if (totalWidth > 0) {
             totalHeight = getHeaderHeight();
+        }
     }
-    
+
     /**
      * Returns the number of columns.
-     * 
-     * @return    the number of columns.
-     * @since    2.1.1
+     *
+     * @return the number of columns.
+     * @since 2.1.1
      */
     public int getNumberOfColumns() {
         return relativeWidths.length;
@@ -1054,47 +1090,48 @@ public int getNumberOfColumns() {
 
     /**
      * Gets the number of the rows that constitute the header.
-     * 
+     *
      * @return the number of the rows that constitute the header
      */
     public int getHeaderRows() {
         return headerRows;
     }
-    
+
     /**
-     * Sets the number of the top rows that constitute the header.
-     * This header has only meaning if the table is added to Document
-     * and the table crosses pages.
-     * 
+     * Sets the number of the top rows that constitute the header. This header has only meaning if the table is added
+     * to
+     * Document and the table crosses pages.
+     *
      * @param headerRows the number of the top rows that constitute the header
      */
     public void setHeaderRows(int headerRows) {
-        if (headerRows < 0)
+        if (headerRows < 0) {
             headerRows = 0;
+        }
         this.headerRows = headerRows;
     }
-    
+
     /**
      * Gets all the chunks in this element.
      *
-     * @return    an ArrayList
+     * @return an ArrayList
      */
     public ArrayList getChunks() {
         return new ArrayList<>();
     }
-    
+
     /**
      * Gets the type of the text element.
      *
-     * @return    a type
+     * @return a type
      */
     public int type() {
         return Element.PTABLE;
     }
-    
+
     /**
      * @see com.lowagie.text.Element#isContent()
-     * @since    iText 2.0.8
+     * @since iText 2.0.8
      */
     public boolean isContent() {
         return true;
@@ -1102,37 +1139,36 @@ public boolean isContent() {
 
     /**
      * @see com.lowagie.text.Element#isNestable()
-     * @since    iText 2.0.8
+     * @since iText 2.0.8
      */
     public boolean isNestable() {
         return true;
     }
-    
+
     /**
      * Processes the element by adding it (or the different parts) to an
      * ElementListener.
      *
-     * @param    listener    an ElementListener
-     * @return    true if the element was processed successfully
+     * @param listener an ElementListener
+     * @return true if the element was processed successfully
      */
     public boolean process(ElementListener listener) {
         try {
             return listener.add(this);
-        }
-        catch(DocumentException de) {
+        } catch (DocumentException de) {
             return false;
         }
     }
-    
+
     /**
      * Gets the width percentage that the table will occupy in the page.
-     * 
+     *
      * @return the width percentage that the table will occupy in the page
      */
     public float getWidthPercentage() {
         return widthPercentage;
     }
-    
+
     /**
      * Sets the width percentage that the table will occupy in the page.
      *
@@ -1141,31 +1177,29 @@ public float getWidthPercentage() {
     public void setWidthPercentage(float widthPercentage) {
         this.widthPercentage = widthPercentage;
     }
-    
+
     /**
      * Gets the horizontal alignment of the table relative to the page.
-     * 
+     *
      * @return the horizontal alignment of the table relative to the page
      */
     public int getHorizontalAlignment() {
         return horizontalAlignment;
     }
-    
+
     /**
-     * Sets the horizontal alignment of the table relative to the page.
-     * It only has meaning if the width percentage is less than 100%.
+     * Sets the horizontal alignment of the table relative to the page. It only has meaning if the width percentage is
+     * less than 100%.
      *
-     * @param horizontalAlignment the horizontal alignment of the table
-     * relative to the page
+     * @param horizontalAlignment the horizontal alignment of the table relative to the page
      */
     public void setHorizontalAlignment(int horizontalAlignment) {
         this.horizontalAlignment = horizontalAlignment;
     }
-    
+
     /**
-     * Gets a row with a given index
-     * (added by Jin-Hsia Yang).
-     * 
+     * Gets a row with a given index (added by Jin-Hsia Yang).
+     *
      * @param idx the position of the row to get
      * @return the row at position idx
      */
@@ -1175,19 +1209,20 @@ public PdfPRow getRow(int idx) {
 
     /**
      * Gets an arraylist with all the rows in the table.
-     * 
+     *
      * @return an arraylist
      */
     public ArrayList getRows() {
         return rows;
     }
-    
+
     /**
      * Gets an arraylist with a selection of rows.
-     * @param    start    the first row in the selection
-     * @param    end     the first row that isn't part of the selection
-     * @return    a selection of rows
-     * @since    2.1.6
+     *
+     * @param start the first row in the selection
+     * @param end   the first row that isn't part of the selection
+     * @return a selection of rows
+     * @since 2.1.6
      */
     public ArrayList getRows(int start, int end) {
         ArrayList list = new ArrayList<>();
@@ -1212,17 +1247,18 @@ public ArrayList getRows(int start, int end) {
                         }
                         firstRow.setExtraHeight(colIndex, extra);
                         float diff = getRowspanHeight(rowIndex, colIndex)
-                            - getRowHeight(start) - extra;
+                                - getRowHeight(start) - extra;
                         firstRow.getCells()[colIndex].consumeHeight(diff);
                     }
                 }
             }
-            if(firstRow != null) {
+            if (firstRow != null) {
                 cell = firstRow.getCells()[colIndex];
-                if (cell == null)
+                if (cell == null) {
                     colIndex++;
-                else
+                } else {
                     colIndex += cell.getColspan();
+                }
             }
         }
         list.add(firstRow);
@@ -1231,25 +1267,29 @@ public ArrayList getRows(int start, int end) {
         }
         return list;
     }
-    
+
     /**
      * Calculates the extra height needed in a row because of rowspans.
-     * @param    start    the index of the start row (the one to adjust)
-     * @param    end        the index of the end row on the page
-     * @since    2.1.6
+     *
+     * @param start the index of the start row (the one to adjust)
+     * @param end   the index of the end row on the page
      * @return a PdfRow
+     * @since 2.1.6
      */
     protected PdfPRow adjustCellsInRow(int start, int end) {
         PdfPRow sourceRow = getRow(start);
-        if(sourceRow == null) return null;
+        if (sourceRow == null) {
+            return null;
+        }
         PdfPRow row = new PdfPRow(sourceRow);
         row.initExtraHeights();
         PdfPCell cell;
         PdfPCell[] cells = row.getCells();
         for (int i = 0; i < cells.length; i++) {
             cell = cells[i];
-            if (cell == null || cell.getRowspan() == 1)
+            if (cell == null || cell.getRowspan() == 1) {
                 continue;
+            }
             int stop = Math.min(end, start + cell.getRowspan());
             float extra = 0;
             for (int k = start + 1; k < stop; k++) {
@@ -1260,43 +1300,45 @@ protected PdfPRow adjustCellsInRow(int start, int end) {
         return row;
     }
 
-    /** Sets the table event for this table.
+    /**
+     * Gets the table event for this page.
+     *
+     * @return the table event for this page
+     */
+    public PdfPTableEvent getTableEvent() {
+        return tableEvent;
+    }
+
+    /**
+     * Sets the table event for this table.
+     *
      * @param event the table event for this table
-     */    
+     */
     public void setTableEvent(PdfPTableEvent event) {
-        if (event == null)
+        if (event == null) {
             this.tableEvent = null;
-        else if (this.tableEvent == null)
+        } else if (this.tableEvent == null) {
             this.tableEvent = event;
-        else if (this.tableEvent instanceof PdfPTableEventForwarder)
-            ((PdfPTableEventForwarder)this.tableEvent).addTableEvent(event);
-        else {
+        } else if (this.tableEvent instanceof PdfPTableEventForwarder) {
+            ((PdfPTableEventForwarder) this.tableEvent).addTableEvent(event);
+        } else {
             PdfPTableEventForwarder forward = new PdfPTableEventForwarder();
             forward.addTableEvent(this.tableEvent);
             forward.addTableEvent(event);
             this.tableEvent = forward;
         }
     }
-    
-    /**
-     * Gets the table event for this page.
-     * 
-     * @return the table event for this page
-     */    
-    public PdfPTableEvent getTableEvent() {
-        return tableEvent;
-    }
-    
+
     /**
      * Gets the absolute sizes of each column width.
-     * 
+     *
      * @return he absolute sizes of each column width
-     */    
+     */
     public float[] getAbsoluteWidths() {
         return absoluteWidths;
     }
-    
-    float [][] getEventWidths(float xPos, int firstRow, int lastRow, boolean includeHeaders) {
+
+    float[][] getEventWidths(float xPos, int firstRow, int lastRow, boolean includeHeaders) {
         if (includeHeaders) {
             firstRow = Math.max(firstRow, headerRows);
             lastRow = Math.max(lastRow, headerRows);
@@ -1307,83 +1349,93 @@ public float[] getAbsoluteWidths() {
             if (includeHeaders) {
                 for (int k = 0; k < headerRows; ++k) {
                     PdfPRow row = rows.get(k);
-                    if (row == null)
+                    if (row == null) {
                         ++n;
-                    else
+                    } else {
                         widths[n++] = row.getEventWidth(xPos);
+                    }
                 }
             }
             for (; firstRow < lastRow; ++firstRow) {
-                    PdfPRow row = rows.get(firstRow);
-                    if (row == null)
-                        ++n;
-                    else
-                        widths[n++] = row.getEventWidth(xPos);
+                PdfPRow row = rows.get(firstRow);
+                if (row == null) {
+                    ++n;
+                } else {
+                    widths[n++] = row.getEventWidth(xPos);
+                }
             }
-        }
-        else {
+        } else {
             int numCols = getNumberOfColumns();
             float[] width = new float[numCols + 1];
             width[0] = xPos;
-            for (int k = 0; k < numCols; ++k)
+            for (int k = 0; k < numCols; ++k) {
                 width[k + 1] = width[k] + absoluteWidths[k];
-            for (int k = 0; k < widths.length; ++k)
+            }
+            for (int k = 0; k < widths.length; ++k) {
                 widths[k] = width;
+            }
         }
         return widths;
     }
 
 
     /**
-     * Tells you if the first header needs to be skipped
-     * (for instance if the header says "continued from the previous page").
-     * 
+     * Tells you if the first header needs to be skipped (for instance if the header says "continued from the previous
+     * page").
+     *
      * @return Value of property skipFirstHeader.
      */
     public boolean isSkipFirstHeader() {
         return skipFirstHeader;
     }
 
+    /**
+     * Skips the printing of the first header. Used when printing tables in succession belonging to the same printed
+     * table aspect.
+     *
+     * @param skipFirstHeader New value of property skipFirstHeader.
+     */
+    public void setSkipFirstHeader(boolean skipFirstHeader) {
+        this.skipFirstHeader = skipFirstHeader;
+    }
 
     /**
-     * Tells you if the last footer needs to be skipped
-     * (for instance if the footer says "continued on the next page")
-     * 
+     * Tells you if the last footer needs to be skipped (for instance if the footer says "continued on the next page")
+     *
      * @return Value of property skipLastFooter.
-     * @since    2.1.6
+     * @since 2.1.6
      */
     public boolean isSkipLastFooter() {
         return skipLastFooter;
     }
-    
-    /**
-     * Skips the printing of the first header. Used when printing
-     * tables in succession belonging to the same printed table aspect.
-     * 
-     * @param skipFirstHeader New value of property skipFirstHeader.
-     */
-    public void setSkipFirstHeader(boolean skipFirstHeader) {
-        this.skipFirstHeader = skipFirstHeader;
-    }
-    
+
     /**
-     * Skips the printing of the last footer. Used when printing
-     * tables in succession belonging to the same printed table aspect.
-     * 
+     * Skips the printing of the last footer. Used when printing tables in succession belonging to the same printed
+     * table aspect.
+     *
      * @param skipLastFooter New value of property skipLastFooter.
-     * @since    2.1.6
+     * @since 2.1.6
      */
     public void setSkipLastFooter(boolean skipLastFooter) {
         this.skipLastFooter = skipLastFooter;
     }
 
     /**
-     * Sets the run direction of the contents of the table.
-     * 
-     * @param runDirection One of the following values:
-     * PdfWriter.RUN_DIRECTION_DEFAULT, PdfWriter.RUN_DIRECTION_NO_BIDI,
+     * Returns the run direction of the contents in the table.
+     *
+     * @return One of the following values: PdfWriter.RUN_DIRECTION_DEFAULT, PdfWriter.RUN_DIRECTION_NO_BIDI,
      * PdfWriter.RUN_DIRECTION_LTR or PdfWriter.RUN_DIRECTION_RTL.
      */
+    public int getRunDirection() {
+        return runDirection;
+    }
+
+    /**
+     * Sets the run direction of the contents of the table.
+     *
+     * @param runDirection One of the following values: PdfWriter.RUN_DIRECTION_DEFAULT,
+     *                     PdfWriter.RUN_DIRECTION_NO_BIDI, PdfWriter.RUN_DIRECTION_LTR or PdfWriter.RUN_DIRECTION_RTL.
+     */
     public void setRunDirection(int runDirection) {
         switch (runDirection) {
             case PdfWriter.RUN_DIRECTION_DEFAULT:
@@ -1393,120 +1445,108 @@ public void setRunDirection(int runDirection) {
                 this.runDirection = runDirection;
                 break;
             default:
-                throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.run.direction.1", runDirection));
+                throw new RuntimeException(
+                        MessageLocalization.getComposedMessage("invalid.run.direction.1", runDirection));
         }
     }
-    
-    /**
-     * Returns the run direction of the contents in the table.
-     * 
-     * @return One of the following values:
-     * PdfWriter.RUN_DIRECTION_DEFAULT, PdfWriter.RUN_DIRECTION_NO_BIDI,
-     * PdfWriter.RUN_DIRECTION_LTR or PdfWriter.RUN_DIRECTION_RTL.
-     */
-    public int getRunDirection() {
-        return runDirection;
-    }
-    
+
     /**
      * Getter for property lockedWidth.
-     * 
+     *
      * @return Value of property lockedWidth.
      */
     public boolean isLockedWidth() {
         return this.lockedWidth;
     }
-    
+
     /**
      * Uses the value in setTotalWidth() in Document.add().
-     * 
-     * @param lockedWidth true to use the value in setTotalWidth() in Document.add()
+     *
+     * @param lockedWidth true to use the value in setTotalWidth() in
+     *                    Document.add()
      */
     public void setLockedWidth(boolean lockedWidth) {
         this.lockedWidth = lockedWidth;
     }
-    
+
     /**
      * Gets the split value.
-     * 
+     *
      * @return true to split; false otherwise
      */
     public boolean isSplitRows() {
         return this.splitRows;
     }
-    
+
     /**
-     * When set the rows that won't fit in the page will be split. 
-     * Note that it takes at least twice the memory to handle a split table row
-     * than a normal table. true by default.
-     * 
+     * When set the rows that won't fit in the page will be split. Note that it takes at least twice the memory to
+     * handle a split table row than a normal table. true by default.
+     *
      * @param splitRows true to split; false otherwise
      */
     public void setSplitRows(boolean splitRows) {
         this.splitRows = splitRows;
     }
-    
+
     /**
      * Sets the spacing before this table.
      *
-     * @param    spacing        the new spacing
+     * @param spacing the new spacing
      */
     public void setSpacingBefore(float spacing) {
         this.spacingBefore = spacing;
     }
-    
+
     /**
      * Sets the spacing after this table.
      *
-     * @param    spacing        the new spacing
+     * @param spacing the new spacing
      */
     public void setSpacingAfter(float spacing) {
         this.spacingAfter = spacing;
-    }    
+    }
 
     /**
      * Gets the spacing before this table.
      *
-     * @return    the spacing
+     * @return the spacing
      */
     public float spacingBefore() {
         return spacingBefore;
     }
-    
+
     /**
      * Gets the spacing after this table.
      *
-     * @return    the spacing
+     * @return the spacing
      */
     public float spacingAfter() {
         return spacingAfter;
-    }    
-    
+    }
+
     /**
      * Gets the value of the last row extension.
-     * 
+     *
      * @return true if the last row will extend; false otherwise
      */
     public boolean isExtendLastRow() {
         return extendLastRow[0];
     }
-    
+
     /**
-     * When set the last row on every page will be extended to fill
-     * all the remaining space to the bottom boundary.
-     * 
+     * When set the last row on every page will be extended to fill all the remaining space to the bottom boundary.
+     *
      * @param extendLastRows true to extend the last row; false otherwise
      */
     public void setExtendLastRow(boolean extendLastRows) {
         extendLastRow[0] = extendLastRows;
         extendLastRow[1] = extendLastRows;
     }
-    
+
     /**
-     * When set the last row on every page will be extended to fill
-     * all the remaining space to the bottom boundary; except maybe the
-     * final row.
-     * 
+     * When set the last row on every page will be extended to fill all the remaining space to the bottom boundary;
+     * except maybe the final row.
+     *
      * @param extendLastRows true to extend the last row on each page; false otherwise
      * @param extendFinalRow false if you don't want to extend the final row of the complete table
      * @since iText 5.0.0
@@ -1515,10 +1555,9 @@ public void setExtendLastRow(boolean extendLastRows, boolean extendFinalRow) {
         extendLastRow[0] = extendLastRows;
         extendLastRow[1] = extendFinalRow;
     }
-    
+
     /**
-     * Gets the value of the last row extension, taking into account
-     * if the final row is reached or not.
+     * Gets the value of the last row extension, taking into account if the final row is reached or not.
      *
      * @param newPageFollows true if a new page follows, false otherwise
      * @return true if the last row will extend; false otherwise
@@ -1526,112 +1565,107 @@ public void setExtendLastRow(boolean extendLastRows, boolean extendFinalRow) {
      */
     public boolean isExtendLastRow(boolean newPageFollows) {
         if (newPageFollows) {
-            return extendLastRow[0];    
+            return extendLastRow[0];
         }
         return extendLastRow[1];
     }
 
     /**
      * Gets the header status inclusion in PdfPTableEvent.
-     * 
+     *
      * @return true if the headers are included; false otherwise
      */
     public boolean isHeadersInEvent() {
         return headersInEvent;
     }
-    
+
     /**
      * When set the PdfPTableEvent will include the headers.
-     * 
+     *
      * @param headersInEvent true to include the headers; false otherwise
      */
     public void setHeadersInEvent(boolean headersInEvent) {
         this.headersInEvent = headersInEvent;
     }
-    
+
     /**
      * Gets the property splitLate.
-     * 
+     *
      * @return the property splitLate
      */
     public boolean isSplitLate() {
         return splitLate;
     }
-    
+
     /**
-     * If true the row will only split if it's the first one in an empty page.
-     * It's true by default.
-     * It's only meaningful if setSplitRows(true).
-     * 
+     * If true the row will only split if it's the first one in an empty page. It's true by default. It's only
+     * meaningful if setSplitRows(true).
+     *
      * @param splitLate the property value
      */
     public void setSplitLate(boolean splitLate) {
         this.splitLate = splitLate;
     }
-    
+
     /**
-     * If true the table will be kept on one page if it fits, by forcing a 
-     * new page if it doesn't fit on the current page. The default is to
-     * split the table over multiple pages.
+     * Getter for property keepTogether
      *
-     * @param keepTogether whether to try to keep the table on one page
+     * @return true if it is tried to keep the table on one page; false otherwise
      */
-    public void setKeepTogether(boolean keepTogether) {
-        this.keepTogether = keepTogether;
+    public boolean getKeepTogether() {
+        return keepTogether;
     }
-    
+
     /**
-     * Getter for property keepTogether
-     * 
-     * @return true if it is tried to keep the table on one page;
-     * false otherwise
+     * If true the table will be kept on one page if it fits, by forcing a new page if it doesn't fit on the current
+     * page. The default is to split the table over multiple pages.
+     *
+     * @param keepTogether whether to try to keep the table on one page
      */
-    public boolean getKeepTogether() {
-        return keepTogether;
+    public void setKeepTogether(boolean keepTogether) {
+        this.keepTogether = keepTogether;
     }
-    
+
     /**
      * Gets the number of rows in the footer.
-     * 
+     *
      * @return the number of rows in the footer
      */
     public int getFooterRows() {
         return this.footerRows;
     }
-    
+
     /**
-     * Sets the number of rows to be used for the footer. The number
-     * of footer rows are subtracted from the header rows. For
-     * example, for a table with two header rows and one footer row the
-     * code would be:
+     * Sets the number of rows to be used for the footer. The number of footer rows are subtracted from the header rows.
+     * For example, for a table with two header rows and one footer row the code would be:
      * 
              * table.setHeaderRows(3);
      * table.setFooterRows(1);
      * 
        
      * Row 0 and 1 will be the header rows and row 2 will be the footer row.
-     * 
+     *
      * @param footerRows the number of rows to be used for the footer
      */
     public void setFooterRows(int footerRows) {
-        if (footerRows < 0)
+        if (footerRows < 0) {
             footerRows = 0;
+        }
         this.footerRows = footerRows;
     }
-    
+
     /**
-     * Completes the current row with the default cell. An incomplete row will
-     * be dropped but calling this method will make sure that it will be
-     * present in the table.
+     * Completes the current row with the default cell. An incomplete row will be dropped but calling this method will
+     * make sure that it will be present in the table.
      */
     public void completeRow() {
         while (!rowCompleted) {
             addCell(defaultCell);
         }
     }
-    
+
     /**
-     * @since    iText 2.0.8
      * @see com.lowagie.text.LargeElement#flushContent()
+     * @since iText 2.0.8
      */
     public void flushContent() {
         deleteBodyRows();
@@ -1639,16 +1673,16 @@ public void flushContent() {
     }
 
     /**
-     * @since    iText 2.0.8
      * @see com.lowagie.text.LargeElement#isComplete()
+     * @since iText 2.0.8
      */
     public boolean isComplete() {
         return complete;
     }
 
     /**
-     * @since    iText 2.0.8
      * @see com.lowagie.text.LargeElement#setComplete(boolean)
+     * @since iText 2.0.8
      */
     public void setComplete(boolean complete) {
         this.complete = complete;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPTableEvent.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPTableEvent.java
index bcfff8f17..914ffa77b 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPTableEvent.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPTableEvent.java
@@ -49,14 +49,16 @@
 
 package com.lowagie.text.pdf;
 
-/** An interface that can be used to retrieve the position of cells in PdfPTable.
+/**
+ * An interface that can be used to retrieve the position of cells in PdfPTable.
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public interface PdfPTableEvent {
-    
-    /** This method is called at the end of the table rendering. The text or graphics are added to
-     * one of the 4 PdfContentByte contained in
+
+    /**
+     * This method is called at the end of the table rendering. The text or graphics are added to one of the 4
+     * PdfContentByte contained in
      * canvases.
        
      * The indexes to canvases are:
      * 
          
@@ -73,21 +75,21 @@ public interface PdfPTableEvent {
      * The size of the widths array is the number of rows.
      * Each sub-array in widths corresponds to the x column border positions where
      * the first element is the x coordinate of the left table border and the last
-     * element is the x coordinate of the right table border. 
+     * element is the x coordinate of the right table border.
      * If colspan is not used all the sub-arrays in widths
      * are the same.
          
      * For the heights the first element is the y coordinate of the top table border and the last
      * element is the y coordinate of the bottom table border.
-     * @param table the PdfPTable in use
-     * @param widths an array of arrays with the cells' x positions. It has the length of the number
-     * of rows
-     * @param heights an array with the cells' y positions. It has a length of the number
-     * of rows + 1
+     *
+     * @param table      the PdfPTable in use
+     * @param widths     an array of arrays with the cells' x positions. It has the length of the number of rows
+     * @param heights    an array with the cells' y positions. It has a length of the number of rows + 1
      * @param headerRows the number of rows defined for the header.
-     * @param rowStart the first row number after the header
-     * @param canvases an array of PdfContentByte
+     * @param rowStart   the first row number after the header
+     * @param canvases   an array of PdfContentByte
      */
-    void tableLayout(PdfPTable table, float[][] widths, float[] heights, int headerRows, int rowStart, PdfContentByte[] canvases);
+    void tableLayout(PdfPTable table, float[][] widths, float[] heights, int headerRows, int rowStart,
+            PdfContentByte[] canvases);
 
 }
 
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPage.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPage.java
index a39bc77dc..ca3ebd02b 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPage.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPage.java
@@ -53,124 +53,120 @@
 
 /**
  * PdfPage is the PDF Page-object.
- * 
          
- * A Page object is a dictionary whose keys describe a single page containing text, graphics, and images. A Page object is a leaf of the
- * Pages tree.
           This object is described in the 'Portable Document Format Reference Manual version 1.3' section 6.4 (page 73-81)
+ * 
          
+ * A Page object is a dictionary whose keys describe a single page containing text, graphics, and images. A Page object
+ * is a leaf of the Pages tree.
           This object is described in the 'Portable Document Format Reference Manual version
+ * 1.3' section 6.4 (page 73-81)
  *
- * @see    PdfPages
+ * @see PdfPages
  */
 
 public class PdfPage extends PdfDictionary {
 
+    /**
+     * value of the Rotate key for a page in PORTRAIT
+     */
+    public static final PdfNumber PORTRAIT = new PdfNumber(0);
+    /**
+     * value of the Rotate key for a page in LANDSCAPE
+     */
+    public static final PdfNumber LANDSCAPE = new PdfNumber(90);
+    // membervariables
+    /**
+     * value of the Rotate key for a page in INVERTEDPORTRAIT
+     */
+    public static final PdfNumber INVERTEDPORTRAIT = new PdfNumber(180);
+    /**
+     * value of the Rotate key for a page in SEASCAPE
+     */
+    public static final PdfNumber SEASCAPE = new PdfNumber(270);
     private static final String[] boxStrings = {"crop", "trim", "art", "bleed"};
     private static final PdfName[] boxNames = {PdfName.CROPBOX, PdfName.TRIMBOX, PdfName.ARTBOX, PdfName.BLEEDBOX};
-  // membervariables
-
-  /**
-   * value of the Rotate key for a page in PORTRAIT
-   */
-  public static final PdfNumber PORTRAIT = new PdfNumber(0);
-
-  /**
-   * value of the Rotate key for a page in LANDSCAPE
-   */
-  public static final PdfNumber LANDSCAPE = new PdfNumber(90);
-
-  /**
-   * value of the Rotate key for a page in INVERTEDPORTRAIT
-   */
-  public static final PdfNumber INVERTEDPORTRAIT = new PdfNumber(180);
-
-  /**
-   * value of the Rotate key for a page in SEASCAPE
-   */
-  public static final PdfNumber SEASCAPE = new PdfNumber(270);
-
-  /**
-   * value of the MediaBox key
-   */
-  PdfRectangle mediaBox;
-
-  // constructors
-
-  /**
-   * Constructs a PdfPage.
-   *
-   * @param    mediaBox    a value for the MediaBox key
-   * @param    resources    an indirect reference to a PdfResources-object
-   * @param    rotate      a value for the Rotate key
-   */
-
-  PdfPage(PdfRectangle mediaBox, HashMap boxSize, PdfDictionary resources, int rotate) {
-    super(PAGE);
-    this.mediaBox = mediaBox;
-    put(PdfName.MEDIABOX, mediaBox);
-    put(PdfName.RESOURCES, resources);
-    if (rotate != 0) {
-      put(PdfName.ROTATE, new PdfNumber(rotate));
+    /**
+     * value of the MediaBox key
+     */
+    PdfRectangle mediaBox;
+
+    // constructors
+
+    /**
+     * Constructs a PdfPage.
+     *
+     * @param mediaBox  a value for the MediaBox key
+     * @param resources an indirect reference to a PdfResources-object
+     * @param rotate    a value for the Rotate key
+     */
+
+    PdfPage(PdfRectangle mediaBox, HashMap boxSize, PdfDictionary resources, int rotate) {
+        super(PAGE);
+        this.mediaBox = mediaBox;
+        put(PdfName.MEDIABOX, mediaBox);
+        put(PdfName.RESOURCES, resources);
+        if (rotate != 0) {
+            put(PdfName.ROTATE, new PdfNumber(rotate));
+        }
+        for (int k = 0; k < boxStrings.length; ++k) {
+            PdfObject rect = boxSize.get(boxStrings[k]);
+            if (rect != null) {
+                put(boxNames[k], rect);
+            }
+        }
     }
-    for (int k = 0; k < boxStrings.length; ++k) {
-      PdfObject rect = boxSize.get(boxStrings[k]);
-      if (rect != null) {
-        put(boxNames[k], rect);
-      }
+
+    /**
+     * Constructs a PdfPage.
+     *
+     * @param mediaBox  a value for the MediaBox key
+     * @param resources an indirect reference to a PdfResources-object
+     */
+
+    PdfPage(PdfRectangle mediaBox, HashMap boxSize, PdfDictionary resources) {
+        this(mediaBox, boxSize, resources, 0);
+    }
+
+    /**
+     * Checks if this page element is a tree of pages.
+     * 
          
+     * This method always returns false.
+     *
+     * @return false because this is a single page
+     */
+
+    public boolean isParent() {
+        return false;
+    }
+
+    // methods
+
+    /**
+     * Adds an indirect reference pointing to a PdfContents-object.
+     *
+     * @param contents an indirect reference to a PdfContents-object
+     */
+
+    void add(PdfIndirectReference contents) {
+        put(PdfName.CONTENTS, contents);
+    }
+
+    /**
+     * Rotates the mediabox, but not the text in it.
+     *
+     * @return a PdfRectangle
+     */
+
+    PdfRectangle rotateMediaBox() {
+        this.mediaBox = mediaBox.rotate();
+        put(PdfName.MEDIABOX, this.mediaBox);
+        return this.mediaBox;
+    }
+
+    /**
+     * Returns the MediaBox of this Page.
+     *
+     * @return a PdfRectangle
+     */
+
+    PdfRectangle getMediaBox() {
+        return mediaBox;
     }
-  }
-
-  /**
-   * Constructs a PdfPage.
-   *
-   * @param    mediaBox    a value for the MediaBox key
-   * @param    resources    an indirect reference to a PdfResources-object
-   */
-
-  PdfPage(PdfRectangle mediaBox, HashMap boxSize, PdfDictionary resources) {
-    this(mediaBox, boxSize, resources, 0);
-  }
-
-  /**
-   * Checks if this page element is a tree of pages.
-   * 
          
-   * This method always returns false.
-   *
-   * @return  false because this is a single page
-   */
-
-  public boolean isParent() {
-    return false;
-  }
-
-  // methods
-
-  /**
-   * Adds an indirect reference pointing to a PdfContents-object.
-   *
-   * @param    contents    an indirect reference to a PdfContents-object
-   */
-
-  void add(PdfIndirectReference contents) {
-    put(PdfName.CONTENTS, contents);
-  }
-
-  /**
-   * Rotates the mediabox, but not the text in it.
-   *
-   * @return a PdfRectangle
-   */
-
-  PdfRectangle rotateMediaBox() {
-    this.mediaBox = mediaBox.rotate();
-    put(PdfName.MEDIABOX, this.mediaBox);
-    return this.mediaBox;
-  }
-
-  /**
-   * Returns the MediaBox of this Page.
-   *
-   * @return a PdfRectangle
-   */
-
-  PdfRectangle getMediaBox() {
-    return mediaBox;
-  }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageElement.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageElement.java
index 1497e2982..9bd6196c0 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageElement.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageElement.java
@@ -52,26 +52,26 @@
 /**
  * The PdfPageElement interface has to be implemented by PdfPage and PdfPages.
  *
- * @see        PdfPage
- * @see        PdfPages
+ * @see PdfPage
+ * @see PdfPages
  */
 
 interface PdfPageElement {
-    
-/**
- * Set the value for the Parent key in the Page or Pages Dictionary.
- *
- * @param    reference            an indirect reference to a PdfPages-object
- */
 
-void setParent(PdfIndirectReference reference);
-    
-/**
- * Checks if this page element is a tree of pages.
- *
- * @return    true if it's a tree of pages;
- *            false if it's a single page
- */
+    /**
+     * Checks if this page element is a tree of pages.
+     *
+     * @return true if it's a tree of pages;
+     * false if it's a single page
+     */
+
+    boolean isParent();
+
+    /**
+     * Set the value for the Parent key in the Page or Pages Dictionary.
+     *
+     * @param reference an indirect reference to a PdfPages-object
+     */
 
-boolean isParent();
+    void setParent(PdfIndirectReference reference);
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageEvent.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageEvent.java
index 92f3eb3eb..56b7e66f2 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageEvent.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageEvent.java
@@ -48,142 +48,139 @@
  */
 
 package com.lowagie.text.pdf;
+
 import com.lowagie.text.Document;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Rectangle;
 
 /**
  * Allows a class to catch several document events.
- *
          
+ * 
          
  * Note: do not use Document.add() inside a page event.
  *
- * @author  Paulo Soares (psoares@consiste.pt)
+ * @author Paulo Soares (psoares@consiste.pt)
  */
 
 public interface PdfPageEvent {
-    
-/**
- * Called when the document is opened.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- */
-void onOpenDocument(PdfWriter writer, Document document);
-    
-/**
- * Called when a page is initialized.
- * 
          
- * Note that if even if a page is not written this method is still
- * called. It is preferable to use onEndPage to avoid
- * infinite loops.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- */
-void onStartPage(PdfWriter writer, Document document);
-    
-/**
- * Called when a page is finished, just before being written to the document.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- */
-void onEndPage(PdfWriter writer, Document document);
-    
-/**
- * Called when the document is closed.
- * 
          
- * Note that this method is called with the page number equal
- * to the last page plus one.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- */
-void onCloseDocument(PdfWriter writer, Document document);
-    
-/**
- * Called when a Paragraph is written.
- * 
          
- * paragraphPosition will hold the height at which the
- * paragraph will be written to. This is useful to insert bookmarks with
- * more control.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- * @param paragraphPosition the position the paragraph will be written to
- */
-void onParagraph(PdfWriter writer, Document document, float paragraphPosition);
-    
-/**
- * Called when a Paragraph is written.
- * 
          
- * paragraphPosition will hold the height of the end of the paragraph.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- * @param paragraphPosition the position of the end of the paragraph
- */
-void onParagraphEnd(PdfWriter writer, Document document, float paragraphPosition);
-    
-/**
- * Called when a Chapter is written.
- * 
          
- * position will hold the height at which the
- * chapter will be written to.
- *
- * @param writer            the PdfWriter for this document
- * @param document          the document
- * @param paragraphPosition the position the chapter will be written to
- * @param title             the title of the Chapter
- */
-void onChapter(PdfWriter writer, Document document, float paragraphPosition, Paragraph title);
-    
-/**
- * Called when the end of a Chapter is reached.
- * 
          
- * position will hold the height of the end of the chapter.
- *
- * @param writer            the PdfWriter for this document
- * @param document          the document
- * @param paragraphPosition the position the chapter will be written to
- */
-void onChapterEnd(PdfWriter writer, Document document, float paragraphPosition);
-    
-/**
- * Called when a Section is written.
- * 
          
- * position will hold the height at which the
- * section will be written to.
- *
- * @param writer            the PdfWriter for this document
- * @param document          the document
- * @param paragraphPosition the position the section will be written to
- * @param depth                the number depth of the section
- * @param title             the title of the section
- */
-void onSection(PdfWriter writer, Document document, float paragraphPosition, int depth, Paragraph title);
-    
-/**
- * Called when the end of a Section is reached.
- * 
          
- * position will hold the height of the section end.
- *
- * @param writer            the PdfWriter for this document
- * @param document          the document
- * @param paragraphPosition the position the section will be written to
- */
-void onSectionEnd(PdfWriter writer, Document document, float paragraphPosition);
-    
-/**
- * Called when a Chunk with a generic tag is written.
- * 
          
- * It is useful to pinpoint the Chunk location to generate
- * bookmarks, for example.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- * @param rect the Rectangle containing the Chunk
- * @param text the text of the tag
- */
-void onGenericTag(PdfWriter writer, Document document, Rectangle rect, String text);
+
+    /**
+     * Called when the document is opened.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     */
+    void onOpenDocument(PdfWriter writer, Document document);
+
+    /**
+     * Called when a page is initialized.
+     * 
          
+     * Note that if even if a page is not written this method is still called. It is preferable to use
+     * onEndPage to avoid infinite loops.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     */
+    void onStartPage(PdfWriter writer, Document document);
+
+    /**
+     * Called when a page is finished, just before being written to the document.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     */
+    void onEndPage(PdfWriter writer, Document document);
+
+    /**
+     * Called when the document is closed.
+     * 
          
+     * Note that this method is called with the page number equal to the last page plus one.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     */
+    void onCloseDocument(PdfWriter writer, Document document);
+
+    /**
+     * Called when a Paragraph is written.
+     * 
          
+     * paragraphPosition will hold the height at which the
+     * paragraph will be written to. This is useful to insert bookmarks with more control.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the paragraph will be written to
+     */
+    void onParagraph(PdfWriter writer, Document document, float paragraphPosition);
+
+    /**
+     * Called when a Paragraph is written.
+     * 
          
+     * paragraphPosition will hold the height of the end of the paragraph.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position of the end of the paragraph
+     */
+    void onParagraphEnd(PdfWriter writer, Document document, float paragraphPosition);
+
+    /**
+     * Called when a Chapter is written.
+     * 
          
+     * position will hold the height at which the
+     * chapter will be written to.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the chapter will be written to
+     * @param title             the title of the Chapter
+     */
+    void onChapter(PdfWriter writer, Document document, float paragraphPosition, Paragraph title);
+
+    /**
+     * Called when the end of a Chapter is reached.
+     * 
          
+     * position will hold the height of the end of the chapter.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the chapter will be written to
+     */
+    void onChapterEnd(PdfWriter writer, Document document, float paragraphPosition);
+
+    /**
+     * Called when a Section is written.
+     * 
          
+     * position will hold the height at which the
+     * section will be written to.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the section will be written to
+     * @param depth             the number depth of the section
+     * @param title             the title of the section
+     */
+    void onSection(PdfWriter writer, Document document, float paragraphPosition, int depth, Paragraph title);
+
+    /**
+     * Called when the end of a Section is reached.
+     * 
          
+     * position will hold the height of the section end.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the section will be written to
+     */
+    void onSectionEnd(PdfWriter writer, Document document, float paragraphPosition);
+
+    /**
+     * Called when a Chunk with a generic tag is written.
+     * 
          
+     * It is useful to pinpoint the Chunk location to generate bookmarks, for example.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     * @param rect     the Rectangle containing the Chunk
+     * @param text     the text of the tag
+     */
+    void onGenericTag(PdfWriter writer, Document document, Rectangle rect, String text);
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageEventHelper.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageEventHelper.java
index a4d9991cf..e29f74010 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageEventHelper.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageEventHelper.java
@@ -48,154 +48,151 @@
  */
 
 package com.lowagie.text.pdf;
+
 import com.lowagie.text.Document;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Rectangle;
 
 /**
- * Helps the use of PdfPageEvent by implementing all the interface methods.
- * A class can extend PdfPageEventHelper and only implement the
- * needed methods.
- *
          
+ * Helps the use of PdfPageEvent by implementing all the interface methods. A class can extend
+ * PdfPageEventHelper and only implement the needed methods.
+ * 
          
  * Note: do not use Document.add() inside a page event.
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 
 public class PdfPageEventHelper implements PdfPageEvent {
-    
-/**
- * Called when the document is opened.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- */
-    public void onOpenDocument(PdfWriter writer,Document document) {
+
+    /**
+     * Called when the document is opened.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     */
+    public void onOpenDocument(PdfWriter writer, Document document) {
     }
-    
-/**
- * Called when a page is initialized.
- * 
          
- * Note that if even if a page is not written this method is still
- * called. It is preferable to use onEndPage to avoid
- * infinite loops.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- */
-    public void onStartPage(PdfWriter writer,Document document) {
+
+    /**
+     * Called when a page is initialized.
+     * 
          
+     * Note that if even if a page is not written this method is still called. It is preferable to use
+     * onEndPage to avoid infinite loops.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     */
+    public void onStartPage(PdfWriter writer, Document document) {
     }
-    
-/**
- * Called when a page is finished, just before being written to the document.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- */
-    public void onEndPage(PdfWriter writer,Document document) {
+
+    /**
+     * Called when a page is finished, just before being written to the document.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     */
+    public void onEndPage(PdfWriter writer, Document document) {
     }
-    
-/**
- * Called when the document is closed.
- * 
          
- * Note that this method is called with the page number equal
- * to the last page plus one.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- */
-    public void onCloseDocument(PdfWriter writer,Document document) {
+
+    /**
+     * Called when the document is closed.
+     * 
          
+     * Note that this method is called with the page number equal to the last page plus one.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     */
+    public void onCloseDocument(PdfWriter writer, Document document) {
     }
-    
-/**
- * Called when a Paragraph is written.
- * 
          
- * paragraphPosition will hold the height at which the
- * paragraph will be written to. This is useful to insert bookmarks with
- * more control.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- * @param paragraphPosition the position the paragraph will be written to
- */
-    public void onParagraph(PdfWriter writer,Document document,float paragraphPosition) {
+
+    /**
+     * Called when a Paragraph is written.
+     * 
          
+     * paragraphPosition will hold the height at which the
+     * paragraph will be written to. This is useful to insert bookmarks with more control.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the paragraph will be written to
+     */
+    public void onParagraph(PdfWriter writer, Document document, float paragraphPosition) {
     }
-    
-/**
- * Called when a Paragraph is written.
- * 
          
- * paragraphPosition will hold the height of the end of the paragraph.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- * @param paragraphPosition the position of the end of the paragraph
- */
-    public void onParagraphEnd(PdfWriter writer,Document document,float paragraphPosition) {
+
+    /**
+     * Called when a Paragraph is written.
+     * 
          
+     * paragraphPosition will hold the height of the end of the paragraph.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position of the end of the paragraph
+     */
+    public void onParagraphEnd(PdfWriter writer, Document document, float paragraphPosition) {
     }
-    
-/**
- * Called when a Chapter is written.
- * 
          
- * position will hold the height at which the
- * chapter will be written to.
- *
- * @param writer            the PdfWriter for this document
- * @param document          the document
- * @param paragraphPosition the position the chapter will be written to
- * @param title             the title of the Chapter
- */
-    public void onChapter(PdfWriter writer,Document document,float paragraphPosition,Paragraph title) {
+
+    /**
+     * Called when a Chapter is written.
+     * 
          
+     * position will hold the height at which the
+     * chapter will be written to.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the chapter will be written to
+     * @param title             the title of the Chapter
+     */
+    public void onChapter(PdfWriter writer, Document document, float paragraphPosition, Paragraph title) {
     }
-    
-/**
- * Called when the end of a Chapter is reached.
- * 
          
- * position will hold the height of the end of the chapter.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- * @param position the position of the end of the chapter.
- */
-    public void onChapterEnd(PdfWriter writer,Document document,float position) {
+
+    /**
+     * Called when the end of a Chapter is reached.
+     * 
          
+     * position will hold the height of the end of the chapter.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     * @param position the position of the end of the chapter.
+     */
+    public void onChapterEnd(PdfWriter writer, Document document, float position) {
     }
-    
-/**
- * Called when a Section is written.
- * 
          
- * position will hold the height at which the
- * section will be written to.
- *
- * @param writer            the PdfWriter for this document
- * @param document          the document
- * @param paragraphPosition the position the section will be written to
- * @param depth                the number depth of the Section
- * @param title             the title of the section
- */
-    public void onSection(PdfWriter writer,Document document,float paragraphPosition,int depth,Paragraph title) {
+
+    /**
+     * Called when a Section is written.
+     * 
          
+     * position will hold the height at which the
+     * section will be written to.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the section will be written to
+     * @param depth             the number depth of the Section
+     * @param title             the title of the section
+     */
+    public void onSection(PdfWriter writer, Document document, float paragraphPosition, int depth, Paragraph title) {
     }
-    
-/**
- * Called when the end of a Section is reached.
- * 
          
- * position will hold the height of the section end.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- * @param position the position of the end of the section
- */
-    public void onSectionEnd(PdfWriter writer,Document document,float position) {
+
+    /**
+     * Called when the end of a Section is reached.
+     * 
          
+     * position will hold the height of the section end.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     * @param position the position of the end of the section
+     */
+    public void onSectionEnd(PdfWriter writer, Document document, float position) {
     }
-    
-/**
- * Called when a Chunk with a generic tag is written.
- * 
          
- * It is useful to pinpoint the Chunk location to generate
- * bookmarks, for example.
- *
- * @param writer the PdfWriter for this document
- * @param document the document
- * @param rect the Rectangle containing the Chunk
- * @param text the text of the tag
- */
-    public void onGenericTag(PdfWriter writer,Document document,Rectangle rect,String text) {
+
+    /**
+     * Called when a Chunk with a generic tag is written.
+     * 
          
+     * It is useful to pinpoint the Chunk location to generate bookmarks, for example.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     * @param rect     the Rectangle containing the Chunk
+     * @param text     the text of the tag
+     */
+    public void onGenericTag(PdfWriter writer, Document document, Rectangle rect, String text) {
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageLabels.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageLabels.java
index 6ce7cbb83..a80f4a391 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageLabels.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPageLabels.java
@@ -27,11 +27,10 @@
 package com.lowagie.text.pdf;
 
 
-import com.lowagie.text.error_messages.MessageLocalization;
 import com.lowagie.text.ExceptionConverter;
+import com.lowagie.text.error_messages.MessageLocalization;
 import com.lowagie.text.factories.RomanAlphabetFactory;
 import com.lowagie.text.factories.RomanNumberFactory;
-
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -39,7 +38,7 @@
 
 /**
  * Page labels are used to identify each page visually on the screen or in print.
- * 
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class PdfPageLabels {
@@ -60,14 +59,14 @@ public class PdfPageLabels {
     public static final int LOWERCASE_ROMAN_NUMERALS = 2;
 
     /**
-     * Logical pages will have the form of uppercase letters (A to Z for the first 26 pages, AA to
-     * ZZ for the next 26, and so on)
+     * Logical pages will have the form of uppercase letters (A to Z for the first 26 pages, AA to ZZ for the next 26,
+     * and so on)
      */
     public static final int UPPERCASE_LETTERS = 3;
 
     /**
-     * Logical pages will have the form of uppercase letters (a to z for the first 26 pages, aa to
-     * zz for the next 26, and so on)
+     * Logical pages will have the form of uppercase letters (a to z for the first 26 pages, aa to zz for the next 26,
+     * and so on)
      */
     public static final int LOWERCASE_LETTERS = 4;
 
@@ -97,102 +96,10 @@ public PdfPageLabels() {
         addPageLabel(1, PdfPageLabels.DECIMAL_ARABIC_NUMERALS, null, 1);
     }
 
-    /**
-     * Adds or replaces a page label.
-     * 
-     * @param page
-     *            the real page to start the numbering. First page is 1
-     * @param numberStyle
-     *            the numbering style such as LOWERCASE_ROMAN_NUMERALS
-     * @param text
-     *            the text to prefix the number. Can be null or empty
-     * @param firstPage
-     *            the first logical page number
-     */
-    public void addPageLabel(int page, int numberStyle, String text, int firstPage) {
-        if (page < 1 || firstPage < 1) {
-            throw new IllegalArgumentException(
-                        MessageLocalization.getComposedMessage("in.a.page.label.the.page.numbers.must.be.greater.or.equal.to.1"));
-        }
-        PdfDictionary dic = new PdfDictionary();
-        if (numberStyle >= 0 && numberStyle < PdfPageLabels.numberingStyle.length) {
-            dic.put(PdfName.S, PdfPageLabels.numberingStyle[numberStyle]);
-        }
-        if (text != null) {
-            dic.put(PdfName.P, new PdfString(text, PdfObject.TEXT_UNICODE));
-        }
-        if (firstPage != 1) {
-            dic.put(PdfName.ST, new PdfNumber(firstPage));
-        }
-        map.put(page - 1, dic);
-    }
-
-    /**
-     * Adds or replaces a page label. The first logical page has the default of 1.
-     * 
-     * @param page
-     *            the real page to start the numbering. First page is 1
-     * @param numberStyle
-     *            the numbering style such as LOWERCASE_ROMAN_NUMERALS
-     * @param text
-     *            the text to prefix the number. Can be null or empty
-     */
-    public void addPageLabel(int page, int numberStyle, String text) {
-        addPageLabel(page, numberStyle, text, 1);
-    }
-
-    /**
-     * Adds or replaces a page label. There is no text prefix and the first logical page has the
-     * default of 1.
-     * 
-     * @param page
-     *            the real page to start the numbering. First page is 1
-     * @param numberStyle
-     *            the numbering style such as LOWERCASE_ROMAN_NUMERALS
-     */
-    public void addPageLabel(int page, int numberStyle) {
-        addPageLabel(page, numberStyle, null, 1);
-    }
-
-    /**
-     * Adds or replaces a page label.
-     * @param format the PdfPageLabelFormat to add
-     */
-    public void addPageLabel(PdfPageLabelFormat format) {
-        addPageLabel(format.physicalPage, format.numberStyle, format.prefix, format.logicalPage);
-    }
-
-    /**
-     * Removes a page label. The first page label can not be removed, only changed.
-     * 
-     * @param page
-     *            the real page to remove
-     */
-    public void removePageLabel(int page) {
-        if (page <= 1) {
-            return;
-        }
-        map.remove(page - 1);
-    }
-
-    /**
-     * Gets the page label dictionary to insert into the document.
-     * 
-     * @return the page label dictionary
-     */
-    PdfDictionary getDictionary(PdfWriter writer) {
-        try {
-            return PdfNumberTree.writeTree(map, writer);
-        } catch (IOException e) {
-            throw new ExceptionConverter(e);
-        }
-    }
-
     /**
      * Retrieves the page labels from a PDF as an array of String objects.
-     * 
-     * @param reader
-     *            a PdfReader object that has the page labels you want to retrieve
+     *
+     * @param reader a PdfReader object that has the page labels you want to retrieve
      * @return a String array or null if no page labels are present
      */
     public static String[] getPageLabels(PdfReader reader) {
@@ -213,7 +120,7 @@ public static String[] getPageLabels(PdfReader reader) {
         Integer current;
         char type = 'D';
         String prefix = "";
-        for (int i = 0; i < n; i++ ) {
+        for (int i = 0; i < n; i++) {
             current = i;
             if (numberTree.containsKey(current)) {
                 PdfDictionary d = (PdfDictionary) PdfReader.getPdfObjectRelease(numberTree.get(current));
@@ -234,32 +141,31 @@ public static String[] getPageLabels(PdfReader reader) {
             switch (type) {
                 default:
                     labelstrings[i] = prefix + pagecount;
-                break;
+                    break;
                 case 'R':
                     labelstrings[i] = prefix + RomanNumberFactory.getUpperCaseString(pagecount);
-                break;
+                    break;
                 case 'r':
                     labelstrings[i] = prefix + RomanNumberFactory.getLowerCaseString(pagecount);
-                break;
+                    break;
                 case 'A':
                     labelstrings[i] = prefix + RomanAlphabetFactory.getUpperCaseString(pagecount);
-                break;
+                    break;
                 case 'a':
                     labelstrings[i] = prefix + RomanAlphabetFactory.getLowerCaseString(pagecount);
-                break;
+                    break;
             }
-            pagecount++ ;
+            pagecount++;
         }
         return labelstrings;
     }
 
     /**
      * Retrieves the page labels from a PDF as an array of {@link PdfPageLabelFormat} objects.
-     * 
-     * @param reader
-     *            a PdfReader object that has the page labels you want to retrieve
+     *
+     * @param reader a PdfReader object that has the page labels you want to retrieve
      * @return a PdfPageLabelEntry array, containing an entry for each format change or
-     *         null if no page labels are present
+     * null if no page labels are present
      */
     public static PdfPageLabelFormat[] getPageLabelFormats(PdfReader reader) {
         PdfDictionary dict = reader.getCatalog();
@@ -293,19 +199,19 @@ public static PdfPageLabelFormat[] getPageLabelFormats(PdfReader reader) {
                 switch (type) {
                     case 'R':
                         numberStyle = PdfPageLabels.UPPERCASE_ROMAN_NUMERALS;
-                    break;
+                        break;
                     case 'r':
                         numberStyle = PdfPageLabels.LOWERCASE_ROMAN_NUMERALS;
-                    break;
+                        break;
                     case 'A':
                         numberStyle = PdfPageLabels.UPPERCASE_LETTERS;
-                    break;
+                        break;
                     case 'a':
                         numberStyle = PdfPageLabels.LOWERCASE_LETTERS;
-                    break;
+                        break;
                     default:
                         numberStyle = PdfPageLabels.DECIMAL_ARABIC_NUMERALS;
-                    break;
+                        break;
                 }
             } else {
                 numberStyle = PdfPageLabels.EMPTY;
@@ -315,6 +221,88 @@ public static PdfPageLabelFormat[] getPageLabelFormats(PdfReader reader) {
         return formats;
     }
 
+    /**
+     * Adds or replaces a page label.
+     *
+     * @param page        the real page to start the numbering. First page is 1
+     * @param numberStyle the numbering style such as LOWERCASE_ROMAN_NUMERALS
+     * @param text        the text to prefix the number. Can be null or empty
+     * @param firstPage   the first logical page number
+     */
+    public void addPageLabel(int page, int numberStyle, String text, int firstPage) {
+        if (page < 1 || firstPage < 1) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage(
+                            "in.a.page.label.the.page.numbers.must.be.greater.or.equal.to.1"));
+        }
+        PdfDictionary dic = new PdfDictionary();
+        if (numberStyle >= 0 && numberStyle < PdfPageLabels.numberingStyle.length) {
+            dic.put(PdfName.S, PdfPageLabels.numberingStyle[numberStyle]);
+        }
+        if (text != null) {
+            dic.put(PdfName.P, new PdfString(text, PdfObject.TEXT_UNICODE));
+        }
+        if (firstPage != 1) {
+            dic.put(PdfName.ST, new PdfNumber(firstPage));
+        }
+        map.put(page - 1, dic);
+    }
+
+    /**
+     * Adds or replaces a page label. The first logical page has the default of 1.
+     *
+     * @param page        the real page to start the numbering. First page is 1
+     * @param numberStyle the numbering style such as LOWERCASE_ROMAN_NUMERALS
+     * @param text        the text to prefix the number. Can be null or empty
+     */
+    public void addPageLabel(int page, int numberStyle, String text) {
+        addPageLabel(page, numberStyle, text, 1);
+    }
+
+    /**
+     * Adds or replaces a page label. There is no text prefix and the first logical page has the default of 1.
+     *
+     * @param page        the real page to start the numbering. First page is 1
+     * @param numberStyle the numbering style such as LOWERCASE_ROMAN_NUMERALS
+     */
+    public void addPageLabel(int page, int numberStyle) {
+        addPageLabel(page, numberStyle, null, 1);
+    }
+
+    /**
+     * Adds or replaces a page label.
+     *
+     * @param format the PdfPageLabelFormat to add
+     */
+    public void addPageLabel(PdfPageLabelFormat format) {
+        addPageLabel(format.physicalPage, format.numberStyle, format.prefix, format.logicalPage);
+    }
+
+    /**
+     * Removes a page label. The first page label can not be removed, only changed.
+     *
+     * @param page the real page to remove
+     */
+    public void removePageLabel(int page) {
+        if (page <= 1) {
+            return;
+        }
+        map.remove(page - 1);
+    }
+
+    /**
+     * Gets the page label dictionary to insert into the document.
+     *
+     * @return the page label dictionary
+     */
+    PdfDictionary getDictionary(PdfWriter writer) {
+        try {
+            return PdfNumberTree.writeTree(map, writer);
+        } catch (IOException e) {
+            throw new ExceptionConverter(e);
+        }
+    }
+
     public static class PdfPageLabelFormat {
 
         public int physicalPage;
@@ -327,20 +315,16 @@ public static class PdfPageLabelFormat {
 
         /**
          * Creates a page label format.
-         * 
-         * @param physicalPage
-         *            the real page to start the numbering. First page is 1
-         * @param numberStyle
-         *            the numbering style such as LOWERCASE_ROMAN_NUMERALS
-         * @param prefix
-         *            the text to prefix the number. Can be null or empty
-         * @param logicalPage
-         *            the first logical page number
+         *
+         * @param physicalPage the real page to start the numbering. First page is 1
+         * @param numberStyle  the numbering style such as LOWERCASE_ROMAN_NUMERALS
+         * @param prefix       the text to prefix the number. Can be null or empty
+         * @param logicalPage  the first logical page number
          */
-        public PdfPageLabelFormat(    int physicalPage,
-                                    int numberStyle,
-                                    String prefix,
-                                    int logicalPage) {
+        public PdfPageLabelFormat(int physicalPage,
+                int numberStyle,
+                String prefix,
+                int logicalPage) {
             this.physicalPage = physicalPage;
             this.numberStyle = numberStyle;
             this.prefix = prefix;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPages.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPages.java
index e5c9200e6..9a60e36d0 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPages.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPages.java
@@ -49,30 +49,28 @@
 
 package com.lowagie.text.pdf;
 
-import java.io.IOException;
-import java.util.ArrayList;
-
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.error_messages.MessageLocalization;
+import java.io.IOException;
+import java.util.ArrayList;
 
 /**
  * PdfPages is the PDF Pages-object.
- * 
          
- * The Pages of a document are accessible through a tree of nodes known as the Pages tree.
- * This tree defines the ordering of the pages in the document.
          
- * This object is described in the 'Portable Document Format Reference Manual version 1.3'
- * section 6.3 (page 71-73)
+ * 
          
+ * The Pages of a document are accessible through a tree of nodes known as the Pages tree. This tree defines the
+ * ordering of the pages in the document.
           This object is described in the 'Portable Document Format Reference Manual
+ * version 1.3' section 6.3 (page 71-73)
  *
- * @see        PdfPage
+ * @see PdfPage
  */
 
 public class PdfPages {
 
     private final ArrayList pages = new ArrayList<>();
     private final ArrayList parents = new ArrayList<>();
-    private int leafSize = 10;
     private final PdfWriter writer;
+    private int leafSize = 10;
     private PdfIndirectReference topParent;
 
     // constructors
@@ -87,35 +85,36 @@ public class PdfPages {
 
     void addPage(PdfDictionary page) {
         try {
-            if ((pages.size() % leafSize) == 0)
+            if ((pages.size() % leafSize) == 0) {
                 parents.add(writer.getPdfIndirectReference());
+            }
             PdfIndirectReference parent = parents.get(parents.size() - 1);
             page.put(PdfName.PARENT, parent);
             PdfIndirectReference current = writer.getCurrentPage();
             writer.addToBody(page, current);
             pages.add(current);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
     }
 
     PdfIndirectReference addPageRef(PdfIndirectReference pageRef) {
         try {
-            if ((pages.size() % leafSize) == 0)
+            if ((pages.size() % leafSize) == 0) {
                 parents.add(writer.getPdfIndirectReference());
+            }
             pages.add(pageRef);
             return parents.get(parents.size() - 1);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
     }
 
     // returns the top parent to include in the catalog
     PdfIndirectReference writePageTree() throws IOException {
-        if (pages.isEmpty())
+        if (pages.isEmpty()) {
             throw new IOException(MessageLocalization.getComposedMessage("the.document.has.no.pages"));
+        }
         int leaf = 1;
         ArrayList tParents = parents;
         ArrayList tPages = pages;
@@ -124,26 +123,29 @@ PdfIndirectReference writePageTree() throws IOException {
             leaf *= leafSize;
             int stdCount = leafSize;
             int rightCount = tPages.size() % leafSize;
-            if (rightCount == 0)
+            if (rightCount == 0) {
                 rightCount = leafSize;
+            }
             for (int p = 0; p < tParents.size(); ++p) {
                 int count;
                 int thisLeaf = leaf;
                 if (p == tParents.size() - 1) {
                     count = rightCount;
                     thisLeaf = pages.size() % leaf;
-                    if (thisLeaf == 0)
+                    if (thisLeaf == 0) {
                         thisLeaf = leaf;
-                }
-                else
+                    }
+                } else {
                     count = stdCount;
+                }
                 PdfDictionary top = new PdfDictionary(PdfName.PAGES);
                 top.put(PdfName.COUNT, new PdfNumber(thisLeaf));
                 PdfArray kids = new PdfArray(tPages.subList(p * stdCount, p * stdCount + count));
                 top.put(PdfName.KIDS, kids);
                 if (tParents.size() > 1) {
-                    if ((p % leafSize) == 0)
+                    if ((p % leafSize) == 0) {
                         nextParents.add(writer.getPdfIndirectReference());
+                    }
                     top.put(PdfName.PARENT, nextParents.get(p / leafSize));
                 }
                 writer.addToBody(top, tParents.get(p));
@@ -159,8 +161,10 @@ PdfIndirectReference writePageTree() throws IOException {
     }
 
     void setLinearMode(PdfIndirectReference topParent) {
-        if (parents.size() > 1)
-            throw new RuntimeException(MessageLocalization.getComposedMessage("linear.page.mode.can.only.be.called.with.a.single.parent"));
+        if (parents.size() > 1) {
+            throw new RuntimeException(
+                    MessageLocalization.getComposedMessage("linear.page.mode.can.only.be.called.with.a.single.parent"));
+        }
         if (topParent != null) {
             this.topParent = topParent;
             parents.clear();
@@ -170,20 +174,30 @@ void setLinearMode(PdfIndirectReference topParent) {
     }
 
     int reorderPages(int[] order) throws DocumentException {
-        if (order == null)
+        if (order == null) {
             return pages.size();
-        if (parents.size() > 1)
-            throw new DocumentException(MessageLocalization.getComposedMessage("page.reordering.requires.a.single.parent.in.the.page.tree.call.pdfwriter.setlinearmode.after.open"));
-        if (order.length != pages.size())
-            throw new DocumentException(MessageLocalization.getComposedMessage("page.reordering.requires.an.array.with.the.same.size.as.the.number.of.pages"));
+        }
+        if (parents.size() > 1) {
+            throw new DocumentException(MessageLocalization.getComposedMessage(
+                    "page.reordering.requires.a.single.parent.in.the.page.tree.call.pdfwriter.setlinearmode.after.open"));
+        }
+        if (order.length != pages.size()) {
+            throw new DocumentException(MessageLocalization.getComposedMessage(
+                    "page.reordering.requires.an.array.with.the.same.size.as.the.number.of.pages"));
+        }
         int max = pages.size();
         boolean[] temp = new boolean[max];
         for (int k = 0; k < max; ++k) {
             int p = order[k];
-            if (p < 1 || p > max)
-                throw new DocumentException(MessageLocalization.getComposedMessage("page.reordering.requires.pages.between.1.and.1.found.2", String.valueOf(max), String.valueOf(p)));
-            if (temp[p - 1])
-                throw new DocumentException(MessageLocalization.getComposedMessage("page.reordering.requires.no.page.repetition.page.1.is.repeated", p));
+            if (p < 1 || p > max) {
+                throw new DocumentException(
+                        MessageLocalization.getComposedMessage("page.reordering.requires.pages.between.1.and.1.found.2",
+                                String.valueOf(max), String.valueOf(p)));
+            }
+            if (temp[p - 1]) {
+                throw new DocumentException(MessageLocalization.getComposedMessage(
+                        "page.reordering.requires.no.page.repetition.page.1.is.repeated", p));
+            }
             temp[p - 1] = true;
         }
         PdfIndirectReference[] copy = pages.toArray(new PdfIndirectReference[0]);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPattern.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPattern.java
index dacc1f4e1..bc6ec0f25 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPattern.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPattern.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2002 by Phillip Pan
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * (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.mozilla.org/MPL/
@@ -52,14 +52,15 @@
 /**
  * A PdfPattern defines a ColorSpace
  *
- * @see        PdfStream
+ * @see PdfStream
  */
 
 public class PdfPattern extends PdfStream {
-    
+
     /**
      * Creates a PdfPattern object.
-     * @param    painter    a pattern painter instance
+     *
+     * @param painter a pattern painter instance
      */
     PdfPattern(PdfPatternPainter painter) {
         this(painter, DEFAULT_COMPRESSION);
@@ -67,15 +68,16 @@ public class PdfPattern extends PdfStream {
 
     /**
      * Creates a PdfPattern object.
-     * @param    painter    a pattern painter instance
-     * @param    compressionLevel the compressionLevel for the stream
-     * @since    2.1.3
+     *
+     * @param painter          a pattern painter instance
+     * @param compressionLevel the compressionLevel for the stream
+     * @since 2.1.3
      */
     PdfPattern(PdfPatternPainter painter, int compressionLevel) {
         super();
         PdfNumber one = new PdfNumber(1);
         PdfArray matrix = painter.getMatrix();
-        if ( matrix != null ) {
+        if (matrix != null) {
             put(PdfName.MATRIX, matrix);
         }
         put(PdfName.TYPE, PdfName.PATTERN);
@@ -83,10 +85,11 @@ public class PdfPattern extends PdfStream {
         put(PdfName.RESOURCES, painter.getResources());
         put(PdfName.TILINGTYPE, one);
         put(PdfName.PATTERNTYPE, one);
-        if (painter.isStencil())
+        if (painter.isStencil()) {
             put(PdfName.PAINTTYPE, new PdfNumber(2));
-        else
+        } else {
             put(PdfName.PAINTTYPE, one);
+        }
         put(PdfName.XSTEP, new PdfNumber(painter.getXStep()));
         put(PdfName.YSTEP, new PdfNumber(painter.getYStep()));
         bytes = painter.toPdf(null);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPatternPainter.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPatternPainter.java
index 21be88d1e..89a4f8b95 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPatternPainter.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPatternPainter.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2002 by Phillip Pan
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * (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.mozilla.org/MPL/
@@ -46,98 +46,102 @@
  */
 package com.lowagie.text.pdf;
 
-import java.awt.Color;
-import com.lowagie.text.error_messages.MessageLocalization;
-
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.Rectangle;
+import com.lowagie.text.error_messages.MessageLocalization;
+import java.awt.Color;
 
 /**
  * Implements the pattern.
  */
 
 public final class PdfPatternPainter extends PdfTemplate {
-    
+
     float xstep, ystep;
     boolean stencil = false;
     Color defaultColor;
-    
+
     /**
-     *Creates a PdfPattern.
+     * Creates a PdfPattern.
      */
-    
+
     private PdfPatternPainter() {
         super();
         type = TYPE_PATTERN;
     }
-    
+
     /**
      * Creates new PdfPattern
      *
      * @param wr the PdfWriter
      */
-    
+
     PdfPatternPainter(PdfWriter wr) {
         super(wr);
         type = TYPE_PATTERN;
     }
-    
+
     PdfPatternPainter(PdfWriter wr, Color defaultColor) {
         this(wr);
         stencil = true;
-        if (defaultColor == null)
+        if (defaultColor == null) {
             this.defaultColor = Color.gray;
-        else
+        } else {
             this.defaultColor = defaultColor;
+        }
     }
-    
+
+    /**
+     * Returns the horizontal interval when repeating the pattern.
+     *
+     * @return a value
+     */
+    public float getXStep() {
+        return this.xstep;
+    }
+
     /**
      * Sets the horizontal interval of this pattern.
      *
      * @param xstep the xstep in horizontal painting
      */
-    
+
     public void setXStep(float xstep) {
         this.xstep = xstep;
     }
-    
+
     /**
-     * Sets the vertical interval of this pattern.
+     * Returns the vertical interval when repeating the pattern.
      *
-     * @param ystep in vertical painting
-     */
-    
-    public void setYStep(float ystep) {
-        this.ystep = ystep;
-    }
-    
-    /**
-     * Returns the horizontal interval when repeating the pattern.
      * @return a value
      */
-    public float getXStep() {
-        return this.xstep;
+    public float getYStep() {
+        return this.ystep;
     }
-    
+
     /**
-     * Returns the vertical interval when repeating the pattern.
-     * @return a value
+     * Sets the vertical interval of this pattern.
+     *
+     * @param ystep in vertical painting
      */
-    public float getYStep() {
-        return this.ystep;
+
+    public void setYStep(float ystep) {
+        this.ystep = ystep;
     }
-    
+
     /**
      * Tells you if this pattern is colored/uncolored (stencil = uncolored, you need to set a default color).
+     *
      * @return true if the pattern is an uncolored tiling pattern (stencil).
      */
     public boolean isStencil() {
         return stencil;
     }
-    
+
     /**
      * Sets the transformation matrix for the pattern.
+     *
      * @param a an element of the transformation matrix
      * @param b an element of the transformation matrix
      * @param c an element of the transformation matrix
@@ -148,30 +152,34 @@ public boolean isStencil() {
     public void setPatternMatrix(float a, float b, float c, float d, float e, float f) {
         setMatrix(a, b, c, d, e, f);
     }
+
     /**
      * Gets the stream representing this pattern
+     *
      * @return the stream representing this pattern
      */
     PdfPattern getPattern() {
         return new PdfPattern(this);
     }
-    
+
     /**
      * Gets the stream representing this pattern
-     * @param    compressionLevel    the compression level of the stream
+     *
+     * @param compressionLevel the compression level of the stream
      * @return the stream representing this pattern
-     * @since    2.1.3
+     * @since 2.1.3
      */
     PdfPattern getPattern(int compressionLevel) {
         return new PdfPattern(this, compressionLevel);
     }
-    
+
     /**
-     * Gets a duplicate of this PdfPatternPainter. All
-     * the members are copied by reference but the buffer stays different.
+     * Gets a duplicate of this PdfPatternPainter. All the members are copied by reference but the buffer
+     * stays different.
+     *
      * @return a copy of this PdfPatternPainter
      */
-    
+
     public PdfContentByte getDuplicate() {
         PdfPatternPainter tpl = new PdfPatternPainter();
         tpl.writer = writer;
@@ -186,15 +194,16 @@ public PdfContentByte getDuplicate() {
         tpl.defaultColor = defaultColor;
         return tpl;
     }
-    
+
     /**
      * Returns the default color of the pattern.
+     *
      * @return a Color
      */
     public Color getDefaultColor() {
         return defaultColor;
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setGrayFill(float)
      */
@@ -202,7 +211,7 @@ public void setGrayFill(float gray) {
         checkNoColor();
         super.setGrayFill(gray);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#resetGrayFill()
      */
@@ -210,7 +219,7 @@ public void resetGrayFill() {
         checkNoColor();
         super.resetGrayFill();
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setGrayStroke(float)
      */
@@ -218,7 +227,7 @@ public void setGrayStroke(float gray) {
         checkNoColor();
         super.setGrayStroke(gray);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#resetGrayStroke()
      */
@@ -226,7 +235,7 @@ public void resetGrayStroke() {
         checkNoColor();
         super.resetGrayStroke();
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setRGBColorFillF(float, float, float)
      */
@@ -234,7 +243,7 @@ public void setRGBColorFillF(float red, float green, float blue) {
         checkNoColor();
         super.setRGBColorFillF(red, green, blue);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#resetRGBColorFill()
      */
@@ -242,7 +251,7 @@ public void resetRGBColorFill() {
         checkNoColor();
         super.resetRGBColorFill();
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setRGBColorStrokeF(float, float, float)
      */
@@ -250,7 +259,7 @@ public void setRGBColorStrokeF(float red, float green, float blue) {
         checkNoColor();
         super.setRGBColorStrokeF(red, green, blue);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#resetRGBColorStroke()
      */
@@ -258,7 +267,7 @@ public void resetRGBColorStroke() {
         checkNoColor();
         super.resetRGBColorStroke();
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setCMYKColorFillF(float, float, float, float)
      */
@@ -266,7 +275,7 @@ public void setCMYKColorFillF(float cyan, float magenta, float yellow, float bla
         checkNoColor();
         super.setCMYKColorFillF(cyan, magenta, yellow, black);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#resetCMYKColorFill()
      */
@@ -274,7 +283,7 @@ public void resetCMYKColorFill() {
         checkNoColor();
         super.resetCMYKColorFill();
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setCMYKColorStrokeF(float, float, float, float)
      */
@@ -282,7 +291,7 @@ public void setCMYKColorStrokeF(float cyan, float magenta, float yellow, float b
         checkNoColor();
         super.setCMYKColorStrokeF(cyan, magenta, yellow, black);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#resetCMYKColorStroke()
      */
@@ -290,16 +299,18 @@ public void resetCMYKColorStroke() {
         checkNoColor();
         super.resetCMYKColorStroke();
     }
-    
+
     /**
-     * @see com.lowagie.text.pdf.PdfContentByte#addImage(com.lowagie.text.Image, float, float, float, float, float, float)
+     * @see com.lowagie.text.pdf.PdfContentByte#addImage(com.lowagie.text.Image, float, float, float, float, float,
+     * float)
      */
     public void addImage(Image image, float a, float b, float c, float d, float e, float f) throws DocumentException {
-        if (stencil && !image.isMask())
+        if (stencil && !image.isMask()) {
             checkNoColor();
+        }
         super.addImage(image, a, b, c, d, e, f);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setCMYKColorFill(int, int, int, int)
      */
@@ -307,7 +318,7 @@ public void setCMYKColorFill(int cyan, int magenta, int yellow, int black) {
         checkNoColor();
         super.setCMYKColorFill(cyan, magenta, yellow, black);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setCMYKColorStroke(int, int, int, int)
      */
@@ -315,7 +326,7 @@ public void setCMYKColorStroke(int cyan, int magenta, int yellow, int black) {
         checkNoColor();
         super.setCMYKColorStroke(cyan, magenta, yellow, black);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setRGBColorFill(int, int, int)
      */
@@ -323,7 +334,7 @@ public void setRGBColorFill(int red, int green, int blue) {
         checkNoColor();
         super.setRGBColorFill(red, green, blue);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setRGBColorStroke(int, int, int)
      */
@@ -331,7 +342,7 @@ public void setRGBColorStroke(int red, int green, int blue) {
         checkNoColor();
         super.setRGBColorStroke(red, green, blue);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setColorStroke(java.awt.Color)
      */
@@ -339,7 +350,7 @@ public void setColorStroke(Color color) {
         checkNoColor();
         super.setColorStroke(color);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setColorFill(java.awt.Color)
      */
@@ -347,7 +358,7 @@ public void setColorFill(Color color) {
         checkNoColor();
         super.setColorFill(color);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setColorFill(com.lowagie.text.pdf.PdfSpotColor, float)
      */
@@ -355,7 +366,7 @@ public void setColorFill(PdfSpotColor sp, float tint) {
         checkNoColor();
         super.setColorFill(sp, tint);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setColorStroke(com.lowagie.text.pdf.PdfSpotColor, float)
      */
@@ -363,7 +374,7 @@ public void setColorStroke(PdfSpotColor sp, float tint) {
         checkNoColor();
         super.setColorStroke(sp, tint);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setPatternFill(com.lowagie.text.pdf.PdfPatternPainter)
      */
@@ -371,23 +382,25 @@ public void setPatternFill(PdfPatternPainter p) {
         checkNoColor();
         super.setPatternFill(p);
     }
-    
+
     /**
-     * @see com.lowagie.text.pdf.PdfContentByte#setPatternFill(com.lowagie.text.pdf.PdfPatternPainter, java.awt.Color, float)
+     * @see com.lowagie.text.pdf.PdfContentByte#setPatternFill(com.lowagie.text.pdf.PdfPatternPainter, java.awt.Color,
+     * float)
      */
     public void setPatternFill(PdfPatternPainter p, Color color, float tint) {
         checkNoColor();
         super.setPatternFill(p, color, tint);
     }
-    
+
     /**
-     * @see com.lowagie.text.pdf.PdfContentByte#setPatternStroke(com.lowagie.text.pdf.PdfPatternPainter, java.awt.Color, float)
+     * @see com.lowagie.text.pdf.PdfContentByte#setPatternStroke(com.lowagie.text.pdf.PdfPatternPainter, java.awt.Color,
+     * float)
      */
     public void setPatternStroke(PdfPatternPainter p, Color color, float tint) {
         checkNoColor();
         super.setPatternStroke(p, color, tint);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfContentByte#setPatternStroke(com.lowagie.text.pdf.PdfPatternPainter)
      */
@@ -395,9 +408,11 @@ public void setPatternStroke(PdfPatternPainter p) {
         checkNoColor();
         super.setPatternStroke(p);
     }
-    
+
     void checkNoColor() {
-        if (stencil)
-            throw new RuntimeException(MessageLocalization.getComposedMessage("colors.are.not.allowed.in.uncolored.tile.patterns"));
+        if (stencil) {
+            throw new RuntimeException(
+                    MessageLocalization.getComposedMessage("colors.are.not.allowed.in.uncolored.tile.patterns"));
+        }
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPrinterGraphics2D.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPrinterGraphics2D.java
index 940e32ea0..0a97de272 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPrinterGraphics2D.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPrinterGraphics2D.java
@@ -56,17 +56,17 @@
  * This is an extension class for the sole purpose of implementing the
  * {@link java.awt.print.PrinterGraphics PrinterGraphics} interface.
  */
-public class PdfPrinterGraphics2D extends PdfGraphics2D implements PrinterGraphics
-{
+public class PdfPrinterGraphics2D extends PdfGraphics2D implements PrinterGraphics {
+
     private PrinterJob printerJob;
-    
+
     public PdfPrinterGraphics2D(PdfContentByte cb, float width, float height, FontMapper fontMapper,
-            boolean onlyShapes, boolean convertImagesToJPEG, float quality, PrinterJob printerJob)    {
+            boolean onlyShapes, boolean convertImagesToJPEG, float quality, PrinterJob printerJob) {
         super(cb, width, height, fontMapper, onlyShapes, convertImagesToJPEG, quality);
         this.printerJob = printerJob;
     }
 
-    public PrinterJob getPrinterJob()    {
+    public PrinterJob getPrinterJob() {
         return printerJob;
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeyRecipient.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeyRecipient.java
index 67830f1d1..9259e0d8b 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeyRecipient.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeyRecipient.java
@@ -53,14 +53,11 @@
 
 public class PdfPublicKeyRecipient {
 
-  private Certificate certificate = null;
-    
-  private int permission = 0;
-  
-  protected byte[] cms = null;
-            
-    public PdfPublicKeyRecipient(Certificate certificate, int permission)
-    {
+    protected byte[] cms = null;
+    private Certificate certificate = null;
+    private int permission = 0;
+
+    public PdfPublicKeyRecipient(Certificate certificate, int permission) {
         this.certificate = certificate;
         this.permission = permission;
     }
@@ -73,11 +70,11 @@ public int getPermission() {
         return permission;
     }
 
-    protected void setCms(byte[] cms) {
-        this.cms = cms;
-    }
-
     protected byte[] getCms() {
         return cms;
     }
+
+    protected void setCms(byte[] cms) {
+        this.cms = cms;
+    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
index cbf0b5df2..a0df9a623 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
@@ -129,163 +129,164 @@
  */
 public class PdfPublicKeySecurityHandler {
 
-  static final int SEED_LENGTH = 20;
-
-  private final List recipients;
-
-  private byte[] seed = new byte[SEED_LENGTH];
-
-  public PdfPublicKeySecurityHandler() {
-    KeyGenerator key;
-    try {
-      key = KeyGenerator.getInstance("AES");
-      key.init(192, new SecureRandom());
-      SecretKey sk = key.generateKey();
-      System.arraycopy(sk.getEncoded(), 0, seed, 0, SEED_LENGTH); // create the
-                                                                  // 20 bytes
-                                                                  // seed
-    } catch (NoSuchAlgorithmException e) {
-      seed = SecureRandom.getSeed(SEED_LENGTH);
+    static final int SEED_LENGTH = 20;
+
+    private final List recipients;
+
+    private byte[] seed = new byte[SEED_LENGTH];
+
+    public PdfPublicKeySecurityHandler() {
+        KeyGenerator key;
+        try {
+            key = KeyGenerator.getInstance("AES");
+            key.init(192, new SecureRandom());
+            SecretKey sk = key.generateKey();
+            System.arraycopy(sk.getEncoded(), 0, seed, 0, SEED_LENGTH); // create the
+            // 20 bytes
+            // seed
+        } catch (NoSuchAlgorithmException e) {
+            seed = SecureRandom.getSeed(SEED_LENGTH);
+        }
+
+        recipients = new ArrayList<>();
     }
 
-    recipients = new ArrayList<>();
-  }
+    public void addRecipient(PdfPublicKeyRecipient recipient) {
+        recipients.add(recipient);
+    }
 
-  public void addRecipient(PdfPublicKeyRecipient recipient) {
-    recipients.add(recipient);
-  }
+    protected byte[] getSeed() {
+        return seed.clone();
+    }
 
-  protected byte[] getSeed() {
-    return seed.clone();
-  }
+    /*
+     * public PdfPublicKeyRecipient[] getRecipients() { recipients.toArray();
+     * return (PdfPublicKeyRecipient[])recipients.toArray(); }
+     */
 
-  /*
-   * public PdfPublicKeyRecipient[] getRecipients() { recipients.toArray();
-   * return (PdfPublicKeyRecipient[])recipients.toArray(); }
-   */
+    public int getRecipientsSize() {
+        return recipients.size();
+    }
 
-  public int getRecipientsSize() {
-    return recipients.size();
-  }
+    public byte[] getEncodedRecipient(int index) throws IOException,
+            GeneralSecurityException {
+        // Certificate certificate = recipient.getX509();
+        PdfPublicKeyRecipient recipient = recipients
+                .get(index);
+        byte[] cms = recipient.getCms();
 
-  public byte[] getEncodedRecipient(int index) throws IOException,
-      GeneralSecurityException {
-    // Certificate certificate = recipient.getX509();
-    PdfPublicKeyRecipient recipient = recipients
-        .get(index);
-    byte[] cms = recipient.getCms();
+        if (cms != null) {
+            return cms;
+        }
 
-    if (cms != null)
-      return cms;
+        Certificate certificate = recipient.getCertificate();
+        int permission = recipient.getPermission();// PdfWriter.AllowCopy |
+        // PdfWriter.AllowPrinting |
+        // PdfWriter.AllowScreenReaders |
+        // PdfWriter.AllowAssembly;
 
-    Certificate certificate = recipient.getCertificate();
-    int permission = recipient.getPermission();// PdfWriter.AllowCopy |
-                                               // PdfWriter.AllowPrinting |
-                                               // PdfWriter.AllowScreenReaders |
-                                               // PdfWriter.AllowAssembly;
+        permission |= 0xfffff0c0;
+        permission &= 0xfffffffc;
+        permission += 1;
 
-    permission |= 0xfffff0c0;
-    permission &= 0xfffffffc;
-    permission += 1;
+        byte[] pkcs7input = new byte[24];
 
-    byte[] pkcs7input = new byte[24];
+        byte one = (byte) (permission);
+        byte two = (byte) (permission >> 8);
+        byte three = (byte) (permission >> 16);
+        byte four = (byte) (permission >> 24);
 
-    byte one = (byte) (permission);
-    byte two = (byte) (permission >> 8);
-    byte three = (byte) (permission >> 16);
-    byte four = (byte) (permission >> 24);
+        System.arraycopy(seed, 0, pkcs7input, 0, 20); // put this seed in the pkcs7
+        // input
 
-    System.arraycopy(seed, 0, pkcs7input, 0, 20); // put this seed in the pkcs7
-                                                  // input
+        pkcs7input[20] = four;
+        pkcs7input[21] = three;
+        pkcs7input[22] = two;
+        pkcs7input[23] = one;
 
-    pkcs7input[20] = four;
-    pkcs7input[21] = three;
-    pkcs7input[22] = two;
-    pkcs7input[23] = one;
+        ASN1Primitive obj = createDERForRecipient(pkcs7input,
+                (X509Certificate) certificate);
 
-    ASN1Primitive obj = createDERForRecipient(pkcs7input,
-        (X509Certificate) certificate);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        final ASN1OutputStream derOutputStream = ASN1OutputStream.create(baos, ASN1Encoding.DER);
 
-    final ASN1OutputStream derOutputStream = ASN1OutputStream.create(baos, ASN1Encoding.DER);
+        derOutputStream.writeObject(obj);
 
-    derOutputStream.writeObject(obj);
+        cms = baos.toByteArray();
 
-    cms = baos.toByteArray();
+        recipient.setCms(cms);
 
-    recipient.setCms(cms);
+        return cms;
+    }
 
-    return cms;
-  }
+    public PdfArray getEncodedRecipients() throws IOException {
+        PdfArray encodedRecipients = new PdfArray();
+        byte[] cms;
+        for (int i = 0; i < recipients.size(); i++) {
+            try {
+                cms = getEncodedRecipient(i);
+                encodedRecipients.add(new PdfLiteral(PdfContentByte.escapeString(cms)));
+            } catch (GeneralSecurityException | IOException e) {
+                encodedRecipients = null;
+                break;
+            }
+        }
+        return encodedRecipients;
+    }
+
+    private ASN1Primitive createDERForRecipient(byte[] in, X509Certificate cert)
+            throws IOException, GeneralSecurityException {
+
+        String s = "1.2.840.113549.3.2";
+
+        AlgorithmParameterGenerator algorithmparametergenerator = AlgorithmParameterGenerator
+                .getInstance(s);
+        AlgorithmParameters algorithmparameters = algorithmparametergenerator
+                .generateParameters();
+        ByteArrayInputStream bytearrayinputstream = new ByteArrayInputStream(
+                algorithmparameters.getEncoded("ASN.1"));
+        ASN1InputStream asn1inputstream = new ASN1InputStream(bytearrayinputstream);
+        ASN1Primitive derobject = asn1inputstream.readObject();
+        KeyGenerator keygenerator = KeyGenerator.getInstance(s);
+        keygenerator.init(128);
+        SecretKey secretkey = keygenerator.generateKey();
+        Cipher cipher = Cipher.getInstance(s);
+        cipher.init(1, secretkey, algorithmparameters);
+        byte[] abyte1 = cipher.doFinal(in);
+        DEROctetString deroctetstring = new DEROctetString(abyte1);
+        KeyTransRecipientInfo keytransrecipientinfo = computeRecipientInfo(cert,
+                secretkey.getEncoded());
+        DERSet derset = new DERSet(new RecipientInfo(keytransrecipientinfo));
+        AlgorithmIdentifier algorithmidentifier = new AlgorithmIdentifier(
+                new ASN1ObjectIdentifier(s), derobject);
+        EncryptedContentInfo encryptedcontentinfo = new EncryptedContentInfo(
+                PKCSObjectIdentifiers.data, algorithmidentifier, deroctetstring);
+        ASN1Set set = null;
+        EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo,
+                set);
+        ContentInfo contentinfo = new ContentInfo(
+                PKCSObjectIdentifiers.envelopedData, env);
+        // OJO... Modificacion de
+        // Felix--------------------------------------------------
+        // return contentinfo.getDERObject();
+        return contentinfo.toASN1Primitive();
+        // ******************************************************************************
+    }
 
-  public PdfArray getEncodedRecipients() throws IOException {
-    PdfArray encodedRecipients = new PdfArray();
-    byte[] cms;
-    for (int i = 0; i < recipients.size(); i++) {
-      try {
-        cms = getEncodedRecipient(i);
-        encodedRecipients.add(new PdfLiteral(PdfContentByte.escapeString(cms)));
-      } catch (GeneralSecurityException | IOException e) {
-        encodedRecipients = null;
-        break;
-      }
+    private KeyTransRecipientInfo computeRecipientInfo(
+            X509Certificate x509certificate, byte[] abyte0)
+            throws GeneralSecurityException, IOException {
+        ASN1InputStream asn1inputstream = new ASN1InputStream(
+                new ByteArrayInputStream(x509certificate.getTBSCertificate()));
+        TBSCertificate tbsCertificate = TBSCertificate.getInstance(asn1inputstream.readObject());
+        AlgorithmIdentifier algorithmidentifier = tbsCertificate.getSubjectPublicKeyInfo().getAlgorithm();
+        IssuerAndSerialNumber issuerandserialnumber = new IssuerAndSerialNumber(
+                tbsCertificate.getIssuer(), tbsCertificate.getSerialNumber().getValue());
+        Cipher cipher = Cipher.getInstance(algorithmidentifier.getAlgorithm().getId());
+        cipher.init(1, x509certificate);
+        DEROctetString deroctetstring = new DEROctetString(cipher.doFinal(abyte0));
+        RecipientIdentifier recipId = new RecipientIdentifier(issuerandserialnumber);
+        return new KeyTransRecipientInfo(recipId, algorithmidentifier, deroctetstring);
     }
-    return encodedRecipients;
-  }
-
-  private ASN1Primitive createDERForRecipient(byte[] in, X509Certificate cert)
-      throws IOException, GeneralSecurityException {
-
-    String s = "1.2.840.113549.3.2";
-
-    AlgorithmParameterGenerator algorithmparametergenerator = AlgorithmParameterGenerator
-        .getInstance(s);
-    AlgorithmParameters algorithmparameters = algorithmparametergenerator
-        .generateParameters();
-    ByteArrayInputStream bytearrayinputstream = new ByteArrayInputStream(
-        algorithmparameters.getEncoded("ASN.1"));
-    ASN1InputStream asn1inputstream = new ASN1InputStream(bytearrayinputstream);
-    ASN1Primitive derobject = asn1inputstream.readObject();
-    KeyGenerator keygenerator = KeyGenerator.getInstance(s);
-    keygenerator.init(128);
-    SecretKey secretkey = keygenerator.generateKey();
-    Cipher cipher = Cipher.getInstance(s);
-    cipher.init(1, secretkey, algorithmparameters);
-    byte[] abyte1 = cipher.doFinal(in);
-    DEROctetString deroctetstring = new DEROctetString(abyte1);
-    KeyTransRecipientInfo keytransrecipientinfo = computeRecipientInfo(cert,
-        secretkey.getEncoded());
-    DERSet derset = new DERSet(new RecipientInfo(keytransrecipientinfo));
-    AlgorithmIdentifier algorithmidentifier = new AlgorithmIdentifier(
-        new ASN1ObjectIdentifier(s), derobject);
-    EncryptedContentInfo encryptedcontentinfo = new EncryptedContentInfo(
-        PKCSObjectIdentifiers.data, algorithmidentifier, deroctetstring);
-    ASN1Set set = null;
-    EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo,
-        set);
-    ContentInfo contentinfo = new ContentInfo(
-        PKCSObjectIdentifiers.envelopedData, env);
-    // OJO... Modificacion de
-    // Felix--------------------------------------------------
-    // return contentinfo.getDERObject();
-    return contentinfo.toASN1Primitive();
-    // ******************************************************************************
-  }
-
-  private KeyTransRecipientInfo computeRecipientInfo(
-      X509Certificate x509certificate, byte[] abyte0)
-      throws GeneralSecurityException, IOException {
-    ASN1InputStream asn1inputstream = new ASN1InputStream(
-        new ByteArrayInputStream(x509certificate.getTBSCertificate()));
-    TBSCertificate tbsCertificate = TBSCertificate.getInstance(asn1inputstream.readObject());
-    AlgorithmIdentifier algorithmidentifier = tbsCertificate.getSubjectPublicKeyInfo().getAlgorithm();
-    IssuerAndSerialNumber issuerandserialnumber = new IssuerAndSerialNumber(
-            tbsCertificate.getIssuer(), tbsCertificate.getSerialNumber().getValue());
-    Cipher cipher = Cipher.getInstance(algorithmidentifier.getAlgorithm().getId());
-    cipher.init(1, x509certificate);
-    DEROctetString deroctetstring = new DEROctetString(cipher.doFinal(abyte0));
-    RecipientIdentifier recipId = new RecipientIdentifier(issuerandserialnumber);
-    return new KeyTransRecipientInfo(recipId, algorithmidentifier, deroctetstring);
-  }
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfReader.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfReader.java
index faf627294..d8b536331 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfReader.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfReader.java
@@ -88,4032 +88,4184 @@
  */
 public class PdfReader implements PdfViewerPreferences, Closeable {
 
-  static final PdfName[] pageInhCandidates = {PdfName.MEDIABOX,
-          PdfName.ROTATE, PdfName.RESOURCES, PdfName.CROPBOX};
-
-  private static final byte[] endstream = PdfEncodings
-          .convertToBytes("endstream", null);
-  private static final byte[] endobj = PdfEncodings.convertToBytes("endobj", null);
-  protected PRTokeniser tokens;
-  // Each xref pair is a position
-  // type 0 -> -1, 0
-  // type 1 -> offset, 0
-  // type 2 -> index, obj num
-  protected int[] xref;
-  protected Map objStmMark;
-  protected IntHashtable objStmToOffset;
-  protected boolean newXrefType;
-  private List xrefObj;
-  PdfDictionary rootPages;
-  protected PdfDictionary trailer;
-  protected PdfDictionary catalog;
-  protected PageRefs pageRefs;
-  protected PRAcroForm acroForm = null;
-  protected boolean acroFormParsed = false;
-  protected boolean encrypted = false;
-  protected boolean rebuilt = false;
-  protected int freeXref;
-  protected boolean tampered = false;
-  protected int lastXref;
-  protected int eofPos;
-  protected char pdfVersion;
-  protected PdfEncryption decrypt;
-  protected byte[] password = null; // added by ujihara for decryption
-  protected Key certificateKey = null; // added by Aiken Sam for certificate
-                                       // decryption
-  protected Certificate certificate = null; // added by Aiken Sam for
-                                            // certificate decryption
-  protected String certificateKeyProvider = null; // added by Aiken Sam for
-                                                  // certificate decryption
-  private boolean ownerPasswordUsed;
-
-  // allow the PDF to be modified even if the owner password was not supplied
-  // if encrypted (non-encrypted documents may be modified regardless)
-  private boolean modificationAllowedWithoutOwnerPassword = true;
-
-  protected List strings = new ArrayList<>();
-  protected boolean sharedStreams = true;
-  protected boolean consolidateNamedDestinations = false;
-  protected boolean remoteToLocalNamedDestinations = false;
-  protected int rValue;
-  protected int pValue;
-  private int objNum;
-  private int objGen;
-  private int fileLength;
-  private boolean hybridXref;
-  private int lastXrefPartial = -1;
-  private boolean partial;
-
-  private PRIndirectReference cryptoRef;
-  private final PdfViewerPreferencesImp viewerPreferences = new PdfViewerPreferencesImp();
-  private boolean encryptionError;
-
-  /**
-   * Holds value of property appendable.
-   */
-  private boolean appendable;
-
-  protected PdfReader() {
-  }
-
-  /**
-   * Reads and parses a PDF document.
-   *
-   * @param filename
-   *          the file name of the document
-   * @throws IOException
-   *           on error
-   */
-  public PdfReader(String filename) throws IOException {
-    this(filename, null);
-  }
-
-  /**
-   * Reads and parses a PDF document.
-   *
-   * @param filename
-   *          the file name of the document
-   * @param ownerPassword
-   *          the password to read the document
-   * @throws IOException
-   *           on error
-   */
-  public PdfReader(String filename, byte[] ownerPassword) throws IOException {
-    password = ownerPassword;
-    tokens = new PRTokeniser(filename);
-    readPdf();
-  }
-
-  /**
-   * Reads and parses a PDF document.
-   *
-   * @param pdfIn
-   *          the byte array with the document
-   * @throws IOException
-   *           on error
-   */
-  public PdfReader(byte[] pdfIn) throws IOException {
-    this(pdfIn, null);
-  }
-
-  /**
-   * Reads and parses a PDF document.
-   *
-   * @param pdfIn
-   *          the byte array with the document
-   * @param ownerPassword
-   *          the password to read the document
-   * @throws IOException
-   *           on error
-   */
-  public PdfReader(byte[] pdfIn, byte[] ownerPassword) throws IOException {
-    password = ownerPassword;
-    tokens = new PRTokeniser(pdfIn);
-    readPdf();
-  }
-
-  /**
-   * Reads and parses a PDF document.
-   *
-   * @param filename
-   *          the file name of the document
-   * @param certificate
-   *          the certificate to read the document
-   * @param certificateKey
-   *          the private key of the certificate
-   * @param certificateKeyProvider
-   *          the security provider for certificateKey
-   * @throws IOException
-   *           on error
-   */
-  public PdfReader(String filename, Certificate certificate,
-      Key certificateKey, String certificateKeyProvider) throws IOException {
-    this.certificate = certificate;
-    this.certificateKey = certificateKey;
-    this.certificateKeyProvider = certificateKeyProvider;
-    tokens = new PRTokeniser(filename);
-    readPdf();
-  }
-
-  /**
-   * Reads and parses a PDF document.
-   *
-   * @param url
-   *          the URL of the document
-   * @throws IOException
-   *           on error
-   */
-  public PdfReader(URL url) throws IOException {
-    this(url, null);
-  }
-
-  /**
-   * Reads and parses a PDF document.
-   *
-   * @param url
-   *          the URL of the document
-   * @param ownerPassword
-   *          the password to read the document
-   * @throws IOException
-   *           on error
-   */
-  public PdfReader(URL url, byte[] ownerPassword) throws IOException {
-    password = ownerPassword;
-    tokens = new PRTokeniser(new RandomAccessFileOrArray(url));
-    readPdf();
-  }
-
-  /**
-   * Reads and parses a PDF document.
-   *
-   * @param is
-   *          the InputStream containing the document. The stream
-   *          is read to the end but is not closed
-   * @param ownerPassword
-   *          the password to read the document
-   * @throws IOException
-   *           on error
-   */
-  public PdfReader(InputStream is, byte[] ownerPassword) throws IOException {
-    password = ownerPassword;
-    tokens = new PRTokeniser(new RandomAccessFileOrArray(is));
-    readPdf();
-  }
-
-  /**
-   * Reads and parses a PDF document.
-   *
-   * @param is
-   *          the InputStream containing the document. The stream
-   *          is read to the end but is not closed
-   * @throws IOException
-   *           on error
-   */
-  public PdfReader(InputStream is) throws IOException {
-    this(is, null);
-  }
-
-  /**
-   * Reads and parses a pdf document. Contrary to the other constructors only
-   * the xref is read into memory. The reader is said to be working in "partial"
-   * mode as only parts of the pdf are read as needed. The pdf is left open but
-   * may be closed at any time with PdfReader.close(), reopen is
-   * automatic.
-   *
-   * @param raf
-   *          the document location
-   * @param ownerPassword
-   *          the password or null for no password
-   * @throws IOException
-   *           on error
-   */
-  public PdfReader(RandomAccessFileOrArray raf, byte[] ownerPassword)
-      throws IOException {
-    password = ownerPassword;
-    partial = true;
-    tokens = new PRTokeniser(raf);
-    readPdfPartial();
-  }
-
-  /**
-   * Creates an independent duplicate.
-   *
-   * @param reader
-   *          the PdfReader to duplicate
-   */
-  public PdfReader(PdfReader reader) {
-    this.appendable = reader.appendable;
-    this.consolidateNamedDestinations = reader.consolidateNamedDestinations;
-    this.encrypted = reader.encrypted;
-    this.rebuilt = reader.rebuilt;
-    this.sharedStreams = reader.sharedStreams;
-    this.tampered = reader.tampered;
-    this.password = reader.password;
-    this.pdfVersion = reader.pdfVersion;
-    this.eofPos = reader.eofPos;
-    this.freeXref = reader.freeXref;
-    this.lastXref = reader.lastXref;
-    this.tokens = new PRTokeniser(reader.tokens.getSafeFile());
-    if (reader.decrypt != null)
-      this.decrypt = new PdfEncryption(reader.decrypt);
-    this.pValue = reader.pValue;
-    this.rValue = reader.rValue;
-    this.xrefObj = new ArrayList<>(reader.xrefObj);
-    for (int k = 0; k < reader.xrefObj.size(); ++k) {
-      this.xrefObj.set(k,
-              duplicatePdfObject(reader.xrefObj.get(k), this));
-    }
-    this.pageRefs = new PageRefs(reader.pageRefs, this);
-    this.trailer = (PdfDictionary) duplicatePdfObject(reader.trailer, this);
-    this.catalog = trailer.getAsDict(PdfName.ROOT);
-    this.rootPages = catalog.getAsDict(PdfName.PAGES);
-    this.fileLength = reader.fileLength;
-    this.partial = reader.partial;
-    this.hybridXref = reader.hybridXref;
-    this.objStmToOffset = reader.objStmToOffset;
-    this.xref = reader.xref;
-    this.cryptoRef = (PRIndirectReference) duplicatePdfObject(reader.cryptoRef,
-        this);
-    this.ownerPasswordUsed = reader.ownerPasswordUsed;
-  }
-
-  /**
-   * Gets a new file instance of the original PDF document.
-   *
-   * @return a new file instance of the original PDF document
-   */
-  public RandomAccessFileOrArray getSafeFile() {
-    return tokens.getSafeFile();
-  }
-
-  protected PdfReaderInstance getPdfReaderInstance(PdfWriter writer) {
-    return new PdfReaderInstance(this, writer);
-  }
-
-  /**
-   * Gets the number of pages in the document.
-   *
-   * @return the number of pages in the document
-   */
-  public int getNumberOfPages() {
-    return pageRefs.size();
-  }
-
-  /**
-   * Returns the document's catalog. This dictionary is not a copy, any changes
-   * will be reflected in the catalog.
-   *
-   * @return the document's catalog
-   */
-  public PdfDictionary getCatalog() {
-    return catalog;
-  }
-
-  /**
-   * Returns the document's acroform, if it has one.
-   *
-   * @return the document's acroform
-   */
-  public PRAcroForm getAcroForm() {
-    if (!acroFormParsed) {
-      acroFormParsed = true;
-      PdfObject form = catalog.get(PdfName.ACROFORM);
-      if (form != null) {
-        try {
-          acroForm = new PRAcroForm(this);
-          acroForm.readAcroForm((PdfDictionary) getPdfObject(form));
-        } catch (Exception e) {
-          acroForm = null;
-        }
-      }
-    }
-    return acroForm;
-  }
-
-  /**
-   * Gets the page rotation. This value can be 0, 90, 180 or 270.
-   *
-   * @param index
-   *          the page number. The first page is 1
-   * @return the page rotation
-   */
-  public int getPageRotation(int index) {
-     return getPageRotation(pageRefs.getPageNRelease(index));
-  }
-
-  static int getPageRotation(PdfDictionary page) {
-    if(page==null) {
-        throw new NullPointerException("To get the rotation the page must not be null!");
-    }
-    PdfNumber rotate = page.getAsNumber(PdfName.ROTATE);
-    if (rotate == null)
-      return 0;
-    else {
-      int n = rotate.intValue();
-      n %= 360;
-      return n < 0 ? n + 360 : n;
-    }
-  }
-
-  /**
-   * Gets the page size, taking rotation into account. This is a
-   * Rectangle with the value of the /MediaBox and the /Rotate key.
-   *
-   * @param index
-   *          the page number. The first page is 1
-   * @return a Rectangle
-   */
-  public Rectangle getPageSizeWithRotation(int index) {
-    return getPageSizeWithRotation(pageRefs.getPageNRelease(index));
-  }
-
-  /**
-   * Gets the rotated page from a page dictionary.
-   *
-   * @param page the page dictionary
-   * @return the rotated page or null when the page does not exists
-   */
-  public Rectangle getPageSizeWithRotation(PdfDictionary page) {
-
-      if(page!=null) {
-          Rectangle rect = getPageSize(page);
-          int rotation = getPageRotation(page);
-          while (rotation > 0) {
-              rect = rect.rotate();
-              rotation -= 90;
-          }
-          return rect;
-      }
-      return null;
-  }
-
-  /** Gets the page size, taking rotation into account. This
-   * is a Rectangle with the value of a an arbitrary box and the /Rotate key.
-   * @param index the page number. The first page is 1
-   * @param boxName of the rotated box. Allowed names are: "crop", "trim", "art", "bleed" and "media".
-   * @return a Rectangle or null if the page does not exist
-   */
-  public Rectangle getPageSizeWithRotation(int index, String boxName) {
-
-      Rectangle rect = getBoxSize(index,boxName);
-      PdfDictionary page = this.pageRefs.getPageNRelease(index);
-
-      if(rect==null || page ==null) {
-          return null;
-      }
-
-      int rotation = getPageRotation(page);
-      //except for the mediabox all other boxes can be null
-      while (rotation > 0) {
-          rect = rect.rotate();
-          rotation -= 90;
-      }
-      return rect;
-  }
-
-  /**
-   * Gets the page size without taking rotation into account. This is the value
-   * of the /MediaBox key.
-   *
-   * @param index
-   *          the page number. The first page is 1
-   * @return the page size
-   */
-  public Rectangle getPageSize(int index) {
-    return getPageSize(pageRefs.getPageNRelease(index));
-  }
-
-  /**
-   * Gets the page from a page dictionary
-   *
-   * @param page
-   *          the page dictionary
-   * @return the page
-   */
-  public Rectangle getPageSize(PdfDictionary page) {
-    PdfArray mediaBox = page.getAsArray(PdfName.MEDIABOX);
-    return getNormalizedRectangle(mediaBox);
-  }
-
-  /**
-   * Gets the crop box without taking rotation into account. This is the value
-   * of the /CropBox key. The crop box is the part of the document to be
-   * displayed or printed. It usually is the same as the media box but may be
-   * smaller. If the page doesn't have a crop box the page size will be
-   * returned.
-   *
-   * @param index
-   *          the page number. The first page is 1
-   * @return the crop box
-   */
-  public Rectangle getCropBox(int index) {
-    PdfDictionary page = pageRefs.getPageNRelease(index);
-    PdfArray cropBox = (PdfArray) getPdfObjectRelease(page.get(PdfName.CROPBOX));
-    if (cropBox == null)
-      return getPageSize(page);
-    return getNormalizedRectangle(cropBox);
-  }
-
-  /**
-   * Gets the box size. Allowed names are: "crop", "trim", "art", "bleed" and
-   * "media".
-   *
-   * @param index
-   *          the page number. The first page is 1
-   * @param boxName
-   *          the box name
-   * @return the box rectangle or null
-   */
-  public Rectangle getBoxSize(int index, String boxName) {
-    PdfDictionary page = pageRefs.getPageNRelease(index);
-    PdfArray box = null;
-      switch (boxName) {
-          case "trim":
-              box = (PdfArray) getPdfObjectRelease(page.get(PdfName.TRIMBOX));
-              break;
-          case "art":
-              box = (PdfArray) getPdfObjectRelease(page.get(PdfName.ARTBOX));
-              break;
-          case "bleed":
-              box = (PdfArray) getPdfObjectRelease(page.get(PdfName.BLEEDBOX));
-              break;
-          case "crop":
-              box = (PdfArray) getPdfObjectRelease(page.get(PdfName.CROPBOX));
-              break;
-          case "media":
-              box = (PdfArray) getPdfObjectRelease(page.get(PdfName.MEDIABOX));
-              break;
-      }
-    if (box == null)
-      return null;
-    return getNormalizedRectangle(box);
-  }
-
-  /**
-   * Returns the content of the document information dictionary as a
-   * HashMap of String.
-   *
-   * @return content of the document information dictionary
-   */
-  public Map getInfo() {
-    Map map = new HashMap<>();
-    PdfDictionary info = trailer.getAsDict(PdfName.INFO);
-    if (info == null)
-      return map;
-    for (Object o : info.getKeys()) {
-      PdfName key = (PdfName) o;
-      PdfObject obj = getPdfObject(info.get(key));
-      if (obj == null)
-        continue;
-      String value = obj.toString();
-      switch (obj.type()) {
-        case PdfObject.STRING: {
-          value = ((PdfString) obj).toUnicodeString();
-          break;
-        }
-        case PdfObject.NAME: {
-          value = PdfName.decodeName(value);
-          break;
-        }
-      }
-      map.put(PdfName.decodeName(key.toString()), value);
-    }
-    return map;
-  }
-
-  /**
-   * Normalizes a Rectangle so that llx and lly are smaller than
-   * urx and ury.
-   *
-   * @param box
-   *          the original rectangle
-   * @return a normalized Rectangle
-   */
-  public static Rectangle getNormalizedRectangle(PdfArray box) {
-    float llx = ((PdfNumber) getPdfObjectRelease(box.getPdfObject(0)))
-        .floatValue();
-    float lly = ((PdfNumber) getPdfObjectRelease(box.getPdfObject(1)))
-        .floatValue();
-    float urx = ((PdfNumber) getPdfObjectRelease(box.getPdfObject(2)))
-        .floatValue();
-    float ury = ((PdfNumber) getPdfObjectRelease(box.getPdfObject(3)))
-        .floatValue();
-    return new Rectangle(Math.min(llx, urx), Math.min(lly, ury), Math.max(llx,
-        urx), Math.max(lly, ury));
-  }
-
-  protected void readPdf() throws IOException {
-    try {
-      fileLength = tokens.getFile().length();
-      pdfVersion = tokens.checkPdfHeader();
-      try {
-        readXref();
-      } catch (Exception e) {
-        try {
-          rebuilt = true;
-          rebuildXref();
-          lastXref = -1;
-        } catch (Exception ne) {
-          throw new InvalidPdfException(MessageLocalization.getComposedMessage(
-              "rebuild.failed.1.original.message.2", ne.getMessage(),
-              e.getMessage()));
-        }
-      }
-      try {
-        readDocObj();
-      } catch (Exception e) {
-        if (e instanceof BadPasswordException)
-          throw new BadPasswordException(e.getMessage());
-        if (rebuilt || encryptionError)
-          throw new InvalidPdfException(e.getMessage());
-        rebuilt = true;
-        encrypted = false;
-        rebuildXref();
-        lastXref = -1;
-        readDocObj();
-      }
-
-      strings.clear();
-      readPages();
-      //eliminateSharedStreams();
-      removeUnusedObjects();
-    } finally {
-      try {
-        tokens.close();
-      } catch (Exception e) {
-        // empty on purpose
-      }
-    }
-  }
-
-  protected void readPdfPartial() throws IOException {
-    try {
-      fileLength = tokens.getFile().length();
-      pdfVersion = tokens.checkPdfHeader();
-      try {
-        readXref();
-      } catch (Exception e) {
-        try {
-          rebuilt = true;
-          rebuildXref();
-          lastXref = -1;
-        } catch (Exception ne) {
-          throw new InvalidPdfException(MessageLocalization.getComposedMessage(
-              "rebuild.failed.1.original.message.2", ne.getMessage(),
-              e.getMessage()));
-        }
-      }
-      readDocObjPartial();
-      readPages();
-    } catch (IOException e) {
-      try {
-        tokens.close();
-      } catch (Exception ignored) {
-      }
-      throw e;
-    }
-  }
-
-  private boolean equalsArray(byte[] ar1, byte[] ar2, int size) {
-    for (int k = 0; k < size; ++k) {
-      if (ar1[k] != ar2[k])
-        return false;
+    static final PdfName[] pageInhCandidates = {PdfName.MEDIABOX,
+            PdfName.ROTATE, PdfName.RESOURCES, PdfName.CROPBOX};
+
+    private static final byte[] endstream = PdfEncodings
+            .convertToBytes("endstream", null);
+    private static final byte[] endobj = PdfEncodings.convertToBytes("endobj", null);
+    private final PdfViewerPreferencesImp viewerPreferences = new PdfViewerPreferencesImp();
+    protected PRTokeniser tokens;
+    // Each xref pair is a position
+    // type 0 -> -1, 0
+    // type 1 -> offset, 0
+    // type 2 -> index, obj num
+    protected int[] xref;
+    protected Map objStmMark;
+    protected IntHashtable objStmToOffset;
+    protected boolean newXrefType;
+    protected PdfDictionary trailer;
+    protected PdfDictionary catalog;
+    protected PageRefs pageRefs;
+    protected PRAcroForm acroForm = null;
+    protected boolean acroFormParsed = false;
+    protected boolean encrypted = false;
+    protected boolean rebuilt = false;
+    protected int freeXref;
+    protected boolean tampered = false;
+    protected int lastXref;
+    protected int eofPos;
+    protected char pdfVersion;
+    protected PdfEncryption decrypt;
+    protected byte[] password = null; // added by ujihara for decryption
+    protected Key certificateKey = null; // added by Aiken Sam for certificate
+    // decryption
+    protected Certificate certificate = null; // added by Aiken Sam for
+    // certificate decryption
+    protected String certificateKeyProvider = null; // added by Aiken Sam for
+    protected List strings = new ArrayList<>();
+    protected boolean sharedStreams = true;
+    protected boolean consolidateNamedDestinations = false;
+    protected boolean remoteToLocalNamedDestinations = false;
+    protected int rValue;
+    protected int pValue;
+    PdfDictionary rootPages;
+    private List xrefObj;
+    // certificate decryption
+    private boolean ownerPasswordUsed;
+    // allow the PDF to be modified even if the owner password was not supplied
+    // if encrypted (non-encrypted documents may be modified regardless)
+    private boolean modificationAllowedWithoutOwnerPassword = true;
+    private int objNum;
+    private int objGen;
+    private int fileLength;
+    private boolean hybridXref;
+    private int lastXrefPartial = -1;
+    private boolean partial;
+    private PRIndirectReference cryptoRef;
+    private boolean encryptionError;
+
+    /**
+     * Holds value of property appendable.
+     */
+    private boolean appendable;
+    // Track how deeply nested the current object is, so
+    // we know when to return an individual null or boolean, or
+    // reuse one of the static ones.
+    private int readDepth = 0;
+
+    protected PdfReader() {
     }
-    return true;
-  }
-
-  /**
-   */
-  private void readDecryptedDocObj() throws IOException {
-    if (encrypted)
-      return;
-    if (trailer == null) {
-      return;
-    }
-    PdfObject encDic = trailer.get(PdfName.ENCRYPT);
-    if (encDic == null || encDic.toString().equals("null"))
-      return;
-    encryptionError = true;
-    byte[] encryptionKey = null;
-    encrypted = true;
-    PdfDictionary enc = (PdfDictionary) getPdfObject(encDic);
-
-    String s;
-    PdfObject o;
-
-    PdfArray documentIDs = trailer.getAsArray(PdfName.ID);
-    byte[] documentID = null;
-    if (documentIDs != null) {
-      o = documentIDs.getPdfObject(0);
-      strings.remove(o);
-      s = o.toString();
-      documentID = com.lowagie.text.DocWriter.getISOBytes(s);
-      if (documentIDs.size() > 1)
-        strings.remove(documentIDs.getPdfObject(1));
-    }
-    // just in case we have a broken producer
-    if (documentID == null)
-      documentID = new byte[0];
-    byte[] uValue = null;
-    byte[] oValue = null;
-    int cryptoMode = PdfWriter.STANDARD_ENCRYPTION_40;
-    int lengthValue = 0;
-
-    PdfObject filter = getPdfObjectRelease(enc.get(PdfName.FILTER));
-
-    if (filter.equals(PdfName.STANDARD)) {
-      s = enc.get(PdfName.U).toString();
-      strings.remove(enc.get(PdfName.U));
-      uValue = com.lowagie.text.DocWriter.getISOBytes(s);
-      s = enc.get(PdfName.O).toString();
-      strings.remove(enc.get(PdfName.O));
-      oValue = com.lowagie.text.DocWriter.getISOBytes(s);
-
-      o = enc.get(PdfName.P);
-      if (!o.isNumber())
-        throw new InvalidPdfException(
-            MessageLocalization.getComposedMessage("illegal.p.value"));
-      pValue = ((PdfNumber) o).intValue();
-
-      o = enc.get(PdfName.R);
-      if (!o.isNumber())
-        throw new InvalidPdfException(
-            MessageLocalization.getComposedMessage("illegal.r.value"));
-      rValue = ((PdfNumber) o).intValue();
-
-      switch (rValue) {
-      case 2:
-        cryptoMode = PdfWriter.STANDARD_ENCRYPTION_40;
-        break;
-      case 3:
-        o = enc.get(PdfName.LENGTH);
-        if (!o.isNumber())
-          throw new InvalidPdfException(
-              MessageLocalization.getComposedMessage("illegal.length.value"));
-        lengthValue = ((PdfNumber) o).intValue();
-        if (lengthValue > 128 || lengthValue < 40 || lengthValue % 8 != 0)
-          throw new InvalidPdfException(
-              MessageLocalization.getComposedMessage("illegal.length.value"));
-        cryptoMode = PdfWriter.STANDARD_ENCRYPTION_128;
-        break;
-      case 4:
-        PdfDictionary dic = (PdfDictionary) enc.get(PdfName.CF);
-        if (dic == null)
-          throw new InvalidPdfException(
-              MessageLocalization.getComposedMessage("cf.not.found.encryption"));
-        dic = (PdfDictionary) dic.get(PdfName.STDCF);
-        if (dic == null)
-          throw new InvalidPdfException(
-              MessageLocalization
-                  .getComposedMessage("stdcf.not.found.encryption"));
-        if (PdfName.V2.equals(dic.get(PdfName.CFM)))
-          cryptoMode = PdfWriter.STANDARD_ENCRYPTION_128;
-        else if (PdfName.AESV2.equals(dic.get(PdfName.CFM)))
-          cryptoMode = PdfWriter.ENCRYPTION_AES_128;
-        else
-          throw new UnsupportedPdfException(
-              MessageLocalization
-                  .getComposedMessage("no.compatible.encryption.found"));
-        PdfObject em = enc.get(PdfName.ENCRYPTMETADATA);
-        if (em != null && em.toString().equals("false"))
-          cryptoMode |= PdfWriter.DO_NOT_ENCRYPT_METADATA;
-        break;
-      case 6:
-        cryptoMode = PdfWriter.ENCRYPTION_AES_256_V3;
-        em = enc.get(PdfName.ENCRYPTMETADATA);
-        if (em != null && em.toString().equals("false"))
-          cryptoMode |= PdfWriter.DO_NOT_ENCRYPT_METADATA;
-        break;
-      default:
-        throw new UnsupportedPdfException(
-            MessageLocalization.getComposedMessage(
-                "unknown.encryption.type.r.eq.1", rValue));
-      }
-    } else if (filter.equals(PdfName.PUBSEC)) {
-      PdfArray recipients;
-
-      o = enc.get(PdfName.V);
-      if (!o.isNumber())
-        throw new InvalidPdfException(
-            MessageLocalization.getComposedMessage("illegal.v.value"));
-      int vValue = ((PdfNumber) o).intValue();
-      switch (vValue) {
-      case 1:
-        cryptoMode = PdfWriter.STANDARD_ENCRYPTION_40;
-        lengthValue = 40;
-        recipients = (PdfArray) enc.get(PdfName.RECIPIENTS);
-        break;
-      case 2:
-        o = enc.get(PdfName.LENGTH);
-        if (!o.isNumber())
-          throw new InvalidPdfException(
-              MessageLocalization.getComposedMessage("illegal.length.value"));
-        lengthValue = ((PdfNumber) o).intValue();
-        if (lengthValue > 128 || lengthValue < 40 || lengthValue % 8 != 0)
-          throw new InvalidPdfException(
-              MessageLocalization.getComposedMessage("illegal.length.value"));
-        cryptoMode = PdfWriter.STANDARD_ENCRYPTION_128;
-        recipients = (PdfArray) enc.get(PdfName.RECIPIENTS);
-        break;
-      case 4:
-        PdfDictionary dic = (PdfDictionary) enc.get(PdfName.CF);
-        if (dic == null)
-          throw new InvalidPdfException(
-              MessageLocalization.getComposedMessage("cf.not.found.encryption"));
-        dic = (PdfDictionary) dic.get(PdfName.DEFAULTCRYPTFILTER);
-        if (dic == null)
-          throw new InvalidPdfException(
-              MessageLocalization
-                  .getComposedMessage("defaultcryptfilter.not.found.encryption"));
-        if (PdfName.V2.equals(dic.get(PdfName.CFM))) {
-          cryptoMode = PdfWriter.STANDARD_ENCRYPTION_128;
-          lengthValue = 128;
-        } else if (PdfName.AESV2.equals(dic.get(PdfName.CFM))) {
-          cryptoMode = PdfWriter.ENCRYPTION_AES_128;
-          lengthValue = 128;
-        } else
-          throw new UnsupportedPdfException(
-              MessageLocalization
-                  .getComposedMessage("no.compatible.encryption.found"));
-        PdfObject em = dic.get(PdfName.ENCRYPTMETADATA);
-        if (em != null && em.toString().equals("false"))
-          cryptoMode |= PdfWriter.DO_NOT_ENCRYPT_METADATA;
-
-        recipients = (PdfArray) dic.get(PdfName.RECIPIENTS);
-        break;
-      default:
-        throw new UnsupportedPdfException(
-            MessageLocalization.getComposedMessage(
-                "unknown.encryption.type.v.eq.1", rValue));
-      }
-      BouncyCastleHelper.checkCertificateEncodingOrThrowException(certificate);
-      byte[] envelopedData = BouncyCastleHelper.getEnvelopedData(recipients, strings, certificate, certificateKey, certificateKeyProvider);
-
-      if (envelopedData == null) {
-        throw new UnsupportedPdfException(
-            MessageLocalization.getComposedMessage("bad.certificate.and.key"));
-      }
-
-      MessageDigest md;
-
-      try {
-        md = MessageDigest.getInstance("SHA-1");
-        md.update(envelopedData, 0, 20);
-        for (int i = 0; i < recipients.size(); i++) {
-          byte[] encodedRecipient = recipients.getPdfObject(i).getBytes();
-          md.update(encodedRecipient);
-        }
-        if ((cryptoMode & PdfWriter.DO_NOT_ENCRYPT_METADATA) != 0)
-          md.update(new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255 });
-        encryptionKey = md.digest();
-      } catch (Exception f) {
-        throw new ExceptionConverter(f);
-      }
-    }
-
-    decrypt = new PdfEncryption();
-    decrypt.setCryptoMode(cryptoMode, lengthValue);
-
-    if (filter.equals(PdfName.STANDARD)) {
-      if (rValue < 6) {
-        // check by owner password
-        decrypt.setupByOwnerPassword(documentID, password, uValue, oValue, pValue);
-        if (!equalsArray(uValue, decrypt.userKey,
-            (rValue == 3 || rValue == 4) ? 16 : 32)) {
-          // check by user password
-          decrypt.setupByUserPassword(documentID, password, oValue, pValue);
-          if (!equalsArray(uValue, decrypt.userKey,
-              (rValue == 3 || rValue == 4) ? 16 : 32)) {
-            throw new BadPasswordException(
-                MessageLocalization.getComposedMessage("bad.user.password"));
-          }
-        } else
-          ownerPasswordUsed = true;
-      } else {
-        // implements Algorithm 2.A: Retrieving the file encryption key from an encrypted document in order to decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3
-        s = enc.get(PdfName.UE).toString();
-        strings.remove(enc.get(PdfName.UE));
-        byte[] ueValue = com.lowagie.text.DocWriter.getISOBytes(s);
-        s = enc.get(PdfName.OE).toString();
-        strings.remove(enc.get(PdfName.OE));
-        byte[] oeValue = com.lowagie.text.DocWriter.getISOBytes(s);
-        s = enc.get(PdfName.PERMS).toString();
-        strings.remove(enc.get(PdfName.PERMS));
-        byte[] permsValue = com.lowagie.text.DocWriter.getISOBytes(s);
-
-        // step b of Algorithm 2.A
-        byte[] password = this.password;
-        if (password == null)
-          password = new byte[0];
-        else if (password.length > 127)
-          password = Arrays.copyOf(password, 127);
-
-        // According to ISO 32000-2 the uValue is expected to be 48 bytes in length.
-        // Actual documents from the wild tend to have the uValue filled with zeroes
-        // to a 127 bytes length. As input to computeHash for owner password related
-        // operations, though, we must only use the 48 bytes.
-        if (uValue != null && uValue.length > 48)
-            uValue = Arrays.copyOf(uValue, 48);
 
-        try {
-          // step c of Algorithm 2.A
-          byte[] hashAlg2B = decrypt.hashAlg2B(password, Arrays.copyOfRange(oValue, 32, 40), uValue);
-          if (equalsArray(hashAlg2B, oValue, 32)) {
-            // step d of Algorithm 2.A
-            decrypt.setupByOwnerPassword(documentID, password, uValue, ueValue, oValue, oeValue, pValue);
-            // step f of Algorithm 2.A
-            if (decrypt.decryptAndCheckPerms(permsValue))
-              ownerPasswordUsed = true;
-          }
-
-          if (!ownerPasswordUsed) {
-            // analog of step c of Algorithm 2.A for user password
-            hashAlg2B = decrypt.hashAlg2B(password, Arrays.copyOfRange(uValue, 32, 40), null);
-            if (!equalsArray(hashAlg2B, uValue, 32))
-              throw new BadPasswordException(MessageLocalization.getComposedMessage("bad.user.password"));
-            // step e of Algorithm 2.A
-            decrypt.setupByUserPassword(documentID, password, uValue, ueValue, oValue, oeValue, pValue);
-            // step f of Algorithm 2.A
-            if (!decrypt.decryptAndCheckPerms(permsValue))
-              throw new BadPasswordException(MessageLocalization.getComposedMessage("bad.user.password"));
-          }
-          pValue = decrypt.permissions;
-        } catch (IOException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new IOException(e);
-        }
-      }
-    } else if (filter.equals(PdfName.PUBSEC)) {
-      decrypt.setupByEncryptionKey(encryptionKey, lengthValue);
-      ownerPasswordUsed = true;
-    }
-
-    for (Object string : strings) {
-      PdfString str = (PdfString) string;
-      str.decrypt(this);
-    }
-
-    if (encDic.isIndirect()) {
-      cryptoRef = (PRIndirectReference) encDic;
-      xrefObj.set(cryptoRef.getNumber(), null);
-    }
-    encryptionError = false;
-  }
-
-  /**
-   * @param obj an object of {@link PdfObject}
-   * @return a PdfObject
-   */
-  public static PdfObject getPdfObjectRelease(PdfObject obj) {
-    PdfObject obj2 = getPdfObject(obj);
-    releaseLastXrefPartial(obj);
-    return obj2;
-  }
-
-  /**
-   * If given object is instance of {@link PdfNull}, then {@code null} is returned. The provided object otherwise.
-   *
-   * @param obj object to convert
-   * @return provided object or null
-   */
-  public static PdfObject convertPdfNull(PdfObject obj) {
-      if (obj == null || obj instanceof PdfNull) {
-          return null;
-      }
-      return obj;
-  }
-
-  /**
-   * Returns {@link #getPdfObjectRelease(PdfObject)} with applied {@link #convertPdfNull(PdfObject)}.
-   */
-  public static PdfObject getPdfObjectReleaseNullConverting(PdfObject obj) {
-      return convertPdfNull(getPdfObjectRelease(obj));
-  }
-
-  /**
-   * Reads a PdfObject resolving an indirect reference if needed.
-   *
-   * @param obj
-   *          the PdfObject to read
-   * @return the resolved PdfObject
-   */
-  public static PdfObject getPdfObject(PdfObject obj) {
-    if (obj == null)
-      return null;
-    if (!obj.isIndirect())
-      return obj;
-    try {
-      PRIndirectReference ref = (PRIndirectReference) obj;
-      int idx = ref.getNumber();
-      boolean appendable = ref.getReader().appendable;
-      obj = ref.getReader().getPdfObject(idx);
-      if (obj == null) {
-        return null;
-      } else {
-        if (appendable) {
-          switch (obj.type()) {
-          case PdfObject.NULL:
-            obj = new PdfNull();
-            break;
-          case PdfObject.BOOLEAN:
-            obj = new PdfBoolean(((PdfBoolean) obj).booleanValue());
-            break;
-          case PdfObject.NAME:
-            obj = new PdfName(obj.getBytes());
-            break;
-          }
-          obj.setIndRef(ref);
+    /**
+     * Reads and parses a PDF document.
+     *
+     * @param filename the file name of the document
+     * @throws IOException on error
+     */
+    public PdfReader(String filename) throws IOException {
+        this(filename, null);
+    }
+
+    /**
+     * Reads and parses a PDF document.
+     *
+     * @param filename      the file name of the document
+     * @param ownerPassword the password to read the document
+     * @throws IOException on error
+     */
+    public PdfReader(String filename, byte[] ownerPassword) throws IOException {
+        password = ownerPassword;
+        tokens = new PRTokeniser(filename);
+        readPdf();
+    }
+
+    /**
+     * Reads and parses a PDF document.
+     *
+     * @param pdfIn the byte array with the document
+     * @throws IOException on error
+     */
+    public PdfReader(byte[] pdfIn) throws IOException {
+        this(pdfIn, null);
+    }
+
+    /**
+     * Reads and parses a PDF document.
+     *
+     * @param pdfIn         the byte array with the document
+     * @param ownerPassword the password to read the document
+     * @throws IOException on error
+     */
+    public PdfReader(byte[] pdfIn, byte[] ownerPassword) throws IOException {
+        password = ownerPassword;
+        tokens = new PRTokeniser(pdfIn);
+        readPdf();
+    }
+
+    /**
+     * Reads and parses a PDF document.
+     *
+     * @param filename               the file name of the document
+     * @param certificate            the certificate to read the document
+     * @param certificateKey         the private key of the certificate
+     * @param certificateKeyProvider the security provider for certificateKey
+     * @throws IOException on error
+     */
+    public PdfReader(String filename, Certificate certificate,
+            Key certificateKey, String certificateKeyProvider) throws IOException {
+        this.certificate = certificate;
+        this.certificateKey = certificateKey;
+        this.certificateKeyProvider = certificateKeyProvider;
+        tokens = new PRTokeniser(filename);
+        readPdf();
+    }
+
+    /**
+     * Reads and parses a PDF document.
+     *
+     * @param url the URL of the document
+     * @throws IOException on error
+     */
+    public PdfReader(URL url) throws IOException {
+        this(url, null);
+    }
+
+    /**
+     * Reads and parses a PDF document.
+     *
+     * @param url           the URL of the document
+     * @param ownerPassword the password to read the document
+     * @throws IOException on error
+     */
+    public PdfReader(URL url, byte[] ownerPassword) throws IOException {
+        password = ownerPassword;
+        tokens = new PRTokeniser(new RandomAccessFileOrArray(url));
+        readPdf();
+    }
+
+    /**
+     * Reads and parses a PDF document.
+     *
+     * @param is            the InputStream containing the document. The stream is read to the end but is
+     *                      not closed
+     * @param ownerPassword the password to read the document
+     * @throws IOException on error
+     */
+    public PdfReader(InputStream is, byte[] ownerPassword) throws IOException {
+        password = ownerPassword;
+        tokens = new PRTokeniser(new RandomAccessFileOrArray(is));
+        readPdf();
+    }
+
+    /**
+     * Reads and parses a PDF document.
+     *
+     * @param is the InputStream containing the document. The stream is read to the end but is not closed
+     * @throws IOException on error
+     */
+    public PdfReader(InputStream is) throws IOException {
+        this(is, null);
+    }
+
+    /**
+     * Reads and parses a pdf document. Contrary to the other constructors only the xref is read into memory. The reader
+     * is said to be working in "partial" mode as only parts of the pdf are read as needed. The pdf is left open but may
+     * be closed at any time with PdfReader.close(), reopen is automatic.
+     *
+     * @param raf           the document location
+     * @param ownerPassword the password or null for no password
+     * @throws IOException on error
+     */
+    public PdfReader(RandomAccessFileOrArray raf, byte[] ownerPassword)
+            throws IOException {
+        password = ownerPassword;
+        partial = true;
+        tokens = new PRTokeniser(raf);
+        readPdfPartial();
+    }
+
+    /**
+     * Creates an independent duplicate.
+     *
+     * @param reader the PdfReader to duplicate
+     */
+    public PdfReader(PdfReader reader) {
+        this.appendable = reader.appendable;
+        this.consolidateNamedDestinations = reader.consolidateNamedDestinations;
+        this.encrypted = reader.encrypted;
+        this.rebuilt = reader.rebuilt;
+        this.sharedStreams = reader.sharedStreams;
+        this.tampered = reader.tampered;
+        this.password = reader.password;
+        this.pdfVersion = reader.pdfVersion;
+        this.eofPos = reader.eofPos;
+        this.freeXref = reader.freeXref;
+        this.lastXref = reader.lastXref;
+        this.tokens = new PRTokeniser(reader.tokens.getSafeFile());
+        if (reader.decrypt != null) {
+            this.decrypt = new PdfEncryption(reader.decrypt);
+        }
+        this.pValue = reader.pValue;
+        this.rValue = reader.rValue;
+        this.xrefObj = new ArrayList<>(reader.xrefObj);
+        for (int k = 0; k < reader.xrefObj.size(); ++k) {
+            this.xrefObj.set(k,
+                    duplicatePdfObject(reader.xrefObj.get(k), this));
+        }
+        this.pageRefs = new PageRefs(reader.pageRefs, this);
+        this.trailer = (PdfDictionary) duplicatePdfObject(reader.trailer, this);
+        this.catalog = trailer.getAsDict(PdfName.ROOT);
+        this.rootPages = catalog.getAsDict(PdfName.PAGES);
+        this.fileLength = reader.fileLength;
+        this.partial = reader.partial;
+        this.hybridXref = reader.hybridXref;
+        this.objStmToOffset = reader.objStmToOffset;
+        this.xref = reader.xref;
+        this.cryptoRef = (PRIndirectReference) duplicatePdfObject(reader.cryptoRef,
+                this);
+        this.ownerPasswordUsed = reader.ownerPasswordUsed;
+    }
+
+    static int getPageRotation(PdfDictionary page) {
+        if (page == null) {
+            throw new NullPointerException("To get the rotation the page must not be null!");
+        }
+        PdfNumber rotate = page.getAsNumber(PdfName.ROTATE);
+        if (rotate == null) {
+            return 0;
+        } else {
+            int n = rotate.intValue();
+            n %= 360;
+            return n < 0 ? n + 360 : n;
         }
-        return obj;
-      }
-    } catch (Exception e) {
-      throw new ExceptionConverter(e);
-    }
-  }
-
-  /**
-   * Reads a PdfObject resolving an indirect reference if needed.
-   * If the reader was opened in partial mode the object will be released to
-   * save memory.
-   *
-   * @param obj the PdfObject to read
-   * @param parent parent object
-   * @return a PdfObject
-   */
-  public static PdfObject getPdfObjectRelease(PdfObject obj, PdfObject parent) {
-    PdfObject obj2 = getPdfObject(obj, parent);
-    releaseLastXrefPartial(obj);
-    return obj2;
-  }
-
-  /**
-   * @param obj the PdfObject to read
-   * @param parent parent object
-   * @return a PdfObject
-   */
-  public static PdfObject getPdfObject(PdfObject obj, PdfObject parent) {
-    if (obj == null)
-      return null;
-    if (!obj.isIndirect()) {
-      PRIndirectReference ref;
-      if (parent != null && (ref = parent.getIndRef()) != null
-          && ref.getReader().isAppendable()) {
-        switch (obj.type()) {
-        case PdfObject.NULL:
-          obj = new PdfNull();
-          break;
-        case PdfObject.BOOLEAN:
-          obj = new PdfBoolean(((PdfBoolean) obj).booleanValue());
-          break;
-        case PdfObject.NAME:
-          obj = new PdfName(obj.getBytes());
-          break;
-        }
-        obj.setIndRef(ref);
-      }
-      return obj;
-    }
-    return getPdfObject(obj);
-  }
-
-  /**
-   * Returns {@link #getPdfObject(PdfObject, PdfObject)} with applied {@link #convertPdfNull(PdfObject)}.
-   */
-  public static PdfObject getPdfObjectNullConverting(PdfObject obj, PdfObject parent) {
-      return convertPdfNull(getPdfObject(obj, parent));
-  }
-
-  /**
-   * @param idx index
-   * @return a PdfObject
-   */
-  public PdfObject getPdfObjectRelease(int idx) {
-    PdfObject obj = getPdfObject(idx);
-    releaseLastXrefPartial();
-    return obj;
-  }
-
-  /**
-   * @param idx index
-   * @return aPdfObject
-   */
-  public PdfObject getPdfObject(int idx) {
-    try {
-      lastXrefPartial = -1;
-      if (idx < 0 || idx >= xrefObj.size())
-        return null;
-      PdfObject obj = xrefObj.get(idx);
-      if (!partial || obj != null)
-        return obj;
-      if (idx * 2 >= xref.length)
-        return null;
-      obj = readSingleObject(idx);
-      lastXrefPartial = -1;
-      if (obj != null)
-        lastXrefPartial = idx;
-      return obj;
-    } catch (Exception e) {
-      throw new ExceptionConverter(e);
     }
-  }
 
-  /**
+    /**
+     * Normalizes a Rectangle so that llx and lly are smaller than urx and ury.
      *
+     * @param box the original rectangle
+     * @return a normalized Rectangle
+     */
+    public static Rectangle getNormalizedRectangle(PdfArray box) {
+        float llx = ((PdfNumber) getPdfObjectRelease(box.getPdfObject(0)))
+                .floatValue();
+        float lly = ((PdfNumber) getPdfObjectRelease(box.getPdfObject(1)))
+                .floatValue();
+        float urx = ((PdfNumber) getPdfObjectRelease(box.getPdfObject(2)))
+                .floatValue();
+        float ury = ((PdfNumber) getPdfObjectRelease(box.getPdfObject(3)))
+                .floatValue();
+        return new Rectangle(Math.min(llx, urx), Math.min(lly, ury), Math.max(llx,
+                urx), Math.max(lly, ury));
+    }
+
+    /**
+     * @param obj an object of {@link PdfObject}
+     * @return a PdfObject
      */
-  public void resetLastXrefPartial() {
-    lastXrefPartial = -1;
-  }
+    public static PdfObject getPdfObjectRelease(PdfObject obj) {
+        PdfObject obj2 = getPdfObject(obj);
+        releaseLastXrefPartial(obj);
+        return obj2;
+    }
 
-  /**
+    /**
+     * If given object is instance of {@link PdfNull}, then {@code null} is returned. The provided object otherwise.
      *
+     * @param obj object to convert
+     * @return provided object or null
      */
-  public void releaseLastXrefPartial() {
-    if (partial && lastXrefPartial != -1) {
-      xrefObj.set(lastXrefPartial, null);
-      lastXrefPartial = -1;
-    }
-  }
-
-  /**
-   * @param obj an object of {@link PdfObject}
-   */
-  public static void releaseLastXrefPartial(PdfObject obj) {
-    if (obj == null)
-      return;
-    if (!obj.isIndirect())
-      return;
-    if (!(obj instanceof PRIndirectReference))
-      return;
-
-    PRIndirectReference ref = (PRIndirectReference) obj;
-    PdfReader reader = ref.getReader();
-    if (reader.partial && reader.lastXrefPartial != -1
-        && reader.lastXrefPartial == ref.getNumber()) {
-      reader.xrefObj.set(reader.lastXrefPartial, null);
-    }
-    reader.lastXrefPartial = -1;
-  }
-
-  private void setXrefPartialObject(int idx, PdfObject obj) {
-    if (!partial || idx < 0)
-      return;
-    xrefObj.set(idx, obj);
-  }
-
-  /**
-   * @param obj an object of {@link PdfObject}
-   * @return an indirect reference
-   */
-  public PRIndirectReference addPdfObject(PdfObject obj) {
-    xrefObj.add(obj);
-    return new PRIndirectReference(this, xrefObj.size() - 1);
-  }
-
-  protected void readPages() throws IOException {
-    catalog = trailer.getAsDict(PdfName.ROOT);
-    rootPages = catalog.getAsDict(PdfName.PAGES);
-    pageRefs = new PageRefs(this);
-  }
-
-  protected void readDocObjPartial() throws IOException {
-    xrefObj = new ArrayList<>(xref.length / 2);
-    xrefObj.addAll(Collections.nCopies(xref.length / 2, null));
-    readDecryptedDocObj();
-    if (objStmToOffset != null) {
-      int[] keys = objStmToOffset.getKeys();
-      for (int n : keys) {
-        objStmToOffset.put(n, xref[n * 2]);
-        xref[n * 2] = -1;
-      }
-    }
-  }
-
-  protected PdfObject readSingleObject(int k) throws IOException {
-    strings.clear();
-    int k2 = k * 2;
-    int pos = xref[k2];
-    if (pos < 0)
-      return null;
-    if (xref[k2 + 1] > 0)
-      pos = objStmToOffset.get(xref[k2 + 1]);
-    if (pos == 0)
-      return null;
-    tokens.seek(pos);
-    tokens.nextValidToken();
-    if (tokens.getTokenType() != PRTokeniser.TK_NUMBER)
-      tokens.throwError(MessageLocalization
-          .getComposedMessage("invalid.object.number"));
-    objNum = tokens.intValue();
-    tokens.nextValidToken();
-    if (tokens.getTokenType() != PRTokeniser.TK_NUMBER)
-      tokens.throwError(MessageLocalization
-          .getComposedMessage("invalid.generation.number"));
-    objGen = tokens.intValue();
-    tokens.nextValidToken();
-    if (!tokens.getStringValue().equals("obj"))
-      tokens.throwError(MessageLocalization
-          .getComposedMessage("token.obj.expected"));
-    PdfObject obj;
-    try {
-      obj = readPRObject();
-      for (PdfObject string : strings) {
-        PdfString str = (PdfString) string;
-        str.decrypt(this);
-      }
-      if (obj.isStream()) {
-        checkPRStreamLength((PRStream) obj);
-      }
-    } catch (Exception e) {
-      obj = null;
-    }
-    if (xref[k2 + 1] > 0) {
-      obj = readOneObjStm((PRStream) obj, xref[k2]);
-    }
-    xrefObj.set(k, obj);
-    return obj;
-  }
-
-  protected PdfObject readOneObjStm(PRStream stream, int idx)
-      throws IOException {
-    int first = stream.getAsNumber(PdfName.FIRST).intValue();
-    byte[] b = getStreamBytes(stream, tokens.getFile());
-    PRTokeniser saveTokens = tokens;
-    tokens = new PRTokeniser(b);
-    try {
-      int address = 0;
-      boolean ok = true;
-      ++idx;
-      for (int k = 0; k < idx; ++k) {
-        ok = tokens.nextToken();
-        if (!ok)
-          break;
-        if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
-          ok = false;
-          break;
+    public static PdfObject convertPdfNull(PdfObject obj) {
+        if (obj == null || obj instanceof PdfNull) {
+            return null;
         }
-        ok = tokens.nextToken();
-        if (!ok)
-          break;
-        if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
-          ok = false;
-          break;
-        }
-        address = tokens.intValue() + first;
-      }
-      if (!ok)
-        throw new InvalidPdfException(
-            MessageLocalization.getComposedMessage("error.reading.objstm"));
-      tokens.seek(address);
-      return readPRObject();
-    } finally {
-      tokens = saveTokens;
-    }
-  }
-
-  /**
-   * @return the percentage of the cross reference table that has been read
-   */
-  public double dumpPerc() {
-    int total = 0;
-    for (PdfObject aXrefObj : xrefObj) {
-      if (aXrefObj != null)
-        ++total;
-    }
-    return (total * 100.0 / xrefObj.size());
-  }
-
-  protected void readDocObj() throws IOException {
-    List streams = new ArrayList<>();
-    xrefObj = new ArrayList<>(xref.length / 2);
-    xrefObj.addAll(Collections.nCopies(xref.length / 2, null));
-    for (int k = 2; k < xref.length; k += 2) {
-      int pos = xref[k];
-      if (pos <= 0 || ((xref.length > k + 1) && (xref[k + 1] > 0))) {
-        continue;
-      }
-      tokens.seek(pos);
-      tokens.nextValidToken();
-      if (tokens.getTokenType() != PRTokeniser.TK_NUMBER)
-        tokens.throwError(MessageLocalization
-            .getComposedMessage("invalid.object.number"));
-      objNum = tokens.intValue();
-      tokens.nextValidToken();
-      if (tokens.getTokenType() != PRTokeniser.TK_NUMBER)
-        tokens.throwError(MessageLocalization
-            .getComposedMessage("invalid.generation.number"));
-      objGen = tokens.intValue();
-      tokens.nextValidToken();
-      if (!tokens.getStringValue().equals("obj"))
-        tokens.throwError(MessageLocalization
-            .getComposedMessage("token.obj.expected"));
-      PdfObject obj;
-      try {
-        obj = readPRObject();
-        if (obj.isStream()) {
-          streams.add(obj);
-        }
-      } catch (Exception e) {
-        obj = null;
-      }
-      xrefObj.set(k / 2, obj);
-    }
-    for (PdfObject stream : streams) {
-      checkPRStreamLength((PRStream) stream);
-    }
-    readDecryptedDocObj();
-    if (objStmMark != null) {
-      for (Object o : objStmMark.entrySet()) {
-        Map.Entry entry = (Map.Entry) o;
-        int n = (Integer) entry.getKey();
-        IntHashtable h = (IntHashtable) entry.getValue();
-        readObjStm((PRStream) xrefObj.get(n), h);
-        xrefObj.set(n, null);
-      }
-      objStmMark = null;
-    }
-    xref = null;
-  }
-
-  private void checkPRStreamLength(PRStream stream) throws IOException {
-    int fileLength = tokens.length();
-    int start = stream.getOffset();
-    boolean calc = false;
-    int streamLength = 0;
-    PdfObject obj = getPdfObjectRelease(stream.get(PdfName.LENGTH));
-    if (obj != null && obj.type() == PdfObject.NUMBER) {
-      streamLength = ((PdfNumber) obj).intValue();
-      if (streamLength + start > fileLength - 20)
-        calc = true;
-      else {
-        tokens.seek(start + streamLength);
-        String line = tokens.readString(20);
-        if (!line.startsWith("\nendstream")
-            && !line.startsWith("\r\nendstream")
-            && !line.startsWith("\rendstream") && !line.startsWith("endstream"))
-          calc = true;
-      }
-    } else
-      calc = true;
-    if (calc) {
-      byte[] tline = new byte[16];
-      tokens.seek(start);
-      while (true) {
-        int pos = tokens.getFilePointer();
-        if (!tokens.readLineSegment(tline))
-          break;
-        if (equalsn(tline, endstream)) {
-          streamLength = pos - start;
-          break;
-        }
-        if (equalsn(tline, endobj)) {
-          tokens.seek(pos - 16);
-          String s = tokens.readString(16);
-          int index = s.indexOf("endstream");
-          if (index >= 0)
-            pos = pos - 16 + index;
-          streamLength = pos - start;
-          break;
-        }
-      }
-    }
-    stream.setLength(streamLength);
-  }
-
-  protected void readObjStm(PRStream stream, IntHashtable map)
-      throws IOException {
-    int first = stream.getAsNumber(PdfName.FIRST).intValue();
-    int n = stream.getAsNumber(PdfName.N).intValue();
-    byte[] b = getStreamBytes(stream, tokens.getFile());
-    PRTokeniser saveTokens = tokens;
-    tokens = new PRTokeniser(b);
-    try {
-      int[] address = new int[n];
-      int[] objNumber = new int[n];
-      boolean ok = true;
-      for (int k = 0; k < n; ++k) {
-        ok = tokens.nextToken();
-        if (!ok)
-          break;
-        if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
-          ok = false;
-          break;
+        return obj;
+    }
+
+    /**
+     * Returns {@link #getPdfObjectRelease(PdfObject)} with applied {@link #convertPdfNull(PdfObject)}.
+     */
+    public static PdfObject getPdfObjectReleaseNullConverting(PdfObject obj) {
+        return convertPdfNull(getPdfObjectRelease(obj));
+    }
+
+    /**
+     * Reads a PdfObject resolving an indirect reference if needed.
+     *
+     * @param obj the PdfObject to read
+     * @return the resolved PdfObject
+     */
+    public static PdfObject getPdfObject(PdfObject obj) {
+        if (obj == null) {
+            return null;
+        }
+        if (!obj.isIndirect()) {
+            return obj;
         }
-        objNumber[k] = tokens.intValue();
-        ok = tokens.nextToken();
-        if (!ok)
-          break;
-        if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
-          ok = false;
-          break;
-        }
-        address[k] = tokens.intValue() + first;
-      }
-      if (!ok)
-        throw new InvalidPdfException(
-            MessageLocalization.getComposedMessage("error.reading.objstm"));
-      for (int k = 0; k < n; ++k) {
-        if (map.containsKey(k)) {
-          tokens.seek(address[k]);
-          PdfObject obj = readPRObject();
-          xrefObj.set(objNumber[k], obj);
-        }
-      }
-    } finally {
-      tokens = saveTokens;
-    }
-  }
-
-  /**
-   * Eliminates the reference to the object freeing the memory used by it and
-   * clearing the xref entry.
-   *
-   * @param obj
-   *          the object. If it's an indirect reference it will be eliminated
-   * @return the object or the already erased dereferenced object
-   */
-  public static PdfObject killIndirect(PdfObject obj) {
-    if (obj == null || obj.isNull())
-      return null;
-    PdfObject ret = getPdfObjectRelease(obj);
-    if (obj.isIndirect()) {
-      PRIndirectReference ref = (PRIndirectReference) obj;
-      PdfReader reader = ref.getReader();
-      int n = ref.getNumber();
-      reader.xrefObj.set(n, null);
-      if (reader.partial)
-        reader.xref[n * 2] = -1;
-    }
-    return ret;
-  }
-
-  private void ensureXrefSize(int size) {
-    if (size == 0)
-      return;
-    if (xref == null)
-      xref = new int[size];
-    else {
-      if (xref.length < size) {
-        int[] xref2 = new int[size];
-        System.arraycopy(xref, 0, xref2, 0, xref.length);
-        xref = xref2;
-      }
-    }
-  }
-
-  protected void readXref() throws IOException {
-    hybridXref = false;
-    newXrefType = false;
-    tokens.seek(tokens.getStartxref());
-    tokens.nextToken();
-    if (!tokens.getStringValue().equals("startxref"))
-      throw new InvalidPdfException(
-          MessageLocalization.getComposedMessage("startxref.not.found"));
-    tokens.nextToken();
-    if (tokens.getTokenType() != PRTokeniser.TK_NUMBER)
-      throw new InvalidPdfException(
-          MessageLocalization
-              .getComposedMessage("startxref.is.not.followed.by.a.number"));
-    int startxref = tokens.intValue();
-    lastXref = startxref;
-    eofPos = tokens.getFilePointer();
-    try {
-      if (readXRefStream(startxref)) {
-        newXrefType = true;
-        return;
-      }
-    } catch (Exception ignored) {
-    }
-    xref = null;
-    tokens.seek(startxref);
-    trailer = readXrefSection();
-    PdfDictionary trailer2 = trailer;
-    while (true) {
-      PdfNumber prev = (PdfNumber) trailer2.get(PdfName.PREV);
-      if (prev == null)
-        break;
-      if (prev.intValue() == startxref)
-        throw new InvalidPdfException(
-            MessageLocalization
-                .getComposedMessage("xref.infinite.loop"));
-      tokens.seek(prev.intValue());
-      trailer2 = readXrefSection();
-    }
-  }
-
-  protected PdfDictionary readXrefSection() throws IOException {
-    tokens.nextValidToken();
-    if (!tokens.getStringValue().equals("xref"))
-      tokens.throwError(MessageLocalization
-          .getComposedMessage("xref.subsection.not.found"));
-    int start;
-    int end;
-    int pos;
-    int gen;
-    while (true) {
-      tokens.nextValidToken();
-      if (tokens.getStringValue().equals("trailer"))
-        break;
-      if (tokens.getTokenType() != PRTokeniser.TK_NUMBER)
-        tokens
-            .throwError(MessageLocalization
-                .getComposedMessage("object.number.of.the.first.object.in.this.xref.subsection.not.found"));
-      start = tokens.intValue();
-      tokens.nextValidToken();
-      if (tokens.getTokenType() != PRTokeniser.TK_NUMBER)
-        tokens
-            .throwError(MessageLocalization
-                .getComposedMessage("number.of.entries.in.this.xref.subsection.not.found"));
-      end = tokens.intValue() + start;
-      if (start == 1) { // fix incorrect start number
-        int back = tokens.getFilePointer();
-        tokens.nextValidToken();
-        pos = tokens.intValue();
-        tokens.nextValidToken();
-        gen = tokens.intValue();
-        if (pos == 0 && gen == PdfWriter.GENERATION_MAX) {
-          --start;
-          --end;
-        }
-        tokens.seek(back);
-      }
-      ensureXrefSize(end * 2);
-      for (int k = start; k < end; ++k) {
-        tokens.nextValidToken();
-        pos = tokens.intValue();
-        tokens.nextValidToken();
-        tokens.nextValidToken();
-        int p = k * 2;
-        if (tokens.getStringValue().equals("n")) {
-          if (xref[p] == 0 && xref[p + 1] == 0) {
-            // if (pos == 0)
-            // tokens.throwError(MessageLocalization.getComposedMessage("file.position.0.cross.reference.entry.in.this.xref.subsection"));
-            xref[p] = pos;
-          }
-        } else if (tokens.getStringValue().equals("f")) {
-          if (xref[p] == 0 && xref[p + 1] == 0)
-            xref[p] = -1;
-        } else
-          tokens
-              .throwError(MessageLocalization
-                  .getComposedMessage("invalid.cross.reference.entry.in.this.xref.subsection"));
-      }
-    }
-    PdfDictionary trailer = (PdfDictionary) readPRObject();
-    PdfNumber xrefSize = (PdfNumber) trailer.get(PdfName.SIZE);
-    ensureXrefSize(xrefSize.intValue() * 2);
-    PdfObject xrs = trailer.get(PdfName.XREFSTM);
-    if (xrs != null && xrs.isNumber()) {
-      int loc = ((PdfNumber) xrs).intValue();
-      try {
-        readXRefStream(loc);
-        newXrefType = true;
-        hybridXref = true;
-      } catch (IOException e) {
-        xref = null;
-        throw e;
-      }
-    }
-    return trailer;
-  }
-
-  protected boolean readXRefStream(int ptr) throws IOException {
-    tokens.seek(ptr);
-    int thisStream;
-    if (!tokens.nextToken())
-      return false;
-    if (tokens.getTokenType() != PRTokeniser.TK_NUMBER)
-      return false;
-    thisStream = tokens.intValue();
-    if (!tokens.nextToken() || tokens.getTokenType() != PRTokeniser.TK_NUMBER)
-      return false;
-    if (!tokens.nextToken() || !tokens.getStringValue().equals("obj"))
-      return false;
-    PdfObject object = readPRObject();
-    PRStream stm;
-    if (object.isStream()) {
-      stm = (PRStream) object;
-      if (!PdfName.XREF.equals(stm.get(PdfName.TYPE)))
-        return false;
-    } else
-      return false;
-    if (trailer == null) {
-      trailer = new PdfDictionary();
-      trailer.putAll(stm);
-    }
-    stm.setLength(((PdfNumber) stm.get(PdfName.LENGTH)).intValue());
-    int size = ((PdfNumber) stm.get(PdfName.SIZE)).intValue();
-    PdfArray index;
-    PdfObject obj = stm.get(PdfName.INDEX);
-    if (obj == null) {
-      index = new PdfArray();
-      index.add(new int[] { 0, size });
-    } else
-      index = (PdfArray) obj;
-    PdfArray w = (PdfArray) stm.get(PdfName.W);
-    int prev = -1;
-    obj = stm.get(PdfName.PREV);
-    if (obj != null)
-      prev = ((PdfNumber) obj).intValue();
-    // Each xref pair is a position
-    // type 0 -> -1, 0
-    // type 1 -> offset, 0
-    // type 2 -> index, obj num
-    ensureXrefSize(size * 2);
-    if (objStmMark == null && !partial)
-      objStmMark = new HashMap<>();
-    if (objStmToOffset == null && partial)
-      objStmToOffset = new IntHashtable();
-    byte[] b = getStreamBytes(stm, tokens.getFile());
-    int bptr = 0;
-    int[] wc = new int[3];
-    for (int k = 0; k < 3; ++k)
-      wc[k] = w.getAsNumber(k).intValue();
-    for (int idx = 0; idx < index.size(); idx += 2) {
-      int start = index.getAsNumber(idx).intValue();
-      int length = index.getAsNumber(idx + 1).intValue();
-      ensureXrefSize((start + length) * 2);
-      while (length-- > 0) {
-        int type = 1;
-        if (wc[0] > 0) {
-          type = 0;
-          for (int k = 0; k < wc[0]; ++k)
-            type = (type << 8) + (b[bptr++] & 0xff);
-        }
-        int field2 = 0;
-        for (int k = 0; k < wc[1]; ++k)
-          field2 = (field2 << 8) + (b[bptr++] & 0xff);
-        int field3 = 0;
-        for (int k = 0; k < wc[2]; ++k)
-          field3 = (field3 << 8) + (b[bptr++] & 0xff);
-        int base = start * 2;
-        if (xref[base] == 0 && xref[base + 1] == 0) {
-          switch (type) {
-          case 0:
-            xref[base] = -1;
-            break;
-          case 1:
-            xref[base] = field2;
-            break;
-          case 2:
-            xref[base] = field3;
-            xref[base + 1] = field2;
-            if (partial) {
-              objStmToOffset.put(field2, 0);
-            } else {
-              Integer on = field2;
-              IntHashtable seq = objStmMark.get(on);
-              if (seq == null) {
-                seq = new IntHashtable();
-                seq.put(field3, 1);
-                objStmMark.put(on, seq);
-              } else
-                seq.put(field3, 1);
-            }
-            break;
-          }
-        }
-        ++start;
-      }
-    }
-    thisStream *= 2;
-    if (thisStream + 1 < xref.length && xref[thisStream + 1] == 0 && xref[thisStream] == 0)
-      xref[thisStream] = -1;
-
-    if (prev == -1)
-      return true;
-    return readXRefStream(prev);
-  }
-
-  protected void rebuildXref() throws IOException {
-    hybridXref = false;
-    newXrefType = false;
-    tokens.seek(0);
-    int[][] xr = new int[1024][];
-    int top = 0;
-    trailer = null;
-    byte[] line = new byte[64];
-    for (;;) {
-      int pos = tokens.getFilePointer();
-      if (!tokens.readLineSegment(line))
-        break;
-      if (line[0] == 't') {
-        if (!PdfEncodings.convertToString(line, null).startsWith("trailer"))
-          continue;
-        tokens.seek(pos);
-        tokens.nextToken();
-        pos = tokens.getFilePointer();
         try {
-          PdfDictionary dic = (PdfDictionary) readPRObject();
-          if (dic.get(PdfName.ROOT) != null)
-            trailer = dic;
-          else
-            tokens.seek(pos);
+            PRIndirectReference ref = (PRIndirectReference) obj;
+            int idx = ref.getNumber();
+            boolean appendable = ref.getReader().appendable;
+            obj = ref.getReader().getPdfObject(idx);
+            if (obj == null) {
+                return null;
+            } else {
+                if (appendable) {
+                    switch (obj.type()) {
+                        case PdfObject.NULL:
+                            obj = new PdfNull();
+                            break;
+                        case PdfObject.BOOLEAN:
+                            obj = new PdfBoolean(((PdfBoolean) obj).booleanValue());
+                            break;
+                        case PdfObject.NAME:
+                            obj = new PdfName(obj.getBytes());
+                            break;
+                    }
+                    obj.setIndRef(ref);
+                }
+                return obj;
+            }
         } catch (Exception e) {
-          tokens.seek(pos);
-        }
-      } else if (line[0] >= '0' && line[0] <= '9') {
-        int[] obj = PRTokeniser.checkObjectStart(line);
-        if (obj == null)
-          continue;
-        int num = obj[0];
-        int gen = obj[1];
-        if (num >= xr.length) {
-          int newLength = num * 2;
-          int[][] xr2 = new int[newLength][];
-          System.arraycopy(xr, 0, xr2, 0, top);
-          xr = xr2;
-        }
-        if (num >= top)
-          top = num + 1;
-        if (xr[num] == null || gen >= xr[num][1]) {
-          obj[0] = pos;
-          xr[num] = obj;
-        }
-      }
-    }
-    if (trailer == null)
-      throw new InvalidPdfException(MessageLocalization.getComposedMessage("trailer.not.found"));
-    xref = new int[top * 2];
-    for (int k = 0; k < top; ++k) {
-      int[] obj = xr[k];
-      if (obj != null)
-        xref[k * 2] = obj[0];
-    }
-  }
-
-  protected PdfDictionary readDictionary() throws IOException {
-    PdfDictionary dic = new PdfDictionary();
-    while (true) {
-      tokens.nextValidToken();
-      if (tokens.getTokenType() == PRTokeniser.TK_END_DIC)
-        break;
-      if (tokens.getTokenType() != PRTokeniser.TK_NAME)
-        tokens.throwError(MessageLocalization
-            .getComposedMessage("dictionary.key.is.not.a.name"));
-      PdfName name = new PdfName(tokens.getStringValue(), false);
-      PdfObject obj = readPRObject();
-      int type = obj.type();
-      if (-type == PRTokeniser.TK_END_DIC)
-        tokens.throwError(MessageLocalization
-            .getComposedMessage("unexpected.gt.gt"));
-      if (-type == PRTokeniser.TK_END_ARRAY)
-        tokens.throwError(MessageLocalization
-            .getComposedMessage("unexpected.close.bracket"));
-      dic.put(name, obj);
-    }
-    return dic;
-  }
-
-  protected PdfArray readArray() throws IOException {
-    PdfArray array = new PdfArray();
-    while (true) {
-      PdfObject obj = readPRObject();
-      int type = obj.type();
-      if (-type == PRTokeniser.TK_END_ARRAY)
-        break;
-      if (-type == PRTokeniser.TK_END_DIC)
-        tokens.throwError(MessageLocalization
-            .getComposedMessage("unexpected.gt.gt"));
-      array.add(obj);
-    }
-    return array;
-  }
-
-  // Track how deeply nested the current object is, so
-  // we know when to return an individual null or boolean, or
-  // reuse one of the static ones.
-  private int readDepth = 0;
-
-  protected PdfObject readPRObject() throws IOException {
-    tokens.nextValidToken();
-    int type = tokens.getTokenType();
-    switch (type) {
-    case PRTokeniser.TK_START_DIC: {
-      ++readDepth;
-      PdfDictionary dic = readDictionary();
-      --readDepth;
-      int pos = tokens.getFilePointer();
-      // be careful in the trailer. May not be a "next" token.
-      boolean hasNext;
-      do {
-        hasNext = tokens.nextToken();
-      } while (hasNext && tokens.getTokenType() == PRTokeniser.TK_COMMENT);
-
-      if (hasNext && tokens.getStringValue().equals("stream")) {
-        // skip whitespaces
-        int ch;
-        do {
-          ch = tokens.read();
-        } while (ch == 32 || ch == 9 || ch == 0 || ch == 12);
-        if (ch != '\n')
-          ch = tokens.read();
-        if (ch != '\n')
-          tokens.backOnePosition(ch);
-        PRStream stream = new PRStream(this, tokens.getFilePointer());
-        stream.putAll(dic);
-        // crypto handling
-        stream.setObjNum(objNum, objGen);
-
-        return stream;
-      } else {
-        tokens.seek(pos);
-        return dic;
-      }
-    }
-    case PRTokeniser.TK_START_ARRAY: {
-      ++readDepth;
-      PdfArray arr = readArray();
-      --readDepth;
-      return arr;
-    }
-    case PRTokeniser.TK_NUMBER:
-      return new PdfNumber(tokens.getStringValue());
-    case PRTokeniser.TK_STRING:
-      PdfString str = new PdfString(tokens.getStringValue(), null)
-          .setHexWriting(tokens.isHexString());
-      // crypto handling
-      str.setObjNum(objNum, objGen);
-      if (strings != null)
-        strings.add(str);
-
-      return str;
-    case PRTokeniser.TK_NAME: {
-      PdfName cachedName = PdfName.staticNames.get(tokens
-          .getStringValue());
-      if (readDepth > 0 && cachedName != null) {
-        return cachedName;
-      } else {
-        // an indirect name (how odd...), or a non-standard one
-        return new PdfName(tokens.getStringValue(), false);
-      }
-    }
-    case PRTokeniser.TK_REF:
-      int num = tokens.getReference();
-      PRIndirectReference ref = new PRIndirectReference(this, num,
-          tokens.getGeneration());
-      return ref;
-    case PRTokeniser.TK_ENDOFFILE:
-      throw new IOException(
-          MessageLocalization.getComposedMessage("unexpected.end.of.file"));
-    default:
-      String sv = tokens.getStringValue();
-      if ("null".equals(sv)) {
-        if (readDepth == 0) {
-          return new PdfNull();
-        } // else
-        return PdfNull.PDFNULL;
-      } else if ("true".equals(sv)) {
-        if (readDepth == 0) {
-          return new PdfBoolean(true);
-        } // else
-        return PdfBoolean.PDFTRUE;
-      } else if ("false".equals(sv)) {
-        if (readDepth == 0) {
-          return new PdfBoolean(false);
-        } // else
-        return PdfBoolean.PDFFALSE;
-      }
-      return new PdfLiteral(-type, tokens.getStringValue());
-    }
-  }
-
-  /**
-   * Decodes a stream that has the FlateDecode filter.
-   *
-   * @param in
-   *          the input data
-   * @return the decoded data
-   */
-  public static byte[] FlateDecode(byte[] in) {
-    byte[] b = FlateDecode(in, true);
-    if (b == null)
-      return FlateDecode(in, false);
-    return b;
-  }
-
-  /**
-   * @param in the input data
-   * @param dicPar an object of {@link PdfObject}
-   * @return a byte array
-   */
-  public static byte[] decodePredictor(byte[] in, PdfObject dicPar) {
-    if (dicPar == null || !dicPar.isDictionary())
-      return in;
-    PdfDictionary dic = (PdfDictionary) dicPar;
-    PdfObject obj = getPdfObject(dic.get(PdfName.PREDICTOR));
-    if (obj == null || !obj.isNumber())
-      return in;
-    int predictor = ((PdfNumber) obj).intValue();
-    if (predictor < 10)
-      return in;
-    int width = 1;
-    obj = getPdfObject(dic.get(PdfName.COLUMNS));
-    if (obj != null && obj.isNumber())
-      width = ((PdfNumber) obj).intValue();
-    int colors = 1;
-    obj = getPdfObject(dic.get(PdfName.COLORS));
-    if (obj != null && obj.isNumber())
-      colors = ((PdfNumber) obj).intValue();
-    int bpc = 8;
-    obj = getPdfObject(dic.get(PdfName.BITSPERCOMPONENT));
-    if (obj != null && obj.isNumber())
-      bpc = ((PdfNumber) obj).intValue();
-    DataInputStream dataStream = new DataInputStream(new ByteArrayInputStream(
-        in));
-    ByteArrayOutputStream fout = new ByteArrayOutputStream(in.length);
-    int bytesPerPixel = colors * bpc / 8;
-    int bytesPerRow = (colors * width * bpc + 7) / 8;
-    byte[] curr = new byte[bytesPerRow];
-    byte[] prior = new byte[bytesPerRow];
-
-    // Decode the (sub)image row-by-row
-    while (true) {
-      // Read the filter type byte and a row of data
-      int filter;
-      try {
-        filter = dataStream.read();
-        if (filter < 0) {
-          return fout.toByteArray();
-        }
-        dataStream.readFully(curr, 0, bytesPerRow);
-      } catch (Exception e) {
-        return fout.toByteArray();
-      }
-
-      switch (filter) {
-      case 0: // PNG_FILTER_NONE
-        break;
-      case 1: // PNG_FILTER_SUB
-        for (int i = bytesPerPixel; i < bytesPerRow; i++) {
-          curr[i] += curr[i - bytesPerPixel];
-        }
-        break;
-      case 2: // PNG_FILTER_UP
-        for (int i = 0; i < bytesPerRow; i++) {
-          curr[i] += prior[i];
-        }
-        break;
-      case 3: // PNG_FILTER_AVERAGE
-        for (int i = 0; i < bytesPerPixel; i++) {
-          curr[i] += (byte) (prior[i] / (byte) 2);
-        }
-        for (int i = bytesPerPixel; i < bytesPerRow; i++) {
-          curr[i] = (byte) ((curr[i] + (curr[i - bytesPerPixel] & 0xff) + (prior[i] & 0xff)) / 2);
-        }
-        break;
-      case 4: // PNG_FILTER_PAETH
-        for (int i = 0; i < bytesPerPixel; i++) {
-          curr[i] += prior[i];
-        }
-
-        for (int i = bytesPerPixel; i < bytesPerRow; i++) {
-          int a = curr[i - bytesPerPixel] & 0xff;
-          int b = prior[i] & 0xff;
-          int c = prior[i - bytesPerPixel] & 0xff;
-
-          int p = a + b - c;
-          int pa = Math.abs(p - a);
-          int pb = Math.abs(p - b);
-          int pc = Math.abs(p - c);
-
-          int ret;
-
-          if ((pa <= pb) && (pa <= pc)) {
-            ret = a;
-          } else if (pb <= pc) {
-            ret = b;
-          } else {
-            ret = c;
-          }
-          curr[i] += (byte) (ret);
-        }
-        break;
-      default:
-        // Error -- unknown filter type
-        throw new RuntimeException(
-            MessageLocalization.getComposedMessage("png.filter.unknown"));
-      }
-      try {
-        fout.write(curr);
-      } catch (IOException ioe) {
-        // Never happens
-      }
-
-      // Swap curr and prior
-      byte[] tmp = prior;
-      prior = curr;
-      curr = tmp;
-    }
-  }
-
-  /**
-   * A helper to FlateDecode.
-   *
-   * @param in
-   *          the input data
-   * @param strict
-   *          true to read a correct stream. false to
-   *          try to read a corrupted stream
-   * @return the decoded data
-   */
-  public static byte[] FlateDecode(byte[] in, boolean strict) {
-    ByteArrayInputStream stream = new ByteArrayInputStream(in);
-    InflaterInputStream zip = new InflaterInputStream(stream);
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    byte[] b = new byte[strict ? 4092 : 1];
-    try {
-      int n;
-      while ((n = zip.read(b)) >= 0) {
-        out.write(b, 0, n);
-      }
-      zip.close();
-      out.close();
-      return out.toByteArray();
-    } catch (Exception e) {
-      if (strict)
-        return null;
-      return out.toByteArray();
-    }
-  }
-
-  /**
-   * Decodes a stream that has the ASCIIHexDecode filter.
-   *
-   * @param in
-   *          the input data
-   * @return the decoded data
-   */
-  public static byte[] ASCIIHexDecode(byte[] in) {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    boolean first = true;
-    int n1 = 0;
-      for (byte b : in) {
-          int ch = b & 0xff;
-          if (ch == '>')
-              break;
-          if (PRTokeniser.isWhitespace(ch))
-              continue;
-          int n = PRTokeniser.getHex(ch);
-          if (n == -1)
-              throw new RuntimeException(
-                      MessageLocalization
-                              .getComposedMessage("illegal.character.in.asciihexdecode"));
-          if (first)
-              n1 = n;
-          else
-              out.write((byte) ((n1 << 4) + n));
-          first = !first;
-      }
-    if (!first)
-      out.write((byte) (n1 << 4));
-    return out.toByteArray();
-  }
-
-  /**
-   * Decodes a stream that has the ASCII85Decode filter.
-   *
-   * @param in
-   *          the input data
-   * @return the decoded data
-   */
-  public static byte[] ASCII85Decode(byte[] in) {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    int state = 0;
-    int[] chn = new int[5];
-      for (byte b : in) {
-          int ch = b & 0xff;
-          if (ch == '~')
-              break;
-          if (PRTokeniser.isWhitespace(ch))
-              continue;
-          if (ch == 'z' && state == 0) {
-              out.write(0);
-              out.write(0);
-              out.write(0);
-              out.write(0);
-              continue;
-          }
-          if (ch < '!' || ch > 'u')
-              throw new RuntimeException(
-                      MessageLocalization
-                              .getComposedMessage("illegal.character.in.ascii85decode"));
-          chn[state] = ch - '!';
-          ++state;
-          if (state == 5) {
-              state = 0;
-              int r = 0;
-              for (int j = 0; j < 5; ++j)
-                  r = r * 85 + chn[j];
-              out.write((byte) (r >> 24));
-              out.write((byte) (r >> 16));
-              out.write((byte) (r >> 8));
-              out.write((byte) r);
-          }
-      }
-    int r;
-    // We'll ignore the next two lines for the sake of perpetuating broken
-    // PDFs
-    // if (state == 1)
-    // throw new
-    // RuntimeException(MessageLocalization.getComposedMessage("illegal.length.in.ascii85decode"));
-    if (state == 2) {
-      r = chn[0] * 85 * 85 * 85 * 85 + chn[1] * 85 * 85 * 85 + 85 * 85 * 85
-          + 85 * 85 + 85;
-      out.write((byte) (r >> 24));
-    } else if (state == 3) {
-      r = chn[0] * 85 * 85 * 85 * 85 + chn[1] * 85 * 85 * 85 + chn[2] * 85 * 85
-          + 85 * 85 + 85;
-      out.write((byte) (r >> 24));
-      out.write((byte) (r >> 16));
-    } else if (state == 4) {
-      r = chn[0] * 85 * 85 * 85 * 85 + chn[1] * 85 * 85 * 85 + chn[2] * 85 * 85
-          + chn[3] * 85 + 85;
-      out.write((byte) (r >> 24));
-      out.write((byte) (r >> 16));
-      out.write((byte) (r >> 8));
-    }
-    return out.toByteArray();
-  }
-
-  /**
-   * Decodes a stream that has the LZWDecode filter.
-   *
-   * @param in
-   *          the input data
-   * @return the decoded data
-   */
-  public static byte[] LZWDecode(byte[] in) {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    LZWDecoder lzw = new LZWDecoder();
-    lzw.decode(in, out);
-    return out.toByteArray();
-  }
-
-  /**
-   * Checks if the document had errors and was rebuilt.
-   *
-   * @return true if rebuilt.
-   *
-   */
-  public boolean isRebuilt() {
-    return this.rebuilt;
-  }
-
-  /**
-   * Gets the dictionary that represents a page.
-   *
-   * @param pageNum the page number. 1 is the first
-   * @return the page dictionary or null when the page does not exist
-   */
-  public PdfDictionary getPageN(int pageNum) {
-    PdfDictionary dic = pageRefs.getPageN(pageNum);
-    if (dic == null)
-      return null;
-    if (appendable)
-      dic.setIndRef(pageRefs.getPageOrigRef(pageNum));
-    return dic;
-  }
-
-  /**
-   * @param pageNum page number
-   * @return a Dictionary object
-   */
-  public PdfDictionary getPageNRelease(int pageNum) {
-    PdfDictionary dic = getPageN(pageNum);
-    pageRefs.releasePage(pageNum);
-    return dic;
-  }
-
-  /**
-   * @param pageNum page number
-   */
-  public void releasePage(int pageNum) {
-    pageRefs.releasePage(pageNum);
-  }
-
-  /**
+            throw new ExceptionConverter(e);
+        }
+    }
+
+    /**
+     * Reads a PdfObject resolving an indirect reference if needed. If the reader was opened in partial
+     * mode the object will be released to save memory.
      *
+     * @param obj    the PdfObject to read
+     * @param parent parent object
+     * @return a PdfObject
      */
-  public void resetReleasePage() {
-    pageRefs.resetReleasePage();
-  }
-
-  /**
-   * Gets the page reference to this page.
-   *
-   * @param pageNum
-   *          the page number. 1 is the first
-   * @return the page reference
-   */
-  public PRIndirectReference getPageOrigRef(int pageNum) {
-    return pageRefs.getPageOrigRef(pageNum);
-  }
-
-  /**
-   * Gets the contents of the page.
-   *
-   * @param pageNum
-   *          the page number. 1 is the first
-   * @param file
-   *          the location of the PDF document
-   * @throws IOException
-   *           on error
-   * @return the content
-   */
-  public byte[] getPageContent(int pageNum, RandomAccessFileOrArray file)
-      throws IOException {
-    PdfDictionary page = getPageNRelease(pageNum);
-    if (page == null)
-      return null;
-    PdfObject contents = getPdfObjectRelease(page.get(PdfName.CONTENTS));
-    if (contents == null)
-      return new byte[0];
-    ByteArrayOutputStream bout;
-    if (contents.isStream()) {
-      return getStreamBytes((PRStream) contents, file);
-    } else if (contents.isArray()) {
-      PdfArray array = (PdfArray) contents;
-      bout = new ByteArrayOutputStream();
-      for (int k = 0; k < array.size(); ++k) {
-        PdfObject item = getPdfObjectRelease(array.getPdfObject(k));
-        if (item == null || !item.isStream())
-          continue;
-        byte[] b = getStreamBytes((PRStream) item, file);
-        bout.write(b);
-        if (k != array.size() - 1)
-          bout.write('\n');
-      }
-      return bout.toByteArray();
-    } else
-      return new byte[0];
-  }
-
-  /**
-   * Gets the contents of the page.
-   *
-   * @param pageNum
-   *          the page number. 1 is the first
-   * @throws IOException
-   *           on error
-   * @return the content
-   */
-  public byte[] getPageContent(int pageNum) throws IOException {
-    RandomAccessFileOrArray rf = getSafeFile();
-    try {
-      rf.reOpen();
-      return getPageContent(pageNum, rf);
-    } finally {
-      try {
-        rf.close();
-      } catch (Exception ignored) {
-      }
-    }
-  }
-
-  protected void killXref(PdfObject obj) {
-    if (obj == null)
-      return;
-    if ((obj instanceof PdfIndirectReference) && !obj.isIndirect())
-      return;
-    switch (obj.type()) {
-    case PdfObject.INDIRECT: {
-      int xr = ((PRIndirectReference) obj).getNumber();
-      obj = xrefObj.get(xr);
-      xrefObj.set(xr, null);
-      freeXref = xr;
-      killXref(obj);
-      break;
-    }
-    case PdfObject.ARRAY: {
-      PdfArray t = (PdfArray) obj;
-      for (int i = 0; i < t.size(); ++i)
-        killXref(t.getPdfObject(i));
-      break;
-    }
-    case PdfObject.STREAM:
-    case PdfObject.DICTIONARY: {
-      PdfDictionary dic = (PdfDictionary) obj;
-      for (Object o : dic.getKeys()) {
-        killXref(dic.get((PdfName) o));
-      }
-      break;
-    }
-    }
-  }
-
-  /**
-   * Sets the contents of the page.
-   *
-   * @param content
-   *          the new page content
-   * @param pageNum
-   *          the page number. 1 is the first
-   */
-  public void setPageContent(int pageNum, byte[] content) {
-    setPageContent(pageNum, content, PdfStream.DEFAULT_COMPRESSION);
-  }
-
-  /**
-   * Sets the contents of the page.
-   *
-   * @param content the new page content
-   * @param pageNum the page number. 1 is the first
-   * @param compressionLevel compression level
-   * @since 2.1.3 (the method already existed without param compressionLevel)
-   */
-  public void setPageContent(int pageNum, byte[] content, int compressionLevel) {
-    PdfDictionary page = getPageN(pageNum);
-    if (page == null)
-      return;
-    PdfObject contents = page.get(PdfName.CONTENTS);
-    freeXref = -1;
-    killXref(contents);
-    if (freeXref == -1) {
-      xrefObj.add(null);
-      freeXref = xrefObj.size() - 1;
-    }
-    page.put(PdfName.CONTENTS, new PRIndirectReference(this, freeXref));
-    xrefObj.set(freeXref, new PRStream(this, content, compressionLevel));
-  }
-
-  /**
-   * Get the content from a stream applying the required filters.
-   *
-   * @param stream
-   *          the stream
-   * @param file
-   *          the location where the stream is
-   * @throws IOException
-   *           on error
-   * @return the stream content
-   */
-  public static byte[] getStreamBytes(PRStream stream,
-      RandomAccessFileOrArray file) throws IOException {
-    PdfObject filter = getPdfObjectRelease(stream.get(PdfName.FILTER));
-    byte[] b = getStreamBytesRaw(stream, file);
-    List filters = new ArrayList<>();
-    filters = addFilters(filters, filter);
-    List dp = new ArrayList<>();
-    PdfObject dpo = getPdfObjectRelease(stream.get(PdfName.DECODEPARMS));
-    if (dpo == null || (!dpo.isDictionary() && !dpo.isArray()))
-      dpo = getPdfObjectRelease(stream.get(PdfName.DP));
-    if (dpo != null) {
-      if (dpo.isDictionary())
-        dp.add(dpo);
-      else if (dpo.isArray())
-        dp = ((PdfArray) dpo).getElements();
-    }
-    String name;
-    for (int j = 0; j < filters.size(); ++j) {
-      name = getPdfObjectRelease(filters.get(j))
-          .toString();
-        switch (name) {
-            case "/FlateDecode":
-            case "/Fl": {
-                b = FlateDecode(b);
-                PdfObject dicParam;
-                if (j < dp.size()) {
-                    dicParam = dp.get(j);
-                    b = decodePredictor(b, dicParam);
-                }
-                break;
-            }
-            case "/ASCIIHexDecode":
-            case "/AHx":
-                b = ASCIIHexDecode(b);
-                break;
-            case "/ASCII85Decode":
-            case "/A85":
-                b = ASCII85Decode(b);
-                break;
-            case "/LZWDecode": {
-                b = LZWDecode(b);
-                PdfObject dicParam;
-                if (j < dp.size()) {
-                    dicParam = dp.get(j);
-                    b = decodePredictor(b, dicParam);
+    public static PdfObject getPdfObjectRelease(PdfObject obj, PdfObject parent) {
+        PdfObject obj2 = getPdfObject(obj, parent);
+        releaseLastXrefPartial(obj);
+        return obj2;
+    }
+
+    /**
+     * @param obj    the PdfObject to read
+     * @param parent parent object
+     * @return a PdfObject
+     */
+    public static PdfObject getPdfObject(PdfObject obj, PdfObject parent) {
+        if (obj == null) {
+            return null;
+        }
+        if (!obj.isIndirect()) {
+            PRIndirectReference ref;
+            if (parent != null && (ref = parent.getIndRef()) != null
+                    && ref.getReader().isAppendable()) {
+                switch (obj.type()) {
+                    case PdfObject.NULL:
+                        obj = new PdfNull();
+                        break;
+                    case PdfObject.BOOLEAN:
+                        obj = new PdfBoolean(((PdfBoolean) obj).booleanValue());
+                        break;
+                    case PdfObject.NAME:
+                        obj = new PdfName(obj.getBytes());
+                        break;
                 }
-                break;
+                obj.setIndRef(ref);
             }
-            case "/Crypt":
-                break;
-            default:
-                throw new UnsupportedPdfException(
-                        MessageLocalization.getComposedMessage(
-                                "the.filter.1.is.not.supported", name));
-        }
-    }
-    return b;
-  }
-
-  /**
-   * Get the content from a stream applying the required filters.
-   *
-   * @param stream
-   *          the stream
-   * @throws IOException
-   *           on error
-   * @return the stream content
-   */
-  public static byte[] getStreamBytes(PRStream stream) throws IOException {
-    RandomAccessFileOrArray rf = stream.getReader().getSafeFile();
-    try {
-      rf.reOpen();
-      return getStreamBytes(stream, rf);
-    } finally {
-      try {
-        rf.close();
-      } catch (Exception e) {
-      }
-    }
-  }
-
-  /**
-   * Get the content from a stream as it is without applying any filter.
-   *
-   * @param stream
-   *          the stream
-   * @param file
-   *          the location where the stream is
-   * @throws IOException
-   *           on error
-   * @return the stream content
-   */
-  public static byte[] getStreamBytesRaw(PRStream stream,
-      RandomAccessFileOrArray file) throws IOException {
-    PdfReader reader = stream.getReader();
-    byte[] b;
-    if (stream.getOffset() < 0)
-      b = stream.getBytes();
-    else {
-      b = new byte[stream.getLength()];
-      file.seek(stream.getOffset());
-      file.readFully(b);
-      PdfEncryption decrypt = reader.getDecrypt();
-      if (decrypt != null) {
-        PdfObject filter = getPdfObjectRelease(stream.get(PdfName.FILTER));
-        List filters = new ArrayList<>();
-        filters = addFilters(filters, filter);
-        boolean skip = false;
-        for (PdfObject filter1 : filters) {
-          PdfObject obj = getPdfObjectRelease(filter1);
-          if (obj != null && obj.toString().equals("/Crypt")) {
-            skip = true;
-            break;
-          }
-        }
-        if (!skip) {
-          decrypt.setHashKey(stream.getObjNum(), stream.getObjGen());
-          b = decrypt.decryptByteArray(b);
-        }
-      }
-    }
-    return b;
-  }
-
-  private static List addFilters(List filters, PdfObject filter) {
-    if (filter != null) {
-      if (filter.isName())
-        filters.add(filter);
-      else if (filter.isArray())
-        filters = ((PdfArray) filter).getElements();
-    }
-    return filters;
-  }
-
-  /**
-   * Get the content from a stream as it is without applying any filter.
-   *
-   * @param stream
-   *          the stream
-   * @throws IOException
-   *           on error
-   * @return the stream content
-   */
-  public static byte[] getStreamBytesRaw(PRStream stream) throws IOException {
-    RandomAccessFileOrArray rf = stream.getReader().getSafeFile();
-    try {
-      rf.reOpen();
-      return getStreamBytesRaw(stream, rf);
-    } finally {
-      try {
-        rf.close();
-      } catch (Exception ignored) {
-      }
-    }
-  }
-
-  /** Eliminates shared streams if they exist. */
-  public void eliminateSharedStreams() {
-    if (!sharedStreams)
-      return;
-    sharedStreams = false;
-    if (pageRefs.size() == 1)
-      return;
-    List newRefs = new ArrayList<>();
-    List newStreams = new ArrayList<>();
-    IntHashtable visited = new IntHashtable();
-    for (int k = 1; k <= pageRefs.size(); ++k) {
-      PdfDictionary page = pageRefs.getPageN(k);
-      if (page == null)
-        continue;
-      PdfObject contents = getPdfObject(page.get(PdfName.CONTENTS));
-      if (contents == null)
-        continue;
-      if (contents.isStream()) {
-        PRIndirectReference ref = (PRIndirectReference) page
-            .get(PdfName.CONTENTS);
-        if (visited.containsKey(ref.getNumber())) {
-          // need to duplicate
-          newRefs.add(ref);
-          newStreams.add(new PRStream((PRStream) contents, null));
-        } else
-          visited.put(ref.getNumber(), 1);
-      } else if (contents.isArray()) {
-        PdfArray array = (PdfArray) contents;
-        for (int j = 0; j < array.size(); ++j) {
-          PRIndirectReference ref = (PRIndirectReference) array.getPdfObject(j);
-          if (visited.containsKey(ref.getNumber())) {
-            // need to duplicate
-            newRefs.add(ref);
-            newStreams.add(new PRStream((PRStream) getPdfObject(ref), null));
-          } else
-            visited.put(ref.getNumber(), 1);
-        }
-      }
-    }
-    if (newStreams.isEmpty())
-      return;
-    for (int k = 0; k < newStreams.size(); ++k) {
-      xrefObj.add(newStreams.get(k));
-      PRIndirectReference ref = (PRIndirectReference) newRefs.get(k);
-      ref.setNumber(xrefObj.size() - 1, 0);
-    }
-  }
-
-  /**
-   * Checks if the document was changed.
-   *
-   * @return true if the document was changed, false
-   *         otherwise
-   */
-  public boolean isTampered() {
-    return tampered;
-  }
-
-  /**
-   * Sets the tampered state. A tampered PdfReader cannot be reused in
-   * PdfStamper.
-   *
-   * @param tampered
-   *          the tampered state
-   */
-  public void setTampered(boolean tampered) {
-    this.tampered = tampered;
-    pageRefs.keepPages();
-  }
-
-  /**
-   * Gets the XML metadata.
-   *
-   * @throws IOException
-   *           on error
-   * @return the XML metadata
-   */
-  public byte[] getMetadata() throws IOException {
-    PdfObject obj = getPdfObject(catalog.get(PdfName.METADATA));
-    if (!(obj instanceof PRStream))
-      return null;
-    RandomAccessFileOrArray rf = getSafeFile();
-    byte[] b;
-    try {
-      rf.reOpen();
-      b = getStreamBytes((PRStream) obj, rf);
-    } finally {
-      try {
-        rf.close();
-      } catch (Exception e) {
-        // empty on purpose
-      }
-    }
-    return b;
-  }
-
-  /**
-   * Gets the byte address of the last xref table.
-   *
-   * @return the byte address of the last xref table
-   */
-  public int getLastXref() {
-    return lastXref;
-  }
-
-  /**
-   * Gets the number of xref objects.
-   *
-   * @return the number of xref objects
-   */
-  public int getXrefSize() {
-    return xrefObj.size();
-  }
-
-  /**
-   * Gets the byte address of the %%EOF marker.
-   *
-   * @return the byte address of the %%EOF marker
-   */
-  public int getEofPos() {
-    return eofPos;
-  }
-
-  /**
-   * Gets the PDF version. Only the last version char is returned. For example
-   * version 1.4 is returned as '4'.
-   *
-   * @return the PDF version
-   */
-  public char getPdfVersion() {
-    return pdfVersion;
-  }
-
-  /**
-   * Returns true if the PDF is encrypted.
-   *
-   * @return true if the PDF is encrypted
-   */
-  public boolean isEncrypted() {
-    return encrypted;
-  }
-
-  /**
-   * Returns true if the owner password has been used to open the document.
-   *
-   * @return true if the owner password has been used to open the document.
-   */
-  public boolean isOwnerPasswordUsed() {
-    return ownerPasswordUsed;
-  }
-
-  /**
-   * Gets the encryption permissions. It can be used directly in
-   * PdfWriter.setEncryption().
-   *
-   * @return the encryption permissions
-   */
-  public int getPermissions() {
-    return pValue;
-  }
-
-    public void setPermissions(int permissionValue) {
-        this.pValue=permissionValue;
-    }
-
-  /**
-   * Returns true if the PDF has a 128 bit key encryption.
-   *
-   * @return true if the PDF has a 128 bit key encryption
-   */
-  public boolean is128Key() {
-    return rValue == 3;
-  }
-
-  /**
-   * Gets the trailer dictionary
-   *
-   * @return the trailer dictionary
-   */
-  public PdfDictionary getTrailer() {
-    return trailer;
-  }
-
-  PdfEncryption getDecrypt() {
-    return decrypt;
-  }
-
-  private static boolean equalsn(byte[] a1, byte[] a2) {
-    int length = a2.length;
-    for (int k = 0; k < length; ++k) {
-      if (a1[k] != a2[k])
-        return false;
-    }
-    return true;
-  }
-
-  private static boolean existsName(PdfDictionary dic, PdfName key, PdfName value) {
-    PdfObject type = getPdfObjectRelease(dic.get(key));
-    if (type == null || !type.isName())
-      return false;
-    PdfName name = (PdfName) type;
-    return name.equals(value);
-  }
-
-  static String getFontNameFromDescriptor(PdfDictionary dic) {
-    return getFontName(dic, PdfName.FONTNAME);
-  }
-
-  private static String getFontName(PdfDictionary dic) {
-    return getFontName(dic, PdfName.BASEFONT);
-  }
-
-  private static String getFontName(PdfDictionary dic, PdfName property) {
-    if (dic == null)
-      return null;
-    PdfObject type = getPdfObjectRelease(dic.get(property));
-    if (type == null || !type.isName())
-      return null;
-    return PdfName.decodeName(type.toString());
-  }
-
-  static boolean isFontSubset(String fontName) {
-    return fontName != null && fontName.length() >= 8
-        && fontName.charAt(6) == '+';
-  }
-
-  private static String getSubsetPrefix(PdfDictionary dic) {
-    if (dic == null)
-      return null;
-    String s = getFontName(dic);
-    if (s == null)
-      return null;
-    if (s.length() < 8 || s.charAt(6) != '+')
-      return null;
-    for (int k = 0; k < 6; ++k) {
-      char c = s.charAt(k);
-      if (c < 'A' || c > 'Z')
-        return null;
+            return obj;
+        }
+        return getPdfObject(obj);
     }
-    return s;
-  }
-
-  /**
-   * Finds all the font subsets and changes the prefixes to some random values.
-   *
-   * @return the number of font subsets altered
-   */
-  public int shuffleSubsetNames() {
-    int total = 0;
-    for (int k = 1; k < xrefObj.size(); ++k) {
-      PdfObject obj = getPdfObjectRelease(k);
-      if (obj == null || !obj.isDictionary())
-        continue;
-      PdfDictionary dic = (PdfDictionary) obj;
-      if (!existsName(dic, PdfName.TYPE, PdfName.FONT))
-        continue;
-      if (existsName(dic, PdfName.SUBTYPE, PdfName.TYPE1)
-          || existsName(dic, PdfName.SUBTYPE, PdfName.MMTYPE1)
-          || existsName(dic, PdfName.SUBTYPE, PdfName.TRUETYPE)) {
-        String s = getSubsetPrefix(dic);
-        if (s == null)
-          continue;
-        String ns = createRandomSubsetPrefix() + s.substring(7);
-        PdfName newName = new PdfName(ns);
-        dic.put(PdfName.BASEFONT, newName);
-        setXrefPartialObject(k, dic);
-        ++total;
-        PdfDictionary fd = dic.getAsDict(PdfName.FONTDESCRIPTOR);
-        if (fd == null)
-          continue;
-        fd.put(PdfName.FONTNAME, newName);
-      } else if (existsName(dic, PdfName.SUBTYPE, PdfName.TYPE0)) {
-        String s = getSubsetPrefix(dic);
-        PdfArray arr = dic.getAsArray(PdfName.DESCENDANTFONTS);
-        if (arr == null)
-          continue;
-        if (arr.isEmpty())
-          continue;
-        PdfDictionary desc = arr.getAsDict(0);
-        String sde = getSubsetPrefix(desc);
-        if (sde == null)
-          continue;
-        String ns = createRandomSubsetPrefix();
-        if (s != null)
-          dic.put(PdfName.BASEFONT, new PdfName(ns + s.substring(7)));
-        setXrefPartialObject(k, dic);
-        PdfName newName = new PdfName(ns + sde.substring(7));
-        desc.put(PdfName.BASEFONT, newName);
-        ++total;
-        PdfDictionary fd = desc.getAsDict(PdfName.FONTDESCRIPTOR);
-        if (fd == null)
-          continue;
-        fd.put(PdfName.FONTNAME, newName);
-      }
-    }
-    return total;
-  }
-
-  /**
-   * Creates a unique subset prefix to be added to the font name when the font
-   * is embedded and subset.
-   *
-   * @return the subset prefix
-   */
-  private String createRandomSubsetPrefix() {
-    String s = "";
-    for (int k = 0; k < 6; ++k) {
-      s += (char) (Math.random() * 26 + 'A');
-    }
-    return s + "+";
-  }
-
-  /**
-   * Finds all the fonts not subset but embedded and marks them as subset.
-   *
-   * @return the number of fonts altered
-   */
-  public int createFakeFontSubsets() {
-    int total = 0;
-    for (int k = 1; k < xrefObj.size(); ++k) {
-      PdfObject obj = getPdfObjectRelease(k);
-      if (obj == null || !obj.isDictionary())
-        continue;
-      PdfDictionary dic = (PdfDictionary) obj;
-      if (!existsName(dic, PdfName.TYPE, PdfName.FONT))
-        continue;
-      if (existsName(dic, PdfName.SUBTYPE, PdfName.TYPE1)
-          || existsName(dic, PdfName.SUBTYPE, PdfName.MMTYPE1)
-          || existsName(dic, PdfName.SUBTYPE, PdfName.TRUETYPE)) {
-        String s = getSubsetPrefix(dic);
-        if (s != null)
-          continue;
-        s = getFontName(dic);
-        if (s == null)
-          continue;
-        String ns = createRandomSubsetPrefix() + s;
-        PdfDictionary fd = (PdfDictionary) getPdfObjectRelease(dic
-            .get(PdfName.FONTDESCRIPTOR));
-        if (fd == null)
-          continue;
-        if (fd.get(PdfName.FONTFILE) == null
-            && fd.get(PdfName.FONTFILE2) == null
-            && fd.get(PdfName.FONTFILE3) == null)
-          continue;
-        fd = dic.getAsDict(PdfName.FONTDESCRIPTOR);
-        PdfName newName = new PdfName(ns);
-        dic.put(PdfName.BASEFONT, newName);
-        fd.put(PdfName.FONTNAME, newName);
-        setXrefPartialObject(k, dic);
-        ++total;
-      }
-    }
-    return total;
-  }
-
-  private static PdfArray getNameArray(PdfObject obj) {
-    if (obj == null)
-      return null;
-    obj = getPdfObjectRelease(obj);
-    if (obj == null)
-      return null;
-    if (obj.isArray())
-      return (PdfArray) obj;
-    else if (obj.isDictionary()) {
-      PdfObject arr2 = getPdfObjectRelease(((PdfDictionary) obj).get(PdfName.D));
-      if (arr2 != null && arr2.isArray())
-        return (PdfArray) arr2;
-    }
-    return null;
-  }
-
-  /**
-   * Gets all the named destinations as an HashMap. The key is the
-   * name and the value is the destinations array.
-   *
-   * @return gets all the named destinations
-   */
-  public HashMap getNamedDestination() {
-    return getNamedDestination(false);
-  }
-
-  /**
-   * Gets all the named destinations as an HashMap. The key is the
-   * name and the value is the destinations array.
-   *
-   * @param keepNames
-   *          true if you want the keys to be real PdfNames instead of Strings
-   * @return gets all the named destinations
-   * @since 2.1.6
-   */
-  public HashMap getNamedDestination(boolean keepNames) {
-    HashMap names = getNamedDestinationFromNames(keepNames);
-    names.putAll(getNamedDestinationFromStrings());
-    return names;
-  }
-
-  /**
-   * Gets the named destinations from the /Dests key in the catalog as an
-   * HashMap. The key is the name and the value is the destinations
-   * array.
-   *
-   * @return gets the named destinations
-   */
-  public HashMap getNamedDestinationFromNames() {
-    return getNamedDestinationFromNames(false);
-  }
-
-  /**
-   * Gets the named destinations from the /Dests key in the catalog as an
-   * HashMap. The key is the name and the value is the destinations
-   * array.
-   *
-   * @param keepNames
-   *          true if you want the keys to be real PdfNames instead of Strings
-   * @return gets the named destinations
-   * @since 2.1.6
-   */
-  public HashMap getNamedDestinationFromNames(boolean keepNames) {
-    HashMap names = new HashMap<>();
-    if (catalog.get(PdfName.DESTS) != null) {
-      PdfDictionary dic = (PdfDictionary) getPdfObjectRelease(catalog.get(PdfName.DESTS));
-      if (dic == null)
-        return names;
-      Set keys = dic.getKeys();
-        for (Object key1 : keys) {
-            PdfName key = (PdfName) key1;
-            PdfArray arr = getNameArray(dic.get(key));
-            if (arr == null)
-                continue;
-            if (keepNames) {
-                names.put(key, arr);
-            } else {
-                String name = PdfName.decodeName(key.toString());
-                names.put(name, arr);
-            }
-        }
-    }
-    return names;
-  }
-
-  /**
-   * Gets the named destinations from the /Names key in the catalog as an
-   * HashMap. The key is the name and the value is the destinations
-   * array.
-   *
-   * @return gets the named destinations
-   */
-  public HashMap getNamedDestinationFromStrings() {
-    if (catalog.get(PdfName.NAMES) != null) {
-      PdfDictionary dic = (PdfDictionary) getPdfObjectRelease(catalog
-          .get(PdfName.NAMES));
-      if (dic != null) {
-        dic = (PdfDictionary) getPdfObjectRelease(dic.get(PdfName.DESTS));
-        if (dic != null) {
-          HashMap names = PdfNameTree.readTree(dic);
-          for (Iterator> it = names.entrySet().iterator(); it.hasNext();) {
-            Map.Entry entry = it.next();
-            PdfArray arr = getNameArray(entry.getValue());
-            if (arr != null)
-              entry.setValue(arr);
-            else
-              it.remove();
-          }
-          return names;
-        }
-      }
-    }
-    return new HashMap<>();
-  }
-
-  /**
-   * Removes all the fields from the document.
-   */
-  public void removeFields() {
-    pageRefs.resetReleasePage();
-    for (int k = 1; k <= pageRefs.size(); ++k) {
-      PdfDictionary page = pageRefs.getPageN(k);
-      PdfArray annots = page.getAsArray(PdfName.ANNOTS);
-      if (annots == null) {
-        pageRefs.releasePage(k);
-        continue;
-      }
-      for (int j = 0; j < annots.size(); ++j) {
-        PdfObject obj = getPdfObjectRelease(annots.getPdfObject(j));
-        if (obj == null || !obj.isDictionary())
-          continue;
-        PdfDictionary annot = (PdfDictionary) obj;
-        if (PdfName.WIDGET.equals(annot.get(PdfName.SUBTYPE)))
-          annots.remove(j--);
-      }
-      if (annots.isEmpty())
-        page.remove(PdfName.ANNOTS);
-      else
-        pageRefs.releasePage(k);
-    }
-    catalog.remove(PdfName.ACROFORM);
-    pageRefs.resetReleasePage();
-  }
-
-  /**
-   * Removes all the annotations and fields from the document.
-   */
-  public void removeAnnotations() {
-    pageRefs.resetReleasePage();
-    for (int k = 1; k <= pageRefs.size(); ++k) {
-      PdfDictionary page = pageRefs.getPageN(k);
-      if (page.get(PdfName.ANNOTS) == null)
-        pageRefs.releasePage(k);
-      else
-        page.remove(PdfName.ANNOTS);
-    }
-    catalog.remove(PdfName.ACROFORM);
-    pageRefs.resetReleasePage();
-  }
-
-  public ArrayList getLinks(int page) {
-    pageRefs.resetReleasePage();
-    ArrayList result = new ArrayList<>();
-    PdfDictionary pageDic = pageRefs.getPageN(page);
-    if (pageDic.get(PdfName.ANNOTS) != null) {
-      PdfArray annots = pageDic.getAsArray(PdfName.ANNOTS);
-      for (int j = 0; j < annots.size(); ++j) {
-        PdfDictionary annot = (PdfDictionary) getPdfObjectRelease(annots
-            .getPdfObject(j));
-
-        if (PdfName.LINK.equals(annot.get(PdfName.SUBTYPE))) {
-          result.add(new PdfAnnotation.PdfImportedLink(annot));
-        }
-      }
-    }
-    pageRefs.releasePage(page);
-    pageRefs.resetReleasePage();
-    return result;
-  }
-
-  private void iterateBookmarks(PdfObject outlineRef, Map names) {
-    while (outlineRef != null) {
-      replaceNamedDestination(outlineRef, names);
-      PdfDictionary outline = (PdfDictionary) getPdfObjectRelease(outlineRef);
-      PdfObject first = outline.get(PdfName.FIRST);
-      if (first != null) {
-        iterateBookmarks(first, names);
-      }
-      outlineRef = outline.get(PdfName.NEXT);
-    }
-  }
-
-  /**
-   * Replaces remote named links with local destinations that have the same
-   * name.
-   *
-   * @since 5.0
-   */
-  public void makeRemoteNamedDestinationsLocal() {
-    if (remoteToLocalNamedDestinations)
-      return;
-    remoteToLocalNamedDestinations = true;
-    Map names = getNamedDestination(true);
-    if (names.isEmpty())
-      return;
-    for (int k = 1; k <= pageRefs.size(); ++k) {
-      PdfDictionary page = pageRefs.getPageN(k);
-      PdfObject annotsRef;
-      PdfArray annots = (PdfArray) getPdfObject(annotsRef = page
-          .get(PdfName.ANNOTS));
-      int annotIdx = lastXrefPartial;
-      releaseLastXrefPartial();
-      if (annots == null) {
-        pageRefs.releasePage(k);
-        continue;
-      }
-      boolean commitAnnots = false;
-      for (int an = 0; an < annots.size(); ++an) {
-        PdfObject objRef = annots.getPdfObject(an);
-        if (convertNamedDestination(objRef, names) && !objRef.isIndirect())
-          commitAnnots = true;
-      }
-      if (commitAnnots)
-        setXrefPartialObject(annotIdx, annots);
-      if (!commitAnnots || annotsRef.isIndirect())
-        pageRefs.releasePage(k);
-    }
-  }
-
-  /**
-   * Converts a remote named destination GoToR with a local named destination if
-   * there's a corresponding name.
-   *
-   * @param obj
-   *          an annotation that needs to be screened for links to external
-   *          named destinations.
-   * @param names
-   *          a map with names of local named destinations
-   * @since iText 5.0
-   */
-  private boolean convertNamedDestination(PdfObject obj, Map names) {
-    obj = getPdfObject(obj);
-    int objIdx = lastXrefPartial;
-    releaseLastXrefPartial();
-    if (obj != null && obj.isDictionary()) {
-      PdfObject ob2 = getPdfObject(((PdfDictionary) obj).get(PdfName.A));
-      if (ob2 != null) {
-        int obj2Idx = lastXrefPartial;
-        releaseLastXrefPartial();
-        PdfDictionary dic = (PdfDictionary) ob2;
-        PdfName type = (PdfName) getPdfObjectRelease(dic.get(PdfName.S));
-        if (PdfName.GOTOR.equals(type)) {
-          PdfObject ob3 = getPdfObjectRelease(dic.get(PdfName.D));
-          Object name = null;
-          if (ob3 != null) {
-            if (ob3.isName())
-              name = ob3;
-            else if (ob3.isString())
-              name = ob3.toString();
-            PdfArray dest = (PdfArray) names.get(name);
-            if (dest != null) {
-              dic.remove(PdfName.F);
-              dic.remove(PdfName.NEWWINDOW);
-              dic.put(PdfName.S, PdfName.GOTO);
-              setXrefPartialObject(obj2Idx, ob2);
-              setXrefPartialObject(objIdx, obj);
-              return true;
-            }
-          }
-        }
-      }
-    }
-    return false;
-  }
-
-  /** Replaces all the local named links with the actual destinations. */
-  public void consolidateNamedDestinations() {
-    if (consolidateNamedDestinations)
-      return;
-    consolidateNamedDestinations = true;
-    Map names = getNamedDestination(true);
-    if (names.isEmpty())
-      return;
-    for (int k = 1; k <= pageRefs.size(); ++k) {
-      PdfDictionary page = pageRefs.getPageN(k);
-      PdfObject annotsRef;
-      PdfArray annots = (PdfArray) getPdfObject(annotsRef = page
-          .get(PdfName.ANNOTS));
-      int annotIdx = lastXrefPartial;
-      releaseLastXrefPartial();
-      if (annots == null) {
-        pageRefs.releasePage(k);
-        continue;
-      }
-      boolean commitAnnots = false;
-      for (int an = 0; an < annots.size(); ++an) {
-        PdfObject objRef = annots.getPdfObject(an);
-        if (replaceNamedDestination(objRef, names) && !objRef.isIndirect())
-          commitAnnots = true;
-      }
-      if (commitAnnots)
-        setXrefPartialObject(annotIdx, annots);
-      if (!commitAnnots || annotsRef.isIndirect())
-        pageRefs.releasePage(k);
-    }
-    PdfDictionary outlines = (PdfDictionary) getPdfObjectRelease(catalog
-        .get(PdfName.OUTLINES));
-    if (outlines == null)
-      return;
-    iterateBookmarks(outlines.get(PdfName.FIRST), names);
-  }
-
-  private boolean replaceNamedDestination(PdfObject obj, Map names) {
-    obj = getPdfObject(obj);
-    int objIdx = lastXrefPartial;
-    releaseLastXrefPartial();
-    if (obj != null && obj.isDictionary()) {
-      PdfObject ob2 = getPdfObjectRelease(((PdfDictionary) obj)
-          .get(PdfName.DEST));
-      Object name = null;
-      if (ob2 != null) {
-        if (ob2.isName())
-          name = ob2;
-        else if (ob2.isString())
-          name = ob2.toString();
-        PdfArray dest = (PdfArray) names.get(name);
-        if (dest != null) {
-          ((PdfDictionary) obj).put(PdfName.DEST, dest);
-          setXrefPartialObject(objIdx, obj);
-          return true;
-        }
-      } else if ((ob2 = getPdfObject(((PdfDictionary) obj).get(PdfName.A))) != null) {
-        int obj2Idx = lastXrefPartial;
-        releaseLastXrefPartial();
-        PdfDictionary dic = (PdfDictionary) ob2;
-        PdfName type = (PdfName) getPdfObjectRelease(dic.get(PdfName.S));
-        if (PdfName.GOTO.equals(type)) {
-          PdfObject ob3 = getPdfObjectRelease(dic.get(PdfName.D));
-          if (ob3 != null) {
-            if (ob3.isName())
-              name = ob3;
-            else if (ob3.isString())
-              name = ob3.toString();
-          }
-          PdfArray dest = (PdfArray) names.get(name);
-          if (dest != null) {
-            dic.put(PdfName.D, dest);
-            setXrefPartialObject(obj2Idx, ob2);
-            setXrefPartialObject(objIdx, obj);
-            return true;
-          }
-        }
-      }
-    }
-    return false;
-  }
-
-  protected static PdfDictionary duplicatePdfDictionary(PdfDictionary original,
-      PdfDictionary copy, PdfReader newReader) {
-    if (copy == null)
-      copy = new PdfDictionary();
-    for (Object o : original.getKeys()) {
-      PdfName key = (PdfName) o;
-      copy.put(key, duplicatePdfObject(original.get(key), newReader));
-    }
-    return copy;
-  }
-
-  protected static PdfObject duplicatePdfObject(PdfObject original,
-      PdfReader newReader) {
-    if (original == null)
-      return null;
-    switch (original.type()) {
-    case PdfObject.DICTIONARY: {
-      return duplicatePdfDictionary((PdfDictionary) original, null, newReader);
-    }
-    case PdfObject.STREAM: {
-      PRStream org = (PRStream) original;
-      PRStream stream = new PRStream(org, null, newReader);
-      duplicatePdfDictionary(org, stream, newReader);
-      return stream;
-    }
-    case PdfObject.ARRAY: {
-      PdfArray arr = new PdfArray();
-      ((PdfArray) original).getElements().forEach(pdfObject -> arr.add(duplicatePdfObject(pdfObject, newReader)));
-      return arr;
-    }
-    case PdfObject.INDIRECT: {
-      PRIndirectReference org = (PRIndirectReference) original;
-      return new PRIndirectReference(newReader, org.getNumber(),
-          org.getGeneration());
-    }
-    default:
-      return original;
-    }
-  }
-
-  /**
-   * Closes the reader
-   */
-  @Override
-  public void close() {
-    if (!partial)
-      return;
-    try {
-      tokens.close();
-    } catch (IOException e) {
-      throw new ExceptionConverter(e);
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  protected void removeUnusedNode(PdfObject obj, boolean[] hits) {
-    Stack state = new Stack();
-    state.push(obj);
-    while (!state.empty()) {
-      Object current = state.pop();
-      if (current == null)
-        continue;
-      List ar = null;
-      PdfDictionary dic = null;
-      PdfName[] keys = null;
-      Object[] objs = null;
-      int idx = 0;
-      if (current instanceof PdfObject) {
-        obj = (PdfObject) current;
-        switch (obj.type()) {
-        case PdfObject.DICTIONARY:
-        case PdfObject.STREAM:
-          dic = (PdfDictionary) obj;
-          keys = new PdfName[dic.size()];
-          dic.getKeys().toArray(keys);
-          break;
-        case PdfObject.ARRAY:
-          ar = ((PdfArray) obj).getElements();
-          break;
-        case PdfObject.INDIRECT:
-          PRIndirectReference ref = (PRIndirectReference) obj;
-          int num = ref.getNumber();
-          if (!hits[num]) {
-            hits[num] = true;
-            state.push(getPdfObjectRelease(ref));
-          }
-          continue;
-        default:
-          continue;
-        }
-      } else {
-        objs = (Object[]) current;
-        if (objs[0] instanceof ArrayList) {
-          ar = (ArrayList) objs[0];
-          idx = (Integer) objs[1];
-        } else {
-          keys = (PdfName[]) objs[0];
-          dic = (PdfDictionary) objs[1];
-          idx = (Integer) objs[2];
-        }
-      }
-      if (ar != null) {
-        for (int k = idx; k < ar.size(); ++k) {
-          PdfObject v = ar.get(k);
-          if (v.isIndirect()) {
-            int num = ((PRIndirectReference) v).getNumber();
-            if (num < 0 || num >= xrefObj.size() || (!partial && xrefObj.get(num) == null)) {
-              ar.set(k, PdfNull.PDFNULL);
-              continue;
-            }
-          }
-          if (objs == null)
-            state.push(new Object[] { ar, k + 1});
-          else {
-            objs[1] = k + 1;
-            state.push(objs);
-          }
-          state.push(v);
-          break;
-        }
-      } else {
-        for (int k = idx; k < keys.length; ++k) {
-          PdfName key = keys[k];
-          PdfObject v = dic.get(key);
-          if (v.isIndirect()) {
-            int num = ((PRIndirectReference) v).getNumber();
-            if (num < 0 || num >= xrefObj.size() || (!partial && xrefObj.get(num) == null)) {
-              dic.put(key, PdfNull.PDFNULL);
-              continue;
-            }
-          }
-          if (objs == null)
-            state.push(new Object[] { keys, dic, k + 1});
-          else {
-            objs[2] = k + 1;
-            state.push(objs);
-          }
-          state.push(v);
-          break;
-        }
-      }
-    }
-  }
-
-  /**
-   * Removes all the unreachable objects.
-   *
-   * @return the number of indirect objects removed
-   */
-  public int removeUnusedObjects() {
-    boolean[] hits = new boolean[xrefObj.size()];
-    removeUnusedNode(trailer, hits);
-    int total = 0;
-    if (partial) {
-      for (int k = 1; k < hits.length; ++k) {
-        if (!hits[k]) {
-          xref[k * 2] = -1;
-          xref[k * 2 + 1] = 0;
-          xrefObj.set(k, null);
-          ++total;
-        }
-      }
-    } else {
-      for (int k = 1; k < hits.length; ++k) {
-        if (!hits[k]) {
-          xrefObj.set(k, null);
-          ++total;
-        }
-      }
-    }
-    return total;
-  }
-
-  /**
-   * Gets a read-only version of AcroFields.
-   *
-   * @return a read-only version of AcroFields
-   */
-  public AcroFields getAcroFields() {
-    return new AcroFields(this, null);
-  }
-
-  /**
-   * Gets the global document JavaScript.
-   *
-   * @param file
-   *          the document file
-   * @throws IOException
-   *           on error
-   * @return the global document JavaScript
-   */
-  public String getJavaScript(RandomAccessFileOrArray file) throws IOException {
-    PdfDictionary names = (PdfDictionary) getPdfObjectRelease(catalog
-        .get(PdfName.NAMES));
-    if (names == null)
-      return null;
-    PdfDictionary js = (PdfDictionary) getPdfObjectRelease(names
-        .get(PdfName.JAVASCRIPT));
-    if (js == null)
-      return null;
-    Map jscript = PdfNameTree.readTree(js);
-    String[] sortedNames = new String[jscript.size()];
-    sortedNames = jscript.keySet().toArray(sortedNames);
-    Arrays.sort(sortedNames);
-    StringBuilder buf = new StringBuilder();
-    for (String sortedName : sortedNames) {
-      PdfDictionary j = (PdfDictionary) getPdfObjectRelease(jscript.get(sortedName));
-      if (j == null)
-        continue;
-      PdfObject obj = getPdfObjectRelease(j.get(PdfName.JS));
-      if (obj != null) {
-        if (obj.isString())
-          buf.append(((PdfString) obj).toUnicodeString()).append('\n');
-        else if (obj.isStream()) {
-          byte[] bytes = getStreamBytes((PRStream) obj, file);
-          if (bytes.length >= 2 && bytes[0] == (byte) 254
-                  && bytes[1] == (byte) 255)
-            buf.append(PdfEncodings.convertToString(bytes,
-                    PdfObject.TEXT_UNICODE));
-          else
-            buf.append(PdfEncodings.convertToString(bytes,
-                    PdfObject.TEXT_PDFDOCENCODING));
-          buf.append('\n');
-        }
-      }
-    }
-    return buf.toString();
-  }
-
-  /**
-   * Gets the global document JavaScript.
-   *
-   * @throws IOException
-   *           on error
-   * @return the global document JavaScript
-   */
-  public String getJavaScript() throws IOException {
-    RandomAccessFileOrArray rf = getSafeFile();
-    try {
-      rf.reOpen();
-      return getJavaScript(rf);
-    } finally {
-      try {
-        rf.close();
-      } catch (Exception ignored) {
-      }
-    }
-  }
-
-  /**
-   * Selects the pages to keep in the document. The pages are described as
-   * ranges. The page ordering can be changed but no page repetitions are
-   * allowed. Note that it may be very slow in partial mode.
-   *
-   * @param ranges
-   *          the comma separated ranges as described in {@link SequenceList}
-   */
-  public void selectPages(String ranges) {
-    selectPages(SequenceList.expand(ranges, getNumberOfPages()));
-  }
-
-  /**
-   * Selects the pages to keep in the document. The pages are described as a
-   * List of Integer. The page ordering can be changed
-   * but no page repetitions are allowed. Note that it may be very slow in
-   * partial mode.
-   *
-   * @param pagesToKeep
-   *          the pages to keep in the document
-   */
-  public void selectPages(List pagesToKeep) {
-    pageRefs.selectPages(pagesToKeep);
-    removeUnusedObjects();
-  }
-
-  /**
-   * Sets the viewer preferences as the sum of several constants.
-   *
-   * @param preferences
-   *          the viewer preferences
-   * @see PdfViewerPreferences#setViewerPreferences
-   */
-  @Override
-  public void setViewerPreferences(int preferences) {
-    this.viewerPreferences.setViewerPreferences(preferences);
-    setViewerPreferences(this.viewerPreferences);
-  }
-
-  /**
-   * Adds a viewer preference
-   *
-   * @param key
-   *          a key for a viewer preference
-   * @param value
-   *          a value for the viewer preference
-   * @see PdfViewerPreferences#addViewerPreference
-   */
-  @Override
-  public void addViewerPreference(PdfName key, PdfObject value) {
-    this.viewerPreferences.addViewerPreference(key, value);
-    setViewerPreferences(this.viewerPreferences);
-  }
-
-  void setViewerPreferences(PdfViewerPreferencesImp vp) {
-    vp.addToCatalog(catalog);
-  }
-
-  /**
-   * Returns a bitset representing the PageMode and PageLayout viewer
-   * preferences. Doesn't return any information about the ViewerPreferences
-   * dictionary.
-   *
-   * @return an int that contains the Viewer Preferences.
-   */
-  public int getSimpleViewerPreferences() {
-    return PdfViewerPreferencesImp.getViewerPreferences(catalog)
-        .getPageLayoutAndMode();
-  }
-
-  /**
-   * Getter for property appendable.
-   *
-   * @return Value of property appendable.
-   */
-  public boolean isAppendable() {
-    return this.appendable;
-  }
-
-  /**
-   * Setter for property appendable.
-   *
-   * @param appendable
-   *          New value of property appendable.
-   */
-  public void setAppendable(boolean appendable) {
-    this.appendable = appendable;
-    if (appendable)
-      getPdfObject(trailer.get(PdfName.ROOT));
-  }
-
-  /**
-   * Getter for property newXrefType.
-   *
-   * @return Value of property newXrefType.
-   */
-  public boolean isNewXrefType() {
-    return newXrefType;
-  }
-
-  /**
-   * Getter for property fileLength.
-   *
-   * @return Value of property fileLength.
-   */
-  public int getFileLength() {
-    return fileLength;
-  }
-
-  /**
-   * Getter for property hybridXref.
-   *
-   * @return Value of property hybridXref.
-   */
-  public boolean isHybridXref() {
-    return hybridXref;
-  }
-
-  static class PageRefs {
-    private final PdfReader reader;
+
     /**
-     * ArrayList with the indirect references to every page. Element 0 = page 1;
-     * 1 = page 2;... Not used for partial reading.
+     * Returns {@link #getPdfObject(PdfObject, PdfObject)} with applied {@link #convertPdfNull(PdfObject)}.
      */
-    private List refsn;
-    /** The number of pages, updated only in case of partial reading. */
-    private int sizep;
+    public static PdfObject getPdfObjectNullConverting(PdfObject obj, PdfObject parent) {
+        return convertPdfNull(getPdfObject(obj, parent));
+    }
+
     /**
-     * intHashtable that does the same thing as refsn in case of partial
-     * reading: major difference: not all the pages are read.
+     * @param obj an object of {@link PdfObject}
      */
-    private IntHashtable refsp;
-    /** Page number of the last page that was read (partial reading only) */
-    private int lastPageRead = -1;
+    public static void releaseLastXrefPartial(PdfObject obj) {
+        if (obj == null) {
+            return;
+        }
+        if (!obj.isIndirect()) {
+            return;
+        }
+        if (!(obj instanceof PRIndirectReference)) {
+            return;
+        }
+
+        PRIndirectReference ref = (PRIndirectReference) obj;
+        PdfReader reader = ref.getReader();
+        if (reader.partial && reader.lastXrefPartial != -1
+                && reader.lastXrefPartial == ref.getNumber()) {
+            reader.xrefObj.set(reader.lastXrefPartial, null);
+        }
+        reader.lastXrefPartial = -1;
+    }
+
     /**
-     * stack to which pages dictionaries are pushed to keep track of the current
-     * page attributes
+     * Eliminates the reference to the object freeing the memory used by it and clearing the xref entry.
+     *
+     * @param obj the object. If it's an indirect reference it will be eliminated
+     * @return the object or the already erased dereferenced object
      */
-    private List pageInh;
-    private boolean keepPages;
-
-    private PageRefs(PdfReader reader) {
-      this.reader = reader;
-      if (reader.partial) {
-        refsp = new IntHashtable();
-        PdfNumber npages = (PdfNumber) PdfReader
-            .getPdfObjectRelease(reader.rootPages.get(PdfName.COUNT));
-        sizep = npages.intValue();
-      } else {
-        readPages();
-      }
-    }
-
-    PageRefs(PageRefs other, PdfReader reader) {
-      this.reader = reader;
-      this.sizep = other.sizep;
-      if (other.refsn != null) {
-        refsn = new ArrayList<>(other.refsn);
-        for (int k = 0; k < refsn.size(); ++k) {
-          refsn.set(k, duplicatePdfObject(refsn.get(k), reader));
-        }
-      } else
-        this.refsp = (IntHashtable) other.refsp.clone();
-    }
-
-    int size() {
-      if (refsn != null)
-        return refsn.size();
-      else
-        return sizep;
-    }
-
-    void readPages() {
-      if (refsn != null)
-        return;
-      refsp = null;
-      refsn = new ArrayList<>();
-      pageInh = new ArrayList<>();
-      PdfObject obj = reader.catalog.get(PdfName.PAGES);
-      if (obj instanceof PRIndirectReference)
-        iteratePages((PRIndirectReference) obj);
-      else if (obj instanceof PdfDictionary)
-        iteratePages((PdfDictionary) obj);
-      pageInh = null;
-      reader.rootPages.put(PdfName.COUNT, new PdfNumber(refsn.size()));
-    }
-
-    void reReadPages() {
-      refsn = null;
-      readPages();
+    public static PdfObject killIndirect(PdfObject obj) {
+        if (obj == null || obj.isNull()) {
+            return null;
+        }
+        PdfObject ret = getPdfObjectRelease(obj);
+        if (obj.isIndirect()) {
+            PRIndirectReference ref = (PRIndirectReference) obj;
+            PdfReader reader = ref.getReader();
+            int n = ref.getNumber();
+            reader.xrefObj.set(n, null);
+            if (reader.partial) {
+                reader.xref[n * 2] = -1;
+            }
+        }
+        return ret;
     }
 
     /**
-     * Gets the page dictionary of the specified page
+     * Decodes a stream that has the FlateDecode filter.
      *
-     * @param pageNum the page number. 1 is the first
-     * @return the page dictionary
+     * @param in the input data
+     * @return the decoded data
      */
-    public PdfDictionary getPageN(int pageNum) {
-      PRIndirectReference ref = getPageOrigRef(pageNum);
-      return (PdfDictionary) PdfReader.getPdfObject(ref);
+    public static byte[] FlateDecode(byte[] in) {
+        byte[] b = FlateDecode(in, true);
+        if (b == null) {
+            return FlateDecode(in, false);
+        }
+        return b;
     }
 
     /**
-     * Gets the page reference to this page.
-     *
-     * @param pageNum the page number.
-     * @return a dictionary object or null when the page does not exist
+     * @param in     the input data
+     * @param dicPar an object of {@link PdfObject}
+     * @return a byte array
      */
-    public PdfDictionary getPageNRelease(int pageNum) {
-      PdfDictionary page = getPageN(pageNum);
-      releasePage(pageNum);
-      return page;
+    public static byte[] decodePredictor(byte[] in, PdfObject dicPar) {
+        if (dicPar == null || !dicPar.isDictionary()) {
+            return in;
+        }
+        PdfDictionary dic = (PdfDictionary) dicPar;
+        PdfObject obj = getPdfObject(dic.get(PdfName.PREDICTOR));
+        if (obj == null || !obj.isNumber()) {
+            return in;
+        }
+        int predictor = ((PdfNumber) obj).intValue();
+        if (predictor < 10) {
+            return in;
+        }
+        int width = 1;
+        obj = getPdfObject(dic.get(PdfName.COLUMNS));
+        if (obj != null && obj.isNumber()) {
+            width = ((PdfNumber) obj).intValue();
+        }
+        int colors = 1;
+        obj = getPdfObject(dic.get(PdfName.COLORS));
+        if (obj != null && obj.isNumber()) {
+            colors = ((PdfNumber) obj).intValue();
+        }
+        int bpc = 8;
+        obj = getPdfObject(dic.get(PdfName.BITSPERCOMPONENT));
+        if (obj != null && obj.isNumber()) {
+            bpc = ((PdfNumber) obj).intValue();
+        }
+        DataInputStream dataStream = new DataInputStream(new ByteArrayInputStream(
+                in));
+        ByteArrayOutputStream fout = new ByteArrayOutputStream(in.length);
+        int bytesPerPixel = colors * bpc / 8;
+        int bytesPerRow = (colors * width * bpc + 7) / 8;
+        byte[] curr = new byte[bytesPerRow];
+        byte[] prior = new byte[bytesPerRow];
+
+        // Decode the (sub)image row-by-row
+        while (true) {
+            // Read the filter type byte and a row of data
+            int filter;
+            try {
+                filter = dataStream.read();
+                if (filter < 0) {
+                    return fout.toByteArray();
+                }
+                dataStream.readFully(curr, 0, bytesPerRow);
+            } catch (Exception e) {
+                return fout.toByteArray();
+            }
+
+            switch (filter) {
+                case 0: // PNG_FILTER_NONE
+                    break;
+                case 1: // PNG_FILTER_SUB
+                    for (int i = bytesPerPixel; i < bytesPerRow; i++) {
+                        curr[i] += curr[i - bytesPerPixel];
+                    }
+                    break;
+                case 2: // PNG_FILTER_UP
+                    for (int i = 0; i < bytesPerRow; i++) {
+                        curr[i] += prior[i];
+                    }
+                    break;
+                case 3: // PNG_FILTER_AVERAGE
+                    for (int i = 0; i < bytesPerPixel; i++) {
+                        curr[i] += (byte) (prior[i] / (byte) 2);
+                    }
+                    for (int i = bytesPerPixel; i < bytesPerRow; i++) {
+                        curr[i] = (byte) ((curr[i] + (curr[i - bytesPerPixel] & 0xff) + (prior[i] & 0xff)) / 2);
+                    }
+                    break;
+                case 4: // PNG_FILTER_PAETH
+                    for (int i = 0; i < bytesPerPixel; i++) {
+                        curr[i] += prior[i];
+                    }
+
+                    for (int i = bytesPerPixel; i < bytesPerRow; i++) {
+                        int a = curr[i - bytesPerPixel] & 0xff;
+                        int b = prior[i] & 0xff;
+                        int c = prior[i - bytesPerPixel] & 0xff;
+
+                        int p = a + b - c;
+                        int pa = Math.abs(p - a);
+                        int pb = Math.abs(p - b);
+                        int pc = Math.abs(p - c);
+
+                        int ret;
+
+                        if ((pa <= pb) && (pa <= pc)) {
+                            ret = a;
+                        } else if (pb <= pc) {
+                            ret = b;
+                        } else {
+                            ret = c;
+                        }
+                        curr[i] += (byte) (ret);
+                    }
+                    break;
+                default:
+                    // Error -- unknown filter type
+                    throw new RuntimeException(
+                            MessageLocalization.getComposedMessage("png.filter.unknown"));
+            }
+            try {
+                fout.write(curr);
+            } catch (IOException ioe) {
+                // Never happens
+            }
+
+            // Swap curr and prior
+            byte[] tmp = prior;
+            prior = curr;
+            curr = tmp;
+        }
     }
 
     /**
-     * Releases the page reference to this page.
+     * A helper to FlateDecode.
      *
-     * @param pageNum the page number.
-     * @return an indirect reference
+     * @param in     the input data
+     * @param strict true to read a correct stream. false to
+     *               try to read a corrupted stream
+     * @return the decoded data
      */
-    public PRIndirectReference getPageOrigRefRelease(int pageNum) {
-      PRIndirectReference ref = getPageOrigRef(pageNum);
-      releasePage(pageNum);
-      return ref;
+    public static byte[] FlateDecode(byte[] in, boolean strict) {
+        ByteArrayInputStream stream = new ByteArrayInputStream(in);
+        InflaterInputStream zip = new InflaterInputStream(stream);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        byte[] b = new byte[strict ? 4092 : 1];
+        try {
+            int n;
+            while ((n = zip.read(b)) >= 0) {
+                out.write(b, 0, n);
+            }
+            zip.close();
+            out.close();
+            return out.toByteArray();
+        } catch (Exception e) {
+            if (strict) {
+                return null;
+            }
+            return out.toByteArray();
+        }
     }
 
     /**
-     * Gets the page reference to this page.
+     * Decodes a stream that has the ASCIIHexDecode filter.
      *
-     * @param pageNum the page number. 1 is the first
-     * @return the page reference or null if the page does not exist
+     * @param in the input data
+     * @return the decoded data
      */
-    public PRIndirectReference getPageOrigRef(int pageNum) {
-      try {
-        --pageNum;
-        if (pageNum < 0 || pageNum >= size())
-          return null;
-        if (refsn != null)
-          return (PRIndirectReference) refsn.get(pageNum);
-        else {
-          int n = refsp.get(pageNum);
-          if (n == 0) {
-            PRIndirectReference ref = getSinglePage(pageNum);
-            if (reader.lastXrefPartial == -1)
-              lastPageRead = -1;
-            else
-              lastPageRead = pageNum;
-            reader.lastXrefPartial = -1;
-            refsp.put(pageNum, ref.getNumber());
-            if (keepPages)
-              lastPageRead = -1;
-            return ref;
-          } else {
-            if (lastPageRead != pageNum)
-              lastPageRead = -1;
-            if (keepPages)
-              lastPageRead = -1;
-            return new PRIndirectReference(reader, n);
-          }
+    public static byte[] ASCIIHexDecode(byte[] in) {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        boolean first = true;
+        int n1 = 0;
+        for (byte b : in) {
+            int ch = b & 0xff;
+            if (ch == '>') {
+                break;
+            }
+            if (PRTokeniser.isWhitespace(ch)) {
+                continue;
+            }
+            int n = PRTokeniser.getHex(ch);
+            if (n == -1) {
+                throw new RuntimeException(
+                        MessageLocalization
+                                .getComposedMessage("illegal.character.in.asciihexdecode"));
+            }
+            if (first) {
+                n1 = n;
+            } else {
+                out.write((byte) ((n1 << 4) + n));
+            }
+            first = !first;
+        }
+        if (!first) {
+            out.write((byte) (n1 << 4));
         }
-      } catch (Exception e) {
-        throw new ExceptionConverter(e);
-      }
+        return out.toByteArray();
     }
 
-    void keepPages() {
-      if (refsp == null || keepPages)
-        return;
-      keepPages = true;
-      refsp.clear();
+    /**
+     * Decodes a stream that has the ASCII85Decode filter.
+     *
+     * @param in the input data
+     * @return the decoded data
+     */
+    public static byte[] ASCII85Decode(byte[] in) {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        int state = 0;
+        int[] chn = new int[5];
+        for (byte b : in) {
+            int ch = b & 0xff;
+            if (ch == '~') {
+                break;
+            }
+            if (PRTokeniser.isWhitespace(ch)) {
+                continue;
+            }
+            if (ch == 'z' && state == 0) {
+                out.write(0);
+                out.write(0);
+                out.write(0);
+                out.write(0);
+                continue;
+            }
+            if (ch < '!' || ch > 'u') {
+                throw new RuntimeException(
+                        MessageLocalization
+                                .getComposedMessage("illegal.character.in.ascii85decode"));
+            }
+            chn[state] = ch - '!';
+            ++state;
+            if (state == 5) {
+                state = 0;
+                int r = 0;
+                for (int j = 0; j < 5; ++j) {
+                    r = r * 85 + chn[j];
+                }
+                out.write((byte) (r >> 24));
+                out.write((byte) (r >> 16));
+                out.write((byte) (r >> 8));
+                out.write((byte) r);
+            }
+        }
+        int r;
+        // We'll ignore the next two lines for the sake of perpetuating broken
+        // PDFs
+        // if (state == 1)
+        // throw new
+        // RuntimeException(MessageLocalization.getComposedMessage("illegal.length.in.ascii85decode"));
+        if (state == 2) {
+            r = chn[0] * 85 * 85 * 85 * 85 + chn[1] * 85 * 85 * 85 + 85 * 85 * 85
+                    + 85 * 85 + 85;
+            out.write((byte) (r >> 24));
+        } else if (state == 3) {
+            r = chn[0] * 85 * 85 * 85 * 85 + chn[1] * 85 * 85 * 85 + chn[2] * 85 * 85
+                    + 85 * 85 + 85;
+            out.write((byte) (r >> 24));
+            out.write((byte) (r >> 16));
+        } else if (state == 4) {
+            r = chn[0] * 85 * 85 * 85 * 85 + chn[1] * 85 * 85 * 85 + chn[2] * 85 * 85
+                    + chn[3] * 85 + 85;
+            out.write((byte) (r >> 24));
+            out.write((byte) (r >> 16));
+            out.write((byte) (r >> 8));
+        }
+        return out.toByteArray();
     }
 
     /**
+     * Decodes a stream that has the LZWDecode filter.
+     *
+     * @param in the input data
+     * @return the decoded data
      */
-    public void releasePage(int pageNum) {
-      if (refsp == null)
-        return;
-      --pageNum;
-      if (pageNum < 0 || pageNum >= size())
-        return;
-      if (pageNum != lastPageRead)
-        return;
-      lastPageRead = -1;
-      reader.lastXrefPartial = refsp.get(pageNum);
-      reader.releaseLastXrefPartial();
-      refsp.remove(pageNum);
+    public static byte[] LZWDecode(byte[] in) {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        LZWDecoder lzw = new LZWDecoder();
+        lzw.decode(in, out);
+        return out.toByteArray();
     }
 
     /**
-         *
-         */
-    public void resetReleasePage() {
-      if (refsp == null)
-        return;
-      lastPageRead = -1;
-    }
-
-    void insertPage(int pageNum, PRIndirectReference ref) {
-      --pageNum;
-      if (refsn != null) {
-        if (pageNum >= refsn.size())
-          refsn.add(ref);
-        else
-          refsn.add(pageNum, ref);
-      } else {
-        ++sizep;
-        lastPageRead = -1;
-        if (pageNum >= size()) {
-          refsp.put(size(), ref.getNumber());
-        } else {
-          IntHashtable refs2 = new IntHashtable((refsp.size() + 1) * 2);
-          for (Iterator it = refsp.getEntryIterator(); it.hasNext();) {
-            IntHashtable.Entry entry = (IntHashtable.Entry) it.next();
-            int p = entry.getKey();
-            refs2.put(p >= pageNum ? p + 1 : p, entry.getValue());
-          }
-          refs2.put(pageNum, ref.getNumber());
-          refsp = refs2;
+     * Get the content from a stream applying the required filters.
+     *
+     * @param stream the stream
+     * @param file   the location where the stream is
+     * @return the stream content
+     * @throws IOException on error
+     */
+    public static byte[] getStreamBytes(PRStream stream,
+            RandomAccessFileOrArray file) throws IOException {
+        PdfObject filter = getPdfObjectRelease(stream.get(PdfName.FILTER));
+        byte[] b = getStreamBytesRaw(stream, file);
+        List filters = new ArrayList<>();
+        filters = addFilters(filters, filter);
+        List dp = new ArrayList<>();
+        PdfObject dpo = getPdfObjectRelease(stream.get(PdfName.DECODEPARMS));
+        if (dpo == null || (!dpo.isDictionary() && !dpo.isArray())) {
+            dpo = getPdfObjectRelease(stream.get(PdfName.DP));
+        }
+        if (dpo != null) {
+            if (dpo.isDictionary()) {
+                dp.add(dpo);
+            } else if (dpo.isArray()) {
+                dp = ((PdfArray) dpo).getElements();
+            }
+        }
+        String name;
+        for (int j = 0; j < filters.size(); ++j) {
+            name = getPdfObjectRelease(filters.get(j))
+                    .toString();
+            switch (name) {
+                case "/FlateDecode":
+                case "/Fl": {
+                    b = FlateDecode(b);
+                    PdfObject dicParam;
+                    if (j < dp.size()) {
+                        dicParam = dp.get(j);
+                        b = decodePredictor(b, dicParam);
+                    }
+                    break;
+                }
+                case "/ASCIIHexDecode":
+                case "/AHx":
+                    b = ASCIIHexDecode(b);
+                    break;
+                case "/ASCII85Decode":
+                case "/A85":
+                    b = ASCII85Decode(b);
+                    break;
+                case "/LZWDecode": {
+                    b = LZWDecode(b);
+                    PdfObject dicParam;
+                    if (j < dp.size()) {
+                        dicParam = dp.get(j);
+                        b = decodePredictor(b, dicParam);
+                    }
+                    break;
+                }
+                case "/Crypt":
+                    break;
+                default:
+                    throw new UnsupportedPdfException(
+                            MessageLocalization.getComposedMessage(
+                                    "the.filter.1.is.not.supported", name));
+            }
         }
-      }
+        return b;
     }
 
     /**
-     * Adds a PdfDictionary to the pageInh stack to keep track of the page
-     * attributes.
+     * Get the content from a stream applying the required filters.
      *
-     * @param nodePages
-     *          a Pages dictionary
+     * @param stream the stream
+     * @return the stream content
+     * @throws IOException on error
      */
-    private void pushPageAttributes(PdfDictionary nodePages) {
-      PdfDictionary dic = new PdfDictionary();
-      if (!pageInh.isEmpty()) {
-        dic.putAll(pageInh.get(pageInh.size() - 1));
-      }
-      for (PdfName pageInhCandidate : pageInhCandidates) {
-        PdfObject obj = nodePages.get(pageInhCandidate);
-        if (obj != null)
-          dic.put(pageInhCandidate, obj);
-      }
-      pageInh.add(dic);
+    public static byte[] getStreamBytes(PRStream stream) throws IOException {
+        RandomAccessFileOrArray rf = stream.getReader().getSafeFile();
+        try {
+            rf.reOpen();
+            return getStreamBytes(stream, rf);
+        } finally {
+            try {
+                rf.close();
+            } catch (Exception e) {
+            }
+        }
     }
 
     /**
-     * Removes the last PdfDictionary that was pushed to the pageInh stack.
+     * Get the content from a stream as it is without applying any filter.
+     *
+     * @param stream the stream
+     * @param file   the location where the stream is
+     * @return the stream content
+     * @throws IOException on error
      */
-    private void popPageAttributes() {
-      pageInh.remove(pageInh.size() - 1);
-    }
-
-    private void iteratePages(PRIndirectReference rpage) {
-      PdfDictionary page = (PdfDictionary) getPdfObject(rpage);
-      if (page == null)
-        return;
-      PdfArray kidsPR = page.getAsArray(PdfName.KIDS);
-      // reference to a leaf
-      if (kidsPR == null) {
-        page.put(PdfName.TYPE, PdfName.PAGE);
-        PdfDictionary dic = pageInh.get(pageInh.size() - 1);
-        PdfName key;
-        for (Object o : dic.getKeys()) {
-          key = (PdfName) o;
-          if (page.get(key) == null)
-            page.put(key, dic.get(key));
-        }
-        if (page.get(PdfName.MEDIABOX) == null) {
-          PdfArray arr = new PdfArray(new float[] { 0, 0,
-                  PageSize.LETTER.getRight(), PageSize.LETTER.getTop() });
-          page.put(PdfName.MEDIABOX, arr);
-        }
-        refsn.add(rpage);
-      }
-      // reference to a branch
-      else {
-        page.put(PdfName.TYPE, PdfName.PAGES);
-        pushPageAttributes(page);
-        for (int k = 0; k < kidsPR.size(); ++k) {
-          PdfObject obj = kidsPR.getPdfObject(k);
-          if (!obj.isIndirect()) {
-            while (k < kidsPR.size())
-              kidsPR.remove(k);
-            break;
-          }
-          if (obj instanceof PRIndirectReference)
-            iteratePages((PRIndirectReference) obj);
-          else if (obj instanceof PdfDictionary)
-            iteratePages((PdfDictionary) obj);
-        }
-        popPageAttributes();
-      }
-    }
-
-    private void iteratePages(PdfDictionary page) {
-      PdfArray kidsPR = page.getAsArray(PdfName.KIDS);
-      // reference to a leaf
-      if (kidsPR != null) {
-        page.put(PdfName.TYPE, PdfName.PAGES);
-        pushPageAttributes(page);
-        for (int k = 0; k < kidsPR.size(); ++k) {
-          PdfObject obj = kidsPR.getPdfObject(k);
-          if (!obj.isIndirect()) {
-            while (k < kidsPR.size())
-              kidsPR.remove(k);
-            break;
-          }
-          if (obj instanceof PRIndirectReference)
-            iteratePages((PRIndirectReference) obj);
-          else if (obj instanceof PdfDictionary)
-            iteratePages((PdfDictionary) obj);
-        }
-        popPageAttributes();
-      }
-    }
-
-    protected PRIndirectReference getSinglePage(int n) {
-      PdfDictionary acc = new PdfDictionary();
-      PdfDictionary top = reader.rootPages;
-      int base = 0;
-      while (true) {
-        for (PdfName pageInhCandidate : pageInhCandidates) {
-          PdfObject obj = top.get(pageInhCandidate);
-          if (obj != null)
-            acc.put(pageInhCandidate, obj);
-        }
-        PdfArray kids = (PdfArray) PdfReader.getPdfObjectRelease(top.get(PdfName.KIDS));
-        for (PdfObject pdfObject : kids.getElements()) {
-          PRIndirectReference ref = (PRIndirectReference) pdfObject;
-          PdfDictionary dic = (PdfDictionary) getPdfObject(ref);
-          int last = reader.lastXrefPartial;
-          PdfObject count = getPdfObjectRelease(dic.get(PdfName.COUNT));
-          reader.lastXrefPartial = last;
-          int acn = 1;
-          if (count != null && count.type() == PdfObject.NUMBER)
-            acn = ((PdfNumber) count).intValue();
-          if (n < base + acn) {
-            if (count == null) {
-              dic.mergeDifferent(acc);
-              return ref;
+    public static byte[] getStreamBytesRaw(PRStream stream,
+            RandomAccessFileOrArray file) throws IOException {
+        PdfReader reader = stream.getReader();
+        byte[] b;
+        if (stream.getOffset() < 0) {
+            b = stream.getBytes();
+        } else {
+            b = new byte[stream.getLength()];
+            file.seek(stream.getOffset());
+            file.readFully(b);
+            PdfEncryption decrypt = reader.getDecrypt();
+            if (decrypt != null) {
+                PdfObject filter = getPdfObjectRelease(stream.get(PdfName.FILTER));
+                List filters = new ArrayList<>();
+                filters = addFilters(filters, filter);
+                boolean skip = false;
+                for (PdfObject filter1 : filters) {
+                    PdfObject obj = getPdfObjectRelease(filter1);
+                    if (obj != null && obj.toString().equals("/Crypt")) {
+                        skip = true;
+                        break;
+                    }
+                }
+                if (!skip) {
+                    decrypt.setHashKey(stream.getObjNum(), stream.getObjGen());
+                    b = decrypt.decryptByteArray(b);
+                }
             }
-            reader.releaseLastXrefPartial();
-            top = dic;
-            break;
-          }
-          reader.releaseLastXrefPartial();
-          base += acn;
-        }
-      }
-    }
-
-    private void selectPages(List pagesToKeep) {
-      IntHashtable pg = new IntHashtable();
-      List finalPages = new ArrayList<>();
-      int psize = size();
-      for (Integer aPagesToKeep : pagesToKeep) {
-        if (aPagesToKeep >= 1 && aPagesToKeep <= psize && pg.put(aPagesToKeep, 1) == 0)
-          finalPages.add(aPagesToKeep);
-      }
-      if (reader.partial) {
-        for (int k = 1; k <= psize; ++k) {
-          getPageOrigRef(k);
-          resetReleasePage();
-        }
-      }
-      PRIndirectReference parent = (PRIndirectReference) reader.catalog
-          .get(PdfName.PAGES);
-      PdfDictionary topPages = (PdfDictionary) PdfReader.getPdfObject(parent);
-      List newPageRefs = new ArrayList<>(finalPages.size());
-      PdfArray kids = new PdfArray();
-      for (Object finalPage : finalPages) {
-        int p = (Integer) finalPage;
-        PRIndirectReference pref = getPageOrigRef(p);
-        resetReleasePage();
-        kids.add(pref);
-        newPageRefs.add(pref);
-        getPageN(p).put(PdfName.PARENT, parent);
-      }
-      AcroFields af = reader.getAcroFields();
-      boolean removeFields = (af.getAllFields().size() > 0);
-      for (int k = 1; k <= psize; ++k) {
-        if (!pg.containsKey(k)) {
-          if (removeFields)
-            af.removeFieldsFromPage(k);
-          PRIndirectReference pref = getPageOrigRef(k);
-          int nref = pref.getNumber();
-          reader.xrefObj.set(nref, null);
-          if (reader.partial) {
-            reader.xref[nref * 2] = -1;
-            reader.xref[nref * 2 + 1] = 0;
-          }
-        }
-      }
-      topPages.put(PdfName.COUNT, new PdfNumber(finalPages.size()));
-      topPages.put(PdfName.KIDS, kids);
-      refsp = null;
-      refsn = newPageRefs;
-    }
-  }
-
-  PdfIndirectReference getCryptoRef() {
-    if (cryptoRef == null)
-      return null;
-    return new PdfIndirectReference(0, cryptoRef.getNumber(),
-        cryptoRef.getGeneration());
-  }
-
-  /**
-   * Removes any usage rights that this PDF may have. Only Adobe can grant usage
-   * rights and any PDF modification with iText will invalidate them.
-   * Invalidated usage rights may confuse Acrobat and it's advisable to remove
-   * them altogether.
-   */
-  public void removeUsageRights() {
-    PdfDictionary perms = catalog.getAsDict(PdfName.PERMS);
-    if (perms == null)
-      return;
-    perms.remove(PdfName.UR);
-    perms.remove(PdfName.UR3);
-    if (perms.size() == 0)
-      catalog.remove(PdfName.PERMS);
-  }
-
-  /**
-   * Gets the certification level for this document. The return values can be
-   * PdfSignatureAppearance.NOT_CERTIFIED,
-   * PdfSignatureAppearance.CERTIFIED_NO_CHANGES_ALLOWED,
-   * PdfSignatureAppearance.CERTIFIED_FORM_FILLING and
-   * PdfSignatureAppearance.CERTIFIED_FORM_FILLING_AND_ANNOTATIONS
-   * .
-   * 
          
-   * No signature validation is made, use the methods available for that in
-   * AcroFields.
-   * 
          
-   *
-   * @return gets the certification level for this document
-   */
-  public int getCertificationLevel() {
-    PdfDictionary dic = catalog.getAsDict(PdfName.PERMS);
-    if (dic == null)
-      return PdfSignatureAppearance.NOT_CERTIFIED;
-    dic = dic.getAsDict(PdfName.DOCMDP);
-    if (dic == null)
-      return PdfSignatureAppearance.NOT_CERTIFIED;
-    PdfArray arr = dic.getAsArray(PdfName.REFERENCE);
-    if (arr == null || arr.size() == 0)
-      return PdfSignatureAppearance.NOT_CERTIFIED;
-    dic = arr.getAsDict(0);
-    if (dic == null)
-      return PdfSignatureAppearance.NOT_CERTIFIED;
-    dic = dic.getAsDict(PdfName.TRANSFORMPARAMS);
-    if (dic == null)
-      return PdfSignatureAppearance.NOT_CERTIFIED;
-    PdfNumber p = dic.getAsNumber(PdfName.P);
-    if (p == null)
-      return PdfSignatureAppearance.NOT_CERTIFIED;
-    return p.intValue();
-  }
-
-  /**
-   * Checks if an encrypted document may be modified if the owner password was not supplied.
-   * If the document is not encrypted, the setting has no effect.
-   *
-   * @return true if the document may be modified even if the owner password was not
-   *         supplied false otherwise
-   */
-  public boolean isModificationlowedWithoutOwnerPassword() {
-    return this.modificationAllowedWithoutOwnerPassword;
-  }
-
-  /**
-   * Sets whether the document (if encrypted) may be modified even if the owner password was not
-   * supplied. If this is set to false an exception will be thrown when attempting to
-   * access the Document if the owner password was not supplied (for encrypted documents.)
-   *
-   * @param modificationAllowedWithoutOwnerPassword
-   *         the modificationAllowedWithoutOwnerPassword state.
-   */
-  public void setModificationAllowedWithoutOwnerPassword(
-    boolean modificationAllowedWithoutOwnerPassword) {
-    this.modificationAllowedWithoutOwnerPassword = modificationAllowedWithoutOwnerPassword;
-  }
-
-  /**
-   * Checks if the document was opened with the owner password so that the end
-   * application can decide what level of access restrictions to apply. If the
-   * document is not encrypted it will return true.
-   *
-   * @return true if the document was opened with the owner password or if it's not
-   *         encrypted or the modificationAllowedWithoutOwnerPassword flag is set,
-   *         false otherwise.
-   */
-  public final boolean isOpenedWithFullPermissions() {
-    return !encrypted || ownerPasswordUsed || modificationAllowedWithoutOwnerPassword;
-  }
-
-  public int getCryptoMode() {
-    if (decrypt == null)
-      return -1;
-    else
-      return decrypt.getCryptoMode();
-  }
-
-  public boolean isMetadataEncrypted() {
-    if (decrypt == null)
-      return false;
-    else
-      return decrypt.isMetadataEncrypted();
-  }
-
-  public byte[] computeUserPassword() {
-    if (!encrypted || !ownerPasswordUsed)
-      return null;
-    return decrypt.computeUserPassword(password);
-  }
-
-  /**
-   * Returns a permanent document identifier extracted from trailer /ID entry, when present
-   *
-   * @return byte array representing the document permanent identifier
-   */
-  public byte[] getDocumentId() {
-    if (trailer == null) {
-      return null;
-    }
-    PdfArray documentIDs = trailer.getAsArray(PdfName.ID);
-    if (documentIDs == null || documentIDs.size() == 0) {
-      return null;
-    }
-    PdfObject o = documentIDs.getPdfObject(0);
-    return com.lowagie.text.DocWriter.getISOBytes(o.toString());
-  }
+        }
+        return b;
+    }
+
+    private static List addFilters(List filters, PdfObject filter) {
+        if (filter != null) {
+            if (filter.isName()) {
+                filters.add(filter);
+            } else if (filter.isArray()) {
+                filters = ((PdfArray) filter).getElements();
+            }
+        }
+        return filters;
+    }
+
+    /**
+     * Get the content from a stream as it is without applying any filter.
+     *
+     * @param stream the stream
+     * @return the stream content
+     * @throws IOException on error
+     */
+    public static byte[] getStreamBytesRaw(PRStream stream) throws IOException {
+        RandomAccessFileOrArray rf = stream.getReader().getSafeFile();
+        try {
+            rf.reOpen();
+            return getStreamBytesRaw(stream, rf);
+        } finally {
+            try {
+                rf.close();
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    private static boolean equalsn(byte[] a1, byte[] a2) {
+        int length = a2.length;
+        for (int k = 0; k < length; ++k) {
+            if (a1[k] != a2[k]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static boolean existsName(PdfDictionary dic, PdfName key, PdfName value) {
+        PdfObject type = getPdfObjectRelease(dic.get(key));
+        if (type == null || !type.isName()) {
+            return false;
+        }
+        PdfName name = (PdfName) type;
+        return name.equals(value);
+    }
+
+    static String getFontNameFromDescriptor(PdfDictionary dic) {
+        return getFontName(dic, PdfName.FONTNAME);
+    }
+
+    private static String getFontName(PdfDictionary dic) {
+        return getFontName(dic, PdfName.BASEFONT);
+    }
+
+    private static String getFontName(PdfDictionary dic, PdfName property) {
+        if (dic == null) {
+            return null;
+        }
+        PdfObject type = getPdfObjectRelease(dic.get(property));
+        if (type == null || !type.isName()) {
+            return null;
+        }
+        return PdfName.decodeName(type.toString());
+    }
+
+    static boolean isFontSubset(String fontName) {
+        return fontName != null && fontName.length() >= 8
+                && fontName.charAt(6) == '+';
+    }
+
+    private static String getSubsetPrefix(PdfDictionary dic) {
+        if (dic == null) {
+            return null;
+        }
+        String s = getFontName(dic);
+        if (s == null) {
+            return null;
+        }
+        if (s.length() < 8 || s.charAt(6) != '+') {
+            return null;
+        }
+        for (int k = 0; k < 6; ++k) {
+            char c = s.charAt(k);
+            if (c < 'A' || c > 'Z') {
+                return null;
+            }
+        }
+        return s;
+    }
+
+    private static PdfArray getNameArray(PdfObject obj) {
+        if (obj == null) {
+            return null;
+        }
+        obj = getPdfObjectRelease(obj);
+        if (obj == null) {
+            return null;
+        }
+        if (obj.isArray()) {
+            return (PdfArray) obj;
+        } else if (obj.isDictionary()) {
+            PdfObject arr2 = getPdfObjectRelease(((PdfDictionary) obj).get(PdfName.D));
+            if (arr2 != null && arr2.isArray()) {
+                return (PdfArray) arr2;
+            }
+        }
+        return null;
+    }
+
+    protected static PdfDictionary duplicatePdfDictionary(PdfDictionary original,
+            PdfDictionary copy, PdfReader newReader) {
+        if (copy == null) {
+            copy = new PdfDictionary();
+        }
+        for (Object o : original.getKeys()) {
+            PdfName key = (PdfName) o;
+            copy.put(key, duplicatePdfObject(original.get(key), newReader));
+        }
+        return copy;
+    }
+
+    protected static PdfObject duplicatePdfObject(PdfObject original,
+            PdfReader newReader) {
+        if (original == null) {
+            return null;
+        }
+        switch (original.type()) {
+            case PdfObject.DICTIONARY: {
+                return duplicatePdfDictionary((PdfDictionary) original, null, newReader);
+            }
+            case PdfObject.STREAM: {
+                PRStream org = (PRStream) original;
+                PRStream stream = new PRStream(org, null, newReader);
+                duplicatePdfDictionary(org, stream, newReader);
+                return stream;
+            }
+            case PdfObject.ARRAY: {
+                PdfArray arr = new PdfArray();
+                ((PdfArray) original).getElements()
+                        .forEach(pdfObject -> arr.add(duplicatePdfObject(pdfObject, newReader)));
+                return arr;
+            }
+            case PdfObject.INDIRECT: {
+                PRIndirectReference org = (PRIndirectReference) original;
+                return new PRIndirectReference(newReader, org.getNumber(),
+                        org.getGeneration());
+            }
+            default:
+                return original;
+        }
+    }
+
+    /**
+     * Gets a new file instance of the original PDF document.
+     *
+     * @return a new file instance of the original PDF document
+     */
+    public RandomAccessFileOrArray getSafeFile() {
+        return tokens.getSafeFile();
+    }
+
+    protected PdfReaderInstance getPdfReaderInstance(PdfWriter writer) {
+        return new PdfReaderInstance(this, writer);
+    }
+
+    /**
+     * Gets the number of pages in the document.
+     *
+     * @return the number of pages in the document
+     */
+    public int getNumberOfPages() {
+        return pageRefs.size();
+    }
+
+    /**
+     * Returns the document's catalog. This dictionary is not a copy, any changes will be reflected in the catalog.
+     *
+     * @return the document's catalog
+     */
+    public PdfDictionary getCatalog() {
+        return catalog;
+    }
+
+    /**
+     * Returns the document's acroform, if it has one.
+     *
+     * @return the document's acroform
+     */
+    public PRAcroForm getAcroForm() {
+        if (!acroFormParsed) {
+            acroFormParsed = true;
+            PdfObject form = catalog.get(PdfName.ACROFORM);
+            if (form != null) {
+                try {
+                    acroForm = new PRAcroForm(this);
+                    acroForm.readAcroForm((PdfDictionary) getPdfObject(form));
+                } catch (Exception e) {
+                    acroForm = null;
+                }
+            }
+        }
+        return acroForm;
+    }
+
+    /**
+     * Gets the page rotation. This value can be 0, 90, 180 or 270.
+     *
+     * @param index the page number. The first page is 1
+     * @return the page rotation
+     */
+    public int getPageRotation(int index) {
+        return getPageRotation(pageRefs.getPageNRelease(index));
+    }
+
+    /**
+     * Gets the page size, taking rotation into account. This is a
+     * Rectangle with the value of the /MediaBox and the /Rotate key.
+     *
+     * @param index the page number. The first page is 1
+     * @return a Rectangle
+     */
+    public Rectangle getPageSizeWithRotation(int index) {
+        return getPageSizeWithRotation(pageRefs.getPageNRelease(index));
+    }
+
+    /**
+     * Gets the rotated page from a page dictionary.
+     *
+     * @param page the page dictionary
+     * @return the rotated page or null when the page does not exists
+     */
+    public Rectangle getPageSizeWithRotation(PdfDictionary page) {
+
+        if (page != null) {
+            Rectangle rect = getPageSize(page);
+            int rotation = getPageRotation(page);
+            while (rotation > 0) {
+                rect = rect.rotate();
+                rotation -= 90;
+            }
+            return rect;
+        }
+        return null;
+    }
+
+    /**
+     * Gets the page size, taking rotation into account. This is a Rectangle with the value of a an
+     * arbitrary box and the /Rotate key.
+     *
+     * @param index   the page number. The first page is 1
+     * @param boxName of the rotated box. Allowed names are: "crop", "trim", "art", "bleed" and "media".
+     * @return a Rectangle or null if the page does not exist
+     */
+    public Rectangle getPageSizeWithRotation(int index, String boxName) {
+
+        Rectangle rect = getBoxSize(index, boxName);
+        PdfDictionary page = this.pageRefs.getPageNRelease(index);
+
+        if (rect == null || page == null) {
+            return null;
+        }
+
+        int rotation = getPageRotation(page);
+        //except for the mediabox all other boxes can be null
+        while (rotation > 0) {
+            rect = rect.rotate();
+            rotation -= 90;
+        }
+        return rect;
+    }
+
+    /**
+     * Gets the page size without taking rotation into account. This is the value of the /MediaBox key.
+     *
+     * @param index the page number. The first page is 1
+     * @return the page size
+     */
+    public Rectangle getPageSize(int index) {
+        return getPageSize(pageRefs.getPageNRelease(index));
+    }
+
+    /**
+     * Gets the page from a page dictionary
+     *
+     * @param page the page dictionary
+     * @return the page
+     */
+    public Rectangle getPageSize(PdfDictionary page) {
+        PdfArray mediaBox = page.getAsArray(PdfName.MEDIABOX);
+        return getNormalizedRectangle(mediaBox);
+    }
+
+    /**
+     * Gets the crop box without taking rotation into account. This is the value of the /CropBox key. The crop box is
+     * the part of the document to be displayed or printed. It usually is the same as the media box but may be smaller.
+     * If the page doesn't have a crop box the page size will be returned.
+     *
+     * @param index the page number. The first page is 1
+     * @return the crop box
+     */
+    public Rectangle getCropBox(int index) {
+        PdfDictionary page = pageRefs.getPageNRelease(index);
+        PdfArray cropBox = (PdfArray) getPdfObjectRelease(page.get(PdfName.CROPBOX));
+        if (cropBox == null) {
+            return getPageSize(page);
+        }
+        return getNormalizedRectangle(cropBox);
+    }
+
+    /**
+     * Gets the box size. Allowed names are: "crop", "trim", "art", "bleed" and "media".
+     *
+     * @param index   the page number. The first page is 1
+     * @param boxName the box name
+     * @return the box rectangle or null
+     */
+    public Rectangle getBoxSize(int index, String boxName) {
+        PdfDictionary page = pageRefs.getPageNRelease(index);
+        PdfArray box = null;
+        switch (boxName) {
+            case "trim":
+                box = (PdfArray) getPdfObjectRelease(page.get(PdfName.TRIMBOX));
+                break;
+            case "art":
+                box = (PdfArray) getPdfObjectRelease(page.get(PdfName.ARTBOX));
+                break;
+            case "bleed":
+                box = (PdfArray) getPdfObjectRelease(page.get(PdfName.BLEEDBOX));
+                break;
+            case "crop":
+                box = (PdfArray) getPdfObjectRelease(page.get(PdfName.CROPBOX));
+                break;
+            case "media":
+                box = (PdfArray) getPdfObjectRelease(page.get(PdfName.MEDIABOX));
+                break;
+        }
+        if (box == null) {
+            return null;
+        }
+        return getNormalizedRectangle(box);
+    }
+
+    /**
+     * Returns the content of the document information dictionary as a
+     * HashMap of String.
+     *
+     * @return content of the document information dictionary
+     */
+    public Map getInfo() {
+        Map map = new HashMap<>();
+        PdfDictionary info = trailer.getAsDict(PdfName.INFO);
+        if (info == null) {
+            return map;
+        }
+        for (Object o : info.getKeys()) {
+            PdfName key = (PdfName) o;
+            PdfObject obj = getPdfObject(info.get(key));
+            if (obj == null) {
+                continue;
+            }
+            String value = obj.toString();
+            switch (obj.type()) {
+                case PdfObject.STRING: {
+                    value = ((PdfString) obj).toUnicodeString();
+                    break;
+                }
+                case PdfObject.NAME: {
+                    value = PdfName.decodeName(value);
+                    break;
+                }
+            }
+            map.put(PdfName.decodeName(key.toString()), value);
+        }
+        return map;
+    }
+
+    protected void readPdf() throws IOException {
+        try {
+            fileLength = tokens.getFile().length();
+            pdfVersion = tokens.checkPdfHeader();
+            try {
+                readXref();
+            } catch (Exception e) {
+                try {
+                    rebuilt = true;
+                    rebuildXref();
+                    lastXref = -1;
+                } catch (Exception ne) {
+                    throw new InvalidPdfException(MessageLocalization.getComposedMessage(
+                            "rebuild.failed.1.original.message.2", ne.getMessage(),
+                            e.getMessage()));
+                }
+            }
+            try {
+                readDocObj();
+            } catch (Exception e) {
+                if (e instanceof BadPasswordException) {
+                    throw new BadPasswordException(e.getMessage());
+                }
+                if (rebuilt || encryptionError) {
+                    throw new InvalidPdfException(e.getMessage());
+                }
+                rebuilt = true;
+                encrypted = false;
+                rebuildXref();
+                lastXref = -1;
+                readDocObj();
+            }
+
+            strings.clear();
+            readPages();
+            //eliminateSharedStreams();
+            removeUnusedObjects();
+        } finally {
+            try {
+                tokens.close();
+            } catch (Exception e) {
+                // empty on purpose
+            }
+        }
+    }
+
+    protected void readPdfPartial() throws IOException {
+        try {
+            fileLength = tokens.getFile().length();
+            pdfVersion = tokens.checkPdfHeader();
+            try {
+                readXref();
+            } catch (Exception e) {
+                try {
+                    rebuilt = true;
+                    rebuildXref();
+                    lastXref = -1;
+                } catch (Exception ne) {
+                    throw new InvalidPdfException(MessageLocalization.getComposedMessage(
+                            "rebuild.failed.1.original.message.2", ne.getMessage(),
+                            e.getMessage()));
+                }
+            }
+            readDocObjPartial();
+            readPages();
+        } catch (IOException e) {
+            try {
+                tokens.close();
+            } catch (Exception ignored) {
+            }
+            throw e;
+        }
+    }
+
+    private boolean equalsArray(byte[] ar1, byte[] ar2, int size) {
+        for (int k = 0; k < size; ++k) {
+            if (ar1[k] != ar2[k]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *
+     */
+    private void readDecryptedDocObj() throws IOException {
+        if (encrypted) {
+            return;
+        }
+        if (trailer == null) {
+            return;
+        }
+        PdfObject encDic = trailer.get(PdfName.ENCRYPT);
+        if (encDic == null || encDic.toString().equals("null")) {
+            return;
+        }
+        encryptionError = true;
+        byte[] encryptionKey = null;
+        encrypted = true;
+        PdfDictionary enc = (PdfDictionary) getPdfObject(encDic);
+
+        String s;
+        PdfObject o;
+
+        PdfArray documentIDs = trailer.getAsArray(PdfName.ID);
+        byte[] documentID = null;
+        if (documentIDs != null) {
+            o = documentIDs.getPdfObject(0);
+            strings.remove(o);
+            s = o.toString();
+            documentID = com.lowagie.text.DocWriter.getISOBytes(s);
+            if (documentIDs.size() > 1) {
+                strings.remove(documentIDs.getPdfObject(1));
+            }
+        }
+        // just in case we have a broken producer
+        if (documentID == null) {
+            documentID = new byte[0];
+        }
+        byte[] uValue = null;
+        byte[] oValue = null;
+        int cryptoMode = PdfWriter.STANDARD_ENCRYPTION_40;
+        int lengthValue = 0;
+
+        PdfObject filter = getPdfObjectRelease(enc.get(PdfName.FILTER));
+
+        if (filter.equals(PdfName.STANDARD)) {
+            s = enc.get(PdfName.U).toString();
+            strings.remove(enc.get(PdfName.U));
+            uValue = com.lowagie.text.DocWriter.getISOBytes(s);
+            s = enc.get(PdfName.O).toString();
+            strings.remove(enc.get(PdfName.O));
+            oValue = com.lowagie.text.DocWriter.getISOBytes(s);
+
+            o = enc.get(PdfName.P);
+            if (!o.isNumber()) {
+                throw new InvalidPdfException(
+                        MessageLocalization.getComposedMessage("illegal.p.value"));
+            }
+            pValue = ((PdfNumber) o).intValue();
+
+            o = enc.get(PdfName.R);
+            if (!o.isNumber()) {
+                throw new InvalidPdfException(
+                        MessageLocalization.getComposedMessage("illegal.r.value"));
+            }
+            rValue = ((PdfNumber) o).intValue();
+
+            switch (rValue) {
+                case 2:
+                    cryptoMode = PdfWriter.STANDARD_ENCRYPTION_40;
+                    break;
+                case 3:
+                    o = enc.get(PdfName.LENGTH);
+                    if (!o.isNumber()) {
+                        throw new InvalidPdfException(
+                                MessageLocalization.getComposedMessage("illegal.length.value"));
+                    }
+                    lengthValue = ((PdfNumber) o).intValue();
+                    if (lengthValue > 128 || lengthValue < 40 || lengthValue % 8 != 0) {
+                        throw new InvalidPdfException(
+                                MessageLocalization.getComposedMessage("illegal.length.value"));
+                    }
+                    cryptoMode = PdfWriter.STANDARD_ENCRYPTION_128;
+                    break;
+                case 4:
+                    PdfDictionary dic = (PdfDictionary) enc.get(PdfName.CF);
+                    if (dic == null) {
+                        throw new InvalidPdfException(
+                                MessageLocalization.getComposedMessage("cf.not.found.encryption"));
+                    }
+                    dic = (PdfDictionary) dic.get(PdfName.STDCF);
+                    if (dic == null) {
+                        throw new InvalidPdfException(
+                                MessageLocalization
+                                        .getComposedMessage("stdcf.not.found.encryption"));
+                    }
+                    if (PdfName.V2.equals(dic.get(PdfName.CFM))) {
+                        cryptoMode = PdfWriter.STANDARD_ENCRYPTION_128;
+                    } else if (PdfName.AESV2.equals(dic.get(PdfName.CFM))) {
+                        cryptoMode = PdfWriter.ENCRYPTION_AES_128;
+                    } else {
+                        throw new UnsupportedPdfException(
+                                MessageLocalization
+                                        .getComposedMessage("no.compatible.encryption.found"));
+                    }
+                    PdfObject em = enc.get(PdfName.ENCRYPTMETADATA);
+                    if (em != null && em.toString().equals("false")) {
+                        cryptoMode |= PdfWriter.DO_NOT_ENCRYPT_METADATA;
+                    }
+                    break;
+                case 6:
+                    cryptoMode = PdfWriter.ENCRYPTION_AES_256_V3;
+                    em = enc.get(PdfName.ENCRYPTMETADATA);
+                    if (em != null && em.toString().equals("false")) {
+                        cryptoMode |= PdfWriter.DO_NOT_ENCRYPT_METADATA;
+                    }
+                    break;
+                default:
+                    throw new UnsupportedPdfException(
+                            MessageLocalization.getComposedMessage(
+                                    "unknown.encryption.type.r.eq.1", rValue));
+            }
+        } else if (filter.equals(PdfName.PUBSEC)) {
+            PdfArray recipients;
+
+            o = enc.get(PdfName.V);
+            if (!o.isNumber()) {
+                throw new InvalidPdfException(
+                        MessageLocalization.getComposedMessage("illegal.v.value"));
+            }
+            int vValue = ((PdfNumber) o).intValue();
+            switch (vValue) {
+                case 1:
+                    cryptoMode = PdfWriter.STANDARD_ENCRYPTION_40;
+                    lengthValue = 40;
+                    recipients = (PdfArray) enc.get(PdfName.RECIPIENTS);
+                    break;
+                case 2:
+                    o = enc.get(PdfName.LENGTH);
+                    if (!o.isNumber()) {
+                        throw new InvalidPdfException(
+                                MessageLocalization.getComposedMessage("illegal.length.value"));
+                    }
+                    lengthValue = ((PdfNumber) o).intValue();
+                    if (lengthValue > 128 || lengthValue < 40 || lengthValue % 8 != 0) {
+                        throw new InvalidPdfException(
+                                MessageLocalization.getComposedMessage("illegal.length.value"));
+                    }
+                    cryptoMode = PdfWriter.STANDARD_ENCRYPTION_128;
+                    recipients = (PdfArray) enc.get(PdfName.RECIPIENTS);
+                    break;
+                case 4:
+                    PdfDictionary dic = (PdfDictionary) enc.get(PdfName.CF);
+                    if (dic == null) {
+                        throw new InvalidPdfException(
+                                MessageLocalization.getComposedMessage("cf.not.found.encryption"));
+                    }
+                    dic = (PdfDictionary) dic.get(PdfName.DEFAULTCRYPTFILTER);
+                    if (dic == null) {
+                        throw new InvalidPdfException(
+                                MessageLocalization
+                                        .getComposedMessage("defaultcryptfilter.not.found.encryption"));
+                    }
+                    if (PdfName.V2.equals(dic.get(PdfName.CFM))) {
+                        cryptoMode = PdfWriter.STANDARD_ENCRYPTION_128;
+                        lengthValue = 128;
+                    } else if (PdfName.AESV2.equals(dic.get(PdfName.CFM))) {
+                        cryptoMode = PdfWriter.ENCRYPTION_AES_128;
+                        lengthValue = 128;
+                    } else {
+                        throw new UnsupportedPdfException(
+                                MessageLocalization
+                                        .getComposedMessage("no.compatible.encryption.found"));
+                    }
+                    PdfObject em = dic.get(PdfName.ENCRYPTMETADATA);
+                    if (em != null && em.toString().equals("false")) {
+                        cryptoMode |= PdfWriter.DO_NOT_ENCRYPT_METADATA;
+                    }
+
+                    recipients = (PdfArray) dic.get(PdfName.RECIPIENTS);
+                    break;
+                default:
+                    throw new UnsupportedPdfException(
+                            MessageLocalization.getComposedMessage(
+                                    "unknown.encryption.type.v.eq.1", rValue));
+            }
+            BouncyCastleHelper.checkCertificateEncodingOrThrowException(certificate);
+            byte[] envelopedData = BouncyCastleHelper.getEnvelopedData(recipients, strings, certificate, certificateKey,
+                    certificateKeyProvider);
+
+            if (envelopedData == null) {
+                throw new UnsupportedPdfException(
+                        MessageLocalization.getComposedMessage("bad.certificate.and.key"));
+            }
+
+            MessageDigest md;
+
+            try {
+                md = MessageDigest.getInstance("SHA-1");
+                md.update(envelopedData, 0, 20);
+                for (int i = 0; i < recipients.size(); i++) {
+                    byte[] encodedRecipient = recipients.getPdfObject(i).getBytes();
+                    md.update(encodedRecipient);
+                }
+                if ((cryptoMode & PdfWriter.DO_NOT_ENCRYPT_METADATA) != 0) {
+                    md.update(new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255});
+                }
+                encryptionKey = md.digest();
+            } catch (Exception f) {
+                throw new ExceptionConverter(f);
+            }
+        }
+
+        decrypt = new PdfEncryption();
+        decrypt.setCryptoMode(cryptoMode, lengthValue);
+
+        if (filter.equals(PdfName.STANDARD)) {
+            if (rValue < 6) {
+                // check by owner password
+                decrypt.setupByOwnerPassword(documentID, password, uValue, oValue, pValue);
+                if (!equalsArray(uValue, decrypt.userKey,
+                        (rValue == 3 || rValue == 4) ? 16 : 32)) {
+                    // check by user password
+                    decrypt.setupByUserPassword(documentID, password, oValue, pValue);
+                    if (!equalsArray(uValue, decrypt.userKey,
+                            (rValue == 3 || rValue == 4) ? 16 : 32)) {
+                        throw new BadPasswordException(
+                                MessageLocalization.getComposedMessage("bad.user.password"));
+                    }
+                } else {
+                    ownerPasswordUsed = true;
+                }
+            } else {
+                // implements Algorithm 2.A: Retrieving the file encryption key from an encrypted document in order to decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3
+                s = enc.get(PdfName.UE).toString();
+                strings.remove(enc.get(PdfName.UE));
+                byte[] ueValue = com.lowagie.text.DocWriter.getISOBytes(s);
+                s = enc.get(PdfName.OE).toString();
+                strings.remove(enc.get(PdfName.OE));
+                byte[] oeValue = com.lowagie.text.DocWriter.getISOBytes(s);
+                s = enc.get(PdfName.PERMS).toString();
+                strings.remove(enc.get(PdfName.PERMS));
+                byte[] permsValue = com.lowagie.text.DocWriter.getISOBytes(s);
+
+                // step b of Algorithm 2.A
+                byte[] password = this.password;
+                if (password == null) {
+                    password = new byte[0];
+                } else if (password.length > 127) {
+                    password = Arrays.copyOf(password, 127);
+                }
+
+                // According to ISO 32000-2 the uValue is expected to be 48 bytes in length.
+                // Actual documents from the wild tend to have the uValue filled with zeroes
+                // to a 127 bytes length. As input to computeHash for owner password related
+                // operations, though, we must only use the 48 bytes.
+                if (uValue != null && uValue.length > 48) {
+                    uValue = Arrays.copyOf(uValue, 48);
+                }
+
+                try {
+                    // step c of Algorithm 2.A
+                    byte[] hashAlg2B = decrypt.hashAlg2B(password, Arrays.copyOfRange(oValue, 32, 40), uValue);
+                    if (equalsArray(hashAlg2B, oValue, 32)) {
+                        // step d of Algorithm 2.A
+                        decrypt.setupByOwnerPassword(documentID, password, uValue, ueValue, oValue, oeValue, pValue);
+                        // step f of Algorithm 2.A
+                        if (decrypt.decryptAndCheckPerms(permsValue)) {
+                            ownerPasswordUsed = true;
+                        }
+                    }
+
+                    if (!ownerPasswordUsed) {
+                        // analog of step c of Algorithm 2.A for user password
+                        hashAlg2B = decrypt.hashAlg2B(password, Arrays.copyOfRange(uValue, 32, 40), null);
+                        if (!equalsArray(hashAlg2B, uValue, 32)) {
+                            throw new BadPasswordException(MessageLocalization.getComposedMessage("bad.user.password"));
+                        }
+                        // step e of Algorithm 2.A
+                        decrypt.setupByUserPassword(documentID, password, uValue, ueValue, oValue, oeValue, pValue);
+                        // step f of Algorithm 2.A
+                        if (!decrypt.decryptAndCheckPerms(permsValue)) {
+                            throw new BadPasswordException(MessageLocalization.getComposedMessage("bad.user.password"));
+                        }
+                    }
+                    pValue = decrypt.permissions;
+                } catch (IOException e) {
+                    throw e;
+                } catch (Exception e) {
+                    throw new IOException(e);
+                }
+            }
+        } else if (filter.equals(PdfName.PUBSEC)) {
+            decrypt.setupByEncryptionKey(encryptionKey, lengthValue);
+            ownerPasswordUsed = true;
+        }
+
+        for (Object string : strings) {
+            PdfString str = (PdfString) string;
+            str.decrypt(this);
+        }
+
+        if (encDic.isIndirect()) {
+            cryptoRef = (PRIndirectReference) encDic;
+            xrefObj.set(cryptoRef.getNumber(), null);
+        }
+        encryptionError = false;
+    }
+
+    /**
+     * @param idx index
+     * @return a PdfObject
+     */
+    public PdfObject getPdfObjectRelease(int idx) {
+        PdfObject obj = getPdfObject(idx);
+        releaseLastXrefPartial();
+        return obj;
+    }
+
+    /**
+     * @param idx index
+     * @return aPdfObject
+     */
+    public PdfObject getPdfObject(int idx) {
+        try {
+            lastXrefPartial = -1;
+            if (idx < 0 || idx >= xrefObj.size()) {
+                return null;
+            }
+            PdfObject obj = xrefObj.get(idx);
+            if (!partial || obj != null) {
+                return obj;
+            }
+            if (idx * 2 >= xref.length) {
+                return null;
+            }
+            obj = readSingleObject(idx);
+            lastXrefPartial = -1;
+            if (obj != null) {
+                lastXrefPartial = idx;
+            }
+            return obj;
+        } catch (Exception e) {
+            throw new ExceptionConverter(e);
+        }
+    }
+
+    /**
+     *
+     */
+    public void resetLastXrefPartial() {
+        lastXrefPartial = -1;
+    }
+
+    /**
+     *
+     */
+    public void releaseLastXrefPartial() {
+        if (partial && lastXrefPartial != -1) {
+            xrefObj.set(lastXrefPartial, null);
+            lastXrefPartial = -1;
+        }
+    }
+
+    private void setXrefPartialObject(int idx, PdfObject obj) {
+        if (!partial || idx < 0) {
+            return;
+        }
+        xrefObj.set(idx, obj);
+    }
+
+    /**
+     * @param obj an object of {@link PdfObject}
+     * @return an indirect reference
+     */
+    public PRIndirectReference addPdfObject(PdfObject obj) {
+        xrefObj.add(obj);
+        return new PRIndirectReference(this, xrefObj.size() - 1);
+    }
+
+    protected void readPages() throws IOException {
+        catalog = trailer.getAsDict(PdfName.ROOT);
+        rootPages = catalog.getAsDict(PdfName.PAGES);
+        pageRefs = new PageRefs(this);
+    }
+
+    protected void readDocObjPartial() throws IOException {
+        xrefObj = new ArrayList<>(xref.length / 2);
+        xrefObj.addAll(Collections.nCopies(xref.length / 2, null));
+        readDecryptedDocObj();
+        if (objStmToOffset != null) {
+            int[] keys = objStmToOffset.getKeys();
+            for (int n : keys) {
+                objStmToOffset.put(n, xref[n * 2]);
+                xref[n * 2] = -1;
+            }
+        }
+    }
+
+    protected PdfObject readSingleObject(int k) throws IOException {
+        strings.clear();
+        int k2 = k * 2;
+        int pos = xref[k2];
+        if (pos < 0) {
+            return null;
+        }
+        if (xref[k2 + 1] > 0) {
+            pos = objStmToOffset.get(xref[k2 + 1]);
+        }
+        if (pos == 0) {
+            return null;
+        }
+        tokens.seek(pos);
+        tokens.nextValidToken();
+        if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+            tokens.throwError(MessageLocalization
+                    .getComposedMessage("invalid.object.number"));
+        }
+        objNum = tokens.intValue();
+        tokens.nextValidToken();
+        if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+            tokens.throwError(MessageLocalization
+                    .getComposedMessage("invalid.generation.number"));
+        }
+        objGen = tokens.intValue();
+        tokens.nextValidToken();
+        if (!tokens.getStringValue().equals("obj")) {
+            tokens.throwError(MessageLocalization
+                    .getComposedMessage("token.obj.expected"));
+        }
+        PdfObject obj;
+        try {
+            obj = readPRObject();
+            for (PdfObject string : strings) {
+                PdfString str = (PdfString) string;
+                str.decrypt(this);
+            }
+            if (obj.isStream()) {
+                checkPRStreamLength((PRStream) obj);
+            }
+        } catch (Exception e) {
+            obj = null;
+        }
+        if (xref[k2 + 1] > 0) {
+            obj = readOneObjStm((PRStream) obj, xref[k2]);
+        }
+        xrefObj.set(k, obj);
+        return obj;
+    }
+
+    protected PdfObject readOneObjStm(PRStream stream, int idx)
+            throws IOException {
+        int first = stream.getAsNumber(PdfName.FIRST).intValue();
+        byte[] b = getStreamBytes(stream, tokens.getFile());
+        PRTokeniser saveTokens = tokens;
+        tokens = new PRTokeniser(b);
+        try {
+            int address = 0;
+            boolean ok = true;
+            ++idx;
+            for (int k = 0; k < idx; ++k) {
+                ok = tokens.nextToken();
+                if (!ok) {
+                    break;
+                }
+                if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+                    ok = false;
+                    break;
+                }
+                ok = tokens.nextToken();
+                if (!ok) {
+                    break;
+                }
+                if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+                    ok = false;
+                    break;
+                }
+                address = tokens.intValue() + first;
+            }
+            if (!ok) {
+                throw new InvalidPdfException(
+                        MessageLocalization.getComposedMessage("error.reading.objstm"));
+            }
+            tokens.seek(address);
+            return readPRObject();
+        } finally {
+            tokens = saveTokens;
+        }
+    }
+
+    /**
+     * @return the percentage of the cross reference table that has been read
+     */
+    public double dumpPerc() {
+        int total = 0;
+        for (PdfObject aXrefObj : xrefObj) {
+            if (aXrefObj != null) {
+                ++total;
+            }
+        }
+        return (total * 100.0 / xrefObj.size());
+    }
+
+    protected void readDocObj() throws IOException {
+        List streams = new ArrayList<>();
+        xrefObj = new ArrayList<>(xref.length / 2);
+        xrefObj.addAll(Collections.nCopies(xref.length / 2, null));
+        for (int k = 2; k < xref.length; k += 2) {
+            int pos = xref[k];
+            if (pos <= 0 || ((xref.length > k + 1) && (xref[k + 1] > 0))) {
+                continue;
+            }
+            tokens.seek(pos);
+            tokens.nextValidToken();
+            if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+                tokens.throwError(MessageLocalization
+                        .getComposedMessage("invalid.object.number"));
+            }
+            objNum = tokens.intValue();
+            tokens.nextValidToken();
+            if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+                tokens.throwError(MessageLocalization
+                        .getComposedMessage("invalid.generation.number"));
+            }
+            objGen = tokens.intValue();
+            tokens.nextValidToken();
+            if (!tokens.getStringValue().equals("obj")) {
+                tokens.throwError(MessageLocalization
+                        .getComposedMessage("token.obj.expected"));
+            }
+            PdfObject obj;
+            try {
+                obj = readPRObject();
+                if (obj.isStream()) {
+                    streams.add(obj);
+                }
+            } catch (Exception e) {
+                obj = null;
+            }
+            xrefObj.set(k / 2, obj);
+        }
+        for (PdfObject stream : streams) {
+            checkPRStreamLength((PRStream) stream);
+        }
+        readDecryptedDocObj();
+        if (objStmMark != null) {
+            for (Object o : objStmMark.entrySet()) {
+                Map.Entry entry = (Map.Entry) o;
+                int n = (Integer) entry.getKey();
+                IntHashtable h = (IntHashtable) entry.getValue();
+                readObjStm((PRStream) xrefObj.get(n), h);
+                xrefObj.set(n, null);
+            }
+            objStmMark = null;
+        }
+        xref = null;
+    }
+
+    private void checkPRStreamLength(PRStream stream) throws IOException {
+        int fileLength = tokens.length();
+        int start = stream.getOffset();
+        boolean calc = false;
+        int streamLength = 0;
+        PdfObject obj = getPdfObjectRelease(stream.get(PdfName.LENGTH));
+        if (obj != null && obj.type() == PdfObject.NUMBER) {
+            streamLength = ((PdfNumber) obj).intValue();
+            if (streamLength + start > fileLength - 20) {
+                calc = true;
+            } else {
+                tokens.seek(start + streamLength);
+                String line = tokens.readString(20);
+                if (!line.startsWith("\nendstream")
+                        && !line.startsWith("\r\nendstream")
+                        && !line.startsWith("\rendstream") && !line.startsWith("endstream")) {
+                    calc = true;
+                }
+            }
+        } else {
+            calc = true;
+        }
+        if (calc) {
+            byte[] tline = new byte[16];
+            tokens.seek(start);
+            while (true) {
+                int pos = tokens.getFilePointer();
+                if (!tokens.readLineSegment(tline)) {
+                    break;
+                }
+                if (equalsn(tline, endstream)) {
+                    streamLength = pos - start;
+                    break;
+                }
+                if (equalsn(tline, endobj)) {
+                    tokens.seek(pos - 16);
+                    String s = tokens.readString(16);
+                    int index = s.indexOf("endstream");
+                    if (index >= 0) {
+                        pos = pos - 16 + index;
+                    }
+                    streamLength = pos - start;
+                    break;
+                }
+            }
+        }
+        stream.setLength(streamLength);
+    }
+
+    protected void readObjStm(PRStream stream, IntHashtable map)
+            throws IOException {
+        int first = stream.getAsNumber(PdfName.FIRST).intValue();
+        int n = stream.getAsNumber(PdfName.N).intValue();
+        byte[] b = getStreamBytes(stream, tokens.getFile());
+        PRTokeniser saveTokens = tokens;
+        tokens = new PRTokeniser(b);
+        try {
+            int[] address = new int[n];
+            int[] objNumber = new int[n];
+            boolean ok = true;
+            for (int k = 0; k < n; ++k) {
+                ok = tokens.nextToken();
+                if (!ok) {
+                    break;
+                }
+                if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+                    ok = false;
+                    break;
+                }
+                objNumber[k] = tokens.intValue();
+                ok = tokens.nextToken();
+                if (!ok) {
+                    break;
+                }
+                if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+                    ok = false;
+                    break;
+                }
+                address[k] = tokens.intValue() + first;
+            }
+            if (!ok) {
+                throw new InvalidPdfException(
+                        MessageLocalization.getComposedMessage("error.reading.objstm"));
+            }
+            for (int k = 0; k < n; ++k) {
+                if (map.containsKey(k)) {
+                    tokens.seek(address[k]);
+                    PdfObject obj = readPRObject();
+                    xrefObj.set(objNumber[k], obj);
+                }
+            }
+        } finally {
+            tokens = saveTokens;
+        }
+    }
+
+    private void ensureXrefSize(int size) {
+        if (size == 0) {
+            return;
+        }
+        if (xref == null) {
+            xref = new int[size];
+        } else {
+            if (xref.length < size) {
+                int[] xref2 = new int[size];
+                System.arraycopy(xref, 0, xref2, 0, xref.length);
+                xref = xref2;
+            }
+        }
+    }
+
+    protected void readXref() throws IOException {
+        hybridXref = false;
+        newXrefType = false;
+        tokens.seek(tokens.getStartxref());
+        tokens.nextToken();
+        if (!tokens.getStringValue().equals("startxref")) {
+            throw new InvalidPdfException(
+                    MessageLocalization.getComposedMessage("startxref.not.found"));
+        }
+        tokens.nextToken();
+        if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+            throw new InvalidPdfException(
+                    MessageLocalization
+                            .getComposedMessage("startxref.is.not.followed.by.a.number"));
+        }
+        int startxref = tokens.intValue();
+        lastXref = startxref;
+        eofPos = tokens.getFilePointer();
+        try {
+            if (readXRefStream(startxref)) {
+                newXrefType = true;
+                return;
+            }
+        } catch (Exception ignored) {
+        }
+        xref = null;
+        tokens.seek(startxref);
+        trailer = readXrefSection();
+        PdfDictionary trailer2 = trailer;
+        while (true) {
+            PdfNumber prev = (PdfNumber) trailer2.get(PdfName.PREV);
+            if (prev == null) {
+                break;
+            }
+            if (prev.intValue() == startxref) {
+                throw new InvalidPdfException(
+                        MessageLocalization
+                                .getComposedMessage("xref.infinite.loop"));
+            }
+            tokens.seek(prev.intValue());
+            trailer2 = readXrefSection();
+        }
+    }
+
+    protected PdfDictionary readXrefSection() throws IOException {
+        tokens.nextValidToken();
+        if (!tokens.getStringValue().equals("xref")) {
+            tokens.throwError(MessageLocalization
+                    .getComposedMessage("xref.subsection.not.found"));
+        }
+        int start;
+        int end;
+        int pos;
+        int gen;
+        while (true) {
+            tokens.nextValidToken();
+            if (tokens.getStringValue().equals("trailer")) {
+                break;
+            }
+            if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+                tokens
+                        .throwError(MessageLocalization
+                                .getComposedMessage(
+                                        "object.number.of.the.first.object.in.this.xref.subsection.not.found"));
+            }
+            start = tokens.intValue();
+            tokens.nextValidToken();
+            if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+                tokens
+                        .throwError(MessageLocalization
+                                .getComposedMessage("number.of.entries.in.this.xref.subsection.not.found"));
+            }
+            end = tokens.intValue() + start;
+            if (start == 1) { // fix incorrect start number
+                int back = tokens.getFilePointer();
+                tokens.nextValidToken();
+                pos = tokens.intValue();
+                tokens.nextValidToken();
+                gen = tokens.intValue();
+                if (pos == 0 && gen == PdfWriter.GENERATION_MAX) {
+                    --start;
+                    --end;
+                }
+                tokens.seek(back);
+            }
+            ensureXrefSize(end * 2);
+            for (int k = start; k < end; ++k) {
+                tokens.nextValidToken();
+                pos = tokens.intValue();
+                tokens.nextValidToken();
+                tokens.nextValidToken();
+                int p = k * 2;
+                if (tokens.getStringValue().equals("n")) {
+                    if (xref[p] == 0 && xref[p + 1] == 0) {
+                        // if (pos == 0)
+                        // tokens.throwError(MessageLocalization.getComposedMessage("file.position.0.cross.reference.entry.in.this.xref.subsection"));
+                        xref[p] = pos;
+                    }
+                } else if (tokens.getStringValue().equals("f")) {
+                    if (xref[p] == 0 && xref[p + 1] == 0) {
+                        xref[p] = -1;
+                    }
+                } else {
+                    tokens
+                            .throwError(MessageLocalization
+                                    .getComposedMessage("invalid.cross.reference.entry.in.this.xref.subsection"));
+                }
+            }
+        }
+        PdfDictionary trailer = (PdfDictionary) readPRObject();
+        PdfNumber xrefSize = (PdfNumber) trailer.get(PdfName.SIZE);
+        ensureXrefSize(xrefSize.intValue() * 2);
+        PdfObject xrs = trailer.get(PdfName.XREFSTM);
+        if (xrs != null && xrs.isNumber()) {
+            int loc = ((PdfNumber) xrs).intValue();
+            try {
+                readXRefStream(loc);
+                newXrefType = true;
+                hybridXref = true;
+            } catch (IOException e) {
+                xref = null;
+                throw e;
+            }
+        }
+        return trailer;
+    }
+
+    protected boolean readXRefStream(int ptr) throws IOException {
+        tokens.seek(ptr);
+        int thisStream;
+        if (!tokens.nextToken()) {
+            return false;
+        }
+        if (tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+            return false;
+        }
+        thisStream = tokens.intValue();
+        if (!tokens.nextToken() || tokens.getTokenType() != PRTokeniser.TK_NUMBER) {
+            return false;
+        }
+        if (!tokens.nextToken() || !tokens.getStringValue().equals("obj")) {
+            return false;
+        }
+        PdfObject object = readPRObject();
+        PRStream stm;
+        if (object.isStream()) {
+            stm = (PRStream) object;
+            if (!PdfName.XREF.equals(stm.get(PdfName.TYPE))) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+        if (trailer == null) {
+            trailer = new PdfDictionary();
+            trailer.putAll(stm);
+        }
+        stm.setLength(((PdfNumber) stm.get(PdfName.LENGTH)).intValue());
+        int size = ((PdfNumber) stm.get(PdfName.SIZE)).intValue();
+        PdfArray index;
+        PdfObject obj = stm.get(PdfName.INDEX);
+        if (obj == null) {
+            index = new PdfArray();
+            index.add(new int[]{0, size});
+        } else {
+            index = (PdfArray) obj;
+        }
+        PdfArray w = (PdfArray) stm.get(PdfName.W);
+        int prev = -1;
+        obj = stm.get(PdfName.PREV);
+        if (obj != null) {
+            prev = ((PdfNumber) obj).intValue();
+        }
+        // Each xref pair is a position
+        // type 0 -> -1, 0
+        // type 1 -> offset, 0
+        // type 2 -> index, obj num
+        ensureXrefSize(size * 2);
+        if (objStmMark == null && !partial) {
+            objStmMark = new HashMap<>();
+        }
+        if (objStmToOffset == null && partial) {
+            objStmToOffset = new IntHashtable();
+        }
+        byte[] b = getStreamBytes(stm, tokens.getFile());
+        int bptr = 0;
+        int[] wc = new int[3];
+        for (int k = 0; k < 3; ++k) {
+            wc[k] = w.getAsNumber(k).intValue();
+        }
+        for (int idx = 0; idx < index.size(); idx += 2) {
+            int start = index.getAsNumber(idx).intValue();
+            int length = index.getAsNumber(idx + 1).intValue();
+            ensureXrefSize((start + length) * 2);
+            while (length-- > 0) {
+                int type = 1;
+                if (wc[0] > 0) {
+                    type = 0;
+                    for (int k = 0; k < wc[0]; ++k) {
+                        type = (type << 8) + (b[bptr++] & 0xff);
+                    }
+                }
+                int field2 = 0;
+                for (int k = 0; k < wc[1]; ++k) {
+                    field2 = (field2 << 8) + (b[bptr++] & 0xff);
+                }
+                int field3 = 0;
+                for (int k = 0; k < wc[2]; ++k) {
+                    field3 = (field3 << 8) + (b[bptr++] & 0xff);
+                }
+                int base = start * 2;
+                if (xref[base] == 0 && xref[base + 1] == 0) {
+                    switch (type) {
+                        case 0:
+                            xref[base] = -1;
+                            break;
+                        case 1:
+                            xref[base] = field2;
+                            break;
+                        case 2:
+                            xref[base] = field3;
+                            xref[base + 1] = field2;
+                            if (partial) {
+                                objStmToOffset.put(field2, 0);
+                            } else {
+                                Integer on = field2;
+                                IntHashtable seq = objStmMark.get(on);
+                                if (seq == null) {
+                                    seq = new IntHashtable();
+                                    seq.put(field3, 1);
+                                    objStmMark.put(on, seq);
+                                } else {
+                                    seq.put(field3, 1);
+                                }
+                            }
+                            break;
+                    }
+                }
+                ++start;
+            }
+        }
+        thisStream *= 2;
+        if (thisStream + 1 < xref.length && xref[thisStream + 1] == 0 && xref[thisStream] == 0) {
+            xref[thisStream] = -1;
+        }
+
+        if (prev == -1) {
+            return true;
+        }
+        return readXRefStream(prev);
+    }
+
+    protected void rebuildXref() throws IOException {
+        hybridXref = false;
+        newXrefType = false;
+        tokens.seek(0);
+        int[][] xr = new int[1024][];
+        int top = 0;
+        trailer = null;
+        byte[] line = new byte[64];
+        for (; ; ) {
+            int pos = tokens.getFilePointer();
+            if (!tokens.readLineSegment(line)) {
+                break;
+            }
+            if (line[0] == 't') {
+                if (!PdfEncodings.convertToString(line, null).startsWith("trailer")) {
+                    continue;
+                }
+                tokens.seek(pos);
+                tokens.nextToken();
+                pos = tokens.getFilePointer();
+                try {
+                    PdfDictionary dic = (PdfDictionary) readPRObject();
+                    if (dic.get(PdfName.ROOT) != null) {
+                        trailer = dic;
+                    } else {
+                        tokens.seek(pos);
+                    }
+                } catch (Exception e) {
+                    tokens.seek(pos);
+                }
+            } else if (line[0] >= '0' && line[0] <= '9') {
+                int[] obj = PRTokeniser.checkObjectStart(line);
+                if (obj == null) {
+                    continue;
+                }
+                int num = obj[0];
+                int gen = obj[1];
+                if (num >= xr.length) {
+                    int newLength = num * 2;
+                    int[][] xr2 = new int[newLength][];
+                    System.arraycopy(xr, 0, xr2, 0, top);
+                    xr = xr2;
+                }
+                if (num >= top) {
+                    top = num + 1;
+                }
+                if (xr[num] == null || gen >= xr[num][1]) {
+                    obj[0] = pos;
+                    xr[num] = obj;
+                }
+            }
+        }
+        if (trailer == null) {
+            throw new InvalidPdfException(MessageLocalization.getComposedMessage("trailer.not.found"));
+        }
+        xref = new int[top * 2];
+        for (int k = 0; k < top; ++k) {
+            int[] obj = xr[k];
+            if (obj != null) {
+                xref[k * 2] = obj[0];
+            }
+        }
+    }
+
+    protected PdfDictionary readDictionary() throws IOException {
+        PdfDictionary dic = new PdfDictionary();
+        while (true) {
+            tokens.nextValidToken();
+            if (tokens.getTokenType() == PRTokeniser.TK_END_DIC) {
+                break;
+            }
+            if (tokens.getTokenType() != PRTokeniser.TK_NAME) {
+                tokens.throwError(MessageLocalization
+                        .getComposedMessage("dictionary.key.is.not.a.name"));
+            }
+            PdfName name = new PdfName(tokens.getStringValue(), false);
+            PdfObject obj = readPRObject();
+            int type = obj.type();
+            if (-type == PRTokeniser.TK_END_DIC) {
+                tokens.throwError(MessageLocalization
+                        .getComposedMessage("unexpected.gt.gt"));
+            }
+            if (-type == PRTokeniser.TK_END_ARRAY) {
+                tokens.throwError(MessageLocalization
+                        .getComposedMessage("unexpected.close.bracket"));
+            }
+            dic.put(name, obj);
+        }
+        return dic;
+    }
+
+    protected PdfArray readArray() throws IOException {
+        PdfArray array = new PdfArray();
+        while (true) {
+            PdfObject obj = readPRObject();
+            int type = obj.type();
+            if (-type == PRTokeniser.TK_END_ARRAY) {
+                break;
+            }
+            if (-type == PRTokeniser.TK_END_DIC) {
+                tokens.throwError(MessageLocalization
+                        .getComposedMessage("unexpected.gt.gt"));
+            }
+            array.add(obj);
+        }
+        return array;
+    }
+
+    protected PdfObject readPRObject() throws IOException {
+        tokens.nextValidToken();
+        int type = tokens.getTokenType();
+        switch (type) {
+            case PRTokeniser.TK_START_DIC: {
+                ++readDepth;
+                PdfDictionary dic = readDictionary();
+                --readDepth;
+                int pos = tokens.getFilePointer();
+                // be careful in the trailer. May not be a "next" token.
+                boolean hasNext;
+                do {
+                    hasNext = tokens.nextToken();
+                } while (hasNext && tokens.getTokenType() == PRTokeniser.TK_COMMENT);
+
+                if (hasNext && tokens.getStringValue().equals("stream")) {
+                    // skip whitespaces
+                    int ch;
+                    do {
+                        ch = tokens.read();
+                    } while (ch == 32 || ch == 9 || ch == 0 || ch == 12);
+                    if (ch != '\n') {
+                        ch = tokens.read();
+                    }
+                    if (ch != '\n') {
+                        tokens.backOnePosition(ch);
+                    }
+                    PRStream stream = new PRStream(this, tokens.getFilePointer());
+                    stream.putAll(dic);
+                    // crypto handling
+                    stream.setObjNum(objNum, objGen);
+
+                    return stream;
+                } else {
+                    tokens.seek(pos);
+                    return dic;
+                }
+            }
+            case PRTokeniser.TK_START_ARRAY: {
+                ++readDepth;
+                PdfArray arr = readArray();
+                --readDepth;
+                return arr;
+            }
+            case PRTokeniser.TK_NUMBER:
+                return new PdfNumber(tokens.getStringValue());
+            case PRTokeniser.TK_STRING:
+                PdfString str = new PdfString(tokens.getStringValue(), null)
+                        .setHexWriting(tokens.isHexString());
+                // crypto handling
+                str.setObjNum(objNum, objGen);
+                if (strings != null) {
+                    strings.add(str);
+                }
+
+                return str;
+            case PRTokeniser.TK_NAME: {
+                PdfName cachedName = PdfName.staticNames.get(tokens
+                        .getStringValue());
+                if (readDepth > 0 && cachedName != null) {
+                    return cachedName;
+                } else {
+                    // an indirect name (how odd...), or a non-standard one
+                    return new PdfName(tokens.getStringValue(), false);
+                }
+            }
+            case PRTokeniser.TK_REF:
+                int num = tokens.getReference();
+                PRIndirectReference ref = new PRIndirectReference(this, num,
+                        tokens.getGeneration());
+                return ref;
+            case PRTokeniser.TK_ENDOFFILE:
+                throw new IOException(
+                        MessageLocalization.getComposedMessage("unexpected.end.of.file"));
+            default:
+                String sv = tokens.getStringValue();
+                if ("null".equals(sv)) {
+                    if (readDepth == 0) {
+                        return new PdfNull();
+                    } // else
+                    return PdfNull.PDFNULL;
+                } else if ("true".equals(sv)) {
+                    if (readDepth == 0) {
+                        return new PdfBoolean(true);
+                    } // else
+                    return PdfBoolean.PDFTRUE;
+                } else if ("false".equals(sv)) {
+                    if (readDepth == 0) {
+                        return new PdfBoolean(false);
+                    } // else
+                    return PdfBoolean.PDFFALSE;
+                }
+                return new PdfLiteral(-type, tokens.getStringValue());
+        }
+    }
+
+    /**
+     * Checks if the document had errors and was rebuilt.
+     *
+     * @return true if rebuilt.
+     */
+    public boolean isRebuilt() {
+        return this.rebuilt;
+    }
+
+    /**
+     * Gets the dictionary that represents a page.
+     *
+     * @param pageNum the page number. 1 is the first
+     * @return the page dictionary or null when the page does not exist
+     */
+    public PdfDictionary getPageN(int pageNum) {
+        PdfDictionary dic = pageRefs.getPageN(pageNum);
+        if (dic == null) {
+            return null;
+        }
+        if (appendable) {
+            dic.setIndRef(pageRefs.getPageOrigRef(pageNum));
+        }
+        return dic;
+    }
+
+    /**
+     * @param pageNum page number
+     * @return a Dictionary object
+     */
+    public PdfDictionary getPageNRelease(int pageNum) {
+        PdfDictionary dic = getPageN(pageNum);
+        pageRefs.releasePage(pageNum);
+        return dic;
+    }
+
+    /**
+     * @param pageNum page number
+     */
+    public void releasePage(int pageNum) {
+        pageRefs.releasePage(pageNum);
+    }
+
+    /**
+     *
+     */
+    public void resetReleasePage() {
+        pageRefs.resetReleasePage();
+    }
+
+    /**
+     * Gets the page reference to this page.
+     *
+     * @param pageNum the page number. 1 is the first
+     * @return the page reference
+     */
+    public PRIndirectReference getPageOrigRef(int pageNum) {
+        return pageRefs.getPageOrigRef(pageNum);
+    }
+
+    /**
+     * Gets the contents of the page.
+     *
+     * @param pageNum the page number. 1 is the first
+     * @param file    the location of the PDF document
+     * @return the content
+     * @throws IOException on error
+     */
+    public byte[] getPageContent(int pageNum, RandomAccessFileOrArray file)
+            throws IOException {
+        PdfDictionary page = getPageNRelease(pageNum);
+        if (page == null) {
+            return null;
+        }
+        PdfObject contents = getPdfObjectRelease(page.get(PdfName.CONTENTS));
+        if (contents == null) {
+            return new byte[0];
+        }
+        ByteArrayOutputStream bout;
+        if (contents.isStream()) {
+            return getStreamBytes((PRStream) contents, file);
+        } else if (contents.isArray()) {
+            PdfArray array = (PdfArray) contents;
+            bout = new ByteArrayOutputStream();
+            for (int k = 0; k < array.size(); ++k) {
+                PdfObject item = getPdfObjectRelease(array.getPdfObject(k));
+                if (item == null || !item.isStream()) {
+                    continue;
+                }
+                byte[] b = getStreamBytes((PRStream) item, file);
+                bout.write(b);
+                if (k != array.size() - 1) {
+                    bout.write('\n');
+                }
+            }
+            return bout.toByteArray();
+        } else {
+            return new byte[0];
+        }
+    }
+
+    /**
+     * Gets the contents of the page.
+     *
+     * @param pageNum the page number. 1 is the first
+     * @return the content
+     * @throws IOException on error
+     */
+    public byte[] getPageContent(int pageNum) throws IOException {
+        RandomAccessFileOrArray rf = getSafeFile();
+        try {
+            rf.reOpen();
+            return getPageContent(pageNum, rf);
+        } finally {
+            try {
+                rf.close();
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    protected void killXref(PdfObject obj) {
+        if (obj == null) {
+            return;
+        }
+        if ((obj instanceof PdfIndirectReference) && !obj.isIndirect()) {
+            return;
+        }
+        switch (obj.type()) {
+            case PdfObject.INDIRECT: {
+                int xr = ((PRIndirectReference) obj).getNumber();
+                obj = xrefObj.get(xr);
+                xrefObj.set(xr, null);
+                freeXref = xr;
+                killXref(obj);
+                break;
+            }
+            case PdfObject.ARRAY: {
+                PdfArray t = (PdfArray) obj;
+                for (int i = 0; i < t.size(); ++i) {
+                    killXref(t.getPdfObject(i));
+                }
+                break;
+            }
+            case PdfObject.STREAM:
+            case PdfObject.DICTIONARY: {
+                PdfDictionary dic = (PdfDictionary) obj;
+                for (Object o : dic.getKeys()) {
+                    killXref(dic.get((PdfName) o));
+                }
+                break;
+            }
+        }
+    }
+
+    /**
+     * Sets the contents of the page.
+     *
+     * @param content the new page content
+     * @param pageNum the page number. 1 is the first
+     */
+    public void setPageContent(int pageNum, byte[] content) {
+        setPageContent(pageNum, content, PdfStream.DEFAULT_COMPRESSION);
+    }
+
+    /**
+     * Sets the contents of the page.
+     *
+     * @param content          the new page content
+     * @param pageNum          the page number. 1 is the first
+     * @param compressionLevel compression level
+     * @since 2.1.3 (the method already existed without param compressionLevel)
+     */
+    public void setPageContent(int pageNum, byte[] content, int compressionLevel) {
+        PdfDictionary page = getPageN(pageNum);
+        if (page == null) {
+            return;
+        }
+        PdfObject contents = page.get(PdfName.CONTENTS);
+        freeXref = -1;
+        killXref(contents);
+        if (freeXref == -1) {
+            xrefObj.add(null);
+            freeXref = xrefObj.size() - 1;
+        }
+        page.put(PdfName.CONTENTS, new PRIndirectReference(this, freeXref));
+        xrefObj.set(freeXref, new PRStream(this, content, compressionLevel));
+    }
+
+    /**
+     * Eliminates shared streams if they exist.
+     */
+    public void eliminateSharedStreams() {
+        if (!sharedStreams) {
+            return;
+        }
+        sharedStreams = false;
+        if (pageRefs.size() == 1) {
+            return;
+        }
+        List newRefs = new ArrayList<>();
+        List newStreams = new ArrayList<>();
+        IntHashtable visited = new IntHashtable();
+        for (int k = 1; k <= pageRefs.size(); ++k) {
+            PdfDictionary page = pageRefs.getPageN(k);
+            if (page == null) {
+                continue;
+            }
+            PdfObject contents = getPdfObject(page.get(PdfName.CONTENTS));
+            if (contents == null) {
+                continue;
+            }
+            if (contents.isStream()) {
+                PRIndirectReference ref = (PRIndirectReference) page
+                        .get(PdfName.CONTENTS);
+                if (visited.containsKey(ref.getNumber())) {
+                    // need to duplicate
+                    newRefs.add(ref);
+                    newStreams.add(new PRStream((PRStream) contents, null));
+                } else {
+                    visited.put(ref.getNumber(), 1);
+                }
+            } else if (contents.isArray()) {
+                PdfArray array = (PdfArray) contents;
+                for (int j = 0; j < array.size(); ++j) {
+                    PRIndirectReference ref = (PRIndirectReference) array.getPdfObject(j);
+                    if (visited.containsKey(ref.getNumber())) {
+                        // need to duplicate
+                        newRefs.add(ref);
+                        newStreams.add(new PRStream((PRStream) getPdfObject(ref), null));
+                    } else {
+                        visited.put(ref.getNumber(), 1);
+                    }
+                }
+            }
+        }
+        if (newStreams.isEmpty()) {
+            return;
+        }
+        for (int k = 0; k < newStreams.size(); ++k) {
+            xrefObj.add(newStreams.get(k));
+            PRIndirectReference ref = (PRIndirectReference) newRefs.get(k);
+            ref.setNumber(xrefObj.size() - 1, 0);
+        }
+    }
+
+    /**
+     * Checks if the document was changed.
+     *
+     * @return true if the document was changed, false
+     * otherwise
+     */
+    public boolean isTampered() {
+        return tampered;
+    }
+
+    /**
+     * Sets the tampered state. A tampered PdfReader cannot be reused in PdfStamper.
+     *
+     * @param tampered the tampered state
+     */
+    public void setTampered(boolean tampered) {
+        this.tampered = tampered;
+        pageRefs.keepPages();
+    }
+
+    /**
+     * Gets the XML metadata.
+     *
+     * @return the XML metadata
+     * @throws IOException on error
+     */
+    public byte[] getMetadata() throws IOException {
+        PdfObject obj = getPdfObject(catalog.get(PdfName.METADATA));
+        if (!(obj instanceof PRStream)) {
+            return null;
+        }
+        RandomAccessFileOrArray rf = getSafeFile();
+        byte[] b;
+        try {
+            rf.reOpen();
+            b = getStreamBytes((PRStream) obj, rf);
+        } finally {
+            try {
+                rf.close();
+            } catch (Exception e) {
+                // empty on purpose
+            }
+        }
+        return b;
+    }
+
+    /**
+     * Gets the byte address of the last xref table.
+     *
+     * @return the byte address of the last xref table
+     */
+    public int getLastXref() {
+        return lastXref;
+    }
+
+    /**
+     * Gets the number of xref objects.
+     *
+     * @return the number of xref objects
+     */
+    public int getXrefSize() {
+        return xrefObj.size();
+    }
+
+    /**
+     * Gets the byte address of the %%EOF marker.
+     *
+     * @return the byte address of the %%EOF marker
+     */
+    public int getEofPos() {
+        return eofPos;
+    }
+
+    /**
+     * Gets the PDF version. Only the last version char is returned. For example version 1.4 is returned as '4'.
+     *
+     * @return the PDF version
+     */
+    public char getPdfVersion() {
+        return pdfVersion;
+    }
+
+    /**
+     * Returns true if the PDF is encrypted.
+     *
+     * @return true if the PDF is encrypted
+     */
+    public boolean isEncrypted() {
+        return encrypted;
+    }
+
+    /**
+     * Returns true if the owner password has been used to open the document.
+     *
+     * @return true if the owner password has been used to open the document.
+     */
+    public boolean isOwnerPasswordUsed() {
+        return ownerPasswordUsed;
+    }
+
+    /**
+     * Gets the encryption permissions. It can be used directly in
+     * PdfWriter.setEncryption().
+     *
+     * @return the encryption permissions
+     */
+    public int getPermissions() {
+        return pValue;
+    }
+
+    public void setPermissions(int permissionValue) {
+        this.pValue = permissionValue;
+    }
+
+    /**
+     * Returns true if the PDF has a 128 bit key encryption.
+     *
+     * @return true if the PDF has a 128 bit key encryption
+     */
+    public boolean is128Key() {
+        return rValue == 3;
+    }
+
+    /**
+     * Gets the trailer dictionary
+     *
+     * @return the trailer dictionary
+     */
+    public PdfDictionary getTrailer() {
+        return trailer;
+    }
+
+    PdfEncryption getDecrypt() {
+        return decrypt;
+    }
+
+    /**
+     * Finds all the font subsets and changes the prefixes to some random values.
+     *
+     * @return the number of font subsets altered
+     */
+    public int shuffleSubsetNames() {
+        int total = 0;
+        for (int k = 1; k < xrefObj.size(); ++k) {
+            PdfObject obj = getPdfObjectRelease(k);
+            if (obj == null || !obj.isDictionary()) {
+                continue;
+            }
+            PdfDictionary dic = (PdfDictionary) obj;
+            if (!existsName(dic, PdfName.TYPE, PdfName.FONT)) {
+                continue;
+            }
+            if (existsName(dic, PdfName.SUBTYPE, PdfName.TYPE1)
+                    || existsName(dic, PdfName.SUBTYPE, PdfName.MMTYPE1)
+                    || existsName(dic, PdfName.SUBTYPE, PdfName.TRUETYPE)) {
+                String s = getSubsetPrefix(dic);
+                if (s == null) {
+                    continue;
+                }
+                String ns = createRandomSubsetPrefix() + s.substring(7);
+                PdfName newName = new PdfName(ns);
+                dic.put(PdfName.BASEFONT, newName);
+                setXrefPartialObject(k, dic);
+                ++total;
+                PdfDictionary fd = dic.getAsDict(PdfName.FONTDESCRIPTOR);
+                if (fd == null) {
+                    continue;
+                }
+                fd.put(PdfName.FONTNAME, newName);
+            } else if (existsName(dic, PdfName.SUBTYPE, PdfName.TYPE0)) {
+                String s = getSubsetPrefix(dic);
+                PdfArray arr = dic.getAsArray(PdfName.DESCENDANTFONTS);
+                if (arr == null) {
+                    continue;
+                }
+                if (arr.isEmpty()) {
+                    continue;
+                }
+                PdfDictionary desc = arr.getAsDict(0);
+                String sde = getSubsetPrefix(desc);
+                if (sde == null) {
+                    continue;
+                }
+                String ns = createRandomSubsetPrefix();
+                if (s != null) {
+                    dic.put(PdfName.BASEFONT, new PdfName(ns + s.substring(7)));
+                }
+                setXrefPartialObject(k, dic);
+                PdfName newName = new PdfName(ns + sde.substring(7));
+                desc.put(PdfName.BASEFONT, newName);
+                ++total;
+                PdfDictionary fd = desc.getAsDict(PdfName.FONTDESCRIPTOR);
+                if (fd == null) {
+                    continue;
+                }
+                fd.put(PdfName.FONTNAME, newName);
+            }
+        }
+        return total;
+    }
+
+    /**
+     * Creates a unique subset prefix to be added to the font name when the font is embedded and subset.
+     *
+     * @return the subset prefix
+     */
+    private String createRandomSubsetPrefix() {
+        String s = "";
+        for (int k = 0; k < 6; ++k) {
+            s += (char) (Math.random() * 26 + 'A');
+        }
+        return s + "+";
+    }
+
+    /**
+     * Finds all the fonts not subset but embedded and marks them as subset.
+     *
+     * @return the number of fonts altered
+     */
+    public int createFakeFontSubsets() {
+        int total = 0;
+        for (int k = 1; k < xrefObj.size(); ++k) {
+            PdfObject obj = getPdfObjectRelease(k);
+            if (obj == null || !obj.isDictionary()) {
+                continue;
+            }
+            PdfDictionary dic = (PdfDictionary) obj;
+            if (!existsName(dic, PdfName.TYPE, PdfName.FONT)) {
+                continue;
+            }
+            if (existsName(dic, PdfName.SUBTYPE, PdfName.TYPE1)
+                    || existsName(dic, PdfName.SUBTYPE, PdfName.MMTYPE1)
+                    || existsName(dic, PdfName.SUBTYPE, PdfName.TRUETYPE)) {
+                String s = getSubsetPrefix(dic);
+                if (s != null) {
+                    continue;
+                }
+                s = getFontName(dic);
+                if (s == null) {
+                    continue;
+                }
+                String ns = createRandomSubsetPrefix() + s;
+                PdfDictionary fd = (PdfDictionary) getPdfObjectRelease(dic
+                        .get(PdfName.FONTDESCRIPTOR));
+                if (fd == null) {
+                    continue;
+                }
+                if (fd.get(PdfName.FONTFILE) == null
+                        && fd.get(PdfName.FONTFILE2) == null
+                        && fd.get(PdfName.FONTFILE3) == null) {
+                    continue;
+                }
+                fd = dic.getAsDict(PdfName.FONTDESCRIPTOR);
+                PdfName newName = new PdfName(ns);
+                dic.put(PdfName.BASEFONT, newName);
+                fd.put(PdfName.FONTNAME, newName);
+                setXrefPartialObject(k, dic);
+                ++total;
+            }
+        }
+        return total;
+    }
+
+    /**
+     * Gets all the named destinations as an HashMap. The key is the name and the value is the destinations
+     * array.
+     *
+     * @return gets all the named destinations
+     */
+    public HashMap getNamedDestination() {
+        return getNamedDestination(false);
+    }
+
+    /**
+     * Gets all the named destinations as an HashMap. The key is the name and the value is the destinations
+     * array.
+     *
+     * @param keepNames true if you want the keys to be real PdfNames instead of Strings
+     * @return gets all the named destinations
+     * @since 2.1.6
+     */
+    public HashMap getNamedDestination(boolean keepNames) {
+        HashMap names = getNamedDestinationFromNames(keepNames);
+        names.putAll(getNamedDestinationFromStrings());
+        return names;
+    }
+
+    /**
+     * Gets the named destinations from the /Dests key in the catalog as an
+     * HashMap. The key is the name and the value is the destinations
+     * array.
+     *
+     * @return gets the named destinations
+     */
+    public HashMap getNamedDestinationFromNames() {
+        return getNamedDestinationFromNames(false);
+    }
+
+    /**
+     * Gets the named destinations from the /Dests key in the catalog as an
+     * HashMap. The key is the name and the value is the destinations
+     * array.
+     *
+     * @param keepNames true if you want the keys to be real PdfNames instead of Strings
+     * @return gets the named destinations
+     * @since 2.1.6
+     */
+    public HashMap getNamedDestinationFromNames(boolean keepNames) {
+        HashMap names = new HashMap<>();
+        if (catalog.get(PdfName.DESTS) != null) {
+            PdfDictionary dic = (PdfDictionary) getPdfObjectRelease(catalog.get(PdfName.DESTS));
+            if (dic == null) {
+                return names;
+            }
+            Set keys = dic.getKeys();
+            for (Object key1 : keys) {
+                PdfName key = (PdfName) key1;
+                PdfArray arr = getNameArray(dic.get(key));
+                if (arr == null) {
+                    continue;
+                }
+                if (keepNames) {
+                    names.put(key, arr);
+                } else {
+                    String name = PdfName.decodeName(key.toString());
+                    names.put(name, arr);
+                }
+            }
+        }
+        return names;
+    }
+
+    /**
+     * Gets the named destinations from the /Names key in the catalog as an
+     * HashMap. The key is the name and the value is the destinations
+     * array.
+     *
+     * @return gets the named destinations
+     */
+    public HashMap getNamedDestinationFromStrings() {
+        if (catalog.get(PdfName.NAMES) != null) {
+            PdfDictionary dic = (PdfDictionary) getPdfObjectRelease(catalog
+                    .get(PdfName.NAMES));
+            if (dic != null) {
+                dic = (PdfDictionary) getPdfObjectRelease(dic.get(PdfName.DESTS));
+                if (dic != null) {
+                    HashMap names = PdfNameTree.readTree(dic);
+                    for (Iterator> it = names.entrySet().iterator(); it.hasNext(); ) {
+                        Map.Entry entry = it.next();
+                        PdfArray arr = getNameArray(entry.getValue());
+                        if (arr != null) {
+                            entry.setValue(arr);
+                        } else {
+                            it.remove();
+                        }
+                    }
+                    return names;
+                }
+            }
+        }
+        return new HashMap<>();
+    }
+
+    /**
+     * Removes all the fields from the document.
+     */
+    public void removeFields() {
+        pageRefs.resetReleasePage();
+        for (int k = 1; k <= pageRefs.size(); ++k) {
+            PdfDictionary page = pageRefs.getPageN(k);
+            PdfArray annots = page.getAsArray(PdfName.ANNOTS);
+            if (annots == null) {
+                pageRefs.releasePage(k);
+                continue;
+            }
+            for (int j = 0; j < annots.size(); ++j) {
+                PdfObject obj = getPdfObjectRelease(annots.getPdfObject(j));
+                if (obj == null || !obj.isDictionary()) {
+                    continue;
+                }
+                PdfDictionary annot = (PdfDictionary) obj;
+                if (PdfName.WIDGET.equals(annot.get(PdfName.SUBTYPE))) {
+                    annots.remove(j--);
+                }
+            }
+            if (annots.isEmpty()) {
+                page.remove(PdfName.ANNOTS);
+            } else {
+                pageRefs.releasePage(k);
+            }
+        }
+        catalog.remove(PdfName.ACROFORM);
+        pageRefs.resetReleasePage();
+    }
+
+    /**
+     * Removes all the annotations and fields from the document.
+     */
+    public void removeAnnotations() {
+        pageRefs.resetReleasePage();
+        for (int k = 1; k <= pageRefs.size(); ++k) {
+            PdfDictionary page = pageRefs.getPageN(k);
+            if (page.get(PdfName.ANNOTS) == null) {
+                pageRefs.releasePage(k);
+            } else {
+                page.remove(PdfName.ANNOTS);
+            }
+        }
+        catalog.remove(PdfName.ACROFORM);
+        pageRefs.resetReleasePage();
+    }
+
+    public ArrayList getLinks(int page) {
+        pageRefs.resetReleasePage();
+        ArrayList result = new ArrayList<>();
+        PdfDictionary pageDic = pageRefs.getPageN(page);
+        if (pageDic.get(PdfName.ANNOTS) != null) {
+            PdfArray annots = pageDic.getAsArray(PdfName.ANNOTS);
+            for (int j = 0; j < annots.size(); ++j) {
+                PdfDictionary annot = (PdfDictionary) getPdfObjectRelease(annots
+                        .getPdfObject(j));
+
+                if (PdfName.LINK.equals(annot.get(PdfName.SUBTYPE))) {
+                    result.add(new PdfAnnotation.PdfImportedLink(annot));
+                }
+            }
+        }
+        pageRefs.releasePage(page);
+        pageRefs.resetReleasePage();
+        return result;
+    }
+
+    private void iterateBookmarks(PdfObject outlineRef, Map names) {
+        while (outlineRef != null) {
+            replaceNamedDestination(outlineRef, names);
+            PdfDictionary outline = (PdfDictionary) getPdfObjectRelease(outlineRef);
+            PdfObject first = outline.get(PdfName.FIRST);
+            if (first != null) {
+                iterateBookmarks(first, names);
+            }
+            outlineRef = outline.get(PdfName.NEXT);
+        }
+    }
+
+    /**
+     * Replaces remote named links with local destinations that have the same name.
+     *
+     * @since 5.0
+     */
+    public void makeRemoteNamedDestinationsLocal() {
+        if (remoteToLocalNamedDestinations) {
+            return;
+        }
+        remoteToLocalNamedDestinations = true;
+        Map names = getNamedDestination(true);
+        if (names.isEmpty()) {
+            return;
+        }
+        for (int k = 1; k <= pageRefs.size(); ++k) {
+            PdfDictionary page = pageRefs.getPageN(k);
+            PdfObject annotsRef;
+            PdfArray annots = (PdfArray) getPdfObject(annotsRef = page
+                    .get(PdfName.ANNOTS));
+            int annotIdx = lastXrefPartial;
+            releaseLastXrefPartial();
+            if (annots == null) {
+                pageRefs.releasePage(k);
+                continue;
+            }
+            boolean commitAnnots = false;
+            for (int an = 0; an < annots.size(); ++an) {
+                PdfObject objRef = annots.getPdfObject(an);
+                if (convertNamedDestination(objRef, names) && !objRef.isIndirect()) {
+                    commitAnnots = true;
+                }
+            }
+            if (commitAnnots) {
+                setXrefPartialObject(annotIdx, annots);
+            }
+            if (!commitAnnots || annotsRef.isIndirect()) {
+                pageRefs.releasePage(k);
+            }
+        }
+    }
+
+    /**
+     * Converts a remote named destination GoToR with a local named destination if there's a corresponding name.
+     *
+     * @param obj   an annotation that needs to be screened for links to external named destinations.
+     * @param names a map with names of local named destinations
+     * @since iText 5.0
+     */
+    private boolean convertNamedDestination(PdfObject obj, Map names) {
+        obj = getPdfObject(obj);
+        int objIdx = lastXrefPartial;
+        releaseLastXrefPartial();
+        if (obj != null && obj.isDictionary()) {
+            PdfObject ob2 = getPdfObject(((PdfDictionary) obj).get(PdfName.A));
+            if (ob2 != null) {
+                int obj2Idx = lastXrefPartial;
+                releaseLastXrefPartial();
+                PdfDictionary dic = (PdfDictionary) ob2;
+                PdfName type = (PdfName) getPdfObjectRelease(dic.get(PdfName.S));
+                if (PdfName.GOTOR.equals(type)) {
+                    PdfObject ob3 = getPdfObjectRelease(dic.get(PdfName.D));
+                    Object name = null;
+                    if (ob3 != null) {
+                        if (ob3.isName()) {
+                            name = ob3;
+                        } else if (ob3.isString()) {
+                            name = ob3.toString();
+                        }
+                        PdfArray dest = (PdfArray) names.get(name);
+                        if (dest != null) {
+                            dic.remove(PdfName.F);
+                            dic.remove(PdfName.NEWWINDOW);
+                            dic.put(PdfName.S, PdfName.GOTO);
+                            setXrefPartialObject(obj2Idx, ob2);
+                            setXrefPartialObject(objIdx, obj);
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Replaces all the local named links with the actual destinations.
+     */
+    public void consolidateNamedDestinations() {
+        if (consolidateNamedDestinations) {
+            return;
+        }
+        consolidateNamedDestinations = true;
+        Map names = getNamedDestination(true);
+        if (names.isEmpty()) {
+            return;
+        }
+        for (int k = 1; k <= pageRefs.size(); ++k) {
+            PdfDictionary page = pageRefs.getPageN(k);
+            PdfObject annotsRef;
+            PdfArray annots = (PdfArray) getPdfObject(annotsRef = page
+                    .get(PdfName.ANNOTS));
+            int annotIdx = lastXrefPartial;
+            releaseLastXrefPartial();
+            if (annots == null) {
+                pageRefs.releasePage(k);
+                continue;
+            }
+            boolean commitAnnots = false;
+            for (int an = 0; an < annots.size(); ++an) {
+                PdfObject objRef = annots.getPdfObject(an);
+                if (replaceNamedDestination(objRef, names) && !objRef.isIndirect()) {
+                    commitAnnots = true;
+                }
+            }
+            if (commitAnnots) {
+                setXrefPartialObject(annotIdx, annots);
+            }
+            if (!commitAnnots || annotsRef.isIndirect()) {
+                pageRefs.releasePage(k);
+            }
+        }
+        PdfDictionary outlines = (PdfDictionary) getPdfObjectRelease(catalog
+                .get(PdfName.OUTLINES));
+        if (outlines == null) {
+            return;
+        }
+        iterateBookmarks(outlines.get(PdfName.FIRST), names);
+    }
+
+    private boolean replaceNamedDestination(PdfObject obj, Map names) {
+        obj = getPdfObject(obj);
+        int objIdx = lastXrefPartial;
+        releaseLastXrefPartial();
+        if (obj != null && obj.isDictionary()) {
+            PdfObject ob2 = getPdfObjectRelease(((PdfDictionary) obj)
+                    .get(PdfName.DEST));
+            Object name = null;
+            if (ob2 != null) {
+                if (ob2.isName()) {
+                    name = ob2;
+                } else if (ob2.isString()) {
+                    name = ob2.toString();
+                }
+                PdfArray dest = (PdfArray) names.get(name);
+                if (dest != null) {
+                    ((PdfDictionary) obj).put(PdfName.DEST, dest);
+                    setXrefPartialObject(objIdx, obj);
+                    return true;
+                }
+            } else if ((ob2 = getPdfObject(((PdfDictionary) obj).get(PdfName.A))) != null) {
+                int obj2Idx = lastXrefPartial;
+                releaseLastXrefPartial();
+                PdfDictionary dic = (PdfDictionary) ob2;
+                PdfName type = (PdfName) getPdfObjectRelease(dic.get(PdfName.S));
+                if (PdfName.GOTO.equals(type)) {
+                    PdfObject ob3 = getPdfObjectRelease(dic.get(PdfName.D));
+                    if (ob3 != null) {
+                        if (ob3.isName()) {
+                            name = ob3;
+                        } else if (ob3.isString()) {
+                            name = ob3.toString();
+                        }
+                    }
+                    PdfArray dest = (PdfArray) names.get(name);
+                    if (dest != null) {
+                        dic.put(PdfName.D, dest);
+                        setXrefPartialObject(obj2Idx, ob2);
+                        setXrefPartialObject(objIdx, obj);
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Closes the reader
+     */
+    @Override
+    public void close() {
+        if (!partial) {
+            return;
+        }
+        try {
+            tokens.close();
+        } catch (IOException e) {
+            throw new ExceptionConverter(e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected void removeUnusedNode(PdfObject obj, boolean[] hits) {
+        Stack state = new Stack();
+        state.push(obj);
+        while (!state.empty()) {
+            Object current = state.pop();
+            if (current == null) {
+                continue;
+            }
+            List ar = null;
+            PdfDictionary dic = null;
+            PdfName[] keys = null;
+            Object[] objs = null;
+            int idx = 0;
+            if (current instanceof PdfObject) {
+                obj = (PdfObject) current;
+                switch (obj.type()) {
+                    case PdfObject.DICTIONARY:
+                    case PdfObject.STREAM:
+                        dic = (PdfDictionary) obj;
+                        keys = new PdfName[dic.size()];
+                        dic.getKeys().toArray(keys);
+                        break;
+                    case PdfObject.ARRAY:
+                        ar = ((PdfArray) obj).getElements();
+                        break;
+                    case PdfObject.INDIRECT:
+                        PRIndirectReference ref = (PRIndirectReference) obj;
+                        int num = ref.getNumber();
+                        if (!hits[num]) {
+                            hits[num] = true;
+                            state.push(getPdfObjectRelease(ref));
+                        }
+                        continue;
+                    default:
+                        continue;
+                }
+            } else {
+                objs = (Object[]) current;
+                if (objs[0] instanceof ArrayList) {
+                    ar = (ArrayList) objs[0];
+                    idx = (Integer) objs[1];
+                } else {
+                    keys = (PdfName[]) objs[0];
+                    dic = (PdfDictionary) objs[1];
+                    idx = (Integer) objs[2];
+                }
+            }
+            if (ar != null) {
+                for (int k = idx; k < ar.size(); ++k) {
+                    PdfObject v = ar.get(k);
+                    if (v.isIndirect()) {
+                        int num = ((PRIndirectReference) v).getNumber();
+                        if (num < 0 || num >= xrefObj.size() || (!partial && xrefObj.get(num) == null)) {
+                            ar.set(k, PdfNull.PDFNULL);
+                            continue;
+                        }
+                    }
+                    if (objs == null) {
+                        state.push(new Object[]{ar, k + 1});
+                    } else {
+                        objs[1] = k + 1;
+                        state.push(objs);
+                    }
+                    state.push(v);
+                    break;
+                }
+            } else {
+                for (int k = idx; k < keys.length; ++k) {
+                    PdfName key = keys[k];
+                    PdfObject v = dic.get(key);
+                    if (v.isIndirect()) {
+                        int num = ((PRIndirectReference) v).getNumber();
+                        if (num < 0 || num >= xrefObj.size() || (!partial && xrefObj.get(num) == null)) {
+                            dic.put(key, PdfNull.PDFNULL);
+                            continue;
+                        }
+                    }
+                    if (objs == null) {
+                        state.push(new Object[]{keys, dic, k + 1});
+                    } else {
+                        objs[2] = k + 1;
+                        state.push(objs);
+                    }
+                    state.push(v);
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Removes all the unreachable objects.
+     *
+     * @return the number of indirect objects removed
+     */
+    public int removeUnusedObjects() {
+        boolean[] hits = new boolean[xrefObj.size()];
+        removeUnusedNode(trailer, hits);
+        int total = 0;
+        if (partial) {
+            for (int k = 1; k < hits.length; ++k) {
+                if (!hits[k]) {
+                    xref[k * 2] = -1;
+                    xref[k * 2 + 1] = 0;
+                    xrefObj.set(k, null);
+                    ++total;
+                }
+            }
+        } else {
+            for (int k = 1; k < hits.length; ++k) {
+                if (!hits[k]) {
+                    xrefObj.set(k, null);
+                    ++total;
+                }
+            }
+        }
+        return total;
+    }
+
+    /**
+     * Gets a read-only version of AcroFields.
+     *
+     * @return a read-only version of AcroFields
+     */
+    public AcroFields getAcroFields() {
+        return new AcroFields(this, null);
+    }
+
+    /**
+     * Gets the global document JavaScript.
+     *
+     * @param file the document file
+     * @return the global document JavaScript
+     * @throws IOException on error
+     */
+    public String getJavaScript(RandomAccessFileOrArray file) throws IOException {
+        PdfDictionary names = (PdfDictionary) getPdfObjectRelease(catalog
+                .get(PdfName.NAMES));
+        if (names == null) {
+            return null;
+        }
+        PdfDictionary js = (PdfDictionary) getPdfObjectRelease(names
+                .get(PdfName.JAVASCRIPT));
+        if (js == null) {
+            return null;
+        }
+        Map jscript = PdfNameTree.readTree(js);
+        String[] sortedNames = new String[jscript.size()];
+        sortedNames = jscript.keySet().toArray(sortedNames);
+        Arrays.sort(sortedNames);
+        StringBuilder buf = new StringBuilder();
+        for (String sortedName : sortedNames) {
+            PdfDictionary j = (PdfDictionary) getPdfObjectRelease(jscript.get(sortedName));
+            if (j == null) {
+                continue;
+            }
+            PdfObject obj = getPdfObjectRelease(j.get(PdfName.JS));
+            if (obj != null) {
+                if (obj.isString()) {
+                    buf.append(((PdfString) obj).toUnicodeString()).append('\n');
+                } else if (obj.isStream()) {
+                    byte[] bytes = getStreamBytes((PRStream) obj, file);
+                    if (bytes.length >= 2 && bytes[0] == (byte) 254
+                            && bytes[1] == (byte) 255) {
+                        buf.append(PdfEncodings.convertToString(bytes,
+                                PdfObject.TEXT_UNICODE));
+                    } else {
+                        buf.append(PdfEncodings.convertToString(bytes,
+                                PdfObject.TEXT_PDFDOCENCODING));
+                    }
+                    buf.append('\n');
+                }
+            }
+        }
+        return buf.toString();
+    }
+
+    /**
+     * Gets the global document JavaScript.
+     *
+     * @return the global document JavaScript
+     * @throws IOException on error
+     */
+    public String getJavaScript() throws IOException {
+        RandomAccessFileOrArray rf = getSafeFile();
+        try {
+            rf.reOpen();
+            return getJavaScript(rf);
+        } finally {
+            try {
+                rf.close();
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    /**
+     * Selects the pages to keep in the document. The pages are described as ranges. The page ordering can be changed
+     * but no page repetitions are allowed. Note that it may be very slow in partial mode.
+     *
+     * @param ranges the comma separated ranges as described in {@link SequenceList}
+     */
+    public void selectPages(String ranges) {
+        selectPages(SequenceList.expand(ranges, getNumberOfPages()));
+    }
+
+    /**
+     * Selects the pages to keep in the document. The pages are described as a
+     * List of Integer. The page ordering can be changed
+     * but no page repetitions are allowed. Note that it may be very slow in partial mode.
+     *
+     * @param pagesToKeep the pages to keep in the document
+     */
+    public void selectPages(List pagesToKeep) {
+        pageRefs.selectPages(pagesToKeep);
+        removeUnusedObjects();
+    }
+
+    /**
+     * Sets the viewer preferences as the sum of several constants.
+     *
+     * @param preferences the viewer preferences
+     * @see PdfViewerPreferences#setViewerPreferences
+     */
+    @Override
+    public void setViewerPreferences(int preferences) {
+        this.viewerPreferences.setViewerPreferences(preferences);
+        setViewerPreferences(this.viewerPreferences);
+    }
+
+    /**
+     * Adds a viewer preference
+     *
+     * @param key   a key for a viewer preference
+     * @param value a value for the viewer preference
+     * @see PdfViewerPreferences#addViewerPreference
+     */
+    @Override
+    public void addViewerPreference(PdfName key, PdfObject value) {
+        this.viewerPreferences.addViewerPreference(key, value);
+        setViewerPreferences(this.viewerPreferences);
+    }
+
+    void setViewerPreferences(PdfViewerPreferencesImp vp) {
+        vp.addToCatalog(catalog);
+    }
+
+    /**
+     * Returns a bitset representing the PageMode and PageLayout viewer preferences. Doesn't return any information
+     * about the ViewerPreferences dictionary.
+     *
+     * @return an int that contains the Viewer Preferences.
+     */
+    public int getSimpleViewerPreferences() {
+        return PdfViewerPreferencesImp.getViewerPreferences(catalog)
+                .getPageLayoutAndMode();
+    }
+
+    /**
+     * Getter for property appendable.
+     *
+     * @return Value of property appendable.
+     */
+    public boolean isAppendable() {
+        return this.appendable;
+    }
+
+    /**
+     * Setter for property appendable.
+     *
+     * @param appendable New value of property appendable.
+     */
+    public void setAppendable(boolean appendable) {
+        this.appendable = appendable;
+        if (appendable) {
+            getPdfObject(trailer.get(PdfName.ROOT));
+        }
+    }
+
+    /**
+     * Getter for property newXrefType.
+     *
+     * @return Value of property newXrefType.
+     */
+    public boolean isNewXrefType() {
+        return newXrefType;
+    }
+
+    /**
+     * Getter for property fileLength.
+     *
+     * @return Value of property fileLength.
+     */
+    public int getFileLength() {
+        return fileLength;
+    }
+
+    /**
+     * Getter for property hybridXref.
+     *
+     * @return Value of property hybridXref.
+     */
+    public boolean isHybridXref() {
+        return hybridXref;
+    }
+
+    PdfIndirectReference getCryptoRef() {
+        if (cryptoRef == null) {
+            return null;
+        }
+        return new PdfIndirectReference(0, cryptoRef.getNumber(),
+                cryptoRef.getGeneration());
+    }
+
+    /**
+     * Removes any usage rights that this PDF may have. Only Adobe can grant usage rights and any PDF modification with
+     * iText will invalidate them. Invalidated usage rights may confuse Acrobat and it's advisable to remove them
+     * altogether.
+     */
+    public void removeUsageRights() {
+        PdfDictionary perms = catalog.getAsDict(PdfName.PERMS);
+        if (perms == null) {
+            return;
+        }
+        perms.remove(PdfName.UR);
+        perms.remove(PdfName.UR3);
+        if (perms.size() == 0) {
+            catalog.remove(PdfName.PERMS);
+        }
+    }
+
+    /**
+     * Gets the certification level for this document. The return values can be
+     * PdfSignatureAppearance.NOT_CERTIFIED,
+     * PdfSignatureAppearance.CERTIFIED_NO_CHANGES_ALLOWED,
+     * PdfSignatureAppearance.CERTIFIED_FORM_FILLING and
+     * PdfSignatureAppearance.CERTIFIED_FORM_FILLING_AND_ANNOTATIONS
+     * .
+     * 
          
+     * No signature validation is made, use the methods available for that in
+     * AcroFields.
+     * 
          
+     *
+     * @return gets the certification level for this document
+     */
+    public int getCertificationLevel() {
+        PdfDictionary dic = catalog.getAsDict(PdfName.PERMS);
+        if (dic == null) {
+            return PdfSignatureAppearance.NOT_CERTIFIED;
+        }
+        dic = dic.getAsDict(PdfName.DOCMDP);
+        if (dic == null) {
+            return PdfSignatureAppearance.NOT_CERTIFIED;
+        }
+        PdfArray arr = dic.getAsArray(PdfName.REFERENCE);
+        if (arr == null || arr.size() == 0) {
+            return PdfSignatureAppearance.NOT_CERTIFIED;
+        }
+        dic = arr.getAsDict(0);
+        if (dic == null) {
+            return PdfSignatureAppearance.NOT_CERTIFIED;
+        }
+        dic = dic.getAsDict(PdfName.TRANSFORMPARAMS);
+        if (dic == null) {
+            return PdfSignatureAppearance.NOT_CERTIFIED;
+        }
+        PdfNumber p = dic.getAsNumber(PdfName.P);
+        if (p == null) {
+            return PdfSignatureAppearance.NOT_CERTIFIED;
+        }
+        return p.intValue();
+    }
+
+    /**
+     * Checks if an encrypted document may be modified if the owner password was not supplied. If the document is not
+     * encrypted, the setting has no effect.
+     *
+     * @return true if the document may be modified even if the owner password was not
+     * supplied false otherwise
+     */
+    public boolean isModificationlowedWithoutOwnerPassword() {
+        return this.modificationAllowedWithoutOwnerPassword;
+    }
+
+    /**
+     * Sets whether the document (if encrypted) may be modified even if the owner password was not supplied. If this is
+     * set to false an exception will be thrown when attempting to access the Document if the owner
+     * password was not supplied (for encrypted documents.)
+     *
+     * @param modificationAllowedWithoutOwnerPassword the modificationAllowedWithoutOwnerPassword state.
+     */
+    public void setModificationAllowedWithoutOwnerPassword(
+            boolean modificationAllowedWithoutOwnerPassword) {
+        this.modificationAllowedWithoutOwnerPassword = modificationAllowedWithoutOwnerPassword;
+    }
+
+    /**
+     * Checks if the document was opened with the owner password so that the end application can decide what level of
+     * access restrictions to apply. If the document is not encrypted it will return true.
+     *
+     * @return true if the document was opened with the owner password or if it's not
+     * encrypted or the modificationAllowedWithoutOwnerPassword flag is set,
+     * false otherwise.
+     */
+    public final boolean isOpenedWithFullPermissions() {
+        return !encrypted || ownerPasswordUsed || modificationAllowedWithoutOwnerPassword;
+    }
+
+    public int getCryptoMode() {
+        if (decrypt == null) {
+            return -1;
+        } else {
+            return decrypt.getCryptoMode();
+        }
+    }
+
+    public boolean isMetadataEncrypted() {
+        if (decrypt == null) {
+            return false;
+        } else {
+            return decrypt.isMetadataEncrypted();
+        }
+    }
+
+    public byte[] computeUserPassword() {
+        if (!encrypted || !ownerPasswordUsed) {
+            return null;
+        }
+        return decrypt.computeUserPassword(password);
+    }
+
+    /**
+     * Returns a permanent document identifier extracted from trailer /ID entry, when present
+     *
+     * @return byte array representing the document permanent identifier
+     */
+    public byte[] getDocumentId() {
+        if (trailer == null) {
+            return null;
+        }
+        PdfArray documentIDs = trailer.getAsArray(PdfName.ID);
+        if (documentIDs == null || documentIDs.size() == 0) {
+            return null;
+        }
+        PdfObject o = documentIDs.getPdfObject(0);
+        return com.lowagie.text.DocWriter.getISOBytes(o.toString());
+    }
+
+    static class PageRefs {
+
+        private final PdfReader reader;
+        /**
+         * ArrayList with the indirect references to every page. Element 0 = page 1; 1 = page 2;... Not used for partial
+         * reading.
+         */
+        private List refsn;
+        /**
+         * The number of pages, updated only in case of partial reading.
+         */
+        private int sizep;
+        /**
+         * intHashtable that does the same thing as refsn in case of partial reading: major difference: not all the
+         * pages are read.
+         */
+        private IntHashtable refsp;
+        /**
+         * Page number of the last page that was read (partial reading only)
+         */
+        private int lastPageRead = -1;
+        /**
+         * stack to which pages dictionaries are pushed to keep track of the current page attributes
+         */
+        private List pageInh;
+        private boolean keepPages;
+
+        private PageRefs(PdfReader reader) {
+            this.reader = reader;
+            if (reader.partial) {
+                refsp = new IntHashtable();
+                PdfNumber npages = (PdfNumber) PdfReader
+                        .getPdfObjectRelease(reader.rootPages.get(PdfName.COUNT));
+                sizep = npages.intValue();
+            } else {
+                readPages();
+            }
+        }
+
+        PageRefs(PageRefs other, PdfReader reader) {
+            this.reader = reader;
+            this.sizep = other.sizep;
+            if (other.refsn != null) {
+                refsn = new ArrayList<>(other.refsn);
+                for (int k = 0; k < refsn.size(); ++k) {
+                    refsn.set(k, duplicatePdfObject(refsn.get(k), reader));
+                }
+            } else {
+                this.refsp = (IntHashtable) other.refsp.clone();
+            }
+        }
+
+        int size() {
+            if (refsn != null) {
+                return refsn.size();
+            } else {
+                return sizep;
+            }
+        }
+
+        void readPages() {
+            if (refsn != null) {
+                return;
+            }
+            refsp = null;
+            refsn = new ArrayList<>();
+            pageInh = new ArrayList<>();
+            PdfObject obj = reader.catalog.get(PdfName.PAGES);
+            if (obj instanceof PRIndirectReference) {
+                iteratePages((PRIndirectReference) obj);
+            } else if (obj instanceof PdfDictionary) {
+                iteratePages((PdfDictionary) obj);
+            }
+            pageInh = null;
+            reader.rootPages.put(PdfName.COUNT, new PdfNumber(refsn.size()));
+        }
+
+        void reReadPages() {
+            refsn = null;
+            readPages();
+        }
+
+        /**
+         * Gets the page dictionary of the specified page
+         *
+         * @param pageNum the page number. 1 is the first
+         * @return the page dictionary
+         */
+        public PdfDictionary getPageN(int pageNum) {
+            PRIndirectReference ref = getPageOrigRef(pageNum);
+            return (PdfDictionary) PdfReader.getPdfObject(ref);
+        }
+
+        /**
+         * Gets the page reference to this page.
+         *
+         * @param pageNum the page number.
+         * @return a dictionary object or null when the page does not exist
+         */
+        public PdfDictionary getPageNRelease(int pageNum) {
+            PdfDictionary page = getPageN(pageNum);
+            releasePage(pageNum);
+            return page;
+        }
+
+        /**
+         * Releases the page reference to this page.
+         *
+         * @param pageNum the page number.
+         * @return an indirect reference
+         */
+        public PRIndirectReference getPageOrigRefRelease(int pageNum) {
+            PRIndirectReference ref = getPageOrigRef(pageNum);
+            releasePage(pageNum);
+            return ref;
+        }
+
+        /**
+         * Gets the page reference to this page.
+         *
+         * @param pageNum the page number. 1 is the first
+         * @return the page reference or null if the page does not exist
+         */
+        public PRIndirectReference getPageOrigRef(int pageNum) {
+            try {
+                --pageNum;
+                if (pageNum < 0 || pageNum >= size()) {
+                    return null;
+                }
+                if (refsn != null) {
+                    return (PRIndirectReference) refsn.get(pageNum);
+                } else {
+                    int n = refsp.get(pageNum);
+                    if (n == 0) {
+                        PRIndirectReference ref = getSinglePage(pageNum);
+                        if (reader.lastXrefPartial == -1) {
+                            lastPageRead = -1;
+                        } else {
+                            lastPageRead = pageNum;
+                        }
+                        reader.lastXrefPartial = -1;
+                        refsp.put(pageNum, ref.getNumber());
+                        if (keepPages) {
+                            lastPageRead = -1;
+                        }
+                        return ref;
+                    } else {
+                        if (lastPageRead != pageNum) {
+                            lastPageRead = -1;
+                        }
+                        if (keepPages) {
+                            lastPageRead = -1;
+                        }
+                        return new PRIndirectReference(reader, n);
+                    }
+                }
+            } catch (Exception e) {
+                throw new ExceptionConverter(e);
+            }
+        }
+
+        void keepPages() {
+            if (refsp == null || keepPages) {
+                return;
+            }
+            keepPages = true;
+            refsp.clear();
+        }
+
+        /**
+         *
+         */
+        public void releasePage(int pageNum) {
+            if (refsp == null) {
+                return;
+            }
+            --pageNum;
+            if (pageNum < 0 || pageNum >= size()) {
+                return;
+            }
+            if (pageNum != lastPageRead) {
+                return;
+            }
+            lastPageRead = -1;
+            reader.lastXrefPartial = refsp.get(pageNum);
+            reader.releaseLastXrefPartial();
+            refsp.remove(pageNum);
+        }
+
+        /**
+         *
+         */
+        public void resetReleasePage() {
+            if (refsp == null) {
+                return;
+            }
+            lastPageRead = -1;
+        }
+
+        void insertPage(int pageNum, PRIndirectReference ref) {
+            --pageNum;
+            if (refsn != null) {
+                if (pageNum >= refsn.size()) {
+                    refsn.add(ref);
+                } else {
+                    refsn.add(pageNum, ref);
+                }
+            } else {
+                ++sizep;
+                lastPageRead = -1;
+                if (pageNum >= size()) {
+                    refsp.put(size(), ref.getNumber());
+                } else {
+                    IntHashtable refs2 = new IntHashtable((refsp.size() + 1) * 2);
+                    for (Iterator it = refsp.getEntryIterator(); it.hasNext(); ) {
+                        IntHashtable.Entry entry = (IntHashtable.Entry) it.next();
+                        int p = entry.getKey();
+                        refs2.put(p >= pageNum ? p + 1 : p, entry.getValue());
+                    }
+                    refs2.put(pageNum, ref.getNumber());
+                    refsp = refs2;
+                }
+            }
+        }
+
+        /**
+         * Adds a PdfDictionary to the pageInh stack to keep track of the page attributes.
+         *
+         * @param nodePages a Pages dictionary
+         */
+        private void pushPageAttributes(PdfDictionary nodePages) {
+            PdfDictionary dic = new PdfDictionary();
+            if (!pageInh.isEmpty()) {
+                dic.putAll(pageInh.get(pageInh.size() - 1));
+            }
+            for (PdfName pageInhCandidate : pageInhCandidates) {
+                PdfObject obj = nodePages.get(pageInhCandidate);
+                if (obj != null) {
+                    dic.put(pageInhCandidate, obj);
+                }
+            }
+            pageInh.add(dic);
+        }
+
+        /**
+         * Removes the last PdfDictionary that was pushed to the pageInh stack.
+         */
+        private void popPageAttributes() {
+            pageInh.remove(pageInh.size() - 1);
+        }
+
+        private void iteratePages(PRIndirectReference rpage) {
+            PdfDictionary page = (PdfDictionary) getPdfObject(rpage);
+            if (page == null) {
+                return;
+            }
+            PdfArray kidsPR = page.getAsArray(PdfName.KIDS);
+            // reference to a leaf
+            if (kidsPR == null) {
+                page.put(PdfName.TYPE, PdfName.PAGE);
+                PdfDictionary dic = pageInh.get(pageInh.size() - 1);
+                PdfName key;
+                for (Object o : dic.getKeys()) {
+                    key = (PdfName) o;
+                    if (page.get(key) == null) {
+                        page.put(key, dic.get(key));
+                    }
+                }
+                if (page.get(PdfName.MEDIABOX) == null) {
+                    PdfArray arr = new PdfArray(new float[]{0, 0,
+                            PageSize.LETTER.getRight(), PageSize.LETTER.getTop()});
+                    page.put(PdfName.MEDIABOX, arr);
+                }
+                refsn.add(rpage);
+            }
+            // reference to a branch
+            else {
+                page.put(PdfName.TYPE, PdfName.PAGES);
+                pushPageAttributes(page);
+                for (int k = 0; k < kidsPR.size(); ++k) {
+                    PdfObject obj = kidsPR.getPdfObject(k);
+                    if (!obj.isIndirect()) {
+                        while (k < kidsPR.size()) {
+                            kidsPR.remove(k);
+                        }
+                        break;
+                    }
+                    if (obj instanceof PRIndirectReference) {
+                        iteratePages((PRIndirectReference) obj);
+                    } else if (obj instanceof PdfDictionary) {
+                        iteratePages((PdfDictionary) obj);
+                    }
+                }
+                popPageAttributes();
+            }
+        }
+
+        private void iteratePages(PdfDictionary page) {
+            PdfArray kidsPR = page.getAsArray(PdfName.KIDS);
+            // reference to a leaf
+            if (kidsPR != null) {
+                page.put(PdfName.TYPE, PdfName.PAGES);
+                pushPageAttributes(page);
+                for (int k = 0; k < kidsPR.size(); ++k) {
+                    PdfObject obj = kidsPR.getPdfObject(k);
+                    if (!obj.isIndirect()) {
+                        while (k < kidsPR.size()) {
+                            kidsPR.remove(k);
+                        }
+                        break;
+                    }
+                    if (obj instanceof PRIndirectReference) {
+                        iteratePages((PRIndirectReference) obj);
+                    } else if (obj instanceof PdfDictionary) {
+                        iteratePages((PdfDictionary) obj);
+                    }
+                }
+                popPageAttributes();
+            }
+        }
+
+        protected PRIndirectReference getSinglePage(int n) {
+            PdfDictionary acc = new PdfDictionary();
+            PdfDictionary top = reader.rootPages;
+            int base = 0;
+            while (true) {
+                for (PdfName pageInhCandidate : pageInhCandidates) {
+                    PdfObject obj = top.get(pageInhCandidate);
+                    if (obj != null) {
+                        acc.put(pageInhCandidate, obj);
+                    }
+                }
+                PdfArray kids = (PdfArray) PdfReader.getPdfObjectRelease(top.get(PdfName.KIDS));
+                for (PdfObject pdfObject : kids.getElements()) {
+                    PRIndirectReference ref = (PRIndirectReference) pdfObject;
+                    PdfDictionary dic = (PdfDictionary) getPdfObject(ref);
+                    int last = reader.lastXrefPartial;
+                    PdfObject count = getPdfObjectRelease(dic.get(PdfName.COUNT));
+                    reader.lastXrefPartial = last;
+                    int acn = 1;
+                    if (count != null && count.type() == PdfObject.NUMBER) {
+                        acn = ((PdfNumber) count).intValue();
+                    }
+                    if (n < base + acn) {
+                        if (count == null) {
+                            dic.mergeDifferent(acc);
+                            return ref;
+                        }
+                        reader.releaseLastXrefPartial();
+                        top = dic;
+                        break;
+                    }
+                    reader.releaseLastXrefPartial();
+                    base += acn;
+                }
+            }
+        }
+
+        private void selectPages(List pagesToKeep) {
+            IntHashtable pg = new IntHashtable();
+            List finalPages = new ArrayList<>();
+            int psize = size();
+            for (Integer aPagesToKeep : pagesToKeep) {
+                if (aPagesToKeep >= 1 && aPagesToKeep <= psize && pg.put(aPagesToKeep, 1) == 0) {
+                    finalPages.add(aPagesToKeep);
+                }
+            }
+            if (reader.partial) {
+                for (int k = 1; k <= psize; ++k) {
+                    getPageOrigRef(k);
+                    resetReleasePage();
+                }
+            }
+            PRIndirectReference parent = (PRIndirectReference) reader.catalog
+                    .get(PdfName.PAGES);
+            PdfDictionary topPages = (PdfDictionary) PdfReader.getPdfObject(parent);
+            List newPageRefs = new ArrayList<>(finalPages.size());
+            PdfArray kids = new PdfArray();
+            for (Object finalPage : finalPages) {
+                int p = (Integer) finalPage;
+                PRIndirectReference pref = getPageOrigRef(p);
+                resetReleasePage();
+                kids.add(pref);
+                newPageRefs.add(pref);
+                getPageN(p).put(PdfName.PARENT, parent);
+            }
+            AcroFields af = reader.getAcroFields();
+            boolean removeFields = (af.getAllFields().size() > 0);
+            for (int k = 1; k <= psize; ++k) {
+                if (!pg.containsKey(k)) {
+                    if (removeFields) {
+                        af.removeFieldsFromPage(k);
+                    }
+                    PRIndirectReference pref = getPageOrigRef(k);
+                    int nref = pref.getNumber();
+                    reader.xrefObj.set(nref, null);
+                    if (reader.partial) {
+                        reader.xref[nref * 2] = -1;
+                        reader.xref[nref * 2 + 1] = 0;
+                    }
+                }
+            }
+            topPages.put(PdfName.COUNT, new PdfNumber(finalPages.size()));
+            topPages.put(PdfName.KIDS, kids);
+            refsp = null;
+            refsn = newPageRefs;
+        }
+    }
 
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfReaderInstance.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfReaderInstance.java
index e42721e58..90a432ee8 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfReaderInstance.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfReaderInstance.java
@@ -48,18 +48,20 @@
  */
 
 package com.lowagie.text.pdf;
+
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import com.lowagie.text.error_messages.MessageLocalization;
 /**
  * Instance of PdfReader in each output document.
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 class PdfReaderInstance {
+
     static final PdfLiteral IDENTITYMATRIX = new PdfLiteral("[1 0 0 1 0 0]");
     static final PdfNumber ONE = new PdfNumber(1);
     int[] myXref;
@@ -69,23 +71,27 @@ class PdfReaderInstance {
     PdfWriter writer;
     HashMap visited = new HashMap<>();
     ArrayList nextRound = new ArrayList<>();
-    
+
     PdfReaderInstance(PdfReader reader, PdfWriter writer) {
         this.reader = reader;
         this.writer = writer;
         file = reader.getSafeFile();
         myXref = new int[reader.getXrefSize()];
     }
-    
+
     PdfReader getReader() {
         return reader;
     }
-    
+
     PdfImportedPage getImportedPage(int pageNumber) {
-        if (!reader.isOpenedWithFullPermissions())
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("pdfreader.not.opened.with.owner.password"));
-        if (pageNumber < 1 || pageNumber > reader.getNumberOfPages())
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("invalid.page.number.1", pageNumber));
+        if (!reader.isOpenedWithFullPermissions()) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("pdfreader.not.opened.with.owner.password"));
+        }
+        if (pageNumber < 1 || pageNumber > reader.getNumberOfPages()) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("invalid.page.number.1", pageNumber));
+        }
         Integer i = pageNumber;
         PdfImportedPage pageT = importedPages.get(i);
         if (pageT == null) {
@@ -94,7 +100,7 @@ PdfImportedPage getImportedPage(int pageNumber) {
         }
         return pageT;
     }
-    
+
     int getNewObjectNumber(int number, int generation) {
         if (myXref[number] == 0) {
             myXref[number] = writer.getIndirectReferenceNumber();
@@ -102,22 +108,23 @@ int getNewObjectNumber(int number, int generation) {
         }
         return myXref[number];
     }
-    
+
     RandomAccessFileOrArray getReaderFile() {
         return file;
     }
-    
+
     PdfObject getResources(int pageNumber) {
         PdfObject obj = PdfReader.getPdfObjectRelease(reader.getPageNRelease(pageNumber).get(PdfName.RESOURCES));
         return obj;
     }
-    
+
     /**
      * Gets the content stream of a page as a PdfStream object.
-     * @param    pageNumber            the page of which you want the stream
-     * @param    compressionLevel    the compression level you want to apply to the stream
-     * @return    a PdfStream object
-     * @since    2.1.3 (the method already existed without param compressionLevel)
+     *
+     * @param pageNumber       the page of which you want the stream
+     * @param compressionLevel the compression level you want to apply to the stream
+     * @return a PdfStream object
+     * @since 2.1.3 (the method already existed without param compressionLevel)
      */
     PdfStream getFormXObject(int pageNumber, int compressionLevel) throws IOException {
         PdfDictionary page = reader.getPageNRelease(pageNumber);
@@ -125,35 +132,36 @@ PdfStream getFormXObject(int pageNumber, int compressionLevel) throws IOExceptio
         PdfDictionary dic = new PdfDictionary();
         byte[] bout = null;
         if (contents != null) {
-            if (contents.isStream())
-                dic.putAll((PRStream)contents);
-            else
+            if (contents.isStream()) {
+                dic.putAll((PRStream) contents);
+            } else {
                 bout = reader.getPageContent(pageNumber, file);
-        }
-        else
+            }
+        } else {
             bout = new byte[0];
+        }
         dic.put(PdfName.RESOURCES, PdfReader.getPdfObjectRelease(page.get(PdfName.RESOURCES)));
         dic.put(PdfName.TYPE, PdfName.XOBJECT);
         dic.put(PdfName.SUBTYPE, PdfName.FORM);
         PdfImportedPage impPage = importedPages.get(pageNumber);
         dic.put(PdfName.BBOX, new PdfRectangle(impPage.getBoundingBox()));
         PdfArray matrix = impPage.getMatrix();
-        if (matrix == null)
+        if (matrix == null) {
             dic.put(PdfName.MATRIX, IDENTITYMATRIX);
-        else
+        } else {
             dic.put(PdfName.MATRIX, matrix);
+        }
         dic.put(PdfName.FORMTYPE, ONE);
         PRStream stream;
         if (bout == null) {
-            stream = new PRStream((PRStream)contents, dic);
-        }
-        else {
+            stream = new PRStream((PRStream) contents, dic);
+        } else {
             stream = new PRStream(reader, bout, compressionLevel);
             stream.putAll(dic);
         }
         return stream;
     }
-    
+
     void writeAllVisited() throws IOException {
         while (!nextRound.isEmpty()) {
             List vec = nextRound;
@@ -167,7 +175,7 @@ void writeAllVisited() throws IOException {
             }
         }
     }
-    
+
     void writeAllPages() throws IOException {
         try {
             file.reOpen();
@@ -176,13 +184,11 @@ void writeAllPages() throws IOException {
                 writer.addToBody(ip.getFormXObject(writer.getCompressionLevel()), ip.getIndirectReference());
             }
             writeAllVisited();
-        }
-        finally {
+        } finally {
             try {
                 reader.close();
                 file.close();
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 //Empty on purpose
             }
         }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfRectangle.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfRectangle.java
index ea8f49bf0..d5c987a91 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfRectangle.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfRectangle.java
@@ -53,47 +53,52 @@
 
 /**
  * PdfRectangle is the PDF Rectangle object.
- * 
          
- * Rectangles are used to describe locations on the page and bounding boxes for several
- * objects in PDF, such as fonts. A rectangle is represented as an array of
- * four numbers, specifying the lower left x, lower left y, upper right x,
- * and upper right y coordinates of the rectangle, in that order.
          
- * This object is described in the 'Portable Document Format Reference Manual version 1.3'
- * section 7.1 (page 183).
+ * 
          
+ * Rectangles are used to describe locations on the page and bounding boxes for several objects in PDF, such as fonts. A
+ * rectangle is represented as an array of four numbers, specifying the lower left x, lower left
+ * y, upper right x, and upper right y coordinates of the rectangle, in that order.
           This
+ * object is described in the 'Portable Document Format Reference Manual version 1.3' section 7.1 (page 183).
  *
- * @see        com.lowagie.text.Rectangle
- * @see        PdfArray
+ * @see com.lowagie.text.Rectangle
+ * @see PdfArray
  */
 
 public class PdfRectangle extends PdfArray {
 
     // membervariables
 
-/** lower left x */
+    /**
+     * lower left x
+     */
     private float llx = 0;
 
-/** lower left y */
+    /**
+     * lower left y
+     */
     private float lly = 0;
 
-/** upper right x */
+    /**
+     * upper right x
+     */
     private float urx = 0;
 
-/** upper right y */
+    /**
+     * upper right y
+     */
     private float ury = 0;
 
     // constructors
 
-/**
- * Constructs a PdfRectangle-object.
- *
- * @param        llx            lower left x
- * @param        lly            lower left y
- * @param        urx            upper right x
- * @param        ury            upper right y
- * @param       rotation        the rotation angle
- *
- * @since        rugPdf0.10
- */
+    /**
+     * Constructs a PdfRectangle-object.
+     *
+     * @param llx      lower left x
+     * @param lly      lower left y
+     * @param urx      upper right x
+     * @param ury      upper right y
+     * @param rotation the rotation angle
+     * @since rugPdf0.10
+     */
 
     public PdfRectangle(float llx, float lly, float urx, float ury, int rotation) {
         super();
@@ -102,8 +107,7 @@ public PdfRectangle(float llx, float lly, float urx, float ury, int rotation) {
             this.lly = llx;
             this.urx = ury;
             this.ury = urx;
-        }
-        else {
+        } else {
             this.llx = llx;
             this.lly = lly;
             this.urx = urx;
@@ -119,13 +123,13 @@ public PdfRectangle(float llx, float lly, float urx, float ury) {
         this(llx, lly, urx, ury, 0);
     }
 
-/**
- * Constructs a PdfRectangle-object starting from the origin (0, 0).
- *
- * @param        urx            upper right x
- * @param        ury            upper right y
- * @param       rotation        the rotation angle
- */
+    /**
+     * Constructs a PdfRectangle-object starting from the origin (0, 0).
+     *
+     * @param urx      upper right x
+     * @param ury      upper right y
+     * @param rotation the rotation angle
+     */
 
     public PdfRectangle(float urx, float ury, int rotation) {
         this(0, 0, urx, ury, rotation);
@@ -135,12 +139,12 @@ public PdfRectangle(float urx, float ury) {
         this(0, 0, urx, ury, 0);
     }
 
-/**
- * Constructs a PdfRectangle-object with a Rectangle-object.
- *
- * @param    rectangle    a Rectangle
- * @param rotation the rotation angle
- */
+    /**
+     * Constructs a PdfRectangle-object with a Rectangle-object.
+     *
+     * @param rectangle a Rectangle
+     * @param rotation  the rotation angle
+     */
 
     public PdfRectangle(Rectangle rectangle, int rotation) {
         this(rectangle.getLeft(), rectangle.getBottom(), rectangle.getRight(), rectangle.getTop(), rotation);
@@ -149,37 +153,43 @@ public PdfRectangle(Rectangle rectangle, int rotation) {
     public PdfRectangle(Rectangle rectangle) {
         this(rectangle.getLeft(), rectangle.getBottom(), rectangle.getRight(), rectangle.getTop(), 0);
     }
-	
-	/**
-     * To be used when the array contains 4 float numbers as pdf coordinates like  RECT / BBox 
+
+    /**
+     * To be used when the array contains 4 float numbers as pdf coordinates like  RECT / BBox
+     *
      * @param rectangle as a PdfArray
      */
     public PdfRectangle(PdfArray rectangle) {
-        this(convertToFloat(rectangle.getPdfObject(0)),convertToFloat(rectangle.getPdfObject(1)),convertToFloat(rectangle.getPdfObject(2)),convertToFloat(rectangle.getPdfObject(3)));
+        this(convertToFloat(rectangle.getPdfObject(0)), convertToFloat(rectangle.getPdfObject(1)),
+                convertToFloat(rectangle.getPdfObject(2)), convertToFloat(rectangle.getPdfObject(3)));
     }
-    
+
     private static float convertToFloat(PdfObject object) {
-        if(!(object instanceof PdfNumber)) {
-            throw new IllegalArgumentException("Invalid argument. Float value (coordinate) expected! But was "+object);
+        if (!(object instanceof PdfNumber)) {
+            throw new IllegalArgumentException(
+                    "Invalid argument. Float value (coordinate) expected! But was " + object);
         }
-        return ((PdfNumber)object).floatValue();
+        return ((PdfNumber) object).floatValue();
     }
 
     // methods
+
     /**
      * Returns the high level version of this PdfRectangle
+     *
      * @return this PdfRectangle translated to class Rectangle
      */
     public Rectangle getRectangle() {
         return new Rectangle(left(), bottom(), right(), top());
     }
 
-/**
- * Overrides the add-method in PdfArray in order to prevent the adding of extra object to the array.
- *
- * @param        object            PdfObject to add (will not be added here)
- * @return        false
- */
+    /**
+     * Overrides the add-method in PdfArray in order to prevent the adding of extra object to
+     * the array.
+     *
+     * @param object PdfObject to add (will not be added here)
+     * @return false
+     */
 
     public boolean add(PdfObject object) {
         return false;
@@ -187,6 +197,7 @@ public boolean add(PdfObject object) {
 
     /**
      * Block changes to the underlying PdfArray
+     *
      * @param values stuff we'll ignore.  Ha!
      * @return false.  You can't add anything to a PdfRectangle
      * @since 2.1.5
@@ -198,6 +209,7 @@ public boolean add(float[] values) {
 
     /**
      * Block changes to the underlying PdfArray
+     *
      * @param values stuff we'll ignore.  Ha!
      * @return false.  You can't add anything to a PdfRectangle
      * @since 2.1.5
@@ -209,121 +221,123 @@ public boolean add(int[] values) {
 
     /**
      * Block changes to the underlying PdfArray
+     *
      * @param object Ignored.
      * @since 2.1.5
      */
 
-    public void addFirst( PdfObject object ) {
+    public void addFirst(PdfObject object) {
     }
-/**
- * Returns the lower left x-coordinate.
- *
- * @return        the lower left x-coordinate
- */
+
+    /**
+     * Returns the lower left x-coordinate.
+     *
+     * @return the lower left x-coordinate
+     */
 
     public float left() {
         return llx;
     }
 
-/**
- * Returns the upper right x-coordinate.
- *
- * @return        the upper right x-coordinate
- */
+    /**
+     * Returns the upper right x-coordinate.
+     *
+     * @return the upper right x-coordinate
+     */
 
     public float right() {
         return urx;
     }
 
-/**
- * Returns the upper right y-coordinate.
- *
- * @return        the upper right y-coordinate
- */
+    /**
+     * Returns the upper right y-coordinate.
+     *
+     * @return the upper right y-coordinate
+     */
 
     public float top() {
         return ury;
     }
 
-/**
- * Returns the lower left y-coordinate.
- *
- * @return        the lower left y-coordinate
- */
+    /**
+     * Returns the lower left y-coordinate.
+     *
+     * @return the lower left y-coordinate
+     */
 
     public float bottom() {
         return lly;
     }
 
-/**
- * Returns the lower left x-coordinate, considering a given margin.
- *
- * @param        margin        a margin
- * @return        the lower left x-coordinate
- */
+    /**
+     * Returns the lower left x-coordinate, considering a given margin.
+     *
+     * @param margin a margin
+     * @return the lower left x-coordinate
+     */
 
     public float left(int margin) {
         return llx + margin;
     }
 
-/**
- * Returns the upper right x-coordinate, considering a given margin.
- *
- * @param        margin        a margin
- * @return        the upper right x-coordinate
- */
+    /**
+     * Returns the upper right x-coordinate, considering a given margin.
+     *
+     * @param margin a margin
+     * @return the upper right x-coordinate
+     */
 
     public float right(int margin) {
         return urx - margin;
     }
 
-/**
- * Returns the upper right y-coordinate, considering a given margin.
- *
- * @param        margin        a margin
- * @return        the upper right y-coordinate
- */
+    /**
+     * Returns the upper right y-coordinate, considering a given margin.
+     *
+     * @param margin a margin
+     * @return the upper right y-coordinate
+     */
 
     public float top(int margin) {
         return ury - margin;
     }
 
-/**
- * Returns the lower left y-coordinate, considering a given margin.
- *
- * @param        margin        a margin
- * @return        the lower left y-coordinate
- */
+    /**
+     * Returns the lower left y-coordinate, considering a given margin.
+     *
+     * @param margin a margin
+     * @return the lower left y-coordinate
+     */
 
     public float bottom(int margin) {
         return lly + margin;
     }
 
-/**
- * Returns the width of the rectangle.
- *
- * @return        a width
- */
+    /**
+     * Returns the width of the rectangle.
+     *
+     * @return a width
+     */
 
     public float width() {
         return urx - llx;
     }
 
-/**
- * Returns the height of the rectangle.
- *
- * @return        a height
- */
+    /**
+     * Returns the height of the rectangle.
+     *
+     * @return a height
+     */
 
     public float height() {
         return ury - lly;
     }
 
-/**
- * Swaps the values of urx and ury and of lly and llx in order to rotate the rectangle.
- *
- * @return        a PdfRectangle
- */
+    /**
+     * Swaps the values of urx and ury and of lly and llx in order to rotate the rectangle.
+     *
+     * @return a PdfRectangle
+     */
 
     public PdfRectangle rotate() {
         return new PdfRectangle(lly, llx, ury, urx, 0);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfRendition.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfRendition.java
index ecd577574..408958bd3 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfRendition.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfRendition.java
@@ -52,10 +52,11 @@
  * A Rendition dictionary (pdf spec 1.5)
  */
 public class PdfRendition extends PdfDictionary {
-     PdfRendition(String file, PdfFileSpecification fs, String mimeType) throws IOException{
-         put(PdfName.S, new PdfName("MR"));
-         put(PdfName.N, new PdfString("Rendition for "+file));
-         put(PdfName.C, new PdfMediaClipData(file, fs, mimeType));
-     }
+
+    PdfRendition(String file, PdfFileSpecification fs, String mimeType) throws IOException {
+        put(PdfName.S, new PdfName("MR"));
+        put(PdfName.N, new PdfString("Rendition for " + file));
+        put(PdfName.C, new PdfMediaClipData(file, fs, mimeType));
+    }
 
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfResources.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfResources.java
index 667ac0f03..5a17a2f22 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfResources.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfResources.java
@@ -51,40 +51,40 @@
 
 /**
  * PdfResources is the PDF Resources-object.
- * 
          
+ * 
          
  * The marking operations for drawing a page are stored in a stream that is the value of the
  * Contents key in the Page object's dictionary. Each marking context includes a list
- * of the named resources it uses. This resource list is stored as a dictionary that is the
- * value of the context's Resources key, and it serves two functions: it enumerates
- * the named resources in the contents stream, and it established the mapping from the names
- * to the objects used by the marking operations.
          
- * This object is described in the 'Portable Document Format Reference Manual version 1.3'
- * section 7.5 (page 195-197).
+ * of the named resources it uses. This resource list is stored as a dictionary that is the value of the context's
+ * Resources key, and it serves two functions: it enumerates the named resources in the contents stream, and it
+ * established the mapping from the names to the objects used by the marking operations.
           This object is described in
+ * the 'Portable Document Format Reference Manual version 1.3' section 7.5 (page 195-197).
  *
- * @see        PdfPage
+ * @see PdfPage
  */
 
 public class PdfResources extends PdfDictionary {
-    
+
     // constructor
-    
-/**
- * Constructs a PDF ResourcesDictionary.
- */
-    
+
+    /**
+     * Constructs a PDF ResourcesDictionary.
+     */
+
     public PdfResources() {
         super();
     }
-    
+
     // methods
-    
+
     void add(PdfName key, PdfDictionary resource) {
-        if (resource.size() == 0)
+        if (resource.size() == 0) {
             return;
+        }
         PdfDictionary dic = getAsDict(key);
-        if (dic == null)
+        if (dic == null) {
             put(key, resource);
-        else
+        } else {
             dic.putAll(resource);
+        }
     }
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfShading.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfShading.java
index 74553b5cb..634f22eae 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfShading.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfShading.java
@@ -49,99 +49,78 @@
 import com.lowagie.text.error_messages.MessageLocalization;
 import java.awt.Color;
 import java.io.IOException;
-/** Implements the shading dictionary (or stream).
+
+/**
+ * Implements the shading dictionary (or stream).
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class PdfShading {
 
     protected PdfDictionary shading;
-    
+
     protected PdfWriter writer;
-    
+
     protected int shadingType;
-    
+
     protected ColorDetails colorDetails;
-    
+
     protected PdfName shadingName;
-    
+
     protected PdfIndirectReference shadingReference;
-    
-    private Color cspace;
-    
-    /** Holds value of property bBox. */
+    /**
+     * Holds value of property bBox.
+     */
     protected float[] bBox;
-    
-    /** Holds value of property antiAlias. */
+    /**
+     * Holds value of property antiAlias.
+     */
     protected boolean antiAlias = false;
-    
-    /** Creates new PdfShading
-     * @param writer  the PdfWriter */
+    private Color cspace;
+
+    /**
+     * Creates new PdfShading
+     *
+     * @param writer the PdfWriter
+     */
     protected PdfShading(PdfWriter writer) {
         this.writer = writer;
     }
-    
-    protected void setColorSpace(Color color) {
-        cspace = color;
-        int type = ExtendedColor.getType(color);
-        PdfObject colorSpace = null;
-        switch (type) {
-            case ExtendedColor.TYPE_GRAY: {
-                colorSpace = PdfName.DEVICEGRAY;
-                break;
-            }
-            case ExtendedColor.TYPE_CMYK: {
-                colorSpace = PdfName.DEVICECMYK;
-                break;
-            }
-            case ExtendedColor.TYPE_SEPARATION: {
-                SpotColor spot = (SpotColor)color;
-                colorDetails = writer.addSimple(spot.getPdfSpotColor());
-                colorSpace = colorDetails.getIndirectReference();
-                break;
-            }
-            case ExtendedColor.TYPE_PATTERN:
-            case ExtendedColor.TYPE_SHADING:
-                throwColorSpaceError();
-                break;
-            default:
-                colorSpace = PdfName.DEVICERGB;
-                break;
-        }
-        shading.put(PdfName.COLORSPACE, colorSpace);
-    }
-    
-    public Color getColorSpace() {
-        return cspace;
-    }
-    
+
     public static void throwColorSpaceError() {
-        throw new IllegalArgumentException(MessageLocalization.getComposedMessage("a.tiling.or.shading.pattern.cannot.be.used.as.a.color.space.in.a.shading.pattern"));
+        throw new IllegalArgumentException(MessageLocalization.getComposedMessage(
+                "a.tiling.or.shading.pattern.cannot.be.used.as.a.color.space.in.a.shading.pattern"));
     }
-    
+
     public static void checkCompatibleColors(Color c1, Color c2) {
         int type1 = ExtendedColor.getType(c1);
         int type2 = ExtendedColor.getType(c2);
-        if (type1 != type2)
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("both.colors.must.be.of.the.same.type"));
-        if (type1 == ExtendedColor.TYPE_SEPARATION && ((SpotColor)c1).getPdfSpotColor() != ((SpotColor)c2).getPdfSpotColor())
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.spot.color.must.be.the.same.only.the.tint.can.vary"));
-        if (type1 == ExtendedColor.TYPE_PATTERN || type1 == ExtendedColor.TYPE_SHADING)
+        if (type1 != type2) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("both.colors.must.be.of.the.same.type"));
+        }
+        if (type1 == ExtendedColor.TYPE_SEPARATION
+                && ((SpotColor) c1).getPdfSpotColor() != ((SpotColor) c2).getPdfSpotColor()) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("the.spot.color.must.be.the.same.only.the.tint.can.vary"));
+        }
+        if (type1 == ExtendedColor.TYPE_PATTERN || type1 == ExtendedColor.TYPE_SHADING) {
             throwColorSpaceError();
+        }
     }
-    
+
     public static float[] getColorArray(Color color) {
         int type = ExtendedColor.getType(color);
         switch (type) {
             case ExtendedColor.TYPE_GRAY: {
-                return new float[]{((GrayColor)color).getGray()};
+                return new float[]{((GrayColor) color).getGray()};
             }
             case ExtendedColor.TYPE_CMYK: {
-                CMYKColor cmyk = (CMYKColor)color;
+                CMYKColor cmyk = (CMYKColor) color;
                 return new float[]{cmyk.getCyan(), cmyk.getMagenta(), cmyk.getYellow(), cmyk.getBlack()};
             }
             case ExtendedColor.TYPE_SEPARATION: {
-                return new float[]{((SpotColor)color).getTint()};
+                return new float[]{((SpotColor) color).getTint()};
             }
             case ExtendedColor.TYPE_RGB: {
                 return new float[]{color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f};
@@ -151,29 +130,34 @@ public static float[] getColorArray(Color color) {
         return null;
     }
 
-    public static PdfShading type1(PdfWriter writer, Color colorSpace, float[] domain, float[] tMatrix, PdfFunction function) {
+    public static PdfShading type1(PdfWriter writer, Color colorSpace, float[] domain, float[] tMatrix,
+            PdfFunction function) {
         PdfShading sp = new PdfShading(writer);
         sp.shading = new PdfDictionary();
         sp.shadingType = 1;
         sp.shading.put(PdfName.SHADINGTYPE, new PdfNumber(sp.shadingType));
         sp.setColorSpace(colorSpace);
-        if (domain != null)
+        if (domain != null) {
             sp.shading.put(PdfName.DOMAIN, new PdfArray(domain));
-        if (tMatrix != null)
+        }
+        if (tMatrix != null) {
             sp.shading.put(PdfName.MATRIX, new PdfArray(tMatrix));
+        }
         sp.shading.put(PdfName.FUNCTION, function.getReference());
         return sp;
     }
-    
-    public static PdfShading type2(PdfWriter writer, Color colorSpace, float[] coords, float[] domain, PdfFunction function, boolean[] extend) {
+
+    public static PdfShading type2(PdfWriter writer, Color colorSpace, float[] coords, float[] domain,
+            PdfFunction function, boolean[] extend) {
         PdfShading sp = new PdfShading(writer);
         sp.shading = new PdfDictionary();
         sp.shadingType = 2;
         sp.shading.put(PdfName.SHADINGTYPE, new PdfNumber(sp.shadingType));
         sp.setColorSpace(colorSpace);
         sp.shading.put(PdfName.COORDS, new PdfArray(coords));
-        if (domain != null)
+        if (domain != null) {
             sp.shading.put(PdfName.DOMAIN, new PdfArray(domain));
+        }
         sp.shading.put(PdfName.FUNCTION, function.getReference());
         if (extend != null && (extend[0] || extend[1])) {
             PdfArray array = new PdfArray(extend[0] ? PdfBoolean.PDFTRUE : PdfBoolean.PDFFALSE);
@@ -183,81 +167,127 @@ public static PdfShading type2(PdfWriter writer, Color colorSpace, float[] coord
         return sp;
     }
 
-    public static PdfShading type3(PdfWriter writer, Color colorSpace, float[] coords, float[] domain, PdfFunction function, boolean[] extend) {
+    public static PdfShading type3(PdfWriter writer, Color colorSpace, float[] coords, float[] domain,
+            PdfFunction function, boolean[] extend) {
         PdfShading sp = type2(writer, colorSpace, coords, domain, function, extend);
         sp.shadingType = 3;
         sp.shading.put(PdfName.SHADINGTYPE, new PdfNumber(sp.shadingType));
         return sp;
     }
-    
-    public static PdfShading simpleAxial(PdfWriter writer, float x0, float y0, float x1, float y1, Color startColor, Color endColor, boolean extendStart, boolean extendEnd) {
+
+    public static PdfShading simpleAxial(PdfWriter writer, float x0, float y0, float x1, float y1, Color startColor,
+            Color endColor, boolean extendStart, boolean extendEnd) {
         checkCompatibleColors(startColor, endColor);
         PdfFunction function = PdfFunction.type2(writer, new float[]{0, 1}, null, getColorArray(startColor),
-            getColorArray(endColor), 1);
-        return type2(writer, startColor, new float[]{x0, y0, x1, y1}, null, function, new boolean[]{extendStart, extendEnd});
+                getColorArray(endColor), 1);
+        return type2(writer, startColor, new float[]{x0, y0, x1, y1}, null, function,
+                new boolean[]{extendStart, extendEnd});
     }
-    
-    public static PdfShading simpleAxial(PdfWriter writer, float x0, float y0, float x1, float y1, Color startColor, Color endColor) {
+
+    public static PdfShading simpleAxial(PdfWriter writer, float x0, float y0, float x1, float y1, Color startColor,
+            Color endColor) {
         return simpleAxial(writer, x0, y0, x1, y1, startColor, endColor, true, true);
     }
-    
-    public static PdfShading simpleRadial(PdfWriter writer, float x0, float y0, float r0, float x1, float y1, float r1, Color startColor, Color endColor, boolean extendStart, boolean extendEnd) {
+
+    public static PdfShading simpleRadial(PdfWriter writer, float x0, float y0, float r0, float x1, float y1, float r1,
+            Color startColor, Color endColor, boolean extendStart, boolean extendEnd) {
         checkCompatibleColors(startColor, endColor);
         PdfFunction function = PdfFunction.type2(writer, new float[]{0, 1}, null, getColorArray(startColor),
-            getColorArray(endColor), 1);
-        return type3(writer, startColor, new float[]{x0, y0, r0, x1, y1, r1}, null, function, new boolean[]{extendStart, extendEnd});
+                getColorArray(endColor), 1);
+        return type3(writer, startColor, new float[]{x0, y0, r0, x1, y1, r1}, null, function,
+                new boolean[]{extendStart, extendEnd});
     }
 
-    public static PdfShading simpleRadial(PdfWriter writer, float x0, float y0, float r0, float x1, float y1, float r1, Color startColor, Color endColor) {
+    public static PdfShading simpleRadial(PdfWriter writer, float x0, float y0, float r0, float x1, float y1, float r1,
+            Color startColor, Color endColor) {
         return simpleRadial(writer, x0, y0, r0, x1, y1, r1, startColor, endColor, true, true);
     }
 
+    public Color getColorSpace() {
+        return cspace;
+    }
+
+    protected void setColorSpace(Color color) {
+        cspace = color;
+        int type = ExtendedColor.getType(color);
+        PdfObject colorSpace = null;
+        switch (type) {
+            case ExtendedColor.TYPE_GRAY: {
+                colorSpace = PdfName.DEVICEGRAY;
+                break;
+            }
+            case ExtendedColor.TYPE_CMYK: {
+                colorSpace = PdfName.DEVICECMYK;
+                break;
+            }
+            case ExtendedColor.TYPE_SEPARATION: {
+                SpotColor spot = (SpotColor) color;
+                colorDetails = writer.addSimple(spot.getPdfSpotColor());
+                colorSpace = colorDetails.getIndirectReference();
+                break;
+            }
+            case ExtendedColor.TYPE_PATTERN:
+            case ExtendedColor.TYPE_SHADING:
+                throwColorSpaceError();
+                break;
+            default:
+                colorSpace = PdfName.DEVICERGB;
+                break;
+        }
+        shading.put(PdfName.COLORSPACE, colorSpace);
+    }
+
     PdfName getShadingName() {
         return shadingName;
     }
-    
+
     PdfIndirectReference getShadingReference() {
-        if (shadingReference == null)
+        if (shadingReference == null) {
             shadingReference = writer.getPdfIndirectReference();
+        }
         return shadingReference;
     }
-    
+
     void setName(int number) {
         shadingName = new PdfName("Sh" + number);
     }
-    
+
     void addToBody() throws IOException {
-        if (bBox != null)
+        if (bBox != null) {
             shading.put(PdfName.BBOX, new PdfArray(bBox));
-        if (antiAlias)
+        }
+        if (antiAlias) {
             shading.put(PdfName.ANTIALIAS, PdfBoolean.PDFTRUE);
+        }
         writer.addToBody(shading, getShadingReference());
     }
-    
+
     PdfWriter getWriter() {
         return writer;
     }
-    
+
     ColorDetails getColorDetails() {
         return colorDetails;
     }
-    
+
     public float[] getBBox() {
         return bBox;
     }
-    
+
     public void setBBox(float[] bBox) {
-        if (bBox.length != 4)
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("bbox.must.be.a.4.element.array"));
+        if (bBox.length != 4) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("bbox.must.be.a.4.element.array"));
+        }
         this.bBox = bBox;
     }
-    
+
     public boolean isAntiAlias() {
         return antiAlias;
     }
-    
+
     public void setAntiAlias(boolean antiAlias) {
         this.antiAlias = antiAlias;
     }
-    
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfShadingPattern.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfShadingPattern.java
index 7f40e02ac..c5417c48e 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfShadingPattern.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfShadingPattern.java
@@ -46,32 +46,37 @@
  */
 package com.lowagie.text.pdf;
 
-import java.io.IOException;
 import com.lowagie.text.error_messages.MessageLocalization;
-/** Implements the shading pattern dictionary.
+import java.io.IOException;
+
+/**
+ * Implements the shading pattern dictionary.
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class PdfShadingPattern extends PdfDictionary {
 
     protected PdfShading shading;
-    
+
     protected PdfWriter writer;
 
     protected float[] matrix = {1, 0, 0, 1, 0, 0};
-    
+
     protected PdfName patternName;
 
     protected PdfIndirectReference patternReference;
 
-    /** Creates new PdfShadingPattern
-     * @param shading the shading */
+    /**
+     * Creates new PdfShadingPattern
+     *
+     * @param shading the shading
+     */
     public PdfShadingPattern(PdfShading shading) {
         writer = shading.getWriter();
         put(PdfName.PATTERNTYPE, new PdfNumber(2));
         this.shading = shading;
     }
-        
+
     PdfName getPatternName() {
         return patternName;
     }
@@ -79,41 +84,43 @@ PdfName getPatternName() {
     PdfName getShadingName() {
         return shading.getShadingName();
     }
-    
+
     PdfIndirectReference getPatternReference() {
-        if (patternReference == null)
+        if (patternReference == null) {
             patternReference = writer.getPdfIndirectReference();
+        }
         return patternReference;
     }
-    
+
     PdfIndirectReference getShadingReference() {
         return shading.getShadingReference();
     }
-    
+
     void setName(int number) {
         patternName = new PdfName("P" + number);
     }
-    
+
     void addToBody() throws IOException {
         put(PdfName.SHADING, getShadingReference());
         put(PdfName.MATRIX, new PdfArray(matrix));
         writer.addToBody(this, getPatternReference());
     }
-    
+
+    public float[] getMatrix() {
+        return matrix;
+    }
+
     public void setMatrix(float[] matrix) {
-        if (matrix.length != 6)
+        if (matrix.length != 6) {
             throw new RuntimeException(MessageLocalization.getComposedMessage("the.matrix.size.must.be.6"));
+        }
         this.matrix = matrix;
     }
-    
-    public float[] getMatrix() {
-        return matrix;
-    }
-    
+
     public PdfShading getShading() {
         return shading;
     }
-    
+
     ColorDetails getColorDetails() {
         return shading.getColorDetails();
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSigGenericPKCS.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSigGenericPKCS.java
index 0a294f041..6d3ea8533 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSigGenericPKCS.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSigGenericPKCS.java
@@ -47,34 +47,33 @@
 package com.lowagie.text.pdf;
 
 import com.lowagie.text.ExceptionConverter;
-
 import java.io.ByteArrayOutputStream;
 import java.security.PrivateKey;
 import java.security.cert.CRL;
 import java.security.cert.Certificate;
 
 
-
 /**
  * A signature dictionary representation for the standard filters.
  */
 public abstract class PdfSigGenericPKCS extends PdfSignature {
+
     /**
      * The hash algorithm, for example "SHA1"
-     */    
+     */
     protected String hashAlgorithm;
     /**
      * The crypto provider
-     */    
+     */
     protected String provider = null;
     /**
      * The class instance that calculates the PKCS#1 and PKCS#7
-     */    
+     */
     protected PdfPKCS7 pkcs;
     /**
      * The subject name in the signing certificate (the element "CN")
-     */    
-    protected String   name;
+     */
+    protected String name;
 
     private byte[] externalDigest;
     private byte[] externalRSAdata;
@@ -82,22 +81,25 @@ public abstract class PdfSigGenericPKCS extends PdfSignature {
 
     /**
      * Creates a generic standard filter.
-     * @param filter the filter name
+     *
+     * @param filter    the filter name
      * @param subFilter the sub-filter name
-     */    
+     */
     public PdfSigGenericPKCS(PdfName filter, PdfName subFilter) {
         super(filter, subFilter);
     }
 
     /**
      * Sets the crypto information to sign.
-     * @param privKey the private key
+     *
+     * @param privKey   the private key
      * @param certChain the certificate chain
-     * @param crlList the certificate revocation list. It can be null
-     */    
+     * @param crlList   the certificate revocation list. It can be null
+     */
     public void setSignInfo(PrivateKey privKey, Certificate[] certChain, CRL[] crlList) {
         try {
-            pkcs = new PdfPKCS7(privKey, certChain, crlList, hashAlgorithm, provider, PdfName.ADBE_PKCS7_SHA1.equals(get(PdfName.SUBFILTER)));
+            pkcs = new PdfPKCS7(privKey, certChain, crlList, hashAlgorithm, provider,
+                    PdfName.ADBE_PKCS7_SHA1.equals(get(PdfName.SUBFILTER)));
             pkcs.setExternalDigest(externalDigest, externalRSAdata, digestEncryptionAlgorithm);
             if (PdfName.ADBE_X509_RSA_SHA1.equals(get(PdfName.SUBFILTER))) {
                 ByteArrayOutputStream bout = new ByteArrayOutputStream();
@@ -107,28 +109,31 @@ public void setSignInfo(PrivateKey privKey, Certificate[] certChain, CRL[] crlLi
                 bout.close();
                 setCert(bout.toByteArray());
                 setContents(pkcs.getEncodedPKCS1());
-            }
-            else
+            } else {
                 setContents(pkcs.getEncodedPKCS7());
+            }
             name = PdfPKCS7.getSubjectFields(pkcs.getSigningCertificate()).getField("CN");
-            if (name != null)
+            if (name != null) {
                 put(PdfName.NAME, new PdfString(name, PdfObject.TEXT_UNICODE));
-            pkcs = new PdfPKCS7(privKey, certChain, crlList, hashAlgorithm, provider, PdfName.ADBE_PKCS7_SHA1.equals(get(PdfName.SUBFILTER)));
+            }
+            pkcs = new PdfPKCS7(privKey, certChain, crlList, hashAlgorithm, provider,
+                    PdfName.ADBE_PKCS7_SHA1.equals(get(PdfName.SUBFILTER)));
             pkcs.setExternalDigest(externalDigest, externalRSAdata, digestEncryptionAlgorithm);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
     }
 
     /**
      * Sets the digest/signature to an external calculated value.
-     * @param digest the digest. This is the actual signature
-     * @param RSAdata the extra data that goes into the data tag in PKCS#7
-     * @param digestEncryptionAlgorithm the encryption algorithm. It may must be null if the digest
-     * is also null. If the digest is not null
-     * then it may be "RSA" or "DSA"
-     */    
+     *
+     * @param digest                    the digest. This is the actual signature
+     * @param RSAdata                   the extra data that goes into the data tag in PKCS#7
+     * @param digestEncryptionAlgorithm the encryption algorithm. It may must be null if the
+     *                                  digest is also null. If the digest is
+     *                                  not
+     *                                  null then it may be "RSA" or "DSA"
+     */
     public void setExternalDigest(byte[] digest, byte[] RSAdata, String digestEncryptionAlgorithm) {
         externalDigest = digest;
         externalRSAdata = RSAdata;
@@ -137,39 +142,43 @@ public void setExternalDigest(byte[] digest, byte[] RSAdata, String digestEncryp
 
     /**
      * Gets the subject name in the signing certificate (the element "CN")
+     *
      * @return the subject name in the signing certificate (the element "CN")
-     */    
+     */
     public String getName() {
         return name;
     }
 
     /**
      * Gets the class instance that does the actual signing.
+     *
      * @return the class instance that does the actual signing
-     */    
+     */
     public PdfPKCS7 getSigner() {
         return pkcs;
     }
 
     /**
-     * Gets the signature content. This can be a PKCS#1 or a PKCS#7. It corresponds to
-     * the /Contents key.
+     * Gets the signature content. This can be a PKCS#1 or a PKCS#7. It corresponds to the /Contents key.
+     *
      * @return the signature content
-     */    
+     */
     public byte[] getSignerContents() {
-        if (PdfName.ADBE_X509_RSA_SHA1.equals(get(PdfName.SUBFILTER)))
+        if (PdfName.ADBE_X509_RSA_SHA1.equals(get(PdfName.SUBFILTER))) {
             return pkcs.getEncodedPKCS1();
-        else
+        } else {
             return pkcs.getEncodedPKCS7();
+        }
     }
 
     /**
      * Creates a standard filter of the type VeriSign.
-     */    
+     */
     public static class VeriSign extends PdfSigGenericPKCS {
+
         /**
          * The constructor for the default provider.
-         */        
+         */
         public VeriSign() {
             super(PdfName.VERISIGN_PPKVS, PdfName.ADBE_PKCS7_DETACHED);
             hashAlgorithm = "MD5";
@@ -178,8 +187,9 @@ public VeriSign() {
 
         /**
          * The constructor for an explicit provider.
+         *
          * @param provider the crypto provider
-         */        
+         */
         public VeriSign(String provider) {
             this();
             this.provider = provider;
@@ -188,11 +198,12 @@ public VeriSign(String provider) {
 
     /**
      * Creates a standard filter of the type self signed.
-     */    
+     */
     public static class PPKLite extends PdfSigGenericPKCS {
+
         /**
          * The constructor for the default provider.
-         */        
+         */
         public PPKLite() {
             super(PdfName.ADOBE_PPKLITE, PdfName.ADBE_X509_RSA_SHA1);
             hashAlgorithm = "SHA1";
@@ -201,8 +212,9 @@ public PPKLite() {
 
         /**
          * The constructor for an explicit provider.
+         *
          * @param provider the crypto provider
-         */        
+         */
         public PPKLite(String provider) {
             this();
             this.provider = provider;
@@ -211,11 +223,12 @@ public PPKLite(String provider) {
 
     /**
      * Creates a standard filter of the type Windows Certificate.
-     */    
+     */
     public static class PPKMS extends PdfSigGenericPKCS {
+
         /**
          * The constructor for the default provider.
-         */        
+         */
         public PPKMS() {
             super(PdfName.ADOBE_PPKMS, PdfName.ADBE_PKCS7_SHA1);
             hashAlgorithm = "SHA1";
@@ -223,8 +236,9 @@ public PPKMS() {
 
         /**
          * The constructor for an explicit provider.
+         *
          * @param provider the crypto provider
-         */        
+         */
         public PPKMS(String provider) {
             this();
             this.provider = provider;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignature.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignature.java
index 1bd39c67f..93eb07bcc 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignature.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignature.java
@@ -47,35 +47,41 @@
 
 package com.lowagie.text.pdf;
 
-/** Implements the signature dictionary.
+/**
+ * Implements the signature dictionary.
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class PdfSignature extends PdfDictionary {
 
-    /** Creates new PdfSignature
-     * @param filter the filter
-     * @param subFilter the sub filter */
+    /**
+     * Creates new PdfSignature
+     *
+     * @param filter    the filter
+     * @param subFilter the sub filter
+     */
     public PdfSignature(PdfName filter, PdfName subFilter) {
         super(PdfName.SIG);
         put(PdfName.FILTER, filter);
         put(PdfName.SUBFILTER, subFilter);
     }
-    
+
     public void setByteRange(int[] range) {
         PdfArray array = new PdfArray();
-        for (int i : range) array.add(new PdfNumber(i));
+        for (int i : range) {
+            array.add(new PdfNumber(i));
+        }
         put(PdfName.BYTERANGE, array);
     }
-    
+
     public void setContents(byte[] contents) {
         put(PdfName.CONTENTS, new PdfString(contents).setHexWriting(true));
     }
-    
+
     public void setCert(byte[] cert) {
         put(PdfName.CERT, new PdfString(cert));
     }
-    
+
     public void setName(String name) {
         put(PdfName.NAME, new PdfString(name, PdfObject.TEXT_UNICODE));
     }
@@ -91,15 +97,15 @@ public void setLocation(String name) {
     public void setReason(String name) {
         put(PdfName.REASON, new PdfString(name, PdfObject.TEXT_UNICODE));
     }
-    
+
     public void setContact(String name) {
         put(PdfName.CONTACTINFO, new PdfString(name, PdfObject.TEXT_UNICODE));
     }
-    
+
     /**
      * Return the build properties dictionary (PDF Dictionary name: Prop_Build)
-     *  
-     * @return the build properties dictionary 
+     *
+     * @return the build properties dictionary
      */
     public PdfSignatureBuildProperties getPdfSignatureBuildProperties() {
         PdfSignatureBuildProperties buildPropDic = (PdfSignatureBuildProperties) getAsDict(PdfName.PROP_BUILD);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureAppDataDict.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureAppDataDict.java
index b9c4226d7..3c7fb68e3 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureAppDataDict.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureAppDataDict.java
@@ -3,81 +3,79 @@
 import java.util.ArrayList;
 
 /**
- * 
- * The optional App dictionary which is part of the Build Properties Dictionary. 
- * 
- * @author Lonzak
+ * The optional App dictionary which is part of the Build Properties Dictionary.
  *
+ * @author Lonzak
  */
-public class PdfSignatureAppDataDict extends PdfDictionary{
-    
+public class PdfSignatureAppDataDict extends PdfDictionary {
+
     public PdfSignatureAppDataDict() {
     }
 
     /**
      * The name of the software module used to create the signature.
-     * 
+     *
      * @return the name of the software module used to create the signature.
      */
     public PdfName getName() {
-        return (PdfName)super.get(PdfName.NAME); 
+        return (PdfName) super.get(PdfName.NAME);
     }
 
     /**
      * The name of the software module used to create the signature.
-     * 
+     *
      * @param name sets the name of the software module used to create the signature.
      */
     public void setName(String name) {
-        if(name!=null && !name.trim().isEmpty()) {
+        if (name != null && !name.trim().isEmpty()) {
             super.put(PdfName.NAME, new PdfName(name));
         }
     }
 
     /**
-     * The software module build date. This string is normally produced by the compiler that is used to compile the software, 
-     * for example using the Date and Time preprocessor flags.
-     * 
+     * The software module build date. This string is normally produced by the compiler that is used to compile the
+     * software, for example using the Date and Time preprocessor flags.
+     *
      * @return The software module build date or null.
      */
     public PdfString getDate() {
-        return (PdfString)super.get(PdfName.DATE); 
+        return (PdfString) super.get(PdfName.DATE);
     }
 
     /**
-     * The software module build date. This string is normally produced by the compiler that is used to compile the software, 
-     * for example using the Date and Time preprocessor flags.
-     * 
-     * @param date Sets the software module build date 
+     * The software module build date. This string is normally produced by the compiler that is used to compile the
+     * software, for example using the Date and Time preprocessor flags.
+     *
+     * @param date Sets the software module build date
      */
     public void setDate(String date) {
-        if(date!=null && !date.trim().isEmpty()) {
+        if (date != null && !date.trim().isEmpty()) {
             super.put(PdfName.DATE, new PdfString(date, TEXT_UNICODE));
         }
     }
 
     /**
-     * The software module revision number. It is important that signature handlers and other software modules 
-     * specify a unique value for R for every publicly available build of the software. 
-     * If the module or handler is ever found to have been defective, for signatures where the value of PreRelease is false,
-     * the value of this attribute is likely to be the only way to detect that the signature was 
-     * created with the defective release. A sample value might be 0x00020014, for software module version 2, sub-build 0x14. 
-     * Various software modules may use this entry differently.
-     * 
+     * The software module revision number. It is important that signature handlers and other software modules specify a
+     * unique value for R for every publicly available build of the software. If the module or handler is ever found to
+     * have been defective, for signatures where the value of PreRelease is false, the value of this attribute is likely
+     * to be the only way to detect that the signature was created with the defective release. A sample value might be
+     * 0x00020014, for software module version 2, sub-build 0x14. Various software modules may use this entry
+     * differently.
+     *
      * @return The software module revision number or null.
      */
     public PdfNumber getR() {
-        return (PdfNumber)super.get(PdfName.R); 
+        return (PdfNumber) super.get(PdfName.R);
     }
 
     /**
-     * The software module revision number. It is important that signature handlers and other software modules 
-     * specify a unique value for R for every publicly available build of the software. 
-     * If the module or handler is ever found to have been defective, for signatures where the value of PreRelease is false,
-     * the value of this attribute is likely to be the only way to detect that the signature was 
-     * created with the defective release. A sample value might be 0x00020014, for software module version 2, sub-build 0x14. 
-     * Various software modules may use this entry differently.
-     * 
+     * The software module revision number. It is important that signature handlers and other software modules specify a
+     * unique value for R for every publicly available build of the software. If the module or handler is ever found to
+     * have been defective, for signatures where the value of PreRelease is false, the value of this attribute is likely
+     * to be the only way to detect that the signature was created with the defective release. A sample value might be
+     * 0x00020014, for software module version 2, sub-build 0x14. Various software modules may use this entry
+     * differently.
+     *
      * @param r sets the software module revision number
      */
     public void setR(int r) {
@@ -85,45 +83,46 @@ public void setR(int r) {
     }
 
     /**
-     * A flag that can be used by the signature handler or software module to indicate that this signature was 
-     * created with unreleased software. If true, this signature was created with pre-release or otherwise unreleased software.
+     * A flag that can be used by the signature handler or software module to indicate that this signature was created
+     * with unreleased software. If true, this signature was created with pre-release or otherwise unreleased software.
      * The default value is false
-     * 
+     *
      * @return true when an unreleased software was used to create the signature otherwise false or null;
      */
     public PdfBoolean getPreRelease() {
-        return (PdfBoolean)super.get(PdfName.PRERELEASE); 
+        return (PdfBoolean) super.get(PdfName.PRERELEASE);
     }
 
     /**
-     * A flag that can be used by the signature handler or software module to indicate that this signature was 
-     * created with unreleased software. If true, this signature was created with pre-release or otherwise unreleased software.
+     * A flag that can be used by the signature handler or software module to indicate that this signature was created
+     * with unreleased software. If true, this signature was created with pre-release or otherwise unreleased software.
      * The default value is false
-     * 
-     * @param preRelease sets the unreleased flag indicating whether the signature was created using an unreleased software
+     *
+     * @param preRelease sets the unreleased flag indicating whether the signature was created using an unreleased
+     *                   software
      */
     public void setPreRelease(boolean preRelease) {
         super.put(PdfName.PRERELEASE, new PdfBoolean(preRelease));
     }
 
     /**
-     * Indicates the operating system, such as Windows. 
-     * Currently there is no specific string format defined for the value of this attribute.
-     * 
+     * Indicates the operating system, such as Windows. Currently there is no specific string format defined for the
+     * value of this attribute.
+     *
      * @return the operating system or null.
      */
     public PdfArray getOs() {
-        return (PdfArray)super.get(PdfName.OS); 
+        return (PdfArray) super.get(PdfName.OS);
     }
 
     /**
-     * Indicates the operating system, such as Windows. 
-     * Currently there is no specific string format defined for the value of this attribute.
-     * 
+     * Indicates the operating system, such as Windows. Currently there is no specific string format defined for the
+     * value of this attribute.
+     *
      * @param os sets the operating system
      */
     public void setOs(String os) {
-        if(os!=null && !os.trim().isEmpty()) {
+        if (os != null && !os.trim().isEmpty()) {
             ArrayList operatingSystem = new ArrayList<>();
             operatingSystem.add(new PdfString(os));
             super.put(PdfName.OS, new PdfArray(operatingSystem));
@@ -131,71 +130,71 @@ public void setOs(String os) {
     }
 
     /**
-     * If there is a Legal dictionary in the catalog of the PDF file, and the NonEmbeddedFonts attribute 
-     * (which specifies the number of fonts not embedded) in that dictionary has a non-zero value, and the viewing 
-     * application has a preference set to suppress the display of the warning about fonts not being embedded, 
-     * then the value of this attribute will be set to true (meaning that no warning need be displayed).
-     * 
+     * If there is a Legal dictionary in the catalog of the PDF file, and the NonEmbeddedFonts attribute (which
+     * specifies the number of fonts not embedded) in that dictionary has a non-zero value, and the viewing application
+     * has a preference set to suppress the display of the warning about fonts not being embedded, then the value of
+     * this attribute will be set to true (meaning that no warning need be displayed).
+     *
      * @return true when no warning should be displayed otherwise false / null;
      */
     public PdfBoolean getNonEFontNoWarn() {
-        return (PdfBoolean)super.get(PdfName.NONEFONTNOWARN); 
+        return (PdfBoolean) super.get(PdfName.NONEFONTNOWARN);
     }
 
     /**
-     * If there is a Legal dictionary in the catalog of the PDF file, and the NonEmbeddedFonts attribute 
-     * (which specifies the number of fonts not embedded) in that dictionary has a non-zero value, and the viewing 
-     * application has a preference set to suppress the display of the warning about fonts not being embedded, 
-     * then the value of this attribute will be set to true (meaning that no warning need be displayed).
-     * 
-     * @param nonEFontNoWarn sets whether no warning should be displayed otherwise false; 
+     * If there is a Legal dictionary in the catalog of the PDF file, and the NonEmbeddedFonts attribute (which
+     * specifies the number of fonts not embedded) in that dictionary has a non-zero value, and the viewing application
+     * has a preference set to suppress the display of the warning about fonts not being embedded, then the value of
+     * this attribute will be set to true (meaning that no warning need be displayed).
+     *
+     * @param nonEFontNoWarn sets whether no warning should be displayed otherwise false;
      */
     public void setNonEFontNoWarn(boolean nonEFontNoWarn) {
         super.put(PdfName.NONEFONTNOWARN, new PdfBoolean(nonEFontNoWarn));
     }
 
     /**
-     * If the value is true, the application was in trusted mode when signing took place. The default value is false. 
-     * A viewing application is in trusted mode when only reviewed code is executing, where reviewed code is code that 
+     * If the value is true, the application was in trusted mode when signing took place. The default value is false. A
+     * viewing application is in trusted mode when only reviewed code is executing, where reviewed code is code that
      * does not affect the rendering of PDF files in ways that are not covered by the PDF Reference.
-     * 
+     *
      * @return if the application was in trusted mode when signing took place. Might also be null if not existent.
      */
     public PdfBoolean getTrustedMode() {
-        return (PdfBoolean)super.get(PdfName.TRUSTEDMODE); 
+        return (PdfBoolean) super.get(PdfName.TRUSTEDMODE);
     }
 
     /**
-     * If the value is true, the application was in trusted mode when signing took place. The default value is false. 
-     * A viewing application is in trusted mode when only reviewed code is executing, where reviewed code is code that 
+     * If the value is true, the application was in trusted mode when signing took place. The default value is false. A
+     * viewing application is in trusted mode when only reviewed code is executing, where reviewed code is code that
      * does not affect the rendering of PDF files in ways that are not covered by the PDF Reference.
-     * 
-     * @param trustedMode sets whether the application was in trusted mode when signing took place 
+     *
+     * @param trustedMode sets whether the application was in trusted mode when signing took place
      */
     public void setTrustedMode(boolean trustedMode) {
         super.put(PdfName.TRUSTEDMODE, new PdfBoolean(trustedMode));
     }
 
     /**
-     * A text string indicating the version of the application implementation, as described by the Name attribute in 
+     * A text string indicating the version of the application implementation, as described by the Name attribute in
      * this dictionary. When set by Adobe Acrobat, this entry is  in the format: major.minor.micro (for example 7.0.7).
-     * 
+     *
      * @return a text string indicating the version of the application implementation or null.
      */
     public PdfString getrEx() {
-        return (PdfString)super.get(PdfName.REX); 
+        return (PdfString) super.get(PdfName.REX);
     }
 
     /**
-     * A text string indicating the version of the application implementation, as described by the Name attribute in 
+     * A text string indicating the version of the application implementation, as described by the Name attribute in
      * this dictionary. When set by Adobe Acrobat, this entry is  in the format: major.minor.micro (for example 7.0.7).
-     * 
+     *
      * @param rEx sets a text string indicating the version of the application implementation
      */
     public void setrEx(String rEx) {
-        if(rEx!=null && !rEx.trim().isEmpty()) {
+        if (rEx != null && !rEx.trim().isEmpty()) {
             super.put(PdfName.REX, new PdfString(rEx, TEXT_UNICODE));
         }
     }
-    
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureAppearance.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureAppearance.java
index 4217672f4..35af798ac 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureAppearance.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureAppearance.java
@@ -48,6 +48,16 @@
  */
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.Chunk;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.Element;
+import com.lowagie.text.ExceptionConverter;
+import com.lowagie.text.Font;
+import com.lowagie.text.Image;
+import com.lowagie.text.Paragraph;
+import com.lowagie.text.Phrase;
+import com.lowagie.text.Rectangle;
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
@@ -65,1657 +75,1617 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.lowagie.text.Chunk;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.Element;
-
-import com.lowagie.text.Font;
-import com.lowagie.text.Image;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.Phrase;
-import com.lowagie.text.Rectangle;
-import com.lowagie.text.error_messages.MessageLocalization;
-import com.lowagie.text.ExceptionConverter;
-
 /**
- * This class takes care of the cryptographic options and appearances that form
- * a signature.
+ * This class takes care of the cryptographic options and appearances that form a signature.
  */
 public class PdfSignatureAppearance {
 
-  /**
-   * The rendering mode is just the description
-   */
-  public static final int SignatureRenderDescription = 0;
-  /**
-   * The rendering mode is the name of the signer and the description
-   */
-  public static final int SignatureRenderNameAndDescription = 1;
-  /**
-   * The rendering mode is an image and the description
-   */
-  public static final int SignatureRenderGraphicAndDescription = 2;
-  
-  /**
-   * The rendering mode is an image and the description
-   */
-  public static final int SignatureRenderGraphic = 3;
-
-  /**
-   * The self signed filter.
-   */
-  public static final PdfName SELF_SIGNED = PdfName.ADOBE_PPKLITE;
-  /**
-   * The VeriSign filter.
-   */
-  public static final PdfName VERISIGN_SIGNED = PdfName.VERISIGN_PPKVS;
-  /**
-   * The Windows Certificate Security.
-   */
-  public static final PdfName WINCER_SIGNED = PdfName.ADOBE_PPKMS;
-
-  public static final int NOT_CERTIFIED = -1;
-  public static final int CERTIFIED_ALL_CHANGES_ALLOWED = 0;
-  public static final int CERTIFIED_NO_CHANGES_ALLOWED = 1;
-  public static final int CERTIFIED_FORM_FILLING = 2;
-  public static final int CERTIFIED_FORM_FILLING_AND_ANNOTATIONS = 3;
-
-  private static final float TOP_SECTION = 0.3f;
-  private static final float MARGIN = 2;
-  private Rectangle rect;
-  private Rectangle pageRect;
-  private final PdfTemplate[] app = new PdfTemplate[5];
-  private PdfTemplate frm;
-  private final PdfStamperImp writer;
-  private String layer2Text;
-  private String reason;
-  private String location;
-  private Calendar signDate;
-  private String provider;
-  private int page = 1;
-  private String fieldName;
-  private PrivateKey privKey;
-  private CRL[] crlList;
-  private PdfName filter;
-  private boolean newField;
-  private ByteBuffer sigout;
-  private OutputStream originalout;
-  private File tempFile;
-  private PdfDictionary cryptoDictionary;
-  private PdfStamper stamper;
-  private boolean preClosed = false;
-  private PdfSigGenericPKCS sigStandard;
-  private long[] range;
-  private RandomAccessFile raf;
-  private byte[] bout;
-  private int boutLen;
-  private byte[] externalDigest;
-  private byte[] externalRSAdata;
-  private String digestEncryptionAlgorithm;
-  private Map exclusionLocations;
-
-  private Certificate[] certChain;
-
-  // ******************************************************************************
-
-  PdfSignatureAppearance(PdfStamperImp writer) {
-    this.writer = writer;
-    fieldName = getNewSigName();
-  }
-
-  private int render = SignatureRenderDescription;
-
-  /**
-   * Gets the rendering mode for this signature.
-   * 
-   * @return the rendering mode for this signature
-   */
-  public int getRender() {
-    return render;
-  }
-
-  /**
-   * Sets the rendering mode for this signature. The rendering modes can be the
-   * constants SignatureRenderDescription,
-   * SignatureRenderNameAndDescription or
-   * SignatureRenderGraphicAndDescription. The two last modes
-   * should be used with Acrobat 6 layer type.
-   * 
-   * @param render
-   *          the render mode
-   */
-  public void setRender(int render) {
-    this.render = render;
-  }
-
-  private Image signatureGraphic = null;
-
-  /**
-   * Gets the Image object to render.
-   * 
-   * @return the image
-   */
-  public Image getSignatureGraphic() {
-    return signatureGraphic;
-  }
-
-  /**
-   * Sets the Image object to render when Render is set to
-   * SignatureRenderGraphicAndDescription
-   * 
-   * @param signatureGraphic
-   *          image rendered. If null the mode is defaulted to
-   *          SignatureRenderDescription
-   */
-  public void setSignatureGraphic(Image signatureGraphic) {
-    this.signatureGraphic = signatureGraphic;
-  }
-
-  /**
-   * Sets the signature text identifying the signer.
-   * 
-   * @param text
-   *          the signature text identifying the signer. If null or
-   *          not set a standard description will be used
-   */
-  public void setLayer2Text(String text) {
-    layer2Text = text;
-  }
-
-  /**
-   * Gets the signature text identifying the signer if set by setLayer2Text().
-   * 
-   * @return the signature text identifying the signer
-   */
-  public String getLayer2Text() {
-    return layer2Text;
-  }
-
-  /**
-   * Sets the text identifying the signature status.
-   * 
-   * @param text
-   *          the text identifying the signature status. If null or
-   *          not set the description "Signature Not Verified" will be used
-   */
-  public void setLayer4Text(String text) {
-    layer4Text = text;
-  }
-
-  /**
-   * Gets the text identifying the signature status if set by setLayer4Text().
-   * 
-   * @return the text identifying the signature status
-   */
-  public String getLayer4Text() {
-    return layer4Text;
-  }
-
-  /**
-   * Gets the rectangle representing the signature dimensions.
-   * 
-   * @return the rectangle representing the signature dimensions. It may be
-   *         null or have zero width or height for invisible
-   *         signatures
-   */
-  public Rectangle getRect() {
-    return rect;
-  }
-
-  /**
-   * Gets the visibility status of the signature.
-   * 
-   * @return the visibility status of the signature
-   */
-  public boolean isInvisible() {
-    return (rect == null || rect.getWidth() == 0 || rect.getHeight() == 0);
-  }
-
-  /**
-   * Sets the cryptographic parameters.
-   * 
-   * @param privKey
-   *          the private key
-   * @param certificate
-   *          the certificate
-   * @param crl
-   *          the certificate revocation list. It may be null
-   * @param filter
-   *          the cryptographic filter type. It can be SELF_SIGNED,
-   *          VERISIGN_SIGNED or WINCER_SIGNED
-   */
-  public void setCrypto(PrivateKey privKey, X509Certificate certificate,
-      CRL crl, PdfName filter) {
-    this.privKey = privKey;
-    if (certificate == null)
-        throw new IllegalArgumentException("Null certificate not allowed");
-    this.certChain = new Certificate[1];
-    this.certChain[0] = certificate;
-    if (crl != null) {
-        this.crlList = new CRL[1];
-        this.crlList[0] = crl;        
-    }
-    this.filter = filter;
-  }
-
-  /**
-   * Sets the cryptographic parameters.
-   * @param privKey the private key
-   * @param certChain the certification chain
-   * @param crlList the crl list
-   * @param filter the PdfName
-   */
-  public void setCrypto(PrivateKey privKey, Certificate[] certChain, CRL[] crlList, PdfName filter) {
-      this.privKey = privKey;
-      this.certChain = certChain;
-      this.crlList = crlList;
-      this.filter = filter;
-  }
-
-  // OJO... Modificacion de
-  // flopez-------------------------------------------------
-  public void setVisibleSignature(Rectangle pageRect, int page) {
-    setVisibleSignature(pageRect, page, getNewSigName());
-  }
-
-  // ******************************************************************************
-
-  /**
-   * Sets the signature to be visible. It creates a new visible signature field.
-   * 
-   * @param pageRect
-   *          the position and dimension of the field in the page
-   * @param page
-   *          the page to place the field. The fist page is 1
-   * @param fieldName
-   *          the field name or null to generate automatically a
-   *          new field name
-   */
-  public void setVisibleSignature(Rectangle pageRect, int page, String fieldName) {
-    if (fieldName != null) {
-      if (fieldName.indexOf('.') >= 0)
-        throw new IllegalArgumentException(
-            MessageLocalization
-                .getComposedMessage("field.names.cannot.contain.a.dot"));
-      AcroFields af = writer.getAcroFields();
-      AcroFields.Item item = af.getFieldItem(fieldName);
-      if (item != null)
-        throw new IllegalArgumentException(
-            MessageLocalization.getComposedMessage(
-                "the.field.1.already.exists", fieldName));
-      this.fieldName = fieldName;
+    /**
+     * The rendering mode is just the description
+     */
+    public static final int SignatureRenderDescription = 0;
+    /**
+     * The rendering mode is the name of the signer and the description
+     */
+    public static final int SignatureRenderNameAndDescription = 1;
+    /**
+     * The rendering mode is an image and the description
+     */
+    public static final int SignatureRenderGraphicAndDescription = 2;
+
+    /**
+     * The rendering mode is an image and the description
+     */
+    public static final int SignatureRenderGraphic = 3;
+
+    /**
+     * The self signed filter.
+     */
+    public static final PdfName SELF_SIGNED = PdfName.ADOBE_PPKLITE;
+    /**
+     * The VeriSign filter.
+     */
+    public static final PdfName VERISIGN_SIGNED = PdfName.VERISIGN_PPKVS;
+    /**
+     * The Windows Certificate Security.
+     */
+    public static final PdfName WINCER_SIGNED = PdfName.ADOBE_PPKMS;
+
+    public static final int NOT_CERTIFIED = -1;
+    public static final int CERTIFIED_ALL_CHANGES_ALLOWED = 0;
+    public static final int CERTIFIED_NO_CHANGES_ALLOWED = 1;
+    public static final int CERTIFIED_FORM_FILLING = 2;
+    public static final int CERTIFIED_FORM_FILLING_AND_ANNOTATIONS = 3;
+    /**
+     * Commands to draw a yellow question mark in a stream content
+     */
+    public static final String questionMark = "% DSUnknown\n" + "q\n" + "1 G\n"
+            + "1 g\n" + "0.1 0 0 0.1 9 0 cm\n" + "0 J 0 j 4 M []0 d\n" + "1 i \n"
+            + "0 g\n" + "313 292 m\n" + "313 404 325 453 432 529 c\n"
+            + "478 561 504 597 504 645 c\n" + "504 736 440 760 391 760 c\n"
+            + "286 760 271 681 265 626 c\n" + "265 625 l\n" + "100 625 l\n"
+            + "100 828 253 898 381 898 c\n" + "451 898 679 878 679 650 c\n"
+            + "679 555 628 499 538 435 c\n" + "488 399 467 376 467 292 c\n"
+            + "313 292 l\n" + "h\n" + "308 214 170 -164 re\n" + "f\n" + "0.44 G\n"
+            + "1.2 w\n" + "1 1 0.4 rg\n" + "287 318 m\n"
+            + "287 430 299 479 406 555 c\n" + "451 587 478 623 478 671 c\n"
+            + "478 762 414 786 365 786 c\n" + "260 786 245 707 239 652 c\n"
+            + "239 651 l\n" + "74 651 l\n" + "74 854 227 924 355 924 c\n"
+            + "425 924 653 904 653 676 c\n" + "653 581 602 525 512 461 c\n"
+            + "462 425 441 402 441 318 c\n" + "287 318 l\n" + "h\n"
+            + "282 240 170 -164 re\n" + "B\n" + "Q\n";
+    private static final float TOP_SECTION = 0.3f;
+    private static final float MARGIN = 2;
+    private final PdfTemplate[] app = new PdfTemplate[5];
+    private final PdfStamperImp writer;
+    private Rectangle rect;
+    private Rectangle pageRect;
+    private PdfTemplate frm;
+    private String layer2Text;
+    private String reason;
+    private String location;
+    private Calendar signDate;
+    private String provider;
+    private int page = 1;
+    private String fieldName;
+    private PrivateKey privKey;
+    private CRL[] crlList;
+    private PdfName filter;
+    private boolean newField;
+    private ByteBuffer sigout;
+    private OutputStream originalout;
+    private File tempFile;
+    private PdfDictionary cryptoDictionary;
+    private PdfStamper stamper;
+    private boolean preClosed = false;
+    private PdfSigGenericPKCS sigStandard;
+    private long[] range;
+    private RandomAccessFile raf;
+    private byte[] bout;
+    private int boutLen;
+    private byte[] externalDigest;
+    private byte[] externalRSAdata;
+    private String digestEncryptionAlgorithm;
+    private Map exclusionLocations;
+
+    // ******************************************************************************
+    private Certificate[] certChain;
+    private int render = SignatureRenderDescription;
+    private Image signatureGraphic = null;
+    /**
+     * Holds value of property contact.
+     */
+    private String contact;
+    /**
+     * Holds value of property layer2Font.
+     */
+    private Font layer2Font;
+    /**
+     * Holds value of property layer4Text.
+     */
+    private String layer4Text;
+    /**
+     * Holds value of property acro6Layers.
+     */
+    private boolean acro6Layers;
+    /**
+     * Holds value of property runDirection.
+     */
+    private int runDirection = PdfWriter.RUN_DIRECTION_NO_BIDI;
+    /**
+     * Holds value of property signatureEvent.
+     */
+    private SignatureEvent signatureEvent;
+    /**
+     * Holds value of property image.
+     */
+    private Image image;
+    /**
+     * Holds value of property imageScale.
+     */
+    private float imageScale;
+    private int certificationLevel = NOT_CERTIFIED;
+
+    PdfSignatureAppearance(PdfStamperImp writer) {
+        this.writer = writer;
+        fieldName = getNewSigName();
     }
-    // OJO... Modificacion de
-    // flopez--------------------------------------------------
-    // if (page < 1 || page > writer.reader.getNumberOfPages())
-    if (page < 0 || page > writer.reader.getNumberOfPages())
-      throw new IllegalArgumentException(
-          MessageLocalization.getComposedMessage("invalid.page.number.1", page));
+
+    /**
+     * Fits the text to some rectangle adjusting the font size as needed.
+     *
+     * @param font         the font to use
+     * @param text         the text
+     * @param rect         the rectangle where the text must fit
+     * @param maxFontSize  the maximum font size
+     * @param runDirection the run direction
+     * @return the calculated font size that makes the text fit
+     */
+    public static float fitText(Font font, String text, Rectangle rect,
+            float maxFontSize, int runDirection) {
+        try {
+            ColumnText ct = null;
+            int status = 0;
+            if (maxFontSize <= 0) {
+                int cr = 0;
+                int lf = 0;
+                char[] t = text.toCharArray();
+                for (char c : t) {
+                    if (c == '\n') {
+                        ++lf;
+                    } else if (c == '\r') {
+                        ++cr;
+                    }
+                }
+                int minLines = Math.max(cr, lf) + 1;
+                maxFontSize = Math.abs(rect.getHeight()) / minLines - 0.001f;
+            }
+            font.setSize(maxFontSize);
+            Phrase ph = new Phrase(text, font);
+            ct = new ColumnText(null);
+            ct.setSimpleColumn(ph, rect.getLeft(), rect.getBottom(), rect.getRight(),
+                    rect.getTop(), maxFontSize, Element.ALIGN_LEFT);
+            ct.setRunDirection(runDirection);
+            status = ct.go(true);
+            if ((status & ColumnText.NO_MORE_TEXT) != 0) {
+                return maxFontSize;
+            }
+            float precision = 0.1f;
+            float min = 0;
+            float max = maxFontSize;
+            float size = maxFontSize;
+            for (int k = 0; k < 50; ++k) { // just in case it doesn't converge
+                size = (min + max) / 2;
+                ct = new ColumnText(null);
+                font.setSize(size);
+                ct.setSimpleColumn(new Phrase(text, font), rect.getLeft(),
+                        rect.getBottom(), rect.getRight(), rect.getTop(), size,
+                        Element.ALIGN_LEFT);
+                ct.setRunDirection(runDirection);
+                status = ct.go(true);
+                if ((status & ColumnText.NO_MORE_TEXT) != 0) {
+                    if (max - min < size * precision) {
+                        return size;
+                    }
+                    min = size;
+                } else {
+                    max = size;
+                }
+            }
+            return size;
+        } catch (Exception e) {
+            throw new ExceptionConverter(e);
+        }
+    }
+
+    /**
+     * Gets the rendering mode for this signature.
+     *
+     * @return the rendering mode for this signature
+     */
+    public int getRender() {
+        return render;
+    }
+
+    /**
+     * Sets the rendering mode for this signature. The rendering modes can be the constants
+     * SignatureRenderDescription,
+     * SignatureRenderNameAndDescription or
+     * SignatureRenderGraphicAndDescription. The two last modes
+     * should be used with Acrobat 6 layer type.
+     *
+     * @param render the render mode
+     */
+    public void setRender(int render) {
+        this.render = render;
+    }
+
     // ******************************************************************************
-    this.pageRect = new Rectangle(pageRect);
-    this.pageRect.normalize();
-    rect = new Rectangle(this.pageRect.getWidth(), this.pageRect.getHeight());
-    this.page = page;
-    newField = true;
-  }
-
-  /**
-   * Sets the signature to be visible. An empty signature field with the same
-   * name must already exist.
-   * 
-   * @param fieldName
-   *          the existing empty signature field name
-   */
-  public void setVisibleSignature(String fieldName) {
-    AcroFields af = writer.getAcroFields();
-    AcroFields.Item item = af.getFieldItem(fieldName);
-    if (item == null)
-      throw new IllegalArgumentException(
-          MessageLocalization.getComposedMessage("the.field.1.does.not.exist",
-              fieldName));
-    PdfDictionary merged = item.getMerged(0);
-    if (!PdfName.SIG.equals(PdfReader.getPdfObject(merged.get(PdfName.FT))))
-      throw new IllegalArgumentException(
-          MessageLocalization.getComposedMessage(
-              "the.field.1.is.not.a.signature.field", fieldName));
-    this.fieldName = fieldName;
-    PdfArray r = merged.getAsArray(PdfName.RECT);
-    float llx = r.getAsNumber(0).floatValue();
-    float lly = r.getAsNumber(1).floatValue();
-    float urx = r.getAsNumber(2).floatValue();
-    float ury = r.getAsNumber(3).floatValue();
-    pageRect = new Rectangle(llx, lly, urx, ury);
-    pageRect.normalize();
-    page = item.getPage(0);
-    int rotation = writer.reader.getPageRotation(page);
-    Rectangle pageSize = writer.reader.getPageSizeWithRotation(page);
-    switch (rotation) {
-    case 90:
-      pageRect = new Rectangle(pageRect.getBottom(), pageSize.getTop()
-          - pageRect.getLeft(), pageRect.getTop(), pageSize.getTop()
-          - pageRect.getRight());
-      break;
-    case 180:
-      pageRect = new Rectangle(pageSize.getRight() - pageRect.getLeft(),
-          pageSize.getTop() - pageRect.getBottom(), pageSize.getRight()
-              - pageRect.getRight(), pageSize.getTop() - pageRect.getTop());
-      break;
-    case 270:
-      pageRect = new Rectangle(pageSize.getRight() - pageRect.getBottom(),
-          pageRect.getLeft(), pageSize.getRight() - pageRect.getTop(),
-          pageRect.getRight());
-      break;
-    }
-    if (rotation != 0)
-      pageRect.normalize();
-    rect = new Rectangle(this.pageRect.getWidth(), this.pageRect.getHeight());
-  }
-
-  /**
-   * Gets a template layer to create a signature appearance. The layers can go
-   * from 0 to 4.
-   * 
          
-   * Consult PPKAppearances.pdf for further details.
-   * 
-   * @param layer
-   *          the layer
-   * @return a template
-   */
-  public PdfTemplate getLayer(int layer) {
-    if (layer < 0 || layer >= app.length)
-      return null;
-    PdfTemplate t = app[layer];
-    if (t == null) {
-      t = app[layer] = new PdfTemplate(writer);
-      t.setBoundingBox(rect);
-      writer.addDirectTemplateSimple(t, new PdfName("n" + layer));
-    }
-    return t;
-  }
-
-  /**
-   * Gets the template that aggregates all appearance layers. This corresponds
-   * to the /FRM resource.
-   * 
          
-   * Consult PPKAppearances.pdf for further details.
-   * 
-   * @return the template that aggregates all appearance layers
-   */
-  public PdfTemplate getTopLayer() {
-    if (frm == null) {
-      frm = new PdfTemplate(writer);
-      frm.setBoundingBox(rect);
-      writer.addDirectTemplateSimple(frm, new PdfName("FRM"));
-    }
-    return frm;
-  }
-
-  /**
-   * Gets the main appearance layer.
-   * 
          
-   * Consult PPKAppearances.pdf for further details.
-   * 
-   * @return the main appearance layer
-   * @throws DocumentException
-   *           on error
-   */
-  public PdfTemplate getAppearance() throws DocumentException {
-    if (isInvisible()) {
-      PdfTemplate t = new PdfTemplate(writer);
-      t.setBoundingBox(new Rectangle(0, 0));
-      writer.addDirectTemplateSimple(t, null);
-      return t;
-    }
-    if (app[0] == null) {
-      PdfTemplate t = app[0] = new PdfTemplate(writer);
-      t.setBoundingBox(new Rectangle(100, 100));
-      writer.addDirectTemplateSimple(t, new PdfName("n0"));
-      t.setLiteral("% DSBlank\n");
-    }
-    if (app[1] == null && !acro6Layers) {
-      PdfTemplate t = app[1] = new PdfTemplate(writer);
-      t.setBoundingBox(new Rectangle(100, 100));
-      writer.addDirectTemplateSimple(t, new PdfName("n1"));
-      t.setLiteral(questionMark);
-    }
-    if (app[2] == null) {
-      String text;
-      if (layer2Text == null) {
-        StringBuilder buf = new StringBuilder();
-        buf.append("Digitally signed by ")
-            .append(PdfPKCS7.getSubjectFields((X509Certificate) certChain[0]).getField("CN"))
-            .append('\n');
-        SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss z");
-        buf.append("Date: ").append(sd.format(getSignDateNullSafe().getTime()));
-        if (reason != null)
-          buf.append('\n').append("Reason: ").append(reason);
-        if (location != null)
-          buf.append('\n').append("Location: ").append(location);
-        text = buf.toString();
-      } else
-        text = layer2Text;
-      PdfTemplate t = app[2] = new PdfTemplate(writer);
-      t.setBoundingBox(rect);
-      writer.addDirectTemplateSimple(t, new PdfName("n2"));
-      if (image != null) {
-        if (imageScale == 0) {
-          t.addImage(image, rect.getWidth(), 0, 0, rect.getHeight(), 0, 0);
-        } else {
-          float usableScale = imageScale;
-          if (imageScale < 0)
-            usableScale = Math.min(rect.getWidth() / image.getWidth(),
-                rect.getHeight() / image.getHeight());
-          float w = image.getWidth() * usableScale;
-          float h = image.getHeight() * usableScale;
-          float x = (rect.getWidth() - w) / 2;
-          float y = (rect.getHeight() - h) / 2;
-          t.addImage(image, w, 0, 0, h, x, y);
+
+    /**
+     * Gets the Image object to render.
+     *
+     * @return the image
+     */
+    public Image getSignatureGraphic() {
+        return signatureGraphic;
+    }
+
+    /**
+     * Sets the Image object to render when Render is set to
+     * SignatureRenderGraphicAndDescription
+     *
+     * @param signatureGraphic image rendered. If null the mode is defaulted to
+     *                         SignatureRenderDescription
+     */
+    public void setSignatureGraphic(Image signatureGraphic) {
+        this.signatureGraphic = signatureGraphic;
+    }
+
+    /**
+     * Gets the signature text identifying the signer if set by setLayer2Text().
+     *
+     * @return the signature text identifying the signer
+     */
+    public String getLayer2Text() {
+        return layer2Text;
+    }
+
+    /**
+     * Sets the signature text identifying the signer.
+     *
+     * @param text the signature text identifying the signer. If null or not set a standard description
+     *             will be used
+     */
+    public void setLayer2Text(String text) {
+        layer2Text = text;
+    }
+
+    /**
+     * Gets the text identifying the signature status if set by setLayer4Text().
+     *
+     * @return the text identifying the signature status
+     */
+    public String getLayer4Text() {
+        return layer4Text;
+    }
+
+    /**
+     * Sets the text identifying the signature status.
+     *
+     * @param text the text identifying the signature status. If null or not set the description "Signature
+     *             Not Verified" will be used
+     */
+    public void setLayer4Text(String text) {
+        layer4Text = text;
+    }
+
+    /**
+     * Gets the rectangle representing the signature dimensions.
+     *
+     * @return the rectangle representing the signature dimensions. It may be
+     * null or have zero width or height for invisible
+     * signatures
+     */
+    public Rectangle getRect() {
+        return rect;
+    }
+
+    /**
+     * Gets the visibility status of the signature.
+     *
+     * @return the visibility status of the signature
+     */
+    public boolean isInvisible() {
+        return (rect == null || rect.getWidth() == 0 || rect.getHeight() == 0);
+    }
+
+    /**
+     * Sets the cryptographic parameters.
+     *
+     * @param privKey     the private key
+     * @param certificate the certificate
+     * @param crl         the certificate revocation list. It may be null
+     * @param filter      the cryptographic filter type. It can be SELF_SIGNED, VERISIGN_SIGNED or WINCER_SIGNED
+     */
+    public void setCrypto(PrivateKey privKey, X509Certificate certificate,
+            CRL crl, PdfName filter) {
+        this.privKey = privKey;
+        if (certificate == null) {
+            throw new IllegalArgumentException("Null certificate not allowed");
         }
-      }
-      Font font;
-      if (layer2Font == null)
-        font = new Font();
-      else
-        font = new Font(layer2Font);
-      float size = font.getSize();
-
-      Rectangle dataRect = null;
-      Rectangle signatureRect = null;
-
-      if (render == SignatureRenderNameAndDescription
-          || (render == SignatureRenderGraphicAndDescription && this.signatureGraphic != null)) {
-        // origin is the bottom-left
-        signatureRect = new Rectangle(MARGIN, MARGIN, rect.getWidth() / 2
-            - MARGIN, rect.getHeight() - MARGIN);
-        dataRect = new Rectangle(rect.getWidth() / 2 + MARGIN / 2, MARGIN,
-            rect.getWidth() - MARGIN / 2, rect.getHeight() - MARGIN);
-
-        if (rect.getHeight() > rect.getWidth()) {
-          signatureRect = new Rectangle(MARGIN, rect.getHeight() / 2,
-              rect.getWidth() - MARGIN, rect.getHeight());
-          dataRect = new Rectangle(MARGIN, MARGIN, rect.getWidth() - MARGIN,
-              rect.getHeight() / 2 - MARGIN);
+        this.certChain = new Certificate[1];
+        this.certChain[0] = certificate;
+        if (crl != null) {
+            this.crlList = new CRL[1];
+            this.crlList[0] = crl;
         }
-      } 
-      else if (this.render == SignatureRenderGraphic) {
-          if (this.signatureGraphic == null) {
-              throw new IllegalArgumentException("Missing signature image for renderingmode: "+this.render);
-          }
-          signatureRect = new Rectangle(
-                  MARGIN,
-                  MARGIN,
-                  rect.getWidth() - MARGIN,
-                  rect.getHeight() - MARGIN);
-      } 
-      else {
-        dataRect = new Rectangle(MARGIN, MARGIN, rect.getWidth() - MARGIN,
-            rect.getHeight() * (1 - TOP_SECTION) - MARGIN);
-      }
-
-      if (render == SignatureRenderNameAndDescription) {
-        String signedBy = PdfPKCS7.getSubjectFields((X509Certificate) certChain[0]).getField("CN");
-        Rectangle sr2 = new Rectangle(signatureRect.getWidth() - MARGIN,
-            signatureRect.getHeight() - MARGIN);
-        float signedSize = fitText(font, signedBy, sr2, -1, runDirection);
-
-        ColumnText ct2 = new ColumnText(t);
-        ct2.setRunDirection(runDirection);
-        ct2.setSimpleColumn(new Phrase(signedBy, font),
-            signatureRect.getLeft(), signatureRect.getBottom(),
-            signatureRect.getRight(), signatureRect.getTop(), signedSize,
-            Element.ALIGN_LEFT);
-
-        ct2.go();
-      } else if (render == SignatureRenderGraphicAndDescription) {
-        ColumnText ct2 = new ColumnText(t);
-        ct2.setRunDirection(runDirection);
-        ct2.setSimpleColumn(signatureRect.getLeft(), signatureRect.getBottom(),
-            signatureRect.getRight(), signatureRect.getTop(), 0,
-            Element.ALIGN_RIGHT);
-
-        Image im = Image.getInstance(signatureGraphic);
-        im.scaleToFit(signatureRect.getWidth(), signatureRect.getHeight());
-
-        Paragraph p = new Paragraph();
-        // must calculate the point to draw from to make image appear in middle
-        // of column
-        float x = 0;
-        // experimentation found this magic number to counteract Adobe's
-        // signature graphic, which
-        // offsets the y co-ordinate by 15 units
-        float y = -im.getScaledHeight() + 15;
-
-        x = x + (signatureRect.getWidth() - im.getScaledWidth()) / 2;
-        y = y - (signatureRect.getHeight() - im.getScaledHeight()) / 2;
-        p.add(new Chunk(im, x
-            + (signatureRect.getWidth() - im.getScaledWidth()) / 2, y, false));
-        ct2.addElement(p);
-        ct2.go();
-      }
-      else if (this.render == SignatureRenderGraphic) {
-          ColumnText ct2 = new ColumnText(t);
-          ct2.setRunDirection(this.runDirection);
-          ct2.setSimpleColumn(signatureRect.getLeft(), signatureRect.getBottom(), signatureRect.getRight(), signatureRect.getTop(), 0, Element.ALIGN_RIGHT);
-
-          Image im = Image.getInstance(this.signatureGraphic);
-          im.scaleToFit(signatureRect.getWidth(), signatureRect.getHeight());
-
-          Paragraph p = new Paragraph(signatureRect.getHeight());
-          // must calculate the point to draw from, to make image appear in the middle of the column
-          float x = (signatureRect.getWidth() - im.getScaledWidth()) / 2f;
-          float y = (signatureRect.getHeight() - im.getScaledHeight()) / 2f;
-          
-          p.add(new Chunk(im, x, y, false));
-          
-          ct2.addElement(p);
-          ct2.go();
-      }
-      
-      if(this.render!=SignatureRenderGraphic) {
-          if (size <= 0) {
-              Rectangle sr = new Rectangle(dataRect.getWidth(), dataRect.getHeight());
-              size = fitText(font, text, sr, 12, runDirection);
-          }
-          ColumnText ct = new ColumnText(t);
-          ct.setRunDirection(runDirection);
-          ct.setSimpleColumn(new Phrase(text, font), dataRect.getLeft(), dataRect.getBottom(), dataRect.getRight(), dataRect.getTop(), size, Element.ALIGN_LEFT);
-          ct.go();
-      }
-    }
-    if (app[3] == null && !acro6Layers) {
-      PdfTemplate t = app[3] = new PdfTemplate(writer);
-      t.setBoundingBox(new Rectangle(100, 100));
-      writer.addDirectTemplateSimple(t, new PdfName("n3"));
-      t.setLiteral("% DSBlank\n");
-    }
-    if (app[4] == null && !acro6Layers) {
-      PdfTemplate t = app[4] = new PdfTemplate(writer);
-      t.setBoundingBox(new Rectangle(0, rect.getHeight() * (1 - TOP_SECTION),
-          rect.getRight(), rect.getTop()));
-      writer.addDirectTemplateSimple(t, new PdfName("n4"));
-      Font font;
-      if (layer2Font == null)
-        font = new Font();
-      else
-        font = new Font(layer2Font);
-      float size = font.getSize();
-      String text = "Signature Not Verified";
-      if (layer4Text != null)
-        text = layer4Text;
-      Rectangle sr = new Rectangle(rect.getWidth() - 2 * MARGIN,
-          rect.getHeight() * TOP_SECTION - 2 * MARGIN);
-      size = fitText(font, text, sr, 15, runDirection);
-      ColumnText ct = new ColumnText(t);
-      ct.setRunDirection(runDirection);
-      ct.setSimpleColumn(new Phrase(text, font), MARGIN, 0, rect.getWidth()
-          - MARGIN, rect.getHeight() - MARGIN, size, Element.ALIGN_LEFT);
-      ct.go();
-    }
-    int rotation = writer.reader.getPageRotation(page);
-    Rectangle rotated = new Rectangle(rect);
-    int n = rotation;
-    while (n > 0) {
-      rotated = rotated.rotate();
-      n -= 90;
-    }
-    if (frm == null) {
-      frm = new PdfTemplate(writer);
-      frm.setBoundingBox(rotated);
-      writer.addDirectTemplateSimple(frm, new PdfName("FRM"));
-      float scale = Math.min(rect.getWidth(), rect.getHeight()) * 0.9f;
-      float x = (rect.getWidth() - scale) / 2;
-      float y = (rect.getHeight() - scale) / 2;
-      scale /= 100;
-      if (rotation == 90)
-        frm.concatCTM(0, 1, -1, 0, rect.getHeight(), 0);
-      else if (rotation == 180)
-        frm.concatCTM(-1, 0, 0, -1, rect.getWidth(), rect.getHeight());
-      else if (rotation == 270)
-        frm.concatCTM(0, -1, 1, 0, 0, rect.getWidth());
-      frm.addTemplate(app[0], 0, 0);
-      if (!acro6Layers)
-        frm.addTemplate(app[1], scale, 0, 0, scale, x, y);
-      frm.addTemplate(app[2], 0, 0);
-      if (!acro6Layers) {
-        frm.addTemplate(app[3], scale, 0, 0, scale, x, y);
-        frm.addTemplate(app[4], 0, 0);
-      }
-    }
-    PdfTemplate napp = new PdfTemplate(writer);
-    napp.setBoundingBox(rotated);
-    writer.addDirectTemplateSimple(napp, null);
-    napp.addTemplate(frm, 0, 0);
-    return napp;
-  }
-
-  /**
-   * Fits the text to some rectangle adjusting the font size as needed.
-   * 
-   * @param font
-   *          the font to use
-   * @param text
-   *          the text
-   * @param rect
-   *          the rectangle where the text must fit
-   * @param maxFontSize
-   *          the maximum font size
-   * @param runDirection
-   *          the run direction
-   * @return the calculated font size that makes the text fit
-   */
-  public static float fitText(Font font, String text, Rectangle rect,
-      float maxFontSize, int runDirection) {
-    try {
-      ColumnText ct = null;
-      int status = 0;
-      if (maxFontSize <= 0) {
-        int cr = 0;
-        int lf = 0;
-        char[] t = text.toCharArray();
-          for (char c : t) {
-              if (c == '\n')
-                  ++lf;
-              else if (c == '\r')
-                  ++cr;
-          }
-        int minLines = Math.max(cr, lf) + 1;
-        maxFontSize = Math.abs(rect.getHeight()) / minLines - 0.001f;
-      }
-      font.setSize(maxFontSize);
-      Phrase ph = new Phrase(text, font);
-      ct = new ColumnText(null);
-      ct.setSimpleColumn(ph, rect.getLeft(), rect.getBottom(), rect.getRight(),
-          rect.getTop(), maxFontSize, Element.ALIGN_LEFT);
-      ct.setRunDirection(runDirection);
-      status = ct.go(true);
-      if ((status & ColumnText.NO_MORE_TEXT) != 0)
-        return maxFontSize;
-      float precision = 0.1f;
-      float min = 0;
-      float max = maxFontSize;
-      float size = maxFontSize;
-      for (int k = 0; k < 50; ++k) { // just in case it doesn't converge
-        size = (min + max) / 2;
-        ct = new ColumnText(null);
-        font.setSize(size);
-        ct.setSimpleColumn(new Phrase(text, font), rect.getLeft(),
-            rect.getBottom(), rect.getRight(), rect.getTop(), size,
-            Element.ALIGN_LEFT);
-        ct.setRunDirection(runDirection);
-        status = ct.go(true);
-        if ((status & ColumnText.NO_MORE_TEXT) != 0) {
-          if (max - min < size * precision)
-            return size;
-          min = size;
-        } else
-          max = size;
-      }
-      return size;
-    } catch (Exception e) {
-      throw new ExceptionConverter(e);
-    }
-  }
-
-  /**
-   * Sets the digest/signature to an external calculated value.
-   * 
-   * @param digest
-   *          the digest. This is the actual signature
-   * @param RSAdata
-   *          the extra data that goes into the data tag in PKCS#7
-   * @param digestEncryptionAlgorithm
-   *          the encryption algorithm. It may must be null if the
-   *          digest is also null. If the
-   *          digest is not null then it may be "RSA"
-   *          or "DSA"
-   */
-  public void setExternalDigest(byte[] digest, byte[] RSAdata,
-                                String digestEncryptionAlgorithm) {
-    externalDigest = digest;
-    externalRSAdata = RSAdata;
-    this.digestEncryptionAlgorithm = digestEncryptionAlgorithm;
-  }
-
-  /**
-   * Gets the signing reason or null if not set.
-   * 
-   * @return the signing reason
-   */
-  public String getReason() {
-    return this.reason;
-  }
-
-  /**
-   * Sets the signing reason.
-   * 
-   * @param reason
-   *          the signing reason
-   */
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  /**
-   * Gets the signing location or null if not set.
-   * 
-   * @return the signing location
-   */
-  public String getLocation() {
-    return this.location;
-  }
-
-  /**
-   * Sets the signing location.
-   * 
-   * @param location
-   *          the signing location
-   */
-  public void setLocation(String location) {
-    this.location = location;
-  }
-
-  /**
-   * Returns the Cryptographic Service Provider that will sign the document.
-   * This method might return null if the provider was not set.
-   * 
-   * @return provider the name of the provider, for example "SUN", or
-   *         null to use the default provider.
-   */
-  public String getProvider() {
-    return this.provider;
-  }
-
-  /**
-   * Sets the Cryptographic Service Provider that will sign the document.
-   *
-   * @param provider
-   *          the name of the provider, for example "SUN", or null
-   *          to use the default provider.
-   */
-  public void setProvider(String provider) {
-    this.provider = provider;
-  }
-
-  /**
-   * Gets the private key.
-   * 
-   * @return the private key
-   */
-  public java.security.PrivateKey getPrivKey() {
-    return privKey;
-  }
-
-  /**
-   * Gets the certificate revocation list.
-   * 
-   * @return the certificate revocation list
-   */
-  public java.security.cert.CRL[] getCrlList() {
-    return this.crlList;
-  }
-
-  /**
-   * Gets the filter used to sign the document.
-   * 
-   * @return the filter used to sign the document
-   */
-  public com.lowagie.text.pdf.PdfName getFilter() {
-    return filter;
-  }
-
-  /**
-   * Checks if a new field was created.
-   * 
-   * @return true if a new field was created, false if
-   *         signing an existing field or if the signature is invisible
-   */
-  public boolean isNewField() {
-    return this.newField;
-  }
-
-  /**
-   * Gets the page number of the field.
-   * 
-   * @return the page number of the field
-   */
-  public int getPage() {
-    return page;
-  }
-
-  /**
-   * Gets the field name.
-   * 
-   * @return the field name
-   */
-  public java.lang.String getFieldName() {
-    return fieldName;
-  }
-  
-  /**
-   * Sets the field name for a new invisible signature field 
-   * @param fieldName for the new invisible signature field
-   */    
-  public void setFieldNameForInvisibleSignatures(String fieldName) {
-      this.fieldName=fieldName;
-  }
-
-  /**
-   * Gets the rectangle that represent the position and dimension of the
-   * signature in the page.
-   * 
-   * @return the rectangle that represent the position and dimension of the
-   *         signature in the page
-   */
-  public com.lowagie.text.Rectangle getPageRect() {
-    return pageRect;
-  }
-
-  /**
-   * Gets the signature date.
-   * 
-   * @return the signature date
-   */
-  public java.util.Calendar getSignDate() {
-    return signDate;
-  }
-
-  /**
-   * Sets the signature date.
-   * 
-   * @param signDate
-   *          the signature date
-   */
-  public void setSignDate(java.util.Calendar signDate) {
-    this.signDate = signDate;
-  }
-  
-  /**
-   * Gets the signature date. If the date is not set the current Date is returned.
-   * @return the signature date
-   */    
-  public java.util.Calendar getSignDateNullSafe() {
-      if(this.signDate==null) {
-          return new GregorianCalendar();
-      }
-      return this.signDate;
-  }
-
-  com.lowagie.text.pdf.ByteBuffer getSigout() {
-    return sigout;
-  }
-
-  void setSigout(com.lowagie.text.pdf.ByteBuffer sigout) {
-    this.sigout = sigout;
-  }
-
-  java.io.OutputStream getOriginalout() {
-    return originalout;
-  }
-
-  void setOriginalout(java.io.OutputStream originalout) {
-    this.originalout = originalout;
-  }
-
-  /**
-   * Gets the temporary file.
-   * 
-   * @return the temporary file or null is the document is created
-   *         in memory
-   */
-  public java.io.File getTempFile() {
-    return tempFile;
-  }
-
-  void setTempFile(java.io.File tempFile) {
-    this.tempFile = tempFile;
-  }
-
-  /**
-   * Gets a new signature fied name that doesn't clash with any existing name.
-   * 
-   * @return a new signature fied name
-   */
-  public final String getNewSigName() {
-    AcroFields af = writer.getAcroFields();
-    String name = "Signature";
-    int step = 0;
-    boolean found = false;
-    while (!found) {
-      ++step;
-      String n1 = name + step;
-      if (af.getFieldItem(n1) != null)
-        continue;
-      n1 += ".";
-      found = true;
-        for (String fn : af.getAllFields().keySet()) {
-            if (fn.startsWith(n1)) {
-                found = false;
-                break;
+        this.filter = filter;
+    }
+
+    /**
+     * Sets the cryptographic parameters.
+     *
+     * @param privKey   the private key
+     * @param certChain the certification chain
+     * @param crlList   the crl list
+     * @param filter    the PdfName
+     */
+    public void setCrypto(PrivateKey privKey, Certificate[] certChain, CRL[] crlList, PdfName filter) {
+        this.privKey = privKey;
+        this.certChain = certChain;
+        this.crlList = crlList;
+        this.filter = filter;
+    }
+
+    // OJO... Modificacion de
+    // flopez-------------------------------------------------
+    public void setVisibleSignature(Rectangle pageRect, int page) {
+        setVisibleSignature(pageRect, page, getNewSigName());
+    }
+
+    /**
+     * Sets the signature to be visible. It creates a new visible signature field.
+     *
+     * @param pageRect  the position and dimension of the field in the page
+     * @param page      the page to place the field. The fist page is 1
+     * @param fieldName the field name or null to generate automatically a new field name
+     */
+    public void setVisibleSignature(Rectangle pageRect, int page, String fieldName) {
+        if (fieldName != null) {
+            if (fieldName.indexOf('.') >= 0) {
+                throw new IllegalArgumentException(
+                        MessageLocalization
+                                .getComposedMessage("field.names.cannot.contain.a.dot"));
             }
+            AcroFields af = writer.getAcroFields();
+            AcroFields.Item item = af.getFieldItem(fieldName);
+            if (item != null) {
+                throw new IllegalArgumentException(
+                        MessageLocalization.getComposedMessage(
+                                "the.field.1.already.exists", fieldName));
+            }
+            this.fieldName = fieldName;
+        }
+        // OJO... Modificacion de
+        // flopez--------------------------------------------------
+        // if (page < 1 || page > writer.reader.getNumberOfPages())
+        if (page < 0 || page > writer.reader.getNumberOfPages()) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("invalid.page.number.1", page));
         }
+        // ******************************************************************************
+        this.pageRect = new Rectangle(pageRect);
+        this.pageRect.normalize();
+        rect = new Rectangle(this.pageRect.getWidth(), this.pageRect.getHeight());
+        this.page = page;
+        newField = true;
     }
-    name += step;
-    return name;
-  }
-
-  /**
-   * This is the first method to be called when using external signatures. The
-   * general sequence is: preClose(), getDocumentBytes() and close().
-   * 
          
-   * If calling preClose() dont't call PdfStamper.close().
-   * 
          
-   * No external signatures are allowed if this method is called.
-   * 
-   * @throws IOException
-   *           on error
-   * @throws DocumentException
-   *           on error
-   */
-  public void preClose() throws IOException, DocumentException {
-    preClose(null);
-  }
-
-  /**
-   * This is the first method to be called when using external signatures. The
-   * general sequence is: preClose(), getDocumentBytes() and close().
-   * 
          
-   * If calling preClose() dont't call PdfStamper.close().
-   * 
          
-   * If using an external signature exclusionSizes must contain at
-   * least the PdfName.CONTENTS key with the size that it will take
-   * in the document. Note that due to the hex string coding this size should be
-   * byte_size*2+2.
-   * 
-   * @param exclusionSizes
-   *          a HashMap with names and sizes to be excluded in the
-   *          signature calculation. The key is a PdfName and the
-   *          value an Integer. At least the
-   *          PdfName.CONTENTS must be present
-   * @throws IOException
-   *           on error
-   * @throws DocumentException
-   *           on error
-   */
-  public void preClose(Map exclusionSizes) throws IOException,
-      DocumentException {
-    if (preClosed)
-      throw new DocumentException(
-          MessageLocalization.getComposedMessage("document.already.pre.closed"));
-    preClosed = true;
-    AcroFields af = writer.getAcroFields();
-    String name = getFieldName();
-    boolean fieldExists = !(isInvisible() || isNewField());
-    PdfIndirectReference refSig = writer.getPdfIndirectReference();
-    writer.setSigFlags(3);
-    if (fieldExists) {
-      //Patch by Lonzak: the signature dictionary must be added to the formfield and no the widget! (testdoc: SignatureWidgetFormfield-Separate.pdf)
-      PdfDictionary data = af.getFieldItem(name).getValue(0);
-      writer.markUsed(data);
-      data.put(PdfName.V, refSig);
-      //for widget attributes
-      PdfDictionary widget = af.getFieldItem(name).getWidget(0);
-      writer.markUsed(widget);
-      widget.put(PdfName.P, writer.getPageReference(getPage()));
-      PdfObject obj = PdfReader.getPdfObjectRelease(widget.get(PdfName.F));
-      int flags = 0;
-      if (obj != null && obj.isNumber())
-        flags = ((PdfNumber) obj).intValue();
-      flags |= PdfAnnotation.FLAGS_LOCKED;
-      widget.put(PdfName.F, new PdfNumber(flags));
-      PdfDictionary ap = new PdfDictionary();
-      ap.put(PdfName.N, getAppearance().getIndirectReference());
-      widget.put(PdfName.AP, ap);
-    } else {
-      PdfFormField sigField = PdfFormField.createSignature(writer);
-      sigField.setFieldName(name);
-      sigField.put(PdfName.V, refSig);
-      sigField.setFlags(PdfAnnotation.FLAGS_PRINT | PdfAnnotation.FLAGS_LOCKED);
-
-      int pagen = getPage();
-      // OJO... Modificacion de
-      // flopez-----------------------------------------------------
-      // if (!isInvisible())
-      // sigField.setWidget(getPageRect(), null);
-      // else
-      // sigField.setWidget(new Rectangle(0, 0), null);
-      if ((!isInvisible()) && (pagen == 0)) { // Si pagina en cero tonces firma
-                                              // en todas las paginas
-        int pages = writer.reader.getNumberOfPages();
-        for (int i = 1; i <= pages; i++) {
-          PdfFormField field = PdfFormField.createEmpty(writer);
-          this.page = i;
-          pagen = i;
-          field.setWidget(getPageRect(), null);
-          field.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, getAppearance());
-          field.setPlaceInPage(i);
-          field.setPage(i);
-          field.setFlags(PdfAnnotation.FLAGS_PRINT);
-          sigField.addKid(field);
-          field = null;
+
+    /**
+     * Sets the signature to be visible. An empty signature field with the same name must already exist.
+     *
+     * @param fieldName the existing empty signature field name
+     */
+    public void setVisibleSignature(String fieldName) {
+        AcroFields af = writer.getAcroFields();
+        AcroFields.Item item = af.getFieldItem(fieldName);
+        if (item == null) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("the.field.1.does.not.exist",
+                            fieldName));
+        }
+        PdfDictionary merged = item.getMerged(0);
+        if (!PdfName.SIG.equals(PdfReader.getPdfObject(merged.get(PdfName.FT)))) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage(
+                            "the.field.1.is.not.a.signature.field", fieldName));
         }
-      } else if (!isInvisible()) // Si es una pagina especifica
-        sigField.setWidget(getPageRect(), null);
-      else
-        sigField.setWidget(new Rectangle(0, 0), null);
-      // ******************************************************************************
-      sigField.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, getAppearance());
-      sigField.setPage(pagen);
-      writer.addAnnotation(sigField, pagen);
-    }
-
-    exclusionLocations = new HashMap<>();
-    if (cryptoDictionary == null) {
-      if (PdfName.ADOBE_PPKLITE.equals(getFilter()))
-        sigStandard = new PdfSigGenericPKCS.PPKLite(getProvider());
-      else if (PdfName.ADOBE_PPKMS.equals(getFilter()))
-        sigStandard = new PdfSigGenericPKCS.PPKMS(getProvider());
-      else if (PdfName.VERISIGN_PPKVS.equals(getFilter()))
-        sigStandard = new PdfSigGenericPKCS.VeriSign(getProvider());
-      else
-        throw new IllegalArgumentException(
-            MessageLocalization.getComposedMessage("unknown.filter.1",
-                getFilter()));
-      sigStandard.setExternalDigest(externalDigest, externalRSAdata,
-          digestEncryptionAlgorithm);
-      if (getReason() != null)
-        sigStandard.setReason(getReason());
-      if (getLocation() != null)
-        sigStandard.setLocation(getLocation());
-      if (getContact() != null)
-        sigStandard.setContact(getContact());
-      sigStandard.put(PdfName.M, new PdfDate(getSignDateNullSafe()));
-      sigStandard.setSignInfo(getPrivKey(), certChain, crlList);
-      // ******************************************************************************
-      PdfString contents = (PdfString) sigStandard.get(PdfName.CONTENTS);
-      PdfLiteral lit = new PdfLiteral(
-          (contents.toString().length() + (PdfName.ADOBE_PPKLITE
-              .equals(getFilter()) ? 0 : 64)) * 2 + 2);
-      exclusionLocations.put(PdfName.CONTENTS, lit);
-      sigStandard.put(PdfName.CONTENTS, lit);
-      lit = new PdfLiteral(80);
-      exclusionLocations.put(PdfName.BYTERANGE, lit);
-      sigStandard.put(PdfName.BYTERANGE, lit);
-      if (this.certificationLevel >= 0) {
-        addDocMDP(sigStandard);
-      }
-      if (signatureEvent != null)
-        signatureEvent.getSignatureDictionary(sigStandard);
-      writer.addToBody(sigStandard, refSig, false);
-    } else {
-        //the following block was added since otherwise this information would be lost.
-        //The original idea might have been that if there is an external crypto dictionary then everything is added manually however
-        //the method description of all the methods in the PdfSignatureAppearance class do not state this - so this would be highly error prone
-        if (getReason() != null) {
-            this.cryptoDictionary.put(PdfName.REASON, new PdfString(this.getReason(), PdfObject.TEXT_UNICODE));
+        this.fieldName = fieldName;
+        PdfArray r = merged.getAsArray(PdfName.RECT);
+        float llx = r.getAsNumber(0).floatValue();
+        float lly = r.getAsNumber(1).floatValue();
+        float urx = r.getAsNumber(2).floatValue();
+        float ury = r.getAsNumber(3).floatValue();
+        pageRect = new Rectangle(llx, lly, urx, ury);
+        pageRect.normalize();
+        page = item.getPage(0);
+        int rotation = writer.reader.getPageRotation(page);
+        Rectangle pageSize = writer.reader.getPageSizeWithRotation(page);
+        switch (rotation) {
+            case 90:
+                pageRect = new Rectangle(pageRect.getBottom(), pageSize.getTop()
+                        - pageRect.getLeft(), pageRect.getTop(), pageSize.getTop()
+                        - pageRect.getRight());
+                break;
+            case 180:
+                pageRect = new Rectangle(pageSize.getRight() - pageRect.getLeft(),
+                        pageSize.getTop() - pageRect.getBottom(), pageSize.getRight()
+                        - pageRect.getRight(), pageSize.getTop() - pageRect.getTop());
+                break;
+            case 270:
+                pageRect = new Rectangle(pageSize.getRight() - pageRect.getBottom(),
+                        pageRect.getLeft(), pageSize.getRight() - pageRect.getTop(),
+                        pageRect.getRight());
+                break;
         }
-        if (getLocation() != null) {
-            this.cryptoDictionary.put(PdfName.LOCATION, new PdfString(this.getLocation(), PdfObject.TEXT_UNICODE));
+        if (rotation != 0) {
+            pageRect.normalize();
         }
-        if (getContact() != null) {
-            this.cryptoDictionary.put(PdfName.CONTACTINFO, new PdfString(this.getContact(), PdfObject.TEXT_UNICODE));
+        rect = new Rectangle(this.pageRect.getWidth(), this.pageRect.getHeight());
+    }
+
+    /**
+     * Gets a template layer to create a signature appearance. The layers can go from 0 to 4.
+     * 
          
+     * Consult PPKAppearances.pdf for
+     * further details.
+     *
+     * @param layer the layer
+     * @return a template
+     */
+    public PdfTemplate getLayer(int layer) {
+        if (layer < 0 || layer >= app.length) {
+            return null;
         }
-        if (this.getSignDate() != null) {
-            this.cryptoDictionary.put(PdfName.M, new PdfDate(getSignDate()));
+        PdfTemplate t = app[layer];
+        if (t == null) {
+            t = app[layer] = new PdfTemplate(writer);
+            t.setBoundingBox(rect);
+            writer.addDirectTemplateSimple(t, new PdfName("n" + layer));
         }
-            
-      PdfLiteral lit = new PdfLiteral(80);
-      exclusionLocations.put(PdfName.BYTERANGE, lit);
-      cryptoDictionary.put(PdfName.BYTERANGE, lit);
-        for (Object o : exclusionSizes.entrySet()) {
-            Map.Entry entry = (Map.Entry) o;
-            PdfName key = (PdfName) entry.getKey();
-            Integer v = (Integer) entry.getValue();
-            lit = new PdfLiteral(v);
-            exclusionLocations.put(key, lit);
-            cryptoDictionary.put(key, lit);
+        return t;
+    }
+
+    /**
+     * Gets the template that aggregates all appearance layers. This corresponds to the /FRM resource.
+     * 
          
+     * Consult PPKAppearances.pdf for
+     * further details.
+     *
+     * @return the template that aggregates all appearance layers
+     */
+    public PdfTemplate getTopLayer() {
+        if (frm == null) {
+            frm = new PdfTemplate(writer);
+            frm.setBoundingBox(rect);
+            writer.addDirectTemplateSimple(frm, new PdfName("FRM"));
         }
-      if (certificationLevel >= 0)
-        addDocMDP(cryptoDictionary);
-      if (signatureEvent != null)
-        signatureEvent.getSignatureDictionary(cryptoDictionary);
-      writer.addToBody(cryptoDictionary, refSig, false);
-    }
-    if (certificationLevel >= 0) {
-      // add DocMDP entry to root
-      PdfDictionary docmdp = new PdfDictionary();
-      docmdp.put(new PdfName("DocMDP"), refSig);
-      writer.reader.getCatalog().put(new PdfName("Perms"), docmdp);
-    }
-    writer.close(stamper.getInfoDictionary());
-
-    range = new long[exclusionLocations.size() * 2];
-    long byteRangePosition = exclusionLocations
-        .get(PdfName.BYTERANGE).getPosition();
-    exclusionLocations.remove(PdfName.BYTERANGE);
-    int idx = 1;
-      for (Object o : exclusionLocations.values()) {
-          PdfLiteral lit = (PdfLiteral) o;
-          long n = lit.getPosition();
-          range[idx++] = n;
-          range[idx++] = lit.getPosLength() + n;
-      }
-    Arrays.sort(range, 1, range.length - 1);
-    for (int k = 3; k < range.length - 2; k += 2)
-      range[k] -= range[k - 1];
-
-    if (tempFile == null) {
-      bout = sigout.getBuffer();
-      boutLen = sigout.size();
-      range[range.length - 1] = boutLen - range[range.length - 2];
-      ByteBuffer bf = new ByteBuffer();
-      bf.append('[');
-        for (long i : range) bf.append(i).append(' ');
-      bf.append(']');
-      System.arraycopy(bf.getBuffer(), 0, bout, (int) byteRangePosition, bf.size());
-    } else {
-      try {
-        raf = new RandomAccessFile(tempFile, "rw");
-        long boutL = raf.length();
-        range[range.length - 1] = boutL - range[range.length - 2];
-        ByteBuffer bf = new ByteBuffer();
-        bf.append('[');
-          for (long i : range) bf.append(i).append(' ');
-        bf.append(']');
-        raf.seek(byteRangePosition);
-        raf.write(bf.getBuffer(), 0, bf.size());
-      } catch (IOException e) {
-        try {
-          raf.close();
-        } catch (Exception ee) {
+        return frm;
+    }
+
+    /**
+     * Gets the main appearance layer.
+     * 
          
+     * Consult PPKAppearances.pdf for
+     * further details.
+     *
+     * @return the main appearance layer
+     * @throws DocumentException on error
+     */
+    public PdfTemplate getAppearance() throws DocumentException {
+        if (isInvisible()) {
+            PdfTemplate t = new PdfTemplate(writer);
+            t.setBoundingBox(new Rectangle(0, 0));
+            writer.addDirectTemplateSimple(t, null);
+            return t;
         }
-        try {
-          tempFile.delete();
-        } catch (Exception ee) {
+        if (app[0] == null) {
+            PdfTemplate t = app[0] = new PdfTemplate(writer);
+            t.setBoundingBox(new Rectangle(100, 100));
+            writer.addDirectTemplateSimple(t, new PdfName("n0"));
+            t.setLiteral("% DSBlank\n");
         }
-        throw e;
-      }
-    }
-  }
-
-  /**
-   * This is the last method to be called when using external signatures. The
-   * general sequence is: preClose(), getDocumentBytes() and close().
-   * 
          
-   * update is a PdfDictionary that must have exactly
-   * the same keys as the ones provided in {@link PdfSignatureAppearance#preClose(Map)}.
-   * 
-   * @param update
-   *          a PdfDictionary with the key/value that will fill the
-   *          holes defined in {@link PdfSignatureAppearance#preClose(Map)}
-   * @throws DocumentException
-   *           on error
-   * @throws IOException
-   *           on error
-   */
-  public void close(PdfDictionary update) throws IOException, DocumentException {
-    try {
-      if (!preClosed)
-        throw new DocumentException(
-            MessageLocalization
-                .getComposedMessage("preclose.must.be.called.first"));
-      ByteBuffer bf = new ByteBuffer();
-        for (PdfName key : update.getKeys()) {
-            PdfObject obj = update.get(key);
-            PdfLiteral lit = exclusionLocations.get(key);
-            if (lit == null)
-                throw new IllegalArgumentException(
-                        MessageLocalization.getComposedMessage(
-                                "the.key.1.didn.t.reserve.space.in.preclose", key.toString()));
-            bf.reset();
-            obj.toPdf(null, bf);
-            if (bf.size() > lit.getPosLength())
+        if (app[1] == null && !acro6Layers) {
+            PdfTemplate t = app[1] = new PdfTemplate(writer);
+            t.setBoundingBox(new Rectangle(100, 100));
+            writer.addDirectTemplateSimple(t, new PdfName("n1"));
+            t.setLiteral(questionMark);
+        }
+        if (app[2] == null) {
+            String text;
+            if (layer2Text == null) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("Digitally signed by ")
+                        .append(PdfPKCS7.getSubjectFields((X509Certificate) certChain[0]).getField("CN"))
+                        .append('\n');
+                SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss z");
+                buf.append("Date: ").append(sd.format(getSignDateNullSafe().getTime()));
+                if (reason != null) {
+                    buf.append('\n').append("Reason: ").append(reason);
+                }
+                if (location != null) {
+                    buf.append('\n').append("Location: ").append(location);
+                }
+                text = buf.toString();
+            } else {
+                text = layer2Text;
+            }
+            PdfTemplate t = app[2] = new PdfTemplate(writer);
+            t.setBoundingBox(rect);
+            writer.addDirectTemplateSimple(t, new PdfName("n2"));
+            if (image != null) {
+                if (imageScale == 0) {
+                    t.addImage(image, rect.getWidth(), 0, 0, rect.getHeight(), 0, 0);
+                } else {
+                    float usableScale = imageScale;
+                    if (imageScale < 0) {
+                        usableScale = Math.min(rect.getWidth() / image.getWidth(),
+                                rect.getHeight() / image.getHeight());
+                    }
+                    float w = image.getWidth() * usableScale;
+                    float h = image.getHeight() * usableScale;
+                    float x = (rect.getWidth() - w) / 2;
+                    float y = (rect.getHeight() - h) / 2;
+                    t.addImage(image, w, 0, 0, h, x, y);
+                }
+            }
+            Font font;
+            if (layer2Font == null) {
+                font = new Font();
+            } else {
+                font = new Font(layer2Font);
+            }
+            float size = font.getSize();
+
+            Rectangle dataRect = null;
+            Rectangle signatureRect = null;
+
+            if (render == SignatureRenderNameAndDescription
+                    || (render == SignatureRenderGraphicAndDescription && this.signatureGraphic != null)) {
+                // origin is the bottom-left
+                signatureRect = new Rectangle(MARGIN, MARGIN, rect.getWidth() / 2
+                        - MARGIN, rect.getHeight() - MARGIN);
+                dataRect = new Rectangle(rect.getWidth() / 2 + MARGIN / 2, MARGIN,
+                        rect.getWidth() - MARGIN / 2, rect.getHeight() - MARGIN);
+
+                if (rect.getHeight() > rect.getWidth()) {
+                    signatureRect = new Rectangle(MARGIN, rect.getHeight() / 2,
+                            rect.getWidth() - MARGIN, rect.getHeight());
+                    dataRect = new Rectangle(MARGIN, MARGIN, rect.getWidth() - MARGIN,
+                            rect.getHeight() / 2 - MARGIN);
+                }
+            } else if (this.render == SignatureRenderGraphic) {
+                if (this.signatureGraphic == null) {
+                    throw new IllegalArgumentException("Missing signature image for renderingmode: " + this.render);
+                }
+                signatureRect = new Rectangle(
+                        MARGIN,
+                        MARGIN,
+                        rect.getWidth() - MARGIN,
+                        rect.getHeight() - MARGIN);
+            } else {
+                dataRect = new Rectangle(MARGIN, MARGIN, rect.getWidth() - MARGIN,
+                        rect.getHeight() * (1 - TOP_SECTION) - MARGIN);
+            }
+
+            if (render == SignatureRenderNameAndDescription) {
+                String signedBy = PdfPKCS7.getSubjectFields((X509Certificate) certChain[0]).getField("CN");
+                Rectangle sr2 = new Rectangle(signatureRect.getWidth() - MARGIN,
+                        signatureRect.getHeight() - MARGIN);
+                float signedSize = fitText(font, signedBy, sr2, -1, runDirection);
+
+                ColumnText ct2 = new ColumnText(t);
+                ct2.setRunDirection(runDirection);
+                ct2.setSimpleColumn(new Phrase(signedBy, font),
+                        signatureRect.getLeft(), signatureRect.getBottom(),
+                        signatureRect.getRight(), signatureRect.getTop(), signedSize,
+                        Element.ALIGN_LEFT);
+
+                ct2.go();
+            } else if (render == SignatureRenderGraphicAndDescription) {
+                ColumnText ct2 = new ColumnText(t);
+                ct2.setRunDirection(runDirection);
+                ct2.setSimpleColumn(signatureRect.getLeft(), signatureRect.getBottom(),
+                        signatureRect.getRight(), signatureRect.getTop(), 0,
+                        Element.ALIGN_RIGHT);
+
+                Image im = Image.getInstance(signatureGraphic);
+                im.scaleToFit(signatureRect.getWidth(), signatureRect.getHeight());
+
+                Paragraph p = new Paragraph();
+                // must calculate the point to draw from to make image appear in middle
+                // of column
+                float x = 0;
+                // experimentation found this magic number to counteract Adobe's
+                // signature graphic, which
+                // offsets the y co-ordinate by 15 units
+                float y = -im.getScaledHeight() + 15;
+
+                x = x + (signatureRect.getWidth() - im.getScaledWidth()) / 2;
+                y = y - (signatureRect.getHeight() - im.getScaledHeight()) / 2;
+                p.add(new Chunk(im, x
+                        + (signatureRect.getWidth() - im.getScaledWidth()) / 2, y, false));
+                ct2.addElement(p);
+                ct2.go();
+            } else if (this.render == SignatureRenderGraphic) {
+                ColumnText ct2 = new ColumnText(t);
+                ct2.setRunDirection(this.runDirection);
+                ct2.setSimpleColumn(signatureRect.getLeft(), signatureRect.getBottom(), signatureRect.getRight(),
+                        signatureRect.getTop(), 0, Element.ALIGN_RIGHT);
+
+                Image im = Image.getInstance(this.signatureGraphic);
+                im.scaleToFit(signatureRect.getWidth(), signatureRect.getHeight());
+
+                Paragraph p = new Paragraph(signatureRect.getHeight());
+                // must calculate the point to draw from, to make image appear in the middle of the column
+                float x = (signatureRect.getWidth() - im.getScaledWidth()) / 2f;
+                float y = (signatureRect.getHeight() - im.getScaledHeight()) / 2f;
+
+                p.add(new Chunk(im, x, y, false));
+
+                ct2.addElement(p);
+                ct2.go();
+            }
+
+            if (this.render != SignatureRenderGraphic) {
+                if (size <= 0) {
+                    Rectangle sr = new Rectangle(dataRect.getWidth(), dataRect.getHeight());
+                    size = fitText(font, text, sr, 12, runDirection);
+                }
+                ColumnText ct = new ColumnText(t);
+                ct.setRunDirection(runDirection);
+                ct.setSimpleColumn(new Phrase(text, font), dataRect.getLeft(), dataRect.getBottom(),
+                        dataRect.getRight(), dataRect.getTop(), size, Element.ALIGN_LEFT);
+                ct.go();
+            }
+        }
+        if (app[3] == null && !acro6Layers) {
+            PdfTemplate t = app[3] = new PdfTemplate(writer);
+            t.setBoundingBox(new Rectangle(100, 100));
+            writer.addDirectTemplateSimple(t, new PdfName("n3"));
+            t.setLiteral("% DSBlank\n");
+        }
+        if (app[4] == null && !acro6Layers) {
+            PdfTemplate t = app[4] = new PdfTemplate(writer);
+            t.setBoundingBox(new Rectangle(0, rect.getHeight() * (1 - TOP_SECTION),
+                    rect.getRight(), rect.getTop()));
+            writer.addDirectTemplateSimple(t, new PdfName("n4"));
+            Font font;
+            if (layer2Font == null) {
+                font = new Font();
+            } else {
+                font = new Font(layer2Font);
+            }
+            float size = font.getSize();
+            String text = "Signature Not Verified";
+            if (layer4Text != null) {
+                text = layer4Text;
+            }
+            Rectangle sr = new Rectangle(rect.getWidth() - 2 * MARGIN,
+                    rect.getHeight() * TOP_SECTION - 2 * MARGIN);
+            size = fitText(font, text, sr, 15, runDirection);
+            ColumnText ct = new ColumnText(t);
+            ct.setRunDirection(runDirection);
+            ct.setSimpleColumn(new Phrase(text, font), MARGIN, 0, rect.getWidth()
+                    - MARGIN, rect.getHeight() - MARGIN, size, Element.ALIGN_LEFT);
+            ct.go();
+        }
+        int rotation = writer.reader.getPageRotation(page);
+        Rectangle rotated = new Rectangle(rect);
+        int n = rotation;
+        while (n > 0) {
+            rotated = rotated.rotate();
+            n -= 90;
+        }
+        if (frm == null) {
+            frm = new PdfTemplate(writer);
+            frm.setBoundingBox(rotated);
+            writer.addDirectTemplateSimple(frm, new PdfName("FRM"));
+            float scale = Math.min(rect.getWidth(), rect.getHeight()) * 0.9f;
+            float x = (rect.getWidth() - scale) / 2;
+            float y = (rect.getHeight() - scale) / 2;
+            scale /= 100;
+            if (rotation == 90) {
+                frm.concatCTM(0, 1, -1, 0, rect.getHeight(), 0);
+            } else if (rotation == 180) {
+                frm.concatCTM(-1, 0, 0, -1, rect.getWidth(), rect.getHeight());
+            } else if (rotation == 270) {
+                frm.concatCTM(0, -1, 1, 0, 0, rect.getWidth());
+            }
+            frm.addTemplate(app[0], 0, 0);
+            if (!acro6Layers) {
+                frm.addTemplate(app[1], scale, 0, 0, scale, x, y);
+            }
+            frm.addTemplate(app[2], 0, 0);
+            if (!acro6Layers) {
+                frm.addTemplate(app[3], scale, 0, 0, scale, x, y);
+                frm.addTemplate(app[4], 0, 0);
+            }
+        }
+        PdfTemplate napp = new PdfTemplate(writer);
+        napp.setBoundingBox(rotated);
+        writer.addDirectTemplateSimple(napp, null);
+        napp.addTemplate(frm, 0, 0);
+        return napp;
+    }
+
+    /**
+     * Sets the digest/signature to an external calculated value.
+     *
+     * @param digest                    the digest. This is the actual signature
+     * @param RSAdata                   the extra data that goes into the data tag in PKCS#7
+     * @param digestEncryptionAlgorithm the encryption algorithm. It may must be null if the
+     *                                  digest is also null. If the
+     *                                  digest is not null then it may be "RSA"
+     *                                  or "DSA"
+     */
+    public void setExternalDigest(byte[] digest, byte[] RSAdata,
+            String digestEncryptionAlgorithm) {
+        externalDigest = digest;
+        externalRSAdata = RSAdata;
+        this.digestEncryptionAlgorithm = digestEncryptionAlgorithm;
+    }
+
+    /**
+     * Gets the signing reason or null if not set.
+     *
+     * @return the signing reason
+     */
+    public String getReason() {
+        return this.reason;
+    }
+
+    /**
+     * Sets the signing reason.
+     *
+     * @param reason the signing reason
+     */
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    /**
+     * Gets the signing location or null if not set.
+     *
+     * @return the signing location
+     */
+    public String getLocation() {
+        return this.location;
+    }
+
+    /**
+     * Sets the signing location.
+     *
+     * @param location the signing location
+     */
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    /**
+     * Returns the Cryptographic Service Provider that will sign the document. This method might return null if the
+     * provider was not set.
+     *
+     * @return provider the name of the provider, for example "SUN", or
+     * null to use the default provider.
+     */
+    public String getProvider() {
+        return this.provider;
+    }
+
+    /**
+     * Sets the Cryptographic Service Provider that will sign the document.
+     *
+     * @param provider the name of the provider, for example "SUN", or null to use the default provider.
+     */
+    public void setProvider(String provider) {
+        this.provider = provider;
+    }
+
+    /**
+     * Gets the private key.
+     *
+     * @return the private key
+     */
+    public java.security.PrivateKey getPrivKey() {
+        return privKey;
+    }
+
+    /**
+     * Gets the certificate revocation list.
+     *
+     * @return the certificate revocation list
+     */
+    public java.security.cert.CRL[] getCrlList() {
+        return this.crlList;
+    }
+
+    /**
+     * Gets the filter used to sign the document.
+     *
+     * @return the filter used to sign the document
+     */
+    public com.lowagie.text.pdf.PdfName getFilter() {
+        return filter;
+    }
+
+    /**
+     * Checks if a new field was created.
+     *
+     * @return true if a new field was created, false if
+     * signing an existing field or if the signature is invisible
+     */
+    public boolean isNewField() {
+        return this.newField;
+    }
+
+    /**
+     * Gets the page number of the field.
+     *
+     * @return the page number of the field
+     */
+    public int getPage() {
+        return page;
+    }
+
+    /**
+     * Gets the field name.
+     *
+     * @return the field name
+     */
+    public java.lang.String getFieldName() {
+        return fieldName;
+    }
+
+    /**
+     * Sets the field name for a new invisible signature field
+     *
+     * @param fieldName for the new invisible signature field
+     */
+    public void setFieldNameForInvisibleSignatures(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    /**
+     * Gets the rectangle that represent the position and dimension of the signature in the page.
+     *
+     * @return the rectangle that represent the position and dimension of the signature in the page
+     */
+    public com.lowagie.text.Rectangle getPageRect() {
+        return pageRect;
+    }
+
+    /**
+     * Gets the signature date.
+     *
+     * @return the signature date
+     */
+    public java.util.Calendar getSignDate() {
+        return signDate;
+    }
+
+    /**
+     * Sets the signature date.
+     *
+     * @param signDate the signature date
+     */
+    public void setSignDate(java.util.Calendar signDate) {
+        this.signDate = signDate;
+    }
+
+    /**
+     * Gets the signature date. If the date is not set the current Date is returned.
+     *
+     * @return the signature date
+     */
+    public java.util.Calendar getSignDateNullSafe() {
+        if (this.signDate == null) {
+            return new GregorianCalendar();
+        }
+        return this.signDate;
+    }
+
+    com.lowagie.text.pdf.ByteBuffer getSigout() {
+        return sigout;
+    }
+
+    void setSigout(com.lowagie.text.pdf.ByteBuffer sigout) {
+        this.sigout = sigout;
+    }
+
+    java.io.OutputStream getOriginalout() {
+        return originalout;
+    }
+
+    void setOriginalout(java.io.OutputStream originalout) {
+        this.originalout = originalout;
+    }
+
+    /**
+     * Gets the temporary file.
+     *
+     * @return the temporary file or null is the document is created in memory
+     */
+    public java.io.File getTempFile() {
+        return tempFile;
+    }
+
+    void setTempFile(java.io.File tempFile) {
+        this.tempFile = tempFile;
+    }
+
+    /**
+     * Gets a new signature fied name that doesn't clash with any existing name.
+     *
+     * @return a new signature fied name
+     */
+    public final String getNewSigName() {
+        AcroFields af = writer.getAcroFields();
+        String name = "Signature";
+        int step = 0;
+        boolean found = false;
+        while (!found) {
+            ++step;
+            String n1 = name + step;
+            if (af.getFieldItem(n1) != null) {
+                continue;
+            }
+            n1 += ".";
+            found = true;
+            for (String fn : af.getAllFields().keySet()) {
+                if (fn.startsWith(n1)) {
+                    found = false;
+                    break;
+                }
+            }
+        }
+        name += step;
+        return name;
+    }
+
+    /**
+     * This is the first method to be called when using external signatures. The general sequence is: preClose(),
+     * getDocumentBytes() and close().
+     * 
          
+     * If calling preClose() dont't call PdfStamper.close().
+     * 
          
+     * No external signatures are allowed if this method is called.
+     *
+     * @throws IOException       on error
+     * @throws DocumentException on error
+     */
+    public void preClose() throws IOException, DocumentException {
+        preClose(null);
+    }
+
+    /**
+     * This is the first method to be called when using external signatures. The general sequence is: preClose(),
+     * getDocumentBytes() and close().
+     * 
          
+     * If calling preClose() dont't call PdfStamper.close().
+     * 
          
+     * If using an external signature exclusionSizes must contain at least the
+     * PdfName.CONTENTS key with the size that it will take in the document. Note that due to the hex
+     * string coding this size should be byte_size*2+2.
+     *
+     * @param exclusionSizes a HashMap with names and sizes to be excluded in the signature calculation.
+     *                       The key is a PdfName and the value an Integer. At least the
+     *                       PdfName.CONTENTS must be present
+     * @throws IOException       on error
+     * @throws DocumentException on error
+     */
+    public void preClose(Map exclusionSizes) throws IOException,
+            DocumentException {
+        if (preClosed) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("document.already.pre.closed"));
+        }
+        preClosed = true;
+        AcroFields af = writer.getAcroFields();
+        String name = getFieldName();
+        boolean fieldExists = !(isInvisible() || isNewField());
+        PdfIndirectReference refSig = writer.getPdfIndirectReference();
+        writer.setSigFlags(3);
+        if (fieldExists) {
+            //Patch by Lonzak: the signature dictionary must be added to the formfield and no the widget! (testdoc: SignatureWidgetFormfield-Separate.pdf)
+            PdfDictionary data = af.getFieldItem(name).getValue(0);
+            writer.markUsed(data);
+            data.put(PdfName.V, refSig);
+            //for widget attributes
+            PdfDictionary widget = af.getFieldItem(name).getWidget(0);
+            writer.markUsed(widget);
+            widget.put(PdfName.P, writer.getPageReference(getPage()));
+            PdfObject obj = PdfReader.getPdfObjectRelease(widget.get(PdfName.F));
+            int flags = 0;
+            if (obj != null && obj.isNumber()) {
+                flags = ((PdfNumber) obj).intValue();
+            }
+            flags |= PdfAnnotation.FLAGS_LOCKED;
+            widget.put(PdfName.F, new PdfNumber(flags));
+            PdfDictionary ap = new PdfDictionary();
+            ap.put(PdfName.N, getAppearance().getIndirectReference());
+            widget.put(PdfName.AP, ap);
+        } else {
+            PdfFormField sigField = PdfFormField.createSignature(writer);
+            sigField.setFieldName(name);
+            sigField.put(PdfName.V, refSig);
+            sigField.setFlags(PdfAnnotation.FLAGS_PRINT | PdfAnnotation.FLAGS_LOCKED);
+
+            int pagen = getPage();
+            // OJO... Modificacion de
+            // flopez-----------------------------------------------------
+            // if (!isInvisible())
+            // sigField.setWidget(getPageRect(), null);
+            // else
+            // sigField.setWidget(new Rectangle(0, 0), null);
+            if ((!isInvisible()) && (pagen == 0)) { // Si pagina en cero tonces firma
+                // en todas las paginas
+                int pages = writer.reader.getNumberOfPages();
+                for (int i = 1; i <= pages; i++) {
+                    PdfFormField field = PdfFormField.createEmpty(writer);
+                    this.page = i;
+                    pagen = i;
+                    field.setWidget(getPageRect(), null);
+                    field.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, getAppearance());
+                    field.setPlaceInPage(i);
+                    field.setPage(i);
+                    field.setFlags(PdfAnnotation.FLAGS_PRINT);
+                    sigField.addKid(field);
+                    field = null;
+                }
+            } else if (!isInvisible()) // Si es una pagina especifica
+            {
+                sigField.setWidget(getPageRect(), null);
+            } else {
+                sigField.setWidget(new Rectangle(0, 0), null);
+            }
+            // ******************************************************************************
+            sigField.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, getAppearance());
+            sigField.setPage(pagen);
+            writer.addAnnotation(sigField, pagen);
+        }
+
+        exclusionLocations = new HashMap<>();
+        if (cryptoDictionary == null) {
+            if (PdfName.ADOBE_PPKLITE.equals(getFilter())) {
+                sigStandard = new PdfSigGenericPKCS.PPKLite(getProvider());
+            } else if (PdfName.ADOBE_PPKMS.equals(getFilter())) {
+                sigStandard = new PdfSigGenericPKCS.PPKMS(getProvider());
+            } else if (PdfName.VERISIGN_PPKVS.equals(getFilter())) {
+                sigStandard = new PdfSigGenericPKCS.VeriSign(getProvider());
+            } else {
                 throw new IllegalArgumentException(
-                        MessageLocalization.getComposedMessage(
-                                "the.key.1.is.too.big.is.2.reserved.3", key.toString(),
-                                String.valueOf(bf.size()), String.valueOf(lit.getPosLength())));
-            if (tempFile == null)
-                System.arraycopy(bf.getBuffer(), 0, bout, (int) lit.getPosition(),
-                        bf.size());
-            else {
-                raf.seek(lit.getPosition());
-                raf.write(bf.getBuffer(), 0, bf.size());
+                        MessageLocalization.getComposedMessage("unknown.filter.1",
+                                getFilter()));
+            }
+            sigStandard.setExternalDigest(externalDigest, externalRSAdata,
+                    digestEncryptionAlgorithm);
+            if (getReason() != null) {
+                sigStandard.setReason(getReason());
+            }
+            if (getLocation() != null) {
+                sigStandard.setLocation(getLocation());
+            }
+            if (getContact() != null) {
+                sigStandard.setContact(getContact());
+            }
+            sigStandard.put(PdfName.M, new PdfDate(getSignDateNullSafe()));
+            sigStandard.setSignInfo(getPrivKey(), certChain, crlList);
+            // ******************************************************************************
+            PdfString contents = (PdfString) sigStandard.get(PdfName.CONTENTS);
+            PdfLiteral lit = new PdfLiteral(
+                    (contents.toString().length() + (PdfName.ADOBE_PPKLITE
+                            .equals(getFilter()) ? 0 : 64)) * 2 + 2);
+            exclusionLocations.put(PdfName.CONTENTS, lit);
+            sigStandard.put(PdfName.CONTENTS, lit);
+            lit = new PdfLiteral(80);
+            exclusionLocations.put(PdfName.BYTERANGE, lit);
+            sigStandard.put(PdfName.BYTERANGE, lit);
+            if (this.certificationLevel >= 0) {
+                addDocMDP(sigStandard);
+            }
+            if (signatureEvent != null) {
+                signatureEvent.getSignatureDictionary(sigStandard);
+            }
+            writer.addToBody(sigStandard, refSig, false);
+        } else {
+            //the following block was added since otherwise this information would be lost.
+            //The original idea might have been that if there is an external crypto dictionary then everything is added manually however
+            //the method description of all the methods in the PdfSignatureAppearance class do not state this - so this would be highly error prone
+            if (getReason() != null) {
+                this.cryptoDictionary.put(PdfName.REASON, new PdfString(this.getReason(), PdfObject.TEXT_UNICODE));
+            }
+            if (getLocation() != null) {
+                this.cryptoDictionary.put(PdfName.LOCATION, new PdfString(this.getLocation(), PdfObject.TEXT_UNICODE));
+            }
+            if (getContact() != null) {
+                this.cryptoDictionary.put(PdfName.CONTACTINFO,
+                        new PdfString(this.getContact(), PdfObject.TEXT_UNICODE));
+            }
+            if (this.getSignDate() != null) {
+                this.cryptoDictionary.put(PdfName.M, new PdfDate(getSignDate()));
+            }
+
+            PdfLiteral lit = new PdfLiteral(80);
+            exclusionLocations.put(PdfName.BYTERANGE, lit);
+            cryptoDictionary.put(PdfName.BYTERANGE, lit);
+            for (Object o : exclusionSizes.entrySet()) {
+                Map.Entry entry = (Map.Entry) o;
+                PdfName key = (PdfName) entry.getKey();
+                Integer v = (Integer) entry.getValue();
+                lit = new PdfLiteral(v);
+                exclusionLocations.put(key, lit);
+                cryptoDictionary.put(key, lit);
             }
+            if (certificationLevel >= 0) {
+                addDocMDP(cryptoDictionary);
+            }
+            if (signatureEvent != null) {
+                signatureEvent.getSignatureDictionary(cryptoDictionary);
+            }
+            writer.addToBody(cryptoDictionary, refSig, false);
         }
-      if (update.size() != exclusionLocations.size())
-        throw new IllegalArgumentException(
-            MessageLocalization
-                .getComposedMessage("the.update.dictionary.has.less.keys.than.required"));
-      if (tempFile == null) {
-        originalout.write(bout, 0, boutLen);
-      } else {
-        if (originalout != null) {
-          raf.seek(0);
-          long length = raf.length();
-          byte[] buf = new byte[8192];
-          while (length > 0) {
-            int r = raf.read(buf, 0, (int) Math.min(buf.length, length));
-            if (r < 0)
-              throw new EOFException(
-                  MessageLocalization.getComposedMessage("unexpected.eof"));
-            originalout.write(buf, 0, r);
-            length -= r;
-          }
+        if (certificationLevel >= 0) {
+            // add DocMDP entry to root
+            PdfDictionary docmdp = new PdfDictionary();
+            docmdp.put(new PdfName("DocMDP"), refSig);
+            writer.reader.getCatalog().put(new PdfName("Perms"), docmdp);
         }
-      }
-    } finally {
-      if (tempFile != null) {
-        try {
-          raf.close();
-        } catch (Exception ee) {
+        writer.close(stamper.getInfoDictionary());
+
+        range = new long[exclusionLocations.size() * 2];
+        long byteRangePosition = exclusionLocations
+                .get(PdfName.BYTERANGE).getPosition();
+        exclusionLocations.remove(PdfName.BYTERANGE);
+        int idx = 1;
+        for (Object o : exclusionLocations.values()) {
+            PdfLiteral lit = (PdfLiteral) o;
+            long n = lit.getPosition();
+            range[idx++] = n;
+            range[idx++] = lit.getPosLength() + n;
+        }
+        Arrays.sort(range, 1, range.length - 1);
+        for (int k = 3; k < range.length - 2; k += 2) {
+            range[k] -= range[k - 1];
         }
-        if (originalout != null)
-          try {
-            tempFile.delete();
-          } catch (Exception ee) {
-          }
-      }
-      if (originalout != null)
+
+        if (tempFile == null) {
+            bout = sigout.getBuffer();
+            boutLen = sigout.size();
+            range[range.length - 1] = boutLen - range[range.length - 2];
+            ByteBuffer bf = new ByteBuffer();
+            bf.append('[');
+            for (long i : range) {
+                bf.append(i).append(' ');
+            }
+            bf.append(']');
+            System.arraycopy(bf.getBuffer(), 0, bout, (int) byteRangePosition, bf.size());
+        } else {
+            try {
+                raf = new RandomAccessFile(tempFile, "rw");
+                long boutL = raf.length();
+                range[range.length - 1] = boutL - range[range.length - 2];
+                ByteBuffer bf = new ByteBuffer();
+                bf.append('[');
+                for (long i : range) {
+                    bf.append(i).append(' ');
+                }
+                bf.append(']');
+                raf.seek(byteRangePosition);
+                raf.write(bf.getBuffer(), 0, bf.size());
+            } catch (IOException e) {
+                try {
+                    raf.close();
+                } catch (Exception ee) {
+                }
+                try {
+                    tempFile.delete();
+                } catch (Exception ee) {
+                }
+                throw e;
+            }
+        }
+    }
+
+    /**
+     * This is the last method to be called when using external signatures. The general sequence is: preClose(),
+     * getDocumentBytes() and close().
+     * 
          
+     * update is a PdfDictionary that must have exactly
+     * the same keys as the ones provided in {@link PdfSignatureAppearance#preClose(Map)}.
+     *
+     * @param update a PdfDictionary with the key/value that will fill the holes defined in
+     *               {@link PdfSignatureAppearance#preClose(Map)}
+     * @throws DocumentException on error
+     * @throws IOException       on error
+     */
+    public void close(PdfDictionary update) throws IOException, DocumentException {
         try {
-          originalout.close();
-        } catch (Exception e) {
+            if (!preClosed) {
+                throw new DocumentException(
+                        MessageLocalization
+                                .getComposedMessage("preclose.must.be.called.first"));
+            }
+            ByteBuffer bf = new ByteBuffer();
+            for (PdfName key : update.getKeys()) {
+                PdfObject obj = update.get(key);
+                PdfLiteral lit = exclusionLocations.get(key);
+                if (lit == null) {
+                    throw new IllegalArgumentException(
+                            MessageLocalization.getComposedMessage(
+                                    "the.key.1.didn.t.reserve.space.in.preclose", key.toString()));
+                }
+                bf.reset();
+                obj.toPdf(null, bf);
+                if (bf.size() > lit.getPosLength()) {
+                    throw new IllegalArgumentException(
+                            MessageLocalization.getComposedMessage(
+                                    "the.key.1.is.too.big.is.2.reserved.3", key.toString(),
+                                    String.valueOf(bf.size()), String.valueOf(lit.getPosLength())));
+                }
+                if (tempFile == null) {
+                    System.arraycopy(bf.getBuffer(), 0, bout, (int) lit.getPosition(),
+                            bf.size());
+                } else {
+                    raf.seek(lit.getPosition());
+                    raf.write(bf.getBuffer(), 0, bf.size());
+                }
+            }
+            if (update.size() != exclusionLocations.size()) {
+                throw new IllegalArgumentException(
+                        MessageLocalization
+                                .getComposedMessage("the.update.dictionary.has.less.keys.than.required"));
+            }
+            if (tempFile == null) {
+                originalout.write(bout, 0, boutLen);
+            } else {
+                if (originalout != null) {
+                    raf.seek(0);
+                    long length = raf.length();
+                    byte[] buf = new byte[8192];
+                    while (length > 0) {
+                        int r = raf.read(buf, 0, (int) Math.min(buf.length, length));
+                        if (r < 0) {
+                            throw new EOFException(
+                                    MessageLocalization.getComposedMessage("unexpected.eof"));
+                        }
+                        originalout.write(buf, 0, r);
+                        length -= r;
+                    }
+                }
+            }
+        } finally {
+            if (tempFile != null) {
+                try {
+                    raf.close();
+                } catch (Exception ee) {
+                }
+                if (originalout != null) {
+                    try {
+                        tempFile.delete();
+                    } catch (Exception ee) {
+                    }
+                }
+            }
+            if (originalout != null) {
+                try {
+                    originalout.close();
+                } catch (Exception e) {
+                }
+            }
+        }
+    }
+
+    private void addDocMDP(PdfDictionary crypto) {
+        PdfDictionary reference = new PdfDictionary();
+        PdfDictionary transformParams = new PdfDictionary();
+        transformParams.put(PdfName.P, new PdfNumber(certificationLevel));
+        transformParams.put(PdfName.V, new PdfName("1.2"));
+        transformParams.put(PdfName.TYPE, PdfName.TRANSFORMPARAMS);
+        reference.put(PdfName.TRANSFORMMETHOD, PdfName.DOCMDP);
+        reference.put(PdfName.TYPE, PdfName.SIGREF);
+        reference.put(PdfName.TRANSFORMPARAMS, transformParams);
+        reference.put(new PdfName("DigestValue"), new PdfString("aa"));
+        PdfArray loc = new PdfArray();
+        loc.add(new PdfNumber(0));
+        loc.add(new PdfNumber(0));
+        reference.put(new PdfName("DigestLocation"), loc);
+        reference.put(new PdfName("DigestMethod"), new PdfName("MD5"));
+        reference.put(PdfName.DATA, writer.reader.getTrailer().get(PdfName.ROOT));
+        PdfArray types = new PdfArray();
+        types.add(reference);
+        crypto.put(PdfName.REFERENCE, types);
+    }
+
+    /**
+     * Gets the document bytes that are hashable when using external signatures. The general sequence is: preClose(),
+     * getRangeStream() and close().
+     * 
          
+     *
+     * @return the document bytes that are hashable
+     */
+    public InputStream getRangeStream() {
+        return new PdfSignatureAppearance.RangeStream(raf, bout, range);
+    }
+
+    /**
+     * Gets the user made signature dictionary. This is the dictionary at the /V key.
+     *
+     * @return the user made signature dictionary
+     */
+    public com.lowagie.text.pdf.PdfDictionary getCryptoDictionary() {
+        return cryptoDictionary;
+    }
+
+    /**
+     * Sets a user made signature dictionary. This is the dictionary at the /V key.
+     *
+     * @param cryptoDictionary a user made signature dictionary
+     */
+    public void setCryptoDictionary(
+            com.lowagie.text.pdf.PdfDictionary cryptoDictionary) {
+        this.cryptoDictionary = cryptoDictionary;
+    }
+
+    /**
+     * Gets the PdfStamper associated with this instance.
+     *
+     * @return the PdfStamper associated with this instance
+     */
+    public com.lowagie.text.pdf.PdfStamper getStamper() {
+        return stamper;
+    }
+
+    void setStamper(com.lowagie.text.pdf.PdfStamper stamper) {
+        this.stamper = stamper;
+    }
+
+    /**
+     * Checks if the document is in the process of closing.
+     *
+     * @return true if the document is in the process of closing,
+     * false otherwise
+     */
+    public boolean isPreClosed() {
+        return preClosed;
+    }
+
+    /**
+     * Gets the instance of the standard signature dictionary. This instance is only available after pre close.
+     * 
          
+     * The main use is to insert external signatures.
+     *
+     * @return the instance of the standard signature dictionary
+     */
+    public com.lowagie.text.pdf.PdfSigGenericPKCS getSigStandard() {
+        return sigStandard;
+    }
+
+    /**
+     * Gets the signing contact.
+     *
+     * @return the signing contact
+     */
+    public String getContact() {
+        return this.contact;
+    }
+
+    /**
+     * Sets the signing contact.
+     *
+     * @param contact the signing contact
+     */
+    public void setContact(String contact) {
+        this.contact = contact;
+    }
+
+    /**
+     * Gets the n2 and n4 layer font.
+     *
+     * @return the n2 and n4 layer font
+     */
+    public Font getLayer2Font() {
+        return this.layer2Font;
+    }
+
+    /**
+     * Sets the n2 and n4 layer font. If the font size is zero, auto-fit will be used.
+     *
+     * @param layer2Font the n2 and n4 font
+     */
+    public void setLayer2Font(Font layer2Font) {
+        this.layer2Font = layer2Font;
+    }
+
+    /**
+     * Gets the Acrobat 6.0 layer mode.
+     *
+     * @return the Acrobat 6.0 layer mode
+     */
+    public boolean isAcro6Layers() {
+        return this.acro6Layers;
+    }
+
+    /**
+     * Acrobat 6.0 and higher recommends that only layer n2 and n4 be present. This method sets that mode.
+     *
+     * @param acro6Layers if true only the layers n2 and n4 will be present
+     */
+    public void setAcro6Layers(boolean acro6Layers) {
+        this.acro6Layers = acro6Layers;
+    }
+
+    /**
+     * Gets the run direction.
+     *
+     * @return the run direction
+     */
+    public int getRunDirection() {
+        return runDirection;
+    }
+
+    /**
+     * Sets the run direction in the n2 and n4 layer.
+     *
+     * @param runDirection the run direction
+     */
+    public void setRunDirection(int runDirection) {
+        if (runDirection < PdfWriter.RUN_DIRECTION_DEFAULT
+                || runDirection > PdfWriter.RUN_DIRECTION_RTL) {
+            throw new RuntimeException(MessageLocalization.getComposedMessage(
+                    "invalid.run.direction.1", runDirection));
         }
+        this.runDirection = runDirection;
+    }
+
+    /**
+     * Getter for property signatureEvent.
+     *
+     * @return Value of property signatureEvent.
+     */
+    public SignatureEvent getSignatureEvent() {
+        return this.signatureEvent;
+    }
+
+    /**
+     * Sets the signature event to allow modification of the signature dictionary.
+     *
+     * @param signatureEvent the signature event
+     */
+    public void setSignatureEvent(SignatureEvent signatureEvent) {
+        this.signatureEvent = signatureEvent;
+    }
+
+    /**
+     * Gets the background image for the layer 2.
+     *
+     * @return the background image for the layer 2
+     */
+    public Image getImage() {
+        return this.image;
+    }
+
+    /**
+     * Sets the background image for the layer 2.
+     *
+     * @param image the background image for the layer 2
+     */
+    public void setImage(Image image) {
+        this.image = image;
+    }
+
+    /**
+     * Gets the scaling to be applied to the background image.
+     *
+     * @return the scaling to be applied to the background image
+     */
+    public float getImageScale() {
+        return this.imageScale;
     }
-  }
-
-  private void addDocMDP(PdfDictionary crypto) {
-    PdfDictionary reference = new PdfDictionary();
-    PdfDictionary transformParams = new PdfDictionary();
-    transformParams.put(PdfName.P, new PdfNumber(certificationLevel));
-    transformParams.put(PdfName.V, new PdfName("1.2"));
-    transformParams.put(PdfName.TYPE, PdfName.TRANSFORMPARAMS);
-    reference.put(PdfName.TRANSFORMMETHOD, PdfName.DOCMDP);
-    reference.put(PdfName.TYPE, PdfName.SIGREF);
-    reference.put(PdfName.TRANSFORMPARAMS, transformParams);
-    reference.put(new PdfName("DigestValue"), new PdfString("aa"));
-    PdfArray loc = new PdfArray();
-    loc.add(new PdfNumber(0));
-    loc.add(new PdfNumber(0));
-    reference.put(new PdfName("DigestLocation"), loc);
-    reference.put(new PdfName("DigestMethod"), new PdfName("MD5"));
-    reference.put(PdfName.DATA, writer.reader.getTrailer().get(PdfName.ROOT));
-    PdfArray types = new PdfArray();
-    types.add(reference);
-    crypto.put(PdfName.REFERENCE, types);
-  }
-
-  /**
-   * Gets the document bytes that are hashable when using external signatures.
-   * The general sequence is: preClose(), getRangeStream() and close().
-   * 
          
-   * 
-   * @return the document bytes that are hashable
-   */
-  public InputStream getRangeStream() {
-    return new PdfSignatureAppearance.RangeStream(raf, bout, range);
-  }
-
-  /**
-   * Gets the user made signature dictionary. This is the dictionary at the /V
-   * key.
-   * 
-   * @return the user made signature dictionary
-   */
-  public com.lowagie.text.pdf.PdfDictionary getCryptoDictionary() {
-    return cryptoDictionary;
-  }
-
-  /**
-   * Sets a user made signature dictionary. This is the dictionary at the /V
-   * key.
-   * 
-   * @param cryptoDictionary
-   *          a user made signature dictionary
-   */
-  public void setCryptoDictionary(
-      com.lowagie.text.pdf.PdfDictionary cryptoDictionary) {
-    this.cryptoDictionary = cryptoDictionary;
-  }
-
-  /**
-   * Gets the PdfStamper associated with this instance.
-   * 
-   * @return the PdfStamper associated with this instance
-   */
-  public com.lowagie.text.pdf.PdfStamper getStamper() {
-    return stamper;
-  }
-
-  void setStamper(com.lowagie.text.pdf.PdfStamper stamper) {
-    this.stamper = stamper;
-  }
-
-  /**
-   * Checks if the document is in the process of closing.
-   * 
-   * @return true if the document is in the process of closing,
-   *         false otherwise
-   */
-  public boolean isPreClosed() {
-    return preClosed;
-  }
-
-  /**
-   * Gets the instance of the standard signature dictionary. This instance is
-   * only available after pre close.
-   * 
          
-   * The main use is to insert external signatures.
-   * 
-   * @return the instance of the standard signature dictionary
-   */
-  public com.lowagie.text.pdf.PdfSigGenericPKCS getSigStandard() {
-    return sigStandard;
-  }
-
-  /**
-   * Gets the signing contact.
-   * 
-   * @return the signing contact
-   */
-  public String getContact() {
-    return this.contact;
-  }
-
-  /**
-   * Sets the signing contact.
-   * 
-   * @param contact
-   *          the signing contact
-   */
-  public void setContact(String contact) {
-    this.contact = contact;
-  }
-
-  /**
-   * Gets the n2 and n4 layer font.
-   * 
-   * @return the n2 and n4 layer font
-   */
-  public Font getLayer2Font() {
-    return this.layer2Font;
-  }
-
-  /**
-   * Sets the n2 and n4 layer font. If the font size is zero, auto-fit will be
-   * used.
-   * 
-   * @param layer2Font
-   *          the n2 and n4 font
-   */
-  public void setLayer2Font(Font layer2Font) {
-    this.layer2Font = layer2Font;
-  }
-
-  /**
-   * Gets the Acrobat 6.0 layer mode.
-   * 
-   * @return the Acrobat 6.0 layer mode
-   */
-  public boolean isAcro6Layers() {
-    return this.acro6Layers;
-  }
-
-  /**
-   * Acrobat 6.0 and higher recommends that only layer n2 and n4 be present.
-   * This method sets that mode.
-   * 
-   * @param acro6Layers
-   *          if true only the layers n2 and n4 will be present
-   */
-  public void setAcro6Layers(boolean acro6Layers) {
-    this.acro6Layers = acro6Layers;
-  }
-
-  /**
-   * Sets the run direction in the n2 and n4 layer.
-   * 
-   * @param runDirection
-   *          the run direction
-   */
-  public void setRunDirection(int runDirection) {
-    if (runDirection < PdfWriter.RUN_DIRECTION_DEFAULT
-        || runDirection > PdfWriter.RUN_DIRECTION_RTL)
-      throw new RuntimeException(MessageLocalization.getComposedMessage(
-          "invalid.run.direction.1", runDirection));
-    this.runDirection = runDirection;
-  }
-
-  /**
-   * Gets the run direction.
-   * 
-   * @return the run direction
-   */
-  public int getRunDirection() {
-    return runDirection;
-  }
-
-  /**
-   * Getter for property signatureEvent.
-   * 
-   * @return Value of property signatureEvent.
-   */
-  public SignatureEvent getSignatureEvent() {
-    return this.signatureEvent;
-  }
-
-  /**
-   * Sets the signature event to allow modification of the signature dictionary.
-   * 
-   * @param signatureEvent
-   *          the signature event
-   */
-  public void setSignatureEvent(SignatureEvent signatureEvent) {
-    this.signatureEvent = signatureEvent;
-  }
-
-  /**
-   * Gets the background image for the layer 2.
-   * 
-   * @return the background image for the layer 2
-   */
-  public Image getImage() {
-    return this.image;
-  }
-
-  /**
-   * Sets the background image for the layer 2.
-   * 
-   * @param image
-   *          the background image for the layer 2
-   */
-  public void setImage(Image image) {
-    this.image = image;
-  }
-
-  /**
-   * Gets the scaling to be applied to the background image.
-   * 
-   * @return the scaling to be applied to the background image
-   */
-  public float getImageScale() {
-    return this.imageScale;
-  }
-
-  /**
-   * Sets the scaling to be applied to the background image. If it's zero the
-   * image will fully fill the rectangle. If it's less than zero the image will
-   * fill the rectangle but will keep the proportions. If it's greater than zero
-   * that scaling will be applied. In any of the cases the image will always be
-   * centered. It's zero by default.
-   * 
-   * @param imageScale
-   *          the scaling to be applied to the background image
-   */
-  public void setImageScale(float imageScale) {
-    this.imageScale = imageScale;
-  }
-
-  /**
-   * Commands to draw a yellow question mark in a stream content
-   */
-  public static final String questionMark = "% DSUnknown\n" + "q\n" + "1 G\n"
-      + "1 g\n" + "0.1 0 0 0.1 9 0 cm\n" + "0 J 0 j 4 M []0 d\n" + "1 i \n"
-      + "0 g\n" + "313 292 m\n" + "313 404 325 453 432 529 c\n"
-      + "478 561 504 597 504 645 c\n" + "504 736 440 760 391 760 c\n"
-      + "286 760 271 681 265 626 c\n" + "265 625 l\n" + "100 625 l\n"
-      + "100 828 253 898 381 898 c\n" + "451 898 679 878 679 650 c\n"
-      + "679 555 628 499 538 435 c\n" + "488 399 467 376 467 292 c\n"
-      + "313 292 l\n" + "h\n" + "308 214 170 -164 re\n" + "f\n" + "0.44 G\n"
-      + "1.2 w\n" + "1 1 0.4 rg\n" + "287 318 m\n"
-      + "287 430 299 479 406 555 c\n" + "451 587 478 623 478 671 c\n"
-      + "478 762 414 786 365 786 c\n" + "260 786 245 707 239 652 c\n"
-      + "239 651 l\n" + "74 651 l\n" + "74 854 227 924 355 924 c\n"
-      + "425 924 653 904 653 676 c\n" + "653 581 602 525 512 461 c\n"
-      + "462 425 441 402 441 318 c\n" + "287 318 l\n" + "h\n"
-      + "282 240 170 -164 re\n" + "B\n" + "Q\n";
-
-  /**
-   * Holds value of property contact.
-   */
-  private String contact;
-
-  /**
-   * Holds value of property layer2Font.
-   */
-  private Font layer2Font;
-
-  /**
-   * Holds value of property layer4Text.
-   */
-  private String layer4Text;
-
-  /**
-   * Holds value of property acro6Layers.
-   */
-  private boolean acro6Layers;
-
-  /**
-   * Holds value of property runDirection.
-   */
-  private int runDirection = PdfWriter.RUN_DIRECTION_NO_BIDI;
-
-  /**
-   * Holds value of property signatureEvent.
-   */
-  private SignatureEvent signatureEvent;
-
-  /**
-   * Holds value of property image.
-   */
-  private Image image;
-
-  /**
-   * Holds value of property imageScale.
-   */
-  private float imageScale;
-
-  /**
-     *
-     */
-  private static class RangeStream extends InputStream {
-    private final byte[] b = new byte[1];
-    private final RandomAccessFile raf;
-    private final byte[] bout;
-    private final long[] range;
-    private long rangePosition = 0;
-
-    private RangeStream(RandomAccessFile raf, byte[] bout, long[] range) {
-      this.raf = raf;
-      this.bout = bout;
-      this.range = range;
-    }
-
-    /**
-     * @see java.io.InputStream#read()
-     */
-    @Override
-    public int read() throws IOException {
-      int n = read(b);
-      if (n != 1)
-        return -1;
-      return b[0] & 0xff;
-    }
-
-    /**
-     * @see java.io.InputStream#read(byte[], int, int)
-     */
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-      if (b == null) {
-        throw new NullPointerException();
-      } else if ((off < 0) || (off > b.length) || (len < 0)
-          || ((off + len) > b.length) || ((off + len) < 0)) {
-        throw new IndexOutOfBoundsException();
-      } else if (len == 0) {
-        return 0;
-      }
-      if (rangePosition >= range[range.length - 2] + range[range.length - 1]) {
-        return -1;
-      }
-      for (int k = 0; k < range.length; k += 2) {
-        long start = range[k];
-        long end = start;
-        if (range.length > k + 1) {
-          end = start + range[k + 1];
+
+    /**
+     * Sets the scaling to be applied to the background image. If it's zero the image will fully fill the rectangle. If
+     * it's less than zero the image will fill the rectangle but will keep the proportions. If it's greater than zero
+     * that scaling will be applied. In any of the cases the image will always be centered. It's zero by default.
+     *
+     * @param imageScale the scaling to be applied to the background image
+     */
+    public void setImageScale(float imageScale) {
+        this.imageScale = imageScale;
+    }
+
+    /**
+     * Gets the certified status of this document.
+     *
+     * @return the certified status
+     */
+    public int getCertificationLevel() {
+        return this.certificationLevel;
+    }
+
+    /**
+     * Sets the document type to certified instead of simply signed.
+     *
+     * @param certificationLevel the values can be: NOT_CERTIFIED,
+     *                           CERTIFIED_NO_CHANGES_ALLOWED,
+     *                           CERTIFIED_FORM_FILLING and
+     *                           CERTIFIED_FORM_FILLING_AND_ANNOTATIONS
+     */
+    public void setCertificationLevel(int certificationLevel) {
+        this.certificationLevel = certificationLevel;
+    }
+
+    /**
+     * An interface to retrieve the signature dictionary for modification.
+     */
+    public interface SignatureEvent {
+
+        /**
+         * Allows modification of the signature dictionary.
+         *
+         * @param sig the signature dictionary
+         */
+        void getSignatureDictionary(PdfDictionary sig);
+    }
+
+    /**
+     *
+     */
+    private static class RangeStream extends InputStream {
+
+        private final byte[] b = new byte[1];
+        private final RandomAccessFile raf;
+        private final byte[] bout;
+        private final long[] range;
+        private long rangePosition = 0;
+
+        private RangeStream(RandomAccessFile raf, byte[] bout, long[] range) {
+            this.raf = raf;
+            this.bout = bout;
+            this.range = range;
         }
-        if (rangePosition < start) {
-          rangePosition = start;
+
+        /**
+         * @see java.io.InputStream#read()
+         */
+        @Override
+        public int read() throws IOException {
+            int n = read(b);
+            if (n != 1) {
+                return -1;
+            }
+            return b[0] & 0xff;
         }
-        if (rangePosition < end) {
-          int lenf = (int) Math.min(len, end - rangePosition);
-          if (raf == null) {
-            System.arraycopy(bout, (int) rangePosition, b, off, lenf);
-          }else {
-            raf.seek(rangePosition);
-            raf.readFully(b, off, lenf);
-          }
-          rangePosition += lenf;
-          return lenf;
+
+        /**
+         * @see java.io.InputStream#read(byte[], int, int)
+         */
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            if (b == null) {
+                throw new NullPointerException();
+            } else if ((off < 0) || (off > b.length) || (len < 0)
+                    || ((off + len) > b.length) || ((off + len) < 0)) {
+                throw new IndexOutOfBoundsException();
+            } else if (len == 0) {
+                return 0;
+            }
+            if (rangePosition >= range[range.length - 2] + range[range.length - 1]) {
+                return -1;
+            }
+            for (int k = 0; k < range.length; k += 2) {
+                long start = range[k];
+                long end = start;
+                if (range.length > k + 1) {
+                    end = start + range[k + 1];
+                }
+                if (rangePosition < start) {
+                    rangePosition = start;
+                }
+                if (rangePosition < end) {
+                    int lenf = (int) Math.min(len, end - rangePosition);
+                    if (raf == null) {
+                        System.arraycopy(bout, (int) rangePosition, b, off, lenf);
+                    } else {
+                        raf.seek(rangePosition);
+                        raf.readFully(b, off, lenf);
+                    }
+                    rangePosition += lenf;
+                    return lenf;
+                }
+            }
+            return -1;
         }
-      }
-      return -1;
-    }
-  }
-
-  /**
-   * An interface to retrieve the signature dictionary for modification.
-   */
-  public interface SignatureEvent {
-    /**
-     * Allows modification of the signature dictionary.
-     * 
-     * @param sig
-     *          the signature dictionary
-     */
-    void getSignatureDictionary(PdfDictionary sig);
-  }
-
-  private int certificationLevel = NOT_CERTIFIED;
-
-  /**
-   * Gets the certified status of this document.
-   * 
-   * @return the certified status
-   */
-  public int getCertificationLevel() {
-    return this.certificationLevel;
-  }
-
-  /**
-   * Sets the document type to certified instead of simply signed.
-   * 
-   * @param certificationLevel
-   *          the values can be: NOT_CERTIFIED,
-   *          CERTIFIED_NO_CHANGES_ALLOWED,
-   *          CERTIFIED_FORM_FILLING and
-   *          CERTIFIED_FORM_FILLING_AND_ANNOTATIONS
-   */
-  public void setCertificationLevel(int certificationLevel) {
-    this.certificationLevel = certificationLevel;
-  }
+    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureBuildProperties.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureBuildProperties.java
index 7058181e8..fb2181561 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureBuildProperties.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSignatureBuildProperties.java
@@ -1,25 +1,23 @@
 package com.lowagie.text.pdf;
 
 /**
- * The build data dictionary contains information from the signature handler or software 
- * module that was used to create the signature. Not all entries are relevant for all 
- * entries in the build properties dictionary.
- * 
+ * The build data dictionary contains information from the signature handler or software module that was used to create
+ * the signature. Not all entries are relevant for all entries in the build properties dictionary.
+ * 
          
  * (Referenced from the "Digital Signature Build Dictionary Specification")
- * 
- * @author Lonzak
  *
+ * @author Lonzak
  */
-public class PdfSignatureBuildProperties extends PdfDictionary{
-    
+public class PdfSignatureBuildProperties extends PdfDictionary {
+
     public PdfSignatureBuildProperties() {
         super();
     }
-    
+
     /**
-     * Returns the {@link PdfSignatureAppDataDict} from this dictionary. If it
-     * doesn't exist, a new {@link PdfSignatureAppDataDict} is added.
-     * 
+     * Returns the {@link PdfSignatureAppDataDict} from this dictionary. If it doesn't exist, a new
+     * {@link PdfSignatureAppDataDict} is added.
+     *
      * @return {@link PdfSignatureAppDataDict}
      */
     public PdfSignatureAppDataDict getPdfSignatureAppProperty() {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSmartCopy.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSmartCopy.java
index f66ab4071..0448bade1 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSmartCopy.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSmartCopy.java
@@ -18,9 +18,9 @@
  * All Rights Reserved.
  * Co-Developer of the code is Paulo Soares. Portions created by the Co-Developer
  * are Copyright (C) 2000, 2001, 2002 by Paulo Soares. All Rights Reserved.
- * 
+ *
  * This class was written by Michael Neuweiler based on hints given by Bruno Lowagie
- * 
+ *
  * Contributor(s): all the names of the contributors are added in the source code
  * where applicable.
  *
@@ -50,6 +50,9 @@
  */
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.ExceptionConverter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.security.MessageDigest;
@@ -57,44 +60,40 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.ExceptionConverter;
-
 
 /**
- * PdfSmartCopy has the same functionality as PdfCopy,
- * but when resources (such as fonts, images,...) are
- * encountered, a reference to these resources is saved
- * in a cache, so that they can be reused.
- * This requires more memory, but reduces the file size
- * of the resulting PDF document.
+ * PdfSmartCopy has the same functionality as PdfCopy, but when resources (such as fonts, images,...) are encountered, a
+ * reference to these resources is saved in a cache, so that they can be reused. This requires more memory, but reduces
+ * the file size of the resulting PDF document.
  */
 
 public class PdfSmartCopy extends PdfCopy {
 
-    /** the cache with the streams and references. */
+    /**
+     * the cache with the streams and references.
+     */
     private Map streamMap = null;
 
-    /** Creates a PdfSmartCopy instance.
-     * @param os the OutputStream
+    /**
+     * Creates a PdfSmartCopy instance.
+     *
+     * @param os       the OutputStream
      * @param document the document
-     * @throws DocumentException on error */
+     * @throws DocumentException on error
+     */
     public PdfSmartCopy(Document document, OutputStream os) throws DocumentException {
         super(document, os);
         this.streamMap = new HashMap<>();
     }
+
     /**
-     * Translate a PRIndirectReference to a PdfIndirectReference
-     * In addition, translates the object numbers, and copies the
-     * referenced object to the output file if it wasn't available
-     * in the cache yet. If it's in the cache, the reference to
-     * the already used stream is returned.
-     * 
-     * NB: PRIndirectReferences (and PRIndirectObjects) really need to know what
-     * file they came from, because each file has its own namespace. The translation
-     * we do from their namespace to ours is *at best* heuristic, and guaranteed to
-     * fail under some circumstances.
+     * Translate a PRIndirectReference to a PdfIndirectReference In addition, translates the object numbers, and copies
+     * the referenced object to the output file if it wasn't available in the cache yet. If it's in the cache, the
+     * reference to the already used stream is returned.
+     * 
          
+     * NB: PRIndirectReferences (and PRIndirectObjects) really need to know what file they came from, because each file
+     * has its own namespace. The translation we do from their namespace to ours is *at best* heuristic, and guaranteed
+     * to fail under some circumstances.
      */
     protected PdfIndirectReference copyIndirect(PRIndirectReference in) throws IOException, BadPdfFormatException {
         PdfObject srcObj = PdfReader.getPdfObjectRelease(in);
@@ -105,14 +104,13 @@ protected PdfIndirectReference copyIndirect(PRIndirectReference in) throws IOExc
         }
         if (srcObj.isStream()) {
             try {
-                streamKey = new ByteStore((PRStream)srcObj);
+                streamKey = new ByteStore((PRStream) srcObj);
                 validStream = true;
                 PdfIndirectReference streamRef = streamMap.get(streamKey);
                 if (streamRef != null) {
                     return streamRef;
                 }
-            }
-            catch (IOException ioe) {
+            } catch (IOException ioe) {
                 //
             }
         }
@@ -131,7 +129,7 @@ protected PdfIndirectReference copyIndirect(PRIndirectReference in) throws IOExc
             indirects.put(key, iRef);
         }
         if (srcObj.isDictionary()) {
-            PdfObject type = PdfReader.getPdfObjectRelease(((PdfDictionary)srcObj).get(PdfName.TYPE));
+            PdfObject type = PdfReader.getPdfObjectRelease(((PdfDictionary) srcObj).get(PdfName.TYPE));
             if (PdfName.PAGE.equals(type)) {
                 return theRef;
             }
@@ -148,17 +146,16 @@ protected PdfIndirectReference copyIndirect(PRIndirectReference in) throws IOExc
     }
 
     static class ByteStore {
+
+        private final int MAX_LEVELS = 100;
         private byte[] b;
         private int hash;
         private MessageDigest md5;
-        
-        private final int MAX_LEVELS = 100;
-        
+
         ByteStore(PRStream str) throws IOException {
             try {
                 md5 = MessageDigest.getInstance("MD5");
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 throw new ExceptionConverter(e);
             }
             ByteBuffer bb = new ByteBuffer();
@@ -179,26 +176,22 @@ private void serObject(PdfObject obj, int level, ByteBuffer bb) throws IOExcepti
             obj = PdfReader.getPdfObject(obj);
             if (obj.isStream()) {
                 bb.append("$B");
-                serDic((PdfDictionary)obj, level - 1, bb);
+                serDic((PdfDictionary) obj, level - 1, bb);
                 md5.reset();
-                bb.append(md5.digest(PdfReader.getStreamBytesRaw((PRStream)obj)));
-            }
-            else if (obj.isDictionary()) {
-                serDic((PdfDictionary)obj, level - 1, bb);
-            }
-            else if (obj.isArray()) {
-                serArray((PdfArray)obj, level - 1, bb);
-            }
-            else if (obj.isString()) {
+                bb.append(md5.digest(PdfReader.getStreamBytesRaw((PRStream) obj)));
+            } else if (obj.isDictionary()) {
+                serDic((PdfDictionary) obj, level - 1, bb);
+            } else if (obj.isArray()) {
+                serArray((PdfArray) obj, level - 1, bb);
+            } else if (obj.isString()) {
                 bb.append("$S").append(obj.toString());
-            }
-            else if (obj.isName()) {
+            } else if (obj.isName()) {
                 bb.append("$N").append(obj.toString());
-            }
-            else
+            } else {
                 bb.append("$L").append(obj.toString());
+            }
         }
-        
+
         private void serDic(PdfDictionary dic, int level, ByteBuffer bb) throws IOException {
             bb.append("$D");
             if (level <= 0) {
@@ -211,7 +204,7 @@ private void serDic(PdfDictionary dic, int level, ByteBuffer bb) throws IOExcept
                 serObject(dic.get((PdfName) key), level, bb);
             }
         }
-        
+
         private void serArray(PdfArray array, int level, ByteBuffer bb) throws IOException {
             bb.append("$A");
             if (level <= 0) {
@@ -221,7 +214,6 @@ private void serArray(PdfArray array, int level, ByteBuffer bb) throws IOExcepti
                 serObject(array.getPdfObject(k), level, bb);
             }
         }
-        
 
 
         public boolean equals(Object obj) {
@@ -231,7 +223,7 @@ public boolean equals(Object obj) {
             if (hashCode() != obj.hashCode()) {
                 return false;
             }
-            return Arrays.equals(b, ((ByteStore)obj).b);
+            return Arrays.equals(b, ((ByteStore) obj).b);
         }
 
         public int hashCode() {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSpotColor.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSpotColor.java
index ccadf67d0..8f2176f9e 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfSpotColor.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfSpotColor.java
@@ -49,69 +49,76 @@
 
 package com.lowagie.text.pdf;
 
-import java.awt.Color;
 import com.lowagie.text.error_messages.MessageLocalization;
+import java.awt.Color;
 
 /**
  * A PdfSpotColor defines a ColorSpace
  *
- * @see        PdfDictionary
+ * @see PdfDictionary
  */
 
-public class PdfSpotColor{
-    
-/**    The color name */
+public class PdfSpotColor {
+
+    /**
+     * The color name
+     */
     public PdfName name;
-    
-/** The alternative color space */
+
+    /**
+     * The alternative color space
+     */
     public Color altcs;
     // constructors
-    
+
     /**
      * Constructs a new PdfSpotColor.
      *
-     * @param        name        a String value
-     * @param        altcs        an alternative colorspace value
+     * @param name  a String value
+     * @param altcs an alternative colorspace value
      */
-    
+
     public PdfSpotColor(String name, Color altcs) {
         this.name = new PdfName(name);
         this.altcs = altcs;
     }
-    
+
     /**
      * Gets the alternative ColorSpace.
+     *
      * @return a Color
      */
     public Color getAlternativeCS() {
         return altcs;
     }
-    
+
     protected PdfObject getSpotObject(PdfWriter writer) {
         PdfArray array = new PdfArray(PdfName.SEPARATION);
         array.add(name);
         PdfFunction func = null;
         if (altcs instanceof ExtendedColor) {
-            int type = ((ExtendedColor)altcs).type;
+            int type = ((ExtendedColor) altcs).type;
             switch (type) {
                 case ExtendedColor.TYPE_GRAY:
                     array.add(PdfName.DEVICEGRAY);
-                    func = PdfFunction.type2(writer, new float[]{0, 1}, null, new float[]{0}, new float[]{((GrayColor)altcs).getGray()}, 1);
+                    func = PdfFunction.type2(writer, new float[]{0, 1}, null, new float[]{0},
+                            new float[]{((GrayColor) altcs).getGray()}, 1);
                     break;
                 case ExtendedColor.TYPE_CMYK:
                     array.add(PdfName.DEVICECMYK);
-                    CMYKColor cmyk = (CMYKColor)altcs;
+                    CMYKColor cmyk = (CMYKColor) altcs;
                     func = PdfFunction.type2(writer, new float[]{0, 1}, null, new float[]{0, 0, 0, 0},
-                        new float[]{cmyk.getCyan(), cmyk.getMagenta(), cmyk.getYellow(), cmyk.getBlack()}, 1);
+                            new float[]{cmyk.getCyan(), cmyk.getMagenta(), cmyk.getYellow(), cmyk.getBlack()}, 1);
                     break;
                 default:
-                    throw new RuntimeException(MessageLocalization.getComposedMessage("only.rgb.gray.and.cmyk.are.supported.as.alternative.color.spaces"));
+                    throw new RuntimeException(MessageLocalization.getComposedMessage(
+                            "only.rgb.gray.and.cmyk.are.supported.as.alternative.color.spaces"));
             }
-        }
-        else {
+        } else {
             array.add(PdfName.DEVICERGB);
             func = PdfFunction.type2(writer, new float[]{0, 1}, null, new float[]{1, 1, 1},
-                new float[]{(float)altcs.getRed() / 255, (float)altcs.getGreen() / 255, (float)altcs.getBlue() / 255}, 1);
+                    new float[]{(float) altcs.getRed() / 255, (float) altcs.getGreen() / 255,
+                            (float) altcs.getBlue() / 255}, 1);
         }
         array.add(func.getReference());
         return array;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamper.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamper.java
index 77123e919..83f608009 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamper.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamper.java
@@ -70,108 +70,257 @@
 import java.util.List;
 import java.util.Map;
 
-/** Applies extra content to the pages of a PDF document.
- * This extra content can be all the objects allowed in PdfContentByte
- * including pages from other Pdfs. The original PDF will keep
- * all the interactive elements including bookmarks, links and form fields.
+/**
+ * Applies extra content to the pages of a PDF document. This extra content can be all the objects allowed in
+ * PdfContentByte including pages from other Pdfs. The original PDF will keep all the interactive elements including
+ * bookmarks, links and form fields.
  * 
          
- * It is also possible to change the field values and to
- * flatten them. New fields can be added but not flattened.
+ * It is also possible to change the field values and to flatten them. New fields can be added but not flattened.
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class PdfStamper
-    implements PdfViewerPreferences, PdfEncryptionSettings, AutoCloseable {
+        implements PdfViewerPreferences, PdfEncryptionSettings, AutoCloseable {
+
     /**
      * The writer
-     */    
+     */
     protected PdfStamperImp stamper;
     private Map moreInfo;
     private boolean hasSignature;
     private PdfSignatureAppearance sigApp;
     private boolean cleanMetadata = false;
 
-    /** Starts the process of adding extra content to an existing PDF
-     * document.
+    /**
+     * Starts the process of adding extra content to an existing PDF document.
+     *
      * @param reader the original document. It cannot be reused
-     * @param os the output stream
+     * @param os     the output stream
      * @throws DocumentException on error
-     * @throws IOException on error
+     * @throws IOException       on error
      */
     public PdfStamper(PdfReader reader, OutputStream os) throws DocumentException, IOException {
         stamper = new PdfStamperImp(reader, os, '\0', false);
     }
 
     /**
-     * Starts the process of adding extra content to an existing PDF
-     * document.
-     * @param reader the original document. It cannot be reused
-     * @param os the output stream
-     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original
-     * document
+     * Starts the process of adding extra content to an existing PDF document.
+     *
+     * @param reader     the original document. It cannot be reused
+     * @param os         the output stream
+     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original document
      * @throws DocumentException on error
-     * @throws IOException on error
+     * @throws IOException       on error
      */
     public PdfStamper(PdfReader reader, OutputStream os, char pdfVersion) throws DocumentException, IOException {
         stamper = new PdfStamperImp(reader, os, pdfVersion, false);
     }
 
     /**
-     * Starts the process of adding extra content to an existing PDF
-     * document, possibly as a new revision.
-     * @param reader the original document. It cannot be reused
-     * @param os the output stream
-     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original
-     * document
-     * @param append if true appends the document changes as a new revision. This is
-     * only useful for multiple signatures as nothing is gained in speed or memory
+     * Starts the process of adding extra content to an existing PDF document, possibly as a new revision.
+     *
+     * @param reader     the original document. It cannot be reused
+     * @param os         the output stream
+     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original document
+     * @param append     if true appends the document changes as a new revision. This is only useful for
+     *                   multiple signatures as nothing is gained in speed or memory
      * @throws DocumentException on error
-     * @throws IOException on error
+     * @throws IOException       on error
      */
-    public PdfStamper(PdfReader reader, OutputStream os, char pdfVersion, boolean append) throws DocumentException, IOException {
+    public PdfStamper(PdfReader reader, OutputStream os, char pdfVersion, boolean append)
+            throws DocumentException, IOException {
         stamper = new PdfStamperImp(reader, os, pdfVersion, append);
     }
 
-    /** Gets the optional String map to add or change values in
-     * the info dictionary.
-     * @return the map or null
+    /**
+     * Applies a digital signature to a document, possibly as a new revision, making possible multiple signatures. The
+     * returned PdfStamper can be used normally as the signature is only applied when closing.
+     * 
          
+     * A possible use for adding a signature without invalidating an existing one is:
+     * 
          
+     * 
          +     * KeyStore ks = KeyStore.getInstance("pkcs12");
+     * ks.load(new FileInputStream("my_private_key.pfx"), "my_password".toCharArray());
+     * String alias = (String)ks.aliases().nextElement();
+     * PrivateKey key = (PrivateKey)ks.getKey(alias, "my_password".toCharArray());
+     * Certificate[] chain = ks.getCertificateChain(alias);
+     * PdfReader reader = new PdfReader("original.pdf");
+     * FileOutputStream fout = new FileOutputStream("signed.pdf");
+     * PdfStamper stp = PdfStamper.createSignature(reader, fout, '\0', new
+     * File("/temp"), true);
+     * PdfSignatureAppearance sap = stp.getSignatureAppearance();
+     * sap.setCrypto(key, chain, null, PdfSignatureAppearance.WINCER_SIGNED);
+     * sap.setReason("I'm the author");
+     * sap.setLocation("Lisbon");
+     * // comment next line to have an invisible signature
+     * sap.setVisibleSignature(new Rectangle(100, 100, 200, 200), 1, null);
+     * stp.close();
+     * 
          
+     *
+     * @param reader     the original document
+     * @param os         the output stream or null to keep the document in the temporary file
+     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original document
+     * @param tempFile   location of the temporary file. If it's a directory a temporary file will be created there. If
+     *                   it's a file it will be used directly. The file will be deleted on exit unless os
+     *                   is null. In that case the document can be retrieved directly from the temporary file. If it's
+     *                   null no temporary file will be created and memory will be used
+     * @param append     if true the signature and all the other content will be added as a new revision
+     *                   thus not invalidating existing signatures
+     * @return a PdfStamper
+     * @throws DocumentException on error
+     * @throws IOException       on error
+     */
+    public static PdfStamper createSignature(PdfReader reader, OutputStream os, char pdfVersion, File tempFile,
+            boolean append) throws DocumentException, IOException {
+        PdfStamper stp;
+        if (tempFile == null) {
+            ByteBuffer bout = new ByteBuffer();
+            stp = new PdfStamper(reader, bout, pdfVersion, append);
+            stp.sigApp = new PdfSignatureAppearance(stp.stamper);
+            stp.sigApp.setSigout(bout);
+        } else {
+            if (tempFile.isDirectory()) {
+                tempFile = Files.createTempFile(tempFile.toPath(), "pdf", null).toFile();
+            }
+            FileOutputStream fout = new FileOutputStream(tempFile);
+            stp = new PdfStamper(reader, fout, pdfVersion, append);
+            stp.sigApp = new PdfSignatureAppearance(stp.stamper);
+            stp.sigApp.setTempFile(tempFile);
+        }
+        stp.sigApp.setOriginalout(os);
+        stp.sigApp.setStamper(stp);
+        stp.hasSignature = true;
+        PdfDictionary catalog = reader.getCatalog();
+        PdfDictionary acroForm = (PdfDictionary) PdfReader.getPdfObjectNullConverting(catalog.get(PdfName.ACROFORM),
+                catalog);
+        if (acroForm != null) {
+            acroForm.remove(PdfName.NEEDAPPEARANCES);
+            stp.stamper.markUsed(acroForm);
+        }
+        return stp;
+    }
+
+    /**
+     * Applies a digital signature to a document. The returned PdfStamper can be used normally as the signature is only
+     * applied when closing.
+     * 
          
+     * Note that the pdf is created in memory.
+     * 
          
+     * A possible use is:
+     * 
          
+     * 
          +     * KeyStore ks = KeyStore.getInstance("pkcs12");
+     * ks.load(new FileInputStream("my_private_key.pfx"), "my_password".toCharArray());
+     * String alias = (String)ks.aliases().nextElement();
+     * PrivateKey key = (PrivateKey)ks.getKey(alias, "my_password".toCharArray());
+     * Certificate[] chain = ks.getCertificateChain(alias);
+     * PdfReader reader = new PdfReader("original.pdf");
+     * FileOutputStream fout = new FileOutputStream("signed.pdf");
+     * PdfStamper stp = PdfStamper.createSignature(reader, fout, '\0');
+     * PdfSignatureAppearance sap = stp.getSignatureAppearance();
+     * sap.setCrypto(key, chain, null, PdfSignatureAppearance.WINCER_SIGNED);
+     * sap.setReason("I'm the author");
+     * sap.setLocation("Lisbon");
+     * // comment next line to have an invisible signature
+     * sap.setVisibleSignature(new Rectangle(100, 100, 200, 200), 1, null);
+     * stp.close();
+     * 
          
+     *
+     * @param reader     the original document
+     * @param os         the output stream
+     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original document
+     * @return a PdfStamper
+     * @throws DocumentException on error
+     * @throws IOException       on error
+     */
+    public static PdfStamper createSignature(PdfReader reader, OutputStream os, char pdfVersion)
+            throws DocumentException, IOException {
+        return createSignature(reader, os, pdfVersion, null, false);
+    }
+
+    /**
+     * Applies a digital signature to a document. The returned PdfStamper can be used normally as the signature is only
+     * applied when closing.
+     * 
          
+     * A possible use is:
+     * 
          
+     * 
          +     * KeyStore ks = KeyStore.getInstance("pkcs12");
+     * ks.load(new FileInputStream("my_private_key.pfx"), "my_password".toCharArray());
+     * String alias = (String)ks.aliases().nextElement();
+     * PrivateKey key = (PrivateKey)ks.getKey(alias, "my_password".toCharArray());
+     * Certificate[] chain = ks.getCertificateChain(alias);
+     * PdfReader reader = new PdfReader("original.pdf");
+     * FileOutputStream fout = new FileOutputStream("signed.pdf");
+     * PdfStamper stp = PdfStamper.createSignature(reader, fout, '\0', new File("/temp"));
+     * PdfSignatureAppearance sap = stp.getSignatureAppearance();
+     * sap.setCrypto(key, chain, null, PdfSignatureAppearance.WINCER_SIGNED);
+     * sap.setReason("I'm the author");
+     * sap.setLocation("Lisbon");
+     * // comment next line to have an invisible signature
+     * sap.setVisibleSignature(new Rectangle(100, 100, 200, 200), 1, null);
+     * stp.close();
+     * 
          
      *
+     * @param reader     the original document
+     * @param os         the output stream or null to keep the document in the temporary file
+     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original document
+     * @param tempFile   location of the temporary file. If it's a directory a temporary file will be created there. If
+     *                   it's a file it will be used directly. The file will be deleted on exit unless os
+     *                   is null. In that case the document can be retrieved directly from the temporary file. If it's
+     *                   null no temporary file will be created and memory will be used
+     * @return a PdfStamper
+     * @throws DocumentException on error
+     * @throws IOException       on error
+     */
+    public static PdfStamper createSignature(PdfReader reader, OutputStream os, char pdfVersion, File tempFile)
+            throws DocumentException, IOException {
+        return createSignature(reader, os, pdfVersion, tempFile, false);
+    }
+
+    /**
+     * Gets the optional String map to add or change values in the info dictionary.
+     *
+     * @return the map or null
      */
     public Map getInfoDictionary() {
         return moreInfo;
     }
-    
+
     /**
-     * An option to make this stamper to clean metadata in the generated file. You must call this method before closing the stamper.
-     */
-    public void cleanMetadata() {
-      Map meta = new HashMap<>();
-      meta.put("Title", null);
-      meta.put("Author", null);
-      meta.put("Subject", null);
-      meta.put("Producer", null);
-      meta.put("Keywords", null);
-      meta.put("Creator", null);
-      meta.put("CreationDate", null);
-      meta.put("ModDate",null);
-      setInfoDictionary(meta);
-      this.cleanMetadata = true;
-    }
-
-    /** An optional String map to add or change values in
-     * the info dictionary. Entries with null
-     * values delete the key in the original info dictionary
-     * @param moreInfo additional entries to the info dictionary
+     * An optional String map to add or change values in the info dictionary. Entries with
+     * null values delete the key in the original info dictionary
      *
+     * @param moreInfo additional entries to the info dictionary
      */
     public void setInfoDictionary(Map moreInfo) {
         this.moreInfo = moreInfo;
     }
 
     /**
-     * Replaces a page from this document with a page from other document. Only the content
-     * is replaced not the fields and annotations. This method must be called before 
-     * getOverContent() or getUndercontent() are called for the same page.
-     * @param r the PdfReader from where the new page will be imported
+     * An option to make this stamper to clean metadata in the generated file. You must call this method before closing
+     * the stamper.
+     */
+    public void cleanMetadata() {
+        Map meta = new HashMap<>();
+        meta.put("Title", null);
+        meta.put("Author", null);
+        meta.put("Subject", null);
+        meta.put("Producer", null);
+        meta.put("Keywords", null);
+        meta.put("Creator", null);
+        meta.put("CreationDate", null);
+        meta.put("ModDate", null);
+        setInfoDictionary(meta);
+        this.cleanMetadata = true;
+    }
+
+    /**
+     * Replaces a page from this document with a page from other document. Only the content is replaced not the fields
+     * and annotations. This method must be called before getOverContent() or getUndercontent() are called for the same
+     * page.
+     *
+     * @param r            the PdfReader from where the new page will be imported
      * @param pageImported the page number of the imported page
      * @param pageReplaced the page to replace in this document
      * @since iText 2.1.1
@@ -179,54 +328,54 @@ public void setInfoDictionary(Map moreInfo) {
     public void replacePage(PdfReader r, int pageImported, int pageReplaced) {
         stamper.replacePage(r, pageImported, pageReplaced);
     }
-    
+
     /**
-     * Inserts a blank page. All the pages above and including pageNumber will
-     * be shifted up. If pageNumber is bigger than the total number of pages
-     * the new page will be the last one.
+     * Inserts a blank page. All the pages above and including pageNumber will be shifted up. If
+     * pageNumber is bigger than the total number of pages the new page will be the last one.
+     *
      * @param pageNumber the page number position where the new page will be inserted
-     * @param mediabox the size of the new page
-     */    
+     * @param mediabox   the size of the new page
+     */
     public void insertPage(int pageNumber, Rectangle mediabox) {
         stamper.insertPage(pageNumber, mediabox);
     }
-    
+
     /**
      * Gets the signing instance. The appearances and other parameters can the be set.
+     *
      * @return the signing instance
-     */    
+     */
     public PdfSignatureAppearance getSignatureAppearance() {
         return sigApp;
     }
 
     /**
-     * Closes the document. No more content can be written after the
-     * document is closed.
+     * Closes the document. No more content can be written after the document is closed.
      * 
          
-     * If closing a signed document with an external signature the closing must be done
-     * in the PdfSignatureAppearance instance.
+     * If closing a signed document with an external signature the closing must be done in the
+     * PdfSignatureAppearance instance.
+     *
      * @throws DocumentException on error
-     * @throws IOException on error
+     * @throws IOException       on error
      */
     public void close() throws DocumentException, IOException {
         if (!hasSignature) {
             if (cleanMetadata && stamper.xmpMetadata == null) {
-              ByteArrayOutputStream baos = new ByteArrayOutputStream();
-              try {
-                XmpWriter writer = new XmpWriter(baos, moreInfo);
-                writer.close();
-                stamper.setXmpMetadata(baos.toByteArray());
-              }
-              catch (IOException ignore) {
-                // ignore exception
-              }
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                try {
+                    XmpWriter writer = new XmpWriter(baos, moreInfo);
+                    writer.close();
+                    stamper.setXmpMetadata(baos.toByteArray());
+                } catch (IOException ignore) {
+                    // ignore exception
+                }
             }
             stamper.close(moreInfo);
             return;
         }
         sigApp.preClose();
         PdfSigGenericPKCS sig = sigApp.getSigStandard();
-        PdfLiteral lit = (PdfLiteral)sig.get(PdfName.CONTENTS);
+        PdfLiteral lit = (PdfLiteral) sig.get(PdfName.CONTENTS);
         int totalBuf = (lit.getPosLength() - 2) / 2;
         byte[] buf = new byte[8192];
         int n;
@@ -235,8 +384,7 @@ public void close() throws DocumentException, IOException {
             while ((n = inp.read(buf)) > 0) {
                 sig.getSigner().update(buf, 0, n);
             }
-        }
-        catch (SignatureException se) {
+        } catch (SignatureException se) {
             throw new ExceptionConverter(se);
         }
         buf = new byte[totalBuf];
@@ -250,143 +398,166 @@ public void close() throws DocumentException, IOException {
         stamper.reader.close();
     }
 
-    /** Gets a PdfContentByte to write under the page of
-     * the original document.
+    /**
+     * Gets a PdfContentByte to write under the page of the original document.
+     *
      * @param pageNum the page number where the extra content is written
-     * @return a PdfContentByte to write under the page of
-     * the original document
+     * @return a PdfContentByte to write under the page of the original document
      */
     public PdfContentByte getUnderContent(int pageNum) {
         return stamper.getUnderContent(pageNum);
     }
 
-    /** Gets a PdfContentByte to write over the page of
-     * the original document.
+    /**
+     * Gets a PdfContentByte to write over the page of the original document.
+     *
      * @param pageNum the page number where the extra content is written
-     * @return a PdfContentByte to write over the page of
-     * the original document
+     * @return a PdfContentByte to write over the page of the original document
      */
     public PdfContentByte getOverContent(int pageNum) {
         return stamper.getOverContent(pageNum);
     }
 
-    /** Checks if the content is automatically adjusted to compensate
-     * the original page rotation.
+    /**
+     * Checks if the content is automatically adjusted to compensate the original page rotation.
+     *
      * @return the auto-rotation status
      */
     public boolean isRotateContents() {
         return stamper.isRotateContents();
     }
 
-    /** Flags the content to be automatically adjusted to compensate
-     * the original page rotation. The default is true.
+    /**
+     * Flags the content to be automatically adjusted to compensate the original page rotation. The default is
+     * true.
+     *
      * @param rotateContents true to set auto-rotation, false
-     * otherwise
+     *                       otherwise
      */
     public void setRotateContents(boolean rotateContents) {
         stamper.setRotateContents(rotateContents);
     }
 
-    /** Sets the encryption options for this document. The userPassword and the
-     *  ownerPassword can be null or have zero length. In this case the ownerPassword
-     *  is replaced by a random string. The open permissions for the document can be
-     *  AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations,
-     *  AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting.
-     *  The permissions can be combined by ORing them.
-     * @param userPassword the user password. Can be null or empty
-     * @param ownerPassword the owner password. Can be null or empty
-     * @param permissions the user permissions
+    /**
+     * Sets the encryption options for this document. The userPassword and the ownerPassword can be null or have zero
+     * length. In this case the ownerPassword is replaced by a random string. The open permissions for the document can
+     * be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn, AllowScreenReaders,
+     * AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them.
+     *
+     * @param userPassword    the user password. Can be null or empty
+     * @param ownerPassword   the owner password. Can be null or empty
+     * @param permissions     the user permissions
      * @param strength128Bits true for 128 bit key length, false for 40 bit key length
      * @throws DocumentException if anything was already written to the output
      */
-    public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, boolean strength128Bits) throws DocumentException {
-        if (stamper.isAppend())
-            throw new DocumentException(MessageLocalization.getComposedMessage("append.mode.does.not.support.changing.the.encryption.status"));
-        if (stamper.isContentWritten())
-            throw new DocumentException(MessageLocalization.getComposedMessage("content.was.already.written.to.the.output"));
-        stamper.setEncryption(userPassword, ownerPassword, permissions, strength128Bits ? PdfWriter.STANDARD_ENCRYPTION_128 : PdfWriter.STANDARD_ENCRYPTION_40);
-    }
-
-    /** Sets the encryption options for this document. The userPassword and the
-     *  ownerPassword can be null or have zero length. In this case the ownerPassword
-     *  is replaced by a random string. The open permissions for the document can be
-     *  AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations,
-     *  AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting.
-     *  The permissions can be combined by ORing them.
-     * @param userPassword the user password. Can be null or empty
-     * @param ownerPassword the owner password. Can be null or empty
-     * @param permissions the user permissions
-     * @param encryptionType the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or ENCRYPTION_AES128.
-     * Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in cleartext
+    public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, boolean strength128Bits)
+            throws DocumentException {
+        if (stamper.isAppend()) {
+            throw new DocumentException(MessageLocalization.getComposedMessage(
+                    "append.mode.does.not.support.changing.the.encryption.status"));
+        }
+        if (stamper.isContentWritten()) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("content.was.already.written.to.the.output"));
+        }
+        stamper.setEncryption(userPassword, ownerPassword, permissions,
+                strength128Bits ? PdfWriter.STANDARD_ENCRYPTION_128 : PdfWriter.STANDARD_ENCRYPTION_40);
+    }
+
+    /**
+     * Sets the encryption options for this document. The userPassword and the ownerPassword can be null or have zero
+     * length. In this case the ownerPassword is replaced by a random string. The open permissions for the document can
+     * be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn, AllowScreenReaders,
+     * AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them.
+     *
+     * @param userPassword   the user password. Can be null or empty
+     * @param ownerPassword  the owner password. Can be null or empty
+     * @param permissions    the user permissions
+     * @param encryptionType the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or
+     *                       ENCRYPTION_AES128. Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in
+     *                       cleartext
      * @throws DocumentException if the document is already open
      */
-    public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType) throws DocumentException {
-        if (stamper.isAppend())
-            throw new DocumentException(MessageLocalization.getComposedMessage("append.mode.does.not.support.changing.the.encryption.status"));
-        if (stamper.isContentWritten())
-            throw new DocumentException(MessageLocalization.getComposedMessage("content.was.already.written.to.the.output"));
+    public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType)
+            throws DocumentException {
+        if (stamper.isAppend()) {
+            throw new DocumentException(MessageLocalization.getComposedMessage(
+                    "append.mode.does.not.support.changing.the.encryption.status"));
+        }
+        if (stamper.isContentWritten()) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("content.was.already.written.to.the.output"));
+        }
         stamper.setEncryption(userPassword, ownerPassword, permissions, encryptionType);
     }
 
     /**
-     * Sets the encryption options for this document. The userPassword and the
-     *  ownerPassword can be null or have zero length. In this case the ownerPassword
-     *  is replaced by a random string. The open permissions for the document can be
-     *  AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations,
-     *  AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting.
-     *  The permissions can be combined by ORing them.
-     * @param strength true for 128 bit key length, false for 40 bit key length
-     * @param userPassword the user password. Can be null or empty
+     * Sets the encryption options for this document. The userPassword and the ownerPassword can be null or have zero
+     * length. In this case the ownerPassword is replaced by a random string. The open permissions for the document can
+     * be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn, AllowScreenReaders,
+     * AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them.
+     *
+     * @param strength      true for 128 bit key length, false for 40 bit key length
+     * @param userPassword  the user password. Can be null or empty
      * @param ownerPassword the owner password. Can be null or empty
-     * @param permissions the user permissions
+     * @param permissions   the user permissions
      * @throws DocumentException if anything was already written to the output
      */
-    public void setEncryption(boolean strength, String userPassword, String ownerPassword, int permissions) throws DocumentException {
+    public void setEncryption(boolean strength, String userPassword, String ownerPassword, int permissions)
+            throws DocumentException {
         setEncryption(DocWriter.getISOBytes(userPassword), DocWriter.getISOBytes(ownerPassword), permissions, strength);
     }
 
     /**
-     * Sets the encryption options for this document. The userPassword and the
-     *  ownerPassword can be null or have zero length. In this case the ownerPassword
-     *  is replaced by a random string. The open permissions for the document can be
-     *  AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations,
-     *  AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting.
-     *  The permissions can be combined by ORing them.
-     * @param encryptionType the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or ENCRYPTION_AES128.
-     * Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in cleartext
-     * @param userPassword the user password. Can be null or empty
-     * @param ownerPassword the owner password. Can be null or empty
-     * @param permissions the user permissions
+     * Sets the encryption options for this document. The userPassword and the ownerPassword can be null or have zero
+     * length. In this case the ownerPassword is replaced by a random string. The open permissions for the document can
+     * be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn, AllowScreenReaders,
+     * AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them.
+     *
+     * @param encryptionType the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or
+     *                       ENCRYPTION_AES128. Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in
+     *                       cleartext
+     * @param userPassword   the user password. Can be null or empty
+     * @param ownerPassword  the owner password. Can be null or empty
+     * @param permissions    the user permissions
      * @throws DocumentException if anything was already written to the output
      */
-    public void setEncryption(int encryptionType, String userPassword, String ownerPassword, int permissions) throws DocumentException {
-        setEncryption(DocWriter.getISOBytes(userPassword), DocWriter.getISOBytes(ownerPassword), permissions, encryptionType);
+    public void setEncryption(int encryptionType, String userPassword, String ownerPassword, int permissions)
+            throws DocumentException {
+        setEncryption(DocWriter.getISOBytes(userPassword), DocWriter.getISOBytes(ownerPassword), permissions,
+                encryptionType);
     }
 
     /**
-     * Sets the certificate encryption options for this document. An array of one or more public certificates
-     * must be provided together with an array of the same size for the permissions for each certificate.
-     *  The open permissions for the document can be
-     *  AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations,
-     *  AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting.
-     *  The permissions can be combined by ORing them.
+     * Sets the certificate encryption options for this document. An array of one or more public certificates must be
+     * provided together with an array of the same size for the permissions for each certificate. The open permissions
+     * for the document can be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn,
+     * AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them.
      * Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in cleartext
-     * @param certs the public certificates to be used for the encryption
-     * @param permissions the user permissions for each of the certificates
-     * @param encryptionType the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or ENCRYPTION_AES128.
+     *
+     * @param certs          the public certificates to be used for the encryption
+     * @param permissions    the user permissions for each of the certificates
+     * @param encryptionType the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or
+     *                       ENCRYPTION_AES128.
      * @throws DocumentException if the encryption was set too late
      */
-     public void setEncryption(Certificate[] certs, int[] permissions, int encryptionType) throws DocumentException {
-        if (stamper.isAppend())
-            throw new DocumentException(MessageLocalization.getComposedMessage("append.mode.does.not.support.changing.the.encryption.status"));
-        if (stamper.isContentWritten())
-            throw new DocumentException(MessageLocalization.getComposedMessage("content.was.already.written.to.the.output"));
+    public void setEncryption(Certificate[] certs, int[] permissions, int encryptionType) throws DocumentException {
+        if (stamper.isAppend()) {
+            throw new DocumentException(MessageLocalization.getComposedMessage(
+                    "append.mode.does.not.support.changing.the.encryption.status"));
+        }
+        if (stamper.isContentWritten()) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("content.was.already.written.to.the.output"));
+        }
         stamper.setEncryption(certs, permissions, encryptionType);
-     }
-     
-    /** Gets a page from other PDF document. Note that calling this method more than
-     * once with the same parameters will retrieve the same object.
-     * @param reader the PDF document where the page is
+    }
+
+    /**
+     * Gets a page from other PDF document. Note that calling this method more than once with the same parameters will
+     * retrieve the same object.
+     *
+     * @param reader     the PDF document where the page is
      * @param pageNumber the page number. The first page is 1
      * @return the template representing the imported page
      */
@@ -394,50 +565,60 @@ public PdfImportedPage getImportedPage(PdfReader reader, int pageNumber) {
         return stamper.getImportedPage(reader, pageNumber);
     }
 
-    /** Gets the underlying PdfWriter.
+    /**
+     * Gets the underlying PdfWriter.
+     *
      * @return the underlying PdfWriter
      */
     public PdfWriter getWriter() {
         return stamper;
     }
 
-    /** Gets the underlying PdfReader.
+    /**
+     * Gets the underlying PdfReader.
+     *
      * @return the underlying PdfReader
      */
     public PdfReader getReader() {
         return stamper.reader;
     }
 
-    /** Gets the AcroFields object that allows to get and set field values
-     * and to merge FDF forms.
+    /**
+     * Gets the AcroFields object that allows to get and set field values and to merge FDF forms.
+     *
      * @return the AcroFields object
      */
     public AcroFields getAcroFields() {
         return stamper.getAcroFields();
     }
 
-    /** Determines if the fields are flattened on close. The fields added with
-     * {@link #addAnnotation(PdfAnnotation,int)} will never be flattened.
+    /**
+     * Determines if the fields are flattened on close. The fields added with {@link #addAnnotation(PdfAnnotation, int)}
+     * will never be flattened.
+     *
      * @param flat true to flatten the fields, false
-     * to keep the fields
+     *             to keep the fields
      */
     public void setFormFlattening(boolean flat) {
         stamper.setFormFlattening(flat);
     }
 
-    /** Determines if the FreeText annotations are flattened on close. 
+    /**
+     * Determines if the FreeText annotations are flattened on close.
+     *
      * @param flat true to flatten the FreeText annotations, false
-     * (the default) to keep the FreeText annotations as active content.
+     *             (the default) to keep the FreeText annotations as active content.
      */
     public void setFreeTextFlattening(boolean flat) {
         stamper.setFreeTextFlattening(flat);
     }
 
     /**
-     * Adds an annotation of form field in a specific page. This page number
-     * can be overridden with {@link PdfAnnotation#setPlaceInPage(int)}.
+     * Adds an annotation of form field in a specific page. This page number can be overridden with
+     * {@link PdfAnnotation#setPlaceInPage(int)}.
+     *
      * @param annot the annotation
-     * @param page the page
+     * @param page  the page
      */
     public void addAnnotation(PdfAnnotation annot, int page) {
         stamper.addAnnotation(annot, page);
@@ -445,14 +626,15 @@ public void addAnnotation(PdfAnnotation annot, int page) {
 
     /**
      * Adds an empty signature.
-     * @param name    the name of the signature
-     * @param page    the page number
-     * @param llx    lower left x coordinate of the signature's position
-     * @param lly    lower left y coordinate of the signature's position
-     * @param urx    upper right x coordinate of the signature's position
-     * @param ury    upper right y coordinate of the signature's position
-     * @return    a signature form field
-     * @since    2.1.4
+     *
+     * @param name the name of the signature
+     * @param page the page number
+     * @param llx  lower left x coordinate of the signature's position
+     * @param lly  lower left y coordinate of the signature's position
+     * @param urx  upper right x coordinate of the signature's position
+     * @param ury  upper right y coordinate of the signature's position
+     * @return a signature form field
+     * @since 2.1.4
      */
     public PdfFormField addSignature(String name, int page, float llx, float lly, float urx, float ury) {
         PdfAcroForm acroForm = stamper.getAcroForm();
@@ -462,19 +644,20 @@ public PdfFormField addSignature(String name, int page, float llx, float lly, fl
         addAnnotation(signature, page);
         return signature;
     }
-    
+
     /**
      * Adds the comments present in an FDF file.
+     *
      * @param fdf the FDF file
      * @throws IOException on error
-     */    
+     */
     public void addComments(FdfReader fdf) throws IOException {
         stamper.addComments(fdf);
     }
-    
+
     /**
-     * Sets the bookmarks. The list structure is defined in
-     * {@link SimpleBookmark}.
+     * Sets the bookmarks. The list structure is defined in {@link SimpleBookmark}.
+     *
      * @param outlines the bookmarks or null to remove any
      */
     public void setOutlines(List outlines) {
@@ -483,22 +666,22 @@ public void setOutlines(List outlines) {
 
     /**
      * Sets the thumbnail image for a page.
+     *
      * @param image the image
-     * @param page the page
-     * @throws PdfException on error
+     * @param page  the page
+     * @throws PdfException      on error
      * @throws DocumentException on error
-     */    
+     */
     public void setThumbnail(Image image, int page) throws DocumentException {
         stamper.setThumbnail(image, page);
     }
-    
+
     /**
-     * Adds name to the list of fields that will be flattened on close,
-     * all the other fields will remain. If this method is never called or is called
-     * with invalid field names, all the fields will be flattened.
+     * Adds name to the list of fields that will be flattened on close, all the other fields will remain.
+     * If this method is never called or is called with invalid field names, all the fields will be flattened.
      * 
          
-     * Calling setFormFlattening(true) is needed to have any kind of
-     * flattening.
+     * Calling setFormFlattening(true) is needed to have any kind of flattening.
+     *
      * @param name the field name
      * @return true if the field exists, false otherwise
      */
@@ -506,39 +689,44 @@ public boolean partialFormFlattening(String name) {
         return stamper.partialFormFlattening(name);
     }
 
-    /** Adds a JavaScript action at the document level. When the document
-     * opens all this JavaScript runs. The existing JavaScript will be replaced.
+    /**
+     * Adds a JavaScript action at the document level. When the document opens all this JavaScript runs. The existing
+     * JavaScript will be replaced.
+     *
      * @param js the JavaScript code
      */
     public void addJavaScript(String js) {
         stamper.addJavaScript(js, !PdfEncodings.isPdfDocEncoding(js));
     }
 
-    /** Adds a file attachment at the document level. Existing attachments will be kept.
+    /**
+     * Adds a file attachment at the document level. Existing attachments will be kept.
+     *
      * @param description the file description
-     * @param fileStore an array with the file. If it's null
-     * the file will be read from the disk
-     * @param file the path to the file. It will only be used if
-     * fileStore is not null
+     * @param fileStore   an array with the file. If it's null the file will be read from the disk
+     * @param file        the path to the file. It will only be used if
+     *                    fileStore is not null
      * @param fileDisplay the actual file name stored in the pdf
      * @throws IOException on error
-     */    
-    public void addFileAttachment(String description, byte[] fileStore, String file, String fileDisplay) throws IOException {
+     */
+    public void addFileAttachment(String description, byte[] fileStore, String file, String fileDisplay)
+            throws IOException {
         addFileAttachment(description, PdfFileSpecification.fileEmbedded(stamper, file, fileDisplay, fileStore));
     }
 
-    /** Adds a file attachment at the document level. Existing attachments will be kept.
+    /**
+     * Adds a file attachment at the document level. Existing attachments will be kept.
+     *
      * @param description the file description
-     * @param fs the file specification
+     * @param fs          the file specification
      * @throws IOException on error
-     */    
+     */
     public void addFileAttachment(String description, PdfFileSpecification fs) throws IOException {
         stamper.addFileAttachment(description, fs);
     }
 
     /**
-     * This is the most simple way to change a PDF into a
-     * portable collection. Choose one of the following names:
+     * This is the most simple way to change a PDF into a portable collection. Choose one of the following names:
      * 
            
      * 
          • PdfName.D (detailed view)
      * 
          • PdfName.T (tiled view)
@@ -547,43 +735,49 @@ public void addFileAttachment(String description, PdfFileSpecification fs) throw
      * Pass this name as a parameter and your PDF will be
      * a portable collection with all the embedded and
      * attached files as entries.
+     *
      * @param initialView can be PdfName.D, PdfName.T or PdfName.H
      */
-    public void makePackage( PdfName initialView ) {
+    public void makePackage(PdfName initialView) {
         PdfCollection collection = new PdfCollection(0);
         collection.put(PdfName.VIEW, initialView);
-        stamper.makePackage( collection );
+        stamper.makePackage(collection);
     }
 
     /**
      * Adds or replaces the Collection Dictionary in the Catalog.
-     * @param    collection    the new collection dictionary.
+     *
+     * @param collection the new collection dictionary.
      */
     public void makePackage(PdfCollection collection) {
-        stamper.makePackage(collection);        
+        stamper.makePackage(collection);
     }
-    
+
     /**
      * Sets the viewer preferences.
+     *
      * @param preferences the viewer preferences
      * @see PdfViewerPreferences#setViewerPreferences(int)
      */
     public void setViewerPreferences(int preferences) {
         stamper.setViewerPreferences(preferences);
     }
-    
-    /** Adds a viewer preference
-     * @param key a key for a viewer preference
+
+    /**
+     * Adds a viewer preference
+     *
+     * @param key   a key for a viewer preference
      * @param value the value for the viewer preference
      * @see PdfViewerPreferences#addViewerPreference
      */
-    
+
     public void addViewerPreference(PdfName key, PdfObject value) {
         stamper.addViewerPreference(key, value);
     }
 
     /**
      * Sets the XMP metadata.
+     *
      * @param xmp bytes for xmp metadata
      * @see PdfWriter#setXmpMetadata(byte[])
      */
@@ -593,6 +787,7 @@ public void setXmpMetadata(byte[] xmp) {
 
     /**
      * Gets the 1.5 compression status.
+     *
      * @return true if the 1.5 compression is on
      */
     public boolean isFullCompression() {
@@ -600,200 +795,60 @@ public boolean isFullCompression() {
     }
 
     /**
-     * Sets the document's compression to the new 1.5 mode with object streams and xref
-     * streams. It can be set at any time but once set it can't be unset.
+     * Sets the document's compression to the new 1.5 mode with object streams and xref streams. It can be set at any
+     * time but once set it can't be unset.
      */
     public void setFullCompression() {
-        if (stamper.isAppend())
+        if (stamper.isAppend()) {
             return;
+        }
         stamper.setFullCompression();
     }
 
     /**
      * Sets the open and close page additional action.
-     * @param actionType the action type. It can be PdfWriter.PAGE_OPEN
-     * or PdfWriter.PAGE_CLOSE
-     * @param action the action to perform
-     * @param page the page where the action will be applied. The first page is 1
+     *
+     * @param actionType the action type. It can be PdfWriter.PAGE_OPEN or
+     *                   PdfWriter.PAGE_CLOSE
+     * @param action     the action to perform
+     * @param page       the page where the action will be applied. The first page is 1
      * @throws PdfException if the action type is invalid
-     */    
+     */
     public void setPageAction(PdfName actionType, PdfAction action, int page) throws PdfException {
         stamper.setPageAction(actionType, action, page);
     }
 
     /**
      * Sets the display duration for the page (for presentations)
-     * @param seconds   the number of seconds to display the page. A negative value removes the entry
-     * @param page the page where the duration will be applied. The first page is 1
+     *
+     * @param seconds the number of seconds to display the page. A negative value removes the entry
+     * @param page    the page where the duration will be applied. The first page is 1
      */
     public void setDuration(int seconds, int page) {
         stamper.setDuration(seconds, page);
     }
-    
+
     /**
      * Sets the transition for the page
-     * @param transition   the transition object. A null removes the transition
-     * @param page the page where the transition will be applied. The first page is 1
+     *
+     * @param transition the transition object. A null removes the transition
+     * @param page       the page where the transition will be applied. The first page is 1
      */
     public void setTransition(PdfTransition transition, int page) {
         stamper.setTransition(transition, page);
     }
-	
+
     /**
      * To indicate that an object has been changed.
+     *
      * @param obj to be marked as used (=dirty)
      */
     public void markUsed(PdfObject obj) {
-       this.stamper.markUsed(obj);
-    }
-
-    /**
-     * Applies a digital signature to a document, possibly as a new revision, making
-     * possible multiple signatures. The returned PdfStamper
-     * can be used normally as the signature is only applied when closing.
-     * 
            
-     * A possible use for adding a signature without invalidating an existing one is:
-     * 
            
-     * 
            -     * KeyStore ks = KeyStore.getInstance("pkcs12");
-     * ks.load(new FileInputStream("my_private_key.pfx"), "my_password".toCharArray());
-     * String alias = (String)ks.aliases().nextElement();
-     * PrivateKey key = (PrivateKey)ks.getKey(alias, "my_password".toCharArray());
-     * Certificate[] chain = ks.getCertificateChain(alias);
-     * PdfReader reader = new PdfReader("original.pdf");
-     * FileOutputStream fout = new FileOutputStream("signed.pdf");
-     * PdfStamper stp = PdfStamper.createSignature(reader, fout, '\0', new
-     * File("/temp"), true);
-     * PdfSignatureAppearance sap = stp.getSignatureAppearance();
-     * sap.setCrypto(key, chain, null, PdfSignatureAppearance.WINCER_SIGNED);
-     * sap.setReason("I'm the author");
-     * sap.setLocation("Lisbon");
-     * // comment next line to have an invisible signature
-     * sap.setVisibleSignature(new Rectangle(100, 100, 200, 200), 1, null);
-     * stp.close();
-     * 
            
-     * @param reader the original document
-     * @param os the output stream or null to keep the document in the temporary file
-     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original
-     * document
-     * @param tempFile location of the temporary file. If it's a directory a temporary file will be created there.
-     *     If it's a file it will be used directly. The file will be deleted on exit unless os is null.
-     *     In that case the document can be retrieved directly from the temporary file. If it's null
-     *     no temporary file will be created and memory will be used
-     * @param append if true the signature and all the other content will be added as a
-     * new revision thus not invalidating existing signatures
-     * @return a PdfStamper
-     * @throws DocumentException on error
-     * @throws IOException on error
-     */
-    public static PdfStamper createSignature(PdfReader reader, OutputStream os, char pdfVersion, File tempFile, boolean append) throws DocumentException, IOException {
-        PdfStamper stp;
-        if (tempFile == null) {
-            ByteBuffer bout = new ByteBuffer();
-            stp = new PdfStamper(reader, bout, pdfVersion, append);
-            stp.sigApp = new PdfSignatureAppearance(stp.stamper);
-            stp.sigApp.setSigout(bout);
-        }
-        else {
-            if (tempFile.isDirectory())
-                tempFile = Files.createTempFile(tempFile.toPath(), "pdf", null).toFile();
-            FileOutputStream fout = new FileOutputStream(tempFile);
-            stp = new PdfStamper(reader, fout, pdfVersion, append);
-            stp.sigApp = new PdfSignatureAppearance(stp.stamper);
-            stp.sigApp.setTempFile(tempFile);
-        }
-        stp.sigApp.setOriginalout(os);
-        stp.sigApp.setStamper(stp);
-        stp.hasSignature = true;
-        PdfDictionary catalog = reader.getCatalog();
-        PdfDictionary acroForm = (PdfDictionary)PdfReader.getPdfObjectNullConverting(catalog.get(PdfName.ACROFORM), catalog);
-        if (acroForm != null) {
-            acroForm.remove(PdfName.NEEDAPPEARANCES);
-            stp.stamper.markUsed(acroForm);
-        }
-        return stp;
+        this.stamper.markUsed(obj);
     }
 
     /**
-     * Applies a digital signature to a document. The returned PdfStamper
-     * can be used normally as the signature is only applied when closing.
-     * 
            
-     * Note that the pdf is created in memory.
-     * 
            
-     * A possible use is:
-     * 
            
-     * 
            -     * KeyStore ks = KeyStore.getInstance("pkcs12");
-     * ks.load(new FileInputStream("my_private_key.pfx"), "my_password".toCharArray());
-     * String alias = (String)ks.aliases().nextElement();
-     * PrivateKey key = (PrivateKey)ks.getKey(alias, "my_password".toCharArray());
-     * Certificate[] chain = ks.getCertificateChain(alias);
-     * PdfReader reader = new PdfReader("original.pdf");
-     * FileOutputStream fout = new FileOutputStream("signed.pdf");
-     * PdfStamper stp = PdfStamper.createSignature(reader, fout, '\0');
-     * PdfSignatureAppearance sap = stp.getSignatureAppearance();
-     * sap.setCrypto(key, chain, null, PdfSignatureAppearance.WINCER_SIGNED);
-     * sap.setReason("I'm the author");
-     * sap.setLocation("Lisbon");
-     * // comment next line to have an invisible signature
-     * sap.setVisibleSignature(new Rectangle(100, 100, 200, 200), 1, null);
-     * stp.close();
-     * 
            
-     * @param reader the original document
-     * @param os the output stream
-     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original
-     * document
-     * @throws DocumentException on error
-     * @throws IOException on error
-     * @return a PdfStamper
-     */
-    public static PdfStamper createSignature(PdfReader reader, OutputStream os, char pdfVersion) throws DocumentException, IOException {
-        return createSignature(reader, os, pdfVersion, null, false);
-    }
-    
-    /**
-     * Applies a digital signature to a document. The returned PdfStamper
-     * can be used normally as the signature is only applied when closing.
-     * 
            
-     * A possible use is:
-     * 
            
-     * 
            -     * KeyStore ks = KeyStore.getInstance("pkcs12");
-     * ks.load(new FileInputStream("my_private_key.pfx"), "my_password".toCharArray());
-     * String alias = (String)ks.aliases().nextElement();
-     * PrivateKey key = (PrivateKey)ks.getKey(alias, "my_password".toCharArray());
-     * Certificate[] chain = ks.getCertificateChain(alias);
-     * PdfReader reader = new PdfReader("original.pdf");
-     * FileOutputStream fout = new FileOutputStream("signed.pdf");
-     * PdfStamper stp = PdfStamper.createSignature(reader, fout, '\0', new File("/temp"));
-     * PdfSignatureAppearance sap = stp.getSignatureAppearance();
-     * sap.setCrypto(key, chain, null, PdfSignatureAppearance.WINCER_SIGNED);
-     * sap.setReason("I'm the author");
-     * sap.setLocation("Lisbon");
-     * // comment next line to have an invisible signature
-     * sap.setVisibleSignature(new Rectangle(100, 100, 200, 200), 1, null);
-     * stp.close();
-     * 
            
-     * @param reader the original document
-     * @param os the output stream or null to keep the document in the temporary file
-     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original
-     * document
-     * @param tempFile location of the temporary file. If it's a directory a temporary file will be created there.
-     *     If it's a file it will be used directly. The file will be deleted on exit unless os is null.
-     *     In that case the document can be retrieved directly from the temporary file. If it's null
-     *     no temporary file will be created and memory will be used
-     * @return a PdfStamper
-     * @throws DocumentException on error
-     * @throws IOException on error
-     */
-    public static PdfStamper createSignature(PdfReader reader, OutputStream os, char pdfVersion, File tempFile) throws DocumentException, IOException 
-    {
-        return createSignature(reader, os, pdfVersion, tempFile, false);
-    }
-
-    /**
-     * Gets the PdfLayer objects in an existing document as a Map
-     * with the names/titles of the layers as keys.
+     * Gets the PdfLayer objects in an existing document as a Map with the names/titles of the layers as keys.
      *
      * @return a Map with all the PdfLayers in the document (and the name/title of the layer as key)
      * @since 2.1.2
@@ -803,19 +858,8 @@ public Map getPdfLayers() {
     }
 
     /**
-     * Specifies if the file ID property should be included in the PDF file header when creating and stamping the PDF file.
-     *
-     * @param includeFileID if file id should be included in the PDF file
-     *
-     * @since OpenPDF 1.2.1
-     * @see PdfName#ID
-     */
-    public void setIncludeFileID(boolean includeFileID) {
-        this.stamper.setIncludeFileID(includeFileID);
-    }
-
-    /**
-     * Returns if the file ID property should be included in the PDF file header when creating and signing the PDF file.
+     * Returns if the file ID property should be included in the PDF file header when creating and signing the PDF
+     * file.
      *
      * @return boolean
      * @see PdfName#ID
@@ -826,19 +870,20 @@ public boolean isIncludeFileID() {
     }
 
     /**
-     * Specifies the enforced PDF file ID, used to specifically override the PDF file ID when creating and signing the PDF file.
+     * Specifies if the file ID property should be included in the PDF file header when creating and stamping the PDF
+     * file.
      *
-     * @param overrideFileId PDF file id to be enforced
-     *
-     * @since OpenPDF 1.2.1
+     * @param includeFileID if file id should be included in the PDF file
      * @see PdfName#ID
+     * @since OpenPDF 1.2.1
      */
-    public void setOverrideFileId(PdfObject overrideFileId) {
-        this.stamper.setOverrideFileId(overrideFileId);
+    public void setIncludeFileID(boolean includeFileID) {
+        this.stamper.setIncludeFileID(includeFileID);
     }
 
     /**
-     * Returns the enforced PDF file ID, used to specifically override the created PDF file ID when creating and signing the PDF file.
+     * Returns the enforced PDF file ID, used to specifically override the created PDF file ID when creating and signing
+     * the PDF file.
      *
      * @return PdfObject
      * @see PdfName#ID
@@ -849,7 +894,20 @@ public PdfObject getOverrideFileId() {
     }
 
     /**
-     * Returns the enforced modification date, used to specifically override the PDF modification date (ModDate) property when creating and signing the PDF file.
+     * Specifies the enforced PDF file ID, used to specifically override the PDF file ID when creating and signing the
+     * PDF file.
+     *
+     * @param overrideFileId PDF file id to be enforced
+     * @see PdfName#ID
+     * @since OpenPDF 1.2.1
+     */
+    public void setOverrideFileId(PdfObject overrideFileId) {
+        this.stamper.setOverrideFileId(overrideFileId);
+    }
+
+    /**
+     * Returns the enforced modification date, used to specifically override the PDF modification date (ModDate)
+     * property when creating and signing the PDF file.
      *
      * @return Calendar
      * @see PdfName#MODDATE
@@ -860,7 +918,8 @@ public Calendar getEnforcedModificationDate() {
     }
 
     /**
-     * Specifies the enforced modification date, used to specifically override the PDF modification date (ModDate) property when creating and signing the PDF file.
+     * Specifies the enforced modification date, used to specifically override the PDF modification date (ModDate)
+     * property when creating and signing the PDF file.
      *
      * @param modificationDate enforced modification date.
      * @see PdfName#MODDATE
@@ -880,9 +939,9 @@ public boolean isUpdateMetadata() {
     }
 
     /**
-     * Sets whether the /Metadata dictionary should be updated in a new sequential PDF revision update.
-     * The condition is applied only when a new revision is being appended (e.g. on a new signature addition).
-     * Default : TRUE (/Metadata dictionary is updated in a sequential revision update)
+     * Sets whether the /Metadata dictionary should be updated in a new sequential PDF revision update. The condition is
+     * applied only when a new revision is being appended (e.g. on a new signature addition). Default : TRUE (/Metadata
+     * dictionary is updated in a sequential revision update)
      *
      * @param updateMetadata if the /Metadata should be updated
      */
@@ -900,9 +959,9 @@ public boolean isUpdateDocInfo() {
     }
 
     /**
-     * Sets whether the document /Info dictionary should be updated in a sequential PDF revision update.
-     * The condition is applied only when a new revision is being appended (e.g. on a new signature addition).
-     * Default : TRUE (/Info dictionary is updated in a sequential revision update)
+     * Sets whether the document /Info dictionary should be updated in a sequential PDF revision update. The condition
+     * is applied only when a new revision is being appended (e.g. on a new signature addition). Default : TRUE (/Info
+     * dictionary is updated in a sequential revision update)
      *
      * @param updateDocInfo if the document /Info should be updated
      */
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamperImp.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamperImp.java
index 7d811afff..c2b102360 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamperImp.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamperImp.java
@@ -46,18 +46,6 @@
  */
 package com.lowagie.text.pdf;
 
-import java.awt.geom.AffineTransform;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.xml.sax.SAXException;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.ExceptionConverter;
@@ -70,20 +58,21 @@
 import com.lowagie.text.pdf.interfaces.PdfViewerPreferences;
 import com.lowagie.text.pdf.internal.PdfViewerPreferencesImp;
 import com.lowagie.text.xml.xmp.XmpReader;
-
+import java.awt.geom.AffineTransform;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.xml.sax.SAXException;
 
 
 class PdfStamperImp extends PdfWriter {
-    HashMap readers2intrefs = new HashMap<>();
-    HashMap readers2file = new HashMap<>();
-    RandomAccessFileOrArray file;
-    PdfReader reader;
-    IntHashtable myXref = new IntHashtable();
-    /** Integer(page number) -> PageStamp */
-    HashMap pagesToContent = new HashMap<>();
-    boolean closed = false;
-    /** Holds value of property rotateContents. */
-    private boolean rotateContents = true;
+
     protected AcroFields acroFields;
     protected boolean flat = false;
     protected boolean flatFreeText = false;
@@ -98,94 +87,164 @@ class PdfStamperImp extends PdfWriter {
     protected IntHashtable marked;
     protected int initialXrefSize;
     protected PdfAction openAction;
+    HashMap readers2intrefs = new HashMap<>();
+    HashMap readers2file = new HashMap<>();
+    RandomAccessFileOrArray file;
+    PdfReader reader;
+    IntHashtable myXref = new IntHashtable();
+    /**
+     * Integer(page number) -> PageStamp
+     */
+    HashMap pagesToContent = new HashMap<>();
+    boolean closed = false;
+    /**
+     * Holds value of property rotateContents.
+     */
+    private boolean rotateContents = true;
     private boolean includeFileID = true;
     private PdfObject overrideFileId = null;
     private Calendar modificationDate = null;
     private boolean updateMetadata = true;
     private boolean updateDocInfo = true;
 
-    /** Creates new PdfStamperImp.
-     * @param reader the read PDF
-     * @param os the output destination
-     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original
-     * document
+    /**
+     * Creates new PdfStamperImp.
+     *
+     * @param reader     the read PDF
+     * @param os         the output destination
+     * @param pdfVersion the new pdf version or '\0' to keep the same version as the original document
      * @param append
      * @throws DocumentException on error
      * @throws IOException
      */
-    PdfStamperImp(PdfReader reader, OutputStream os, char pdfVersion, boolean append) throws DocumentException, IOException {
+    PdfStamperImp(PdfReader reader, OutputStream os, char pdfVersion, boolean append)
+            throws DocumentException, IOException {
         super(new PdfDocument(), os);
-        if (!reader.isOpenedWithFullPermissions())
-            throw new BadPasswordException(MessageLocalization.getComposedMessage("pdfreader.not.opened.with.owner.password"));
-        if (reader.isTampered())
-            throw new DocumentException(MessageLocalization.getComposedMessage("the.original.document.was.reused.read.it.again.from.file"));
+        if (!reader.isOpenedWithFullPermissions()) {
+            throw new BadPasswordException(
+                    MessageLocalization.getComposedMessage("pdfreader.not.opened.with.owner.password"));
+        }
+        if (reader.isTampered()) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("the.original.document.was.reused.read.it.again.from.file"));
+        }
         reader.setTampered(true);
         this.reader = reader;
         file = reader.getSafeFile();
         this.append = append;
         if (append) {
-            if (reader.isRebuilt())
-                throw new DocumentException(MessageLocalization.getComposedMessage("append.mode.requires.a.document.without.errors.even.if.recovery.was.possible"));
-            if (reader.isEncrypted())
+            if (reader.isRebuilt()) {
+                throw new DocumentException(MessageLocalization.getComposedMessage(
+                        "append.mode.requires.a.document.without.errors.even.if.recovery.was.possible"));
+            }
+            if (reader.isEncrypted()) {
                 crypto = new PdfEncryption(reader.getDecrypt());
+            }
             pdf_version.setAppendmode(true);
             file.reOpen();
             byte[] buf = new byte[8192];
             int n;
-            while ((n = file.read(buf)) > 0)
+            while ((n = file.read(buf)) > 0) {
                 this.os.write(buf, 0, n);
+            }
             file.close();
             prevxref = reader.getLastXref();
             reader.setAppendable(true);
-        }
-        else {
-            if (pdfVersion == 0)
+        } else {
+            if (pdfVersion == 0) {
                 super.setPdfVersion(reader.getPdfVersion());
-            else
+            } else {
                 super.setPdfVersion(pdfVersion);
+            }
         }
         super.open();
         pdf.addWriter(this);
         if (append) {
             body.setRefnum(reader.getXrefSize());
             marked = new IntHashtable();
-            if (reader.isNewXrefType())
+            if (reader.isNewXrefType()) {
                 fullCompression = true;
-            if (reader.isHybridXref())
+            }
+            if (reader.isHybridXref()) {
                 fullCompression = false;
+            }
         }
         initialXrefSize = reader.getXrefSize();
     }
 
+    static void findAllObjects(PdfReader reader, PdfObject obj, IntHashtable hits) {
+        if (obj == null) {
+            return;
+        }
+        switch (obj.type()) {
+            case PdfObject.INDIRECT:
+                PRIndirectReference iref = (PRIndirectReference) obj;
+                if (reader != iref.getReader()) {
+                    return;
+                }
+                if (hits.containsKey(iref.getNumber())) {
+                    return;
+                }
+                hits.put(iref.getNumber(), 1);
+                findAllObjects(reader, PdfReader.getPdfObject(obj), hits);
+                return;
+            case PdfObject.ARRAY:
+                PdfArray a = (PdfArray) obj;
+                for (int k = 0; k < a.size(); ++k) {
+                    findAllObjects(reader, a.getPdfObject(k), hits);
+                }
+                return;
+            case PdfObject.DICTIONARY:
+            case PdfObject.STREAM:
+                PdfDictionary dic = (PdfDictionary) obj;
+                for (PdfName name : dic.getKeys()) {
+                    findAllObjects(reader, dic.get(name), hits);
+                }
+        }
+    }
+
+    private static void moveRectangle(PdfDictionary dic2, PdfReader r, int pageImported, PdfName key, String name) {
+        Rectangle m = r.getBoxSize(pageImported, name);
+        if (m == null) {
+            dic2.remove(key);
+        } else {
+            dic2.put(key, new PdfRectangle(m));
+        }
+    }
+
     void close(Map moreInfo) throws IOException {
-        if (closed)
+        if (closed) {
             return;
+        }
         if (useVp) {
             reader.setViewerPreferences(viewerPreferences);
             markUsed(reader.getTrailer().get(PdfName.ROOT));
         }
-        if (flat)
+        if (flat) {
             flatFields();
-        if (flatFreeText)
+        }
+        if (flatFreeText) {
             flatFreeTextFields();
+        }
         addFieldResources();
         PdfDictionary catalog = reader.getCatalog();
-        PdfDictionary pages = (PdfDictionary)PdfReader.getPdfObject(catalog.get(PdfName.PAGES));
+        PdfDictionary pages = (PdfDictionary) PdfReader.getPdfObject(catalog.get(PdfName.PAGES));
         markUsed(pages);
         PdfObject acroFormObject = PdfReader.getPdfObject(catalog.get(PdfName.ACROFORM), reader.getCatalog());
         if (acroFormObject instanceof PdfDictionary) {
             PdfDictionary acroForm = (PdfDictionary) acroFormObject;
             if (acroFields != null && acroFields.getXfa().isChanged()) {
                 markUsed(acroForm);
-                if (!flat)
+                if (!flat) {
                     acroFields.getXfa().setXfa(this);
+                }
             }
             if (sigFlags != 0) {
-                    acroForm.put(PdfName.SIGFLAGS, new PdfNumber(sigFlags));
-                    markUsed(acroForm);
-                    markUsed(catalog);
-                }
+                acroForm.put(PdfName.SIGFLAGS, new PdfNumber(sigFlags));
+                markUsed(acroForm);
+                markUsed(catalog);
             }
+        }
         closed = true;
         addSharedObjectsToBody();
         setOutlines();
@@ -194,16 +253,16 @@ void close(Map moreInfo) throws IOException {
         if (openAction != null) {
             catalog.put(PdfName.OPENACTION, openAction);
         }
-        if (pdf.pageLabels != null)
+        if (pdf.pageLabels != null) {
             catalog.put(PdfName.PAGELABELS, pdf.pageLabels.getDictionary(this));
+        }
         // OCG
         if (!documentOCG.isEmpty()) {
             fillOCProperties(false);
             PdfDictionary ocdict = catalog.getAsDict(PdfName.OCPROPERTIES);
             if (ocdict == null) {
                 reader.getCatalog().put(PdfName.OCPROPERTIES, OCProperties);
-            }
-            else {
+            } else {
                 ocdict.put(PdfName.OCGS, OCProperties.get(PdfName.OCGS));
                 PdfDictionary ddict = ocdict.getAsDict(PdfName.D);
                 if (ddict == null) {
@@ -218,41 +277,40 @@ void close(Map moreInfo) throws IOException {
         }
         // metadata
         int skipInfo = -1;
-        PRIndirectReference iInfo = (PRIndirectReference)reader.getTrailer().get(PdfName.INFO);
+        PRIndirectReference iInfo = (PRIndirectReference) reader.getTrailer().get(PdfName.INFO);
 
-        PdfDictionary oldInfo = (PdfDictionary)PdfReader.getPdfObject(iInfo);
+        PdfDictionary oldInfo = (PdfDictionary) PdfReader.getPdfObject(iInfo);
         String producer = null;
         if (iInfo != null) {
-          skipInfo = iInfo.getNumber();
+            skipInfo = iInfo.getNumber();
         }
         if (oldInfo != null && oldInfo.get(PdfName.PRODUCER) != null) {
-          producer = oldInfo.getAsString(PdfName.PRODUCER).toUnicodeString();
+            producer = oldInfo.getAsString(PdfName.PRODUCER).toUnicodeString();
         }
         if (producer == null) {
-          producer = Document.getVersion();
-        }
-        else if (!producer.contains(Document.getProduct())) {
+            producer = Document.getVersion();
+        } else if (!producer.contains(Document.getProduct())) {
             producer = producer + "; modified using " + Document.getVersion();
         }
 
         // if we explicitly set Producer key
         if (moreInfo != null && moreInfo.containsKey("Producer")) {
-          producer = moreInfo.get("Producer");
+            producer = moreInfo.get("Producer");
         }
 
         // XMP
         byte[] altMetadata = null;
         PdfObject xmpo = PdfReader.getPdfObject(catalog.get(PdfName.METADATA));
         if (xmpo != null && xmpo.isStream()) {
-          altMetadata = PdfReader.getStreamBytesRaw((PRStream)xmpo);
-          PdfReader.killIndirect(catalog.get(PdfName.METADATA));
+            altMetadata = PdfReader.getStreamBytesRaw((PRStream) xmpo);
+            PdfReader.killIndirect(catalog.get(PdfName.METADATA));
         }
         if (xmpMetadata != null) {
-          altMetadata = xmpMetadata;
+            altMetadata = xmpMetadata;
         }
         PdfDate date;
         if (modificationDate == null) {
-          date = new PdfDate();
+            date = new PdfDate();
         } else {
             date = new PdfDate(modificationDate);
         }
@@ -261,25 +319,24 @@ else if (!producer.contains(Document.getProduct())) {
         if (altMetadata != null && (!append || updateMetadata)) {
             PdfStream xmp;
             try {
-              XmpReader xmpr = new XmpReader(altMetadata);
-              String producerXMP = producer;
-              if (producerXMP == null) {
-                producerXMP = "";
-              }
-              if (!xmpr.replace("http://ns.adobe.com/pdf/1.3/", "Producer", producerXMP)) {
-                if (!"".equals(producerXMP)) {
-                  xmpr.add("rdf:Description", "http://ns.adobe.com/pdf/1.3/", "pdf:Producer", producerXMP);
+                XmpReader xmpr = new XmpReader(altMetadata);
+                String producerXMP = producer;
+                if (producerXMP == null) {
+                    producerXMP = "";
+                }
+                if (!xmpr.replace("http://ns.adobe.com/pdf/1.3/", "Producer", producerXMP)) {
+                    if (!"".equals(producerXMP)) {
+                        xmpr.add("rdf:Description", "http://ns.adobe.com/pdf/1.3/", "pdf:Producer", producerXMP);
+                    }
                 }
-              }
 
                 if (!xmpr.replace("http://ns.adobe.com/xap/1.0/", "ModifyDate", date.getW3CDate())) {
-                xmpr.add("rdf:Description", "http://ns.adobe.com/xap/1.0/", "xmp:ModifyDate", date.getW3CDate());
-              }
+                    xmpr.add("rdf:Description", "http://ns.adobe.com/xap/1.0/", "xmp:ModifyDate", date.getW3CDate());
+                }
                 xmpr.replace("http://ns.adobe.com/xap/1.0/", "MetadataDate", date.getW3CDate());
                 xmp = new PdfStream(xmpr.serializeDoc());
-            }
-            catch (SAXException | IOException e) {
-              xmp = new PdfStream(altMetadata);
+            } catch (SAXException | IOException e) {
+                xmp = new PdfStream(altMetadata);
             }
             xmp.put(PdfName.TYPE, PdfName.METADATA);
             xmp.put(PdfName.SUBTYPE, PdfName.XML);
@@ -289,17 +346,16 @@ else if (!producer.contains(Document.getProduct())) {
                 xmp.put(PdfName.FILTER, ar);
             }
             if (append && xmpo != null) {
-              body.add(xmp, xmpo.getIndRef());
-            }
-            else {
-              catalog.put(PdfName.METADATA, body.add(xmp).getIndirectReference());
-              markUsed(catalog);
+                body.add(xmp, xmpo.getIndRef());
+            } else {
+                catalog.put(PdfName.METADATA, body.add(xmp).getIndirectReference());
+                markUsed(catalog);
             }
         }
         try {
             file.reOpen();
             alterContents();
-            int rootN = ((PRIndirectReference)reader.trailer.get(PdfName.ROOT)).getNumber();
+            int rootN = ((PRIndirectReference) reader.trailer.get(PdfName.ROOT)).getNumber();
             if (append) {
                 int[] keys = marked.getKeys();
                 for (int j : keys) {
@@ -314,8 +370,7 @@ else if (!producer.contains(Document.getProduct())) {
                         addToBody(obj, getNewObjectNumber(reader, k, 0));
                     }
                 }
-            }
-            else {
+            } else {
                 for (int k = 1; k < reader.getXrefSize(); ++k) {
                     PdfObject obj = reader.getPdfObjectRelease(k);
                     if (obj != null && skipInfo != k) {
@@ -323,12 +378,10 @@ else if (!producer.contains(Document.getProduct())) {
                     }
                 }
             }
-        }
-        finally {
+        } finally {
             try {
                 file.close();
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 // empty on purpose
             }
         }
@@ -338,8 +391,7 @@ else if (!producer.contains(Document.getProduct())) {
         if (crypto != null) {
             if (append) {
                 encryption = reader.getCryptoRef();
-            }
-            else {
+            } else {
                 PdfIndirectObject encryptionObject = addToBody(crypto.getEncryptionDictionary(), false);
                 encryption = encryptionObject.getIndirectReference();
             }
@@ -348,21 +400,18 @@ else if (!producer.contains(Document.getProduct())) {
                         PdfEncryption.getFileIdChangingPart(overrideFileId) : PdfEncryption.createDocumentId();
                 fileID = PdfEncryption.createInfoId(crypto.documentID, fileIDPartTwo);
             }
-        }
-        else if (includeFileID) {
+        } else if (includeFileID) {
             byte[] documentId = reader.getDocumentId();
             if (overrideFileId != null) {
                 if (documentId != null) {
-                    fileID = PdfEncryption.createInfoId(documentId, PdfEncryption.getFileIdChangingPart(overrideFileId));
-                }
-                else {
+                    fileID = PdfEncryption.createInfoId(documentId,
+                            PdfEncryption.getFileIdChangingPart(overrideFileId));
+                } else {
                     fileID = overrideFileId;
                 }
-            }
-            else if (documentId != null) {
+            } else if (documentId != null) {
                 fileID = PdfEncryption.createInfoId(documentId);
-            }
-            else {
+            } else {
                 byte[] fileIDPart = PdfEncryption.createDocumentId();
                 fileID = PdfEncryption.createInfoId(fileIDPart, fileIDPart);
             }
@@ -375,10 +424,11 @@ else if (documentId != null) {
         PdfIndirectReference infoRef = null;
         if (append) {
             if (updateDocInfo) {
-                if (iInfo == null)
+                if (iInfo == null) {
                     infoRef = addToBody(info, false).getIndirectReference();
-                else
+                } else {
                     infoRef = addToBody(info, iInfo.getNumber(), false).getIndirectReference();
+                }
             }
         } else {
             infoRef = addToBody(info, false).getIndirectReference();
@@ -389,12 +439,14 @@ else if (documentId != null) {
         os.write(getISOBytes(String.valueOf(body.offset())));
         os.write(getISOBytes("\n%%EOF\n"));
         os.flush();
-        if (isCloseStream())
+        if (isCloseStream()) {
             os.close();
+        }
         reader.close();
     }
 
-    PdfDictionary getInfoDictionary(PdfDictionary oldInfo, PdfDate modificationDate, String producer, Map moreInfo) {
+    PdfDictionary getInfoDictionary(PdfDictionary oldInfo, PdfDate modificationDate, String producer,
+            Map moreInfo) {
         PdfDictionary newInfo = new PdfDictionary();
         if (oldInfo != null) {
             for (PdfName key : oldInfo.getKeys()) {
@@ -415,8 +467,7 @@ PdfDictionary getInfoDictionary(PdfDictionary oldInfo, PdfDate modificationDate,
                 String value = entry.getValue();
                 if (value == null) {
                     newInfo.remove(keyName);
-                }
-                else {
+                } else {
                     newInfo.put(keyName, new PdfString(value, PdfObject.TEXT_UNICODE));
                 }
             }
@@ -425,8 +476,9 @@ PdfDictionary getInfoDictionary(PdfDictionary oldInfo, PdfDate modificationDate,
     }
 
     void applyRotation(PdfDictionary pageN, ByteBuffer out) {
-        if (!rotateContents)
+        if (!rotateContents) {
             return;
+        }
         Rectangle page = reader.getPageSizeWithRotation(pageN);
         int rotation = page.getRotation();
         switch (rotation) {
@@ -478,8 +530,9 @@ void alterContents() throws IOException {
                 out.append(ps.under.getInternalBuffer());
                 out.append(PdfContents.RESTORESTATE);
             }
-            if (ps.over != null)
+            if (ps.over != null) {
                 out.append(PdfContents.SAVESTATE);
+            }
             PdfStream stream = new PdfStream(out.toByteArray());
             stream.flateCompress(compressionLevel);
             ar.addFirst(addToBody(stream).getIndirectReference());
@@ -516,38 +569,42 @@ protected int getNewObjectNumber(PdfReader reader, int number, int generation) {
             return n;
         }
         if (currentPdfReaderInstance == null) {
-            if (append && number < initialXrefSize)
+            if (append && number < initialXrefSize) {
                 return number;
+            }
             int n = myXref.get(number);
             if (n == 0) {
                 n = getIndirectReferenceNumber();
                 myXref.put(number, n);
             }
             return n;
-        }
-        else
+        } else {
             return currentPdfReaderInstance.getNewObjectNumber(number, generation);
+        }
     }
 
     RandomAccessFileOrArray getReaderFile(PdfReader reader) {
         if (readers2intrefs.containsKey(reader)) {
             RandomAccessFileOrArray raf = readers2file.get(reader);
-            if (raf != null)
+            if (raf != null) {
                 return raf;
+            }
             return reader.getSafeFile();
         }
-        if (currentPdfReaderInstance == null)
+        if (currentPdfReaderInstance == null) {
             return file;
-        else
+        } else {
             return currentPdfReaderInstance.getReaderFile();
+        }
     }
 
     /**
      * Removes the encryption from the document (and also inherently the permissions)
+     *
      * @throws DocumentException
      */
     public void removeEncryption() throws DocumentException {
-        super.setEncryption(null,null,0,ENCRYPTION_NONE);
+        super.setEncryption(null, null, 0, ENCRYPTION_NONE);
         this.reader.setPermissions(0);
     }
 
@@ -557,8 +614,9 @@ public void removeEncryption() throws DocumentException {
      * @throws IOException
      */
     public void registerReader(PdfReader reader, boolean openFile) throws IOException {
-        if (readers2intrefs.containsKey(reader))
+        if (readers2intrefs.containsKey(reader)) {
             return;
+        }
         readers2intrefs.put(reader, new IntHashtable());
         if (openFile) {
             RandomAccessFileOrArray raf = reader.getSafeFile();
@@ -571,12 +629,14 @@ public void registerReader(PdfReader reader, boolean openFile) throws IOExceptio
      * @param reader
      */
     public void unRegisterReader(PdfReader reader) {
-        if (!readers2intrefs.containsKey(reader))
+        if (!readers2intrefs.containsKey(reader)) {
             return;
+        }
         readers2intrefs.remove(reader);
         RandomAccessFileOrArray raf = readers2file.get(reader);
-        if (raf == null)
+        if (raf == null) {
             return;
+        }
         readers2file.remove(reader);
         try {
             raf.close();
@@ -584,64 +644,41 @@ public void unRegisterReader(PdfReader reader) {
         }
     }
 
-    static void findAllObjects(PdfReader reader, PdfObject obj, IntHashtable hits) {
-        if (obj == null)
-            return;
-        switch (obj.type()) {
-            case PdfObject.INDIRECT:
-                PRIndirectReference iref = (PRIndirectReference)obj;
-                if (reader != iref.getReader())
-                    return;
-                if (hits.containsKey(iref.getNumber()))
-                    return;
-                hits.put(iref.getNumber(), 1);
-                findAllObjects(reader, PdfReader.getPdfObject(obj), hits);
-                return;
-            case PdfObject.ARRAY:
-                PdfArray a = (PdfArray)obj;
-                for (int k = 0; k < a.size(); ++k) {
-                    findAllObjects(reader, a.getPdfObject(k), hits);
-                }
-                return;
-            case PdfObject.DICTIONARY:
-            case PdfObject.STREAM:
-                PdfDictionary dic = (PdfDictionary)obj;
-                for (PdfName name : dic.getKeys()) {
-                    findAllObjects(reader, dic.get(name), hits);
-                }
-        }
-    }
-
     /**
      * @param fdf
      * @throws IOException
      */
-    public void addComments(FdfReader fdf) throws IOException{
-        if (readers2intrefs.containsKey(fdf))
+    public void addComments(FdfReader fdf) throws IOException {
+        if (readers2intrefs.containsKey(fdf)) {
             return;
+        }
         PdfDictionary catalog = fdf.getCatalog();
         catalog = catalog.getAsDict(PdfName.FDF);
-        if (catalog == null)
+        if (catalog == null) {
             return;
+        }
         PdfArray annots = catalog.getAsArray(PdfName.ANNOTS);
-        if (annots == null || annots.size() == 0)
+        if (annots == null || annots.size() == 0) {
             return;
+        }
         registerReader(fdf, false);
         IntHashtable hits = new IntHashtable();
         Map irt = new HashMap<>();
         List an = new ArrayList<>();
         for (int k = 0; k < annots.size(); ++k) {
             PdfObject obj = annots.getPdfObject(k);
-            PdfDictionary annot = (PdfDictionary)PdfReader.getPdfObject(obj);
+            PdfDictionary annot = (PdfDictionary) PdfReader.getPdfObject(obj);
             PdfNumber page = annot.getAsNumber(PdfName.PAGE);
-            if (page == null || page.intValue() >= reader.getNumberOfPages())
+            if (page == null || page.intValue() >= reader.getNumberOfPages()) {
                 continue;
+            }
             findAllObjects(fdf, obj, hits);
             an.add(obj);
             if (obj.type() == PdfObject.INDIRECT) {
                 PdfObject nm = PdfReader.getPdfObject(annot.get(PdfName.NM));
-                if (nm != null && nm.type() == PdfObject.STRING)
+                if (nm != null && nm.type() == PdfObject.STRING) {
                     irt.put(nm.toString(), obj);
+                }
             }
         }
         int[] arhits = hits.getKeys();
@@ -687,50 +724,51 @@ PageStamp getPageStamp(int pageNum) {
     }
 
     PdfContentByte getUnderContent(int pageNum) {
-        if (pageNum < 1 || pageNum > reader.getNumberOfPages())
+        if (pageNum < 1 || pageNum > reader.getNumberOfPages()) {
             return null;
+        }
         PageStamp ps = getPageStamp(pageNum);
-        if (ps.under == null)
+        if (ps.under == null) {
             ps.under = new StampContent(this, ps);
+        }
         return ps.under;
     }
 
     PdfContentByte getOverContent(int pageNum) {
-        if (pageNum < 1 || pageNum > reader.getNumberOfPages())
+        if (pageNum < 1 || pageNum > reader.getNumberOfPages()) {
             return null;
+        }
         PageStamp ps = getPageStamp(pageNum);
-        if (ps.over == null)
+        if (ps.over == null) {
             ps.over = new StampContent(this, ps);
+        }
         return ps.over;
     }
 
     void correctAcroFieldPages(int page) {
-        if (acroFields == null)
+        if (acroFields == null) {
             return;
-        if (page > reader.getNumberOfPages())
+        }
+        if (page > reader.getNumberOfPages()) {
             return;
+        }
         Map fields = acroFields.getAllFields();
         for (Item item : fields.values()) {
             for (int k = 0; k < item.size(); ++k) {
                 int p = item.getPage(k);
-                if (p >= page)
+                if (p >= page) {
                     item.forcePage(k, p + 1);
+                }
             }
         }
     }
 
-    private static void moveRectangle(PdfDictionary dic2, PdfReader r, int pageImported, PdfName key, String name) {
-        Rectangle m = r.getBoxSize(pageImported, name);
-        if (m == null)
-            dic2.remove(key);
-        else
-            dic2.put(key, new PdfRectangle(m));
-    }
-
     void replacePage(PdfReader r, int pageImported, int pageReplaced) {
         PdfDictionary pageN = reader.getPageN(pageReplaced);
-        if (pagesToContent.containsKey(pageN))
-            throw new IllegalStateException(MessageLocalization.getComposedMessage("this.page.cannot.be.replaced.new.content.was.already.added"));
+        if (pagesToContent.containsKey(pageN)) {
+            throw new IllegalStateException(MessageLocalization.getComposedMessage(
+                    "this.page.cannot.be.replaced.new.content.was.already.added"));
+        }
         PdfImportedPage p = getImportedPage(r, pageImported);
         PdfDictionary dic2 = reader.getPageNRelease(pageReplaced);
         dic2.remove(PdfName.RESOURCES);
@@ -767,35 +805,36 @@ void insertPage(int pageNumber, Rectangle mediabox) {
         PRIndirectReference parentRef;
         if (pageNumber > reader.getNumberOfPages()) {
             PdfDictionary lastPage = reader.getPageNRelease(reader.getNumberOfPages());
-            parentRef = (PRIndirectReference)lastPage.get(PdfName.PARENT);
+            parentRef = (PRIndirectReference) lastPage.get(PdfName.PARENT);
             parentRef = new PRIndirectReference(reader, parentRef.getNumber());
-            parent = (PdfDictionary)PdfReader.getPdfObject(parentRef);
-            PdfArray kids = (PdfArray)PdfReader.getPdfObject(parent.get(PdfName.KIDS), parent);
+            parent = (PdfDictionary) PdfReader.getPdfObject(parentRef);
+            PdfArray kids = (PdfArray) PdfReader.getPdfObject(parent.get(PdfName.KIDS), parent);
             kids.add(pref);
             markUsed(kids);
             reader.pageRefs.insertPage(pageNumber, pref);
-        }
-        else {
-            if (pageNumber < 1)
+        } else {
+            if (pageNumber < 1) {
                 pageNumber = 1;
+            }
             PdfDictionary firstPage = reader.getPageN(pageNumber);
             PRIndirectReference firstPageRef = reader.getPageOrigRef(pageNumber);
             reader.releasePage(pageNumber);
-            parentRef = (PRIndirectReference)firstPage.get(PdfName.PARENT);
+            parentRef = (PRIndirectReference) firstPage.get(PdfName.PARENT);
             parentRef = new PRIndirectReference(reader, parentRef.getNumber());
-            parent = (PdfDictionary)PdfReader.getPdfObject(parentRef);
-            PdfArray kids = (PdfArray)PdfReader.getPdfObject(parent.get(PdfName.KIDS), parent);
+            parent = (PdfDictionary) PdfReader.getPdfObject(parentRef);
+            PdfArray kids = (PdfArray) PdfReader.getPdfObject(parent.get(PdfName.KIDS), parent);
             int len = kids.size();
             int num = firstPageRef.getNumber();
             for (int k = 0; k < len; ++k) {
-                PRIndirectReference cur = (PRIndirectReference)kids.getPdfObject(k);
+                PRIndirectReference cur = (PRIndirectReference) kids.getPdfObject(k);
                 if (num == cur.getNumber()) {
                     kids.add(k, pref);
                     break;
                 }
             }
-            if (len == kids.size())
+            if (len == kids.size()) {
                 throw new RuntimeException(MessageLocalization.getComposedMessage("internal.inconsistence"));
+            }
             markUsed(kids);
             reader.pageRefs.insertPage(pageNumber, pref);
             correctAcroFieldPages(pageNumber);
@@ -803,23 +842,25 @@ void insertPage(int pageNumber, Rectangle mediabox) {
         page.put(PdfName.PARENT, parentRef);
         while (parent != null) {
             markUsed(parent);
-            PdfNumber count = (PdfNumber)PdfReader.getPdfObjectRelease(parent.get(PdfName.COUNT));
+            PdfNumber count = (PdfNumber) PdfReader.getPdfObjectRelease(parent.get(PdfName.COUNT));
             parent.put(PdfName.COUNT, new PdfNumber(count.intValue() + 1));
             parent = parent.getAsDict(PdfName.PARENT);
         }
     }
 
-    /** Getter for property rotateContents.
-     * @return Value of property rotateContents.
+    /**
+     * Getter for property rotateContents.
      *
+     * @return Value of property rotateContents.
      */
     boolean isRotateContents() {
         return this.rotateContents;
     }
 
-    /** Setter for property rotateContents.
-     * @param rotateContents New value of property rotateContents.
+    /**
+     * Setter for property rotateContents.
      *
+     * @param rotateContents New value of property rotateContents.
      */
     void setRotateContents(boolean rotateContents) {
         this.rotateContents = rotateContents;
@@ -846,17 +887,22 @@ void setFreeTextFlattening(boolean flat) {
 
     boolean partialFormFlattening(String name) {
         getAcroFields();
-        if (acroFields.getXfa().isXfaPresent())
-            throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("partial.form.flattening.is.not.supported.with.xfa.forms"));
-        if (!acroFields.getAllFields().containsKey(name))
+        if (acroFields.getXfa().isXfaPresent()) {
+            throw new UnsupportedOperationException(
+                    MessageLocalization.getComposedMessage("partial.form.flattening.is.not.supported.with.xfa.forms"));
+        }
+        if (!acroFields.getAllFields().containsKey(name)) {
             return false;
+        }
         partialFlattening.add(name);
         return true;
     }
 
     void flatFields() {
-        if (append)
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("field.flattening.is.not.supported.in.append.mode"));
+        if (append) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("field.flattening.is.not.supported.in.append.mode"));
+        }
         getAcroFields();
         Map fields = acroFields.getAllFields();
         if (fieldsAdded && partialFlattening.isEmpty()) {
@@ -864,111 +910,113 @@ void flatFields() {
         }
         PdfDictionary acroForm = reader.getCatalog().getAsDict(PdfName.ACROFORM);
         PdfArray acroFds = null;
-        PdfBoolean needAppearance=null;
+        PdfBoolean needAppearance = null;
         if (acroForm != null) {
-            acroFds = (PdfArray)PdfReader.getPdfObject(acroForm.get(PdfName.FIELDS), acroForm);
-            needAppearance = (PdfBoolean)acroForm.get(PdfName.NEEDAPPEARANCES);
+            acroFds = (PdfArray) PdfReader.getPdfObject(acroForm.get(PdfName.FIELDS), acroForm);
+            needAppearance = (PdfBoolean) acroForm.get(PdfName.NEEDAPPEARANCES);
         }
         for (Map.Entry entry : fields.entrySet()) {
             String name = entry.getKey();
-            if (!partialFlattening.isEmpty() && !partialFlattening.contains(name))
+            if (!partialFlattening.isEmpty() && !partialFlattening.contains(name)) {
                 continue;
+            }
             Item item = entry.getValue();
             for (int k = 0; k < item.size(); ++k) {
                 PdfDictionary merged = item.getMerged(k);
                 PdfNumber ff = merged.getAsNumber(PdfName.F);
                 int flags = 0;
-                if (ff != null)
+                if (ff != null) {
                     flags = ff.intValue();
+                }
                 int page = item.getPage(k);
-                if (page == -1)
+                if (page == -1) {
                     continue;
+                }
                 PdfDictionary appDic = merged.getAsDict(PdfName.AP);
-                PdfStream appStream=null;
-                
+                PdfStream appStream = null;
+
                 if (appDic != null) {
                     appStream = appDic.getAsStream(PdfName.N);
                 }
 
                 //Lonzak (fix) if NeedAppearances flag is true then regenerate appearance before flattening
-                if (needAppearance!=null && needAppearance.booleanValue()) {
-                    
+                if (needAppearance != null && needAppearance.booleanValue()) {
+
                     boolean regenerate = false;
                     int type = this.acroFields.getFieldType(name);
 
-                    if(type!=AcroFields.FIELD_TYPE_SIGNATURE) {
-                        if(appDic != null && appDic.getDirectObject(PdfName.N) instanceof PdfIndirectReference) {
+                    if (type != AcroFields.FIELD_TYPE_SIGNATURE) {
+                        if (appDic != null && appDic.getDirectObject(PdfName.N) instanceof PdfIndirectReference) {
                             //since newly added
-                            regenerate=false;
-                        }
-                        else {
-                            regenerate=true;
+                            regenerate = false;
+                        } else {
+                            regenerate = true;
                         }
                     }
-                    
-                    if(regenerate) {
+
+                    if (regenerate) {
                         try {
                             this.acroFields.regenerateField(name);
                             appDic = this.acroFields.getFieldItem(name).getMerged(k).getAsDict(PdfName.AP);
-                        }
-                        catch (Exception e) {
+                        } catch (Exception e) {
                             //ignore any exception
                         }
                     }
                 }
-                
-                boolean transformNeeded=false;
+
+                boolean transformNeeded = false;
                 double rotation = 0;
                 //usually using the MK value will render the correct result because the annotation matrix usually is built according to the MK/R value.
                 //if there is a problem with the rotation a mechanism based on the matrix of the appearance as described in ISO 32000-2:2020 section 12.5.5. should be used
-                if(merged.getAsDict(PdfName.MK) != null && merged.getAsDict(PdfName.MK).get(PdfName.R) != null){
+                if (merged.getAsDict(PdfName.MK) != null && merged.getAsDict(PdfName.MK).get(PdfName.R) != null) {
                     rotation = merged.getAsDict(PdfName.MK).getAsNumber(PdfName.R).floatValue();
                 }
-                
-                if (this.acroFields.isGenerateAppearances() && appStream!=null) {
-                    
+
+                if (this.acroFields.isGenerateAppearances() && appStream != null) {
+
                     PdfArray bboxRaw = appStream.getAsArray(PdfName.BBOX);
                     PdfArray rectRaw = merged.getAsArray(PdfName.RECT);
-                    
+
                     if (bboxRaw != null && rectRaw != null) {
                         transformNeeded = true;
                         PdfRectangle bbox = new PdfRectangle(bboxRaw);
                         PdfRectangle rect = new PdfRectangle(rectRaw);
-                        
+
                         float rectWidth = rect.width();
                         float rectHeight = rect.height();
-                        
+
                         //Switches width and height if the rotation is an odd multiple of 90 degrees
-                        if (Math.abs(rotation)>0 && rotation % 180 != 0 && rotation % 90 == 0) {
+                        if (Math.abs(rotation) > 0 && rotation % 180 != 0 && rotation % 90 == 0) {
                             rectWidth = rect.height();
                             rectHeight = rect.width();
                         }
-                        
+
                         float scaleFactorWidth = Math.abs(bbox.width() != 0 ? rectWidth / bbox.width() : 1.0f);
                         float scaleFactorHeight = Math.abs(bbox.height() != 0 ? rectHeight / bbox.height() : 1.0f);
-                        
+
                         PdfArray array = new PdfArray(new float[]{scaleFactorWidth, 0, 0, scaleFactorHeight, 0, 0});
                         appStream.put(PdfName.MATRIX, array);
                         markUsed(appStream);
                     }
                 }
-                                
-                if (appDic != null && (flags & PdfFormField.FLAGS_PRINT) != 0 && (flags & PdfFormField.FLAGS_HIDDEN) == 0) {
+
+                if (appDic != null && (flags & PdfFormField.FLAGS_PRINT) != 0
+                        && (flags & PdfFormField.FLAGS_HIDDEN) == 0) {
                     PdfObject normalAppearanceObj = appDic.get(PdfName.N);
                     PdfAppearance app = null;
                     PdfObject objReal = PdfReader.getPdfObject(normalAppearanceObj);
                     if (normalAppearanceObj != null) {
-                        if (normalAppearanceObj instanceof PdfIndirectReference && !normalAppearanceObj.isIndirect())
-                            app = new PdfAppearance((PdfIndirectReference)normalAppearanceObj);
-                        else if (objReal instanceof PdfStream) {
+                        if (normalAppearanceObj instanceof PdfIndirectReference && !normalAppearanceObj.isIndirect()) {
+                            app = new PdfAppearance((PdfIndirectReference) normalAppearanceObj);
+                        } else if (objReal instanceof PdfStream) {
                             ((PdfDictionary) objReal).put(PdfName.SUBTYPE, PdfName.FORM);
-                            app = new PdfAppearance((PdfIndirectReference)normalAppearanceObj);
-                        }
-                        else {
+                            app = new PdfAppearance((PdfIndirectReference) normalAppearanceObj);
+                        } else {
                             if (objReal != null && objReal.isDictionary()) {
                                 PdfName as = merged.getAsName(PdfName.AS);
                                 if (as != null) {
-                                    PdfIndirectReference iref = (PdfIndirectReference) ((PdfDictionary) objReal).get(as);
+                                    PdfIndirectReference iref = (PdfIndirectReference) ((PdfDictionary) objReal).get(
+                                            as);
                                     if (iref != null) {
                                         app = new PdfAppearance(iref);
                                         if (iref.isIndirect()) {
@@ -980,26 +1028,26 @@ else if (objReal instanceof PdfStream) {
                             }
                         }
                     }
-                    if (app != null && objReal!=null) {
+                    if (app != null && objReal != null) {
                         Rectangle box = PdfReader.getNormalizedRectangle(merged.getAsArray(PdfName.RECT));
                         PdfContentByte cb = getOverContent(page);
                         cb.setLiteral("Q ");
 
-                        if(transformNeeded) {
+                        if (transformNeeded) {
                             AffineTransform transform = new AffineTransform();
                             double x = box.getLeft();
                             double y = box.getBottom();
-                            
-                            rotation = rotation % 360; 
+
+                            rotation = rotation % 360;
                             if (rotation == 90 || rotation == 180) {
                                 x += box.getWidth();
                             }
                             if (rotation == 180 || rotation == 270) {
                                 y += box.getHeight();
                             }
-                            
+
                             transform.translate(x, y);
-                            
+
                             //before applying the rotation convert from degree to radiant
                             transform.rotate(Math.toRadians(rotation));
 
@@ -1007,43 +1055,47 @@ else if (objReal instanceof PdfStream) {
                             double[] matrix = new double[6];
                             transform.getMatrix(matrix);
                             cb.addTemplate(app, matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]);
-                        }
-                        else {
+                        } else {
                             //when objReal is an PdfIndirectReference then it was just created (thus it doesn't need to be corrected
-                            if(!(objReal instanceof PdfIndirectReference)) {
-                                
+                            if (!(objReal instanceof PdfIndirectReference)) {
+
                                 // Lonzak: npe bugfix
-                                PdfRectangle bBoxCoordinates = new PdfRectangle(((PdfDictionary)objReal).getAsArray(PdfName.BBOX));
-                                if(bBoxCoordinates!=null && bBoxCoordinates.size()>=4) {
+                                PdfRectangle bBoxCoordinates = new PdfRectangle(
+                                        ((PdfDictionary) objReal).getAsArray(PdfName.BBOX));
+                                if (bBoxCoordinates != null && bBoxCoordinates.size() >= 4) {
                                     // DEVSIX-1741 - Bugfix backported as Jonthan of iText suggested
                                     Rectangle bBox = PdfReader.getNormalizedRectangle(bBoxCoordinates);
-                                    cb.addTemplate(app, (box.getWidth() / bBox.getWidth()), 0, 0, (box.getHeight() / bBox.getHeight()), box.getLeft(), box.getBottom());
-                                }
-                                else {
-                                    throw new DocumentException("The required BBox attribute of the field "+ name +" is missing. The PDF is not PDF spec compliant!");
+                                    cb.addTemplate(app, (box.getWidth() / bBox.getWidth()), 0, 0,
+                                            (box.getHeight() / bBox.getHeight()), box.getLeft(), box.getBottom());
+                                } else {
+                                    throw new DocumentException("The required BBox attribute of the field " + name
+                                            + " is missing. The PDF is not PDF spec compliant!");
                                 }
-                            }
-                            else {
-                        cb.addTemplate(app, box.getLeft(), box.getBottom());
+                            } else {
+                                cb.addTemplate(app, box.getLeft(), box.getBottom());
                             }
                         }
-                        
+
                         cb.setLiteral("q ");
                     }
                 }
-                if (partialFlattening.isEmpty())
+                if (partialFlattening.isEmpty()) {
                     continue;
+                }
                 PdfDictionary pageDic = reader.getPageN(page);
                 PdfArray annots = pageDic.getAsArray(PdfName.ANNOTS);
-                if (annots == null)
+                if (annots == null) {
                     continue;
+                }
                 for (int idx = 0; idx < annots.size(); ++idx) {
                     PdfObject ran = annots.getPdfObject(idx);
-                    if (!ran.isIndirect())
+                    if (!ran.isIndirect()) {
                         continue;
+                    }
                     PdfObject ran2 = item.getWidgetRef(k);
-                    if (!ran2.isIndirect())
+                    if (!ran2.isIndirect()) {
                         continue;
+                    }
                     if (((PRIndirectReference) ran).getNumber() == ((PRIndirectReference) ran2).getNumber()) {
                         annots.remove(idx--);
                         PRIndirectReference wdref = (PRIndirectReference) ran2;
@@ -1070,8 +1122,9 @@ else if (objReal instanceof PdfStream) {
                                     --fr;
                                 }
                             }
-                            if (!kids.isEmpty())
+                            if (!kids.isEmpty()) {
                                 break;
+                            }
                             wdref = parentRef;
                         }
                     }
@@ -1086,13 +1139,16 @@ else if (objReal instanceof PdfStream) {
             for (int page = 1; page <= reader.getNumberOfPages(); ++page) {
                 PdfDictionary pageDic = reader.getPageN(page);
                 PdfArray annots = pageDic.getAsArray(PdfName.ANNOTS);
-                if (annots == null)
+                if (annots == null) {
                     continue;
+                }
                 for (int idx = 0; idx < annots.size(); ++idx) {
                     PdfObject annoto = annots.getDirectObject(idx);
-                    if ((annoto instanceof PdfIndirectReference) && !annoto.isIndirect())
+                    if ((annoto instanceof PdfIndirectReference) && !annoto.isIndirect()) {
                         continue;
-                    if (!annoto.isDictionary() || PdfName.WIDGET.equals(((PdfDictionary)annoto).get(PdfName.SUBTYPE))) {
+                    }
+                    if (!annoto.isDictionary() || PdfName.WIDGET.equals(
+                            ((PdfDictionary) annoto).get(PdfName.SUBTYPE))) {
                         annots.remove(idx);
                         --idx;
                     }
@@ -1108,9 +1164,10 @@ else if (objReal instanceof PdfStream) {
 
     void eliminateAcroformObjects() {
         PdfObject acro = reader.getCatalog().get(PdfName.ACROFORM);
-        if (acro == null)
+        if (acro == null) {
             return;
-        PdfDictionary acrodic = (PdfDictionary)PdfReader.getPdfObject(acro);
+        }
+        PdfDictionary acrodic = (PdfDictionary) PdfReader.getPdfObject(acro);
         reader.killXref(acrodic.get(PdfName.XFA));
         acrodic.remove(PdfName.XFA);
         PdfObject iFields = acrodic.get(PdfName.FIELDS);
@@ -1128,86 +1185,82 @@ void eliminateAcroformObjects() {
 
     void sweepKids(PdfObject obj) {
         PdfObject oo = PdfReader.killIndirect(obj);
-        if (oo == null || !oo.isDictionary())
+        if (oo == null || !oo.isDictionary()) {
             return;
-        PdfDictionary dic = (PdfDictionary)oo;
-        PdfArray kids = (PdfArray)PdfReader.killIndirect(dic.get(PdfName.KIDS));
-        if (kids == null)
+        }
+        PdfDictionary dic = (PdfDictionary) oo;
+        PdfArray kids = (PdfArray) PdfReader.killIndirect(dic.get(PdfName.KIDS));
+        if (kids == null) {
             return;
+        }
         for (int k = 0; k < kids.size(); ++k) {
             sweepKids(kids.getPdfObject(k));
         }
     }
 
-    private void flatFreeTextFields()
-    {
-        if (append)
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("freetext.flattening.is.not.supported.in.append.mode"));
+    private void flatFreeTextFields() {
+        if (append) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("freetext.flattening.is.not.supported.in.append.mode"));
+        }
 
-        for (int page = 1; page <= reader.getNumberOfPages(); ++page)
-        {
+        for (int page = 1; page <= reader.getNumberOfPages(); ++page) {
             PdfDictionary pageDic = reader.getPageN(page);
             PdfArray annots = pageDic.getAsArray(PdfName.ANNOTS);
-            if (annots == null)
+            if (annots == null) {
                 continue;
-            for (int idx = 0; idx < annots.size(); ++idx)
-            {
+            }
+            for (int idx = 0; idx < annots.size(); ++idx) {
                 PdfObject annoto = annots.getDirectObject(idx);
-                if ((annoto instanceof PdfIndirectReference) && !annoto.isIndirect())
+                if ((annoto instanceof PdfIndirectReference) && !annoto.isIndirect()) {
                     continue;
+                }
 
                 //Lonzak Fix: java.lang.ClassCastException: com.lowagie.text.pdf.PdfNull cannot be cast to com.lowagie.text.pdf.PdfDictionary
-                if(!(annoto instanceof PdfDictionary)) {
+                if (!(annoto instanceof PdfDictionary)) {
                     continue;
                 }
 
-                PdfDictionary annDic = (PdfDictionary)annoto;
-                 if (!annDic.get(PdfName.SUBTYPE).equals(PdfName.FREETEXT))
+                PdfDictionary annDic = (PdfDictionary) annoto;
+                if (!annDic.get(PdfName.SUBTYPE).equals(PdfName.FREETEXT)) {
                     continue;
+                }
                 PdfNumber ff = annDic.getAsNumber(PdfName.F);
                 int flags = (ff != null) ? ff.intValue() : 0;
 
-                if ( (flags & PdfFormField.FLAGS_PRINT) != 0 && (flags & PdfFormField.FLAGS_HIDDEN) == 0)
-                {
+                if ((flags & PdfFormField.FLAGS_PRINT) != 0 && (flags & PdfFormField.FLAGS_HIDDEN) == 0) {
                     PdfObject obj1 = annDic.get(PdfName.AP);
-                    if (obj1 == null)
+                    if (obj1 == null) {
                         continue;
+                    }
                     PdfDictionary appDic = (obj1 instanceof PdfIndirectReference) ?
                             (PdfDictionary) PdfReader.getPdfObject(obj1) : (PdfDictionary) obj1;
                     PdfObject obj = appDic.get(PdfName.N);
                     PdfAppearance app = null;
                     PdfObject objReal = PdfReader.getPdfObject(obj);
 
-                    if (obj instanceof PdfIndirectReference && !obj.isIndirect())
-                        app = new PdfAppearance((PdfIndirectReference)obj);
-                    else if (objReal instanceof PdfStream)
-                    {
-                        ((PdfDictionary)objReal).put(PdfName.SUBTYPE, PdfName.FORM);
-                        app = new PdfAppearance((PdfIndirectReference)obj);
-                    }
-                    else
-                    {
+                    if (obj instanceof PdfIndirectReference && !obj.isIndirect()) {
+                        app = new PdfAppearance((PdfIndirectReference) obj);
+                    } else if (objReal instanceof PdfStream) {
+                        ((PdfDictionary) objReal).put(PdfName.SUBTYPE, PdfName.FORM);
+                        app = new PdfAppearance((PdfIndirectReference) obj);
+                    } else {
                         //Lonzak: NPE Fix since objReal or obj can be null
-                        if (objReal!=null && objReal.isDictionary())
-                        {
+                        if (objReal != null && objReal.isDictionary()) {
                             PdfName as_p = appDic.getAsName(PdfName.AS);
-                            if (as_p != null)
-                            {
-                                PdfIndirectReference iref = (PdfIndirectReference)((PdfDictionary)objReal).get(as_p);
-                                if (iref != null)
-                                {
+                            if (as_p != null) {
+                                PdfIndirectReference iref = (PdfIndirectReference) ((PdfDictionary) objReal).get(as_p);
+                                if (iref != null) {
                                     app = new PdfAppearance(iref);
-                                    if (iref.isIndirect())
-                                    {
+                                    if (iref.isIndirect()) {
                                         objReal = PdfReader.getPdfObject(iref);
-                                        ((PdfDictionary)objReal).put(PdfName.SUBTYPE, PdfName.FORM);
+                                        ((PdfDictionary) objReal).put(PdfName.SUBTYPE, PdfName.FORM);
                                     }
                                 }
                             }
                         }
                     }
-                    if (app != null)
-                    {
+                    if (app != null) {
                         Rectangle box = PdfReader.getNormalizedRectangle(annDic.getAsArray(PdfName.RECT));
                         PdfContentByte cb = getOverContent(page);
                         cb.setLiteral("Q ");
@@ -1216,20 +1269,16 @@ else if (objReal instanceof PdfStream)
                     }
                 }
             }
-            for (int idx = 0; idx < annots.size(); ++idx)
-            {
+            for (int idx = 0; idx < annots.size(); ++idx) {
                 PdfDictionary annot = annots.getAsDict(idx);
-                if (annot != null)
-                {
-                    if (PdfName.FREETEXT.equals(annot.get(PdfName.SUBTYPE)))
-                    {
+                if (annot != null) {
+                    if (PdfName.FREETEXT.equals(annot.get(PdfName.SUBTYPE))) {
                         annots.remove(idx);
                         --idx;
                     }
                 }
             }
-            if (annots.isEmpty())
-            {
+            if (annots.isEmpty()) {
                 PdfReader.killIndirect(pageDic.get(PdfName.ANNOTS));
                 pageDic.remove(PdfName.ANNOTS);
             }
@@ -1241,20 +1290,22 @@ else if (objReal instanceof PdfStream)
      */
     public PdfIndirectReference getPageReference(int page) {
         PdfIndirectReference ref = reader.getPageOrigRef(page);
-        if (ref == null)
+        if (ref == null) {
             throw new IllegalArgumentException(MessageLocalization.getComposedMessage("invalid.page.number.1", page));
+        }
         return ref;
     }
 
     void addDocumentField(PdfIndirectReference ref) {
         PdfDictionary catalog = reader.getCatalog();
-        PdfDictionary acroForm = (PdfDictionary)PdfReader.getPdfObjectNullConverting(catalog.get(PdfName.ACROFORM), catalog);
+        PdfDictionary acroForm = (PdfDictionary) PdfReader.getPdfObjectNullConverting(catalog.get(PdfName.ACROFORM),
+                catalog);
         if (acroForm == null) {
             acroForm = new PdfDictionary();
             catalog.put(PdfName.ACROFORM, acroForm);
             markUsed(catalog);
         }
-        PdfArray fields = (PdfArray)PdfReader.getPdfObjectNullConverting(acroForm.get(PdfName.FIELDS), acroForm);
+        PdfArray fields = (PdfArray) PdfReader.getPdfObjectNullConverting(acroForm.get(PdfName.FIELDS), acroForm);
         if (fields == null) {
             fields = new PdfArray();
             acroForm.put(PdfName.FIELDS, fields);
@@ -1269,16 +1320,17 @@ void addDocumentField(PdfIndirectReference ref) {
     }
 
     void addFieldResources() throws IOException {
-        if (fieldTemplates.isEmpty())
+        if (fieldTemplates.isEmpty()) {
             return;
+        }
         PdfDictionary catalog = reader.getCatalog();
-        PdfDictionary acroForm = (PdfDictionary)PdfReader.getPdfObject(catalog.get(PdfName.ACROFORM), catalog);
+        PdfDictionary acroForm = (PdfDictionary) PdfReader.getPdfObject(catalog.get(PdfName.ACROFORM), catalog);
         if (acroForm == null) {
             acroForm = new PdfDictionary();
             catalog.put(PdfName.ACROFORM, acroForm);
             markUsed(catalog);
         }
-        PdfDictionary dr = (PdfDictionary)PdfReader.getPdfObject(acroForm.get(PdfName.DR), acroForm);
+        PdfDictionary dr = (PdfDictionary) PdfReader.getPdfObject(acroForm.get(PdfName.DR), acroForm);
         if (dr == null) {
             dr = new PdfDictionary();
             acroForm.put(PdfName.DR, dr);
@@ -1331,26 +1383,30 @@ void addAnnotation(PdfAnnotation annotation, PdfDictionary pageN) {
             if (annotation.isForm()) {
                 fieldsAdded = true;
                 getAcroFields();
-                PdfFormField field = (PdfFormField)annotation;
-                if (field.getParent() != null)
+                PdfFormField field = (PdfFormField) annotation;
+                if (field.getParent() != null) {
                     return;
+                }
                 expandFields(field, annotations);
-            }
-            else
+            } else {
                 annotations.add(annotation);
+            }
             for (PdfAnnotation pdfAnnotation : annotations) {
                 annotation = pdfAnnotation;
-                if (annotation.getPlaceInPage() > 0)
+                if (annotation.getPlaceInPage() > 0) {
                     pageN = reader.getPageN(annotation.getPlaceInPage());
+                }
                 if (annotation.isForm()) {
                     if (!annotation.isUsed()) {
                         Map templates = annotation.getTemplates();
-                        if (templates != null)
+                        if (templates != null) {
                             fieldTemplates.putAll(templates);
+                        }
                     }
                     PdfFormField field = (PdfFormField) annotation;
-                    if (field.getParent() == null)
+                    if (field.getParent() == null) {
                         addDocumentField(field.getIndirectReference());
+                    }
                 }
                 if (annotation.isAnnotation()) {
                     PdfObject pdfobj = PdfReader.getPdfObject(pageN.get(PdfName.ANNOTS), pageN);
@@ -1359,13 +1415,15 @@ void addAnnotation(PdfAnnotation annotation, PdfDictionary pageN) {
                         annots = new PdfArray();
                         pageN.put(PdfName.ANNOTS, annots);
                         markUsed(pageN);
-                    } else
+                    } else {
                         annots = (PdfArray) pdfobj;
+                    }
                     annots.add(annotation.getIndirectReference());
                     markUsed(annots);
                     if (!annotation.isUsed()) {
                         PdfRectangle rect = (PdfRectangle) annotation.get(PdfName.RECT);
-                        if (rect != null && (rect.left() != 0 || rect.right() != 0 || rect.top() != 0 || rect.bottom() != 0)) {
+                        if (rect != null && (rect.left() != 0 || rect.right() != 0 || rect.top() != 0
+                                || rect.bottom() != 0)) {
                             int rotation = reader.getPageRotation(pageN);
                             Rectangle pageSize = reader.getPageSizeWithRotation(pageN);
                             switch (rotation) {
@@ -1399,16 +1457,15 @@ void addAnnotation(PdfAnnotation annotation, PdfDictionary pageN) {
                     addToBody(annotation, annotation.getIndirectReference());
                 }
             }
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             throw new ExceptionConverter(e);
         }
     }
-    
+
     /**
-     * Allows to add e.g. a Radiogroup without specifying a page for the data field parent.
-     * The parent (data) form field isn't located on a page thus it doesn't make sense to specify one.
-     * 
+     * Allows to add e.g. a Radiogroup without specifying a page for the data field parent. The parent (data) form field
+     * isn't located on a page thus it doesn't make sense to specify one.
+     *
      * @param annot annotation to be added
      */
     private void addAnnotationToDocument(PdfAnnotation annot) {
@@ -1418,102 +1475,104 @@ private void addAnnotationToDocument(PdfAnnotation annot) {
                 fieldsAdded = true;
                 getAcroFields();
                 //@sonatype-lift ignore since before 'isForm' is called 
-                PdfFormField field = (PdfFormField)annot;
+                PdfFormField field = (PdfFormField) annot;
                 if (field.getParent() != null) {
                     return;
                 }
                 expandFields(field, allAnnots);
-            }
-            else {
+            } else {
                 allAnnots.add(annot);
             }
-            
+
             PdfDictionary pageN = null;
-            
+
             for (int k = 0; k < allAnnots.size(); ++k) {
-                annot = (PdfAnnotation)allAnnots.get(k);
-                if (annot.getPlaceInPage() > 0)
+                annot = (PdfAnnotation) allAnnots.get(k);
+                if (annot.getPlaceInPage() > 0) {
                     pageN = reader.getPageN(annot.getPlaceInPage());
+                }
                 if (annot.isForm()) {
                     if (!annot.isUsed()) {
                         HashMap templates = annot.getTemplates();
-                        if (templates != null)
+                        if (templates != null) {
                             fieldTemplates.putAll(templates);
+                        }
                     }
                     //@sonatype-lift ignore since before 'isForm' is called 
-                    PdfFormField field = (PdfFormField)annot;
-                    if (field.getParent() == null)
+                    PdfFormField field = (PdfFormField) annot;
+                    if (field.getParent() == null) {
                         addDocumentField(field.getIndirectReference());
+                    }
                 }
                 if (annot.isAnnotation()) {
                     //ensure that a page has been set for the annotations (=kids of the parent)
-                    if(annot.isForm() && pageN!=null) {
+                    if (annot.isForm() && pageN != null) {
                         PdfObject pdfobj = PdfReader.getPdfObject(pageN.get(PdfName.ANNOTS), pageN);
                         PdfArray annots = null;
                         if (pdfobj == null || !pdfobj.isArray()) {
                             annots = new PdfArray();
                             pageN.put(PdfName.ANNOTS, annots);
                             markUsed(pageN);
+                        } else {
+                            annots = (PdfArray) pdfobj;
                         }
-                        else
-                           annots = (PdfArray)pdfobj;
                         annots.add(annot.getIndirectReference());
                         markUsed(annots);
                         if (!annot.isUsed()) {
-                            PdfRectangle rect = (PdfRectangle)annot.get(PdfName.RECT);
-                            if (rect != null && (rect.left() != 0 || rect.right() != 0 || rect.top() != 0 || rect.bottom() != 0)) {
+                            PdfRectangle rect = (PdfRectangle) annot.get(PdfName.RECT);
+                            if (rect != null && (rect.left() != 0 || rect.right() != 0 || rect.top() != 0
+                                    || rect.bottom() != 0)) {
                                 int rotation = reader.getPageRotation(pageN);
                                 Rectangle pageSize = reader.getPageSizeWithRotation(pageN);
                                 switch (rotation) {
                                     case 90:
                                         annot.put(PdfName.RECT, new PdfRectangle(
-                                        pageSize.getTop() - rect.top(),
-                                        rect.right(),
-                                        pageSize.getTop() - rect.bottom(),
-                                        rect.left()));
+                                                pageSize.getTop() - rect.top(),
+                                                rect.right(),
+                                                pageSize.getTop() - rect.bottom(),
+                                                rect.left()));
                                         break;
                                     case 180:
                                         annot.put(PdfName.RECT, new PdfRectangle(
-                                        pageSize.getRight() - rect.left(),
-                                        pageSize.getTop() - rect.bottom(),
-                                        pageSize.getRight() - rect.right(),
-                                        pageSize.getTop() - rect.top()));
+                                                pageSize.getRight() - rect.left(),
+                                                pageSize.getTop() - rect.bottom(),
+                                                pageSize.getRight() - rect.right(),
+                                                pageSize.getTop() - rect.top()));
                                         break;
                                     case 270:
                                         annot.put(PdfName.RECT, new PdfRectangle(
-                                        rect.bottom(),
-                                        pageSize.getRight() - rect.left(),
-                                        rect.top(),
-                                        pageSize.getRight() - rect.right()));
+                                                rect.bottom(),
+                                                pageSize.getRight() - rect.left(),
+                                                rect.top(),
+                                                pageSize.getRight() - rect.right()));
                                         break;
                                 }
                             }
                         }
-                    }
-                    else {
-                        throw new IllegalStateException("The radiobutton widget doesn't have a page: "+annot.toString());
+                    } else {
+                        throw new IllegalStateException(
+                                "The radiobutton widget doesn't have a page: " + annot.toString());
                     }
                 }
-                
+
                 if (!annot.isUsed()) {
                     annot.setUsed();
                     addToBody(annot, annot.getIndirectReference());
                 }
             }
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             throw new ExceptionConverter(e);
         }
     }
 
     public void addAnnotation(PdfAnnotation annot, int page) {
         //Bugfix to prevent that for autofill parents the /P page reference is added [^Lonzak]
-        if(annot.isAnnotation()){
+        if (annot.isAnnotation()) {
             annot.setPage(page);
         }
         addAnnotation(annot, reader.getPageN(page));
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfWriter#addAnnotation(com.lowagie.text.pdf.PdfAnnotation)
      */
@@ -1524,23 +1583,24 @@ public void addAnnotation(PdfAnnotation annot) {
 
     private void outlineTravel(PRIndirectReference outline) {
         while (outline != null) {
-            PdfDictionary outlineR = (PdfDictionary)PdfReader.getPdfObjectRelease(outline);
-            PRIndirectReference first = (PRIndirectReference)outlineR.get(PdfName.FIRST);
+            PdfDictionary outlineR = (PdfDictionary) PdfReader.getPdfObjectRelease(outline);
+            PRIndirectReference first = (PRIndirectReference) outlineR.get(PdfName.FIRST);
             if (first != null) {
                 outlineTravel(first);
             }
             PdfReader.killIndirect(outlineR.get(PdfName.DEST));
             PdfReader.killIndirect(outlineR.get(PdfName.A));
             PdfReader.killIndirect(outline);
-            outline = (PRIndirectReference)outlineR.get(PdfName.NEXT);
+            outline = (PRIndirectReference) outlineR.get(PdfName.NEXT);
         }
     }
 
     void deleteOutlines() {
         PdfDictionary catalog = reader.getCatalog();
-        PRIndirectReference outlines = (PRIndirectReference)catalog.get(PdfName.OUTLINES);
-        if (outlines == null)
+        PRIndirectReference outlines = (PRIndirectReference) catalog.get(PdfName.OUTLINES);
+        if (outlines == null) {
             return;
+        }
         outlineTravel(outlines);
         PdfReader.killIndirect(outlines);
         catalog.remove(PdfName.OUTLINES);
@@ -1549,10 +1609,11 @@ void deleteOutlines() {
 
     void setJavaScript() throws IOException {
         Map djs = pdf.getDocumentLevelJS();
-        if (djs.isEmpty())
+        if (djs.isEmpty()) {
             return;
+        }
         PdfDictionary catalog = reader.getCatalog();
-        PdfDictionary names = (PdfDictionary)PdfReader.getPdfObject(catalog.get(PdfName.NAMES), catalog);
+        PdfDictionary names = (PdfDictionary) PdfReader.getPdfObject(catalog.get(PdfName.NAMES), catalog);
         if (names == null) {
             names = new PdfDictionary();
             catalog.put(PdfName.NAMES, names);
@@ -1565,17 +1626,19 @@ void setJavaScript() throws IOException {
 
     void addFileAttachments() throws IOException {
         Map fs = pdf.getDocumentFileAttachment();
-        if (fs.isEmpty())
+        if (fs.isEmpty()) {
             return;
+        }
         PdfDictionary catalog = reader.getCatalog();
-        PdfDictionary names = (PdfDictionary)PdfReader.getPdfObject(catalog.get(PdfName.NAMES), catalog);
+        PdfDictionary names = (PdfDictionary) PdfReader.getPdfObject(catalog.get(PdfName.NAMES), catalog);
         if (names == null) {
             names = new PdfDictionary();
             catalog.put(PdfName.NAMES, names);
             markUsed(catalog);
         }
         markUsed(names);
-        Map old = PdfNameTree.readTree((PdfDictionary)PdfReader.getPdfObjectRelease(names.get(PdfName.EMBEDDEDFILES)));
+        Map old = PdfNameTree.readTree(
+                (PdfDictionary) PdfReader.getPdfObjectRelease(names.get(PdfName.EMBEDDEDFILES)));
         for (Map.Entry entry : fs.entrySet()) {
             String name = entry.getKey();
             int k = 0;
@@ -1599,19 +1662,22 @@ void addFileAttachments() throws IOException {
 
     /**
      * Adds or replaces the Collection Dictionary in the Catalog.
-     * @param    collection    the new collection dictionary.
+     *
+     * @param collection the new collection dictionary.
      */
-    void makePackage( PdfCollection collection ) {
+    void makePackage(PdfCollection collection) {
         PdfDictionary catalog = reader.getCatalog();
-           catalog.put( PdfName.COLLECTION, collection );
+        catalog.put(PdfName.COLLECTION, collection);
     }
 
     void setOutlines() throws IOException {
-        if (newBookmarks == null)
+        if (newBookmarks == null) {
             return;
+        }
         deleteOutlines();
-        if (newBookmarks.isEmpty())
+        if (newBookmarks.isEmpty()) {
             return;
+        }
         PdfDictionary catalog = reader.getCatalog();
         boolean namedAsNames = (catalog.get(PdfName.DESTS) != null);
         writeOutlines(catalog, namedAsNames);
@@ -1620,6 +1686,7 @@ void setOutlines() throws IOException {
 
     /**
      * Sets the viewer preferences.
+     *
      * @param preferences the viewer preferences
      * @see PdfWriter#setViewerPreferences(int)
      */
@@ -1628,8 +1695,10 @@ public void setViewerPreferences(int preferences) {
         this.viewerPreferences.setViewerPreferences(preferences);
     }
 
-    /** Adds a viewer preference
-     * @param key a key for a viewer preference
+    /**
+     * Adds a viewer preference
+     *
+     * @param key   a key for a viewer preference
      * @param value the value for the viewer preference
      * @see PdfViewerPreferences#addViewerPreference
      */
@@ -1640,35 +1709,42 @@ public void addViewerPreference(PdfName key, PdfObject value) {
 
     /**
      * Set the signature flags.
+     *
      * @param f the flags. This flags are ORed with current ones
      */
     public void setSigFlags(int f) {
         sigFlags |= f;
     }
 
-    /** Always throws an UnsupportedOperationException.
+    /**
+     * Always throws an UnsupportedOperationException.
+     *
      * @param actionType ignore
-     * @param action ignore
+     * @param action     ignore
      * @throws PdfException ignore
      * @see PdfStamper#setPageAction(PdfName, PdfAction, int)
      */
     public void setPageAction(PdfName actionType, PdfAction action) throws PdfException {
-        throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("use.setpageaction.pdfname.actiontype.pdfaction.action.int.page"));
+        throw new UnsupportedOperationException(MessageLocalization.getComposedMessage(
+                "use.setpageaction.pdfname.actiontype.pdfaction.action.int.page"));
     }
 
     /**
      * Sets the open and close page additional action.
-     * @param actionType the action type. It can be PdfWriter.PAGE_OPEN
-     * or PdfWriter.PAGE_CLOSE
-     * @param action the action to perform
-     * @param page the page where the action will be applied. The first page is 1
+     *
+     * @param actionType the action type. It can be PdfWriter.PAGE_OPEN or
+     *                   PdfWriter.PAGE_CLOSE
+     * @param action     the action to perform
+     * @param page       the page where the action will be applied. The first page is 1
      * @throws PdfException if the action type is invalid
      */
     void setPageAction(PdfName actionType, PdfAction action, int page) throws PdfException {
-        if (!actionType.equals(PAGE_OPEN) && !actionType.equals(PAGE_CLOSE))
-            throw new PdfException(MessageLocalization.getComposedMessage("invalid.page.additional.action.type.1", actionType.toString()));
+        if (!actionType.equals(PAGE_OPEN) && !actionType.equals(PAGE_CLOSE)) {
+            throw new PdfException(MessageLocalization.getComposedMessage("invalid.page.additional.action.type.1",
+                    actionType.toString()));
+        }
         PdfDictionary pg = reader.getPageN(page);
-        PdfDictionary aa = (PdfDictionary)PdfReader.getPdfObject(pg.get(PdfName.AA), pg);
+        PdfDictionary aa = (PdfDictionary) PdfReader.getPdfObject(pg.get(PdfName.AA), pg);
         if (aa == null) {
             aa = new PdfDictionary();
             pg.put(PdfName.AA, aa);
@@ -1680,103 +1756,118 @@ void setPageAction(PdfName actionType, PdfAction action, int page) throws PdfExc
 
     /**
      * Always throws an UnsupportedOperationException.
+     *
      * @param seconds ignore
      */
     public void setDuration(int seconds) {
-        throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("use.setpageaction.pdfname.actiontype.pdfaction.action.int.page"));
+        throw new UnsupportedOperationException(MessageLocalization.getComposedMessage(
+                "use.setpageaction.pdfname.actiontype.pdfaction.action.int.page"));
     }
 
     /**
      * Always throws an UnsupportedOperationException.
+     *
      * @param transition ignore
      */
     public void setTransition(PdfTransition transition) {
-        throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("use.setpageaction.pdfname.actiontype.pdfaction.action.int.page"));
+        throw new UnsupportedOperationException(MessageLocalization.getComposedMessage(
+                "use.setpageaction.pdfname.actiontype.pdfaction.action.int.page"));
     }
 
     /**
      * Sets the display duration for the page (for presentations)
-     * @param seconds   the number of seconds to display the page. A negative value removes the entry
-     * @param page the page where the duration will be applied. The first page is 1
+     *
+     * @param seconds the number of seconds to display the page. A negative value removes the entry
+     * @param page    the page where the duration will be applied. The first page is 1
      */
     void setDuration(int seconds, int page) {
         PdfDictionary pg = reader.getPageN(page);
-        if (seconds < 0)
+        if (seconds < 0) {
             pg.remove(PdfName.DUR);
-        else
+        } else {
             pg.put(PdfName.DUR, new PdfNumber(seconds));
+        }
         markUsed(pg);
     }
 
     /**
      * Sets the transition for the page
-     * @param transition   the transition object. A null removes the transition
-     * @param page the page where the transition will be applied. The first page is 1
+     *
+     * @param transition the transition object. A null removes the transition
+     * @param page       the page where the transition will be applied. The first page is 1
      */
     void setTransition(PdfTransition transition, int page) {
         PdfDictionary pg = reader.getPageN(page);
-        if (transition == null)
+        if (transition == null) {
             pg.remove(PdfName.TRANS);
-        else
+        } else {
             pg.put(PdfName.TRANS, transition.getTransitionDictionary());
+        }
         markUsed(pg);
     }
 
     protected void markUsed(PdfObject obj) {
         if (append && obj != null) {
             PRIndirectReference ref;
-            if (obj.type() == PdfObject.INDIRECT)
-                ref = (PRIndirectReference)obj;
-            else
+            if (obj.type() == PdfObject.INDIRECT) {
+                ref = (PRIndirectReference) obj;
+            } else {
                 ref = obj.getIndRef();
-            if (ref != null)
+            }
+            if (ref != null) {
                 marked.put(ref.getNumber(), 1);
+            }
         }
     }
 
     protected void markUsed(int num) {
-        if (append)
+        if (append) {
             marked.put(num, 1);
+        }
     }
 
     /**
      * Getter for property append.
+     *
      * @return Value of property append.
      */
     boolean isAppend() {
         return append;
     }
 
-    /** Additional-actions defining the actions to be taken in
-     * response to various trigger events affecting the document
+    /**
+     * Additional-actions defining the actions to be taken in response to various trigger events affecting the document
      * as a whole. The actions types allowed are: DOCUMENT_CLOSE,
      * WILL_SAVE, DID_SAVE, WILL_PRINT
      * and DID_PRINT.
      *
      * @param actionType the action type
-     * @param action the action to execute in response to the trigger
+     * @param action     the action to execute in response to the trigger
      * @throws PdfException on invalid action type
      */
     public void setAdditionalAction(PdfName actionType, PdfAction action) throws PdfException {
         if (!(actionType.equals(DOCUMENT_CLOSE) ||
-        actionType.equals(WILL_SAVE) ||
-        actionType.equals(DID_SAVE) ||
-        actionType.equals(WILL_PRINT) ||
-        actionType.equals(DID_PRINT))) {
-            throw new PdfException(MessageLocalization.getComposedMessage("invalid.additional.action.type.1", actionType.toString()));
+                actionType.equals(WILL_SAVE) ||
+                actionType.equals(DID_SAVE) ||
+                actionType.equals(WILL_PRINT) ||
+                actionType.equals(DID_PRINT))) {
+            throw new PdfException(
+                    MessageLocalization.getComposedMessage("invalid.additional.action.type.1", actionType.toString()));
         }
         PdfDictionary aa = reader.getCatalog().getAsDict(PdfName.AA);
         if (aa == null) {
-            if (action == null)
+            if (action == null) {
                 return;
+            }
             aa = new PdfDictionary();
             reader.getCatalog().put(PdfName.AA, aa);
         }
         markUsed(aa);
-        if (action == null)
+        if (action == null) {
             aa.remove(actionType);
-        else
+        } else {
             aa.put(actionType, action);
+        }
     }
 
     /**
@@ -1790,7 +1881,8 @@ public void setOpenAction(PdfAction action) {
      * @see com.lowagie.text.pdf.PdfWriter#setOpenAction(java.lang.String)
      */
     public void setOpenAction(String name) {
-        throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("open.actions.by.name.are.not.supported"));
+        throw new UnsupportedOperationException(
+                MessageLocalization.getComposedMessage("open.actions.by.name.are.not.supported"));
     }
 
     /**
@@ -1809,18 +1901,21 @@ void setThumbnail(Image image, int page) throws DocumentException {
     }
 
     public PdfContentByte getDirectContentUnder() {
-        throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("use.pdfstamper.getundercontent.or.pdfstamper.getovercontent"));
+        throw new UnsupportedOperationException(
+                MessageLocalization.getComposedMessage("use.pdfstamper.getundercontent.or.pdfstamper.getovercontent"));
     }
 
     public PdfContentByte getDirectContent() {
-        throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("use.pdfstamper.getundercontent.or.pdfstamper.getovercontent"));
+        throw new UnsupportedOperationException(
+                MessageLocalization.getComposedMessage("use.pdfstamper.getundercontent.or.pdfstamper.getovercontent"));
     }
 
     /**
-     * Reads the OCProperties dictionary from the catalog of the existing document
-     * and fills the documentOCG, documentOCGorder and OCGRadioGroup variables in PdfWriter.
-     * Note that the original OCProperties of the existing document can contain more information.
-     * @since    2.1.2
+     * Reads the OCProperties dictionary from the catalog of the existing document and fills the documentOCG,
+     * documentOCGorder and OCGRadioGroup variables in PdfWriter. Note that the original OCProperties of the existing
+     * document can contain more information.
+     *
+     * @since 2.1.2
      */
     protected void readOCProperties() {
         if (!documentOCG.isEmpty()) {
@@ -1835,18 +1930,18 @@ protected void readOCProperties() {
         PdfLayer layer;
         Map ocgmap = new HashMap<>();
         for (PdfObject pdfObject : ocgs.getElements()) {
-            ref = (PdfIndirectReference)pdfObject;
+            ref = (PdfIndirectReference) pdfObject;
             layer = new PdfLayer(null);
             layer.setRef(ref);
             layer.setOnPanel(false);
-            layer.merge((PdfDictionary)PdfReader.getPdfObject(ref));
+            layer.merge((PdfDictionary) PdfReader.getPdfObject(ref));
             ocgmap.put(ref.toString(), layer);
         }
         PdfDictionary d = dict.getAsDict(PdfName.D);
         PdfArray off = d.getAsArray(PdfName.OFF);
         if (off != null) {
-            for (PdfObject pdfObject : off.getElements() ) {
-                ref = (PdfIndirectReference)pdfObject;
+            for (PdfObject pdfObject : off.getElements()) {
+                ref = (PdfIndirectReference) pdfObject;
                 layer = ocgmap.get(ref.toString());
                 layer.setOn(false);
             }
@@ -1858,8 +1953,9 @@ protected void readOCProperties() {
         documentOCG.addAll(ocgmap.values());
         OCGRadioGroup = d.getAsArray(PdfName.RBGROUPS);
         OCGLocked = d.getAsArray(PdfName.LOCKED);
-        if (OCGLocked == null)
+        if (OCGLocked == null) {
             OCGLocked = new PdfArray();
+        }
     }
 
     /**
@@ -1884,12 +1980,13 @@ private void addOrder(PdfLayer parent, PdfArray arr, Map ocgma
                 }
                 if (arr.size() > i + 1 && arr.getPdfObject(i + 1).isArray()) {
                     i++;
-                    addOrder(layer, (PdfArray)arr.getPdfObject(i), ocgmap);
+                    addOrder(layer, (PdfArray) arr.getPdfObject(i), ocgmap);
+                }
+            } else if (obj.isArray()) {
+                PdfArray sub = (PdfArray) obj;
+                if (sub.isEmpty()) {
+                    return;
                 }
-            }
-            else if (obj.isArray()) {
-                PdfArray sub = (PdfArray)obj;
-                if (sub.isEmpty()) return;
                 obj = sub.getPdfObject(0);
                 if (obj.isString()) {
                     layer = new PdfLayer(obj.toString());
@@ -1901,17 +1998,15 @@ else if (obj.isArray()) {
                     PdfArray array = new PdfArray();
                     sub.getElements().forEach(array::add);
                     addOrder(layer, array, ocgmap);
-                }
-                else {
-                    addOrder(parent, (PdfArray)obj, ocgmap);
+                } else {
+                    addOrder(parent, (PdfArray) obj, ocgmap);
                 }
             }
         }
     }
 
     /**
-     * Gets the PdfLayer objects in an existing document as a Map
-     * with the names/titles of the layers as keys.
+     * Gets the PdfLayer objects in an existing document as a Map with the names/titles of the layers as keys.
      *
      * @return a Map with all the PdfLayers in the document (and the name/title of the layer as key)
      * @since 2.1.2
@@ -1944,23 +2039,9 @@ public Map getPdfLayers() {
         return map;
     }
 
-    static class PageStamp {
-
-        PdfDictionary pageN;
-        StampContent under;
-        StampContent over;
-        PageResources pageResources;
-        int replacePoint = 0;
-
-        PageStamp(PdfStamperImp stamper, PdfDictionary pageN) {
-            this.pageN = pageN;
-            pageResources = new PageResources();
-            PdfDictionary resources = pageN.getAsDict(PdfName.RESOURCES);
-            pageResources.setOriginalResources(resources, stamper.namePtr);
-        }
-    }
-
-    /** These methods are used by PdfStamper to override some PDF properties when signing PDF files. */
+    /**
+     * These methods are used by PdfStamper to override some PDF properties when signing PDF files.
+     */
 
     public boolean isIncludeFileID() {
         return includeFileID;
@@ -2002,4 +2083,20 @@ public void setUpdateDocInfo(boolean updateDocInfo) {
         this.updateDocInfo = updateDocInfo;
     }
 
+    static class PageStamp {
+
+        PdfDictionary pageN;
+        StampContent under;
+        StampContent over;
+        PageResources pageResources;
+        int replacePoint = 0;
+
+        PageStamp(PdfStamperImp stamper, PdfDictionary pageN) {
+            this.pageN = pageN;
+            pageResources = new PageResources();
+            PdfDictionary resources = pageN.getAsDict(PdfName.RESOURCES);
+            pageResources.setOriginalResources(resources, stamper.namePtr);
+        }
+    }
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStream.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStream.java
index ee168e366..80ccfb520 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStream.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStream.java
@@ -49,74 +49,76 @@
 
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.DocWriter;
+import com.lowagie.text.Document;
+import com.lowagie.text.ExceptionConverter;
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.zip.Deflater;
 import java.util.zip.DeflaterOutputStream;
-import com.lowagie.text.error_messages.MessageLocalization;
-
-import com.lowagie.text.DocWriter;
-import com.lowagie.text.Document;
-import com.lowagie.text.ExceptionConverter;
 
 
 /**
  * PdfStream is the Pdf stream object.
- * 
            
- * A stream, like a string, is a sequence of characters. However, an application can
- * read a small portion of a stream at a time, while a string must be read in its entirety.
- * For this reason, objects with potentially large amounts of data, such as images and
- * page descriptions, are represented as streams.
            
- * A stream consists of a dictionary that describes a sequence of characters, followed by
- * the keyword stream, followed by zero or more lines of characters, followed by
- * the keyword endstream.
            
- * All streams must be PdfIndirectObjects. The stream dictionary must be a direct
- * object. The keyword stream that follows the stream dictionary should be followed by
- * a carriage return and linefeed or just a linefeed.
            
- * Remark: In this version only the FLATEDECODE-filter is supported.
            
- * This object is described in the 'Portable Document Format Reference Manual version 1.7'
- * section 3.2.7 (page 60-63).
            
+ * 
            
+ * A stream, like a string, is a sequence of characters. However, an application can read a small portion of a stream at
+ * a time, while a string must be read in its entirety. For this reason, objects with potentially large amounts of data,
+ * such as images and page descriptions, are represented as streams.
             A stream consists of a dictionary that
+ * describes a sequence of characters, followed by the keyword stream, followed by zero or more lines of
+ * characters, followed by the keyword endstream.
             All streams must be PdfIndirectObjects. The
+ * stream dictionary must be a direct object. The keyword stream that follows the stream dictionary should be
+ * followed by a carriage return and linefeed or just a linefeed.
             Remark: In this version only the
+ * FLATEDECODE-filter is supported.
             This object is described in the 'Portable Document Format Reference Manual
+ * version 1.7' section 3.2.7 (page 60-63).
            
  *
- * @see        PdfObject
- * @see        PdfDictionary
+ * @see PdfObject
+ * @see PdfDictionary
  */
 
 public class PdfStream extends PdfDictionary {
-    
+
     // membervariables
 
     /**
      * A possible compression level.
-     * @since    2.1.3
+     *
+     * @since 2.1.3
      */
     public static final int DEFAULT_COMPRESSION = -1;
     /**
      * A possible compression level.
-     * @since    2.1.3
+     *
+     * @since 2.1.3
      */
     public static final int NO_COMPRESSION = 0;
     /**
      * A possible compression level.
-     * @since    2.1.3
+     *
+     * @since 2.1.3
      */
     public static final int BEST_SPEED = 1;
     /**
      * A possible compression level.
-     * @since    2.1.3
+     *
+     * @since 2.1.3
      */
     public static final int BEST_COMPRESSION = 9;
-    
-    
-/** is the stream compressed? */
+    static final byte[] STARTSTREAM = DocWriter.getISOBytes("stream\n");
+    static final byte[] ENDSTREAM = DocWriter.getISOBytes("\nendstream");
+    static final int SIZESTREAM = STARTSTREAM.length + ENDSTREAM.length;
+    /**
+     * is the stream compressed?
+     */
     protected boolean compressed = false;
     /**
      * The level of compression.
-     * @since    2.1.3
+     *
+     * @since 2.1.3
      */
     protected int compressionLevel = NO_COMPRESSION;
-    
     protected ByteArrayOutputStream streamBytes = null;
     protected InputStream inputStream;
     protected PdfIndirectReference ref;
@@ -124,18 +126,14 @@ public class PdfStream extends PdfDictionary {
     protected PdfWriter writer;
     protected long rawLength;
 
-    static final byte[] STARTSTREAM = DocWriter.getISOBytes("stream\n");
-    static final byte[] ENDSTREAM = DocWriter.getISOBytes("\nendstream");
-    static final int SIZESTREAM = STARTSTREAM.length + ENDSTREAM.length;
-
     // constructors
-    
-/**
- * Constructs a PdfStream-object.
- *
- * @param        bytes            content of the new PdfObject as an array of byte.
- */
- 
+
+    /**
+     * Constructs a PdfStream-object.
+     *
+     * @param bytes content of the new PdfObject as an array of byte.
+     */
+
     public PdfStream(byte[] bytes) {
         super();
         type = STREAM;
@@ -143,10 +141,10 @@ public PdfStream(byte[] bytes) {
         rawLength = bytes.length;
         put(PdfName.LENGTH, new PdfNumber(bytes.length));
     }
-  
+
     /**
-     * Creates an efficient stream. No temporary array is ever created. The InputStream
-     * is totally consumed but is not closed. The general usage is:
+     * Creates an efficient stream. No temporary array is ever created. The InputStream is totally consumed
+     * but is not closed. The general usage is:
      * 
                  * InputStream in = ...;
      * PdfStream stream = new PdfStream(in, writer);
@@ -155,9 +153,10 @@ public PdfStream(byte[] bytes) {
      * stream.writeLength();
      * in.close();
      * 
            
+     *
      * @param inputStream the data to write to this stream
-     * @param writer the PdfWriter for this stream
-     */    
+     * @param writer      the PdfWriter for this stream
+     */
     public PdfStream(InputStream inputStream, PdfWriter writer) {
         super();
         type = STREAM;
@@ -166,55 +165,63 @@ public PdfStream(InputStream inputStream, PdfWriter writer) {
         ref = writer.getPdfIndirectReference();
         put(PdfName.LENGTH, ref);
     }
-  
-/**
- * Constructs a PdfStream-object.
- */
-    
+
+    /**
+     * Constructs a PdfStream-object.
+     */
+
     protected PdfStream() {
         super();
         type = STREAM;
     }
-    
+
     /**
      * Writes the stream length to the PdfWriter.
      * 
            
-     * This method must be called and can only be called if the constructor {@link #PdfStream(InputStream,PdfWriter)}
+     * This method must be called and can only be called if the constructor {@link #PdfStream(InputStream, PdfWriter)}
      * is used to create the stream.
+     *
      * @throws IOException on error
-     * @see #PdfStream(InputStream,PdfWriter)
+     * @see #PdfStream(InputStream, PdfWriter)
      */
     public void writeLength() throws IOException {
-        if (inputStream == null)
-            throw new UnsupportedOperationException(MessageLocalization.getComposedMessage("writelength.can.only.be.called.in.a.contructed.pdfstream.inputstream.pdfwriter"));
-        if (inputStreamLength == -1)
-            throw new IOException(MessageLocalization.getComposedMessage("writelength.can.only.be.called.after.output.of.the.stream.body"));
+        if (inputStream == null) {
+            throw new UnsupportedOperationException(MessageLocalization.getComposedMessage(
+                    "writelength.can.only.be.called.in.a.contructed.pdfstream.inputstream.pdfwriter"));
+        }
+        if (inputStreamLength == -1) {
+            throw new IOException(MessageLocalization.getComposedMessage(
+                    "writelength.can.only.be.called.after.output.of.the.stream.body"));
+        }
         writer.addToBody(new PdfNumber(inputStreamLength), ref, false);
     }
-    
+
     /**
      * Gets the raw length of the stream.
+     *
      * @return the raw length of the stream
      */
     public long getRawLength() {
         return rawLength;
     }
-    
+
     /**
      * Compresses the stream.
      */
     public void flateCompress() {
         flateCompress(DEFAULT_COMPRESSION);
     }
-    
+
     /**
      * Compresses the stream.
+     *
      * @param compressionLevel the compression level (0 = best speed, 9 = best compression, -1 is default)
-     * @since    2.1.3
+     * @since 2.1.3
      */
     public void flateCompress(int compressionLevel) {
-        if (!Document.compress)
+        if (!Document.compress) {
             return;
+        }
         // check if the flateCompress-method has already been
         if (compressed) {
             return;
@@ -228,15 +235,16 @@ public void flateCompress(int compressionLevel) {
         PdfObject filter = PdfReader.getPdfObject(get(PdfName.FILTER));
         if (filter != null) {
             if (filter.isName()) {
-                if (PdfName.FLATEDECODE.equals(filter))
+                if (PdfName.FLATEDECODE.equals(filter)) {
                     return;
-            }
-            else if (filter.isArray()) {
-                if (((PdfArray) filter).contains(PdfName.FLATEDECODE))
+                }
+            } else if (filter.isArray()) {
+                if (((PdfArray) filter).contains(PdfName.FLATEDECODE)) {
                     return;
-            }
-            else {
-                throw new RuntimeException(MessageLocalization.getComposedMessage("stream.could.not.be.compressed.filter.is.not.a.name.or.array"));
+                }
+            } else {
+                throw new RuntimeException(MessageLocalization.getComposedMessage(
+                        "stream.could.not.be.compressed.filter.is.not.a.name.or.array"));
             }
         }
         try {
@@ -244,10 +252,11 @@ else if (filter.isArray()) {
             ByteArrayOutputStream stream = new ByteArrayOutputStream();
             Deflater deflater = new Deflater(compressionLevel);
             DeflaterOutputStream zip = new DeflaterOutputStream(stream, deflater);
-            if (streamBytes != null)
+            if (streamBytes != null) {
                 streamBytes.writeTo(zip);
-            else
+            } else {
                 zip.write(bytes);
+            }
             zip.close();
             deflater.end();
             // update the object
@@ -256,15 +265,13 @@ else if (filter.isArray()) {
             put(PdfName.LENGTH, new PdfNumber(streamBytes.size()));
             if (filter == null) {
                 put(PdfName.FILTER, PdfName.FLATEDECODE);
-            }
-            else {
+            } else {
                 PdfArray filters = new PdfArray(filter);
                 filters.add(PdfName.FLATEDECODE);
                 put(PdfName.FILTER, filters);
             }
             compressed = true;
-        }
-        catch(IOException ioe) {
+        } catch (IOException ioe) {
             throw new ExceptionConverter(ioe);
         }
     }
@@ -277,41 +284,44 @@ else if (filter.isArray()) {
 //        else
 //            return bytes.length + dicBytes.length + SIZESTREAM;
 //    }
-    
+
     protected void superToPdf(PdfWriter writer, OutputStream os) throws IOException {
         super.toPdf(writer, os);
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfDictionary#toPdf(com.lowagie.text.pdf.PdfWriter, java.io.OutputStream)
      */
     public void toPdf(PdfWriter writer, OutputStream os) throws IOException {
-        if (inputStream != null && compressed)
+        if (inputStream != null && compressed) {
             put(PdfName.FILTER, PdfName.FLATEDECODE);
+        }
         PdfEncryption crypto = null;
-        if (writer != null)
+        if (writer != null) {
             crypto = writer.getEncryption();
+        }
         if (crypto != null) {
             PdfObject filter = get(PdfName.FILTER);
             if (filter != null) {
-                if (PdfName.CRYPT.equals(filter))
+                if (PdfName.CRYPT.equals(filter)) {
                     crypto = null;
-                else if (filter.isArray()) {
-                    PdfArray a = (PdfArray)filter;
-                    if (!a.isEmpty() && PdfName.CRYPT.equals(a.getPdfObject(0)))
+                } else if (filter.isArray()) {
+                    PdfArray a = (PdfArray) filter;
+                    if (!a.isEmpty() && PdfName.CRYPT.equals(a.getPdfObject(0))) {
                         crypto = null;
+                    }
                 }
             }
         }
         PdfObject nn = get(PdfName.LENGTH);
         if (crypto != null && nn != null && nn.isNumber()) {
-            int sz = ((PdfNumber)nn).intValue();
+            int sz = ((PdfNumber) nn).intValue();
             put(PdfName.LENGTH, new PdfNumber(crypto.calculateStreamSize(sz)));
             superToPdf(writer, os);
             put(PdfName.LENGTH, nn);
-        }
-        else
+        } else {
             superToPdf(writer, os);
+        }
         os.write(STARTSTREAM);
         if (inputStream != null) {
             rawLength = 0;
@@ -319,8 +329,9 @@ else if (filter.isArray()) {
             OutputStreamCounter osc = new OutputStreamCounter(os);
             OutputStreamEncryption ose = null;
             OutputStream fout = osc;
-            if (crypto != null && !crypto.isEmbeddedFilesOnly())
+            if (crypto != null && !crypto.isEmbeddedFilesOnly()) {
                 fout = ose = crypto.getEncryptionStream(fout);
+            }
             Deflater deflater = null;
             if (compressed) {
                 deflater = new Deflater(compressionLevel);
@@ -330,8 +341,9 @@ else if (filter.isArray()) {
             byte[] buf = new byte[4192];
             while (true) {
                 int n = inputStream.read(buf);
-                if (n <= 0)
+                if (n <= 0) {
                     break;
+                }
                 fout.write(buf, 0, n);
                 rawLength += n;
             }
@@ -339,48 +351,51 @@ else if (filter.isArray()) {
                 def.finish();
                 deflater.end();
             }
-            if (ose != null)
+            if (ose != null) {
                 ose.finish();
+            }
             inputStreamLength = osc.getCounter();
-        }
-        else {
+        } else {
             if (crypto != null && !crypto.isEmbeddedFilesOnly()) {
                 byte[] b;
                 if (streamBytes != null) {
                     b = crypto.encryptByteArray(streamBytes.toByteArray());
-                }
-                else {
+                } else {
                     b = crypto.encryptByteArray(bytes);
                 }
                 os.write(b);
-            }
-            else {
-                if (streamBytes != null)
+            } else {
+                if (streamBytes != null) {
                     streamBytes.writeTo(os);
-                else
+                } else {
                     os.write(bytes);
+                }
             }
         }
         os.write(ENDSTREAM);
     }
-    
+
     /**
      * Writes the data content to an OutputStream.
+     *
      * @param os the destination to write to
      * @throws IOException on error
-     */    
+     */
     public void writeContent(OutputStream os) throws IOException {
-        if (streamBytes != null)
+        if (streamBytes != null) {
             streamBytes.writeTo(os);
-        else if (bytes != null)
+        } else if (bytes != null) {
             os.write(bytes);
+        }
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfObject#toString()
      */
     public String toString() {
-        if (get(PdfName.TYPE) == null) return "Stream";
+        if (get(PdfName.TYPE) == null) {
+            return "Stream";
+        }
         return "Stream of type: " + get(PdfName.TYPE);
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfString.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfString.java
index 0689b68e8..ff7f6cebb 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfString.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfString.java
@@ -54,64 +54,63 @@
 import java.nio.charset.StandardCharsets;
 
 /**
- * A PdfString-class is the PDF-equivalent of a
- * JAVA-String-object.
- * 
            
- * A string is a sequence of characters delimited by parenthesis.
- * If a string is too long to be conveniently placed on a single line, it may
- * be split across multiple lines by using the backslash character (\) at the
- * end of a line to indicate that the string continues on the following line.
- * Within a string, the backslash character is used as an escape to specify
- * unbalanced parenthesis, non-printing ASCII characters, and the backslash
- * character itself. Use of the \ddd escape sequence is the preferred
- * way to represent characters outside the printable ASCII character set.
            
- * This object is described in the 'Portable Document Format Reference Manual
- * version 1.7' section 3.2.3 (page 53-56).
+ * A PdfString-class is the PDF-equivalent of a JAVA-String-object.
+ * 
            
+ * A string is a sequence of characters delimited by parenthesis. If a string is too long to be conveniently placed on a
+ * single line, it may be split across multiple lines by using the backslash character (\) at the end of a line to
+ * indicate that the string continues on the following line. Within a string, the backslash character is used as an
+ * escape to specify unbalanced parenthesis, non-printing ASCII characters, and the backslash character itself. Use of
+ * the \ddd escape sequence is the preferred way to represent characters outside the printable ASCII character
+ * set.
             This object is described in the 'Portable Document Format Reference Manual version 1.7' section 3.2.3 (page
+ * 53-56).
  *
  * @see PdfObject
  * @see BadPdfFormatException
  */
 public class PdfString extends PdfObject {
-    
+
     // CLASS VARIABLES
-    
-    /** The value of this object. */
+
+    /**
+     * The value of this object.
+     */
     protected String value = NOTHING;
-    
+
     protected String originalValue = null;
-    
-    /** The encoding. */
+
+    /**
+     * The encoding.
+     */
     protected String encoding = TEXT_PDFDOCENCODING;
-    
+
     protected int objNum = 0;
-    
+
     protected int objGen = 0;
-    
+
     protected boolean hexWriting = false;
 
     // CONSTRUCTORS
-    
+
     /**
      * Constructs an empty PdfString-object.
      */
     public PdfString() {
         super(STRING);
     }
-    
+
     /**
-     * Constructs a PdfString-object containing a string in the
-     * standard encoding TEXT_PDFDOCENCODING.
+     * Constructs a PdfString-object containing a string in the standard encoding
+     * TEXT_PDFDOCENCODING.
      *
-     * @param value    the content of the string
+     * @param value the content of the string
      */
     public PdfString(String value) {
         super(STRING);
         this.value = value;
     }
-    
+
     /**
-     * Constructs a PdfString-object containing a string in the
-     * specified encoding.
+     * Constructs a PdfString-object containing a string in the specified encoding.
      *
      * @param value    the content of the string
      * @param encoding an encoding
@@ -121,46 +120,50 @@ public PdfString(String value, String encoding) {
         this.value = value;
         this.encoding = encoding;
     }
-    
+
     /**
      * Constructs a PdfString-object.
      *
-     * @param bytes    an array of byte
+     * @param bytes an array of byte
      */
     public PdfString(byte[] bytes) {
         super(STRING);
         value = PdfEncodings.convertToString(bytes, null);
         encoding = NOTHING;
     }
-    
+
     // methods overriding some methods in PdfObject
-    
+
     /**
-     * Writes the PDF representation of this PdfString as an array
-     * of byte to the specified OutputStream.
-     * 
+     * Writes the PDF representation of this PdfString as an array of byte to the specified
+     * OutputStream.
+     *
      * @param writer for backwards compatibility
-     * @param os The OutputStream to write the bytes to.
+     * @param os     The OutputStream to write the bytes to.
      */
     public void toPdf(PdfWriter writer, OutputStream os) throws IOException {
         byte[] b = getBytes();
         PdfEncryption crypto = null;
-        if (writer != null)
+        if (writer != null) {
             crypto = writer.getEncryption();
-        if (crypto != null && !crypto.isEmbeddedFilesOnly())
+        }
+        if (crypto != null && !crypto.isEmbeddedFilesOnly()) {
             b = crypto.encryptByteArray(b);
+        }
         if (hexWriting) {
             ByteBuffer buf = new ByteBuffer();
             buf.append('<');
             int len = b.length;
-            for (byte b1 : b) buf.appendHex(b1);
+            for (byte b1 : b) {
+                buf.appendHex(b1);
+            }
             buf.append('>');
             os.write(buf.toByteArray());
-        }
-        else
+        } else {
             os.write(PdfContentByte.escapeString(b));
+        }
     }
-    
+
     /**
      * Returns the String value of this PdfString-object.
      *
@@ -169,19 +172,20 @@ public void toPdf(PdfWriter writer, OutputStream os) throws IOException {
     public String toString() {
         return value;
     }
-    
+
     public byte[] getBytes() {
         if (bytes == null) {
-            if (encoding != null && encoding.equals(TEXT_UNICODE) && PdfEncodings.isPdfDocEncoding(value))
+            if (encoding != null && encoding.equals(TEXT_UNICODE) && PdfEncodings.isPdfDocEncoding(value)) {
                 bytes = PdfEncodings.convertToBytes(value, TEXT_PDFDOCENCODING);
-            else
+            } else {
                 bytes = PdfEncodings.convertToBytes(value, encoding);
+            }
         }
         return bytes;
     }
-    
+
     // other methods
-    
+
     /**
      * Returns the Unicode String value of this
      * PdfString-object.
@@ -189,15 +193,17 @@ public byte[] getBytes() {
      * @return A String
      */
     public String toUnicodeString() {
-        if (encoding != null && encoding.length() != 0)
+        if (encoding != null && encoding.length() != 0) {
             return value;
+        }
         getBytes();
-        if (bytes.length >= 2 && bytes[0] == (byte)254 && bytes[1] == (byte)255)
+        if (bytes.length >= 2 && bytes[0] == (byte) 254 && bytes[1] == (byte) 255) {
             return PdfEncodings.convertToString(bytes, PdfObject.TEXT_UNICODE);
-        else
+        } else {
             return PdfEncodings.convertToString(bytes, PdfObject.TEXT_PDFDOCENCODING);
+        }
     }
-    
+
     /**
      * Gets the encoding of this string.
      *
@@ -206,12 +212,12 @@ public String toUnicodeString() {
     public String getEncoding() {
         return encoding;
     }
-    
+
     void setObjNum(int objNum, int objGen) {
         this.objNum = objNum;
         this.objGen = objGen;
     }
-    
+
     /**
      * Decrypt an encrypted PdfString
      */
@@ -225,56 +231,60 @@ void decrypt(PdfReader reader) {
             value = PdfEncodings.convertToString(bytes, null);
         }
     }
-    
+
     /**
-     * @return The original bytes used to create this PDF string, or the bytes of our current value
-     *         if the original bytes are missing.
+     * @return The original bytes used to create this PDF string, or the bytes of our current value if the original
+     * bytes are missing.
      */
     public byte[] getOriginalBytes() {
-        if (originalValue == null)
+        if (originalValue == null) {
             return getBytes();
+        }
         return PdfEncodings.convertToBytes(originalValue, null);
     }
-    
+
     /**
-     * return the characters in our value without any translation. This allows
-     * a string to be built that holds 2-byte or one-byte character codes, as needed
-     * for processing by fonts when extracting text.
-     * 
+     * return the characters in our value without any translation. This allows a string to be built that holds 2-byte or
+     * one-byte character codes, as needed for processing by fonts when extracting text.
+     * 
            
      * Intended for use when no encoding transformations are desired.
+     *
      * @return The code points in this font as chars.
      */
     public char[] getOriginalChars() {
         char[] chars;
         if (encoding == null || encoding.length() == 0) {
-            byte [] bytes = getOriginalBytes();
+            byte[] bytes = getOriginalBytes();
             chars = new char[bytes.length];
-            for (int i = 0; i= 0)
+        if (mark >= 0) {
             put(PdfName.K, new PdfNumber(mark));
+        }
         top.setPageMark(page, reference);
     }
-    
+
     /**
      * Gets the reference this object will be written to.
+     *
      * @return the reference this object will be written to
-     * @since    2.1.6 method removed in 2.1.5, but restored in 2.1.6
-     */    
+     * @since 2.1.6 method removed in 2.1.5, but restored in 2.1.6
+     */
     public PdfIndirectReference getReference() {
         return this.reference;
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStructureTreeRoot.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStructureTreeRoot.java
index 68f7f21ff..631c27030 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStructureTreeRoot.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStructureTreeRoot.java
@@ -67,30 +67,34 @@ public class PdfStructureTreeRoot extends PdfDictionary {
      */
     private final PdfWriter writer;
 
-    /** Creates a new instance of PdfStructureTreeRoot */
+    /**
+     * Creates a new instance of PdfStructureTreeRoot
+     */
     PdfStructureTreeRoot(PdfWriter writer) {
         super(PdfName.STRUCTTREEROOT);
         this.writer = writer;
         reference = writer.getPdfIndirectReference();
     }
-    
+
     /**
-     * Maps the user tags to the standard tags. The mapping will allow a standard application to make some sense of the tagged
-     * document whatever the user tags may be.
-     * @param used the user tag
+     * Maps the user tags to the standard tags. The mapping will allow a standard application to make some sense of the
+     * tagged document whatever the user tags may be.
+     *
+     * @param used     the user tag
      * @param standard the standard tag
-     */    
+     */
     public void mapRole(PdfName used, PdfName standard) {
-        PdfDictionary rm = (PdfDictionary)get(PdfName.ROLEMAP);
+        PdfDictionary rm = (PdfDictionary) get(PdfName.ROLEMAP);
         if (rm == null) {
             rm = new PdfDictionary();
             put(PdfName.ROLEMAP, rm);
         }
         rm.put(used, standard);
     }
-    
+
     /**
      * Gets the writer.
+     *
      * @return the writer
      */
     public PdfWriter getWriter() {
@@ -99,9 +103,10 @@ public PdfWriter getWriter() {
 
     /**
      * Gets the reference this object will be written to.
+     *
      * @return the reference this object will be written to
-     * @since    2.1.6 method removed in 2.1.5, but restored in 2.1.6
-     */    
+     * @since 2.1.6 method removed in 2.1.5, but restored in 2.1.6
+     */
     public PdfIndirectReference getReference() {
         return this.reference;
     }
@@ -119,7 +124,8 @@ void setPageMark(int page, PdfIndirectReference reference) {
     private void nodeProcess(PdfDictionary dictionary, PdfIndirectReference reference)
             throws IOException {
         PdfObject obj = dictionary.get(PdfName.K);
-        if (obj != null && obj.isArray() && !((PdfArray) obj).getElements().isEmpty() && !((PdfArray) obj).getElements().get(0).isNumber()) {
+        if (obj != null && obj.isArray() && !((PdfArray) obj).getElements().isEmpty() && !((PdfArray) obj).getElements()
+                .get(0).isNumber()) {
             PdfArray ar = (PdfArray) obj;
             for (int k = 0; k < ar.size(); ++k) {
                 PdfStructureElement e = (PdfStructureElement) ar.getDirectObject(k);
@@ -131,7 +137,7 @@ private void nodeProcess(PdfDictionary dictionary, PdfIndirectReference referenc
             writer.addToBody(dictionary, reference);
         }
     }
-    
+
     void buildTree() throws IOException {
         Map numTree = new HashMap<>();
         for (Integer i : parentTree.keySet()) {
@@ -139,9 +145,10 @@ void buildTree() throws IOException {
             numTree.put(i, writer.addToBody(ar).getIndirectReference());
         }
         PdfDictionary dicTree = PdfNumberTree.writeTree(numTree, writer);
-        if (dicTree != null)
+        if (dicTree != null) {
             put(PdfName.PARENTTREE, writer.addToBody(dicTree).getIndirectReference());
-        
+        }
+
         nodeProcess(this, reference);
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfTable.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfTable.java
index 2f705ee0e..80c467464 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfTable.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfTable.java
@@ -49,71 +49,76 @@
 
 package com.lowagie.text.pdf;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-
 import com.lowagie.text.Cell;
 import com.lowagie.text.Element;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.Row;
 import com.lowagie.text.Table;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 /**
  * PdfTable is an object that contains the graphics and text of a table.
  *
- * @see        com.lowagie.text.Table
- * @see        com.lowagie.text.Row
- * @see        com.lowagie.text.Cell
- * @see        PdfCell
+ * @see com.lowagie.text.Table
+ * @see com.lowagie.text.Row
+ * @see com.lowagie.text.Cell
+ * @see PdfCell
  */
 
 public class PdfTable extends Rectangle {
-    
+
     // membervariables
-    
-    /** this is the number of columns in the table. */
+
+    /**
+     * Original table used to build this object
+     */
+    protected Table table;
+    /**
+     * Cached column widths.
+     */
+    protected float[] positions;
+    /**
+     * this is the number of columns in the table.
+     */
     private int columns;
-    
-    /** this is the ArrayList with all the cell of the table header. */
+    /**
+     * this is the ArrayList with all the cell of the table header.
+     */
     private ArrayList headercells;
-    
-    /** this is the ArrayList with all the cells in the table. */
+    /**
+     * this is the ArrayList with all the cells in the table.
+     */
     private ArrayList cells;
-    
-    /** Original table used to build this object*/
-    protected Table table;
-    
-    /** Cached column widths. */
-    protected float[] positions;
-    
+
     // constructors
 
     /**
      * Constructs a PdfTable-object.
      *
-     * @param    table    a Table
-     * @param    left    the left border on the page
-     * @param    right    the right border on the page
-     * @param    top        the start position of the top of the table
-     * @since    a parameter of this method has been removed in iText 2.0.8
+     * @param table a Table
+     * @param left  the left border on the page
+     * @param right the right border on the page
+     * @param top   the start position of the top of the table
+     * @since a parameter of this method has been removed in iText 2.0.8
      */
-    
+
     PdfTable(Table table, float left, float right, float top) {
         // constructs a Rectangle (the bottom value will be changed afterwards)
         super(left, top, right, top);
         this.table = table;
         table.complete();
-        
+
         // copying the attributes from class Table
         cloneNonPositionParameters(table);
 
         this.columns = table.getColumns();
         positions = table.getWidths(left, right - left);
-        
+
         // initialization of some parameters
         setLeft(positions[0]);
         setRight(positions[positions.length - 1]);
-        
+
         headercells = new ArrayList<>();
         cells = new ArrayList<>();
 
@@ -123,21 +128,22 @@ public class PdfTable extends Rectangle {
     // methods
 
     /**
-     * Updates the table row additions in the underlying table object and deletes all table rows, 
-     * in order to preserve memory and detect future row additions.
-     * 
            Pre-requisite: the object must have been built with the parameter supportUpdateRowAdditions equals to true.
+     * Updates the table row additions in the underlying table object and deletes all table rows, in order to preserve
+     * memory and detect future row additions.
+     * 
            Pre-requisite: the object must have been built with the parameter
+     * supportUpdateRowAdditions equals to true.
      */
-    
+
     void updateRowAdditions() {
         table.complete();
         updateRowAdditionsInternal();
         table.deleteAllRows();
     }
-    
+
     /**
      * Updates the table row additions in the underlying table object
      */
-    
+
     private void updateRowAdditionsInternal() {
         // correct table : fill empty cells/ parse table in table
         Row row;
@@ -154,31 +160,35 @@ private void updateRowAdditionsInternal() {
         for (int i = 0; i < rows; i++) {
             offsets[i] = getBottom();
         }
-        
+
         // loop over all the rows
         for (Iterator rowIterator = table.iterator(); rowIterator.hasNext(); ) {
             groupChange = false;
             row = (Row) rowIterator.next();
             if (row.isEmpty()) {
-                if (rowNumber < rows - 1 && offsets[rowNumber + 1] > offsets[rowNumber]) offsets[rowNumber + 1] = offsets[rowNumber];
-            }
-            else {
-                for(int i = 0; i < row.getColumns(); i++) {
+                if (rowNumber < rows - 1 && offsets[rowNumber + 1] > offsets[rowNumber]) {
+                    offsets[rowNumber + 1] = offsets[rowNumber];
+                }
+            } else {
+                for (int i = 0; i < row.getColumns(); i++) {
                     cell = (Cell) row.getCell(i);
                     if (cell != null) {
-                        currentCell = new PdfCell(cell, rowNumber+prevRows, positions[i], positions[i + cell.getColspan()], offsets[rowNumber], cellspacing(), cellpadding());
+                        currentCell = new PdfCell(cell, rowNumber + prevRows, positions[i],
+                                positions[i + cell.getColspan()], offsets[rowNumber], cellspacing(), cellpadding());
                         if (rowNumber < firstDataRow) {
                             currentCell.setHeader();
                             headercells.add(currentCell);
-                            if (!table.isNotAddedYet())
+                            if (!table.isNotAddedYet()) {
                                 continue;
+                            }
                         }
                         try {
-                            if (offsets[rowNumber] - currentCell.getHeight() - cellpadding() < offsets[rowNumber + currentCell.rowspan()]) {
-                                offsets[rowNumber + currentCell.rowspan()] = offsets[rowNumber] - currentCell.getHeight() - cellpadding();
+                            if (offsets[rowNumber] - currentCell.getHeight() - cellpadding() < offsets[rowNumber
+                                    + currentCell.rowspan()]) {
+                                offsets[rowNumber + currentCell.rowspan()] =
+                                        offsets[rowNumber] - currentCell.getHeight() - cellpadding();
                             }
-                        }
-                        catch(ArrayIndexOutOfBoundsException aioobe) {
+                        } catch (ArrayIndexOutOfBoundsException aioobe) {
                             if (offsets[rowNumber] - currentCell.getHeight() < offsets[rows - 1]) {
                                 offsets[rows - 1] = offsets[rowNumber] - currentCell.getHeight();
                             }
@@ -190,9 +200,11 @@ private void updateRowAdditionsInternal() {
                 }
             }
             rowNumber++;
-            if( groupChange ) groupNumber++;
+            if (groupChange) {
+                groupNumber++;
+            }
         }
-        
+
         // loop over all the cells
         int n = newCells.size();
         for (Object newCell : newCells) {
@@ -210,80 +222,82 @@ private void updateRowAdditionsInternal() {
     /**
      * Get the number of rows
      */
-    
+
     int rows() {
-        return cells.isEmpty() ? 0 : cells.get(cells.size()-1).rownumber()+1;
+        return cells.isEmpty() ? 0 : cells.get(cells.size() - 1).rownumber() + 1;
     }
 
-    /** @see com.lowagie.text.Element#type() */
+    /**
+     * @see com.lowagie.text.Element#type()
+     */
     public int type() {
         return Element.TABLE;
     }
-    
+
     /**
      * Returns the arraylist with the cells of the table header.
      *
-     * @return    an ArrayList
+     * @return an ArrayList
      */
-    
+
     ArrayList getHeaderCells() {
         return headercells;
     }
-    
+
     /**
      * Checks if there is a table header.
      *
-     * @return    an ArrayList
+     * @return an ArrayList
      */
-    
+
     boolean hasHeader() {
         return !headercells.isEmpty();
     }
-    
+
     /**
      * Returns the arraylist with the cells of the table.
      *
-     * @return    an ArrayList
+     * @return an ArrayList
      */
-    
+
     ArrayList getCells() {
         return cells;
     }
-    
+
     /**
      * Returns the number of columns of the table.
      *
-     * @return    the number of columns
+     * @return the number of columns
      */
-    
+
     int columns() {
         return columns;
     }
-    
+
     /**
      * Returns the cellpadding of the table.
      *
-     * @return    the cellpadding
+     * @return the cellpadding
      */
-    
+
     final float cellpadding() {
         return table.getPadding();
     }
-    
+
     /**
      * Returns the cellspacing of the table.
      *
-     * @return    the cellspacing
+     * @return the cellspacing
      */
-    
+
     final float cellspacing() {
         return table.getSpacing();
     }
-    
+
     /**
      * Checks if this Table has to fit a page.
      *
-     * @return  true if the table may not be split
+     * @return true if the table may not be split
      */
 
     public final boolean hasToFitPageTable() {
@@ -293,9 +307,9 @@ public final boolean hasToFitPageTable() {
     /**
      * Checks if the cells of this Table have to fit a page.
      *
-     * @return  true if the cells may not be split
+     * @return true if the cells may not be split
      */
-    
+
     public final boolean hasToFitPageCells() {
         return table.isCellsFitPage();
     }
@@ -303,7 +317,7 @@ public final boolean hasToFitPageCells() {
     /**
      * Gets the offset of this table.
      *
-     * @return  the space between this table and the previous element.
+     * @return the space between this table and the previous element.
      */
     public float getOffset() {
         return table.getOffset();
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfTemplate.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfTemplate.java
index a916be74b..fecf0fe15 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfTemplate.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfTemplate.java
@@ -48,50 +48,57 @@
  */
 
 package com.lowagie.text.pdf;
-import java.io.IOException;
 
 import com.lowagie.text.Rectangle;
+import java.io.IOException;
 
 /**
  * Implements the form XObject.
  */
 
 public class PdfTemplate extends PdfContentByte {
+
     public static final int TYPE_TEMPLATE = 1;
     public static final int TYPE_IMPORTED = 2;
     public static final int TYPE_PATTERN = 3;
     protected int type;
-    /** The indirect reference to this template */
+    /**
+     * The indirect reference to this template
+     */
     protected PdfIndirectReference thisReference;
-    
-    /** The resources used by this template */
+
+    /**
+     * The resources used by this template
+     */
     protected PageResources pageResources;
-    
-    
-    /** The bounding box of this template */
+
+
+    /**
+     * The bounding box of this template
+     */
     protected Rectangle bBox = new Rectangle(0, 0);
-    
+
     protected PdfArray matrix;
-    
+
     protected PdfTransparencyGroup group;
-    
+
     protected PdfOCG layer;
-    
+
     /**
-     *Creates a PdfTemplate.
+     * Creates a PdfTemplate.
      */
-    
+
     protected PdfTemplate() {
         super(null);
         type = TYPE_TEMPLATE;
     }
-    
+
     /**
      * Creates new PdfTemplate
      *
      * @param wr the PdfWriter
      */
-    
+
     PdfTemplate(PdfWriter wr) {
         super(wr);
         type = TYPE_TEMPLATE;
@@ -99,24 +106,23 @@ protected PdfTemplate() {
         pageResources.addDefaultColor(wr.getDefaultColorspace());
         thisReference = writer.getPdfIndirectReference();
     }
-    
+
     /**
      * Creates a new template.
-     * 
            
-     * Creates a new template that is nothing more than a form XObject. This template can be included
-     * in this template or in another template. Templates are only written
-     * to the output when the document is closed permitting things like showing text in the first page
-     * that is only defined in the last page.
+     * 
            
+     * Creates a new template that is nothing more than a form XObject. This template can be included in this template
+     * or in another template. Templates are only written to the output when the document is closed permitting things
+     * like showing text in the first page that is only defined in the last page.
      *
      * @param writer the PdfWriter to use
-     * @param width the bounding box width
+     * @param width  the bounding box width
      * @param height the bounding box height
      * @return the created template
      */
     public static PdfTemplate createTemplate(PdfWriter writer, float width, float height) {
         return createTemplate(writer, width, height, null);
     }
-    
+
     static PdfTemplate createTemplate(PdfWriter writer, float width, float height, PdfName forcedName) {
         PdfTemplate template = new PdfTemplate(writer);
         template.setWidth(width);
@@ -125,71 +131,73 @@ static PdfTemplate createTemplate(PdfWriter writer, float width, float height, P
         return template;
     }
 
+    /**
+     * Gets the bounding width of this template.
+     *
+     * @return width the bounding width
+     */
+    public float getWidth() {
+        return bBox.getWidth();
+    }
+
     /**
      * Sets the bounding width of this template.
      *
      * @param width the bounding width
      */
-    
+
     public void setWidth(float width) {
         bBox.setLeft(0);
         bBox.setRight(width);
     }
-    
+
+    /**
+     * Gets the bounding height of this template.
+     *
+     * @return height the bounding height
+     */
+
+    public float getHeight() {
+        return bBox.getHeight();
+    }
+
     /**
      * Sets the bounding height of this template.
      *
      * @param height the bounding height
      */
-    
+
     public void setHeight(float height) {
         bBox.setBottom(0);
         bBox.setTop(height);
     }
-    
-    /**
-     * Gets the bounding width of this template.
-     *
-     * @return width the bounding width
-     */
-    public float getWidth() {
-        return bBox.getWidth();
-    }
-    
-    /**
-     * Gets the bounding height of this template.
-     *
-     * @return height the bounding height
-     */
-    
-    public float getHeight() {
-        return bBox.getHeight();
-    }
-    
+
     public Rectangle getBoundingBox() {
         return bBox;
     }
-    
+
     public void setBoundingBox(Rectangle bBox) {
         this.bBox = bBox;
     }
-    
-    /**
-     * Sets the layer this template belongs to.
-     * @param layer the layer this template belongs to
-     */    
-    public void setLayer(PdfOCG layer) {
-        this.layer = layer;
-    }
-    
+
     /**
      * Gets the layer this template belongs to.
+     *
      * @return the layer this template belongs to or null for no layer defined
      */
     public PdfOCG getLayer() {
         return layer;
     }
 
+    /**
+     * Sets the layer this template belongs to.
+     *
+     * @param layer the layer this template belongs to
+     */
+    public void setLayer(PdfOCG layer) {
+        this.layer = layer;
+    }
+
     public void setMatrix(float a, float b, float c, float d, float e, float f) {
         matrix = new PdfArray();
         matrix.add(new PdfNumber(a));
@@ -203,13 +211,13 @@ public void setMatrix(float a, float b, float c, float d, float e, float f) {
     PdfArray getMatrix() {
         return matrix;
     }
-    
+
     /**
      * Gets the indirect reference to this template.
      *
      * @return the indirect reference to this template
      */
-    
+
     public PdfIndirectReference getIndirectReference() {
         // uncomment the null check as soon as we're sure all examples still work
         if (thisReference == null /* && writer != null */) {
@@ -217,42 +225,43 @@ public PdfIndirectReference getIndirectReference() {
         }
         return thisReference;
     }
-        
+
     public void beginVariableText() {
         content.append("/Tx BMC ");
     }
-    
+
     public void endVariableText() {
         content.append("EMC ");
     }
-    
+
     /**
      * Constructs the resources used by this template.
      *
      * @return the resources used by this template
      */
-    
+
     PdfObject getResources() {
         return getPageResources().getResources();
     }
-    
+
     /**
      * Gets the stream representing this template.
      *
-     * @param    compressionLevel    the compressionLevel
+     * @param compressionLevel the compressionLevel
      * @return the stream representing this template
-     * @since    2.1.3    (replacing the method without param compressionLevel)
+     * @since 2.1.3    (replacing the method without param compressionLevel)
      */
     PdfStream getFormXObject(int compressionLevel) throws IOException {
         return new PdfFormXObject(this, compressionLevel);
     }
-        
+
     /**
-     * Gets a duplicate of this PdfTemplate. All
-     * the members are copied by reference but the buffer stays different.
+     * Gets a duplicate of this PdfTemplate. All the members are copied by reference but the buffer stays
+     * different.
+     *
      * @return a copy of this PdfTemplate
      */
-    
+
     public PdfContentByte getDuplicate() {
         PdfTemplate tpl = new PdfTemplate();
         tpl.writer = writer;
@@ -268,29 +277,31 @@ public PdfContentByte getDuplicate() {
         tpl.separator = separator;
         return tpl;
     }
-    
+
     public int getType() {
         return type;
     }
-    
+
     PageResources getPageResources() {
         return pageResources;
     }
-    
-    /** Getter for property group.
-     * @return Value of property group.
+
+    /**
+     * Getter for property group.
      *
+     * @return Value of property group.
      */
     public PdfTransparencyGroup getGroup() {
         return this.group;
     }
-    
-    /** Setter for property group.
-     * @param group New value of property group.
+
+    /**
+     * Setter for property group.
      *
+     * @param group New value of property group.
      */
     public void setGroup(PdfTransparencyGroup group) {
         this.group = group;
     }
-    
+
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfTextArray.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfTextArray.java
index 58f6e7102..b177bce81 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfTextArray.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfTextArray.java
@@ -54,17 +54,16 @@
 
 /**
  * PdfTextArray defines an array with displacements and PdfString-objects.
- * 
            
- * A TextArray is used with the operator TJ in PdfText.
- * The first object in this array has to be a PdfString;
- * see reference manual version 1.3 section 8.7.5, pages 346-347.
- *       OR
- * see reference manual version 1.6 section 5.3.2, pages 378-379.
+ * 
            
+ * A TextArray is used with the operator TJ in PdfText. The first object in this
+ * array has to be a PdfString; see reference manual version 1.3 section 8.7.5, pages 346-347. OR see
+ * reference manual version 1.6 section 5.3.2, pages 378-379.
  */
 
-public class PdfTextArray{
+public class PdfTextArray {
+
     private List arrayList = new LinkedList<>();
-    
+
     // To emit a more efficient array, we consolidate
     // repeated numbers or strings into single array entries.
     // "add( 50 ); add( -50 );" will REMOVE the combined zero from the array.
@@ -73,24 +72,24 @@ public class PdfTextArray{
     private String lastStr;
     private Float lastNum;
     private boolean isRTL = false;
-    
+
     // constructors
     public PdfTextArray(String str) {
         add(str);
     }
-    
+
     public PdfTextArray() {
     }
-    
+
     /**
      * Adds a PdfNumber to the PdfArray.
      *
-     * @param  number   displacement of the string
+     * @param number displacement of the string
      */
     public void add(PdfNumber number) {
         add((float) number.doubleValue());
     }
-    
+
     public void add(float number) {
         if (number != 0) {
             if (lastNum != null) {
@@ -102,32 +101,35 @@ public void add(float number) {
                 }
             } else {
                 lastNum = number;
-                if (isRTL)
+                if (isRTL) {
                     arrayList.add(0, lastNum);
-                else
+                } else {
                     arrayList.add(lastNum);
+                }
             }
-            
+
             lastStr = null;
         }
         // adding zero doesn't modify the TextArray at all
     }
-    
+
     public void add(String str) {
-        if (isRTL)
+        if (isRTL) {
             str = new StringBuffer(str).reverse().toString();
+        }
         if (str.length() > 0) {
             if (lastStr != null) {
-                if (isRTL)
+                if (isRTL) {
                     lastStr = str + lastStr;
-                else
+                } else {
                     lastStr = lastStr + str;
+                }
                 replaceLast(lastStr);
             } else {
                 lastStr = str;
                 if (isRTL) {
                     arrayList.add(0, lastStr);
-                }else {
+                } else {
                     arrayList.add(lastStr);
                 }
             }
@@ -139,20 +141,21 @@ public void add(String str) {
     List getArrayList() {
         return arrayList;
     }
-    
+
     private void replaceLast(Object obj) {
         // deliberately throw the IndexOutOfBoundsException if we screw up.
-        if (isRTL)
+        if (isRTL) {
             arrayList.set(0, obj);
-        else
+        } else {
             arrayList.set(arrayList.size() - 1, obj);
+        }
     }
 
-    public void setRTL(boolean isRTL){
-        this.isRTL = isRTL;
+    public boolean getRTL() {
+        return this.isRTL;
     }
 
-    public boolean getRTL(){
-        return this.isRTL;
+    public void setRTL(boolean isRTL) {
+        this.isRTL = isRTL;
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfTransition.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfTransition.java
index 47c726298..72072352c 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfTransition.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfTransition.java
@@ -48,203 +48,203 @@
 package com.lowagie.text.pdf;
 
 public class PdfTransition {
+
     /**
-     *  Out Vertical Split
+     * Out Vertical Split
      */
-    public static final int SPLITVOUT      = 1;
+    public static final int SPLITVOUT = 1;
     /**
-     *  Out Horizontal Split
+     * Out Horizontal Split
      */
-    public static final int SPLITHOUT      = 2;
+    public static final int SPLITHOUT = 2;
     /**
-     *  In Vertical Split
+     * In Vertical Split
      */
-    public static final int SPLITVIN      = 3;
+    public static final int SPLITVIN = 3;
     /**
-     *  IN Horizontal Split
+     * IN Horizontal Split
      */
-    public static final int SPLITHIN      = 4;
+    public static final int SPLITHIN = 4;
     /**
-     *  Vertical Blinds
+     * Vertical Blinds
      */
-    public static final int BLINDV      = 5;
+    public static final int BLINDV = 5;
     /**
-     *  Vertical Blinds
+     * Vertical Blinds
      */
-    public static final int BLINDH      = 6;
+    public static final int BLINDH = 6;
     /**
-     *  Inward Box
+     * Inward Box
      */
-    public static final int INBOX       = 7;
+    public static final int INBOX = 7;
     /**
-     *  Outward Box
+     * Outward Box
      */
-    public static final int OUTBOX      = 8;
+    public static final int OUTBOX = 8;
     /**
-     *  Left-Right Wipe
+     * Left-Right Wipe
      */
-    public static final int LRWIPE      = 9;
+    public static final int LRWIPE = 9;
     /**
-     *  Right-Left Wipe
+     * Right-Left Wipe
      */
-    public static final int RLWIPE     = 10;
+    public static final int RLWIPE = 10;
     /**
-     *  Bottom-Top Wipe
+     * Bottom-Top Wipe
      */
-    public static final int BTWIPE     = 11;
+    public static final int BTWIPE = 11;
     /**
-     *  Top-Bottom Wipe
+     * Top-Bottom Wipe
      */
-    public static final int TBWIPE     = 12;
+    public static final int TBWIPE = 12;
     /**
-     *  Dissolve
+     * Dissolve
      */
-    public static final int DISSOLVE    = 13;
+    public static final int DISSOLVE = 13;
     /**
-     *  Left-Right Glitter
+     * Left-Right Glitter
      */
-    public static final int LRGLITTER   = 14;
+    public static final int LRGLITTER = 14;
     /**
-     *  Top-Bottom Glitter
+     * Top-Bottom Glitter
      */
-    public static final int TBGLITTER  = 15;
+    public static final int TBGLITTER = 15;
     /**
-     *  Diagonal Glitter
+     * Diagonal Glitter
      */
-    public static final int DGLITTER  = 16;
-    
+    public static final int DGLITTER = 16;
+
     /**
-     *  duration of the transition effect
+     * duration of the transition effect
      */
     protected int duration;
     /**
-     *  type of the transition effect
+     * type of the transition effect
      */
     protected int type;
-    
+
     /**
-     *  Constructs a Transition.
-     *
+     * Constructs a Transition.
      */
     public PdfTransition() {
         this(BLINDH);
     }
-    
+
     /**
-     *  Constructs a Transition.
+     * Constructs a Transition.
      *
-     *@param  type      type of the transition effect
+     * @param type type of the transition effect
      */
     public PdfTransition(int type) {
-        this(type,1);
+        this(type, 1);
     }
-    
+
     /**
-     *  Constructs a Transition.
+     * Constructs a Transition.
      *
-     *@param  type      type of the transition effect
-     *@param  duration  duration of the transition effect
+     * @param type     type of the transition effect
+     * @param duration duration of the transition effect
      */
     public PdfTransition(int type, int duration) {
         this.duration = duration;
         this.type = type;
     }
-    
-    
+
+
     public int getDuration() {
         return duration;
     }
-    
-    
+
+
     public int getType() {
         return type;
     }
-    
+
     public PdfDictionary getTransitionDictionary() {
         PdfDictionary trans = new PdfDictionary(PdfName.TRANS);
         switch (type) {
             case SPLITVOUT:
-                trans.put(PdfName.S,PdfName.SPLIT);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DM,PdfName.V);
-                trans.put(PdfName.M,PdfName.O);
+                trans.put(PdfName.S, PdfName.SPLIT);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DM, PdfName.V);
+                trans.put(PdfName.M, PdfName.O);
                 break;
             case SPLITHOUT:
-                trans.put(PdfName.S,PdfName.SPLIT);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DM,PdfName.H);
-                trans.put(PdfName.M,PdfName.O);
+                trans.put(PdfName.S, PdfName.SPLIT);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DM, PdfName.H);
+                trans.put(PdfName.M, PdfName.O);
                 break;
             case SPLITVIN:
-                trans.put(PdfName.S,PdfName.SPLIT);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DM,PdfName.V);
-                trans.put(PdfName.M,PdfName.I);
+                trans.put(PdfName.S, PdfName.SPLIT);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DM, PdfName.V);
+                trans.put(PdfName.M, PdfName.I);
                 break;
             case SPLITHIN:
-                trans.put(PdfName.S,PdfName.SPLIT);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DM,PdfName.H);
-                trans.put(PdfName.M,PdfName.I);
+                trans.put(PdfName.S, PdfName.SPLIT);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DM, PdfName.H);
+                trans.put(PdfName.M, PdfName.I);
                 break;
             case BLINDV:
-                trans.put(PdfName.S,PdfName.BLINDS);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DM,PdfName.V);
+                trans.put(PdfName.S, PdfName.BLINDS);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DM, PdfName.V);
                 break;
             case BLINDH:
-                trans.put(PdfName.S,PdfName.BLINDS);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DM,PdfName.H);
+                trans.put(PdfName.S, PdfName.BLINDS);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DM, PdfName.H);
                 break;
             case INBOX:
-                trans.put(PdfName.S,PdfName.BOX);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.M,PdfName.I);
+                trans.put(PdfName.S, PdfName.BOX);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.M, PdfName.I);
                 break;
             case OUTBOX:
-                trans.put(PdfName.S,PdfName.BOX);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.M,PdfName.O);
+                trans.put(PdfName.S, PdfName.BOX);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.M, PdfName.O);
                 break;
             case LRWIPE:
-                trans.put(PdfName.S,PdfName.WIPE);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DI,new PdfNumber(0));
+                trans.put(PdfName.S, PdfName.WIPE);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DI, new PdfNumber(0));
                 break;
             case RLWIPE:
-                trans.put(PdfName.S,PdfName.WIPE);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DI,new PdfNumber(180));
+                trans.put(PdfName.S, PdfName.WIPE);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DI, new PdfNumber(180));
                 break;
             case BTWIPE:
-                trans.put(PdfName.S,PdfName.WIPE);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DI,new PdfNumber(90));
+                trans.put(PdfName.S, PdfName.WIPE);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DI, new PdfNumber(90));
                 break;
             case TBWIPE:
-                trans.put(PdfName.S,PdfName.WIPE);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DI,new PdfNumber(270));
+                trans.put(PdfName.S, PdfName.WIPE);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DI, new PdfNumber(270));
                 break;
             case DISSOLVE:
-                trans.put(PdfName.S,PdfName.DISSOLVE);
-                trans.put(PdfName.D,new PdfNumber(duration));
+                trans.put(PdfName.S, PdfName.DISSOLVE);
+                trans.put(PdfName.D, new PdfNumber(duration));
                 break;
             case LRGLITTER:
-                trans.put(PdfName.S,PdfName.GLITTER);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DI,new PdfNumber(0));
+                trans.put(PdfName.S, PdfName.GLITTER);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DI, new PdfNumber(0));
                 break;
             case TBGLITTER:
-                trans.put(PdfName.S,PdfName.GLITTER);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DI,new PdfNumber(270));
+                trans.put(PdfName.S, PdfName.GLITTER);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DI, new PdfNumber(270));
                 break;
             case DGLITTER:
-                trans.put(PdfName.S,PdfName.GLITTER);
-                trans.put(PdfName.D,new PdfNumber(duration));
-                trans.put(PdfName.DI,new PdfNumber(315));
+                trans.put(PdfName.S, PdfName.GLITTER);
+                trans.put(PdfName.D, new PdfNumber(duration));
+                trans.put(PdfName.DI, new PdfNumber(315));
                 break;
         }
         return trans;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfTransparencyGroup.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfTransparencyGroup.java
index 30396288f..12be05a4d 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfTransparencyGroup.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfTransparencyGroup.java
@@ -46,12 +46,13 @@
  */
 package com.lowagie.text.pdf;
 
-/** The transparency group dictionary.
+/**
+ * The transparency group dictionary.
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class PdfTransparencyGroup extends PdfDictionary {
-    
+
     /**
      * Constructs a transparencyGroup.
      */
@@ -59,27 +60,32 @@ public PdfTransparencyGroup() {
         super();
         put(PdfName.S, PdfName.TRANSPARENCY);
     }
- 
+
     /**
      * Determining the initial backdrop against which its stack is composited.
+     *
      * @param isolated true to set, false to remove
      */
     public void setIsolated(boolean isolated) {
-        if (isolated)
+        if (isolated) {
             put(PdfName.I, PdfBoolean.PDFTRUE);
-        else
+        } else {
             remove(PdfName.I);
+        }
     }
-    
+
     /**
-     * Determining whether the objects within the stack are composited with one another or only with the group's backdrop.
+     * Determining whether the objects within the stack are composited with one another or only with the group's
+     * backdrop.
+     *
      * @param knockout boolean value to set
      */
     public void setKnockout(boolean knockout) {
-        if (knockout)
+        if (knockout) {
             put(PdfName.K, PdfBoolean.PDFTRUE);
-        else
+        } else {
             remove(PdfName.K);
+        }
     }
 
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java
index 82458e388..d6062fbdd 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java
@@ -101,14 +101,14 @@
  */
 
 public class PdfWriter extends DocWriter implements
-    PdfViewerPreferences,
-    PdfEncryptionSettings,
-    PdfVersion,
-    PdfDocumentActions,
-    PdfPageActions,
-    PdfXConformance,
-    PdfRunDirection,
-    PdfAnnotations {
+        PdfViewerPreferences,
+        PdfEncryptionSettings,
+        PdfVersion,
+        PdfDocumentActions,
+        PdfPageActions,
+        PdfXConformance,
+        PdfRunDirection,
+        PdfAnnotations {
 
     /**
      * The highest generation number possible.
@@ -118,466 +118,571 @@ public class PdfWriter extends DocWriter implements
     public static final int GENERATION_MAX = 65535;
 
 // INNER CLASSES
-
     /**
-     * This class generates the structure of a PDF document.
-     * 
            
-     * This class covers the third section of Chapter 5 in the 'Portable Document Format Reference Manual version 1.3'
-     * (page 55-60). It contains the body of a PDF document (section 5.14) and it can also generate a Cross-reference
-     * Table (section 5.15).
-     *
-     * @see PdfWriter
-     * @see PdfObject
-     * @see PdfIndirectObject
+     * possible PDF version (header)
      */
-    public static class PdfBody {
-
-        private static final int OBJSINSTREAM = 200;
-
-        // membervariables
+    public static final char VERSION_1_2 = '2';
+    /**
+     * possible PDF version (header)
+     */
+    public static final char VERSION_1_3 = '3';
 
-        /**
-         * array containing the cross-reference table of the normal objects.
-         */
-        private final TreeSet xrefs;
-        private int refnum;
-        /**
-         * the current byte position in the body.
-         */
-        private long position;
-        private final PdfWriter writer;
-        private ByteBuffer index;
-        private ByteBuffer streamObjects;
-        private int currentObjNum;
-        private int numObj = 0;
+//    ESSENTIALS
 
-        // constructors
+//    Construct a PdfWriter instance
+    /**
+     * possible PDF version (header)
+     */
+    public static final char VERSION_1_4 = '4';
+    /**
+     * possible PDF version (header)
+     */
+    public static final char VERSION_1_5 = '5';
+    /**
+     * possible PDF version (header)
+     */
+    public static final char VERSION_1_6 = '6';
+    /**
+     * possible PDF version (header)
+     */
+    public static final char VERSION_1_7 = '7';
 
-        /**
-         * Constructs a new PdfBody.
-         *
-         * @param writer
-         */
-        PdfBody(PdfWriter writer) {
-            xrefs = new TreeSet<>();
-            xrefs.add(new PdfCrossReference(0, 0, GENERATION_MAX));
-            position = writer.getOs().getCounter();
-            refnum = 1;
-            this.writer = writer;
-        }
+//    the PdfDocument instance
+    /**
+     * possible PDF version (catalog)
+     */
+    public static final PdfName PDF_VERSION_1_2 = new PdfName("1.2");
+    /**
+     * possible PDF version (catalog)
+     */
+    public static final PdfName PDF_VERSION_1_3 = new PdfName("1.3");
+    /**
+     * possible PDF version (catalog)
+     */
+    public static final PdfName PDF_VERSION_1_4 = new PdfName("1.4");
+    /**
+     * possible PDF version (catalog)
+     */
+    public static final PdfName PDF_VERSION_1_5 = new PdfName("1.5");
+    /**
+     * possible PDF version (catalog)
+     */
+    public static final PdfName PDF_VERSION_1_6 = new PdfName("1.6");
 
-        // methods
+//    the PdfDirectContentByte instances
 
-        void setRefnum(int refnum) {
-            this.refnum = refnum;
-        }
+    /*
+     * You should see Direct Content as a canvas on which you can draw
+     * graphics and text. One canvas goes on top of the page (getDirectContent),
+     * the other goes underneath (getDirectContentUnder).
+     * You can always the same object throughout your document,
+     * even if you have moved to a new page. Whatever you add on
+     * the canvas will be displayed on top or under the current page.
+     */
+    /**
+     * possible PDF version (catalog)
+     */
+    public static final PdfName PDF_VERSION_1_7 = new PdfName("1.7");
+    /**
+     * A viewer preference
+     */
+    public static final int PageLayoutSinglePage = 1;
+    /**
+     * A viewer preference
+     */
+    public static final int PageLayoutOneColumn = 2;
+    /**
+     * A viewer preference
+     */
+    public static final int PageLayoutTwoColumnLeft = 4;
+    /**
+     * A viewer preference
+     */
+    public static final int PageLayoutTwoColumnRight = 8;
 
-        private PdfWriter.PdfBody.PdfCrossReference addToObjStm(PdfObject obj, int nObj) throws IOException {
-            if (numObj >= OBJSINSTREAM) {
-                flushObjStm();
-            }
-            if (index == null) {
-                index = new ByteBuffer();
-                streamObjects = new ByteBuffer();
-                currentObjNum = getIndirectReferenceNumber();
-                numObj = 0;
-            }
-            int p = streamObjects.size();
-            int idx = numObj++;
-            PdfEncryption enc = writer.crypto;
-            writer.crypto = null;
-            obj.toPdf(writer, streamObjects);
-            writer.crypto = enc;
-            streamObjects.append(' ');
-            index.append(nObj).append(' ').append(p).append(' ');
-            return new PdfWriter.PdfBody.PdfCrossReference(2, nObj, currentObjNum, idx);
-        }
+//    PDF body
 
-        private void flushObjStm() throws IOException {
-            if (numObj == 0) {
-                return;
-            }
-            int first = index.size();
-            index.append(streamObjects);
-            PdfStream stream = new PdfStream(index.toByteArray());
-            stream.flateCompress(writer.getCompressionLevel());
-            stream.put(PdfName.TYPE, PdfName.OBJSTM);
-            stream.put(PdfName.N, new PdfNumber(numObj));
-            stream.put(PdfName.FIRST, new PdfNumber(first));
-            add(stream, currentObjNum);
-            index = null;
-            streamObjects = null;
-            numObj = 0;
-        }
+    /*
+     * A PDF file has 4 parts: a header, a body, a cross-reference table, and a trailer.
+     * The body contains all the PDF objects that make up the PDF document.
+     * Each element gets a reference (a set of numbers) and the byte position of
+     * every object is stored in the cross-reference table.
+     * Use these methods only if you know what you're doing.
+     */
+    /**
+     * A viewer preference
+     */
+    public static final int PageLayoutTwoPageLeft = 16;
+    /**
+     * A viewer preference
+     */
+    public static final int PageLayoutTwoPageRight = 32;
+    /**
+     * A viewer preference
+     */
+    public static final int PageModeUseNone = 64;
+    /**
+     * A viewer preference
+     */
+    public static final int PageModeUseOutlines = 128;
+    /**
+     * A viewer preference
+     */
+    public static final int PageModeUseThumbs = 256;
+    /**
+     * A viewer preference
+     */
+    public static final int PageModeFullScreen = 512;
+    /**
+     * A viewer preference
+     */
+    public static final int PageModeUseOC = 1024;
+    /**
+     * A viewer preference
+     */
+    public static final int PageModeUseAttachments = 2048;
+    /**
+     * A viewer preference
+     */
+    public static final int HideToolbar = 1 << 12;
+    /**
+     * A viewer preference
+     */
+    public static final int HideMenubar = 1 << 13;
+    /**
+     * A viewer preference
+     */
+    public static final int HideWindowUI = 1 << 14;
 
-        /**
-         * Adds a PdfObject to the body.
-         * 
            
-         * This methods creates a PdfIndirectObject with a certain number, containing the given
-         * PdfObject. It also adds a PdfCrossReference for this object to an
-         * ArrayList that will be used to build the Cross-reference Table.
-         *
-         * @param object a PdfObject
-         * @return a PdfIndirectObject
-         * @throws IOException
-         */
-        PdfIndirectObject add(PdfObject object) throws IOException {
-            return add(object, getIndirectReferenceNumber());
-        }
+//    PDF Catalog
 
-        PdfIndirectObject add(PdfObject object, boolean inObjStm) throws IOException {
-            return add(object, getIndirectReferenceNumber(), inObjStm);
-        }
+    /*
+     * The Catalog is also called the root object of the document.
+     * Whereas the Cross-Reference maps the objects number with the
+     * byte offset so that the viewer can find the objects, the
+     * Catalog tells the viewer the numbers of the objects needed
+     * to render the document.
+     */
+    /**
+     * A viewer preference
+     */
+    public static final int FitWindow = 1 << 15;
+    /**
+     * A viewer preference
+     */
+    public static final int CenterWindow = 1 << 16;
+    /**
+     * A viewer preference
+     */
+    public static final int DisplayDocTitle = 1 << 17;
 
-        /**
-         * Gets a PdfIndirectReference for an object that will be created in the future.
-         *
-         * @return a PdfIndirectReference
-         */
-        PdfIndirectReference getPdfIndirectReference() {
-            return new PdfIndirectReference(0, getIndirectReferenceNumber());
-        }
+//    PdfPages
 
-        int getIndirectReferenceNumber() {
-            int n = refnum++;
-            xrefs.add(new PdfCrossReference(n, 0, GENERATION_MAX));
-            return n;
-        }
-
-        /**
-         * Adds a PdfObject to the body given an already existing PdfIndirectReference.
-         * 
            
-         * This methods creates a PdfIndirectObject with the number given by
-         * ref, containing the given PdfObject.
-         * It also adds a PdfCrossReference for this object to an ArrayList that will be used
-         * to build the Cross-reference Table.
-         *
-         * @param object a PdfObject
-         * @param ref    a PdfIndirectReference
-         * @return a PdfIndirectObject
-         * @throws IOException
-         */
-        PdfIndirectObject add(PdfObject object, PdfIndirectReference ref) throws IOException {
-            return add(object, ref.getNumber());
-        }
-
-        PdfIndirectObject add(PdfObject object, PdfIndirectReference ref, boolean inObjStm) throws IOException {
-            return add(object, ref.getNumber(), inObjStm);
-        }
-
-        PdfIndirectObject add(PdfObject object, int refNumber) throws IOException {
-            return add(object, refNumber, true); // to false
-        }
-
-        PdfIndirectObject add(PdfObject object, int refNumber, boolean inObjStm) throws IOException {
-            if (inObjStm && object.canBeInObjStm() && writer.isFullCompression()) {
-                PdfCrossReference pxref = addToObjStm(object, refNumber);
-                PdfIndirectObject indirect = new PdfIndirectObject(refNumber, object, writer);
-                if (!xrefs.add(pxref)) {
-                    xrefs.remove(pxref);
-                    xrefs.add(pxref);
-                }
-                return indirect;
-            } else {
-                PdfIndirectObject indirect = new PdfIndirectObject(refNumber, object, writer);
-                PdfCrossReference pxref = new PdfCrossReference(refNumber, position);
-                if (!xrefs.add(pxref)) {
-                    xrefs.remove(pxref);
-                    xrefs.add(pxref);
-                }
-                indirect.writeTo(writer.getOs());
-                position = writer.getOs().getCounter();
-                return indirect;
-            }
-        }
-
-        /**
-         * Returns the offset of the Cross-Reference table.
-         *
-         * @return an offset
-         */
-        long offset() {
-            return position;
-        }
-
-        /**
-         * Returns the total number of objects contained in the CrossReferenceTable of this Body.
-         *
-         * @return a number of objects
-         */
-        int size() {
-            return Math.max((xrefs.last()).getRefnum() + 1, refnum);
-        }
-
-        /**
-         * Returns the CrossReferenceTable of the Body.
-         *
-         * @param os
-         * @param root
-         * @param info
-         * @param encryption
-         * @param fileID
-         * @param prevxref
-         * @throws IOException
-         */
-
-        void writeCrossReferenceTable(OutputStream os, PdfIndirectReference root, PdfIndirectReference info,
-            PdfIndirectReference encryption, PdfObject fileID, int prevxref) throws IOException {
-            int refNumber = 0;
-            // Old-style xref tables limit object offsets to 10 digits
-            boolean useNewXrefFormat = writer.isFullCompression() || position > 9_999_999_999L;
-            if (useNewXrefFormat) {
-                flushObjStm();
-                refNumber = getIndirectReferenceNumber();
-                xrefs.add(new PdfCrossReference(refNumber, position));
-            }
-            PdfCrossReference entry = xrefs.first();
-            int first = entry.getRefnum();
-            int len = 0;
-            ArrayList sections = new ArrayList<>();
-            for (PdfCrossReference xref1 : xrefs) {
-                entry = xref1;
-                if (first + len == entry.getRefnum()) {
-                    ++len;
-                } else {
-                    sections.add(first);
-                    sections.add(len);
-                    first = entry.getRefnum();
-                    len = 1;
-                }
-            }
-            sections.add(first);
-            sections.add(len);
-            PdfTrailer trailer = new PdfTrailer(size(), root, info, encryption, fileID, prevxref);
-            if (useNewXrefFormat) {
-                int mid = 8 - (Long.numberOfLeadingZeros(position) >> 3);
-                ByteBuffer buf = new ByteBuffer();
-
-                for (PdfCrossReference xref : xrefs) {
-                    entry = xref;
-                    entry.toPdf(mid, buf);
-                }
-                PdfStream xr = new PdfStream(buf.toByteArray());
-                xr.flateCompress(writer.getCompressionLevel());
-                xr.putAll(trailer);
-                xr.put(PdfName.W, new PdfArray(new int[]{1, mid, 2}));
-                xr.put(PdfName.TYPE, PdfName.XREF);
-                PdfArray idx = new PdfArray();
-                for (Integer section : sections) {
-                    idx.add(new PdfNumber(section));
-                }
-                xr.put(PdfName.INDEX, idx);
-                PdfEncryption enc = writer.crypto;
-                writer.crypto = null;
-                PdfIndirectObject indirect = new PdfIndirectObject(refNumber, xr, writer);
-                indirect.writeTo(writer.getOs());
-                writer.crypto = enc;
-            } else {
-                os.write(getISOBytes("xref\n"));
-                Iterator i = xrefs.iterator();
-                for (int k = 0; k < sections.size(); k += 2) {
-                    first = sections.get(k);
-                    len = sections.get(k + 1);
-                    os.write(getISOBytes(String.valueOf(first)));
-                    os.write(getISOBytes(" "));
-                    os.write(getISOBytes(String.valueOf(len)));
-                    os.write('\n');
-                    while (len-- > 0) {
-                        entry = i.next();
-                        entry.toPdf(os);
-                    }
-                }
-                // make the trailer
-                trailer.toPdf(writer, os);
-            }
-        }
-
-        // inner classes
-
-        /**
-         * PdfCrossReference is an entry in the PDF Cross-Reference table.
-         */
-        public static class PdfCrossReference implements Comparable {
-
-            /**
-             * String template for cross-reference entry PDF representation.
-             *
-             * @see Formatter
-             */
-            private static final String CROSS_REFERENCE_ENTRY_FORMAT = "%010d %05d %c \n";
-
-            // membervariables
-            private final int type;
+    /*
+     * The page root keeps the complete page tree of the document.
+     * There's an entry in the Catalog that refers to the root
+     * of the page tree, the page tree contains the references
+     * to pages and other page trees.
+     */
+    /**
+     * A viewer preference
+     */
+    public static final int NonFullScreenPageModeUseNone = 1 << 18;
+    /**
+     * A viewer preference
+     */
+    public static final int NonFullScreenPageModeUseOutlines = 1 << 19;
+    /**
+     * A viewer preference
+     */
+    public static final int NonFullScreenPageModeUseThumbs = 1 << 20;
+    /**
+     * A viewer preference
+     */
+    public static final int NonFullScreenPageModeUseOC = 1 << 21;
+    /**
+     * A viewer preference
+     */
+    public static final int DirectionL2R = 1 << 22;
+    /**
+     * A viewer preference
+     */
+    public static final int DirectionR2L = 1 << 23;
+    /**
+     * A viewer preference
+     */
+    public static final int PrintScalingNone = 1 << 24;
+    /**
+     * action value
+     */
+    public static final PdfName DOCUMENT_CLOSE = PdfName.WC;
+    /**
+     * action value
+     */
+    public static final PdfName WILL_SAVE = PdfName.WS;
+    /**
+     * action value
+     */
+    public static final PdfName DID_SAVE = PdfName.DS;
+    /**
+     * action value
+     */
+    public static final PdfName WILL_PRINT = PdfName.WP;
+    /**
+     * action value
+     */
+    public static final PdfName DID_PRINT = PdfName.DP;
+    /**
+     * signature value
+     */
+    public static final int SIGNATURE_EXISTS = 1;
 
-            /**
-             * Byte offset in the PDF file.
-             */
-            private final long offset;
+//    page events
 
-            private final int refnum;
-            /**
-             * generation of the object.
-             */
-            private final int generation;
+    /*
+     * Page events are specific for iText, not for PDF.
+     * Upon specific events (for instance when a page starts
+     * or ends), the corresponding method in the page event
+     * implementation that is added to the writer is invoked.
+     */
+    /**
+     * signature value
+     */
+    public static final int SIGNATURE_APPEND_ONLY = 2;
+    /**
+     * A PDF/X level.
+     */
+    public static final int PDFXNONE = 0;
+    /**
+     * A PDF/X level.
+     */
+    public static final int PDFX1A2001 = 1;
 
-            // constructors
+//    Open and Close methods + method that create the PDF
+    /**
+     * A PDF/X level.
+     */
+    public static final int PDFX32002 = 2;
+    /**
+     * PDFA-1A level.
+     */
+    public static final int PDFA1A = 3;
+    /**
+     * PDFA-1B level.
+     */
+    public static final int PDFA1B = 4;
+    /**
+     * No encryption
+     */
+    public static final int ENCRYPTION_NONE = -1;
 
-            /**
-             * Constructs a cross-reference element for a PdfIndirectObject.
-             *
-             * @param refnum     the reference number
-             * @param offset     byte offset of the object
-             * @param generation generation number of the object
-             */
-            public PdfCrossReference(int refnum, long offset, int generation) {
-                type = 0;
-                this.offset = offset;
-                this.refnum = refnum;
-                this.generation = generation;
-            }
+// Root data for the PDF document (used when composing the Catalog)
 
-            /**
-             * Constructs a cross-reference element for a PdfIndirectObject.
-             *
-             * @param refnum the reference number
-             * @param offset byte offset of the object
-             */
-            public PdfCrossReference(int refnum, long offset) {
-                type = 1;
-                this.offset = offset;
-                this.refnum = refnum;
-                this.generation = 0;
-            }
+//  [C1] Outlines (bookmarks)
+    /**
+     * Type of encryption
+     */
+    public static final int STANDARD_ENCRYPTION_40 = 0;
+    /**
+     * Type of encryption
+     */
+    public static final int STANDARD_ENCRYPTION_128 = 1;
+    /**
+     * Type of encryption
+     */
+    public static final int ENCRYPTION_AES_128 = 2;
+    /**
+     * Type of encryption
+     */
+    public static final int ENCRYPTION_AES_256_V3 = 4;
 
-            public PdfCrossReference(int type, int refnum, long offset, int generation) {
-                this.type = type;
-                this.offset = offset;
-                this.refnum = refnum;
-                this.generation = generation;
-            }
+//    [C2] PdfVersion interface
+    /**
+     * Add this to the mode to keep the metadata in clear text
+     */
+    public static final int DO_NOT_ENCRYPT_METADATA = 8;
+    /**
+     * Add this to the mode to keep encrypt only the embedded files.
+     *
+     * @since 2.1.3
+     */
+    public static final int EMBEDDED_FILES_ONLY = 24;
+    /**
+     * The operation permitted when the document is opened with the user password
+     *
+     * @since 2.0.7
+     */
+    public static final int ALLOW_PRINTING = 4 + 2048;
+    /**
+     * The operation permitted when the document is opened with the user password
+     *
+     * @since 2.0.7
+     */
+    public static final int ALLOW_MODIFY_CONTENTS = 8;
+    /**
+     * The operation permitted when the document is opened with the user password
+     *
+     * @since 2.0.7
+     */
+    public static final int ALLOW_COPY = 16;
+    /**
+     * The operation permitted when the document is opened with the user password
+     *
+     * @since 2.0.7
+     */
+    public static final int ALLOW_MODIFY_ANNOTATIONS = 32;
+    /**
+     * The operation permitted when the document is opened with the user password
+     *
+     * @since 2.0.7
+     */
+    public static final int ALLOW_FILL_IN = 256;
+    /**
+     * The operation permitted when the document is opened with the user password
+     *
+     * @since 2.0.7
+     */
+    public static final int ALLOW_SCREENREADERS = 512;
+    /**
+     * The operation permitted when the document is opened with the user password
+     *
+     * @since 2.0.7
+     */
+    public static final int ALLOW_ASSEMBLY = 1024;
+    /**
+     * The operation permitted when the document is opened with the user password
+     *
+     * @since 2.0.7
+     */
+    public static final int ALLOW_DEGRADED_PRINTING = 4;
+    /**
+     * action value
+     */
+    public static final PdfName PAGE_OPEN = PdfName.O;
+    /**
+     * action value
+     */
+    public static final PdfName PAGE_CLOSE = PdfName.C;
+    /**
+     * The default space-char ratio.
+     */
+    public static final float SPACE_CHAR_RATIO_DEFAULT = 2.5f;
+    /**
+     * Disable the inter-character spacing.
+     */
+    public static final float NO_SPACE_CHAR_RATIO = 10000000f;
+    /**
+     * Use the default run direction.
+     */
+    public static final int RUN_DIRECTION_DEFAULT = 0;
+    /**
+     * Do not use bidirectional reordering.
+     */
+    public static final int RUN_DIRECTION_NO_BIDI = 1;
+    /**
+     * Use bidirectional reordering with left-to-right preferential run direction.
+     */
+    public static final int RUN_DIRECTION_LTR = 2;
+    /**
+     * Use bidirectional reordering with right-to-left preferential run direction.
+     */
+    public static final int RUN_DIRECTION_RTL = 3;
 
-            int getRefnum() {
-                return refnum;
-            }
+//  [C3] PdfViewerPreferences interface
 
-            /**
-             * Writes PDF representation of cross-reference entry to passed output stream.
-             *
-             * @param os Output stream this entry to write to
-             * @throws IOException If any I/O error occurs
-             */
-            public void toPdf(OutputStream os) throws IOException {
-                // TODO: are generation number and 'In use' keyword bound that way?
-                final char inUse = generation == GENERATION_MAX ? 'f' : 'n';
-                os.write(getISOBytes(String.format(CROSS_REFERENCE_ENTRY_FORMAT, offset, generation, inUse)));
-            }
+    // page layout (section 13.1.1 of "iText in Action")
+    /**
+     * Mask to separate the encryption type from the encryption mode.
+     */
+    static final int ENCRYPTION_MASK = 7;
+    /**
+     * Stores the PDF/X level.
+     */
+    private final PdfXConformanceImp pdfxConformance = new PdfXConformanceImp();
+    /**
+     * This is the list with all the images in the document.
+     */
+    private final HashMap images = new HashMap<>();
+    /**
+     * the pdfdocument object.
+     */
+    protected PdfDocument pdf;
+    /**
+     * The direct content in this document.
+     */
+    protected PdfContentByte directContent;
+    /**
+     * The direct content under in this document.
+     */
+    protected PdfContentByte directContentUnder;
 
-            /**
-             * Writes PDF syntax to the OutputStream
-             *
-             * @param midSize the mid size
-             * @param os      the OutputStream
-             * @throws IOException on error
-             */
-            public void toPdf(int midSize, OutputStream os) throws IOException {
-                os.write((byte) type);
-                int thisMidSize = midSize;
-                while (--thisMidSize >= 0) {
-                    os.write((byte) ((offset >>> (8 * thisMidSize)) & 0xff));
-                }
-                os.write((byte) ((generation >>> 8) & 0xff));
-                os.write((byte) (generation & 0xff));
-            }
+    // page mode (section 13.1.2 of "iText in Action")
+    /**
+     * body of the PDF document
+     */
+    protected PdfBody body;
+    /**
+     * Holds value of property extraCatalog this is used for Output Intents.
+     */
+    protected PdfDictionary extraCatalog;
+    /**
+     * The root of the page tree.
+     */
+    protected PdfPages root = new PdfPages(this);
+    /**
+     * The PdfIndirectReference to the pages.
+     */
+    protected ArrayList pageReferences = new ArrayList<>();
+    /**
+     * The current page number.
+     */
+    protected int currentPageNumber = 1;
+    /**
+     * The value of the Tabs entry in the page dictionary.
+     *
+     * @since 2.1.5
+     */
+    protected PdfName tabs = null;
 
-            /**
-             * Compares current {@link PdfCrossReference entry} with passed {@code reference} by PDF object number.
-             */
-            @Override
-            public int compareTo(final PdfCrossReference reference) {
-                return Integer.compare(refnum, reference.refnum);
-            }
+    // values for setting viewer preferences in iText versions older than 2.x
+    /**
+     * A number referring to the previous Cross-Reference Table.
+     */
+    protected int prevxref = 0;
+    protected List newBookmarks;
+    /**
+     * Stores the version information for the header and the catalog.
+     */
+    protected PdfVersionImp pdf_version = new PdfVersionImp();
+    /**
+     * XMP Metadata for the document.
+     */
+    protected byte[] xmpMetadata = null;
+    /**
+     * Contains the business logic for cryptography.
+     */
+    protected PdfEncryption crypto;
+    /**
+     * Holds value of property fullCompression.
+     */
+    protected boolean fullCompression = false;
+    /**
+     * The compression level of the content streams.
+     *
+     * @since 2.1.3
+     */
+    protected int compressionLevel = PdfStream.DEFAULT_COMPRESSION;
+    /**
+     * The fonts of this document
+     */
+    protected LinkedHashMap documentFonts = new LinkedHashMap<>();
+    /**
+     * The font number counter for the fonts in the document.
+     */
+    protected int fontNumber = 1;
+    /**
+     * The form XObjects in this document. The key is the xref and the value is Object[]{PdfName, template}.
+     */
+    protected LinkedHashMap formXObjects = new LinkedHashMap<>();
+    /**
+     * The name counter for the form XObjects name.
+     */
+    protected int formXObjectsCounter = 1;
+    protected HashMap importedPages = new HashMap<>();
+    protected PdfReaderInstance currentPdfReaderInstance;
+    /**
+     * The colors of this document
+     */
+    protected HashMap documentColors = new HashMap<>();
+    /**
+     * The color number counter for the colors in the document.
+     */
+    protected int colorNumber = 1;
 
-            /**
-             * Checks if two entries are equal if their PDF object numbers are equal.
-             *
-             * @param obj Another cross-reference entry
-             * @return If null, not of type {@link PdfCrossReference} or object numbers are not equal, returns false;
-             * true otherwise
-             */
-            @Override
-            public boolean equals(Object obj) {
-                if (!(obj instanceof PdfCrossReference)) {
-                    return false;
-                }
-                PdfCrossReference other = (PdfCrossReference) obj;
-                return refnum == other.refnum;
-            }
+//  [C4] Page labels
+    /**
+     * The patterns of this document
+     */
+    protected HashMap documentPatterns = new HashMap<>();
 
-            @Override
-            public int hashCode() {
-                return refnum;
-            }
-        }
-    }
+//  [C5] named objects: named destinations, javascript, embedded files
+    /**
+     * The pattern number counter for the colors in the document.
+     */
+    protected int patternNumber = 1;
+    protected HashMap documentShadingPatterns = new HashMap<>();
+    protected HashMap documentShadings = new HashMap<>();
+    protected HashMap documentExtGState = new LinkedHashMap<>();
+    protected HashMap documentProperties = new HashMap<>();
+    protected boolean tagged = false;
+    protected PdfStructureTreeRoot structureTreeRoot;
+    /**
+     * A hashSet containing all the PdfLayer objects.
+     */
+    protected Set documentOCG = new HashSet<>();
+    /**
+     * An array list used to define the order of an OCG tree.
+     */
+    protected List documentOCGorder = new ArrayList<>();
+    /**
+     * The OCProperties in a catalog dictionary.
+     */
+    protected PdfOCProperties OCProperties;
+    /**
+     * The RBGroups array in an OCG dictionary
+     */
+    protected PdfArray OCGRadioGroup = new PdfArray();
 
+// [C6] Actions (open and additional)
     /**
-     * PdfTrailer is the PDF Trailer object.
-     * 
            
-     * This object is described in the 'Portable Document Format Reference Manual version 1.3' section 5.16 (page
-     * 59-60).
+     * The locked array in an OCG dictionary
+     *
+     * @since 2.1.2
      */
+    protected PdfArray OCGLocked = new PdfArray();
+    /**
+     * A group attributes dictionary specifying the attributes of the page's page group for use in the transparent
+     * imaging model
+     */
+    protected PdfDictionary group;
+    protected int runDirection = RUN_DIRECTION_NO_BIDI;
+    protected float userunit = 0f;
+    protected PdfDictionary defaultColorspace = new PdfDictionary();
+    protected HashMap documentSpotPatterns = new HashMap<>();
+    protected ColorDetails patternColorspaceRGB;
+    protected ColorDetails patternColorspaceGRAY;
 
-    static class PdfTrailer extends PdfDictionary {
-
-        // constructors
-
-        /**
-         * Constructs a PDF-Trailer.
-         *
-         * @param size       the number of entries in the PdfCrossReferenceTable
-         * @param root       an indirect reference to the root of the PDF document
-         * @param info       an indirect reference to the info object of the PDF document
-         * @param encryption
-         * @param fileID
-         * @param prevxref
-         */
-
-        PdfTrailer(int size, PdfIndirectReference root, PdfIndirectReference info, PdfIndirectReference encryption,
-            PdfObject fileID, int prevxref) {
-            put(PdfName.SIZE, new PdfNumber(size));
-            put(PdfName.ROOT, root);
-            if (info != null) {
-                put(PdfName.INFO, info);
-            }
-            if (encryption != null) {
-                put(PdfName.ENCRYPT, encryption);
-            }
-            if (fileID != null) {
-                put(PdfName.ID, fileID);
-            }
-            if (prevxref > 0) {
-                put(PdfName.PREV, new PdfNumber(prevxref));
-            }
-        }
-
-        /**
-         * Returns the PDF representation of this PdfObject.
-         *
-         * @param writer
-         * @param os
-         * @throws IOException
-         */
-        @Override
-        public void toPdf(PdfWriter writer, OutputStream os) throws IOException {
-            os.write(getISOBytes("trailer\n"));
-            super.toPdf(null, os);
-            os.write('\n');
-        }
-    }
-
-//    ESSENTIALS
+    //  [C7] portable collections
+    protected ColorDetails patternColorspaceCMYK;
 
-//    Construct a PdfWriter instance
+//  [C8] AcroForm
+    /**
+     * Dictionary, containing all the images of the PDF document
+     */
+    protected PdfDictionary imageDictionary = new PdfDictionary();
+    /**
+     * A HashSet with Stream objects containing JBIG2 Globals
+     *
+     * @since 2.1.5
+     */
+    protected HashMap JBIG2Globals = new HashMap<>();
+    /**
+     * The PdfPageEvent for this document.
+     */
+    private PdfPageEvent pageEvent;
+    /**
+     * The ratio between the extra word spacing and the extra character spacing. Extra word spacing will grow
+     * ratio times more than extra character spacing.
+     */
+    private float spaceCharRatio = SPACE_CHAR_RATIO_DEFAULT;
+    /**
+     * A flag indicating the presence of structure elements that contain user properties attributes.
+     */
+    private boolean userProperties;
+    /**
+     * Holds value of property RGBTranparency.
+     */
+    private boolean rgbTransparencyBlending;
 
     /**
      * Constructs a PdfWriter.
@@ -585,6 +690,8 @@ public void toPdf(PdfWriter writer, OutputStream os) throws IOException {
     protected PdfWriter() {
     }
 
+//  [C9] Metadata
+
     /**
      * Constructs a PdfWriter.
      * 
            
@@ -612,7 +719,7 @@ protected PdfWriter(PdfDocument document, OutputStream os) {
      */
 
     public static PdfWriter getInstance(Document document, OutputStream os)
-        throws DocumentException {
+            throws DocumentException {
         PdfDocument pdf = new PdfDocument();
         pdf.setTextRenderingOptions(document.getTextRenderingOptions());
         document.addDocListener(pdf);
@@ -632,7 +739,7 @@ public static PdfWriter getInstance(Document document, OutputStream os)
      */
 
     public static PdfWriter getInstance(Document document, OutputStream os, DocListener listener)
-        throws DocumentException {
+            throws DocumentException {
         PdfDocument pdf = new PdfDocument();
         pdf.setTextRenderingOptions(document.getTextRenderingOptions());
         pdf.addDocListener(listener);
@@ -642,12 +749,38 @@ public static PdfWriter getInstance(Document document, OutputStream os, DocListe
         return writer;
     }
 
-//    the PdfDocument instance
+    private static String getNameString(PdfDictionary dic, PdfName key) {
+        PdfObject obj = PdfReader.getPdfObject(dic.get(key));
+        if (obj == null || !obj.isString()) {
+            return null;
+        }
+        return ((PdfString) obj).toUnicodeString();
+    }
 
-    /**
-     * the pdfdocument object.
-     */
-    protected PdfDocument pdf;
+    private static void getOCGOrder(PdfArray order, PdfLayer layer) {
+        if (!layer.isOnPanel()) {
+            return;
+        }
+        if (layer.getTitle() == null) {
+            order.add(layer.getRef());
+        }
+        ArrayList children = layer.getChildren();
+        if (children == null) {
+            return;
+        }
+        PdfArray kids = new PdfArray();
+        if (layer.getTitle() != null) {
+            kids.add(new PdfString(layer.getTitle(), PdfObject.TEXT_UNICODE));
+        }
+        for (PdfLayer child : children) {
+            getOCGOrder(kids, child);
+        }
+        if (!kids.isEmpty()) {
+            order.add(kids);
+        }
+    }
+
+//  [C10] PDFX Conformance
 
     /**
      * Gets the PdfDocument associated with this writer.
@@ -690,32 +823,11 @@ public float getVerticalPosition(boolean ensureNewLine) {
     public void setInitialLeading(float leading) throws DocumentException {
         if (open) {
             throw new DocumentException(MessageLocalization.getComposedMessage(
-                "you.can.t.set.the.initial.leading.if.the.document.is.already.open"));
+                    "you.can.t.set.the.initial.leading.if.the.document.is.already.open"));
         }
         pdf.setLeading(leading);
     }
 
-//    the PdfDirectContentByte instances
-
-    /*
-     * You should see Direct Content as a canvas on which you can draw
-     * graphics and text. One canvas goes on top of the page (getDirectContent),
-     * the other goes underneath (getDirectContentUnder).
-     * You can always the same object throughout your document,
-     * even if you have moved to a new page. Whatever you add on
-     * the canvas will be displayed on top or under the current page.
-     */
-
-    /**
-     * The direct content in this document.
-     */
-    protected PdfContentByte directContent;
-
-    /**
-     * The direct content under in this document.
-     */
-    protected PdfContentByte directContentUnder;
-
     /**
      * Use this method to get the direct content for this document. There is only one direct content, multiple calls to
      * this method will allways retrieve the same object.
@@ -752,21 +864,6 @@ void resetContent() {
         directContentUnder.reset();
     }
 
-//    PDF body
-
-    /*
-     * A PDF file has 4 parts: a header, a body, a cross-reference table, and a trailer.
-     * The body contains all the PDF objects that make up the PDF document.
-     * Each element gets a reference (a set of numbers) and the byte position of
-     * every object is stored in the cross-reference table.
-     * Use these methods only if you know what you're doing.
-     */
-
-    /**
-     * body of the PDF document
-     */
-    protected PdfBody body;
-
     /**
      * Adds the local destinations to the body of the document.
      *
@@ -814,6 +911,8 @@ public PdfIndirectObject addToBody(PdfObject object, boolean inObjStm) throws IO
         return body.add(object, inObjStm);
     }
 
+//  [C11] Output intents
+
     /**
      * Use this method to add a PDF object to the PDF body. Use this method only if you know what you're doing!
      *
@@ -836,7 +935,7 @@ public PdfIndirectObject addToBody(PdfObject object, PdfIndirectReference ref) t
      * @throws IOException thrown when an I/O operation fails
      */
     public PdfIndirectObject addToBody(PdfObject object, PdfIndirectReference ref, boolean inObjStm)
-        throws IOException {
+            throws IOException {
         return body.add(object, ref, inObjStm);
     }
 
@@ -865,6 +964,12 @@ public PdfIndirectObject addToBody(PdfObject object, int refNumber, boolean inOb
         return body.add(object, refNumber, inObjStm);
     }
 
+// PDF Objects that have an impact on the PDF body
+
+//  [F1] PdfEncryptionSettings interface
+
+    // types of encryption
+
     /**
      * Use this to get an PdfIndirectReference for an object that will be created in the future. Use this
      * method only if you know what you're doing!
@@ -889,16 +994,6 @@ OutputStreamCounter getOs() {
         return os;
     }
 
-//    PDF Catalog
-
-    /*
-     * The Catalog is also called the root object of the document.
-     * Whereas the Cross-Reference maps the objects number with the
-     * byte offset so that the viewer can find the objects, the
-     * Catalog tells the viewer the numbers of the objects needed
-     * to render the document.
-     */
-
     protected PdfDictionary getCatalog(PdfIndirectReference rootObj) {
         PdfDictionary catalog = pdf.getCatalog(rootObj);
         // [F12] tagged PDF
@@ -923,11 +1018,8 @@ protected PdfDictionary getCatalog(PdfIndirectReference rootObj) {
         }
         return catalog;
     }
-
-    /**
-     * Holds value of property extraCatalog this is used for Output Intents.
-     */
-    protected PdfDictionary extraCatalog;
+    // ENCRYPTION_* = 3 reserved for implementation of the
+    // meanwhile deprecated proprietary AES256 variant by Adobe
 
     /**
      * Sets extra keys to the catalog.
@@ -941,34 +1033,6 @@ public PdfDictionary getExtraCatalog() {
         return this.extraCatalog;
     }
 
-//    PdfPages
-
-    /*
-     * The page root keeps the complete page tree of the document.
-     * There's an entry in the Catalog that refers to the root
-     * of the page tree, the page tree contains the references
-     * to pages and other page trees.
-     */
-
-    /**
-     * The root of the page tree.
-     */
-    protected PdfPages root = new PdfPages(this);
-    /**
-     * The PdfIndirectReference to the pages.
-     */
-    protected ArrayList pageReferences = new ArrayList<>();
-    /**
-     * The current page number.
-     */
-    protected int currentPageNumber = 1;
-    /**
-     * The value of the Tabs entry in the page dictionary.
-     *
-     * @since 2.1.5
-     */
-    protected PdfName tabs = null;
-
     /**
      * Use this method to make sure the page tree has a linear structure (every leave is attached directly to the root).
      * Use this method to allow page reordering with method reorderPages.
@@ -1001,7 +1065,7 @@ public PdfIndirectReference getPageReference(int page) {
         --page;
         if (page < 0) {
             throw new IndexOutOfBoundsException(
-                MessageLocalization.getComposedMessage("the.page.number.must.be.gt.eq.1"));
+                    MessageLocalization.getComposedMessage("the.page.number.must.be.gt.eq.1"));
         }
         PdfIndirectReference ref;
         if (page < pageReferences.size()) {
@@ -1021,6 +1085,8 @@ public PdfIndirectReference getPageReference(int page) {
         return ref;
     }
 
+    // permissions
+
     /**
      * Gets the pagenumber of this document. This number can be different from the real pagenumber, if you have (re)set
      * the page number previously.
@@ -1041,24 +1107,24 @@ public int getCurrentPageNumber() {
     }
 
     /**
-     * Sets the value for the Tabs entry in the page tree.
+     * Returns the value to be used for the Tabs entry in the page tree.
      *
-     * @param tabs Can be PdfName.R, PdfName.C or PdfName.S. Since the Adobe Extensions Level 3, it can also be
-     *             PdfName.A or PdfName.W
+     * @return a PdfName of the value of the Tabs entry in the page dictionnary
      * @since 2.1.5
      */
-    public void setTabs(PdfName tabs) {
-        this.tabs = tabs;
+    public PdfName getTabs() {
+        return tabs;
     }
 
     /**
-     * Returns the value to be used for the Tabs entry in the page tree.
+     * Sets the value for the Tabs entry in the page tree.
      *
-     * @return a PdfName of the value of the Tabs entry in the page dictionnary
+     * @param tabs Can be PdfName.R, PdfName.C or PdfName.S. Since the Adobe Extensions Level 3, it can also be
+     *             PdfName.A or PdfName.W
      * @since 2.1.5
      */
-    public PdfName getTabs() {
-        return tabs;
+    public void setTabs(PdfName tabs) {
+        this.tabs = tabs;
     }
 
     /**
@@ -1099,19 +1165,15 @@ PdfIndirectReference add(PdfPage page, PdfContents contents) throws PdfException
         return null;
     }
 
-//    page events
-
-    /*
-     * Page events are specific for iText, not for PDF.
-     * Upon specific events (for instance when a page starts
-     * or ends), the corresponding method in the page event
-     * implementation that is added to the writer is invoked.
-     */
-
     /**
-     * The PdfPageEvent for this document.
+     * Gets the PdfPageEvent for this document or null if none is set.
+     *
+     * @return the PdfPageEvent for this document or null if none is set
      */
-    private PdfPageEvent pageEvent;
+
+    public PdfPageEvent getPageEvent() {
+        return pageEvent;
+    }
 
     /**
      * Sets the PdfPageEvent for this document.
@@ -1134,23 +1196,6 @@ public void setPageEvent(PdfPageEvent event) {
         }
     }
 
-    /**
-     * Gets the PdfPageEvent for this document or null if none is set.
-     *
-     * @return the PdfPageEvent for this document or null if none is set
-     */
-
-    public PdfPageEvent getPageEvent() {
-        return pageEvent;
-    }
-
-//    Open and Close methods + method that create the PDF
-
-    /**
-     * A number referring to the previous Cross-Reference Table.
-     */
-    protected int prevxref = 0;
-
     /**
      * Signals that the Document has been opened and that
      * Elements can be added.
@@ -1169,7 +1214,7 @@ public void open() {
                 PdfDictionary sec = new PdfDictionary();
                 sec.put(PdfName.GAMMA, new PdfArray(new float[]{2.2f, 2.2f, 2.2f}));
                 sec.put(PdfName.MATRIX, new PdfArray(
-                    new float[]{0.4124f, 0.2126f, 0.0193f, 0.3576f, 0.7152f, 0.1192f, 0.1805f, 0.0722f, 0.9505f}));
+                        new float[]{0.4124f, 0.2126f, 0.0193f, 0.3576f, 0.7152f, 0.1192f, 0.1805f, 0.0722f, 0.9505f}));
                 sec.put(PdfName.WHITEPOINT, new PdfArray(new float[]{0.9505f, 1f, 1.089f}));
                 PdfArray arr = new PdfArray(PdfName.CALRGB);
                 arr.add(sec);
@@ -1194,7 +1239,7 @@ public void close() {
         if (open) {
             if (pdf != null && pdf.isOpen()) {
                 throw new IllegalStateException(MessageLocalization
-                    .getComposedMessage("you.should.call.document.close.instead"));
+                        .getComposedMessage("you.should.call.document.close.instead"));
             }
             if ((currentPageNumber - 1) != pageReferences.size())
             // 2019-04-26: If you get this error, it could be that you are using OpenPDF or
@@ -1204,7 +1249,7 @@ public void close() {
             // See: https://github.com/LibrePDF/OpenPDF/issues/164
             {
                 throw new RuntimeException("The page " + pageReferences.size() +
-                    " was requested but the document has only " + (currentPageNumber - 1) + " pages.");
+                        " was requested but the document has only " + (currentPageNumber - 1) + " pages.");
             }
 
             try {
@@ -1260,7 +1305,7 @@ public void close() {
 
                 // write the cross-reference table of the body
                 body.writeCrossReferenceTable(os, indirectCatalog.getIndirectReference(),
-                    infoObj.getIndirectReference(), encryption, fileID, prevxref);
+                        infoObj.getIndirectReference(), encryption, fileID, prevxref);
 
                 os.write(getISOBytes("startxref\n"));
                 os.write(getISOBytes(String.valueOf(body.offset())));
@@ -1332,10 +1377,6 @@ protected void addSharedObjectsToBody() throws IOException {
         }
     }
 
-// Root data for the PDF document (used when composing the Catalog)
-
-//  [C1] Outlines (bookmarks)
-
     /**
      * Use this method to get the root outline and construct bookmarks.
      *
@@ -1346,7 +1387,7 @@ public PdfOutline getRootOutline() {
         return directContent.getRootOutline();
     }
 
-    protected List newBookmarks;
+//  [F2] compression
 
     /**
      * Sets the bookmarks. The list structure is defined in {@link SimpleBookmark}.
@@ -1371,69 +1412,6 @@ protected void writeOutlines(PdfDictionary catalog, boolean namedAsNames) throws
         catalog.put(PdfName.OUTLINES, topRef);
     }
 
-//    [C2] PdfVersion interface
-    /**
-     * possible PDF version (header)
-     */
-    public static final char VERSION_1_2 = '2';
-    /**
-     * possible PDF version (header)
-     */
-    public static final char VERSION_1_3 = '3';
-    /**
-     * possible PDF version (header)
-     */
-    public static final char VERSION_1_4 = '4';
-    /**
-     * possible PDF version (header)
-     */
-    public static final char VERSION_1_5 = '5';
-    /**
-     * possible PDF version (header)
-     */
-    public static final char VERSION_1_6 = '6';
-    /**
-     * possible PDF version (header)
-     */
-    public static final char VERSION_1_7 = '7';
-
-    /**
-     * possible PDF version (catalog)
-     */
-    public static final PdfName PDF_VERSION_1_2 = new PdfName("1.2");
-    /**
-     * possible PDF version (catalog)
-     */
-    public static final PdfName PDF_VERSION_1_3 = new PdfName("1.3");
-    /**
-     * possible PDF version (catalog)
-     */
-    public static final PdfName PDF_VERSION_1_4 = new PdfName("1.4");
-    /**
-     * possible PDF version (catalog)
-     */
-    public static final PdfName PDF_VERSION_1_5 = new PdfName("1.5");
-    /**
-     * possible PDF version (catalog)
-     */
-    public static final PdfName PDF_VERSION_1_6 = new PdfName("1.6");
-    /**
-     * possible PDF version (catalog)
-     */
-    public static final PdfName PDF_VERSION_1_7 = new PdfName("1.7");
-
-    /**
-     * Stores the version information for the header and the catalog.
-     */
-    protected PdfVersionImp pdf_version = new PdfVersionImp();
-
-    /**
-     * @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(char)
-     */
-    public void setPdfVersion(char version) {
-        pdf_version.setPdfVersion(version);
-    }
-
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfVersion#setAtLeastPdfVersion(char)
      */
@@ -1441,13 +1419,6 @@ public void setAtLeastPdfVersion(char version) {
         pdf_version.setAtLeastPdfVersion(version);
     }
 
-    /**
-     * @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(com.lowagie.text.pdf.PdfName)
-     */
-    public void setPdfVersion(PdfName version) {
-        pdf_version.setPdfVersion(version);
-    }
-
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfVersion#addDeveloperExtension(com.lowagie.text.pdf.PdfDeveloperExtension)
      * @since 2.1.6
@@ -1463,119 +1434,21 @@ PdfVersionImp getPdfVersion() {
         return pdf_version;
     }
 
-//  [C3] PdfViewerPreferences interface
-
-    // page layout (section 13.1.1 of "iText in Action")
-
-    /**
-     * A viewer preference
-     */
-    public static final int PageLayoutSinglePage = 1;
-    /**
-     * A viewer preference
-     */
-    public static final int PageLayoutOneColumn = 2;
-    /**
-     * A viewer preference
-     */
-    public static final int PageLayoutTwoColumnLeft = 4;
-    /**
-     * A viewer preference
-     */
-    public static final int PageLayoutTwoColumnRight = 8;
-    /**
-     * A viewer preference
-     */
-    public static final int PageLayoutTwoPageLeft = 16;
-    /**
-     * A viewer preference
-     */
-    public static final int PageLayoutTwoPageRight = 32;
-
-    // page mode (section 13.1.2 of "iText in Action")
-
-    /**
-     * A viewer preference
-     */
-    public static final int PageModeUseNone = 64;
-    /**
-     * A viewer preference
-     */
-    public static final int PageModeUseOutlines = 128;
-    /**
-     * A viewer preference
-     */
-    public static final int PageModeUseThumbs = 256;
-    /**
-     * A viewer preference
-     */
-    public static final int PageModeFullScreen = 512;
-    /**
-     * A viewer preference
-     */
-    public static final int PageModeUseOC = 1024;
-    /**
-     * A viewer preference
-     */
-    public static final int PageModeUseAttachments = 2048;
-
-    // values for setting viewer preferences in iText versions older than 2.x
-
-    /**
-     * A viewer preference
-     */
-    public static final int HideToolbar = 1 << 12;
-    /**
-     * A viewer preference
-     */
-    public static final int HideMenubar = 1 << 13;
-    /**
-     * A viewer preference
-     */
-    public static final int HideWindowUI = 1 << 14;
-    /**
-     * A viewer preference
-     */
-    public static final int FitWindow = 1 << 15;
-    /**
-     * A viewer preference
-     */
-    public static final int CenterWindow = 1 << 16;
-    /**
-     * A viewer preference
-     */
-    public static final int DisplayDocTitle = 1 << 17;
-
-    /**
-     * A viewer preference
-     */
-    public static final int NonFullScreenPageModeUseNone = 1 << 18;
-    /**
-     * A viewer preference
-     */
-    public static final int NonFullScreenPageModeUseOutlines = 1 << 19;
-    /**
-     * A viewer preference
-     */
-    public static final int NonFullScreenPageModeUseThumbs = 1 << 20;
     /**
-     * A viewer preference
+     * @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(char)
      */
-    public static final int NonFullScreenPageModeUseOC = 1 << 21;
+    public void setPdfVersion(char version) {
+        pdf_version.setPdfVersion(version);
+    }
 
-    /**
-     * A viewer preference
-     */
-    public static final int DirectionL2R = 1 << 22;
-    /**
-     * A viewer preference
-     */
-    public static final int DirectionR2L = 1 << 23;
+//  [F3] adding fonts
 
     /**
-     * A viewer preference
+     * @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(com.lowagie.text.pdf.PdfName)
      */
-    public static final int PrintScalingNone = 1 << 24;
+    public void setPdfVersion(PdfName version) {
+        pdf_version.setPdfVersion(version);
+    }
 
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#setViewerPreferences(int)
@@ -1592,8 +1465,6 @@ public void addViewerPreference(PdfName key, PdfObject value) {
         pdf.addViewerPreference(key, value);
     }
 
-//  [C4] Page labels
-
     /**
      * Use this method to add page labels
      *
@@ -1603,7 +1474,7 @@ public void setPageLabels(PdfPageLabels pageLabels) {
         pdf.setPageLabels(pageLabels);
     }
 
-//  [C5] named objects: named destinations, javascript, embedded files
+//  [F4] adding (and releasing) form XObjects
 
     /**
      * Adds named destinations in bulk. Valid keys and values of the map can be found in the map that is created by
@@ -1664,6 +1535,8 @@ public void addJavaScript(String code, boolean unicode) {
         addJavaScript(PdfAction.javaScript(code, this, unicode));
     }
 
+//  [F5] adding pages imported form other PDF documents
+
     /**
      * Use this method to adds a JavaScript action at the document level. When the document opens, all this JavaScript
      * runs.
@@ -1720,7 +1593,7 @@ public void addJavaScript(String name, String code) {
      * @throws IOException on error
      */
     public void addFileAttachment(String description, byte[] fileStore, String file, String fileDisplay)
-        throws IOException {
+            throws IOException {
         addFileAttachment(description, PdfFileSpecification.fileEmbedded(this, file, fileDisplay, fileStore));
     }
 
@@ -1731,42 +1604,21 @@ public void addFileAttachment(String description, byte[] fileStore, String file,
      * @param fs          the file specification
      * @throws IOException thrown when an I/O operation fails
      */
-    public void addFileAttachment(String description, PdfFileSpecification fs) throws IOException {
-        pdf.addFileAttachment(description, fs);
-    }
-
-    /**
-     * Use this method to add a file attachment at the document level.
-     *
-     * @param fs the file specification
-     * @throws IOException thrown when an I/O operation fails
-     */
-    public void addFileAttachment(PdfFileSpecification fs) throws IOException {
-        addFileAttachment(null, fs);
-    }
-
-// [C6] Actions (open and additional)
-
-    /**
-     * action value
-     */
-    public static final PdfName DOCUMENT_CLOSE = PdfName.WC;
-    /**
-     * action value
-     */
-    public static final PdfName WILL_SAVE = PdfName.WS;
-    /**
-     * action value
-     */
-    public static final PdfName DID_SAVE = PdfName.DS;
-    /**
-     * action value
-     */
-    public static final PdfName WILL_PRINT = PdfName.WP;
+    public void addFileAttachment(String description, PdfFileSpecification fs) throws IOException {
+        pdf.addFileAttachment(description, fs);
+    }
+
     /**
-     * action value
+     * Use this method to add a file attachment at the document level.
+     *
+     * @param fs the file specification
+     * @throws IOException thrown when an I/O operation fails
      */
-    public static final PdfName DID_PRINT = PdfName.DP;
+    public void addFileAttachment(PdfFileSpecification fs) throws IOException {
+        addFileAttachment(null, fs);
+    }
+
+//  [F6] spot colors
 
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfDocumentActions#setOpenAction(java.lang.String)
@@ -1788,18 +1640,16 @@ public void setOpenAction(PdfAction action) {
      */
     public void setAdditionalAction(PdfName actionType, PdfAction action) throws DocumentException {
         if (!(actionType.equals(DOCUMENT_CLOSE) ||
-            actionType.equals(WILL_SAVE) ||
-            actionType.equals(DID_SAVE) ||
-            actionType.equals(WILL_PRINT) ||
-            actionType.equals(DID_PRINT))) {
+                actionType.equals(WILL_SAVE) ||
+                actionType.equals(DID_SAVE) ||
+                actionType.equals(WILL_PRINT) ||
+                actionType.equals(DID_PRINT))) {
             throw new DocumentException(
-                MessageLocalization.getComposedMessage("invalid.additional.action.type.1", actionType.toString()));
+                    MessageLocalization.getComposedMessage("invalid.additional.action.type.1", actionType.toString()));
         }
         pdf.addAdditionalAction(actionType, action);
     }
 
-//  [C7] portable collections
-
     /**
      * Use this method to add the Collection dictionary.
      *
@@ -1810,16 +1660,7 @@ public void setCollection(PdfCollection collection) {
         pdf.setCollection(collection);
     }
 
-//  [C8] AcroForm
-
-    /**
-     * signature value
-     */
-    public static final int SIGNATURE_EXISTS = 1;
-    /**
-     * signature value
-     */
-    public static final int SIGNATURE_APPEND_ONLY = 2;
+//  [F7] document patterns
 
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfAnnotations#getAcroForm()
@@ -1839,6 +1680,8 @@ void addAnnotation(PdfAnnotation annot, int page) {
         addAnnotation(annot);
     }
 
+//  [F8] shading patterns
+
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfAnnotations#addCalculationOrder(com.lowagie.text.pdf.PdfFormField)
      */
@@ -1853,12 +1696,7 @@ public void setSigFlags(int f) {
         pdf.setSigFlags(f);
     }
 
-//  [C9] Metadata
-
-    /**
-     * XMP Metadata for the document.
-     */
-    protected byte[] xmpMetadata = null;
+//  [F9] document shadings
 
     /**
      * Use this method to set the XMP Metadata.
@@ -1878,6 +1716,8 @@ public void setPageXmpMetadata(byte[] xmpMetadata) {
         pdf.setXmpMetadata(xmpMetadata);
     }
 
+// [F10] extended graphics state (for instance for transparency)
+
     /**
      * Use this method to creates XMP Metadata based on the metadata in the PdfDocument.
      */
@@ -1899,32 +1739,14 @@ private byte[] createXmpMetadataBytes() {
         return baos.toByteArray();
     }
 
-//  [C10] PDFX Conformance
-    /**
-     * A PDF/X level.
-     */
-    public static final int PDFXNONE = 0;
-    /**
-     * A PDF/X level.
-     */
-    public static final int PDFX1A2001 = 1;
-    /**
-     * A PDF/X level.
-     */
-    public static final int PDFX32002 = 2;
-    /**
-     * PDFA-1A level.
-     */
-    public static final int PDFA1A = 3;
-    /**
-     * PDFA-1B level.
-     */
-    public static final int PDFA1B = 4;
+//  [F11] adding properties (OCG, marked content)
 
     /**
-     * Stores the PDF/X level.
+     * @see com.lowagie.text.pdf.interfaces.PdfXConformance#getPDFXConformance()
      */
-    private final PdfXConformanceImp pdfxConformance = new PdfXConformanceImp();
+    public int getPDFXConformance() {
+        return pdfxConformance.getPDFXConformance();
+    }
 
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfXConformance#setPDFXConformance(int)
@@ -1935,12 +1757,12 @@ public void setPDFXConformance(int pdfx) {
         }
         if (pdf.isOpen()) {
             throw new PdfXConformanceException(
-                MessageLocalization.getComposedMessage(
-                    "pdfx.conformance.can.only.be.set.before.opening.the.document"));
+                    MessageLocalization.getComposedMessage(
+                            "pdfx.conformance.can.only.be.set.before.opening.the.document"));
         }
         if (crypto != null) {
             throw new PdfXConformanceException(
-                MessageLocalization.getComposedMessage("a.pdfx.conforming.document.cannot.be.encrypted"));
+                    MessageLocalization.getComposedMessage("a.pdfx.conforming.document.cannot.be.encrypted"));
         }
         if (pdfx == PDFA1A || pdfx == PDFA1B) {
             setPdfVersion(VERSION_1_4);
@@ -1950,13 +1772,6 @@ public void setPDFXConformance(int pdfx) {
         pdfxConformance.setPDFXConformance(pdfx);
     }
 
-    /**
-     * @see com.lowagie.text.pdf.interfaces.PdfXConformance#getPDFXConformance()
-     */
-    public int getPDFXConformance() {
-        return pdfxConformance.getPDFXConformance();
-    }
-
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfXConformance#isPdfX()
      */
@@ -1964,12 +1779,12 @@ public boolean isPdfX() {
         return pdfxConformance.isPdfX();
     }
 
+//  [F12] tagged PDF
+
     public boolean isPdfA1() {
         return pdfxConformance.isPdfA1();
     }
 
-//  [C11] Output intents
-
     /**
      * Sets the values of the output intent dictionary. Null values are allowed to suppress any key.
      *
@@ -1982,7 +1797,7 @@ public boolean isPdfA1() {
      * @since 2.1.5
      */
     public void setOutputIntents(String outputConditionIdentifier, String outputCondition, String registryName,
-        String info, ICC_Profile colorProfile) throws IOException {
+            String info, ICC_Profile colorProfile) throws IOException {
         getExtraCatalog();
         PdfDictionary out = new PdfDictionary(PdfName.OUTPUTINTENT);
         if (outputCondition != null) {
@@ -1990,7 +1805,7 @@ public void setOutputIntents(String outputConditionIdentifier, String outputCond
         }
         if (outputConditionIdentifier != null) {
             out.put(PdfName.OUTPUTCONDITIONIDENTIFIER,
-                new PdfString(outputConditionIdentifier, PdfObject.TEXT_UNICODE));
+                    new PdfString(outputConditionIdentifier, PdfObject.TEXT_UNICODE));
         }
         if (registryName != null) {
             out.put(PdfName.REGISTRYNAME, new PdfString(registryName, PdfObject.TEXT_UNICODE));
@@ -2029,12 +1844,11 @@ public void setOutputIntents(String outputConditionIdentifier, String outputCond
      * @since 1.x
      */
     public void setOutputIntents(String outputConditionIdentifier, String outputCondition, String registryName,
-        String info, byte[] destOutputProfile) throws IOException {
+            String info, byte[] destOutputProfile) throws IOException {
         ICC_Profile colorProfile = (destOutputProfile == null) ? null : ICC_Profile.getInstance(destOutputProfile);
         setOutputIntents(outputConditionIdentifier, outputCondition, registryName, info, colorProfile);
     }
 
-
     /**
      * Use this method to copy the output intent dictionary from another document to this one.
      *
@@ -2068,1389 +1882,1511 @@ public boolean setOutputIntents(PdfReader reader, boolean checkExistence) throws
             destProfile = PdfReader.getStreamBytes(stream);
         }
         setOutputIntents(getNameString(out, PdfName.OUTPUTCONDITIONIDENTIFIER),
-            getNameString(out, PdfName.OUTPUTCONDITION),
-            getNameString(out, PdfName.REGISTRYNAME), getNameString(out, PdfName.INFO), destProfile);
+                getNameString(out, PdfName.OUTPUTCONDITION),
+                getNameString(out, PdfName.REGISTRYNAME), getNameString(out, PdfName.INFO), destProfile);
         return true;
     }
 
-    private static String getNameString(PdfDictionary dic, PdfName key) {
-        PdfObject obj = PdfReader.getPdfObject(dic.get(key));
-        if (obj == null || !obj.isString()) {
-            return null;
-        }
-        return ((PdfString) obj).toUnicodeString();
+    PdfEncryption getEncryption() {
+        return crypto;
     }
 
-// PDF Objects that have an impact on the PDF body
-
-//  [F1] PdfEncryptionSettings interface
-
-    // types of encryption
+//  [F13] Optional Content Groups
 
     /**
-     * No encryption
+     * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(byte[], byte[], int, int)
      */
-    public static final int ENCRYPTION_NONE = -1;
+    public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType)
+            throws DocumentException {
+        if (pdf.isOpen()) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("encryption.can.only.be.added.before.opening.the.document"));
+        }
+        crypto = new PdfEncryption();
+        crypto.setCryptoMode(encryptionType, 0);
+        crypto.setupAllKeys(userPassword, ownerPassword, permissions);
+    }
+
     /**
-     * Type of encryption
+     * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(java.security.cert.Certificate[], int[],
+     * int)
      */
-    public static final int STANDARD_ENCRYPTION_40 = 0;
+    public void setEncryption(Certificate[] certs, int[] permissions, int encryptionType) throws DocumentException {
+        if (pdf.isOpen()) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("encryption.can.only.be.added.before.opening.the.document"));
+        }
+        crypto = new PdfEncryption();
+        if (certs != null) {
+            for (int i = 0; i < certs.length; i++) {
+                crypto.addRecipient(certs[i], permissions[i]);
+            }
+        }
+        crypto.setCryptoMode(encryptionType, 0);
+        crypto.getEncryptionDictionary();
+    }
+
     /**
-     * Type of encryption
+     * Use this method to find out if 1.5 compression is on.
+     *
+     * @return the 1.5 compression status
      */
-    public static final int STANDARD_ENCRYPTION_128 = 1;
+    public boolean isFullCompression() {
+        return this.fullCompression;
+    }
+
     /**
-     * Type of encryption
+     * Use this method to set the document's compression to the PDF 1.5 mode with object streams and xref streams. It
+     * can be set at any time but once set it can't be unset.
+     * 
            
+     * If set before opening the document it will also set the pdf version to 1.5.
      */
-    public static final int ENCRYPTION_AES_128 = 2;
-    // ENCRYPTION_* = 3 reserved for implementation of the
-    // meanwhile deprecated proprietary AES256 variant by Adobe
+    public void setFullCompression() {
+        this.fullCompression = true;
+        setAtLeastPdfVersion(VERSION_1_5);
+    }
+
     /**
-     * Type of encryption
+     * Returns the compression level used for streams written by this writer.
+     *
+     * @return the compression level (0 = best speed, 9 = best compression, -1 is default)
+     * @since 2.1.3
      */
-    public static final int ENCRYPTION_AES_256_V3 = 4;
+    public int getCompressionLevel() {
+        return compressionLevel;
+    }
+
     /**
-     * Mask to separate the encryption type from the encryption mode.
+     * Sets the compression level to be used for streams written by this writer.
+     *
+     * @param compressionLevel a value between 0 (best speed) and 9 (best compression)
+     * @since 2.1.3
      */
-    static final int ENCRYPTION_MASK = 7;
+    public void setCompressionLevel(int compressionLevel) {
+        if (compressionLevel < PdfStream.NO_COMPRESSION || compressionLevel > PdfStream.BEST_COMPRESSION) {
+            this.compressionLevel = PdfStream.DEFAULT_COMPRESSION;
+        } else {
+            this.compressionLevel = compressionLevel;
+        }
+    }
+
     /**
-     * Add this to the mode to keep the metadata in clear text
+     * Adds a BaseFont to the document but not to the page resources. It is used for templates.
+     *
+     * @param bf the BaseFont to add
+     * @return an Object[] where position 0 is a PdfName and position 1 is an
+     * PdfIndirectReference
      */
-    public static final int DO_NOT_ENCRYPT_METADATA = 8;
+
+    FontDetails addSimple(BaseFont bf) {
+        if (bf.getFontType() == BaseFont.FONT_TYPE_DOCUMENT) {
+            return new FontDetails(new PdfName("F" + (fontNumber++)), ((DocumentFont) bf).getIndirectReference(), bf);
+        }
+        FontDetails ret = documentFonts.get(bf);
+        if (ret == null) {
+            PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_FONT, bf);
+            ret = new FontDetails(new PdfName("F" + (fontNumber++)), body.getPdfIndirectReference(), bf);
+            documentFonts.put(bf, ret);
+        }
+        return ret;
+    }
+
+    void eliminateFontSubset(PdfDictionary fonts) {
+        for (FontDetails ft : documentFonts.values()) {
+            if (fonts.get(ft.getFontName()) != null) {
+                ft.setSubset(false);
+            }
+        }
+    }
+
     /**
-     * Add this to the mode to keep encrypt only the embedded files.
+     * Adds a template to the document but not to the page resources.
      *
-     * @since 2.1.3
+     * @param template   the template to add
+     * @param forcedName the template name, rather than a generated one. Can be null
+     * @return the PdfName for this template
      */
-    public static final int EMBEDDED_FILES_ONLY = 24;
 
-    // permissions
+    PdfName addDirectTemplateSimple(PdfTemplate template, PdfName forcedName) {
+        PdfIndirectReference ref = template.getIndirectReference();
+        Object[] obj = formXObjects.get(ref);
+        PdfName name;
+        try {
+            if (obj == null) {
+                if (forcedName == null) {
+                    name = new PdfName("Xf" + formXObjectsCounter);
+                    ++formXObjectsCounter;
+                } else {
+                    name = forcedName;
+                }
+                if (template.getType() == PdfTemplate.TYPE_IMPORTED) {
+                    // If we got here from PdfCopy we'll have to fill importedPages
+                    PdfImportedPage ip = (PdfImportedPage) template;
+                    PdfReader r = ip.getPdfReaderInstance().getReader();
+                    if (!importedPages.containsKey(r)) {
+                        importedPages.put(r, ip.getPdfReaderInstance());
+                    }
+                    template = null;
+                }
+                formXObjects.put(ref, new Object[]{name, template});
+            } else {
+                name = (PdfName) obj[0];
+            }
+        } catch (Exception e) {
+            throw new ExceptionConverter(e);
+        }
+        return name;
+    }
 
     /**
-     * The operation permitted when the document is opened with the user password
+     * Use this method to releases the memory used by a template. This method writes the template to the output. The
+     * template can still be added to any content but changes to the template itself won't have any effect.
      *
-     * @since 2.0.7
+     * @param tp the template to release
+     * @throws IOException on error
      */
-    public static final int ALLOW_PRINTING = 4 + 2048;
+    public void releaseTemplate(PdfTemplate tp) throws IOException {
+        PdfIndirectReference ref = tp.getIndirectReference();
+        Object[] objs = formXObjects.get(ref);
+        if (objs == null || objs[1] == null) {
+            return;
+        }
+        PdfTemplate template = (PdfTemplate) objs[1];
+        if (template.getIndirectReference() instanceof PRIndirectReference) {
+            return;
+        }
+        if (template.getType() == PdfTemplate.TYPE_TEMPLATE) {
+            addToBody(template.getFormXObject(compressionLevel), template.getIndirectReference());
+            objs[1] = null;
+        }
+    }
 
     /**
-     * The operation permitted when the document is opened with the user password
+     * Use this method to get a page from other PDF document. The page can be used as any other PdfTemplate. Note that
+     * calling this method more than once with the same parameters will retrieve the same object.
      *
-     * @since 2.0.7
+     * @param reader     the PDF document where the page is
+     * @param pageNumber the page number. The first page is 1
+     * @return the template representing the imported page
      */
-    public static final int ALLOW_MODIFY_CONTENTS = 8;
+    public PdfImportedPage getImportedPage(PdfReader reader, int pageNumber) {
+        PdfReaderInstance inst = importedPages.get(reader);
+        if (inst == null) {
+            inst = reader.getPdfReaderInstance(this);
+            importedPages.put(reader, inst);
+        }
+        return inst.getImportedPage(pageNumber);
+    }
 
     /**
-     * The operation permitted when the document is opened with the user password
+     * Use this method to writes the reader to the document and free the memory used by it. The main use is when
+     * concatenating multiple documents to keep the memory usage restricted to the current appending document.
      *
-     * @since 2.0.7
+     * @param reader the PdfReader to free
+     * @throws IOException on error
      */
-    public static final int ALLOW_COPY = 16;
+    public void freeReader(PdfReader reader) throws IOException {
+        currentPdfReaderInstance = importedPages.get(reader);
+        if (currentPdfReaderInstance == null) {
+            return;
+        }
+        currentPdfReaderInstance.writeAllPages();
+        currentPdfReaderInstance = null;
+        importedPages.remove(reader);
+    }
 
-    /**
-     * The operation permitted when the document is opened with the user password
-     *
-     * @since 2.0.7
-     */
-    public static final int ALLOW_MODIFY_ANNOTATIONS = 32;
+//  User methods to change aspects of the page
 
-    /**
-     * The operation permitted when the document is opened with the user password
-     *
-     * @since 2.0.7
-     */
-    public static final int ALLOW_FILL_IN = 256;
+//  [U1] page size
 
     /**
-     * The operation permitted when the document is opened with the user password
+     * Use this method to gets the current document size. This size only includes the data already written to the output
+     * stream, it does not include templates or fonts. It is useful if used with freeReader() when
+     * concatenating many documents and an idea of the current size is needed.
      *
-     * @since 2.0.7
+     * @return the approximate size without fonts or templates
      */
-    public static final int ALLOW_SCREENREADERS = 512;
+    public long getCurrentDocumentSize() {
+        return body.offset() + (long) body.size() * 20L + 0x48;
+    }
 
-    /**
-     * The operation permitted when the document is opened with the user password
-     *
-     * @since 2.0.7
-     */
-    public static final int ALLOW_ASSEMBLY = 1024;
+    protected int getNewObjectNumber(PdfReader reader, int number, int generation) {
+        if (currentPdfReaderInstance == null && importedPages.get(reader) == null) {
+            importedPages.put(reader, reader.getPdfReaderInstance(this));
+        }
+        currentPdfReaderInstance = importedPages.get(reader);
+        int n = currentPdfReaderInstance.getNewObjectNumber(number, generation);
+        currentPdfReaderInstance = null;
+        return n;
+    }
+
+    RandomAccessFileOrArray getReaderFile(PdfReader reader) {
+        return currentPdfReaderInstance.getReaderFile();
+    }
+
+    PdfName getColorspaceName() {
+        return new PdfName("CS" + (colorNumber++));
+    }
+
+//  [U2] take care of empty pages
 
     /**
-     * The operation permitted when the document is opened with the user password
+     * Adds a SpotColor to the document but not to the page resources.
      *
-     * @since 2.0.7
+     * @param spc the SpotColor to add
+     * @return an Object[] where position 0 is a PdfName and position 1 is an
+     * PdfIndirectReference
      */
-    public static final int ALLOW_DEGRADED_PRINTING = 4;
+    ColorDetails addSimple(PdfSpotColor spc) {
+        ColorDetails ret = documentColors.get(spc);
+        if (ret == null) {
+            ret = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), spc);
+            documentColors.put(spc, ret);
+        }
+        return ret;
+    }
 
+    PdfName addSimplePattern(PdfPatternPainter painter) {
+        PdfName name = documentPatterns.get(painter);
+        try {
+            if (name == null) {
+                name = new PdfName("P" + patternNumber);
+                ++patternNumber;
+                documentPatterns.put(painter, name);
+            }
+        } catch (Exception e) {
+            throw new ExceptionConverter(e);
+        }
+        return name;
+    }
 
-    /**
-     * Contains the business logic for cryptography.
-     */
-    protected PdfEncryption crypto;
+//  [U3] page actions (open and close)
 
-    PdfEncryption getEncryption() {
-        return crypto;
+    void addSimpleShadingPattern(PdfShadingPattern shading) {
+        if (!documentShadingPatterns.containsKey(shading)) {
+            shading.setName(patternNumber);
+            ++patternNumber;
+            documentShadingPatterns.put(shading, null);
+            addSimpleShading(shading.getShading());
+        }
     }
 
-    /**
-     * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(byte[], byte[], int, int)
-     */
-    public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType)
-        throws DocumentException {
-        if (pdf.isOpen()) {
-            throw new DocumentException(
-                MessageLocalization.getComposedMessage("encryption.can.only.be.added.before.opening.the.document"));
+    void addSimpleShading(PdfShading shading) {
+        if (!documentShadings.containsKey(shading)) {
+            documentShadings.put(shading, null);
+            shading.setName(documentShadings.size());
         }
-        crypto = new PdfEncryption();
-        crypto.setCryptoMode(encryptionType, 0);
-        crypto.setupAllKeys(userPassword, ownerPassword, permissions);
     }
 
-    /**
-     * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(java.security.cert.Certificate[], int[],
-     * int)
-     */
-    public void setEncryption(Certificate[] certs, int[] permissions, int encryptionType) throws DocumentException {
-        if (pdf.isOpen()) {
-            throw new DocumentException(
-                MessageLocalization.getComposedMessage("encryption.can.only.be.added.before.opening.the.document"));
+    PdfObject[] addSimpleExtGState(PdfDictionary gstate) {
+        if (!documentExtGState.containsKey(gstate)) {
+            PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_GSTATE, gstate);
+            documentExtGState.put(gstate,
+                    new PdfObject[]{new PdfName("GS" + (documentExtGState.size() + 1)), getPdfIndirectReference()});
         }
-        crypto = new PdfEncryption();
-        if (certs != null) {
-            for (int i = 0; i < certs.length; i++) {
-                crypto.addRecipient(certs[i], permissions[i]);
+        return documentExtGState.get(gstate);
+    }
+
+    PdfObject[] addSimpleProperty(Object prop, PdfIndirectReference refi) {
+        if (!documentProperties.containsKey(prop)) {
+            if (prop instanceof PdfOCG) {
+                PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_LAYER, null);
             }
+            documentProperties.put(prop, new PdfObject[]{new PdfName("Pr" + (documentProperties.size() + 1)), refi});
         }
-        crypto.setCryptoMode(encryptionType, 0);
-        crypto.getEncryptionDictionary();
+        return documentProperties.get(prop);
     }
 
-//  [F2] compression
+    boolean propertyExists(Object prop) {
+        return documentProperties.containsKey(prop);
+    }
+
+//  [U4] Thumbnail image
 
     /**
-     * Holds value of property fullCompression.
+     * Mark this document for tagging. It must be called before open.
      */
-    protected boolean fullCompression = false;
+    public void setTagged() {
+        if (open) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("tagging.must.be.set.before.opening.the.document"));
+        }
+        tagged = true;
+    }
+
+//  [U5] Transparency groups
 
     /**
-     * Use this method to find out if 1.5 compression is on.
+     * Check if the document is marked for tagging.
      *
-     * @return the 1.5 compression status
+     * @return true if the document is marked for tagging
      */
-    public boolean isFullCompression() {
-        return this.fullCompression;
+    public boolean isTagged() {
+        return tagged;
     }
 
     /**
-     * Use this method to set the document's compression to the PDF 1.5 mode with object streams and xref streams. It
-     * can be set at any time but once set it can't be unset.
-     * 
            
-     * If set before opening the document it will also set the pdf version to 1.5.
+     * Gets the structure tree root. If the document is not marked for tagging it will return null.
+     *
+     * @return the structure tree root
      */
-    public void setFullCompression() {
-        this.fullCompression = true;
-        setAtLeastPdfVersion(VERSION_1_5);
+    public PdfStructureTreeRoot getStructureTreeRoot() {
+        if (tagged && structureTreeRoot == null) {
+            structureTreeRoot = new PdfStructureTreeRoot(this);
+        }
+        return structureTreeRoot;
     }
 
     /**
-     * The compression level of the content streams.
+     * Use this method to get the Optional Content Properties Dictionary. Each call fills the dictionary with the
+     * current layer state. It's advisable to only call this method right before close and do any modifications at that
+     * time.
      *
-     * @since 2.1.3
+     * @return the Optional Content Properties Dictionary
      */
-    protected int compressionLevel = PdfStream.DEFAULT_COMPRESSION;
+    public PdfOCProperties getOCProperties() {
+        fillOCProperties(true);
+        return OCProperties;
+    }
+
+//  [U6] space char ratio
 
     /**
-     * Returns the compression level used for streams written by this writer.
+     * Use this method to set a collection of optional content groups whose states are intended to follow a "radio
+     * button" paradigm. That is, the state of at most one optional content group in the array should be ON at a time:
+     * if one group is turned ON, all others must be turned OFF.
      *
-     * @return the compression level (0 = best speed, 9 = best compression, -1 is default)
-     * @since 2.1.3
+     * @param group the radio group
      */
-    public int getCompressionLevel() {
-        return compressionLevel;
+    public void addOCGRadioGroup(List group) {
+        PdfArray ar = new PdfArray();
+        for (PdfLayer layer : group) {
+            if (layer.getTitle() == null) {
+                ar.add(layer.getRef());
+            }
+        }
+        if (ar.isEmpty()) {
+            return;
+        }
+        OCGRadioGroup.add(ar);
     }
 
     /**
-     * Sets the compression level to be used for streams written by this writer.
+     * Use this method to lock an optional content group. The state of a locked group cannot be changed through the user
+     * interface of a viewer application. Producers can use this entry to prevent the visibility of content that depends
+     * on these groups from being changed by users.
      *
-     * @param compressionLevel a value between 0 (best speed) and 9 (best compression)
-     * @since 2.1.3
+     * @param layer the layer that needs to be added to the array of locked OCGs
+     * @since 2.1.2
      */
-    public void setCompressionLevel(int compressionLevel) {
-        if (compressionLevel < PdfStream.NO_COMPRESSION || compressionLevel > PdfStream.BEST_COMPRESSION) {
-            this.compressionLevel = PdfStream.DEFAULT_COMPRESSION;
-        } else {
-            this.compressionLevel = compressionLevel;
+    public void lockLayer(PdfLayer layer) {
+        OCGLocked.add(layer.getRef());
+    }
+
+    private void addASEvent(PdfName event, PdfName category) {
+        PdfArray arr = new PdfArray();
+        for (PdfOCG o : documentOCG) {
+            PdfLayer layer = (PdfLayer) o;
+            PdfDictionary usage = layer.getAsDict(PdfName.USAGE);
+            if (usage != null && usage.get(category) != null) {
+                arr.add(layer.getRef());
+            }
+        }
+        if (arr.isEmpty()) {
+            return;
         }
+        PdfDictionary d = (PdfDictionary) OCProperties.get(PdfName.D);
+        PdfArray arras = (PdfArray) d.get(PdfName.AS);
+        if (arras == null) {
+            arras = new PdfArray();
+            d.put(PdfName.AS, arras);
+        }
+        PdfDictionary as = new PdfDictionary();
+        as.put(PdfName.EVENT, event);
+        as.put(PdfName.CATEGORY, new PdfArray(category));
+        as.put(PdfName.OCGS, arr);
+        arras.add(as);
     }
 
-//  [F3] adding fonts
-
-    /**
-     * The fonts of this document
-     */
-    protected LinkedHashMap documentFonts = new LinkedHashMap<>();
-
     /**
-     * The font number counter for the fonts in the document.
+     * @param erase true to erase, false otherwise
+     * @since 2.1.2
      */
-    protected int fontNumber = 1;
+    protected void fillOCProperties(boolean erase) {
+        if (OCProperties == null) {
+            OCProperties = new PdfOCProperties();
+        }
+        if (erase) {
+            OCProperties.remove(PdfName.OCGS);
+            OCProperties.remove(PdfName.D);
+        }
+        if (OCProperties.get(PdfName.OCGS) == null) {
+            PdfArray gr = new PdfArray();
+            for (PdfOCG o : documentOCG) {
+                PdfLayer layer = (PdfLayer) o;
+                gr.add(layer.getRef());
+            }
+            OCProperties.put(PdfName.OCGS, gr);
+        }
+        if (OCProperties.get(PdfName.D) != null) {
+            return;
+        }
 
-    /**
-     * Adds a BaseFont to the document but not to the page resources. It is used for templates.
-     *
-     * @param bf the BaseFont to add
-     * @return an Object[] where position 0 is a PdfName and position 1 is an
-     * PdfIndirectReference
-     */
+        List docOrder = documentOCGorder.stream()
+                .filter(pdfOCG -> ((PdfLayer) pdfOCG).getParent() == null)
+                .collect(Collectors.toList());
 
-    FontDetails addSimple(BaseFont bf) {
-        if (bf.getFontType() == BaseFont.FONT_TYPE_DOCUMENT) {
-            return new FontDetails(new PdfName("F" + (fontNumber++)), ((DocumentFont) bf).getIndirectReference(), bf);
+        PdfArray order = new PdfArray();
+        for (PdfOCG o1 : docOrder) {
+            PdfLayer layer = (PdfLayer) o1;
+            getOCGOrder(order, layer);
         }
-        FontDetails ret = documentFonts.get(bf);
-        if (ret == null) {
-            PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_FONT, bf);
-            ret = new FontDetails(new PdfName("F" + (fontNumber++)), body.getPdfIndirectReference(), bf);
-            documentFonts.put(bf, ret);
+        PdfDictionary d = new PdfDictionary();
+        OCProperties.put(PdfName.D, d);
+        d.put(PdfName.ORDER, order);
+        PdfArray gr = new PdfArray();
+        for (PdfOCG o : documentOCG) {
+            PdfLayer layer = (PdfLayer) o;
+            if (!layer.isOn()) {
+                gr.add(layer.getRef());
+            }
         }
-        return ret;
+        if (!gr.isEmpty()) {
+            d.put(PdfName.OFF, gr);
+        }
+        if (OCGRadioGroup != null && !OCGRadioGroup.isEmpty()) {
+            d.put(PdfName.RBGROUPS, OCGRadioGroup);
+        }
+        if (OCGLocked != null && !OCGLocked.isEmpty()) {
+            d.put(PdfName.LOCKED, OCGLocked);
+        }
+        addASEvent(PdfName.VIEW, PdfName.ZOOM);
+        addASEvent(PdfName.VIEW, PdfName.VIEW);
+        addASEvent(PdfName.PRINT, PdfName.PRINT);
+        addASEvent(PdfName.EXPORT, PdfName.EXPORT);
+        d.put(PdfName.LISTMODE, PdfName.VISIBLEPAGES);
     }
 
-    void eliminateFontSubset(PdfDictionary fonts) {
-        for (FontDetails ft : documentFonts.values()) {
-            if (fonts.get(ft.getFontName()) != null) {
-                ft.setSubset(false);
+    void registerLayer(PdfOCG layer) {
+        PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_LAYER, null);
+        if (layer instanceof PdfLayer) {
+            PdfLayer la = (PdfLayer) layer;
+            if (la.getTitle() == null) {
+                if (!documentOCG.contains(layer)) {
+                    documentOCG.add(layer);
+                    documentOCGorder.add(layer);
+                }
+            } else {
+                documentOCGorder.add(layer);
             }
+        } else {
+            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("only.pdflayer.is.accepted"));
         }
     }
 
-//  [F4] adding (and releasing) form XObjects
+//  [U7] run direction (doesn't actually do anything)
 
     /**
-     * The form XObjects in this document. The key is the xref and the value is Object[]{PdfName, template}.
+     * Use this method to get the size of the media box.
+     *
+     * @return a Rectangle
      */
-    protected LinkedHashMap formXObjects = new LinkedHashMap<>();
+    public Rectangle getPageSize() {
+        return pdf.getPageSize();
+    }
 
     /**
-     * The name counter for the form XObjects name.
+     * Use this method to set the crop box. The crop box should not be rotated even if the page is rotated. This change
+     * only takes effect in the next page.
+     *
+     * @param crop the crop box
      */
-    protected int formXObjectsCounter = 1;
+    public void setCropBoxSize(Rectangle crop) {
+        pdf.setCropBoxSize(crop);
+    }
 
     /**
-     * Adds a template to the document but not to the page resources.
+     * Use this method to set the page box sizes. Allowed names are: "crop", "trim", "art" and "bleed".
      *
-     * @param template   the template to add
-     * @param forcedName the template name, rather than a generated one. Can be null
-     * @return the PdfName for this template
+     * @param boxName the box size
+     * @param size    the size
      */
-
-    PdfName addDirectTemplateSimple(PdfTemplate template, PdfName forcedName) {
-        PdfIndirectReference ref = template.getIndirectReference();
-        Object[] obj = formXObjects.get(ref);
-        PdfName name;
-        try {
-            if (obj == null) {
-                if (forcedName == null) {
-                    name = new PdfName("Xf" + formXObjectsCounter);
-                    ++formXObjectsCounter;
-                } else {
-                    name = forcedName;
-                }
-                if (template.getType() == PdfTemplate.TYPE_IMPORTED) {
-                    // If we got here from PdfCopy we'll have to fill importedPages
-                    PdfImportedPage ip = (PdfImportedPage) template;
-                    PdfReader r = ip.getPdfReaderInstance().getReader();
-                    if (!importedPages.containsKey(r)) {
-                        importedPages.put(r, ip.getPdfReaderInstance());
-                    }
-                    template = null;
-                }
-                formXObjects.put(ref, new Object[]{name, template});
-            } else {
-                name = (PdfName) obj[0];
-            }
-        } catch (Exception e) {
-            throw new ExceptionConverter(e);
-        }
-        return name;
+    public void setBoxSize(String boxName, Rectangle size) {
+        pdf.setBoxSize(boxName, size);
     }
 
     /**
-     * Use this method to releases the memory used by a template. This method writes the template to the output. The
-     * template can still be added to any content but changes to the template itself won't have any effect.
+     * Use this method to get the size of a trim, art, crop or bleed box, or null if not defined.
      *
-     * @param tp the template to release
-     * @throws IOException on error
+     * @param boxName crop, trim, art or bleed
+     * @return the Rectangle
      */
-    public void releaseTemplate(PdfTemplate tp) throws IOException {
-        PdfIndirectReference ref = tp.getIndirectReference();
-        Object[] objs = formXObjects.get(ref);
-        if (objs == null || objs[1] == null) {
-            return;
-        }
-        PdfTemplate template = (PdfTemplate) objs[1];
-        if (template.getIndirectReference() instanceof PRIndirectReference) {
-            return;
-        }
-        if (template.getType() == PdfTemplate.TYPE_TEMPLATE) {
-            addToBody(template.getFormXObject(compressionLevel), template.getIndirectReference());
-            objs[1] = null;
-        }
+    public Rectangle getBoxSize(String boxName) {
+        return pdf.getBoxSize(boxName);
     }
 
-//  [F5] adding pages imported form other PDF documents
-
-    protected HashMap importedPages = new HashMap<>();
-
     /**
-     * Use this method to get a page from other PDF document. The page can be used as any other PdfTemplate. Note that
-     * calling this method more than once with the same parameters will retrieve the same object.
+     * Checks if a newPage() will actually generate a new page.
      *
-     * @param reader     the PDF document where the page is
-     * @param pageNumber the page number. The first page is 1
-     * @return the template representing the imported page
+     * @return true if a new page will be generated, false otherwise
+     * @since 2.1.8
      */
-    public PdfImportedPage getImportedPage(PdfReader reader, int pageNumber) {
-        PdfReaderInstance inst = importedPages.get(reader);
-        if (inst == null) {
-            inst = reader.getPdfReaderInstance(this);
-            importedPages.put(reader, inst);
-        }
-        return inst.getImportedPage(pageNumber);
+    public boolean isPageEmpty() {
+        return pdf.isPageEmpty();
     }
 
     /**
-     * Use this method to writes the reader to the document and free the memory used by it. The main use is when
-     * concatenating multiple documents to keep the memory usage restricted to the current appending document.
+     * Use this method to make sure a page is added, even if it's empty. If you use setPageEmpty(false), invoking
+     * newPage() after a blank page will add a newPage. setPageEmpty(true) won't have any effect.
      *
-     * @param reader the PdfReader to free
-     * @throws IOException on error
+     * @param pageEmpty the state
      */
-    public void freeReader(PdfReader reader) throws IOException {
-        currentPdfReaderInstance = importedPages.get(reader);
-        if (currentPdfReaderInstance == null) {
+    public void setPageEmpty(boolean pageEmpty) {
+        if (pageEmpty) {
             return;
         }
-        currentPdfReaderInstance.writeAllPages();
-        currentPdfReaderInstance = null;
-        importedPages.remove(reader);
+        pdf.setPageEmpty(pageEmpty);
     }
 
     /**
-     * Use this method to gets the current document size. This size only includes the data already written to the output
-     * stream, it does not include templates or fonts. It is useful if used with freeReader() when
-     * concatenating many documents and an idea of the current size is needed.
-     *
-     * @return the approximate size without fonts or templates
+     * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setPageAction(com.lowagie.text.pdf.PdfName,
+     * com.lowagie.text.pdf.PdfAction)
      */
-    public long getCurrentDocumentSize() {
-        return body.offset() + (long) body.size() * 20L + 0x48;
-    }
-
-    protected PdfReaderInstance currentPdfReaderInstance;
-
-    protected int getNewObjectNumber(PdfReader reader, int number, int generation) {
-        if (currentPdfReaderInstance == null && importedPages.get(reader) == null) {
-            importedPages.put(reader, reader.getPdfReaderInstance(this));
-        }
-        currentPdfReaderInstance = importedPages.get(reader);
-        int n = currentPdfReaderInstance.getNewObjectNumber(number, generation);
-        currentPdfReaderInstance = null;
-        return n;
-    }
-
-    RandomAccessFileOrArray getReaderFile(PdfReader reader) {
-        return currentPdfReaderInstance.getReaderFile();
+    public void setPageAction(PdfName actionType, PdfAction action) throws DocumentException {
+        if (!actionType.equals(PAGE_OPEN) && !actionType.equals(PAGE_CLOSE)) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("invalid.page.additional.action.type.1",
+                            actionType.toString()));
+        }
+        pdf.setPageAction(actionType, action);
     }
 
-//  [F6] spot colors
+//  [U8] user units
 
     /**
-     * The colors of this document
+     * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setDuration(int)
      */
-    protected HashMap documentColors = new HashMap<>();
+    public void setDuration(int seconds) {
+        pdf.setDuration(seconds);
+    }
 
     /**
-     * The color number counter for the colors in the document.
+     * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setTransition(com.lowagie.text.pdf.PdfTransition)
      */
-    protected int colorNumber = 1;
-
-    PdfName getColorspaceName() {
-        return new PdfName("CS" + (colorNumber++));
+    public void setTransition(PdfTransition transition) {
+        pdf.setTransition(transition);
     }
 
     /**
-     * Adds a SpotColor to the document but not to the page resources.
+     * Use this method to set the thumbnail image for the current page.
      *
-     * @param spc the SpotColor to add
-     * @return an Object[] where position 0 is a PdfName and position 1 is an
-     * PdfIndirectReference
+     * @param image the image
+     * @throws PdfException      on error
+     * @throws DocumentException or error
      */
-    ColorDetails addSimple(PdfSpotColor spc) {
-        ColorDetails ret = documentColors.get(spc);
-        if (ret == null) {
-            ret = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), spc);
-            documentColors.put(spc, ret);
-        }
-        return ret;
+    public void setThumbnail(Image image) throws DocumentException {
+        pdf.setThumbnail(image);
     }
 
-//  [F7] document patterns
+// Miscellaneous topics
+
+//  [M1] Color settings
 
     /**
-     * The patterns of this document
+     * Use this method to get the group dictionary.
+     *
+     * @return Value of property group.
      */
-    protected HashMap documentPatterns = new HashMap<>();
+    public PdfDictionary getGroup() {
+        return this.group;
+    }
 
     /**
-     * The pattern number counter for the colors in the document.
+     * Use this method to set the group dictionary.
+     *
+     * @param group New value of property group.
      */
-    protected int patternNumber = 1;
-
-    PdfName addSimplePattern(PdfPatternPainter painter) {
-        PdfName name = documentPatterns.get(painter);
-        try {
-            if (name == null) {
-                name = new PdfName("P" + patternNumber);
-                ++patternNumber;
-                documentPatterns.put(painter, name);
-            }
-        } catch (Exception e) {
-            throw new ExceptionConverter(e);
-        }
-        return name;
+    public void setGroup(PdfDictionary group) {
+        this.group = group;
     }
 
-//  [F8] shading patterns
-
-    protected HashMap documentShadingPatterns = new HashMap<>();
-
-    void addSimpleShadingPattern(PdfShadingPattern shading) {
-        if (!documentShadingPatterns.containsKey(shading)) {
-            shading.setName(patternNumber);
-            ++patternNumber;
-            documentShadingPatterns.put(shading, null);
-            addSimpleShading(shading.getShading());
-        }
+    /**
+     * Use this method to gets the space/character extra spacing ratio for fully justified text.
+     *
+     * @return the space/character extra spacing ratio
+     */
+    public float getSpaceCharRatio() {
+        return spaceCharRatio;
     }
 
-//  [F9] document shadings
-
-    protected HashMap documentShadings = new HashMap<>();
+//  [M2] spot patterns
 
-    void addSimpleShading(PdfShading shading) {
-        if (!documentShadings.containsKey(shading)) {
-            documentShadings.put(shading, null);
-            shading.setName(documentShadings.size());
-        }
+    /**
+     * Use this method to set the ratio between the extra word spacing and the extra character spacing when the text is
+     * fully justified. Extra word spacing will grow spaceCharRatio times more than extra character
+     * spacing. If the ratio is PdfWriter.NO_SPACE_CHAR_RATIO then the extra character spacing will be
+     * zero.
+     *
+     * @param spaceCharRatio the ratio between the extra word spacing and the extra character spacing
+     */
+    public void setSpaceCharRatio(float spaceCharRatio) {
+        this.spaceCharRatio = Math.max(spaceCharRatio, 0.001f);
     }
 
-// [F10] extended graphics state (for instance for transparency)
-
-    protected HashMap documentExtGState = new LinkedHashMap<>();
-
-    PdfObject[] addSimpleExtGState(PdfDictionary gstate) {
-        if (!documentExtGState.containsKey(gstate)) {
-            PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_GSTATE, gstate);
-            documentExtGState.put(gstate,
-                new PdfObject[]{new PdfName("GS" + (documentExtGState.size() + 1)), getPdfIndirectReference()});
-        }
-        return documentExtGState.get(gstate);
+    /**
+     * Use this method to set the run direction.
+     *
+     * @return the run direction
+     */
+    public int getRunDirection() {
+        return runDirection;
     }
 
-//  [F11] adding properties (OCG, marked content)
-
-    protected HashMap documentProperties = new HashMap<>();
-
-    PdfObject[] addSimpleProperty(Object prop, PdfIndirectReference refi) {
-        if (!documentProperties.containsKey(prop)) {
-            if (prop instanceof PdfOCG) {
-                PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_LAYER, null);
-            }
-            documentProperties.put(prop, new PdfObject[]{new PdfName("Pr" + (documentProperties.size() + 1)), refi});
+    /**
+     * Use this method to set the run direction. This is only used as a placeholder as it does not affect anything.
+     *
+     * @param runDirection the run direction
+     */
+    public void setRunDirection(int runDirection) {
+        if (runDirection < RUN_DIRECTION_NO_BIDI || runDirection > RUN_DIRECTION_RTL) {
+            throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.run.direction.1", runDirection));
         }
-        return documentProperties.get(prop);
+        this.runDirection = runDirection;
     }
 
-    boolean propertyExists(Object prop) {
-        return documentProperties.containsKey(prop);
+    /**
+     * Use this method to get the user unit. A user unit is a value that defines the default user space unit. The
+     * minimum UserUnit is 1 (1 unit = 1/72 inch). The maximum UserUnit is 75,000. Note that this userunit only works
+     * starting with PDF1.6!
+     *
+     * @return Returns the userunit.
+     */
+    public float getUserunit() {
+        return userunit;
     }
 
-//  [F12] tagged PDF
-
-    protected boolean tagged = false;
-    protected PdfStructureTreeRoot structureTreeRoot;
-
     /**
-     * Mark this document for tagging. It must be called before open.
+     * Use this method to set the user unit. A UserUnit is a value that defines the default user space unit. The minimum
+     * UserUnit is 1 (1 unit = 1/72 inch). The maximum UserUnit is 75,000. Note that this userunit only works starting
+     * with PDF1.6!
+     *
+     * @param userunit The userunit to set.
+     * @throws DocumentException on error
      */
-    public void setTagged() {
-        if (open) {
-            throw new IllegalArgumentException(
-                MessageLocalization.getComposedMessage("tagging.must.be.set.before.opening.the.document"));
+    public void setUserunit(float userunit) throws DocumentException {
+        if (userunit < 1f || userunit > 75000f) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("userunit.should.be.a.value.between.1.and.75000"));
         }
-        tagged = true;
+        this.userunit = userunit;
+        setAtLeastPdfVersion(VERSION_1_6);
     }
 
+//  [M3] Images
+
     /**
-     * Check if the document is marked for tagging.
+     * Use this method to get the default colorspaces.
      *
-     * @return true if the document is marked for tagging
+     * @return the default colorspaces
      */
-    public boolean isTagged() {
-        return tagged;
+    public PdfDictionary getDefaultColorspace() {
+        return defaultColorspace;
     }
 
     /**
-     * Gets the structure tree root. If the document is not marked for tagging it will return null.
+     * Use this method to sets the default colorspace that will be applied to all the document. The colorspace is only
+     * applied if another colorspace with the same name is not present in the content.
+     * 
            
+     * The colorspace is applied immediately when creating templates and at the page end for the main document content.
      *
-     * @return the structure tree root
+     * @param key the name of the colorspace. It can be PdfName.DEFAULTGRAY,
+     *            PdfName.DEFAULTRGB or PdfName.DEFAULTCMYK
+     * @param cs  the colorspace. A null or PdfNull removes any colorspace with the same name
      */
-    public PdfStructureTreeRoot getStructureTreeRoot() {
-        if (tagged && structureTreeRoot == null) {
-            structureTreeRoot = new PdfStructureTreeRoot(this);
+    public void setDefaultColorspace(PdfName key, PdfObject cs) {
+        if (cs == null || cs.isNull()) {
+            defaultColorspace.remove(key);
+        }
+        defaultColorspace.put(key, cs);
+    }
+
+    ColorDetails addSimplePatternColorspace(Color color) {
+        int type = ExtendedColor.getType(color);
+        if (type == ExtendedColor.TYPE_PATTERN || type == ExtendedColor.TYPE_SHADING) {
+            throw new RuntimeException(MessageLocalization.getComposedMessage(
+                    "an.uncolored.tile.pattern.can.not.have.another.pattern.or.shading.as.color"));
+        }
+        try {
+            switch (type) {
+                case ExtendedColor.TYPE_RGB:
+                    if (patternColorspaceRGB == null) {
+                        patternColorspaceRGB = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(),
+                                null);
+                        PdfArray array = new PdfArray(PdfName.PATTERN);
+                        array.add(PdfName.DEVICERGB);
+                        addToBody(array, patternColorspaceRGB.getIndirectReference());
+                    }
+                    return patternColorspaceRGB;
+                case ExtendedColor.TYPE_CMYK:
+                    if (patternColorspaceCMYK == null) {
+                        patternColorspaceCMYK = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(),
+                                null);
+                        PdfArray array = new PdfArray(PdfName.PATTERN);
+                        array.add(PdfName.DEVICECMYK);
+                        addToBody(array, patternColorspaceCMYK.getIndirectReference());
+                    }
+                    return patternColorspaceCMYK;
+                case ExtendedColor.TYPE_GRAY:
+                    if (patternColorspaceGRAY == null) {
+                        patternColorspaceGRAY = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(),
+                                null);
+                        PdfArray array = new PdfArray(PdfName.PATTERN);
+                        array.add(PdfName.DEVICEGRAY);
+                        addToBody(array, patternColorspaceGRAY.getIndirectReference());
+                    }
+                    return patternColorspaceGRAY;
+                case ExtendedColor.TYPE_SEPARATION: {
+                    ColorDetails details = addSimple(((SpotColor) color).getPdfSpotColor());
+                    ColorDetails patternDetails = documentSpotPatterns.get(details);
+                    if (patternDetails == null) {
+                        patternDetails = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), null);
+                        PdfArray array = new PdfArray(PdfName.PATTERN);
+                        array.add(details.getIndirectReference());
+                        addToBody(array, patternDetails.getIndirectReference());
+                        documentSpotPatterns.put(details, patternDetails);
+                    }
+                    return patternDetails;
+                }
+                default:
+                    throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.color.type"));
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage());
         }
-        return structureTreeRoot;
     }
 
-//  [F13] Optional Content Groups
-    /**
-     * A hashSet containing all the PdfLayer objects.
-     */
-    protected Set documentOCG = new HashSet<>();
-    /**
-     * An array list used to define the order of an OCG tree.
-     */
-    protected List documentOCGorder = new ArrayList<>();
-    /**
-     * The OCProperties in a catalog dictionary.
-     */
-    protected PdfOCProperties OCProperties;
-    /**
-     * The RBGroups array in an OCG dictionary
-     */
-    protected PdfArray OCGRadioGroup = new PdfArray();
     /**
-     * The locked array in an OCG dictionary
+     * Use this method to get the strictImageSequence status.
      *
-     * @since 2.1.2
+     * @return value of property strictImageSequence
      */
-    protected PdfArray OCGLocked = new PdfArray();
+    public boolean isStrictImageSequence() {
+        return pdf.isStrictImageSequence();
+    }
 
     /**
-     * Use this method to get the Optional Content Properties Dictionary. Each call fills the dictionary with the
-     * current layer state. It's advisable to only call this method right before close and do any modifications at that
-     * time.
+     * Use this method to set the image sequence, so that it follows the text in strict order (or not).
      *
-     * @return the Optional Content Properties Dictionary
+     * @param strictImageSequence new value of property strictImageSequence
      */
-    public PdfOCProperties getOCProperties() {
-        fillOCProperties(true);
-        return OCProperties;
+    public void setStrictImageSequence(boolean strictImageSequence) {
+        pdf.setStrictImageSequence(strictImageSequence);
     }
 
     /**
-     * Use this method to set a collection of optional content groups whose states are intended to follow a "radio
-     * button" paradigm. That is, the state of at most one optional content group in the array should be ON at a time:
-     * if one group is turned ON, all others must be turned OFF.
+     * Use this method to clear text wrapping around images (if applicable).
      *
-     * @param group the radio group
+     * @throws DocumentException on error
      */
-    public void addOCGRadioGroup(List group) {
-        PdfArray ar = new PdfArray();
-        for (PdfLayer layer : group) {
-            if (layer.getTitle() == null) {
-                ar.add(layer.getRef());
-            }
-        }
-        if (ar.isEmpty()) {
-            return;
-        }
-        OCGRadioGroup.add(ar);
+    public void clearTextWrap() throws DocumentException {
+        pdf.clearTextWrap();
     }
 
     /**
-     * Use this method to lock an optional content group. The state of a locked group cannot be changed through the user
-     * interface of a viewer application. Producers can use this entry to prevent the visibility of content that depends
-     * on these groups from being changed by users.
+     * Use this method to adds an image to the document but not to the page resources. It is used with templates and
+     * Document.add(Image). Use this method only if you know what you're doing!
      *
-     * @param layer the layer that needs to be added to the array of locked OCGs
-     * @since 2.1.2
+     * @param image the Image to add
+     * @return the name of the image added
+     * @throws PdfException      on error
+     * @throws DocumentException on error
      */
-    public void lockLayer(PdfLayer layer) {
-        OCGLocked.add(layer.getRef());
-    }
-
-    private static void getOCGOrder(PdfArray order, PdfLayer layer) {
-        if (!layer.isOnPanel()) {
-            return;
-        }
-        if (layer.getTitle() == null) {
-            order.add(layer.getRef());
-        }
-        ArrayList children = layer.getChildren();
-        if (children == null) {
-            return;
-        }
-        PdfArray kids = new PdfArray();
-        if (layer.getTitle() != null) {
-            kids.add(new PdfString(layer.getTitle(), PdfObject.TEXT_UNICODE));
-        }
-        for (PdfLayer child : children) {
-            getOCGOrder(kids, child);
-        }
-        if (!kids.isEmpty()) {
-            order.add(kids);
-        }
-    }
-
-    private void addASEvent(PdfName event, PdfName category) {
-        PdfArray arr = new PdfArray();
-        for (PdfOCG o : documentOCG) {
-            PdfLayer layer = (PdfLayer) o;
-            PdfDictionary usage = layer.getAsDict(PdfName.USAGE);
-            if (usage != null && usage.get(category) != null) {
-                arr.add(layer.getRef());
-            }
-        }
-        if (arr.isEmpty()) {
-            return;
-        }
-        PdfDictionary d = (PdfDictionary) OCProperties.get(PdfName.D);
-        PdfArray arras = (PdfArray) d.get(PdfName.AS);
-        if (arras == null) {
-            arras = new PdfArray();
-            d.put(PdfName.AS, arras);
-        }
-        PdfDictionary as = new PdfDictionary();
-        as.put(PdfName.EVENT, event);
-        as.put(PdfName.CATEGORY, new PdfArray(category));
-        as.put(PdfName.OCGS, arr);
-        arras.add(as);
+    public PdfName addDirectImageSimple(Image image) throws DocumentException {
+        return addDirectImageSimple(image, null);
     }
 
     /**
-     * @param erase true to erase, false otherwise
-     * @since 2.1.2
+     * Adds an image to the document but not to the page resources. It is used with templates and
+     * Document.add(Image). Use this method only if you know what you're doing!
+     *
+     * @param image    the Image to add
+     * @param fixedRef the reference to used. It may be null, a PdfIndirectReference or a
+     *                 PRIndirectReference.
+     * @return the name of the image added
+     * @throws PdfException      on error
+     * @throws DocumentException on error
      */
-    protected void fillOCProperties(boolean erase) {
-        if (OCProperties == null) {
-            OCProperties = new PdfOCProperties();
-        }
-        if (erase) {
-            OCProperties.remove(PdfName.OCGS);
-            OCProperties.remove(PdfName.D);
-        }
-        if (OCProperties.get(PdfName.OCGS) == null) {
-            PdfArray gr = new PdfArray();
-            for (PdfOCG o : documentOCG) {
-                PdfLayer layer = (PdfLayer) o;
-                gr.add(layer.getRef());
-            }
-            OCProperties.put(PdfName.OCGS, gr);
-        }
-        if (OCProperties.get(PdfName.D) != null) {
-            return;
-        }
-
-        List docOrder = documentOCGorder.stream()
-            .filter(pdfOCG -> ((PdfLayer) pdfOCG).getParent() == null)
-            .collect(Collectors.toList());
-
-        PdfArray order = new PdfArray();
-        for (PdfOCG o1 : docOrder) {
-            PdfLayer layer = (PdfLayer) o1;
-            getOCGOrder(order, layer);
-        }
-        PdfDictionary d = new PdfDictionary();
-        OCProperties.put(PdfName.D, d);
-        d.put(PdfName.ORDER, order);
-        PdfArray gr = new PdfArray();
-        for (PdfOCG o : documentOCG) {
-            PdfLayer layer = (PdfLayer) o;
-            if (!layer.isOn()) {
-                gr.add(layer.getRef());
-            }
-        }
-        if (!gr.isEmpty()) {
-            d.put(PdfName.OFF, gr);
-        }
-        if (OCGRadioGroup != null && !OCGRadioGroup.isEmpty()) {
-            d.put(PdfName.RBGROUPS, OCGRadioGroup);
-        }
-        if (OCGLocked != null && !OCGLocked.isEmpty()) {
-            d.put(PdfName.LOCKED, OCGLocked);
+    public PdfName addDirectImageSimple(Image image, PdfIndirectReference fixedRef) throws DocumentException {
+        PdfName name;
+        // if the images is already added, just retrieve the name
+        if (images.containsKey(image.getMySerialId())) {
+            name = images.get(image.getMySerialId());
         }
-        addASEvent(PdfName.VIEW, PdfName.ZOOM);
-        addASEvent(PdfName.VIEW, PdfName.VIEW);
-        addASEvent(PdfName.PRINT, PdfName.PRINT);
-        addASEvent(PdfName.EXPORT, PdfName.EXPORT);
-        d.put(PdfName.LISTMODE, PdfName.VISIBLEPAGES);
-    }
-
-    void registerLayer(PdfOCG layer) {
-        PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_LAYER, null);
-        if (layer instanceof PdfLayer) {
-            PdfLayer la = (PdfLayer) layer;
-            if (la.getTitle() == null) {
-                if (!documentOCG.contains(layer)) {
-                    documentOCG.add(layer);
-                    documentOCGorder.add(layer);
+        // if it's a new image, add it to the document
+        else {
+            if (image.isImgTemplate()) {
+                name = new PdfName("img" + images.size());
+                if (image instanceof ImgWMF) {
+                    try {
+                        ImgWMF wmf = (ImgWMF) image;
+                        wmf.readWMF(PdfTemplate.createTemplate(this, 0, 0));
+                    } catch (Exception e) {
+                        throw new DocumentException(e);
+                    }
                 }
             } else {
-                documentOCGorder.add(layer);
-            }
-        } else {
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("only.pdflayer.is.accepted"));
-        }
-    }
-
-//  User methods to change aspects of the page
-
-//  [U1] page size
-
-    /**
-     * Use this method to get the size of the media box.
-     *
-     * @return a Rectangle
-     */
-    public Rectangle getPageSize() {
-        return pdf.getPageSize();
+                PdfIndirectReference dref = image.getDirectReference();
+                if (dref != null) {
+                    PdfName rname = new PdfName("img" + images.size());
+                    images.put(image.getMySerialId(), rname);
+                    imageDictionary.put(rname, dref);
+                    return rname;
+                }
+                Image maskImage = image.getImageMask();
+                PdfIndirectReference maskRef = null;
+                if (maskImage != null) {
+                    PdfName mname = images.get(maskImage.getMySerialId());
+                    maskRef = getImageReference(mname);
+                }
+                PdfImage i = new PdfImage(image, "img" + images.size(), maskRef);
+                if (image instanceof ImgJBIG2) {
+                    byte[] globals = ((ImgJBIG2) image).getGlobalBytes();
+                    if (globals != null) {
+                        PdfDictionary decodeparms = new PdfDictionary();
+                        decodeparms.put(PdfName.JBIG2GLOBALS, getReferenceJBIG2Globals(globals));
+                        i.put(PdfName.DECODEPARMS, decodeparms);
+                    }
+                }
+                if (image.hasICCProfile()) {
+                    PdfICCBased icc = new PdfICCBased(image.getICCProfile(), image.getCompressionLevel());
+                    PdfIndirectReference iccRef = add(icc);
+                    PdfArray iccArray = new PdfArray();
+                    iccArray.add(PdfName.ICCBASED);
+                    iccArray.add(iccRef);
+                    PdfArray colorspace = i.getAsArray(PdfName.COLORSPACE);
+                    if (colorspace != null) {
+                        if (colorspace.size() > 1 && PdfName.INDEXED.equals(colorspace.getPdfObject(0))) {
+                            colorspace.set(1, iccArray);
+                        } else {
+                            i.put(PdfName.COLORSPACE, iccArray);
+                        }
+                    } else {
+                        i.put(PdfName.COLORSPACE, iccArray);
+                    }
+                }
+                add(i, fixedRef);
+                name = i.name();
+            }
+            images.put(image.getMySerialId(), name);
+        }
+        return name;
     }
 
     /**
-     * Use this method to set the crop box. The crop box should not be rotated even if the page is rotated. This change
-     * only takes effect in the next page.
+     * Writes a PdfImage to the outputstream.
      *
-     * @param crop the crop box
+     * @param pdfImage the image to be added
+     * @return a PdfIndirectReference to the encapsulated image
+     * @throws PdfException when a document isn't open yet, or has been closed
      */
-    public void setCropBoxSize(Rectangle crop) {
-        pdf.setCropBoxSize(crop);
-    }
 
-    /**
-     * Use this method to set the page box sizes. Allowed names are: "crop", "trim", "art" and "bleed".
-     *
-     * @param boxName the box size
-     * @param size    the size
-     */
-    public void setBoxSize(String boxName, Rectangle size) {
-        pdf.setBoxSize(boxName, size);
+    PdfIndirectReference add(PdfImage pdfImage, PdfIndirectReference fixedRef) throws PdfException {
+        if (!imageDictionary.contains(pdfImage.name())) {
+            PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_IMAGE, pdfImage);
+            if (fixedRef instanceof PRIndirectReference) {
+                PRIndirectReference r2 = (PRIndirectReference) fixedRef;
+                fixedRef = new PdfIndirectReference(0,
+                        getNewObjectNumber(r2.getReader(), r2.getNumber(), r2.getGeneration()));
+            }
+            try {
+                if (fixedRef == null) {
+                    fixedRef = addToBody(pdfImage).getIndirectReference();
+                } else {
+                    addToBody(pdfImage, fixedRef);
+                }
+            } catch (IOException ioe) {
+                throw new ExceptionConverter(ioe);
+            }
+            imageDictionary.put(pdfImage.name(), fixedRef);
+            return fixedRef;
+        }
+        return (PdfIndirectReference) imageDictionary.get(pdfImage.name());
     }
 
     /**
-     * Use this method to get the size of a trim, art, crop or bleed box, or null if not defined.
+     * return the PdfIndirectReference to the image with a given name.
      *
-     * @param boxName crop, trim, art or bleed
-     * @return the Rectangle
+     * @param name the name of the image
+     * @return a PdfIndirectReference
      */
-    public Rectangle getBoxSize(String boxName) {
-        return pdf.getBoxSize(boxName);
-    }
 
-//  [U2] take care of empty pages
+    PdfIndirectReference getImageReference(PdfName name) {
+        return (PdfIndirectReference) imageDictionary.get(name);
+    }
 
-    /**
-     * Use this method to make sure a page is added, even if it's empty. If you use setPageEmpty(false), invoking
-     * newPage() after a blank page will add a newPage. setPageEmpty(true) won't have any effect.
-     *
-     * @param pageEmpty the state
-     */
-    public void setPageEmpty(boolean pageEmpty) {
-        if (pageEmpty) {
-            return;
+    protected PdfIndirectReference add(PdfICCBased icc) {
+        PdfIndirectObject object;
+        try {
+            object = addToBody(icc);
+        } catch (IOException ioe) {
+            throw new ExceptionConverter(ioe);
         }
-        pdf.setPageEmpty(pageEmpty);
+        return object.getIndirectReference();
     }
 
     /**
-     * Checks if a newPage() will actually generate a new page.
+     * Gets an indirect reference to a JBIG2 Globals stream. Adds the stream if it hasn't already been added to the
+     * writer.
      *
-     * @return true if a new page will be generated, false otherwise
-     * @since 2.1.8
+     * @param content a byte array that may already been added to the writer inside a stream object.
+     * @return the PdfIndirectReference
+     * @since 2.1.5
      */
-    public boolean isPageEmpty() {
-        return pdf.isPageEmpty();
+    protected PdfIndirectReference getReferenceJBIG2Globals(byte[] content) {
+        if (content == null) {
+            return null;
+        }
+        PdfStream stream;
+        for (PdfStream pdfStream : JBIG2Globals.keySet()) {
+            stream = pdfStream;
+            if (Arrays.equals(content, stream.getBytes())) {
+                return JBIG2Globals.get(stream);
+            }
+        }
+        stream = new PdfStream(content);
+        PdfIndirectObject ref;
+        try {
+            ref = addToBody(stream);
+        } catch (IOException e) {
+            return null;
+        }
+        JBIG2Globals.put(stream, ref.getIndirectReference());
+        return ref.getIndirectReference();
     }
 
-//  [U3] page actions (open and close)
+//  [M4] Old table functionality; do we still need it?
 
     /**
-     * action value
-     */
-    public static final PdfName PAGE_OPEN = PdfName.O;
-    /**
-     * action value
+     * Checks if a Table fits the current page of the PdfDocument.
+     *
+     * @param table  the table that has to be checked
+     * @param margin a certain margin
+     * @return true if the Table fits the page, false otherwise.
      */
-    public static final PdfName PAGE_CLOSE = PdfName.C;
 
-    /**
-     * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setPageAction(com.lowagie.text.pdf.PdfName,
-     * com.lowagie.text.pdf.PdfAction)
-     */
-    public void setPageAction(PdfName actionType, PdfAction action) throws DocumentException {
-        if (!actionType.equals(PAGE_OPEN) && !actionType.equals(PAGE_CLOSE)) {
-            throw new DocumentException(
-                MessageLocalization.getComposedMessage("invalid.page.additional.action.type.1",
-                    actionType.toString()));
-        }
-        pdf.setPageAction(actionType, action);
+    public boolean fitsPage(Table table, float margin) {
+        return pdf.bottom(table) > pdf.indentBottom() + margin;
     }
 
     /**
-     * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setDuration(int)
+     * Checks if a Table fits the current page of the PdfDocument.
+     *
+     * @param table the table that has to be checked
+     * @return true if the Table fits the page, false otherwise.
      */
-    public void setDuration(int seconds) {
-        pdf.setDuration(seconds);
-    }
 
-    /**
-     * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setTransition(com.lowagie.text.pdf.PdfTransition)
-     */
-    public void setTransition(PdfTransition transition) {
-        pdf.setTransition(transition);
+    public boolean fitsPage(Table table) {
+        return fitsPage(table, 0);
     }
-
-//  [U4] Thumbnail image
+//  [F12] tagged PDF
 
     /**
-     * Use this method to set the thumbnail image for the current page.
+     * Gets the flag indicating the presence of structure elements that contain user properties attributes.
      *
-     * @param image the image
-     * @throws PdfException      on error
-     * @throws DocumentException or error
+     * @return the user properties flag
      */
-    public void setThumbnail(Image image) throws DocumentException {
-        pdf.setThumbnail(image);
+    public boolean isUserProperties() {
+        return this.userProperties;
     }
 
-//  [U5] Transparency groups
-
-    /**
-     * A group attributes dictionary specifying the attributes of the page's page group for use in the transparent
-     * imaging model
-     */
-    protected PdfDictionary group;
-
     /**
-     * Use this method to get the group dictionary.
+     * Sets the flag indicating the presence of structure elements that contain user properties attributes.
      *
-     * @return Value of property group.
+     * @param userProperties the user properties flag
      */
-    public PdfDictionary getGroup() {
-        return this.group;
+    public void setUserProperties(boolean userProperties) {
+        this.userProperties = userProperties;
     }
 
     /**
-     * Use this method to set the group dictionary.
+     * Gets the transparency blending colorspace.
      *
-     * @param group New value of property group.
+     * @return true if the transparency blending colorspace is RGB, false
+     * if it is the default blending colorspace
+     * @since 2.1.0
      */
-    public void setGroup(PdfDictionary group) {
-        this.group = group;
+    public boolean isRgbTransparencyBlending() {
+        return this.rgbTransparencyBlending;
     }
 
-//  [U6] space char ratio
-
-    /**
-     * The default space-char ratio.
-     */
-    public static final float SPACE_CHAR_RATIO_DEFAULT = 2.5f;
-    /**
-     * Disable the inter-character spacing.
-     */
-    public static final float NO_SPACE_CHAR_RATIO = 10000000f;
-
-    /**
-     * The ratio between the extra word spacing and the extra character spacing. Extra word spacing will grow
-     * ratio times more than extra character spacing.
-     */
-    private float spaceCharRatio = SPACE_CHAR_RATIO_DEFAULT;
-
     /**
-     * Use this method to gets the space/character extra spacing ratio for fully justified text.
+     * Sets the transparency blending colorspace to RGB. The default blending colorspace is CMYK and will result in
+     * faded colors in the screen and in printing. Calling this method will return the RGB colors to what is expected.
+     * The RGB blending will be applied to all subsequent pages until other value is set. Note that this is a generic
+     * solution that may not work in all cases.
      *
-     * @return the space/character extra spacing ratio
+     * @param rgbTransparencyBlending true to set the transparency blending colorspace to RGB,
+     *                                false
+     *                                to use the default blending colorspace
+     * @since 2.1.0
      */
-    public float getSpaceCharRatio() {
-        return spaceCharRatio;
+    public void setRgbTransparencyBlending(boolean rgbTransparencyBlending) {
+        this.rgbTransparencyBlending = rgbTransparencyBlending;
     }
 
     /**
-     * Use this method to set the ratio between the extra word spacing and the extra character spacing when the text is
-     * fully justified. Extra word spacing will grow spaceCharRatio times more than extra character
-     * spacing. If the ratio is PdfWriter.NO_SPACE_CHAR_RATIO then the extra character spacing will be
-     * zero.
+     * This class generates the structure of a PDF document.
+     * 
            
+     * This class covers the third section of Chapter 5 in the 'Portable Document Format Reference Manual version 1.3'
+     * (page 55-60). It contains the body of a PDF document (section 5.14) and it can also generate a Cross-reference
+     * Table (section 5.15).
      *
-     * @param spaceCharRatio the ratio between the extra word spacing and the extra character spacing
+     * @see PdfWriter
+     * @see PdfObject
+     * @see PdfIndirectObject
      */
-    public void setSpaceCharRatio(float spaceCharRatio) {
-        this.spaceCharRatio = Math.max(spaceCharRatio, 0.001f);
-    }
+    public static class PdfBody {
 
-//  [U7] run direction (doesn't actually do anything)
+        private static final int OBJSINSTREAM = 200;
+
+        // membervariables
+
+        /**
+         * array containing the cross-reference table of the normal objects.
+         */
+        private final TreeSet xrefs;
+        private final PdfWriter writer;
+        private int refnum;
+        /**
+         * the current byte position in the body.
+         */
+        private long position;
+        private ByteBuffer index;
+        private ByteBuffer streamObjects;
+        private int currentObjNum;
+        private int numObj = 0;
+
+        // constructors
+
+        /**
+         * Constructs a new PdfBody.
+         *
+         * @param writer
+         */
+        PdfBody(PdfWriter writer) {
+            xrefs = new TreeSet<>();
+            xrefs.add(new PdfCrossReference(0, 0, GENERATION_MAX));
+            position = writer.getOs().getCounter();
+            refnum = 1;
+            this.writer = writer;
+        }
 
-    /**
-     * Use the default run direction.
-     */
-    public static final int RUN_DIRECTION_DEFAULT = 0;
-    /**
-     * Do not use bidirectional reordering.
-     */
-    public static final int RUN_DIRECTION_NO_BIDI = 1;
+        // methods
 
-    /**
-     * Use bidirectional reordering with left-to-right preferential run direction.
-     */
-    public static final int RUN_DIRECTION_LTR = 2;
-    /**
-     * Use bidirectional reordering with right-to-left preferential run direction.
-     */
-    public static final int RUN_DIRECTION_RTL = 3;
+        void setRefnum(int refnum) {
+            this.refnum = refnum;
+        }
 
-    protected int runDirection = RUN_DIRECTION_NO_BIDI;
+        private PdfWriter.PdfBody.PdfCrossReference addToObjStm(PdfObject obj, int nObj) throws IOException {
+            if (numObj >= OBJSINSTREAM) {
+                flushObjStm();
+            }
+            if (index == null) {
+                index = new ByteBuffer();
+                streamObjects = new ByteBuffer();
+                currentObjNum = getIndirectReferenceNumber();
+                numObj = 0;
+            }
+            int p = streamObjects.size();
+            int idx = numObj++;
+            PdfEncryption enc = writer.crypto;
+            writer.crypto = null;
+            obj.toPdf(writer, streamObjects);
+            writer.crypto = enc;
+            streamObjects.append(' ');
+            index.append(nObj).append(' ').append(p).append(' ');
+            return new PdfWriter.PdfBody.PdfCrossReference(2, nObj, currentObjNum, idx);
+        }
 
-    /**
-     * Use this method to set the run direction. This is only used as a placeholder as it does not affect anything.
-     *
-     * @param runDirection the run direction
-     */
-    public void setRunDirection(int runDirection) {
-        if (runDirection < RUN_DIRECTION_NO_BIDI || runDirection > RUN_DIRECTION_RTL) {
-            throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.run.direction.1", runDirection));
+        private void flushObjStm() throws IOException {
+            if (numObj == 0) {
+                return;
+            }
+            int first = index.size();
+            index.append(streamObjects);
+            PdfStream stream = new PdfStream(index.toByteArray());
+            stream.flateCompress(writer.getCompressionLevel());
+            stream.put(PdfName.TYPE, PdfName.OBJSTM);
+            stream.put(PdfName.N, new PdfNumber(numObj));
+            stream.put(PdfName.FIRST, new PdfNumber(first));
+            add(stream, currentObjNum);
+            index = null;
+            streamObjects = null;
+            numObj = 0;
         }
-        this.runDirection = runDirection;
-    }
 
-    /**
-     * Use this method to set the run direction.
-     *
-     * @return the run direction
-     */
-    public int getRunDirection() {
-        return runDirection;
-    }
+        /**
+         * Adds a PdfObject to the body.
+         * 
            
+         * This methods creates a PdfIndirectObject with a certain number, containing the given
+         * PdfObject. It also adds a PdfCrossReference for this object to an
+         * ArrayList that will be used to build the Cross-reference Table.
+         *
+         * @param object a PdfObject
+         * @return a PdfIndirectObject
+         * @throws IOException
+         */
+        PdfIndirectObject add(PdfObject object) throws IOException {
+            return add(object, getIndirectReferenceNumber());
+        }
 
-//  [U8] user units
+        PdfIndirectObject add(PdfObject object, boolean inObjStm) throws IOException {
+            return add(object, getIndirectReferenceNumber(), inObjStm);
+        }
 
-    protected float userunit = 0f;
+        /**
+         * Gets a PdfIndirectReference for an object that will be created in the future.
+         *
+         * @return a PdfIndirectReference
+         */
+        PdfIndirectReference getPdfIndirectReference() {
+            return new PdfIndirectReference(0, getIndirectReferenceNumber());
+        }
 
-    /**
-     * Use this method to get the user unit. A user unit is a value that defines the default user space unit. The
-     * minimum UserUnit is 1 (1 unit = 1/72 inch). The maximum UserUnit is 75,000. Note that this userunit only works
-     * starting with PDF1.6!
-     *
-     * @return Returns the userunit.
-     */
-    public float getUserunit() {
-        return userunit;
-    }
+        int getIndirectReferenceNumber() {
+            int n = refnum++;
+            xrefs.add(new PdfCrossReference(n, 0, GENERATION_MAX));
+            return n;
+        }
 
-    /**
-     * Use this method to set the user unit. A UserUnit is a value that defines the default user space unit. The minimum
-     * UserUnit is 1 (1 unit = 1/72 inch). The maximum UserUnit is 75,000. Note that this userunit only works starting
-     * with PDF1.6!
-     *
-     * @param userunit The userunit to set.
-     * @throws DocumentException on error
-     */
-    public void setUserunit(float userunit) throws DocumentException {
-        if (userunit < 1f || userunit > 75000f) {
-            throw new DocumentException(
-                MessageLocalization.getComposedMessage("userunit.should.be.a.value.between.1.and.75000"));
+        /**
+         * Adds a PdfObject to the body given an already existing PdfIndirectReference.
+         * 
            
+         * This methods creates a PdfIndirectObject with the number given by
+         * ref, containing the given PdfObject.
+         * It also adds a PdfCrossReference for this object to an ArrayList that will be used
+         * to build the Cross-reference Table.
+         *
+         * @param object a PdfObject
+         * @param ref    a PdfIndirectReference
+         * @return a PdfIndirectObject
+         * @throws IOException
+         */
+        PdfIndirectObject add(PdfObject object, PdfIndirectReference ref) throws IOException {
+            return add(object, ref.getNumber());
         }
-        this.userunit = userunit;
-        setAtLeastPdfVersion(VERSION_1_6);
-    }
 
-// Miscellaneous topics
+        PdfIndirectObject add(PdfObject object, PdfIndirectReference ref, boolean inObjStm) throws IOException {
+            return add(object, ref.getNumber(), inObjStm);
+        }
 
-//  [M1] Color settings
+        PdfIndirectObject add(PdfObject object, int refNumber) throws IOException {
+            return add(object, refNumber, true); // to false
+        }
 
-    protected PdfDictionary defaultColorspace = new PdfDictionary();
+        PdfIndirectObject add(PdfObject object, int refNumber, boolean inObjStm) throws IOException {
+            if (inObjStm && object.canBeInObjStm() && writer.isFullCompression()) {
+                PdfCrossReference pxref = addToObjStm(object, refNumber);
+                PdfIndirectObject indirect = new PdfIndirectObject(refNumber, object, writer);
+                if (!xrefs.add(pxref)) {
+                    xrefs.remove(pxref);
+                    xrefs.add(pxref);
+                }
+                return indirect;
+            } else {
+                PdfIndirectObject indirect = new PdfIndirectObject(refNumber, object, writer);
+                PdfCrossReference pxref = new PdfCrossReference(refNumber, position);
+                if (!xrefs.add(pxref)) {
+                    xrefs.remove(pxref);
+                    xrefs.add(pxref);
+                }
+                indirect.writeTo(writer.getOs());
+                position = writer.getOs().getCounter();
+                return indirect;
+            }
+        }
 
-    /**
-     * Use this method to get the default colorspaces.
-     *
-     * @return the default colorspaces
-     */
-    public PdfDictionary getDefaultColorspace() {
-        return defaultColorspace;
-    }
+        /**
+         * Returns the offset of the Cross-Reference table.
+         *
+         * @return an offset
+         */
+        long offset() {
+            return position;
+        }
 
-    /**
-     * Use this method to sets the default colorspace that will be applied to all the document. The colorspace is only
-     * applied if another colorspace with the same name is not present in the content.
-     * 
            
-     * The colorspace is applied immediately when creating templates and at the page end for the main document content.
-     *
-     * @param key the name of the colorspace. It can be PdfName.DEFAULTGRAY,
-     *            PdfName.DEFAULTRGB or PdfName.DEFAULTCMYK
-     * @param cs  the colorspace. A null or PdfNull removes any colorspace with the same name
-     */
-    public void setDefaultColorspace(PdfName key, PdfObject cs) {
-        if (cs == null || cs.isNull()) {
-            defaultColorspace.remove(key);
+        /**
+         * Returns the total number of objects contained in the CrossReferenceTable of this Body.
+         *
+         * @return a number of objects
+         */
+        int size() {
+            return Math.max((xrefs.last()).getRefnum() + 1, refnum);
         }
-        defaultColorspace.put(key, cs);
-    }
 
-//  [M2] spot patterns
+        /**
+         * Returns the CrossReferenceTable of the Body.
+         *
+         * @param os
+         * @param root
+         * @param info
+         * @param encryption
+         * @param fileID
+         * @param prevxref
+         * @throws IOException
+         */
 
-    protected HashMap documentSpotPatterns = new HashMap<>();
-    protected ColorDetails patternColorspaceRGB;
-    protected ColorDetails patternColorspaceGRAY;
-    protected ColorDetails patternColorspaceCMYK;
+        void writeCrossReferenceTable(OutputStream os, PdfIndirectReference root, PdfIndirectReference info,
+                PdfIndirectReference encryption, PdfObject fileID, int prevxref) throws IOException {
+            int refNumber = 0;
+            // Old-style xref tables limit object offsets to 10 digits
+            boolean useNewXrefFormat = writer.isFullCompression() || position > 9_999_999_999L;
+            if (useNewXrefFormat) {
+                flushObjStm();
+                refNumber = getIndirectReferenceNumber();
+                xrefs.add(new PdfCrossReference(refNumber, position));
+            }
+            PdfCrossReference entry = xrefs.first();
+            int first = entry.getRefnum();
+            int len = 0;
+            ArrayList sections = new ArrayList<>();
+            for (PdfCrossReference xref1 : xrefs) {
+                entry = xref1;
+                if (first + len == entry.getRefnum()) {
+                    ++len;
+                } else {
+                    sections.add(first);
+                    sections.add(len);
+                    first = entry.getRefnum();
+                    len = 1;
+                }
+            }
+            sections.add(first);
+            sections.add(len);
+            PdfTrailer trailer = new PdfTrailer(size(), root, info, encryption, fileID, prevxref);
+            if (useNewXrefFormat) {
+                int mid = 8 - (Long.numberOfLeadingZeros(position) >> 3);
+                ByteBuffer buf = new ByteBuffer();
 
-    ColorDetails addSimplePatternColorspace(Color color) {
-        int type = ExtendedColor.getType(color);
-        if (type == ExtendedColor.TYPE_PATTERN || type == ExtendedColor.TYPE_SHADING) {
-            throw new RuntimeException(MessageLocalization.getComposedMessage(
-                "an.uncolored.tile.pattern.can.not.have.another.pattern.or.shading.as.color"));
-        }
-        try {
-            switch (type) {
-                case ExtendedColor.TYPE_RGB:
-                    if (patternColorspaceRGB == null) {
-                        patternColorspaceRGB = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(),
-                            null);
-                        PdfArray array = new PdfArray(PdfName.PATTERN);
-                        array.add(PdfName.DEVICERGB);
-                        addToBody(array, patternColorspaceRGB.getIndirectReference());
-                    }
-                    return patternColorspaceRGB;
-                case ExtendedColor.TYPE_CMYK:
-                    if (patternColorspaceCMYK == null) {
-                        patternColorspaceCMYK = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(),
-                            null);
-                        PdfArray array = new PdfArray(PdfName.PATTERN);
-                        array.add(PdfName.DEVICECMYK);
-                        addToBody(array, patternColorspaceCMYK.getIndirectReference());
-                    }
-                    return patternColorspaceCMYK;
-                case ExtendedColor.TYPE_GRAY:
-                    if (patternColorspaceGRAY == null) {
-                        patternColorspaceGRAY = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(),
-                            null);
-                        PdfArray array = new PdfArray(PdfName.PATTERN);
-                        array.add(PdfName.DEVICEGRAY);
-                        addToBody(array, patternColorspaceGRAY.getIndirectReference());
-                    }
-                    return patternColorspaceGRAY;
-                case ExtendedColor.TYPE_SEPARATION: {
-                    ColorDetails details = addSimple(((SpotColor) color).getPdfSpotColor());
-                    ColorDetails patternDetails = documentSpotPatterns.get(details);
-                    if (patternDetails == null) {
-                        patternDetails = new ColorDetails(getColorspaceName(), body.getPdfIndirectReference(), null);
-                        PdfArray array = new PdfArray(PdfName.PATTERN);
-                        array.add(details.getIndirectReference());
-                        addToBody(array, patternDetails.getIndirectReference());
-                        documentSpotPatterns.put(details, patternDetails);
+                for (PdfCrossReference xref : xrefs) {
+                    entry = xref;
+                    entry.toPdf(mid, buf);
+                }
+                PdfStream xr = new PdfStream(buf.toByteArray());
+                xr.flateCompress(writer.getCompressionLevel());
+                xr.putAll(trailer);
+                xr.put(PdfName.W, new PdfArray(new int[]{1, mid, 2}));
+                xr.put(PdfName.TYPE, PdfName.XREF);
+                PdfArray idx = new PdfArray();
+                for (Integer section : sections) {
+                    idx.add(new PdfNumber(section));
+                }
+                xr.put(PdfName.INDEX, idx);
+                PdfEncryption enc = writer.crypto;
+                writer.crypto = null;
+                PdfIndirectObject indirect = new PdfIndirectObject(refNumber, xr, writer);
+                indirect.writeTo(writer.getOs());
+                writer.crypto = enc;
+            } else {
+                os.write(getISOBytes("xref\n"));
+                Iterator i = xrefs.iterator();
+                for (int k = 0; k < sections.size(); k += 2) {
+                    first = sections.get(k);
+                    len = sections.get(k + 1);
+                    os.write(getISOBytes(String.valueOf(first)));
+                    os.write(getISOBytes(" "));
+                    os.write(getISOBytes(String.valueOf(len)));
+                    os.write('\n');
+                    while (len-- > 0) {
+                        entry = i.next();
+                        entry.toPdf(os);
                     }
-                    return patternDetails;
                 }
-                default:
-                    throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.color.type"));
+                // make the trailer
+                trailer.toPdf(writer, os);
             }
-        } catch (Exception e) {
-            throw new RuntimeException(e.getMessage());
         }
-    }
 
-//  [M3] Images
+        // inner classes
 
-    /**
-     * Use this method to get the strictImageSequence status.
-     *
-     * @return value of property strictImageSequence
-     */
-    public boolean isStrictImageSequence() {
-        return pdf.isStrictImageSequence();
-    }
+        /**
+         * PdfCrossReference is an entry in the PDF Cross-Reference table.
+         */
+        public static class PdfCrossReference implements Comparable {
 
-    /**
-     * Use this method to set the image sequence, so that it follows the text in strict order (or not).
-     *
-     * @param strictImageSequence new value of property strictImageSequence
-     */
-    public void setStrictImageSequence(boolean strictImageSequence) {
-        pdf.setStrictImageSequence(strictImageSequence);
-    }
+            /**
+             * String template for cross-reference entry PDF representation.
+             *
+             * @see Formatter
+             */
+            private static final String CROSS_REFERENCE_ENTRY_FORMAT = "%010d %05d %c \n";
 
-    /**
-     * Use this method to clear text wrapping around images (if applicable).
-     *
-     * @throws DocumentException on error
-     */
-    public void clearTextWrap() throws DocumentException {
-        pdf.clearTextWrap();
-    }
+            // membervariables
+            private final int type;
 
-    /**
-     * Dictionary, containing all the images of the PDF document
-     */
-    protected PdfDictionary imageDictionary = new PdfDictionary();
+            /**
+             * Byte offset in the PDF file.
+             */
+            private final long offset;
 
-    /**
-     * This is the list with all the images in the document.
-     */
-    private final HashMap images = new HashMap<>();
+            private final int refnum;
+            /**
+             * generation of the object.
+             */
+            private final int generation;
 
-    /**
-     * Use this method to adds an image to the document but not to the page resources. It is used with templates and
-     * Document.add(Image). Use this method only if you know what you're doing!
-     *
-     * @param image the Image to add
-     * @return the name of the image added
-     * @throws PdfException      on error
-     * @throws DocumentException on error
-     */
-    public PdfName addDirectImageSimple(Image image) throws DocumentException {
-        return addDirectImageSimple(image, null);
-    }
+            // constructors
 
-    /**
-     * Adds an image to the document but not to the page resources. It is used with templates and
-     * Document.add(Image). Use this method only if you know what you're doing!
-     *
-     * @param image    the Image to add
-     * @param fixedRef the reference to used. It may be null, a PdfIndirectReference or a
-     *                 PRIndirectReference.
-     * @return the name of the image added
-     * @throws PdfException      on error
-     * @throws DocumentException on error
-     */
-    public PdfName addDirectImageSimple(Image image, PdfIndirectReference fixedRef) throws DocumentException {
-        PdfName name;
-        // if the images is already added, just retrieve the name
-        if (images.containsKey(image.getMySerialId())) {
-            name = images.get(image.getMySerialId());
-        }
-        // if it's a new image, add it to the document
-        else {
-            if (image.isImgTemplate()) {
-                name = new PdfName("img" + images.size());
-                if (image instanceof ImgWMF) {
-                    try {
-                        ImgWMF wmf = (ImgWMF) image;
-                        wmf.readWMF(PdfTemplate.createTemplate(this, 0, 0));
-                    } catch (Exception e) {
-                        throw new DocumentException(e);
-                    }
-                }
-            } else {
-                PdfIndirectReference dref = image.getDirectReference();
-                if (dref != null) {
-                    PdfName rname = new PdfName("img" + images.size());
-                    images.put(image.getMySerialId(), rname);
-                    imageDictionary.put(rname, dref);
-                    return rname;
-                }
-                Image maskImage = image.getImageMask();
-                PdfIndirectReference maskRef = null;
-                if (maskImage != null) {
-                    PdfName mname = images.get(maskImage.getMySerialId());
-                    maskRef = getImageReference(mname);
-                }
-                PdfImage i = new PdfImage(image, "img" + images.size(), maskRef);
-                if (image instanceof ImgJBIG2) {
-                    byte[] globals = ((ImgJBIG2) image).getGlobalBytes();
-                    if (globals != null) {
-                        PdfDictionary decodeparms = new PdfDictionary();
-                        decodeparms.put(PdfName.JBIG2GLOBALS, getReferenceJBIG2Globals(globals));
-                        i.put(PdfName.DECODEPARMS, decodeparms);
-                    }
-                }
-                if (image.hasICCProfile()) {
-                    PdfICCBased icc = new PdfICCBased(image.getICCProfile(), image.getCompressionLevel());
-                    PdfIndirectReference iccRef = add(icc);
-                    PdfArray iccArray = new PdfArray();
-                    iccArray.add(PdfName.ICCBASED);
-                    iccArray.add(iccRef);
-                    PdfArray colorspace = i.getAsArray(PdfName.COLORSPACE);
-                    if (colorspace != null) {
-                        if (colorspace.size() > 1 && PdfName.INDEXED.equals(colorspace.getPdfObject(0))) {
-                            colorspace.set(1, iccArray);
-                        } else {
-                            i.put(PdfName.COLORSPACE, iccArray);
-                        }
-                    } else {
-                        i.put(PdfName.COLORSPACE, iccArray);
-                    }
-                }
-                add(i, fixedRef);
-                name = i.name();
+            /**
+             * Constructs a cross-reference element for a PdfIndirectObject.
+             *
+             * @param refnum     the reference number
+             * @param offset     byte offset of the object
+             * @param generation generation number of the object
+             */
+            public PdfCrossReference(int refnum, long offset, int generation) {
+                type = 0;
+                this.offset = offset;
+                this.refnum = refnum;
+                this.generation = generation;
+            }
+
+            /**
+             * Constructs a cross-reference element for a PdfIndirectObject.
+             *
+             * @param refnum the reference number
+             * @param offset byte offset of the object
+             */
+            public PdfCrossReference(int refnum, long offset) {
+                type = 1;
+                this.offset = offset;
+                this.refnum = refnum;
+                this.generation = 0;
             }
-            images.put(image.getMySerialId(), name);
-        }
-        return name;
-    }
-
-    /**
-     * Writes a PdfImage to the outputstream.
-     *
-     * @param pdfImage the image to be added
-     * @return a PdfIndirectReference to the encapsulated image
-     * @throws PdfException when a document isn't open yet, or has been closed
-     */
 
-    PdfIndirectReference add(PdfImage pdfImage, PdfIndirectReference fixedRef) throws PdfException {
-        if (!imageDictionary.contains(pdfImage.name())) {
-            PdfXConformanceImp.checkPDFXConformance(this, PdfXConformanceImp.PDFXKEY_IMAGE, pdfImage);
-            if (fixedRef instanceof PRIndirectReference) {
-                PRIndirectReference r2 = (PRIndirectReference) fixedRef;
-                fixedRef = new PdfIndirectReference(0,
-                    getNewObjectNumber(r2.getReader(), r2.getNumber(), r2.getGeneration()));
+            public PdfCrossReference(int type, int refnum, long offset, int generation) {
+                this.type = type;
+                this.offset = offset;
+                this.refnum = refnum;
+                this.generation = generation;
             }
-            try {
-                if (fixedRef == null) {
-                    fixedRef = addToBody(pdfImage).getIndirectReference();
-                } else {
-                    addToBody(pdfImage, fixedRef);
-                }
-            } catch (IOException ioe) {
-                throw new ExceptionConverter(ioe);
+
+            int getRefnum() {
+                return refnum;
             }
-            imageDictionary.put(pdfImage.name(), fixedRef);
-            return fixedRef;
-        }
-        return (PdfIndirectReference) imageDictionary.get(pdfImage.name());
-    }
 
-    /**
-     * return the PdfIndirectReference to the image with a given name.
-     *
-     * @param name the name of the image
-     * @return a PdfIndirectReference
-     */
+            /**
+             * Writes PDF representation of cross-reference entry to passed output stream.
+             *
+             * @param os Output stream this entry to write to
+             * @throws IOException If any I/O error occurs
+             */
+            public void toPdf(OutputStream os) throws IOException {
+                // TODO: are generation number and 'In use' keyword bound that way?
+                final char inUse = generation == GENERATION_MAX ? 'f' : 'n';
+                os.write(getISOBytes(String.format(CROSS_REFERENCE_ENTRY_FORMAT, offset, generation, inUse)));
+            }
 
-    PdfIndirectReference getImageReference(PdfName name) {
-        return (PdfIndirectReference) imageDictionary.get(name);
-    }
+            /**
+             * Writes PDF syntax to the OutputStream
+             *
+             * @param midSize the mid size
+             * @param os      the OutputStream
+             * @throws IOException on error
+             */
+            public void toPdf(int midSize, OutputStream os) throws IOException {
+                os.write((byte) type);
+                int thisMidSize = midSize;
+                while (--thisMidSize >= 0) {
+                    os.write((byte) ((offset >>> (8 * thisMidSize)) & 0xff));
+                }
+                os.write((byte) ((generation >>> 8) & 0xff));
+                os.write((byte) (generation & 0xff));
+            }
 
-    protected PdfIndirectReference add(PdfICCBased icc) {
-        PdfIndirectObject object;
-        try {
-            object = addToBody(icc);
-        } catch (IOException ioe) {
-            throw new ExceptionConverter(ioe);
-        }
-        return object.getIndirectReference();
-    }
+            /**
+             * Compares current {@link PdfCrossReference entry} with passed {@code reference} by PDF object number.
+             */
+            @Override
+            public int compareTo(final PdfCrossReference reference) {
+                return Integer.compare(refnum, reference.refnum);
+            }
 
-    /**
-     * A HashSet with Stream objects containing JBIG2 Globals
-     *
-     * @since 2.1.5
-     */
-    protected HashMap JBIG2Globals = new HashMap<>();
+            /**
+             * Checks if two entries are equal if their PDF object numbers are equal.
+             *
+             * @param obj Another cross-reference entry
+             * @return If null, not of type {@link PdfCrossReference} or object numbers are not equal, returns false;
+             * true otherwise
+             */
+            @Override
+            public boolean equals(Object obj) {
+                if (!(obj instanceof PdfCrossReference)) {
+                    return false;
+                }
+                PdfCrossReference other = (PdfCrossReference) obj;
+                return refnum == other.refnum;
+            }
 
-    /**
-     * Gets an indirect reference to a JBIG2 Globals stream. Adds the stream if it hasn't already been added to the
-     * writer.
-     *
-     * @param content a byte array that may already been added to the writer inside a stream object.
-     * @return the PdfIndirectReference
-     * @since 2.1.5
-     */
-    protected PdfIndirectReference getReferenceJBIG2Globals(byte[] content) {
-        if (content == null) {
-            return null;
-        }
-        PdfStream stream;
-        for (PdfStream pdfStream : JBIG2Globals.keySet()) {
-            stream = pdfStream;
-            if (Arrays.equals(content, stream.getBytes())) {
-                return JBIG2Globals.get(stream);
+            @Override
+            public int hashCode() {
+                return refnum;
             }
         }
-        stream = new PdfStream(content);
-        PdfIndirectObject ref;
-        try {
-            ref = addToBody(stream);
-        } catch (IOException e) {
-            return null;
-        }
-        JBIG2Globals.put(stream, ref.getIndirectReference());
-        return ref.getIndirectReference();
-    }
-
-//  [M4] Old table functionality; do we still need it?
-
-    /**
-     * Checks if a Table fits the current page of the PdfDocument.
-     *
-     * @param table  the table that has to be checked
-     * @param margin a certain margin
-     * @return true if the Table fits the page, false otherwise.
-     */
-
-    public boolean fitsPage(Table table, float margin) {
-        return pdf.bottom(table) > pdf.indentBottom() + margin;
     }
 
     /**
-     * Checks if a Table fits the current page of the PdfDocument.
-     *
-     * @param table the table that has to be checked
-     * @return true if the Table fits the page, false otherwise.
-     */
-
-    public boolean fitsPage(Table table) {
-        return fitsPage(table, 0);
-    }
-//  [F12] tagged PDF
-    /**
-     * A flag indicating the presence of structure elements that contain user properties attributes.
+     * PdfTrailer is the PDF Trailer object.
+     * 
            
+     * This object is described in the 'Portable Document Format Reference Manual version 1.3' section 5.16 (page
+     * 59-60).
      */
-    private boolean userProperties;
 
-    /**
-     * Gets the flag indicating the presence of structure elements that contain user properties attributes.
-     *
-     * @return the user properties flag
-     */
-    public boolean isUserProperties() {
-        return this.userProperties;
-    }
+    static class PdfTrailer extends PdfDictionary {
 
-    /**
-     * Sets the flag indicating the presence of structure elements that contain user properties attributes.
-     *
-     * @param userProperties the user properties flag
-     */
-    public void setUserProperties(boolean userProperties) {
-        this.userProperties = userProperties;
-    }
+        // constructors
 
-    /**
-     * Holds value of property RGBTranparency.
-     */
-    private boolean rgbTransparencyBlending;
+        /**
+         * Constructs a PDF-Trailer.
+         *
+         * @param size       the number of entries in the PdfCrossReferenceTable
+         * @param root       an indirect reference to the root of the PDF document
+         * @param info       an indirect reference to the info object of the PDF document
+         * @param encryption
+         * @param fileID
+         * @param prevxref
+         */
 
-    /**
-     * Gets the transparency blending colorspace.
-     *
-     * @return true if the transparency blending colorspace is RGB, false
-     * if it is the default blending colorspace
-     * @since 2.1.0
-     */
-    public boolean isRgbTransparencyBlending() {
-        return this.rgbTransparencyBlending;
-    }
+        PdfTrailer(int size, PdfIndirectReference root, PdfIndirectReference info, PdfIndirectReference encryption,
+                PdfObject fileID, int prevxref) {
+            put(PdfName.SIZE, new PdfNumber(size));
+            put(PdfName.ROOT, root);
+            if (info != null) {
+                put(PdfName.INFO, info);
+            }
+            if (encryption != null) {
+                put(PdfName.ENCRYPT, encryption);
+            }
+            if (fileID != null) {
+                put(PdfName.ID, fileID);
+            }
+            if (prevxref > 0) {
+                put(PdfName.PREV, new PdfNumber(prevxref));
+            }
+        }
 
-    /**
-     * Sets the transparency blending colorspace to RGB. The default blending colorspace is CMYK and will result in
-     * faded colors in the screen and in printing. Calling this method will return the RGB colors to what is expected.
-     * The RGB blending will be applied to all subsequent pages until other value is set. Note that this is a generic
-     * solution that may not work in all cases.
-     *
-     * @param rgbTransparencyBlending true to set the transparency blending colorspace to RGB,
-     *                                false
-     *                                to use the default blending colorspace
-     * @since 2.1.0
-     */
-    public void setRgbTransparencyBlending(boolean rgbTransparencyBlending) {
-        this.rgbTransparencyBlending = rgbTransparencyBlending;
+        /**
+         * Returns the PDF representation of this PdfObject.
+         *
+         * @param writer
+         * @param os
+         * @throws IOException
+         */
+        @Override
+        public void toPdf(PdfWriter writer, OutputStream os) throws IOException {
+            os.write(getISOBytes("trailer\n"));
+            super.toPdf(null, os);
+            os.write('\n');
+        }
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfXConformanceException.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfXConformanceException.java
index 920162735..916018dd3 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfXConformanceException.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfXConformanceException.java
@@ -50,22 +50,25 @@
 package com.lowagie.text.pdf;
 
 /**
- *
- * @author  psoares
+ * @author psoares
  */
 public class PdfXConformanceException extends RuntimeException {
-    
+
     private static final long serialVersionUID = 9199144538884293397L;
 
-    /** Creates a new instance of PdfXConformanceException. */
+    /**
+     * Creates a new instance of PdfXConformanceException.
+     */
     public PdfXConformanceException() {
     }
-    
+
     /**
      * Creates a new instance of PdfXConformanceException.
-     * @param s the detail message. The detail message is saved for later retrieval by the Throwable.getMessage() method.
+     *
+     * @param s the detail message. The detail message is saved for later retrieval by the Throwable.getMessage()
+     *          method.
      */
     public PdfXConformanceException(String s) {
         super(s);
-    }    
+    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/Pfm2afm.java b/openpdf/src/main/java/com/lowagie/text/pdf/Pfm2afm.java
index 77d5424b8..f388c3ad0 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/Pfm2afm.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/Pfm2afm.java
@@ -98,7 +98,7 @@
  *  Compiled with Watcom C 10.6                                     *
  *                                                                  *
  ********************************************************************/
- 
+
 /********************************************************************
  *                                                                  *
  *  Further modifications, 4/21/98, by Rod Smith                    *
@@ -140,6 +140,7 @@
  ********************************************************************/
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -148,361 +149,59 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 
-import com.lowagie.text.error_messages.MessageLocalization;
-
 /**
  * Converts a PFM file into an AFM file.
  */
 public final class Pfm2afm {
+
     private RandomAccessFileOrArray in;
     private PrintWriter out;
-    
-    /** Creates a new instance of Pfm2afm */
-    private Pfm2afm(RandomAccessFileOrArray in, OutputStream out) throws IOException {
-        this.in = in;
-        this.out = new PrintWriter(new OutputStreamWriter(out, StandardCharsets.ISO_8859_1));
-    }
-    
-    /**
-     * Converts a PFM file into an AFM file.
-     * @param in the PFM file
-     * @param out the AFM file
-     * @throws IOException on error
-     */    
-    public static void convert(RandomAccessFileOrArray in, OutputStream out) throws IOException {
-        Pfm2afm p = new Pfm2afm(in, out);
-        p.openpfm();
-        p.putheader();
-        p.putchartab();
-        p.putkerntab();
-        p.puttrailer();
-        p.out.flush();
-    }
-    
-    public static void main(String[] args) {
-        try {
-            RandomAccessFileOrArray in = new RandomAccessFileOrArray(args[0]);
-            OutputStream out = new FileOutputStream(args[1]);
-            convert(in, out);
-            in.close();
-            out.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    private String readString(int n) throws IOException {
-        byte[] b = new byte[n];
-        in.readFully(b);
-        int k;
-        for (k = 0; k < b.length; ++k) {
-            if (b[k] == 0)
-                break;
-        }
-        return new String(b, 0, k, StandardCharsets.ISO_8859_1);
-    }
-    
-    private String readString() throws IOException {
-        StringBuilder buf = new StringBuilder();
-        while (true) {
-            int c = in.read();
-            if (c <= 0)
-                break;
-            buf.append((char)c);
-        }
-        return buf.toString();
-    }
-    
-    private void outval(int n) {
-        out.print(' ');
-        out.print(n);
-    }
-    
+    private short vers;
+    private int h_len;             /* Total length of .pfm file */
+    private String copyright;   /* Copyright string [60]*/
+    private short type;
+    private short points;
+    private short verres;
+    private short horres;
+    private short ascent;
+    private short intleading;
+    private short extleading;
+    private byte italic;
+    private byte uline;
+    private byte overs;
+    private short weight;
+    private byte charset;         /* 0=windows, otherwise nomap */
+    private short pixwidth;        /* Width for mono fonts */
+    private short pixheight;
+    private byte kind;            /* Lower bit off in mono */
+    private short avgwidth;        /* Mono if avg=max width */
+    private short maxwidth;        /* Use to compute bounding box */
+    private int firstchar;       /* First char in table */
+    private int lastchar;        /* Last char in table */
+    private byte defchar;
+    private byte brkchar;
+    private short widthby;
+    private int device;
+    private int face;            /* Face name */
+    private int bits;
+    private int bitoff;
+    private short extlen;
+    private int psext;           /* PostScript extension */
+    private int chartab;         /* Character width tables */
+    private int res1;
+    private int kernpairs;       /* Kerning pairs */
+    private int res2;
+    private int fontname;        /* Font name */
     /*
-     *  Output a character entry
+     *  Some metrics from the PostScript extension
      */
-    private void  outchar(int code, int width, String name) {
-        out.print("C ");
-        outval(code);
-        out.print(" ; WX ");
-        outval(width);
-        if (name != null) {
-            out.print(" ; N ");
-            out.print(name);
-        }
-        out.print(" ;\n");
-    }
-    
-    private void openpfm() throws IOException {
-        in.seek(0);
-        vers = in.readShortLE();
-        h_len = in.readIntLE();
-        copyright = readString(60);
-        type = in.readShortLE();
-        points = in.readShortLE();
-        verres = in.readShortLE();
-        horres = in.readShortLE();
-        ascent = in.readShortLE();
-        intleading = in.readShortLE();
-        extleading = in.readShortLE();
-        italic = (byte)in.read();
-        uline = (byte)in.read();
-        overs = (byte)in.read();
-        weight = in.readShortLE();
-        charset = (byte)in.read();
-        pixwidth = in.readShortLE();
-        pixheight = in.readShortLE();
-        kind = (byte)in.read();
-        avgwidth = in.readShortLE();
-        maxwidth = in.readShortLE();
-        firstchar = in.read();
-        lastchar = in.read();
-        defchar = (byte)in.read();
-        brkchar = (byte)in.read();
-        widthby = in.readShortLE();
-        device = in.readIntLE();
-        face = in.readIntLE();
-        bits = in.readIntLE();
-        bitoff = in.readIntLE();
-        extlen = in.readShortLE();
-        psext = in.readIntLE();
-        chartab = in.readIntLE();
-        res1 = in.readIntLE();
-        kernpairs = in.readIntLE();
-        res2 = in.readIntLE();
-        fontname = in.readIntLE();
-        if (h_len != in.length() || extlen != 30 || fontname < 75 || fontname > 512)
-            throw new IOException(MessageLocalization.getComposedMessage("not.a.valid.pfm.file"));
-        in.seek(psext + 14);
-        capheight = in.readShortLE();
-        xheight = in.readShortLE();
-        ascender = in.readShortLE();
-        descender = in.readShortLE();
-    }
-    
-    private void putheader() throws IOException {
-        out.print("StartFontMetrics 2.0\n");
-        if (copyright.length() > 0)
-            out.print("Comment " + copyright + '\n');
-        out.print("FontName ");
-        in.seek(fontname);
-        String fname = readString();
-        out.print(fname);
-        out.print("\nEncodingScheme ");
-        if (charset != 0)
-            out.print("FontSpecific\n");
-        else
-            out.print("AdobeStandardEncoding\n");
-        /*
-         * The .pfm is missing full name, so construct from font name by
-         * changing the hyphen to a space.  This actually works in a lot
-         * of cases.
-         */
-        out.print("FullName " + fname.replace('-', ' '));
-        if (face != 0) {
-            in.seek(face);
-            out.print("\nFamilyName " + readString());
-        }
-
-        out.print("\nWeight ");
-        if (weight > 475 || fname.toLowerCase(Locale.ROOT).contains("bold"))
-           out.print("Bold");
-        else if ((weight < 325 && weight != 0) || fname.toLowerCase(Locale.ROOT).contains("light"))
-            out.print("Light");
-        else if (fname.toLowerCase(Locale.ROOT).contains("black"))
-            out.print("Black");
-        else 
-            out.print("Medium");
-
-        out.print("\nItalicAngle ");
-        if (italic != 0 || fname.toLowerCase(Locale.ROOT).contains("italic"))
-            out.print("-12.00");
-            /* this is a typical value; something else may work better for a
-               specific font */
-        else
-            out.print("0");
-
-        /*
-         *  The mono flag in the pfm actually indicates whether there is a
-         *  table of font widths, not if they are all the same.
-         */
-        out.print("\nIsFixedPitch ");
-        if ((kind & 1) == 0 ||                  /* Flag for mono */
-            avgwidth == maxwidth ) {  /* Avg width = max width */
-            out.print("true");
-            isMono = true;
-        }
-        else {
-            out.print("false");
-            isMono = false;
-        }
-
-        /*
-         * The font bounding box is lost, but try to reconstruct it.
-         * Much of this is just guess work.  The bounding box is required in
-         * the .afm, but is not used by the PM font installer.
-         */
-        out.print("\nFontBBox");
-        if (isMono)
-            outval(-20);      /* Just guess at left bounds */
-        else 
-            outval(-100);
-        outval(-(descender+5));  /* Descender is given as positive value */
-        outval(maxwidth+10);
-        outval(ascent+5);
-
-        /*
-         * Give other metrics that were kept
-         */
-        out.print("\nCapHeight");
-        outval(capheight);
-        out.print("\nXHeight");
-        outval(xheight);
-        out.print("\nDescender");
-        outval(descender);
-        out.print("\nAscender");
-        outval(ascender);
-        out.print('\n');
-    }
-    
-    private void putchartab() throws IOException {
-        int count = lastchar - firstchar + 1;
-        int[] ctabs = new int[count];
-        in.seek(chartab);
-        for (int k = 0; k < count; ++k)
-            ctabs[k] = in.readUnsignedShortLE();
-        int[] back = new int[256];
-        if (charset == 0) {
-            for (int i = firstchar; i <= lastchar; ++i) {
-                if (Win2PSStd[i] != 0)
-                    back[Win2PSStd[i]] = i;
-            }
-        }
-        /* Put out the header */
-        out.print("StartCharMetrics");
-        outval(count);
-        out.print('\n');
-
-        /* Put out all encoded chars */
-        if (charset != 0) {
-        /*
-         * If the charset is not the Windows standard, just put out
-         * unnamed entries.
-         */
-            for (int i = firstchar; i <= lastchar; i++) {
-                if (ctabs[i - firstchar] != 0) {
-                    outchar(i, ctabs[i - firstchar], null);
-                }
-            }
-        }
-        else {
-            for (int i = 0; i < 256; i++) {
-                int j = back[i];
-                if (j != 0) {
-                    outchar(i, ctabs[j - firstchar], WinChars[j]);
-                    ctabs[j - firstchar] = 0;
-                }
-            }
-            /* Put out all non-encoded chars */
-            for (int i = firstchar; i <= lastchar; i++) {
-                if (ctabs[i - firstchar] != 0) {
-                    outchar(-1, ctabs[i - firstchar], WinChars[i]);
-                }
-            }
-        }
-        /* Put out the trailer */
-        out.print("EndCharMetrics\n");
-        
-    }
-    
-    private void putkerntab() throws IOException {
-        if (kernpairs == 0)
-            return;
-        in.seek(kernpairs);
-        int count = in.readUnsignedShortLE();
-        int nzero = 0;
-        int[] kerns = new int[count * 3];
-        for (int k = 0; k < kerns.length;) {
-            kerns[k++] = in.read();
-            kerns[k++] = in.read();
-            if ((kerns[k++] = in.readShortLE()) != 0)
-                ++nzero;
-        }
-        if (nzero == 0)
-            return;
-        out.print("StartKernData\nStartKernPairs");
-        outval(nzero);
-        out.print('\n');
-        for (int k = 0; k < kerns.length; k += 3) {
-            if (kerns[k + 2] != 0) {
-                out.print("KPX ");
-                out.print(WinChars[kerns[k]]);
-                out.print(' ');
-                out.print(WinChars[kerns[k + 1]]);
-                outval(kerns[k + 2]);
-                out.print('\n');
-            }
-        }
-        /* Put out trailer */
-        out.print("EndKernPairs\nEndKernData\n");
-    }
-    
-
-    private void  puttrailer() {
-        out.print("EndFontMetrics\n");
-    }
-
-    private short  vers;
-    private int   h_len;             /* Total length of .pfm file */
-    private String   copyright;   /* Copyright string [60]*/
-    private short  type;
-    private short  points;
-    private short  verres;
-    private short  horres;
-    private short  ascent;
-    private short  intleading;
-    private short  extleading;
-    private byte   italic;
-    private byte   uline;
-    private byte   overs;
-    private short  weight;
-    private byte   charset;         /* 0=windows, otherwise nomap */
-    private short  pixwidth;        /* Width for mono fonts */
-    private short  pixheight;
-    private byte   kind;            /* Lower bit off in mono */
-    private short  avgwidth;        /* Mono if avg=max width */
-    private short  maxwidth;        /* Use to compute bounding box */
-    private int   firstchar;       /* First char in table */
-    private int   lastchar;        /* Last char in table */
-    private byte   defchar;
-    private byte   brkchar;
-    private short  widthby;
-    private int   device;
-    private int   face;            /* Face name */
-    private int   bits;
-    private int   bitoff;
-    private short  extlen;
-    private int   psext;           /* PostScript extension */
-    private int   chartab;         /* Character width tables */
-    private int   res1;
-    private int   kernpairs;       /* Kerning pairs */
-    private int   res2;
-    private int   fontname;        /* Font name */
-
-/*
- *  Some metrics from the PostScript extension
- */
-    private short  capheight;       /* Cap height */
-    private short  xheight;         /* X height */
-    private short  ascender;        /* Ascender */
-    private short  descender;       /* Descender (positive) */
-
-    
+    private short capheight;       /* Cap height */
+    private short xheight;         /* X height */
+    private short ascender;        /* Ascender */
+    private short descender;       /* Descender (positive) */
     private boolean isMono;
     /**
-     * Translate table from 1004 to psstd.  1004 is an extension of the
-     * Windows translate table used in PM.
+     * Translate table from 1004 to psstd.  1004 is an extension of the Windows translate table used in PM.
      */
     private int[] Win2PSStd = {
             0, 0, 0, 0, 197, 198, 199, 0, 202, 0, 205, 206, 207, 0, 0, 0,   // 00
@@ -522,11 +221,9 @@ private void  puttrailer() {
             0, 0, 0, 0, 0, 0, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // E0
             0, 0, 0, 0, 0, 0, 0, 0, 249, 0, 0, 0, 0, 0, 0, 0    // F0
     };
-
     /**
-     * Character class.  This is a minor attempt to overcome the problem that
-     * in the pfm file, all unused characters are given the width of space.
-     * Note that this array isn't used in iText.
+     * Character class.  This is a minor attempt to overcome the problem that in the pfm file, all unused characters are
+     * given the width of space. Note that this array isn't used in iText.
      */
     private int[] WinClass = {
             0, 0, 0, 0, 2, 2, 2, 0, 2, 0, 2, 2, 2, 0, 0, 0,   /* 00 */
@@ -546,10 +243,8 @@ private void  puttrailer() {
             1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,   /* e0 */
             1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1   /* f0 */
     };
-
     /**
-     * Windows character names.  Give a name to the used locations
-     * for when the all flag is specified.
+     * Windows character names.  Give a name to the used locations for when the all flag is specified.
      */
     private String[] WinChars = {
             "W00",              /*   00    */
@@ -809,4 +504,313 @@ private void  puttrailer() {
             "thorn",            /*   FE    */
             "ydieresis"         /*   FF    */
     };
+
+    /**
+     * Creates a new instance of Pfm2afm
+     */
+    private Pfm2afm(RandomAccessFileOrArray in, OutputStream out) throws IOException {
+        this.in = in;
+        this.out = new PrintWriter(new OutputStreamWriter(out, StandardCharsets.ISO_8859_1));
+    }
+
+    /**
+     * Converts a PFM file into an AFM file.
+     *
+     * @param in  the PFM file
+     * @param out the AFM file
+     * @throws IOException on error
+     */
+    public static void convert(RandomAccessFileOrArray in, OutputStream out) throws IOException {
+        Pfm2afm p = new Pfm2afm(in, out);
+        p.openpfm();
+        p.putheader();
+        p.putchartab();
+        p.putkerntab();
+        p.puttrailer();
+        p.out.flush();
+    }
+
+    public static void main(String[] args) {
+        try {
+            RandomAccessFileOrArray in = new RandomAccessFileOrArray(args[0]);
+            OutputStream out = new FileOutputStream(args[1]);
+            convert(in, out);
+            in.close();
+            out.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private String readString(int n) throws IOException {
+        byte[] b = new byte[n];
+        in.readFully(b);
+        int k;
+        for (k = 0; k < b.length; ++k) {
+            if (b[k] == 0) {
+                break;
+            }
+        }
+        return new String(b, 0, k, StandardCharsets.ISO_8859_1);
+    }
+
+    private String readString() throws IOException {
+        StringBuilder buf = new StringBuilder();
+        while (true) {
+            int c = in.read();
+            if (c <= 0) {
+                break;
+            }
+            buf.append((char) c);
+        }
+        return buf.toString();
+    }
+
+    private void outval(int n) {
+        out.print(' ');
+        out.print(n);
+    }
+
+    /*
+     *  Output a character entry
+     */
+    private void outchar(int code, int width, String name) {
+        out.print("C ");
+        outval(code);
+        out.print(" ; WX ");
+        outval(width);
+        if (name != null) {
+            out.print(" ; N ");
+            out.print(name);
+        }
+        out.print(" ;\n");
+    }
+
+    private void openpfm() throws IOException {
+        in.seek(0);
+        vers = in.readShortLE();
+        h_len = in.readIntLE();
+        copyright = readString(60);
+        type = in.readShortLE();
+        points = in.readShortLE();
+        verres = in.readShortLE();
+        horres = in.readShortLE();
+        ascent = in.readShortLE();
+        intleading = in.readShortLE();
+        extleading = in.readShortLE();
+        italic = (byte) in.read();
+        uline = (byte) in.read();
+        overs = (byte) in.read();
+        weight = in.readShortLE();
+        charset = (byte) in.read();
+        pixwidth = in.readShortLE();
+        pixheight = in.readShortLE();
+        kind = (byte) in.read();
+        avgwidth = in.readShortLE();
+        maxwidth = in.readShortLE();
+        firstchar = in.read();
+        lastchar = in.read();
+        defchar = (byte) in.read();
+        brkchar = (byte) in.read();
+        widthby = in.readShortLE();
+        device = in.readIntLE();
+        face = in.readIntLE();
+        bits = in.readIntLE();
+        bitoff = in.readIntLE();
+        extlen = in.readShortLE();
+        psext = in.readIntLE();
+        chartab = in.readIntLE();
+        res1 = in.readIntLE();
+        kernpairs = in.readIntLE();
+        res2 = in.readIntLE();
+        fontname = in.readIntLE();
+        if (h_len != in.length() || extlen != 30 || fontname < 75 || fontname > 512) {
+            throw new IOException(MessageLocalization.getComposedMessage("not.a.valid.pfm.file"));
+        }
+        in.seek(psext + 14);
+        capheight = in.readShortLE();
+        xheight = in.readShortLE();
+        ascender = in.readShortLE();
+        descender = in.readShortLE();
+    }
+
+    private void putheader() throws IOException {
+        out.print("StartFontMetrics 2.0\n");
+        if (copyright.length() > 0) {
+            out.print("Comment " + copyright + '\n');
+        }
+        out.print("FontName ");
+        in.seek(fontname);
+        String fname = readString();
+        out.print(fname);
+        out.print("\nEncodingScheme ");
+        if (charset != 0) {
+            out.print("FontSpecific\n");
+        } else {
+            out.print("AdobeStandardEncoding\n");
+        }
+        /*
+         * The .pfm is missing full name, so construct from font name by
+         * changing the hyphen to a space.  This actually works in a lot
+         * of cases.
+         */
+        out.print("FullName " + fname.replace('-', ' '));
+        if (face != 0) {
+            in.seek(face);
+            out.print("\nFamilyName " + readString());
+        }
+
+        out.print("\nWeight ");
+        if (weight > 475 || fname.toLowerCase(Locale.ROOT).contains("bold")) {
+            out.print("Bold");
+        } else if ((weight < 325 && weight != 0) || fname.toLowerCase(Locale.ROOT).contains("light")) {
+            out.print("Light");
+        } else if (fname.toLowerCase(Locale.ROOT).contains("black")) {
+            out.print("Black");
+        } else {
+            out.print("Medium");
+        }
+
+        out.print("\nItalicAngle ");
+        if (italic != 0 || fname.toLowerCase(Locale.ROOT).contains("italic")) {
+            out.print("-12.00");
+        }
+            /* this is a typical value; something else may work better for a
+               specific font */
+        else {
+            out.print("0");
+        }
+
+        /*
+         *  The mono flag in the pfm actually indicates whether there is a
+         *  table of font widths, not if they are all the same.
+         */
+        out.print("\nIsFixedPitch ");
+        if ((kind & 1) == 0 ||                  /* Flag for mono */
+                avgwidth == maxwidth) {  /* Avg width = max width */
+            out.print("true");
+            isMono = true;
+        } else {
+            out.print("false");
+            isMono = false;
+        }
+
+        /*
+         * The font bounding box is lost, but try to reconstruct it.
+         * Much of this is just guess work.  The bounding box is required in
+         * the .afm, but is not used by the PM font installer.
+         */
+        out.print("\nFontBBox");
+        if (isMono) {
+            outval(-20);      /* Just guess at left bounds */
+        } else {
+            outval(-100);
+        }
+        outval(-(descender + 5));  /* Descender is given as positive value */
+        outval(maxwidth + 10);
+        outval(ascent + 5);
+
+        /*
+         * Give other metrics that were kept
+         */
+        out.print("\nCapHeight");
+        outval(capheight);
+        out.print("\nXHeight");
+        outval(xheight);
+        out.print("\nDescender");
+        outval(descender);
+        out.print("\nAscender");
+        outval(ascender);
+        out.print('\n');
+    }
+
+    private void putchartab() throws IOException {
+        int count = lastchar - firstchar + 1;
+        int[] ctabs = new int[count];
+        in.seek(chartab);
+        for (int k = 0; k < count; ++k) {
+            ctabs[k] = in.readUnsignedShortLE();
+        }
+        int[] back = new int[256];
+        if (charset == 0) {
+            for (int i = firstchar; i <= lastchar; ++i) {
+                if (Win2PSStd[i] != 0) {
+                    back[Win2PSStd[i]] = i;
+                }
+            }
+        }
+        /* Put out the header */
+        out.print("StartCharMetrics");
+        outval(count);
+        out.print('\n');
+
+        /* Put out all encoded chars */
+        if (charset != 0) {
+            /*
+             * If the charset is not the Windows standard, just put out
+             * unnamed entries.
+             */
+            for (int i = firstchar; i <= lastchar; i++) {
+                if (ctabs[i - firstchar] != 0) {
+                    outchar(i, ctabs[i - firstchar], null);
+                }
+            }
+        } else {
+            for (int i = 0; i < 256; i++) {
+                int j = back[i];
+                if (j != 0) {
+                    outchar(i, ctabs[j - firstchar], WinChars[j]);
+                    ctabs[j - firstchar] = 0;
+                }
+            }
+            /* Put out all non-encoded chars */
+            for (int i = firstchar; i <= lastchar; i++) {
+                if (ctabs[i - firstchar] != 0) {
+                    outchar(-1, ctabs[i - firstchar], WinChars[i]);
+                }
+            }
+        }
+        /* Put out the trailer */
+        out.print("EndCharMetrics\n");
+
+    }
+
+    private void putkerntab() throws IOException {
+        if (kernpairs == 0) {
+            return;
+        }
+        in.seek(kernpairs);
+        int count = in.readUnsignedShortLE();
+        int nzero = 0;
+        int[] kerns = new int[count * 3];
+        for (int k = 0; k < kerns.length; ) {
+            kerns[k++] = in.read();
+            kerns[k++] = in.read();
+            if ((kerns[k++] = in.readShortLE()) != 0) {
+                ++nzero;
+            }
+        }
+        if (nzero == 0) {
+            return;
+        }
+        out.print("StartKernData\nStartKernPairs");
+        outval(nzero);
+        out.print('\n');
+        for (int k = 0; k < kerns.length; k += 3) {
+            if (kerns[k + 2] != 0) {
+                out.print("KPX ");
+                out.print(WinChars[kerns[k]]);
+                out.print(' ');
+                out.print(WinChars[kerns[k + 1]]);
+                outval(kerns[k + 2]);
+                out.print('\n');
+            }
+        }
+        /* Put out trailer */
+        out.print("EndKernPairs\nEndKernData\n");
+    }
+
+    private void puttrailer() {
+        out.print("EndFontMetrics\n");
+    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PushbuttonField.java b/openpdf/src/main/java/com/lowagie/text/pdf/PushbuttonField.java
index fbcdfa7a2..ff76dc8a2 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PushbuttonField.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PushbuttonField.java
@@ -51,282 +51,326 @@
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.error_messages.MessageLocalization;
 import java.io.IOException;
+
 /**
- * Creates a pushbutton field. It supports all the text and icon alignments.
- * The icon may be an image or a template.
+ * Creates a pushbutton field. It supports all the text and icon alignments. The icon may be an image or a template.
  * Example usage:
  * 
            - * Document document = new Document(PageSize.A4, 50, 50, 50, 50);
- * PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("output.pdf"));
- * document.open();
- * PdfContentByte cb = writer.getDirectContent();
- * Image img = Image.getInstance("image.png");
- * PushbuttonField bt = new PushbuttonField(writer, new Rectangle(100, 100, 200, 200), "Button1");
- * bt.setText("My Caption");
- * bt.setFontSize(0);
- * bt.setImage(img);
- * bt.setLayout(PushbuttonField.LAYOUT_ICON_TOP_LABEL_BOTTOM);
- * bt.setBackgroundColor(Color.cyan);
- * bt.setBorderStyle(PdfBorderDictionary.STYLE_SOLID);
- * bt.setBorderColor(Color.red);
- * bt.setBorderWidth(3);
- * PdfFormField ff = bt.getField();
- * PdfAction ac = PdfAction.createSubmitForm("http://www.submit-site.com", null, 0);
- * ff.setAction(ac);
- * writer.addAnnotation(ff);
- * document.close();
+ * Document document = new Document(PageSize.A4, 50, 50, 50, 50); PdfWriter writer = PdfWriter.getInstance(document, new
+ * FileOutputStream("output.pdf")); document.open(); PdfContentByte cb = writer.getDirectContent(); Image img =
+ * Image.getInstance("image.png"); PushbuttonField bt = new PushbuttonField(writer, new Rectangle(100, 100, 200, 200),
+ * "Button1"); bt.setText("My Caption"); bt.setFontSize(0); bt.setImage(img);
+ * bt.setLayout(PushbuttonField.LAYOUT_ICON_TOP_LABEL_BOTTOM); bt.setBackgroundColor(Color.cyan);
+ * bt.setBorderStyle(PdfBorderDictionary.STYLE_SOLID); bt.setBorderColor(Color.red); bt.setBorderWidth(3); PdfFormField
+ * ff = bt.getField(); PdfAction ac = PdfAction.createSubmitForm("http://www.submit-site.com", null, 0);
+ * ff.setAction(ac); writer.addAnnotation(ff); document.close();
  * 
            
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class PushbuttonField extends BaseField {
-   
-    /** A layout option */    
+
+    /**
+     * A layout option
+     */
     public static final int LAYOUT_LABEL_ONLY = 1;
-    /** A layout option */    
+    /**
+     * A layout option
+     */
     public static final int LAYOUT_ICON_ONLY = 2;
-    /** A layout option */    
+    /**
+     * A layout option
+     */
     public static final int LAYOUT_ICON_TOP_LABEL_BOTTOM = 3;
-    /** A layout option */    
+    /**
+     * A layout option
+     */
     public static final int LAYOUT_LABEL_TOP_ICON_BOTTOM = 4;
-    /** A layout option */    
+    /**
+     * A layout option
+     */
     public static final int LAYOUT_ICON_LEFT_LABEL_RIGHT = 5;
-    /** A layout option */    
+    /**
+     * A layout option
+     */
     public static final int LAYOUT_LABEL_LEFT_ICON_RIGHT = 6;
-    /** A layout option */    
+    /**
+     * A layout option
+     */
     public static final int LAYOUT_LABEL_OVER_ICON = 7;
-    /** An icon scaling option */    
-    public static final int SCALE_ICON_ALWAYS  = 1;
-    /** An icon scaling option */    
+    /**
+     * An icon scaling option
+     */
+    public static final int SCALE_ICON_ALWAYS = 1;
+    /**
+     * An icon scaling option
+     */
     public static final int SCALE_ICON_NEVER = 2;
-    /** An icon scaling option */    
+    /**
+     * An icon scaling option
+     */
     public static final int SCALE_ICON_IS_TOO_BIG = 3;
-    /** An icon scaling option */    
+    /**
+     * An icon scaling option
+     */
     public static final int SCALE_ICON_IS_TOO_SMALL = 4;
 
     /**
      * Holds value of property layout.
      */
     private int layout = LAYOUT_LABEL_ONLY;
-    
+
     /**
      * Holds value of property image.
      */
-    private Image image;    
-    
+    private Image image;
+
     /**
      * Holds value of property template.
      */
     private PdfTemplate template;
-    
+
     /**
      * Holds value of property scaleIcon.
      */
     private int scaleIcon = SCALE_ICON_ALWAYS;
-    
+
     /**
      * Holds value of property proportionalIcon.
      */
     private boolean proportionalIcon = true;
-    
+
     /**
      * Holds value of property iconVerticalAdjustment.
      */
     private float iconVerticalAdjustment = 0.5f;
-    
+
     /**
      * Holds value of property iconHorizontalAdjustment.
      */
     private float iconHorizontalAdjustment = 0.5f;
-    
+
     /**
      * Holds value of property iconFitToBounds.
      */
     private boolean iconFitToBounds;
-    
+
     private PdfTemplate tp;
-    
+    /**
+     * Holds value of property iconReference.
+     */
+    private PRIndirectReference iconReference;
+
     /**
      * Creates a new instance of PushbuttonField
-     * @param writer the document PdfWriter
-     * @param box the field location and dimensions
-     * @param fieldName the field name. If null only the widget keys
-     * will be included in the field allowing it to be used as a kid field.
+     *
+     * @param writer    the document PdfWriter
+     * @param box       the field location and dimensions
+     * @param fieldName the field name. If null only the widget keys will be included in the field allowing
+     *                  it to be used as a kid field.
      */
     public PushbuttonField(PdfWriter writer, Rectangle box, String fieldName) {
         super(writer, box, fieldName);
     }
-    
+
     /**
      * Getter for property layout.
+     *
      * @return Value of property layout.
      */
     public int getLayout() {
         return this.layout;
     }
-    
+
     /**
      * Sets the icon and label layout. Possible values are LAYOUT_LABEL_ONLY,
      * LAYOUT_ICON_ONLY, LAYOUT_ICON_TOP_LABEL_BOTTOM,
      * LAYOUT_LABEL_TOP_ICON_BOTTOM, LAYOUT_ICON_LEFT_LABEL_RIGHT,
      * LAYOUT_LABEL_LEFT_ICON_RIGHT and LAYOUT_LABEL_OVER_ICON.
      * The default is LAYOUT_LABEL_ONLY.
+     *
      * @param layout New value of property layout.
      */
     public void setLayout(int layout) {
-        if (layout < LAYOUT_LABEL_ONLY || layout > LAYOUT_LABEL_OVER_ICON)
+        if (layout < LAYOUT_LABEL_ONLY || layout > LAYOUT_LABEL_OVER_ICON) {
             throw new IllegalArgumentException(MessageLocalization.getComposedMessage("layout.out.of.bounds"));
+        }
         this.layout = layout;
     }
-    
+
     /**
      * Getter for property image.
+     *
      * @return Value of property image.
      */
     public Image getImage() {
         return this.image;
     }
-    
+
     /**
      * Sets the icon as an image.
+     *
      * @param image the image
      */
     public void setImage(Image image) {
         this.image = image;
         template = null;
     }
-    
+
     /**
      * Getter for property template.
+     *
      * @return Value of property template.
      */
     public PdfTemplate getTemplate() {
         return this.template;
     }
-    
+
     /**
      * Sets the icon as a template.
+     *
      * @param template the template
      */
     public void setTemplate(PdfTemplate template) {
         this.template = template;
         image = null;
     }
-    
+
     /**
      * Getter for property scaleIcon.
+     *
      * @return Value of property scaleIcon.
      */
     public int getScaleIcon() {
         return this.scaleIcon;
     }
-    
+
     /**
      * Sets the way the icon will be scaled. Possible values are
      * SCALE_ICON_ALWAYS, SCALE_ICON_NEVER,
      * SCALE_ICON_IS_TOO_BIG and SCALE_ICON_IS_TOO_SMALL.
      * The default is SCALE_ICON_ALWAYS.
+     *
      * @param scaleIcon the way the icon will be scaled
      */
     public void setScaleIcon(int scaleIcon) {
-        if (scaleIcon < SCALE_ICON_ALWAYS || scaleIcon > SCALE_ICON_IS_TOO_SMALL)
+        if (scaleIcon < SCALE_ICON_ALWAYS || scaleIcon > SCALE_ICON_IS_TOO_SMALL) {
             scaleIcon = SCALE_ICON_ALWAYS;
+        }
         this.scaleIcon = scaleIcon;
     }
-    
+
     /**
      * Getter for property proportionalIcon.
+     *
      * @return Value of property proportionalIcon.
      */
     public boolean isProportionalIcon() {
         return this.proportionalIcon;
     }
-    
+
     /**
-     * Sets the way the icon is scaled. If true the icon is scaled proportionally,
-     * if false the scaling is done anamorphicaly.
+     * Sets the way the icon is scaled. If true the icon is scaled proportionally, if false
+     * the scaling is done anamorphicaly.
+     *
      * @param proportionalIcon the way the icon is scaled
      */
     public void setProportionalIcon(boolean proportionalIcon) {
         this.proportionalIcon = proportionalIcon;
     }
-    
+
     /**
      * Getter for property iconVerticalAdjustment.
+     *
      * @return Value of property iconVerticalAdjustment.
      */
     public float getIconVerticalAdjustment() {
         return this.iconVerticalAdjustment;
     }
-    
+
     /**
-     * A number between 0 and 1 indicating the fraction of leftover space to allocate at the bottom of the icon.
-     * A value of 0 positions the icon at the bottom of the annotation rectangle.
-     * A value of 0.5 centers it within the rectangle. The default is 0.5.
-     * @param iconVerticalAdjustment a number between 0 and 1 indicating the fraction of leftover space to allocate at the bottom of the icon
+     * A number between 0 and 1 indicating the fraction of leftover space to allocate at the bottom of the icon. A value
+     * of 0 positions the icon at the bottom of the annotation rectangle. A value of 0.5 centers it within the
+     * rectangle. The default is 0.5.
+     *
+     * @param iconVerticalAdjustment a number between 0 and 1 indicating the fraction of leftover space to allocate at
+     *                               the bottom of the icon
      */
     public void setIconVerticalAdjustment(float iconVerticalAdjustment) {
-        if (iconVerticalAdjustment < 0)
+        if (iconVerticalAdjustment < 0) {
             iconVerticalAdjustment = 0;
-        else if (iconVerticalAdjustment > 1)
+        } else if (iconVerticalAdjustment > 1) {
             iconVerticalAdjustment = 1;
+        }
         this.iconVerticalAdjustment = iconVerticalAdjustment;
     }
-    
+
     /**
      * Getter for property iconHorizontalAdjustment.
+     *
      * @return Value of property iconHorizontalAdjustment.
      */
     public float getIconHorizontalAdjustment() {
         return this.iconHorizontalAdjustment;
     }
-    
+
     /**
-     * A number between 0 and 1 indicating the fraction of leftover space to allocate at the left of the icon.
-     * A value of 0 positions the icon at the left of the annotation rectangle.
-     * A value of 0.5 centers it within the rectangle. The default is 0.5.
-     * @param iconHorizontalAdjustment a number between 0 and 1 indicating the fraction of leftover space to allocate at the left of the icon
+     * A number between 0 and 1 indicating the fraction of leftover space to allocate at the left of the icon. A value
+     * of 0 positions the icon at the left of the annotation rectangle. A value of 0.5 centers it within the rectangle.
+     * The default is 0.5.
+     *
+     * @param iconHorizontalAdjustment a number between 0 and 1 indicating the fraction of leftover space to allocate at
+     *                                 the left of the icon
      */
     public void setIconHorizontalAdjustment(float iconHorizontalAdjustment) {
-        if (iconHorizontalAdjustment < 0)
+        if (iconHorizontalAdjustment < 0) {
             iconHorizontalAdjustment = 0;
-        else if (iconHorizontalAdjustment > 1)
+        } else if (iconHorizontalAdjustment > 1) {
             iconHorizontalAdjustment = 1;
+        }
         this.iconHorizontalAdjustment = iconHorizontalAdjustment;
     }
-    
+
     private float calculateFontSize(float w, float h) throws IOException, DocumentException {
         BaseFont ufont = getRealFont();
         float fsize = fontSize;
         if (fsize == 0) {
             float bw = ufont.getWidthPoint(text, 1);
-            if (bw == 0)
+            if (bw == 0) {
                 fsize = 12;
-            else
+            } else {
                 fsize = w / bw;
+            }
             float nfsize = h / (1 - ufont.getFontDescriptor(BaseFont.DESCENT, 1));
             fsize = Math.min(fsize, nfsize);
-            if (fsize < 4)
+            if (fsize < 4) {
                 fsize = 4;
+            }
         }
         return fsize;
     }
-    
+
     /**
      * Gets the button appearance.
-     * @throws IOException on error
-     * @throws DocumentException on error
+     *
      * @return the button appearance
-     */    
+     * @throws IOException       on error
+     * @throws DocumentException on error
+     */
     public PdfAppearance getAppearance() throws IOException, DocumentException {
-        PdfAppearance app = getBorderAppearance(super.writer,super.box,super.rotation,super.backgroundColor,super.borderStyle,super.borderWidth,super.borderColor,super.options,super.maxCharacterLength);
+        PdfAppearance app = getBorderAppearance(super.writer, super.box, super.rotation, super.backgroundColor,
+                super.borderStyle, super.borderWidth, super.borderColor, super.options, super.maxCharacterLength);
         Rectangle box = new Rectangle(app.getBoundingBox());
-        if ((text == null || text.length() == 0) && (layout == LAYOUT_LABEL_ONLY || (image == null && template == null && iconReference == null))) {
+        if ((text == null || text.length() == 0) && (layout == LAYOUT_LABEL_ONLY || (image == null && template == null
+                && iconReference == null))) {
             return app;
         }
-        if (layout == LAYOUT_ICON_ONLY && image == null && template == null && iconReference == null)
+        if (layout == LAYOUT_ICON_ONLY && image == null && template == null && iconReference == null) {
             return app;
+        }
         BaseFont ufont = getRealFont();
-        boolean borderExtra = borderStyle == PdfBorderDictionary.STYLE_BEVELED || borderStyle == PdfBorderDictionary.STYLE_INSET;
+        boolean borderExtra =
+                borderStyle == PdfBorderDictionary.STYLE_BEVELED || borderStyle == PdfBorderDictionary.STYLE_INSET;
         float h = box.getHeight() - borderWidth * 2;
         float bw2 = borderWidth;
         if (borderExtra) {
@@ -344,8 +388,9 @@ public PdfAppearance getAppearance() throws IOException, DocumentException {
         float ht = box.getHeight() - 2 * offX;
         float adj = (iconFitToBounds ? 0 : offX + 1);
         int nlayout = layout;
-        if (image == null && template == null && iconReference == null)
+        if (image == null && template == null && iconReference == null) {
             nlayout = LAYOUT_LABEL_ONLY;
+        }
         Rectangle iconBox = null;
         while (true) {
             switch (nlayout) {
@@ -358,8 +403,10 @@ public PdfAppearance getAppearance() throws IOException, DocumentException {
                     }
                     // fallthrough
                 case LAYOUT_ICON_ONLY:
-                    if (nlayout == LAYOUT_LABEL_OVER_ICON || nlayout == LAYOUT_ICON_ONLY)
-                        iconBox = new Rectangle(box.getLeft() + adj, box.getBottom() + adj, box.getRight() - adj, box.getTop() - adj);
+                    if (nlayout == LAYOUT_LABEL_OVER_ICON || nlayout == LAYOUT_ICON_ONLY) {
+                        iconBox = new Rectangle(box.getLeft() + adj, box.getBottom() + adj, box.getRight() - adj,
+                                box.getTop() - adj);
+                    }
                     break;
                 case LAYOUT_ICON_TOP_LABEL_BOTTOM:
                     if (text == null || text.length() == 0 || wt <= 0 || ht <= 0) {
@@ -367,13 +414,15 @@ public PdfAppearance getAppearance() throws IOException, DocumentException {
                         continue;
                     }
                     float nht = box.getHeight() * 0.35f - offX;
-                    if (nht > 0)
+                    if (nht > 0) {
                         fsize = calculateFontSize(wt, nht);
-                    else
+                    } else {
                         fsize = 4;
+                    }
                     textX = (box.getWidth() - ufont.getWidthPoint(text, fsize)) / 2;
                     textY = offX - ufont.getFontDescriptor(BaseFont.DESCENT, fsize);
-                    iconBox = new Rectangle(box.getLeft() + adj, textY + fsize, box.getRight() - adj, box.getTop() - adj);
+                    iconBox = new Rectangle(box.getLeft() + adj, textY + fsize, box.getRight() - adj,
+                            box.getTop() - adj);
                     break;
                 case LAYOUT_LABEL_TOP_ICON_BOTTOM:
                     if (text == null || text.length() == 0 || wt <= 0 || ht <= 0) {
@@ -381,15 +430,18 @@ public PdfAppearance getAppearance() throws IOException, DocumentException {
                         continue;
                     }
                     nht = box.getHeight() * 0.35f - offX;
-                    if (nht > 0)
+                    if (nht > 0) {
                         fsize = calculateFontSize(wt, nht);
-                    else
+                    } else {
                         fsize = 4;
+                    }
                     textX = (box.getWidth() - ufont.getWidthPoint(text, fsize)) / 2;
                     textY = box.getHeight() - offX - fsize;
-                    if (textY < offX)
+                    if (textY < offX) {
                         textY = offX;
-                    iconBox = new Rectangle(box.getLeft() + adj, box.getBottom() + adj, box.getRight() - adj, textY + ufont.getFontDescriptor(BaseFont.DESCENT, fsize));
+                    }
+                    iconBox = new Rectangle(box.getLeft() + adj, box.getBottom() + adj, box.getRight() - adj,
+                            textY + ufont.getFontDescriptor(BaseFont.DESCENT, fsize));
                     break;
                 case LAYOUT_LABEL_LEFT_ICON_RIGHT:
                     if (text == null || text.length() == 0 || wt <= 0 || ht <= 0) {
@@ -397,10 +449,11 @@ public PdfAppearance getAppearance() throws IOException, DocumentException {
                         continue;
                     }
                     float nw = box.getWidth() * 0.35f - offX;
-                    if (nw > 0)
+                    if (nw > 0) {
                         fsize = calculateFontSize(wt, nw);
-                    else
+                    } else {
                         fsize = 4;
+                    }
                     if (ufont.getWidthPoint(text, fsize) >= wt) {
                         nlayout = LAYOUT_LABEL_ONLY;
                         fsize = fontSize;
@@ -408,7 +461,8 @@ public PdfAppearance getAppearance() throws IOException, DocumentException {
                     }
                     textX = offX + 1;
                     textY = (box.getHeight() - ufont.getFontDescriptor(BaseFont.ASCENT, fsize)) / 2;
-                    iconBox = new Rectangle(textX + ufont.getWidthPoint(text, fsize), box.getBottom() + adj, box.getRight() - adj, box.getTop() - adj);
+                    iconBox = new Rectangle(textX + ufont.getWidthPoint(text, fsize), box.getBottom() + adj,
+                            box.getRight() - adj, box.getTop() - adj);
                     break;
                 case LAYOUT_ICON_LEFT_LABEL_RIGHT:
                     if (text == null || text.length() == 0 || wt <= 0 || ht <= 0) {
@@ -416,10 +470,11 @@ public PdfAppearance getAppearance() throws IOException, DocumentException {
                         continue;
                     }
                     nw = box.getWidth() * 0.35f - offX;
-                    if (nw > 0)
+                    if (nw > 0) {
                         fsize = calculateFontSize(wt, nw);
-                    else
+                    } else {
                         fsize = 4;
+                    }
                     if (ufont.getWidthPoint(text, fsize) >= wt) {
                         nlayout = LAYOUT_LABEL_ONLY;
                         fsize = fontSize;
@@ -432,10 +487,12 @@ public PdfAppearance getAppearance() throws IOException, DocumentException {
             }
             break;
         }
-        if (textY < box.getBottom() + offX)
+        if (textY < box.getBottom() + offX) {
             textY = box.getBottom() + offX;
-        if (iconBox != null && (iconBox.getWidth() <= 0 || iconBox.getHeight() <= 0))
+        }
+        if (iconBox != null && (iconBox.getWidth() <= 0 || iconBox.getHeight() <= 0)) {
             iconBox = null;
+        }
         boolean haveIcon = false;
         float boundingBoxWidth = 0;
         float boundingBoxHeight = 0;
@@ -449,8 +506,7 @@ public PdfAppearance getAppearance() throws IOException, DocumentException {
                 haveIcon = true;
                 boundingBoxWidth = tp.getBoundingBox().getWidth();
                 boundingBoxHeight = tp.getBoundingBox().getHeight();
-            }
-            else if (template != null) {
+            } else if (template != null) {
                 tp = new PdfTemplate(writer);
                 tp.setBoundingBox(new Rectangle(template.getWidth(), template.getHeight()));
                 writer.addDirectTemplateSimple(tp, PdfName.FRM);
@@ -458,9 +514,8 @@ else if (template != null) {
                 haveIcon = true;
                 boundingBoxWidth = tp.getBoundingBox().getWidth();
                 boundingBoxHeight = tp.getBoundingBox().getHeight();
-            }
-            else if (iconReference != null) {
-                PdfDictionary dic = (PdfDictionary)PdfReader.getPdfObject(iconReference);
+            } else if (iconReference != null) {
+                PdfDictionary dic = (PdfDictionary) PdfReader.getPdfObject(iconReference);
                 if (dic != null) {
                     Rectangle r2 = PdfReader.getNormalizedRectangle(dic.getAsArray(PdfName.BBOX));
                     matrix = dic.getAsArray(PdfName.MATRIX);
@@ -491,8 +546,7 @@ else if (iconReference != null) {
                         break;
                 }
                 icy = icx;
-            }
-            else {
+            } else {
                 switch (scaleIcon) {
                     case SCALE_ICON_IS_TOO_BIG:
                         icx = Math.min(icx, 1);
@@ -510,25 +564,29 @@ else if (iconReference != null) {
                 }
             }
             float xpos = iconBox.getLeft() + (iconBox.getWidth() - (boundingBoxWidth * icx)) * iconHorizontalAdjustment;
-            float ypos = iconBox.getBottom() + (iconBox.getHeight() - (boundingBoxHeight * icy)) * iconVerticalAdjustment;
+            float ypos =
+                    iconBox.getBottom() + (iconBox.getHeight() - (boundingBoxHeight * icy)) * iconVerticalAdjustment;
             app.saveState();
             app.rectangle(iconBox.getLeft(), iconBox.getBottom(), iconBox.getWidth(), iconBox.getHeight());
             app.clip();
             app.newPath();
-            if (tp != null)
+            if (tp != null) {
                 app.addTemplate(tp, icx, 0, 0, icy, xpos, ypos);
-            else {
+            } else {
                 float cox = 0;
                 float coy = 0;
                 if (matrix != null && matrix.size() == 6) {
                     PdfNumber nm = matrix.getAsNumber(4);
-                    if (nm != null)
+                    if (nm != null) {
                         cox = nm.floatValue();
+                    }
                     nm = matrix.getAsNumber(5);
-                    if (nm != null)
+                    if (nm != null) {
                         coy = nm.floatValue();
+                    }
                 }
-                app.addTemplateReference(iconReference, PdfName.FRM, icx, 0, 0, icy, xpos - cox * icx, ypos - coy * icy);
+                app.addTemplateReference(iconReference, PdfName.FRM, icx, 0, 0, icy, xpos - cox * icx,
+                        ypos - coy * icy);
             }
             app.restoreState();
         }
@@ -537,10 +595,11 @@ else if (iconReference != null) {
             app.rectangle(offX, offX, box.getWidth() - 2 * offX, box.getHeight() - 2 * offX);
             app.clip();
             app.newPath();
-            if (textColor == null)
+            if (textColor == null) {
                 app.resetGrayFill();
-            else
+            } else {
                 app.setColorFill(textColor);
+            }
             app.beginText();
             app.setFontAndSize(ufont, fsize);
             app.setTextMatrix(textX, textY);
@@ -553,38 +612,46 @@ else if (iconReference != null) {
 
     /**
      * Gets the pushbutton field.
-     * @throws IOException on error
-     * @throws DocumentException on error
+     *
      * @return the pushbutton field
-     */    
+     * @throws IOException       on error
+     * @throws DocumentException on error
+     */
     public PdfFormField getField() throws IOException, DocumentException {
         PdfFormField field = PdfFormField.createPushButton(writer);
         field.setWidget(box, PdfAnnotation.HIGHLIGHT_INVERT);
         if (fieldName != null) {
             field.setFieldName(fieldName);
-            if ((options & READ_ONLY) != 0)
+            if ((options & READ_ONLY) != 0) {
                 field.setFieldFlags(PdfFormField.FF_READ_ONLY);
-            if ((options & REQUIRED) != 0)
+            }
+            if ((options & REQUIRED) != 0) {
                 field.setFieldFlags(PdfFormField.FF_REQUIRED);
+            }
         }
-        if (text != null)
+        if (text != null) {
             field.setMKNormalCaption(text);
-        if (rotation != 0)
+        }
+        if (rotation != 0) {
             field.setMKRotation(rotation);
+        }
         field.setBorderStyle(new PdfBorderDictionary(borderWidth, borderStyle, new PdfDashPattern(3)));
         PdfAppearance tpa = getAppearance();
         field.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, tpa);
-        PdfAppearance da = (PdfAppearance)tpa.getDuplicate();
+        PdfAppearance da = (PdfAppearance) tpa.getDuplicate();
         da.setFontAndSize(getRealFont(), fontSize);
-        if (textColor == null)
+        if (textColor == null) {
             da.setGrayFill(0);
-        else
+        } else {
             da.setColorFill(textColor);
+        }
         field.setDefaultAppearanceString(da);
-        if (borderColor != null)
+        if (borderColor != null) {
             field.setMKBorderColor(borderColor);
-        if (backgroundColor != null)
+        }
+        if (backgroundColor != null) {
             field.setMKBackgroundColor(backgroundColor);
+        }
         switch (visibility) {
             case HIDDEN:
                 field.setFlags(PdfAnnotation.FLAGS_PRINT | PdfAnnotation.FLAGS_HIDDEN);
@@ -598,47 +665,46 @@ public PdfFormField getField() throws IOException, DocumentException {
                 field.setFlags(PdfAnnotation.FLAGS_PRINT);
                 break;
         }
-        if (tp != null)
+        if (tp != null) {
             field.setMKNormalIcon(tp);
+        }
         field.setMKTextPosition(layout - 1);
         PdfName scale = PdfName.A;
-        if (scaleIcon == SCALE_ICON_IS_TOO_BIG)
+        if (scaleIcon == SCALE_ICON_IS_TOO_BIG) {
             scale = PdfName.B;
-        else if (scaleIcon == SCALE_ICON_IS_TOO_SMALL)
+        } else if (scaleIcon == SCALE_ICON_IS_TOO_SMALL) {
             scale = PdfName.S;
-        else if (scaleIcon == SCALE_ICON_NEVER)
+        } else if (scaleIcon == SCALE_ICON_NEVER) {
             scale = PdfName.N;
+        }
         field.setMKIconFit(scale, proportionalIcon ? PdfName.P : PdfName.A, iconHorizontalAdjustment,
-            iconVerticalAdjustment, iconFitToBounds);
+                iconVerticalAdjustment, iconFitToBounds);
         return field;
     }
-    
+
     /**
      * Getter for property iconFitToBounds.
+     *
      * @return Value of property iconFitToBounds.
      */
     public boolean isIconFitToBounds() {
         return this.iconFitToBounds;
     }
-    
+
     /**
-     * If true the icon will be scaled to fit fully within the bounds of the annotation,
-     * if false the border width will be taken into account. The default
-     * is false.
-     * @param iconFitToBounds if true the icon will be scaled to fit fully within the bounds of the annotation,
-     * if false the border width will be taken into account
+     * If true the icon will be scaled to fit fully within the bounds of the annotation, if
+     * false the border width will be taken into account. The default is false.
+     *
+     * @param iconFitToBounds if true the icon will be scaled to fit fully within the bounds of the
+     *                        annotation, if false the border width will be taken into account
      */
     public void setIconFitToBounds(boolean iconFitToBounds) {
         this.iconFitToBounds = iconFitToBounds;
     }
 
-    /**
-     * Holds value of property iconReference.
-     */
-    private PRIndirectReference iconReference;
-
     /**
      * Gets the reference to an existing icon.
+     *
      * @return the reference to an existing icon.
      */
     public PRIndirectReference getIconReference() {
@@ -647,10 +713,11 @@ public PRIndirectReference getIconReference() {
 
     /**
      * Sets the reference to an existing icon.
+     *
      * @param iconReference the reference to an existing icon
      */
     public void setIconReference(PRIndirectReference iconReference) {
         this.iconReference = iconReference;
     }
-    
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/RGBColor.java b/openpdf/src/main/java/com/lowagie/text/pdf/RGBColor.java
index 49fe21e35..24a1a8696 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/RGBColor.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/RGBColor.java
@@ -17,37 +17,41 @@
 package com.lowagie.text.pdf;
 
 /**
- *
- * @author  Douglas SIX (http://github.com/sixdouglas)
+ * @author Douglas SIX (http://github.com/sixdouglas)
  */
 public class RGBColor extends ExtendedColor {
 
     /**
      * Constructs a RGB Color based on 3 color values (values are integers from 0 to 255).
-     * @param intRed the red
+     *
+     * @param intRed   the red
      * @param intGreen the green
-     * @param intBlue the blue
+     * @param intBlue  the blue
      */
     public RGBColor(int intRed, int intGreen, int intBlue) {
-        this(normalize(intRed) / MAX_INT_COLOR_VALUE, normalize(intGreen) / MAX_INT_COLOR_VALUE, normalize(intBlue) / MAX_INT_COLOR_VALUE, MAX_FLOAT_COLOR_VALUE);
+        this(normalize(intRed) / MAX_INT_COLOR_VALUE, normalize(intGreen) / MAX_INT_COLOR_VALUE,
+                normalize(intBlue) / MAX_INT_COLOR_VALUE, MAX_FLOAT_COLOR_VALUE);
     }
 
     /**
      * Constructs a RGB Color based on 3 color values (values are integers from 0 to 255).
-     * @param intRed the red
+     *
+     * @param intRed   the red
      * @param intGreen the green
-     * @param intBlue the blue
+     * @param intBlue  the blue
      * @param intAlpha the alpha
      */
     public RGBColor(int intRed, int intGreen, int intBlue, int intAlpha) {
-        this(normalize(intRed) / MAX_INT_COLOR_VALUE, normalize(intGreen) / MAX_INT_COLOR_VALUE, normalize(intBlue) / MAX_INT_COLOR_VALUE, normalize(intAlpha) / MAX_INT_COLOR_VALUE);
+        this(normalize(intRed) / MAX_INT_COLOR_VALUE, normalize(intGreen) / MAX_INT_COLOR_VALUE,
+                normalize(intBlue) / MAX_INT_COLOR_VALUE, normalize(intAlpha) / MAX_INT_COLOR_VALUE);
     }
 
     /**
      * Construct a RGB Color (values are floats from 0 to 1).
-     * @param floatRed the red
+     *
+     * @param floatRed   the red
      * @param floatGreen the green
-     * @param floatBlue the blue
+     * @param floatBlue  the blue
      */
     public RGBColor(float floatRed, float floatGreen, float floatBlue) {
         this(floatRed, floatGreen, floatBlue, MAX_FLOAT_COLOR_VALUE);
@@ -55,9 +59,10 @@ public RGBColor(float floatRed, float floatGreen, float floatBlue) {
 
     /**
      * Construct a RGB Color (values are floats from 0 to 1).
-     * @param floatRed the red
+     *
+     * @param floatRed   the red
      * @param floatGreen the green
-     * @param floatBlue the blue
+     * @param floatBlue  the blue
      * @param floatAlpha the alpha
      */
     public RGBColor(float floatRed, float floatGreen, float floatBlue, float floatAlpha) {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/RadioCheckField.java b/openpdf/src/main/java/com/lowagie/text/pdf/RadioCheckField.java
index 6eeb294a2..c38e580a6 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/RadioCheckField.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/RadioCheckField.java
@@ -46,197 +46,129 @@
  */
 package com.lowagie.text.pdf;
 
-import java.awt.Color;
-import java.io.IOException;
-
 import com.lowagie.text.DocumentException;
-
-import com.lowagie.text.Rectangle;
 import com.lowagie.text.ExceptionConverter;
+import com.lowagie.text.Rectangle;
+import java.awt.Color;
+import java.io.IOException;
 
 /**
- * Creates a radio or a check field.
- * Example usage:
+ * Creates a radio or a check field. Example usage:
  * 
            - * Document document = new Document(PageSize.A4, 50, 50, 50, 50);
- * PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("output.pdf"));
- * document.open();
- * PdfContentByte cb = writer.getDirectContent();
- * RadioCheckField bt = new RadioCheckField(writer, new Rectangle(100, 100, 200, 200), "radio", "v1");
- * bt.setCheckType(RadioCheckField.TYPE_CIRCLE);
- * bt.setBackgroundColor(Color.cyan);
- * bt.setBorderStyle(PdfBorderDictionary.STYLE_SOLID);
- * bt.setBorderColor(Color.red);
- * bt.setTextColor(Color.yellow);
- * bt.setBorderWidth(BaseField.BORDER_WIDTH_THICK);
- * bt.setChecked(false);
- * PdfFormField f1 = bt.getRadioField();
- * bt.setOnValue("v2");
- * bt.setChecked(true);
- * bt.setBox(new Rectangle(100, 300, 200, 400));
- * PdfFormField f2 = bt.getRadioField();
- * bt.setChecked(false);
- * PdfFormField top = bt.getRadioGroup(true, false);
- * bt.setOnValue("v3");
- * bt.setBox(new Rectangle(100, 500, 200, 600));
- * PdfFormField f3 = bt.getRadioField();
- * top.addKid(f1);
- * top.addKid(f2);
- * top.addKid(f3);
- * writer.addAnnotation(top);
- * bt = new RadioCheckField(writer, new Rectangle(300, 300, 400, 400), "check1", "Yes");
- * bt.setCheckType(RadioCheckField.TYPE_CHECK);
- * bt.setBorderWidth(BaseField.BORDER_WIDTH_THIN);
- * bt.setBorderColor(Color.black);
- * bt.setBackgroundColor(Color.white);
- * PdfFormField ck = bt.getCheckField();
- * writer.addAnnotation(ck);
- * document.close();
+ * Document document = new Document(PageSize.A4, 50, 50, 50, 50); PdfWriter writer = PdfWriter.getInstance(document, new
+ * FileOutputStream("output.pdf")); document.open(); PdfContentByte cb = writer.getDirectContent(); RadioCheckField bt =
+ * new RadioCheckField(writer, new Rectangle(100, 100, 200, 200), "radio", "v1");
+ * bt.setCheckType(RadioCheckField.TYPE_CIRCLE); bt.setBackgroundColor(Color.cyan);
+ * bt.setBorderStyle(PdfBorderDictionary.STYLE_SOLID); bt.setBorderColor(Color.red); bt.setTextColor(Color.yellow);
+ * bt.setBorderWidth(BaseField.BORDER_WIDTH_THICK); bt.setChecked(false); PdfFormField f1 = bt.getRadioField();
+ * bt.setOnValue("v2"); bt.setChecked(true); bt.setBox(new Rectangle(100, 300, 200, 400)); PdfFormField f2 =
+ * bt.getRadioField(); bt.setChecked(false); PdfFormField top = bt.getRadioGroup(true, false); bt.setOnValue("v3");
+ * bt.setBox(new Rectangle(100, 500, 200, 600)); PdfFormField f3 = bt.getRadioField(); top.addKid(f1); top.addKid(f2);
+ * top.addKid(f3); writer.addAnnotation(top); bt = new RadioCheckField(writer, new Rectangle(300, 300, 400, 400),
+ * "check1", "Yes"); bt.setCheckType(RadioCheckField.TYPE_CHECK); bt.setBorderWidth(BaseField.BORDER_WIDTH_THIN);
+ * bt.setBorderColor(Color.black); bt.setBackgroundColor(Color.white); PdfFormField ck = bt.getCheckField();
+ * writer.addAnnotation(ck); document.close();
  * 
            
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class RadioCheckField extends BaseField {
 
-    /** A field with the symbol check */
+    /**
+     * A field with the symbol check
+     */
     public static final int TYPE_CHECK = 1;
-    /** A field with the symbol circle */
+    /**
+     * A field with the symbol circle
+     */
     public static final int TYPE_CIRCLE = 2;
-    /** A field with the symbol cross */
+    /**
+     * A field with the symbol cross
+     */
     public static final int TYPE_CROSS = 3;
-    /** A field with the symbol diamond */
+    /**
+     * A field with the symbol diamond
+     */
     public static final int TYPE_DIAMOND = 4;
-    /** A field with the symbol square */
+    /**
+     * A field with the symbol square
+     */
     public static final int TYPE_SQUARE = 5;
-    /** A field with the symbol star */
+    /**
+     * A field with the symbol star
+     */
     public static final int TYPE_STAR = 6;
 
     private static String[] typeChars = {"4", "l", "8", "u", "n", "H"};
-    
+
     /**
      * Holds value of property checkType.
      */
     private int checkType;
-    
+
     /**
      * Holds value of property onValue.
      */
     private String onValue;
-    
+
     /**
      * Holds value of property checked.
      */
     private boolean checked;
-    
+
     /**
      * Creates a new instance of RadioCheckField
-     * @param writer the document PdfWriter
-     * @param box the field location and dimensions
+     *
+     * @param writer    the document PdfWriter
+     * @param box       the field location and dimensions
      * @param fieldName the field name. It must not be null
-     * @param onValue the value when the field is checked
+     * @param onValue   the value when the field is checked
      */
     public RadioCheckField(PdfWriter writer, Rectangle box, String fieldName, String onValue) {
         super(writer, box, fieldName);
         setOnValue(onValue);
         setCheckType(TYPE_CHECK);
     }
-    
+
     /**
      * Creates a new instance of parent RadioCheckField with the default appearance of type 'cross'
-     * @param writer the document PdfWriter
+     *
+     * @param writer    the document PdfWriter
      * @param fieldName the field name. It must not be null
-     * @param onValue the value when the field is checked
+     * @param onValue   the value when the field is checked
      */
     public RadioCheckField(PdfWriter writer, String fieldName, String onValue) {
         super(writer, null, fieldName);
         setOnValue(onValue);
         setCheckType(TYPE_CROSS);
     }
-    
-    /**
-     * Getter for property checkType.
-     * @return Value of property checkType.
-     */
-    public int getCheckType() {
-        return this.checkType;
-    }
-    
-    /**
-     * Sets the checked symbol. It can be
-     * TYPE_CHECK,
-     * TYPE_CIRCLE,
-     * TYPE_CROSS,
-     * TYPE_DIAMOND,
-     * TYPE_SQUARE and
-     * TYPE_STAR.
-     * @param checkType the checked symbol
-     */
-    public void setCheckType(int checkType) {
-        if (checkType < TYPE_CHECK || checkType > TYPE_STAR)
-            checkType = TYPE_CHECK;
-        this.checkType = checkType;
-        setText(typeChars[checkType - 1]);
-        try {
-            setFont(BaseFont.createFont(BaseFont.ZAPFDINGBATS, BaseFont.WINANSI, false));
-        }
-        catch (Exception e) {
-            throw new ExceptionConverter(e);
-        }
-    }
-    
-    /**
-     * Getter for property onValue.
-     * @return Value of property onValue.
-     */
-    public String getOnValue() {
-        return this.onValue;
-    }
-    
-    /**
-     * Sets the value when the field is checked.
-     * @param onValue the value when the field is checked
-     */
-    public void setOnValue(String onValue) {
-        this.onValue = onValue;
-    }
-    
-    /**
-     * Getter for property checked.
-     * @return Value of property checked.
-     */
-    public boolean isChecked() {
-        return this.checked;
-    }
-    
-    /**
-     * Sets the state of the field to checked or unchecked.
-     * @param checked the state of the field, true for checked
-     * and false for unchecked
-     */
-    public void setChecked(boolean checked) {
-        this.checked = checked;
-    }
-    
+
     /**
      * Gets the field appearance.
-     * 
-     * For Circle and Cross own appearances are drawn.
-     * For all other styles the ZapfDingbats font it used.
-     * 
+     * 
            
+     * For Circle and Cross own appearances are drawn. For all other styles the ZapfDingbats font it used.
+     *
      * @return the appearance
-     */    
+     */
     public static PdfAppearance getAppearance(boolean on, PdfWriter writer, int checkType, int rotation,
-                    int borderStyle, Rectangle box, float borderWidth, float fontSize, String text, Color textColor,
-                    Color backgroundColor, Color borderColor, BaseFont ufont) {
-        if (checkType == TYPE_CIRCLE)
-            return getAppearanceRadioCircle(on, writer,box, rotation, backgroundColor, borderWidth, borderColor, textColor);
-        else if (checkType == TYPE_CROSS)
-            return getAppearanceRadioCross(on, writer, box, rotation, backgroundColor, borderWidth, borderColor, textColor);
-        
+            int borderStyle, Rectangle box, float borderWidth, float fontSize, String text, Color textColor,
+            Color backgroundColor, Color borderColor, BaseFont ufont) {
+        if (checkType == TYPE_CIRCLE) {
+            return getAppearanceRadioCircle(on, writer, box, rotation, backgroundColor, borderWidth, borderColor,
+                    textColor);
+        } else if (checkType == TYPE_CROSS) {
+            return getAppearanceRadioCross(on, writer, box, rotation, backgroundColor, borderWidth, borderColor,
+                    textColor);
+        }
+
         //setting last two parameters (options and maxlength) to 0 since those are only valid for textfields
-        PdfAppearance app = getBorderAppearance(writer,box,rotation,backgroundColor, borderStyle,borderWidth,borderColor,0,0);
-        if (!on)
+        PdfAppearance app = getBorderAppearance(writer, box, rotation, backgroundColor, borderStyle, borderWidth,
+                borderColor, 0, 0);
+        if (!on) {
             return app;
-        boolean borderExtra = borderStyle == PdfBorderDictionary.STYLE_BEVELED || borderStyle == PdfBorderDictionary.STYLE_INSET;
+        }
+        boolean borderExtra =
+                borderStyle == PdfBorderDictionary.STYLE_BEVELED || borderStyle == PdfBorderDictionary.STYLE_INSET;
         float h = box.getHeight() - borderWidth * 2;
         float bw2 = borderWidth;
         if (borderExtra) {
@@ -251,10 +183,11 @@ else if (checkType == TYPE_CROSS)
         float fsize = fontSize;
         if (fsize == 0) {
             float bw = ufont.getWidthPoint(text, 1);
-            if (bw == 0)
+            if (bw == 0) {
                 fsize = 12;
-            else
+            } else {
                 fsize = wt / bw;
+            }
             float nfsize = h / (ufont.getFontDescriptor(BaseFont.ASCENT, 1));
             fsize = Math.min(fsize, nfsize);
         }
@@ -262,14 +195,15 @@ else if (checkType == TYPE_CROSS)
         app.rectangle(offX, offX, wt, ht);
         app.clip();
         app.newPath();
-        if (textColor == null)
+        if (textColor == null) {
             app.resetGrayFill();
-        else
+        } else {
             app.setColorFill(textColor);
+        }
         app.beginText();
         app.setFontAndSize(ufont, fsize);
-        app.setTextMatrix((box.getWidth() - ufont.getWidthPoint(text, fsize)) / 2, 
-            (box.getHeight() - ufont.getAscentPoint(text, fsize)) / 2);
+        app.setTextMatrix((box.getWidth() - ufont.getWidthPoint(text, fsize)) / 2,
+                (box.getHeight() - ufont.getAscentPoint(text, fsize)) / 2);
         app.showText(text);
         app.endText();
         app.restoreState();
@@ -278,11 +212,12 @@ else if (checkType == TYPE_CROSS)
 
     /**
      * Gets the special field appearance for the radio circle.
+     *
      * @param on true for the checked state otherwise, false
-     * 
      * @return the appearance
-     */    
-    public static PdfAppearance getAppearanceRadioCircle(boolean on, PdfWriter writer, Rectangle box, int rotation, Color backgroundColor, float borderWidth, Color borderColor, Color textColor) {
+     */
+    public static PdfAppearance getAppearanceRadioCircle(boolean on, PdfWriter writer, Rectangle box, int rotation,
+            Color backgroundColor, float borderWidth, Color borderColor, Color textColor) {
         PdfAppearance app = PdfAppearance.createAppearance(writer, box.getWidth(), box.getHeight());
         switch (rotation) {
             case 90:
@@ -295,14 +230,16 @@ public static PdfAppearance getAppearanceRadioCircle(boolean on, PdfWriter write
                 app.setMatrix(0, -1, 1, 0, 0, box.getWidth());
                 break;
             case 0:
-            default: break;
+            default:
+                break;
         }
         Rectangle boundingBox = new Rectangle(app.getBoundingBox());
         float cx = boundingBox.getWidth() / 2;
         float cy = boundingBox.getHeight() / 2;
         float r = (Math.min(boundingBox.getWidth(), boundingBox.getHeight()) - borderWidth) / 2;
-        if (r <= 0)
+        if (r <= 0) {
             return app;
+        }
         if (backgroundColor != null) {
             app.setColorFill(backgroundColor);
             app.circle(cx, cy, r + borderWidth / 2);
@@ -315,24 +252,27 @@ public static PdfAppearance getAppearanceRadioCircle(boolean on, PdfWriter write
             app.stroke();
         }
         if (on) {
-            if (textColor == null)
+            if (textColor == null) {
                 app.resetGrayFill();
-            else
+            } else {
                 app.setColorFill(textColor);
+            }
             app.circle(cx, cy, r / 2);
             app.fill();
         }
         return app;
     }
-    
+
     /**
      * Gets the special field appearance for the radio circle.
+     *
      * @param on true for the checked state, false
-     * otherwise
+     *           otherwise
      * @return the appearance
-     */    
-    public static PdfAppearance getAppearanceRadioCross(boolean on, PdfWriter writer, Rectangle box, int rotation, Color backgroundColor, float borderWidth, Color borderColor, Color textColor) {
-        
+     */
+    public static PdfAppearance getAppearanceRadioCross(boolean on, PdfWriter writer, Rectangle box, int rotation,
+            Color backgroundColor, float borderWidth, Color borderColor, Color textColor) {
+
         PdfAppearance app = PdfAppearance.createAppearance(writer, box.getWidth(), box.getHeight());
         switch (rotation) {
             case 90:
@@ -345,57 +285,55 @@ public static PdfAppearance getAppearanceRadioCross(boolean on, PdfWriter writer
                 app.setMatrix(0, -1, 1, 0, 0, box.getWidth());
                 break;
         }
-        
+
         //"q"
         app.saveState();
-        
+
         if (backgroundColor != null) {
             app.setColorFill(backgroundColor);
-        }
-        else {
+        } else {
             //"0 0 0 rg"
             app.setRGBColorFillF(0, 0, 0);
         }
-        
+
         if (borderWidth > 0 && borderColor != null) {
             app.setLineWidth(borderWidth);
             app.setColorStroke(borderColor);
             //draw surrounding rectangle
             //"1 1 "+(width-2)+" "+(height-2)+" re"
-            app.rectangle(1,1,box.getWidth()-2,box.getHeight()-2);
-            
+            app.rectangle(1, 1, box.getWidth() - 2, box.getHeight() - 2);
+
             //"W"
             app.clip();
         }
-        
-        if(on) {
+
+        if (on) {
             //"n"
             app.newPath();
-            
+
             //draw lines of the cross:
             //upper left corner
             //"2 "+(height-2)+" m"
-            app.moveTo(2, box.getHeight()-2);
-            
+            app.moveTo(2, box.getHeight() - 2);
+
             if (textColor != null) {
                 app.setColorFill(textColor);
             }
             //lower right corner
             //(width-2)+" 2"+ " l"
-            app.lineTo(box.getWidth()-2, 2);
-            
+            app.lineTo(box.getWidth() - 2, 2);
+
             //upper right corner
             //(width-2)+" "+(height-2)+" m"
-            app.moveTo(box.getWidth()-2, box.getHeight()-2);
-            
+            app.moveTo(box.getWidth() - 2, box.getHeight() - 2);
+
             //lower left corner
             //"2 2 l"
             app.lineTo(2, 2);
-            
+
             //"s"
             app.closePathStroke();
-        }
-        else {
+        } else {
             //draw nothing since it is the Off appearance
         }
         //"Q"
@@ -403,132 +341,217 @@ public static PdfAppearance getAppearanceRadioCross(boolean on, PdfWriter writer
 
         return app;
     }
-    
+
+    /**
+     * Getter for property checkType.
+     *
+     * @return Value of property checkType.
+     */
+    public int getCheckType() {
+        return this.checkType;
+    }
+
+    /**
+     * Sets the checked symbol. It can be
+     * TYPE_CHECK,
+     * TYPE_CIRCLE,
+     * TYPE_CROSS,
+     * TYPE_DIAMOND,
+     * TYPE_SQUARE and
+     * TYPE_STAR.
+     *
+     * @param checkType the checked symbol
+     */
+    public void setCheckType(int checkType) {
+        if (checkType < TYPE_CHECK || checkType > TYPE_STAR) {
+            checkType = TYPE_CHECK;
+        }
+        this.checkType = checkType;
+        setText(typeChars[checkType - 1]);
+        try {
+            setFont(BaseFont.createFont(BaseFont.ZAPFDINGBATS, BaseFont.WINANSI, false));
+        } catch (Exception e) {
+            throw new ExceptionConverter(e);
+        }
+    }
+
+    /**
+     * Getter for property onValue.
+     *
+     * @return Value of property onValue.
+     */
+    public String getOnValue() {
+        return this.onValue;
+    }
+
+    /**
+     * Sets the value when the field is checked.
+     *
+     * @param onValue the value when the field is checked
+     */
+    public void setOnValue(String onValue) {
+        this.onValue = onValue;
+    }
+
+    /**
+     * Getter for property checked.
+     *
+     * @return Value of property checked.
+     */
+    public boolean isChecked() {
+        return this.checked;
+    }
+
+    /**
+     * Sets the state of the field to checked or unchecked.
+     *
+     * @param checked the state of the field, true for checked and false for unchecked
+     */
+    public void setChecked(boolean checked) {
+        this.checked = checked;
+    }
+
     /**
-     * Gets a radio group. It's composed of the field specific keys, without the widget
-     * ones. This field is to be used as a field aggregator with {@link PdfFormField#addKid(PdfFormField) addKid()}.
-     * @param noToggleToOff if true, exactly one radio button must be selected at all
-     * times; clicking the currently selected button has no effect.
-     * If false, clicking
-     * the selected button deselects it, leaving no button selected.
-     * @param radiosInUnison if true, a group of radio buttons within a radio button field that
-     * use the same value for the on state will turn on and off in unison; that is if
-     * one is checked, they are all checked. If false, the buttons are mutually exclusive
-     * (the same behavior as HTML radio buttons)
+     * Gets a radio group. It's composed of the field specific keys, without the widget ones. This field is to be used
+     * as a field aggregator with {@link PdfFormField#addKid(PdfFormField) addKid()}.
+     *
+     * @param noToggleToOff  if true, exactly one radio button must be selected at all times; clicking the
+     *                       currently selected button has no effect. If false, clicking the selected
+     *                       button deselects it, leaving no button selected.
+     * @param radiosInUnison if true, a group of radio buttons within a radio button field that use the
+     *                       same value for the on state will turn on and off in unison; that is if one is checked, they
+     *                       are all checked. If false, the buttons are mutually exclusive (the same
+     *                       behavior as HTML radio buttons)
      * @return the radio group
-     */    
+     */
     public PdfFormField getRadioGroup(boolean noToggleToOff, boolean radiosInUnison) {
         PdfFormField field = PdfFormField.createRadioButton(writer, noToggleToOff);
-        if (radiosInUnison)
+        if (radiosInUnison) {
             field.setFieldFlags(PdfFormField.FF_RADIOSINUNISON);
+        }
         field.setFieldName(fieldName);
         field.setUserName(super.alternateFieldName);
-        field.setMappingName(super.mappingName);        if ((options & READ_ONLY) != 0)
+        field.setMappingName(super.mappingName);
+        if ((options & READ_ONLY) != 0) {
             field.setFieldFlags(PdfFormField.FF_READ_ONLY);
-        if ((options & REQUIRED) != 0)
+        }
+        if ((options & REQUIRED) != 0) {
             field.setFieldFlags(PdfFormField.FF_REQUIRED);
+        }
         field.setValueAsName(checked ? onValue : "Off");
         return field;
     }
-    
+
     /**
-     * Gets a parent of a checkbox autofill parent. 
-     * It is composed of the field specific keys, without the widget ones. 
+     * Gets a parent of a checkbox autofill parent. It is composed of the field specific keys, without the widget ones.
      * This field is to be used as a field aggregator with {@link PdfFormField#addKid(PdfFormField) addKid()}.
-     * 
+     *
      * @return the radio group
-     */    
+     */
     public PdfFormField getCheckboxParent() {
         PdfFormField field = PdfFormField.createCheckBox(super.writer);
-        
+
         field.setFieldName(super.fieldName);
         field.setUserName(super.alternateFieldName);
         field.setMappingName(super.mappingName);
-        
-        if ((super.options & READ_ONLY) != 0)
+
+        if ((super.options & READ_ONLY) != 0) {
             field.setFieldFlags(PdfFormField.FF_READ_ONLY);
-        if ((super.options & REQUIRED) != 0)
+        }
+        if ((super.options & REQUIRED) != 0) {
             field.setFieldFlags(PdfFormField.FF_REQUIRED);
-        
+        }
+
         field.setValueAsName(this.checked ? this.onValue : "Off");
         return field;
     }
-    
+
     /**
-     * Gets the child field. It's only composed of the widget keys and is valid for all autofill fields and radiobuttons. 
-     * Has to be used with {@link #getRadioGroup(boolean,boolean)} or {@link #getCheckboxParent()}.
-     * 
+     * Gets the child field. It's only composed of the widget keys and is valid for all autofill fields and
+     * radiobuttons. Has to be used with {@link #getRadioGroup(boolean, boolean)} or {@link #getCheckboxParent()}.
+     *
      * @return the radio field
-     * @throws IOException on error
+     * @throws IOException       on error
      * @throws DocumentException on error
-     */    
+     */
     public PdfFormField getKidField() throws IOException, DocumentException {
         return getField(true);
     }
-    
+
     /**
-     * Gets the full parent field (There are no kids)
-     * This is the case for non-autofill fields and non-radiobutton fields
-     * 
+     * Gets the full parent field (There are no kids) This is the case for non-autofill fields and non-radiobutton
+     * fields
+     *
      * @return the check field
-     * @throws IOException on error
+     * @throws IOException       on error
      * @throws DocumentException on error
-     */    
+     */
     public PdfFormField getFullField() throws IOException, DocumentException {
         return getField(false);
     }
-    
+
     /**
      * Gets a radio or check field.
+     *
      * @param isKid true to get a child field, false to get full parent field
-     * @throws IOException on error
-     * @throws DocumentException on error
      * @return the field
-     */    
+     * @throws IOException       on error
+     * @throws DocumentException on error
+     */
     protected PdfFormField getField(boolean isKid) throws IOException, DocumentException {
         PdfFormField field = null;
-        if (isKid)
+        if (isKid) {
             field = PdfFormField.createEmpty(writer);
-        else
+        } else {
             field = PdfFormField.createCheckBox(writer);
+        }
         field.setWidget(box, PdfAnnotation.HIGHLIGHT_INVERT);
         if (!isKid) {
             field.setFieldName(fieldName);
             field.setUserName(super.alternateFieldName);
             field.setMappingName(super.mappingName);
-            
-            if ((options & READ_ONLY) != 0) field.setFieldFlags(PdfFormField.FF_READ_ONLY);
-            if ((options & REQUIRED) != 0)  field.setFieldFlags(PdfFormField.FF_REQUIRED);
-            
-            field.setValueAsName(checked ? onValue : "Off");            
+
+            if ((options & READ_ONLY) != 0) {
+                field.setFieldFlags(PdfFormField.FF_READ_ONLY);
+            }
+            if ((options & REQUIRED) != 0) {
+                field.setFieldFlags(PdfFormField.FF_REQUIRED);
+            }
+
+            field.setValueAsName(checked ? onValue : "Off");
             //bugfixed as setting the type wasn't working (also mentioned on the mailinglist on 5th may 2011)
             setCheckType(checkType);
         }
-        if (text != null)
+        if (text != null) {
             field.setMKNormalCaption(text);
-        if (rotation != 0)
+        }
+        if (rotation != 0) {
             field.setMKRotation(rotation);
+        }
         field.setBorderStyle(new PdfBorderDictionary(borderWidth, borderStyle, new PdfDashPattern(3)));
         PdfAppearance tpon = getAppearance(true, super.writer, this.checkType, super.rotation, super.borderStyle,
-                        super.box, super.borderWidth, super.fontSize, super.text, super.textColor,
-                        super.backgroundColor, super.borderColor, super.getRealFont());
+                super.box, super.borderWidth, super.fontSize, super.text, super.textColor,
+                super.backgroundColor, super.borderColor, super.getRealFont());
         PdfAppearance tpoff = getAppearance(false, super.writer, this.checkType, super.rotation, super.borderStyle,
-                        super.box, super.borderWidth, super.fontSize, super.text, super.textColor,
-                        super.backgroundColor, super.borderColor, super.getRealFont());
+                super.box, super.borderWidth, super.fontSize, super.text, super.textColor,
+                super.backgroundColor, super.borderColor, super.getRealFont());
         field.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, onValue, tpon);
         field.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, "Off", tpoff);
         field.setAppearanceState(checked ? onValue : "Off");
-        PdfAppearance da = (PdfAppearance)tpon.getDuplicate();
+        PdfAppearance da = (PdfAppearance) tpon.getDuplicate();
         da.setFontAndSize(getRealFont(), fontSize);
-        if (textColor == null)
+        if (textColor == null) {
             da.setGrayFill(0);
-        else
+        } else {
             da.setColorFill(textColor);
+        }
         field.setDefaultAppearanceString(da);
-        if (borderColor != null)
+        if (borderColor != null) {
             field.setMKBorderColor(borderColor);
-        if (backgroundColor != null)
+        }
+        if (backgroundColor != null) {
             field.setMKBackgroundColor(backgroundColor);
+        }
         switch (visibility) {
             case HIDDEN:
                 field.setFlags(PdfAnnotation.FLAGS_PRINT | PdfAnnotation.FLAGS_HIDDEN);
@@ -542,13 +565,21 @@ protected PdfFormField getField(boolean isKid) throws IOException, DocumentExcep
                 field.setFlags(PdfAnnotation.FLAGS_PRINT);
                 break;
         }
-        
-        if ((visibility & INVISIBLE) != 0) field.addFlags(PdfAnnotation.FLAGS_INVISIBLE);
+
+        if ((visibility & INVISIBLE) != 0) {
+            field.addFlags(PdfAnnotation.FLAGS_INVISIBLE);
+        }
         //if ((visibility & HIDDEN) != 0) field.addFlags(PdfAnnotation.FLAGS_HIDDEN);
-        if ((visibility & PRINT) != 0) field.addFlags(PdfAnnotation.FLAGS_PRINT);
-        if ((visibility & NOVIEW) != 0) field.addFlags(PdfAnnotation.FLAGS_NOVIEW);
-        if ((visibility & LOCKED) != 0) field.addFlags(PdfAnnotation.FLAGS_LOCKED);
-        
+        if ((visibility & PRINT) != 0) {
+            field.addFlags(PdfAnnotation.FLAGS_PRINT);
+        }
+        if ((visibility & NOVIEW) != 0) {
+            field.addFlags(PdfAnnotation.FLAGS_NOVIEW);
+        }
+        if ((visibility & LOCKED) != 0) {
+            field.addFlags(PdfAnnotation.FLAGS_LOCKED);
+        }
+
         return field;
     }
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/RandomAccessFileOrArray.java b/openpdf/src/main/java/com/lowagie/text/pdf/RandomAccessFileOrArray.java
index 2b5458f55..491ad63e1 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/RandomAccessFileOrArray.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/RandomAccessFileOrArray.java
@@ -49,6 +49,9 @@
 
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.Document;
+import com.lowagie.text.FontFactory;
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.DataInput;
@@ -62,18 +65,13 @@
 import java.net.URL;
 import java.nio.channels.FileChannel;
 
-import com.lowagie.text.Document;
-import com.lowagie.text.FontFactory;
-import com.lowagie.text.error_messages.MessageLocalization;
-
 /**
- * An implementation of a RandomAccessFile for input only
- * that accepts a file or a byte array as data source.
+ * An implementation of a RandomAccessFile for input only that accepts a file or a byte array as data source.
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class RandomAccessFileOrArray implements DataInput, Closeable {
-    
+
     MappedRandomAccessFile rf;
     RandomAccessFile trf;
     boolean plainRandomAccess;
@@ -82,14 +80,16 @@ public class RandomAccessFileOrArray implements DataInput, Closeable {
     int arrayInPtr;
     byte back;
     boolean isBack = false;
-    
-    /** Holds value of property startOffset. */
+
+    /**
+     * Holds value of property startOffset.
+     */
     private int startOffset = 0;
 
     public RandomAccessFileOrArray(String filename) throws IOException {
         this(filename, false, Document.plainRandomAccess);
     }
-    
+
     public RandomAccessFileOrArray(String filename, boolean forceRead, boolean plainRandomAccess) throws IOException {
         this.plainRandomAccess = plainRandomAccess;
         File file = new File(filename);
@@ -98,43 +98,46 @@ public RandomAccessFileOrArray(String filename, boolean forceRead, boolean plain
             file = new File(filename);
         }
         if (!file.canRead()) {
-            if (filename.startsWith("file:/") || filename.startsWith("http://") 
-                    || filename.startsWith("https://") || filename.startsWith("jar:") || filename.startsWith("wsjar:")) {
+            if (filename.startsWith("file:/") || filename.startsWith("http://")
+                    || filename.startsWith("https://") || filename.startsWith("jar:") || filename.startsWith(
+                    "wsjar:")) {
                 try (InputStream is = new URL(filename).openStream()) {
                     this.arrayIn = InputStreamToArray(is);
                     return;
                 }
-            }
-            else {
+            } else {
                 InputStream is = null;
                 if ("-".equals(filename)) {
                     is = System.in;
-                }
-                else {
+                } else {
                     is = BaseFont.getResourceStream(filename);
                 }
-                if (is == null)
-                    throw new IOException(MessageLocalization.getComposedMessage("1.not.found.as.file.or.resource", filename));
+                if (is == null) {
+                    throw new IOException(
+                            MessageLocalization.getComposedMessage("1.not.found.as.file.or.resource", filename));
+                }
                 try {
                     this.arrayIn = InputStreamToArray(is);
                     return;
-                }
-                finally {
-                    try {is.close();}catch(IOException ioe){}
+                } finally {
+                    try {
+                        is.close();
+                    } catch (IOException ioe) {
+                    }
                 }
             }
-        }
-        else if (forceRead) {
+        } else if (forceRead) {
             try (InputStream s = new FileInputStream(file)) {
                 this.arrayIn = InputStreamToArray(s);
             }
             return;
         }
         this.filename = filename;
-        if (plainRandomAccess)
+        if (plainRandomAccess) {
             trf = new RandomAccessFile(filename, "r");
-        else
+        } else {
             rf = new MappedRandomAccessFile(filename, "r");
+        }
     }
 
     public RandomAccessFileOrArray(URL url) throws IOException {
@@ -146,61 +149,63 @@ public RandomAccessFileOrArray(URL url) throws IOException {
     public RandomAccessFileOrArray(InputStream is) throws IOException {
         this.arrayIn = InputStreamToArray(is);
     }
-    
+
+    public RandomAccessFileOrArray(byte[] arrayIn) {
+        this.arrayIn = arrayIn;
+    }
+
+    public RandomAccessFileOrArray(RandomAccessFileOrArray file) {
+        filename = file.filename;
+        arrayIn = file.arrayIn;
+        startOffset = file.startOffset;
+        plainRandomAccess = file.plainRandomAccess;
+    }
+
     public static byte[] InputStreamToArray(InputStream is) throws IOException {
         byte[] b = new byte[8192];
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         while (true) {
             int read = is.read(b);
-            if (read < 1)
+            if (read < 1) {
                 break;
+            }
             out.write(b, 0, read);
         }
         out.close();
         return out.toByteArray();
     }
 
-    public RandomAccessFileOrArray(byte[] arrayIn) {
-        this.arrayIn = arrayIn;
-    }
-    
-    public RandomAccessFileOrArray(RandomAccessFileOrArray file) {
-        filename = file.filename;
-        arrayIn = file.arrayIn;
-        startOffset = file.startOffset;
-        plainRandomAccess = file.plainRandomAccess;
-    }
-    
     public void pushBack(byte b) {
         back = b;
         isBack = true;
     }
-    
+
     public int read() throws IOException {
-        if(isBack) {
+        if (isBack) {
             isBack = false;
             return back & 0xff;
         }
-        if (arrayIn == null)
+        if (arrayIn == null) {
             return plainRandomAccess ? trf.read() : rf.read();
-        else {
-            if (arrayInPtr >= arrayIn.length)
+        } else {
+            if (arrayInPtr >= arrayIn.length) {
                 return -1;
+            }
             return arrayIn[arrayInPtr++] & 0xff;
         }
     }
-    
+
     public int read(byte[] b, int off, int len) throws IOException {
-        if (len == 0)
+        if (len == 0) {
             return 0;
+        }
         int n = 0;
         if (isBack) {
             isBack = false;
             if (len == 1) {
                 b[off] = back;
                 return 1;
-            }
-            else {
+            } else {
                 n = 1;
                 b[off++] = back;
                 --len;
@@ -208,40 +213,42 @@ public int read(byte[] b, int off, int len) throws IOException {
         }
         if (arrayIn == null) {
             return (plainRandomAccess ? trf.read(b, off, len) : rf.read(b, off, len)) + n;
-        }
-        else {
-            if (arrayInPtr >= arrayIn.length)
+        } else {
+            if (arrayInPtr >= arrayIn.length) {
                 return -1;
-            if (arrayInPtr + len > arrayIn.length)
+            }
+            if (arrayInPtr + len > arrayIn.length) {
                 len = arrayIn.length - arrayInPtr;
+            }
             System.arraycopy(arrayIn, arrayInPtr, b, off, len);
             arrayInPtr += len;
             return len + n;
         }
     }
-    
+
     public int read(byte[] b) throws IOException {
         return read(b, 0, b.length);
     }
-    
+
     public void readFully(byte[] b) throws IOException {
         readFully(b, 0, b.length);
     }
-    
+
     public void readFully(byte[] b, int off, int len) throws IOException {
         int n = 0;
         do {
             int count = read(b, off + n, len - n);
-            if (count < 0)
+            if (count < 0) {
                 throw new EOFException();
+            }
             n += count;
         } while (n < len);
     }
-    
+
     public long skip(long n) throws IOException {
-        return skipBytes((int)n);
+        return skipBytes((int) n);
     }
-    
+
     public int skipBytes(int n) throws IOException {
         if (n <= 0) {
             return 0;
@@ -251,8 +258,7 @@ public int skipBytes(int n) throws IOException {
             isBack = false;
             if (n == 1) {
                 return 1;
-            }
-            else {
+            } else {
                 --n;
                 adj = 1;
             }
@@ -260,7 +266,7 @@ public int skipBytes(int n) throws IOException {
         int pos;
         int len;
         int newpos;
-        
+
         pos = getFilePointer();
         len = length();
         newpos = pos + n;
@@ -268,31 +274,32 @@ public int skipBytes(int n) throws IOException {
             newpos = len;
         }
         seek(newpos);
-        
+
         /* return the actual number of bytes skipped */
         return newpos - pos + adj;
     }
-    
+
     public void reOpen() throws IOException {
         if (filename != null && rf == null && trf == null) {
-            if (plainRandomAccess)
+            if (plainRandomAccess) {
                 trf = new RandomAccessFile(filename, "r");
-            else
+            } else {
                 rf = new MappedRandomAccessFile(filename, "r");
+            }
         }
         seek(0);
     }
-    
+
     protected void insureOpen() throws IOException {
         if (filename != null && rf == null && trf == null) {
             reOpen();
         }
     }
-    
+
     public boolean isOpen() {
         return (filename == null || rf != null || trf != null);
     }
-    
+
     public void close() throws IOException {
         isBack = false;
         if (rf != null) {
@@ -302,121 +309,119 @@ public void close() throws IOException {
             // in iText it's faster the next re-openings to be done as a plain random access
             // file
             plainRandomAccess = true;
-        }
-        else if (trf != null) {
+        } else if (trf != null) {
             trf.close();
             trf = null;
         }
     }
-    
+
     public int length() throws IOException {
         if (arrayIn == null) {
             insureOpen();
-            return (int)(plainRandomAccess ? trf.length() : rf.length()) - startOffset;
-        }
-        else
+            return (int) (plainRandomAccess ? trf.length() : rf.length()) - startOffset;
+        } else {
             return arrayIn.length - startOffset;
+        }
     }
-    
+
     public void seek(int pos) throws IOException {
         pos += startOffset;
         isBack = false;
         if (arrayIn == null) {
             insureOpen();
-            if (plainRandomAccess)
+            if (plainRandomAccess) {
                 trf.seek(pos);
-            else
+            } else {
                 rf.seek(pos);
-        }
-        else
+            }
+        } else {
             arrayInPtr = pos;
+        }
     }
-    
+
     public void seek(long pos) throws IOException {
-        seek((int)pos);
+        seek((int) pos);
     }
-    
+
     public int getFilePointer() throws IOException {
         insureOpen();
         int n = isBack ? 1 : 0;
         if (arrayIn == null) {
-            return (int)(plainRandomAccess ? trf.getFilePointer() : rf.getFilePointer()) - n - startOffset;
-        }
-        else
+            return (int) (plainRandomAccess ? trf.getFilePointer() : rf.getFilePointer()) - n - startOffset;
+        } else {
             return arrayInPtr - n - startOffset;
+        }
     }
-    
+
     public boolean readBoolean() throws IOException {
         int ch = this.read();
-        if (ch < 0)
+        if (ch < 0) {
             throw new EOFException();
+        }
         return (ch != 0);
     }
-    
+
     public byte readByte() throws IOException {
         int ch = this.read();
-        if (ch < 0)
+        if (ch < 0) {
             throw new EOFException();
-        return (byte)(ch);
+        }
+        return (byte) (ch);
     }
-    
+
     public int readUnsignedByte() throws IOException {
         int ch = this.read();
-        if (ch < 0)
+        if (ch < 0) {
             throw new EOFException();
+        }
         return ch;
     }
-    
+
     public short readShort() throws IOException {
         int ch1 = this.read();
         int ch2 = this.read();
-        if ((ch1 | ch2) < 0)
+        if ((ch1 | ch2) < 0) {
             throw new EOFException();
-        return (short)((ch1 << 8) + ch2);
+        }
+        return (short) ((ch1 << 8) + ch2);
     }
-    
+
     /**
-     * Reads a signed 16-bit number from this stream in little-endian order.
-     * The method reads two
-     * bytes from this stream, starting at the current stream pointer.
-     * If the two bytes read, in order, are
+     * Reads a signed 16-bit number from this stream in little-endian order. The method reads two bytes from this
+     * stream, starting at the current stream pointer. If the two bytes read, in order, are
      * b1 and b2, where each of the two values is
-     * between 0 and 255, inclusive, then the
-     * result is equal to:
+     * between 0 and 255, inclusive, then the result is equal to:
      * 
                  *     (short)((b2 << 8) | b1)
      * 
            
      * 
            
-     * This method blocks until the two bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
+     * This method blocks until the two bytes are read, the end of the stream is detected, or an exception is thrown.
      *
-     * @return     the next two bytes of this stream, interpreted as a signed
-     *             16-bit number.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               two bytes.
-     * @exception  IOException   if an I/O error occurs.
+     * @return the next two bytes of this stream, interpreted as a signed 16-bit number.
+     * @throws EOFException if this stream reaches the end before reading two bytes.
+     * @throws IOException  if an I/O error occurs.
      */
     public final short readShortLE() throws IOException {
         int ch1 = this.read();
         int ch2 = this.read();
-        if ((ch1 | ch2) < 0)
+        if ((ch1 | ch2) < 0) {
             throw new EOFException();
-        return (short)((ch2 << 8) + (ch1 << 0));
+        }
+        return (short) ((ch2 << 8) + (ch1 << 0));
     }
-    
+
     public int readUnsignedShort() throws IOException {
         int ch1 = this.read();
         int ch2 = this.read();
-        if ((ch1 | ch2) < 0)
+        if ((ch1 | ch2) < 0) {
             throw new EOFException();
+        }
         return (ch1 << 8) + ch2;
     }
-    
+
     /**
-     * Reads an unsigned 16-bit number from this stream in little-endian order.
-     * This method reads
-     * two bytes from the stream, starting at the current stream pointer.
-     * If the bytes read, in order, are
+     * Reads an unsigned 16-bit number from this stream in little-endian order. This method reads two bytes from the
+     * stream, starting at the current stream pointer. If the bytes read, in order, are
      * b1 and b2, where
      * 0 <= b1, b2 <= 255,
      * then the result is equal to:
@@ -424,36 +429,33 @@ public int readUnsignedShort() throws IOException {
      *     (b2 << 8) | b1
      * 
      * 
            
-     * This method blocks until the two bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
+     * This method blocks until the two bytes are read, the end of the stream is detected, or an exception is thrown.
      *
-     * @return     the next two bytes of this stream, interpreted as an
-     *             unsigned 16-bit integer.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               two bytes.
-     * @exception  IOException   if an I/O error occurs.
+     * @return the next two bytes of this stream, interpreted as an unsigned 16-bit integer.
+     * @throws EOFException if this stream reaches the end before reading two bytes.
+     * @throws IOException  if an I/O error occurs.
      */
     public final int readUnsignedShortLE() throws IOException {
         int ch1 = this.read();
         int ch2 = this.read();
-        if ((ch1 | ch2) < 0)
+        if ((ch1 | ch2) < 0) {
             throw new EOFException();
+        }
         return (ch2 << 8) + (ch1 << 0);
     }
-    
+
     public char readChar() throws IOException {
         int ch1 = this.read();
         int ch2 = this.read();
-        if ((ch1 | ch2) < 0)
+        if ((ch1 | ch2) < 0) {
             throw new EOFException();
-        return (char)((ch1 << 8) + ch2);
+        }
+        return (char) ((ch1 << 8) + ch2);
     }
-    
+
     /**
-     * Reads a Unicode character from this stream in little-endian order.
-     * This method reads two
-     * bytes from the stream, starting at the current stream pointer.
-     * If the bytes read, in order, are
+     * Reads a Unicode character from this stream in little-endian order. This method reads two bytes from the stream,
+     * starting at the current stream pointer. If the bytes read, in order, are
      * b1 and b2, where
      * 0 <= b1, b2 <= 255,
      * then the result is equal to:
@@ -461,37 +463,35 @@ public char readChar() throws IOException {
      *     (char)((b2 << 8) | b1)
      * 
      * 
            
-     * This method blocks until the two bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
+     * This method blocks until the two bytes are read, the end of the stream is detected, or an exception is thrown.
      *
-     * @return     the next two bytes of this stream as a Unicode character.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               two bytes.
-     * @exception  IOException   if an I/O error occurs.
+     * @return the next two bytes of this stream as a Unicode character.
+     * @throws EOFException if this stream reaches the end before reading two bytes.
+     * @throws IOException  if an I/O error occurs.
      */
     public final char readCharLE() throws IOException {
         int ch1 = this.read();
         int ch2 = this.read();
-        if ((ch1 | ch2) < 0)
+        if ((ch1 | ch2) < 0) {
             throw new EOFException();
-        return (char)((ch2 << 8) + (ch1 << 0));
+        }
+        return (char) ((ch2 << 8) + (ch1 << 0));
     }
-    
+
     public int readInt() throws IOException {
         int ch1 = this.read();
         int ch2 = this.read();
         int ch3 = this.read();
         int ch4 = this.read();
-        if ((ch1 | ch2 | ch3 | ch4) < 0)
+        if ((ch1 | ch2 | ch3 | ch4) < 0) {
             throw new EOFException();
+        }
         return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + ch4);
     }
-    
+
     /**
-     * Reads a signed 32-bit integer from this stream in little-endian order.
-     * This method reads 4
-     * bytes from the stream, starting at the current stream pointer.
-     * If the bytes read, in order, are b1,
+     * Reads a signed 32-bit integer from this stream in little-endian order. This method reads 4 bytes from the stream,
+     * starting at the current stream pointer. If the bytes read, in order, are b1,
      * b2, b3, and b4, where
      * 0 <= b1, b2, b3, b4 <= 255,
      * then the result is equal to:
@@ -499,29 +499,27 @@ public int readInt() throws IOException {
      *     (b4 << 24) | (b3 << 16) + (b2 << 8) + b1
      * 
      * 
            
-     * This method blocks until the four bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
+     * This method blocks until the four bytes are read, the end of the stream is detected, or an exception is thrown.
      *
-     * @return     the next four bytes of this stream, interpreted as an
-     *             int.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               four bytes.
-     * @exception  IOException   if an I/O error occurs.
+     * @return the next four bytes of this stream, interpreted as an
+     * int.
+     * @throws EOFException if this stream reaches the end before reading four bytes.
+     * @throws IOException  if an I/O error occurs.
      */
     public final int readIntLE() throws IOException {
         int ch1 = this.read();
         int ch2 = this.read();
         int ch3 = this.read();
         int ch4 = this.read();
-        if ((ch1 | ch2 | ch3 | ch4) < 0)
+        if ((ch1 | ch2 | ch3 | ch4) < 0) {
             throw new EOFException();
+        }
         return ((ch4 << 24) + (ch3 << 16) + (ch2 << 8) + (ch1 << 0));
     }
-    
+
     /**
-     * Reads an unsigned 32-bit integer from this stream. This method reads 4
-     * bytes from the stream, starting at the current stream pointer.
-     * If the bytes read, in order, are b1,
+     * Reads an unsigned 32-bit integer from this stream. This method reads 4 bytes from the stream, starting at the
+     * current stream pointer. If the bytes read, in order, are b1,
      * b2, b3, and b4, where
      * 0 <= b1, b2, b3, b4 <= 255,
      * then the result is equal to:
@@ -529,66 +527,66 @@ public final int readIntLE() throws IOException {
      *     (b1 << 24) | (b2 << 16) + (b3 << 8) + b4
      * 
      * 
            
-     * This method blocks until the four bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
+     * This method blocks until the four bytes are read, the end of the stream is detected, or an exception is thrown.
      *
-     * @return     the next four bytes of this stream, interpreted as a
-     *             long.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               four bytes.
-     * @exception  IOException   if an I/O error occurs.
+     * @return the next four bytes of this stream, interpreted as a
+     * long.
+     * @throws EOFException if this stream reaches the end before reading four bytes.
+     * @throws IOException  if an I/O error occurs.
      */
     public final long readUnsignedInt() throws IOException {
         long ch1 = this.read();
         long ch2 = this.read();
         long ch3 = this.read();
         long ch4 = this.read();
-        if ((ch1 | ch2 | ch3 | ch4) < 0)
+        if ((ch1 | ch2 | ch3 | ch4) < 0) {
             throw new EOFException();
+        }
         return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4 << 0));
     }
-    
+
     public final long readUnsignedIntLE() throws IOException {
         long ch1 = this.read();
         long ch2 = this.read();
         long ch3 = this.read();
         long ch4 = this.read();
-        if ((ch1 | ch2 | ch3 | ch4) < 0)
+        if ((ch1 | ch2 | ch3 | ch4) < 0) {
             throw new EOFException();
+        }
         return ((ch4 << 24) + (ch3 << 16) + (ch2 << 8) + (ch1 << 0));
     }
-    
+
     public long readLong() throws IOException {
-        return ((long)(readInt()) << 32) + (readInt() & 0xFFFFFFFFL);
+        return ((long) (readInt()) << 32) + (readInt() & 0xFFFFFFFFL);
     }
-    
+
     public final long readLongLE() throws IOException {
         int i1 = readIntLE();
         int i2 = readIntLE();
-        return ((long)i2 << 32) + (i1 & 0xFFFFFFFFL);
+        return ((long) i2 << 32) + (i1 & 0xFFFFFFFFL);
     }
-    
+
     public float readFloat() throws IOException {
         return Float.intBitsToFloat(readInt());
     }
-    
+
     public final float readFloatLE() throws IOException {
         return Float.intBitsToFloat(readIntLE());
     }
-    
+
     public double readDouble() throws IOException {
         return Double.longBitsToDouble(readLong());
     }
-    
+
     public final double readDoubleLE() throws IOException {
         return Double.longBitsToDouble(readLongLE());
     }
-    
+
     public String readLine() throws IOException {
         StringBuilder input = new StringBuilder();
         int c = -1;
         boolean eol = false;
-        
+
         while (!eol) {
             switch (c = read()) {
                 case -1:
@@ -603,49 +601,52 @@ public String readLine() throws IOException {
                     }
                     break;
                 default:
-                    input.append((char)c);
+                    input.append((char) c);
                     break;
             }
         }
-        
+
         if ((c == -1) && (input.length() == 0)) {
             return null;
         }
         return input.toString();
     }
-    
+
     public String readUTF() throws IOException {
         return DataInputStream.readUTF(this);
     }
-    
-    /** Getter for property startOffset.
-     * @return Value of property startOffset.
+
+    /**
+     * Getter for property startOffset.
      *
+     * @return Value of property startOffset.
      */
     public int getStartOffset() {
         return this.startOffset;
     }
-    
-    /** Setter for property startOffset.
-     * @param startOffset New value of property startOffset.
+
+    /**
+     * Setter for property startOffset.
      *
+     * @param startOffset New value of property startOffset.
      */
     public void setStartOffset(int startOffset) {
         this.startOffset = startOffset;
     }
 
     /**
-     * @since 2.0.8
-     * @throws IOException on error
      * @return a ByteBuffer
+     * @throws IOException on error
+     * @since 2.0.8
      */
     public java.nio.ByteBuffer getNioByteBuffer() throws IOException {
         if (filename != null) {
             FileChannel channel;
-            if (plainRandomAccess)
+            if (plainRandomAccess) {
                 channel = trf.getChannel();
-            else
+            } else {
                 channel = rf.getChannel();
+            }
             return channel.map(FileChannel.MapMode.READ_ONLY, 0, channel.size());
         }
         return java.nio.ByteBuffer.wrap(arrayIn);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/SequenceList.java b/openpdf/src/main/java/com/lowagie/text/pdf/SequenceList.java
index 41f06d228..8536d6247 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/SequenceList.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/SequenceList.java
@@ -51,17 +51,16 @@
 import java.util.ListIterator;
 
 /**
- * This class expands a string into a list of numbers. The main use is to select a
- * range of pages.
+ * This class expands a string into a list of numbers. The main use is to select a range of pages.
  * 
            
- * The general syntax is:
            
- * [!][o][odd][e][even]start-end
+ * The general syntax is:
             [!][o][odd][e][even]start-end
  * 
            
- * You can have multiple ranges separated by commas ','. The '!' modifier removes the
- * range from what is already selected. The range changes are incremental, that is,
- * numbers are added or deleted as the range appears. The start or the end, but not both, can be omitted.
+ * You can have multiple ranges separated by commas ','. The '!' modifier removes the range from what is already
+ * selected. The range changes are incremental, that is, numbers are added or deleted as the range appears. The start or
+ * the end, but not both, can be omitted.
  */
 public class SequenceList {
+
     protected static final int COMMA = 1;
     protected static final int MINUS = 2;
     protected static final int NOT = 3;
@@ -91,23 +90,107 @@ protected SequenceList(String range) {
         ptr = 0;
         text = range.toCharArray();
     }
-    
+
+    /**
+     * Generates a list of numbers from a string.
+     *
+     * @param ranges    the comma separated ranges
+     * @param maxNumber the maximum number in the range
+     * @return a list with the numbers as Integer
+     */
+    public static List expand(String ranges, int maxNumber) {
+        SequenceList parse = new SequenceList(ranges);
+        List list = new LinkedList<>();
+        boolean sair = false;
+        while (!sair) {
+            sair = parse.getAttributes();
+            if (parse.low == -1 && parse.high == -1 && !parse.even && !parse.odd) {
+                continue;
+            }
+            if (parse.low < 1) {
+                parse.low = 1;
+            }
+            if (parse.high < 1 || parse.high > maxNumber) {
+                parse.high = maxNumber;
+            }
+            if (parse.low > maxNumber) {
+                parse.low = maxNumber;
+            }
+
+            //System.out.println("low="+parse.low+",high="+parse.high+",odd="+parse.odd+",even="+parse.even+",inverse="+parse.inverse);
+            int inc = 1;
+            if (parse.inverse) {
+                if (parse.low > parse.high) {
+                    int t = parse.low;
+                    parse.low = parse.high;
+                    parse.high = t;
+                }
+                for (ListIterator it = list.listIterator(); it.hasNext(); ) {
+                    int n = (Integer) it.next();
+                    if (parse.even && (n & 1) == 1) {
+                        continue;
+                    }
+                    if (parse.odd && (n & 1) == 0) {
+                        continue;
+                    }
+                    if (n >= parse.low && n <= parse.high) {
+                        it.remove();
+                    }
+                }
+            } else {
+                if (parse.low > parse.high) {
+                    inc = -1;
+                    if (parse.odd || parse.even) {
+                        --inc;
+                        if (parse.even) {
+                            parse.low &= ~1;
+                        } else {
+                            parse.low -= ((parse.low & 1) == 1 ? 0 : 1);
+                        }
+                    }
+                    for (int k = parse.low; k >= parse.high; k += inc) {
+                        list.add(k);
+                    }
+                } else {
+                    if (parse.odd || parse.even) {
+                        ++inc;
+                        if (parse.odd) {
+                            parse.low |= 1;
+                        } else {
+                            parse.low += ((parse.low & 1) == 1 ? 1 : 0);
+                        }
+                    }
+                    for (int k = parse.low; k <= parse.high; k += inc) {
+                        list.add(k);
+                    }
+                }
+            }
+//            for (int k = 0; k < list.size(); ++k)
+//                System.out.print(((Integer)list.get(k)).intValue() + ",");
+//            System.out.println();
+        }
+        return list;
+    }
+
     protected char nextChar() {
         while (true) {
-            if (ptr >= text.length)
+            if (ptr >= text.length) {
                 return EOT;
+            }
             char c = text[ptr++];
-            if (c > ' ')
+            if (c > ' ') {
                 return c;
+            }
         }
     }
-    
+
     protected void putBack() {
         --ptr;
-        if (ptr < 0)
+        if (ptr < 0) {
             ptr = 0;
+        }
     }
-    
+
     protected int getType() {
         StringBuilder buf = new StringBuilder();
         int state = FIRST;
@@ -117,8 +200,7 @@ protected int getType() {
                 if (state == DIGIT) {
                     number = Integer.parseInt(other = buf.toString());
                     return NUMBER;
-                }
-                else if (state == OTHER) {
+                } else if (state == OTHER) {
                     other = buf.toString().toLowerCase();
                     return TEXT;
                 }
@@ -135,24 +217,25 @@ else if (state == OTHER) {
                             return COMMA;
                     }
                     buf.append(c);
-                    if (c >= '0' && c <= '9')
+                    if (c >= '0' && c <= '9') {
                         state = DIGIT;
-                    else
+                    } else {
                         state = OTHER;
+                    }
                     break;
                 case DIGIT:
-                    if (c >= '0' && c <= '9')
+                    if (c >= '0' && c <= '9') {
                         buf.append(c);
-                    else {
+                    } else {
                         putBack();
                         number = Integer.parseInt(other = buf.toString());
                         return NUMBER;
                     }
                     break;
                 case OTHER:
-                    if (NOT_OTHER.indexOf(c) < 0)
+                    if (NOT_OTHER.indexOf(c) < 0) {
                         buf.append(c);
-                    else {
+                    } else {
                         putBack();
                         other = buf.toString().toLowerCase();
                         return TEXT;
@@ -161,18 +244,17 @@ else if (state == OTHER) {
             }
         }
     }
-    
+
     private void otherProc() {
         if (other.equals("odd") || other.equals("o")) {
             odd = true;
             even = false;
-        }
-        else if (other.equals("even") || other.equals("e")) {
+        } else if (other.equals("even") || other.equals("e")) {
             odd = false;
             even = true;
         }
     }
-    
+
     protected boolean getAttributes() {
         low = -1;
         high = -1;
@@ -181,8 +263,9 @@ protected boolean getAttributes() {
         while (true) {
             int type = getType();
             if (type == END || type == COMMA) {
-                if (state == DIGIT)
+                if (state == DIGIT) {
                     high = low;
+                }
                 return (type == END);
             }
             switch (state) {
@@ -198,9 +281,9 @@ protected boolean getAttributes() {
                             if (type == NUMBER) {
                                 low = number;
                                 state = DIGIT;
-                            }
-                            else
+                            } else {
                                 otherProc();
+                            }
                             break;
                     }
                     break;
@@ -242,76 +325,4 @@ protected boolean getAttributes() {
             }
         }
     }
-    
-    /**
-     * Generates a list of numbers from a string.
-     * @param ranges the comma separated ranges
-     * @param maxNumber the maximum number in the range
-     * @return a list with the numbers as Integer
-     */    
-    public static List expand(String ranges, int maxNumber) {
-        SequenceList parse = new SequenceList(ranges);
-        List list = new LinkedList<>();
-        boolean sair = false;
-        while (!sair) {
-            sair = parse.getAttributes();
-            if (parse.low == -1 && parse.high == -1 && !parse.even && !parse.odd)
-                continue;
-            if (parse.low < 1)
-                parse.low = 1;
-            if (parse.high < 1 || parse.high > maxNumber)
-                parse.high = maxNumber;
-            if (parse.low > maxNumber)
-                parse.low = maxNumber;
-            
-            //System.out.println("low="+parse.low+",high="+parse.high+",odd="+parse.odd+",even="+parse.even+",inverse="+parse.inverse);
-            int inc = 1;
-            if (parse.inverse) {
-                if (parse.low > parse.high) {
-                    int t = parse.low;
-                    parse.low = parse.high;
-                    parse.high = t;
-                }
-                for (ListIterator it = list.listIterator(); it.hasNext();) {
-                    int n = (Integer) it.next();
-                    if (parse.even && (n & 1) == 1)
-                        continue;
-                    if (parse.odd && (n & 1) == 0)
-                        continue;
-                    if (n >= parse.low && n <= parse.high)
-                        it.remove();
-                }
-            }
-            else {
-                if (parse.low > parse.high) {
-                    inc = -1;
-                    if (parse.odd || parse.even) {
-                        --inc;
-                        if (parse.even)
-                            parse.low &= ~1;
-                        else
-                            parse.low -= ((parse.low & 1) == 1 ? 0 : 1);
-                    }
-                    for (int k = parse.low; k >= parse.high; k += inc)
-                        list.add(k);
-                }
-                else {
-                    if (parse.odd || parse.even) {
-                        ++inc;
-                        if (parse.odd)
-                            parse.low |= 1;
-                        else
-                            parse.low += ((parse.low & 1) == 1 ? 1 : 0);
-                    }
-                    for (int k = parse.low; k <= parse.high; k += inc) {
-                        list.add(k);
-                    }
-                }
-            }
-//            for (int k = 0; k < list.size(); ++k)
-//                System.out.print(((Integer)list.get(k)).intValue() + ",");
-//            System.out.println();
-        }
-        return list;
-    }
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/ShadingColor.java b/openpdf/src/main/java/com/lowagie/text/pdf/ShadingColor.java
index a1365f2ab..9078b5bac 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/ShadingColor.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/ShadingColor.java
@@ -47,7 +47,8 @@
 
 package com.lowagie.text.pdf;
 
-/** Implements a shading pattern as a Color.
+/**
+ * Implements a shading pattern as a Color.
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
@@ -58,6 +59,7 @@ public class ShadingColor extends ExtendedColor {
 
     /**
      * Creates a shading color.
+     *
      * @param shadingPattern the shading pattern
      */
     public ShadingColor(PdfShadingPattern shadingPattern) {
@@ -67,18 +69,19 @@ public ShadingColor(PdfShadingPattern shadingPattern) {
 
     /**
      * Gets the shading pattern.
+     *
      * @return a shading pattern.
      */
     public PdfShadingPattern getPdfShadingPattern() {
         return shadingPattern;
     }
-    
+
     public boolean equals(Object obj) {
         return this == obj;
     }
-    
+
     public int hashCode() {
         return shadingPattern.hashCode();
     }
-    
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/SignatureType.java b/openpdf/src/main/java/com/lowagie/text/pdf/SignatureType.java
index 561ff2fa4..a17b1a786 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/SignatureType.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/SignatureType.java
@@ -1,65 +1,73 @@
 package com.lowagie.text.pdf;
 
 public enum SignatureType {
-    
+
     /**
      * Represents an unsigned (empty) signature field
      */
     UNSIGNED,
-    
+
     /**
      * Represents an incomplete or partly signed signature field. This signature should be considered broken.
      */
     INCOMPLETE,
-    
+
     /**
-     * Signed signature type. A document can contain one or more approval signatures. These signatures appear in signature form fields.
-     * *dobe Reader shows a green check mark when a valid approval signature, signed with an official certificate is present.
+     * Signed signature type. A document can contain one or more approval signatures. These signatures appear in
+     * signature form fields. *dobe Reader shows a green check mark when a valid approval signature, signed with an
+     * official certificate is present.
      */
     APPROVAL,
-    
+
     /**
-     * Signed signature type. A document can contain (only) one certification signature. This signature can define different permissions. 
-     * *dobe Reader shows a blue ribbon when a document was certified with an official certificate.
-     * 
+     * Signed signature type. A document can contain (only) one certification signature. This signature can define
+     * different permissions. *dobe Reader shows a blue ribbon when a document was certified with an official
+     * certificate.
+     * 
            
      * All changes to the document are permitted; no change to the document shall invalidate the signature.
-     */ 
+     */
     CERTIFICATION_ALL_CHANGES,
-    
+
     /**
-     * Signed signature type. A document can contain (only) one certification signature. This signature can define different permissions. 
-     * *dobe Reader shows a blue ribbon when a document was certified with an official certificate.
-     * 
+     * Signed signature type. A document can contain (only) one certification signature. This signature can define
+     * different permissions. *dobe Reader shows a blue ribbon when a document was certified with an official
+     * certificate.
+     * 
            
      * No changes to the document shall be permitted; any change to the document shall invalidate the signature.
-     */ 
+     */
     CERTIFICATION_NO_CHANGES,
-    
+
     /**
-     * Signed signature type. A document can contain (only) one certification signature. This signature can define different permissions. 
-     * *dobe Reader shows a blue ribbon when a document was certified with an official certificate.
-     * 
-     * Permitted changes shall be filling in forms, instantiating page templates, and signing; other changes shall invalidate the signature.
-     */ 
+     * Signed signature type. A document can contain (only) one certification signature. This signature can define
+     * different permissions. *dobe Reader shows a blue ribbon when a document was certified with an official
+     * certificate.
+     * 
            
+     * Permitted changes shall be filling in forms, instantiating page templates, and signing; other changes shall
+     * invalidate the signature.
+     */
     CERTIFICATION_FILLINGFORMS_SIGNING,
-    
+
     /**
-     * Signed signature type. A document can contain (only) one certification signature. This signature can define different permissions. 
-     * *dobe Reader shows a blue ribbon when a document was certified with an official certificate.
-     * 
-     * Permitted changes shall be the same as for 2, as well as annotation creation,deletion, and modification; other changes shall invalidate the signature.
-     */ 
+     * Signed signature type. A document can contain (only) one certification signature. This signature can define
+     * different permissions. *dobe Reader shows a blue ribbon when a document was certified with an official
+     * certificate.
+     * 
            
+     * Permitted changes shall be the same as for 2, as well as annotation creation,deletion, and modification; other
+     * changes shall invalidate the signature.
+     */
     CERTIFICATION_FILLINGFORMS_SIGNING_ANNOTATIONS,
-    
+
     /**
-     * Signed signature type. A document can contain one usage rights signature (in previous PDF specs two). 
-     * This signature is created by certain manufacturers using their own, proprietary key. When a PDF document is signed with 
-     * such a usage rights signature certain features might be unlocked. For instance *dobe has such a key which unlocks certain 
-     * features ('Reader enabled') in its reader software. But other vendors can use their own private key to enforce similar 
-     * usage rights in their own software. 
+     * Signed signature type. A document can contain one usage rights signature (in previous PDF specs two). This
+     * signature is created by certain manufacturers using their own, proprietary key. When a PDF document is signed
+     * with such a usage rights signature certain features might be unlocked. For instance *dobe has such a key which
+     * unlocks certain features ('Reader enabled') in its reader software. But other vendors can use their own private
+     * key to enforce similar usage rights in their own software.
      */
     USAGE_RIGHTS;
-    
+
     public boolean isCertificationType() {
-        return this==CERTIFICATION_NO_CHANGES || this==CERTIFICATION_FILLINGFORMS_SIGNING || this==CERTIFICATION_FILLINGFORMS_SIGNING_ANNOTATIONS || this== CERTIFICATION_ALL_CHANGES;
+        return this == CERTIFICATION_NO_CHANGES || this == CERTIFICATION_FILLINGFORMS_SIGNING
+                || this == CERTIFICATION_FILLINGFORMS_SIGNING_ANNOTATIONS || this == CERTIFICATION_ALL_CHANGES;
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/SimpleBookmark.java b/openpdf/src/main/java/com/lowagie/text/pdf/SimpleBookmark.java
index db1a6f748..79f05a058 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/SimpleBookmark.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/SimpleBookmark.java
@@ -47,6 +47,11 @@
 
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.error_messages.MessageLocalization;
+import com.lowagie.text.xml.XMLUtil;
+import com.lowagie.text.xml.simpleparser.IanaEncodings;
+import com.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
+import com.lowagie.text.xml.simpleparser.SimpleXMLParser;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -62,26 +67,16 @@
 import java.util.Stack;
 import java.util.StringTokenizer;
 
-import com.lowagie.text.error_messages.MessageLocalization;
-import com.lowagie.text.xml.XMLUtil;
-import com.lowagie.text.xml.simpleparser.IanaEncodings;
-import com.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
-import com.lowagie.text.xml.simpleparser.SimpleXMLParser;
-
 /**
- * Bookmark processing in a simple way. It has some limitations, mainly the only
- * action types supported are GoTo, GoToR, URI and Launch.
+ * Bookmark processing in a simple way. It has some limitations, mainly the only action types supported are GoTo, GoToR,
+ * URI and Launch.
  * 
            
- * The list structure is composed by a number of HashMap, keyed by strings, one HashMap
- * for each bookmark.
- * The element values are all strings with the exception of the key "Kids" that has
- * another list for the child bookmarks.
+ * The list structure is composed by a number of HashMap, keyed by strings, one HashMap for each bookmark. The element
+ * values are all strings with the exception of the key "Kids" that has another list for the child bookmarks.
  * 
            
- * All the bookmarks have a "Title" with the
- * bookmark title and optionally a "Style" that can be "bold", "italic" or a
- * combination of both. They can also have a "Color" key with a value of three
- * floats separated by spaces. The key "Open" can have the values "true" or "false" and
- * signals the open status of the children. It's "true" by default.
+ * All the bookmarks have a "Title" with the bookmark title and optionally a "Style" that can be "bold", "italic" or a
+ * combination of both. They can also have a "Color" key with a value of three floats separated by spaces. The key
+ * "Open" can have the values "true" or "false" and signals the open status of the children. It's "true" by default.
  * 
            
  * The actions and the parameters can be:
  * 
              
@@ -112,8 +107,8 @@
  */
 public final class SimpleBookmark implements SimpleXMLDocHandler {
 
-    private List> topList;
     private final Stack> attr = new Stack<>();
+    private List> topList;
 
     /**
      * Creates a new instance of SimpleBookmark
@@ -136,153 +131,159 @@ private static List> bookmarkDepth(PdfDictionary outline,
                 out.append(color.getAsNumber(2).floatValue());
                 map.put("Color", PdfEncodings.convertToString(out.toByteArray(), null));
             }
-            PdfNumber style = (PdfNumber)PdfReader.getPdfObjectRelease(outline.get(PdfName.F));
+            PdfNumber style = (PdfNumber) PdfReader.getPdfObjectRelease(outline.get(PdfName.F));
             if (style != null) {
                 int f = style.intValue();
                 String s = "";
-                if ((f & 1) != 0)
+                if ((f & 1) != 0) {
                     s += "italic ";
-                if ((f & 2) != 0)
+                }
+                if ((f & 2) != 0) {
                     s += "bold ";
+                }
                 s = s.trim();
-                if (s.length() != 0) 
+                if (s.length() != 0) {
                     map.put("Style", s);
+                }
             }
-            PdfNumber count = (PdfNumber)PdfReader.getPdfObjectRelease(outline.get(PdfName.COUNT));
-            if (count != null && count.intValue() < 0)
+            PdfNumber count = (PdfNumber) PdfReader.getPdfObjectRelease(outline.get(PdfName.COUNT));
+            if (count != null && count.intValue() < 0) {
                 map.put("Open", "false");
+            }
             try {
                 PdfObject dest = PdfReader.getPdfObjectRelease(outline.get(PdfName.DEST));
                 if (dest != null) {
                     mapGotoBookmark(map, dest, pages); //changed by ujihara 2004-06-13
-                }
-                else {
-                    PdfDictionary action = (PdfDictionary)PdfReader.getPdfObjectRelease(outline.get(PdfName.A));
+                } else {
+                    PdfDictionary action = (PdfDictionary) PdfReader.getPdfObjectRelease(outline.get(PdfName.A));
                     if (action != null) {
                         if (PdfName.GOTO.equals(PdfReader.getPdfObjectRelease(action.get(PdfName.S)))) {
                             dest = PdfReader.getPdfObjectRelease(action.get(PdfName.D));
                             if (dest != null) {
                                 mapGotoBookmark(map, dest, pages);
                             }
-                        }
-                        else if (PdfName.URI.equals(PdfReader.getPdfObjectRelease(action.get(PdfName.S)))) {
+                        } else if (PdfName.URI.equals(PdfReader.getPdfObjectRelease(action.get(PdfName.S)))) {
                             map.put("Action", "URI");
-                            map.put("URI", ((PdfString)PdfReader.getPdfObjectRelease(action.get(PdfName.URI))).toUnicodeString());
-                        }
-                        else if (PdfName.GOTOR.equals(PdfReader.getPdfObjectRelease(action.get(PdfName.S)))) {
+                            map.put("URI", ((PdfString) PdfReader.getPdfObjectRelease(
+                                    action.get(PdfName.URI))).toUnicodeString());
+                        } else if (PdfName.GOTOR.equals(PdfReader.getPdfObjectRelease(action.get(PdfName.S)))) {
                             dest = PdfReader.getPdfObjectRelease(action.get(PdfName.D));
                             if (dest != null) {
-                                if (dest.isString())
+                                if (dest.isString()) {
                                     map.put("Named", dest.toString());
-                                else if (dest.isName())
+                                } else if (dest.isName()) {
                                     map.put("NamedN", PdfName.decodeName(dest.toString()));
-                                else if (dest.isArray()) {
-                                    PdfArray arr = (PdfArray)dest;
+                                } else if (dest.isArray()) {
+                                    PdfArray arr = (PdfArray) dest;
                                     StringBuilder s = new StringBuilder();
                                     s.append(arr.getPdfObject(0).toString());
                                     s.append(' ').append(arr.getPdfObject(1).toString());
-                                    for (int k = 2; k < arr.size(); ++k)
+                                    for (int k = 2; k < arr.size(); ++k) {
                                         s.append(' ').append(arr.getPdfObject(k).toString());
+                                    }
                                     map.put("Page", s.toString());
                                 }
                             }
                             map.put("Action", "GoToR");
                             PdfObject file = PdfReader.getPdfObjectRelease(action.get(PdfName.F));
                             if (file != null) {
-                                if (file.isString())
-                                    map.put("File", ((PdfString)file).toUnicodeString());
-                                else if (file.isDictionary()) {
-                                    file = PdfReader.getPdfObject(((PdfDictionary)file).get(PdfName.F));
-                                    if (file.isString())
-                                        map.put("File", ((PdfString)file).toUnicodeString());
+                                if (file.isString()) {
+                                    map.put("File", ((PdfString) file).toUnicodeString());
+                                } else if (file.isDictionary()) {
+                                    file = PdfReader.getPdfObject(((PdfDictionary) file).get(PdfName.F));
+                                    if (file.isString()) {
+                                        map.put("File", ((PdfString) file).toUnicodeString());
+                                    }
                                 }
                             }
                             PdfObject newWindow = PdfReader.getPdfObjectRelease(action.get(PdfName.NEWWINDOW));
-                            if (newWindow != null)
+                            if (newWindow != null) {
                                 map.put("NewWindow", newWindow.toString());
-                        }
-                        else if (PdfName.LAUNCH.equals(PdfReader.getPdfObjectRelease(action.get(PdfName.S)))) {
+                            }
+                        } else if (PdfName.LAUNCH.equals(PdfReader.getPdfObjectRelease(action.get(PdfName.S)))) {
                             map.put("Action", "Launch");
                             PdfObject file = PdfReader.getPdfObjectRelease(action.get(PdfName.F));
-                            if (file == null)
+                            if (file == null) {
                                 file = PdfReader.getPdfObjectRelease(action.get(PdfName.WIN));
+                            }
                             if (file != null) {
-                                if (file.isString())
-                                    map.put("File", ((PdfString)file).toUnicodeString());
-                                else if (file.isDictionary()) {
-                                    file = PdfReader.getPdfObjectRelease(((PdfDictionary)file).get(PdfName.F));
-                                    if (file.isString())
-                                        map.put("File", ((PdfString)file).toUnicodeString());
+                                if (file.isString()) {
+                                    map.put("File", ((PdfString) file).toUnicodeString());
+                                } else if (file.isDictionary()) {
+                                    file = PdfReader.getPdfObjectRelease(((PdfDictionary) file).get(PdfName.F));
+                                    if (file.isString()) {
+                                        map.put("File", ((PdfString) file).toUnicodeString());
+                                    }
                                 }
                             }
                         }
                     }
                 }
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 //empty on purpose
             }
-            PdfDictionary first = (PdfDictionary)PdfReader.getPdfObjectRelease(outline.get(PdfName.FIRST));
+            PdfDictionary first = (PdfDictionary) PdfReader.getPdfObjectRelease(outline.get(PdfName.FIRST));
             if (first != null) {
                 map.put("Kids", bookmarkDepth(first, pages));
             }
             list.add(map);
-            outline = (PdfDictionary)PdfReader.getPdfObjectRelease(outline.get(PdfName.NEXT));
+            outline = (PdfDictionary) PdfReader.getPdfObjectRelease(outline.get(PdfName.NEXT));
         }
         return list;
     }
-    
-    private static void mapGotoBookmark(Map map, PdfObject dest, IntHashtable pages)
-    {
-        if (dest.isString())
+
+    private static void mapGotoBookmark(Map map, PdfObject dest, IntHashtable pages) {
+        if (dest.isString()) {
             map.put("Named", dest.toString());
-        else if (dest.isName())
+        } else if (dest.isName()) {
             map.put("Named", PdfName.decodeName(dest.toString()));
-        else if (dest.isArray()) 
-            map.put("Page", makeBookmarkParam((PdfArray)dest, pages)); //changed by ujihara 2004-06-13
+        } else if (dest.isArray()) {
+            map.put("Page", makeBookmarkParam((PdfArray) dest, pages)); //changed by ujihara 2004-06-13
+        }
         map.put("Action", "GoTo");
     }
 
-    private static String makeBookmarkParam(PdfArray dest, IntHashtable pages)
-    {
+    private static String makeBookmarkParam(PdfArray dest, IntHashtable pages) {
         StringBuilder s = new StringBuilder();
-        if (dest.size() == 0)
-        		throw new IllegalArgumentException("Illegal bookmark destination");
+        if (dest.size() == 0) {
+            throw new IllegalArgumentException("Illegal bookmark destination");
+        }
         PdfObject obj = dest.getPdfObject(0);
-        if (obj.isNumber())
-            s.append(((PdfNumber)obj).intValue() + 1);
-        else
-            s.append(pages.get(getNumber((PdfIndirectReference)obj))); //changed by ujihara 2004-06-13
+        if (obj.isNumber()) {
+            s.append(((PdfNumber) obj).intValue() + 1);
+        } else {
+            s.append(pages.get(getNumber((PdfIndirectReference) obj))); //changed by ujihara 2004-06-13
+        }
         s.append(' ').append(dest.getPdfObject(1).toString().substring(1));
-        for (int k = 2; k < dest.size(); ++k)
+        for (int k = 2; k < dest.size(); ++k) {
             s.append(' ').append(dest.getPdfObject(k).toString());
+        }
         return s.toString();
     }
-    
+
     /**
-     * Gets number of indirect. If type of directed indirect is PAGES, it refers PAGE object through KIDS.
-     * (Contributed by Kazuya Ujihara)
-     * @param indirect 
-     * 2004-06-13
+     * Gets number of indirect. If type of directed indirect is PAGES, it refers PAGE object through KIDS. (Contributed
+     * by Kazuya Ujihara)
+     *
+     * @param indirect 2004-06-13
      */
-    private static int getNumber(PdfIndirectReference indirect)
-    {
-        PdfDictionary pdfObj = (PdfDictionary)PdfReader.getPdfObjectRelease(indirect);
-        if (pdfObj.contains(PdfName.TYPE) && pdfObj.get(PdfName.TYPE).equals(PdfName.PAGES) && pdfObj.contains(PdfName.KIDS)) 
-        {
-            PdfArray kids = (PdfArray)pdfObj.get(PdfName.KIDS);
-            indirect = (PdfIndirectReference)kids.getPdfObject(0);
+    private static int getNumber(PdfIndirectReference indirect) {
+        PdfDictionary pdfObj = (PdfDictionary) PdfReader.getPdfObjectRelease(indirect);
+        if (pdfObj.contains(PdfName.TYPE) && pdfObj.get(PdfName.TYPE).equals(PdfName.PAGES) && pdfObj.contains(
+                PdfName.KIDS)) {
+            PdfArray kids = (PdfArray) pdfObj.get(PdfName.KIDS);
+            indirect = (PdfIndirectReference) kids.getPdfObject(0);
         }
         return indirect.getNumber();
     }
-    
+
     /**
-     * Gets a List with the bookmarks. It returns null if
-     * the document doesn't have any bookmarks.
+     * Gets a List with the bookmarks. It returns null if the document doesn't have any
+     * bookmarks.
+     *
      * @param reader the document
-     * @return a List with the bookmarks or null if the
-     * document doesn't have any
-     */    
+     * @return a List with the bookmarks or null if the document doesn't have any
+     */
     public static List> getBookmarkList(PdfReader reader) {
         PdfDictionary catalog = reader.getCatalog();
         PdfObject obj = PdfReader.getPdfObjectRelease(catalog.get(PdfName.OUTLINES));
@@ -301,10 +302,10 @@ public static List> getBookmarkList(PdfReader reader) {
     }
 
     /**
-     * Removes the bookmark entries for a number of page ranges. The page ranges consists of a
-     * number of pairs with the start/end page range. The page numbers are inclusive.
+     * Removes the bookmark entries for a number of page ranges. The page ranges consists of a number of pairs with the
+     * start/end page range. The page numbers are inclusive.
      *
-     * @param list the bookmarks
+     * @param list      the bookmarks
      * @param pageRange the page ranges, always in pairs.
      */
     public static void eliminatePages(List> list, int[] pageRange) {
@@ -354,20 +355,19 @@ public static void eliminatePages(List> list, int[] pageRang
             }
         }
     }
-    
+
     /**
-     * For the pages in range add the pageShift to the page number.
-     * The page ranges
-     * consists of a number of pairs with the start/end page range. The page numbers
-     * are inclusive.
-     * @param list the bookmarks
+     * For the pages in range add the pageShift to the page number. The page ranges consists of a number of
+     * pairs with the start/end page range. The page numbers are inclusive.
+     *
+     * @param list      the bookmarks
      * @param pageShift the number to add to the pages in range
-     * @param pageRange the page ranges, always in pairs. It can be null
-     * to include all the pages
-     */    
+     * @param pageRange the page ranges, always in pairs. It can be null to include all the pages
+     */
     public static void shiftPageNumbersInRange(List> list, int pageShift, int[] pageRange) {
-        if (list == null)
+        if (list == null) {
             return;
+        }
         for (Map map : list) {
             if ("GoTo".equals(map.get("Action"))) {
                 String page = (String) map.get("Page");
@@ -375,14 +375,15 @@ public static void shiftPageNumbersInRange(List> list, int p
                     page = page.trim();
                     int idx = page.indexOf(' ');
                     int pageNum;
-                    if (idx < 0)
+                    if (idx < 0) {
                         pageNum = Integer.parseInt(page);
-                    else
+                    } else {
                         pageNum = Integer.parseInt(page.substring(0, idx));
+                    }
                     boolean hit = false;
-                    if (pageRange == null)
+                    if (pageRange == null) {
                         hit = true;
-                    else {
+                    } else {
                         int len = pageRange.length & 0xfffffffe;
                         for (int k = 0; k < len; k += 2) {
                             if (pageNum >= pageRange[k] && pageNum <= pageRange[k + 1]) {
@@ -392,9 +393,9 @@ public static void shiftPageNumbersInRange(List> list, int p
                         }
                     }
                     if (hit) {
-                        if (idx < 0)
+                        if (idx < 0) {
                             page = Integer.toString(pageNum + pageShift);
-                        else {
+                        } else {
                             page = (pageNum + pageShift) + page.substring(idx);
                         }
                     }
@@ -446,8 +447,7 @@ static void createOutlineAction(PdfDictionary outline, Map map,
                     }
                     outline.put(PdfName.DEST, ar);
                 }
-            }
-            else if ("GoToR".equals(action)) {
+            } else if ("GoToR".equals(action)) {
                 String p;
                 PdfDictionary dic = new PdfDictionary();
                 if ((p = (String) map.get("Named")) != null) {
@@ -480,19 +480,19 @@ else if ("GoToR".equals(action)) {
                 }
                 String file = (String) map.get("File");
                 if (dic.size() > 0 && file != null) {
-                    dic.put(PdfName.S,  PdfName.GOTOR);
+                    dic.put(PdfName.S, PdfName.GOTOR);
                     dic.put(PdfName.F, new PdfString(file));
                     String nw = (String) map.get("NewWindow");
                     if (nw != null) {
-                        if (nw.equals("true"))
+                        if (nw.equals("true")) {
                             dic.put(PdfName.NEWWINDOW, PdfBoolean.PDFTRUE);
-                        else if (nw.equals("false"))
+                        } else if (nw.equals("false")) {
                             dic.put(PdfName.NEWWINDOW, PdfBoolean.PDFFALSE);
+                        }
                     }
                     outline.put(PdfName.A, dic);
                 }
-            }
-            else if ("URI".equals(action)) {
+            } else if ("URI".equals(action)) {
                 String uri = (String) map.get("URI");
                 if (uri != null) {
                     PdfDictionary dic = new PdfDictionary();
@@ -500,8 +500,7 @@ else if ("URI".equals(action)) {
                     dic.put(PdfName.URI, new PdfString(uri));
                     outline.put(PdfName.A, dic);
                 }
-            }
-            else if ("Launch".equals(action)) {
+            } else if ("Launch".equals(action)) {
                 String file = (String) map.get("File");
                 if (file != null) {
                     PdfDictionary dic = new PdfDictionary();
@@ -545,12 +544,14 @@ public static Object[] iterateOutlines(PdfWriter writer, PdfIndirectReference pa
                 }
             }
             outline.put(PdfName.PARENT, parent);
-            if (ptr > 0)
+            if (ptr > 0) {
                 outline.put(PdfName.PREV, refs[ptr - 1]);
-            if (ptr < refs.length - 1)
+            }
+            if (ptr < refs.length - 1) {
                 outline.put(PdfName.NEXT, refs[ptr + 1]);
-            outline.put(PdfName.TITLE, new PdfString((String)map.get("Title"), PdfObject.TEXT_UNICODE));
-            String color = (String)map.get("Color");
+            }
+            outline.put(PdfName.TITLE, new PdfString((String) map.get("Title"), PdfObject.TEXT_UNICODE));
+            String color = (String) map.get("Color");
             if (color != null) {
                 try {
                     PdfArray arr = new PdfArray();
@@ -570,16 +571,19 @@ public static Object[] iterateOutlines(PdfWriter writer, PdfIndirectReference pa
                     //in case it's malformed
                 }
             }
-            String style = (String)map.get("Style");
+            String style = (String) map.get("Style");
             if (style != null) {
                 style = style.toLowerCase();
                 int bits = 0;
-                if (style.contains("italic"))
+                if (style.contains("italic")) {
                     bits |= 1;
-                if (style.contains("bold"))
+                }
+                if (style.contains("bold")) {
                     bits |= 2;
-                if (bits != 0)
+                }
+                if (bits != 0) {
                     outline.put(PdfName.F, new PdfNumber(bits));
+                }
             }
             createOutlineAction(outline, map, writer, namedAsNames);
             writer.addToBody(outline, refs[ptr]);
@@ -588,13 +592,13 @@ public static Object[] iterateOutlines(PdfWriter writer, PdfIndirectReference pa
     }
 
     /**
-     * Exports the bookmarks to XML. Only of use if the generation is to be include in
-     * some other XML document.
-     * @param list the bookmarks
-     * @param out the export destination. The writer is not closed
-     * @param indent the indentation level. Pretty printing significant only
-     * @param onlyASCII codes above 127 will always be escaped with &#nn; if true,
-     * whatever the encoding
+     * Exports the bookmarks to XML. Only of use if the generation is to be include in some other XML document.
+     *
+     * @param list      the bookmarks
+     * @param out       the export destination. The writer is not closed
+     * @param indent    the indentation level. Pretty printing significant only
+     * @param onlyASCII codes above 127 will always be escaped with &#nn; if true, whatever the
+     *                  encoding
      * @throws IOException on error
      */
     public static void exportToXMLNode(List list, Writer out, int indent, boolean onlyASCII) throws IOException {
@@ -619,15 +623,17 @@ public static void exportToXMLNode(List list, Writer out, int indent, boolean on
                     out.write(key);
                     out.write("=\"");
                     String value = (String) entry.getValue();
-                    if (key.equals("Named") || key.equals("NamedN"))
+                    if (key.equals("Named") || key.equals("NamedN")) {
                         value = SimpleNamedDestination.escapeBinaryString(value);
+                    }
                     out.write(XMLUtil.escapeXML(value, onlyASCII));
                     out.write("\" ");
                 }
             }
             out.write(">");
-            if (title == null)
+            if (title == null) {
                 title = "";
+            }
             out.write(XMLUtil.escapeXML(title, onlyASCII));
             if (kids != null) {
                 out.write("\n");
@@ -657,11 +663,12 @@ public static void exportToXMLNode(List list, Writer out, int indent, boolean on
      * >
      * <!ELEMENT Bookmark (Title)*>
      * 
-     * @param list the bookmarks
-     * @param out the export destination. The stream is not closed
-     * @param encoding the encoding according to IANA conventions
-     * @param onlyASCII codes above 127 will always be escaped with &#nn; if true,
-     * whatever the encoding
+     *
+     * @param list      the bookmarks
+     * @param out       the export destination. The stream is not closed
+     * @param encoding  the encoding according to IANA conventions
+     * @param onlyASCII codes above 127 will always be escaped with &#nn; if true, whatever the
+     *                  encoding
      * @throws IOException on error
      */
     public static void exportToXML(List list, OutputStream out, String encoding, boolean onlyASCII) throws IOException {
@@ -672,11 +679,12 @@ public static void exportToXML(List list, OutputStream out, String encoding, boo
 
     /**
      * Exports the bookmarks to XML.
-     * @param list the bookmarks
-     * @param wrt the export destination. The writer is not closed
-     * @param encoding the encoding according to IANA conventions
-     * @param onlyASCII codes above 127 will always be escaped with &#nn; if true,
-     * whatever the encoding
+     *
+     * @param list      the bookmarks
+     * @param wrt       the export destination. The writer is not closed
+     * @param encoding  the encoding according to IANA conventions
+     * @param onlyASCII codes above 127 will always be escaped with &#nn; if true, whatever the
+     *                  encoding
      * @throws IOException on error
      */
     public static void exportToXML(List list, Writer wrt, String encoding, boolean onlyASCII) throws IOException {
@@ -690,9 +698,10 @@ public static void exportToXML(List list, Writer wrt, String encoding, boolean o
 
     /**
      * Import the bookmarks from XML.
+     *
      * @param in the XML source. The stream is not closed
-     * @throws IOException on error
      * @return the bookmarks
+     * @throws IOException on error
      */
     public static List> importFromXML(InputStream in) throws IOException {
         SimpleBookmark book = new SimpleBookmark();
@@ -702,9 +711,10 @@ public static List> importFromXML(InputStream in) throws IOE
 
     /**
      * Import the bookmarks from XML.
+     *
      * @param in the XML source. The reader is not closed
-     * @throws IOException on error
      * @return the bookmarks
+     * @throws IOException on error
      */
     public static List> importFromXML(Reader in) throws IOException {
         SimpleBookmark book = new SimpleBookmark();
@@ -717,25 +727,29 @@ public void endDocument() {
 
     public void endElement(String tag) {
         if (tag.equals("Bookmark")) {
-            if (attr.isEmpty())
+            if (attr.isEmpty()) {
                 return;
-            else
+            } else {
                 throw new RuntimeException(MessageLocalization.getComposedMessage("bookmark.end.tag.out.of.place"));
+            }
         }
-        if (!tag.equals("Title"))
+        if (!tag.equals("Title")) {
             throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.end.tag.1", tag));
+        }
         Map attributes = attr.pop();
         String title = (String) attributes.get("Title");
-        attributes.put("Title",  title.trim());
+        attributes.put("Title", title.trim());
         String named = (String) attributes.get("Named");
-        if (named != null)
+        if (named != null) {
             attributes.put("Named", SimpleNamedDestination.unEscapeBinaryString(named));
+        }
         named = (String) attributes.get("NamedN");
-        if (named != null)
+        if (named != null) {
             attributes.put("NamedN", SimpleNamedDestination.unEscapeBinaryString(named));
-        if (attr.isEmpty())
+        }
+        if (attr.isEmpty()) {
             topList.add(attributes);
-        else {
+        } else {
             Map parent = attr.peek();
             @SuppressWarnings("unchecked")
             List> kids = (List>) parent.get("Kids");
@@ -755,12 +769,14 @@ public void startElement(String tag, Map h) {
             if (tag.equals("Bookmark")) {
                 topList = new ArrayList<>();
                 return;
+            } else {
+                throw new RuntimeException(
+                        MessageLocalization.getComposedMessage("root.element.is.not.bookmark.1", tag));
             }
-            else
-                throw new RuntimeException(MessageLocalization.getComposedMessage("root.element.is.not.bookmark.1", tag));
         }
-        if (!tag.equals("Title"))
+        if (!tag.equals("Title")) {
             throw new RuntimeException(MessageLocalization.getComposedMessage("tag.1.not.allowed", tag));
+        }
         Map attributes = new HashMap<>(h);
         attributes.put("Title", "");
         attributes.remove("Kids");
@@ -768,8 +784,9 @@ public void startElement(String tag, Map h) {
     }
 
     public void text(String str) {
-        if (attr.isEmpty())
+        if (attr.isEmpty()) {
             return;
+        }
         Map attributes = attr.peek();
         String title = (String) attributes.get("Title");
         title += str;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/SimpleNamedDestination.java b/openpdf/src/main/java/com/lowagie/text/pdf/SimpleNamedDestination.java
index 2078731df..0b999fe3d 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/SimpleNamedDestination.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/SimpleNamedDestination.java
@@ -46,6 +46,11 @@
  */
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.error_messages.MessageLocalization;
+import com.lowagie.text.xml.XMLUtil;
+import com.lowagie.text.xml.simpleparser.IanaEncodings;
+import com.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
+import com.lowagie.text.xml.simpleparser.SimpleXMLParser;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -57,19 +62,12 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.StringTokenizer;
-import com.lowagie.text.error_messages.MessageLocalization;
-
-import com.lowagie.text.xml.simpleparser.IanaEncodings;
-import com.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
-import com.lowagie.text.xml.simpleparser.SimpleXMLParser;
-import com.lowagie.text.xml.XMLUtil;
 
 /**
- *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public final class SimpleNamedDestination implements SimpleXMLDocHandler {
-    
+
     private HashMap xmlNames;
     private Map xmlLast;
 
@@ -80,21 +78,23 @@ private SimpleNamedDestination() {
     public static HashMap getNamedDestination(PdfReader reader, boolean fromNames) {
         IntHashtable pages = new IntHashtable();
         int numPages = reader.getNumberOfPages();
-        for (int k = 1; k <= numPages; ++k)
+        for (int k = 1; k <= numPages; ++k) {
             pages.put(reader.getPageOrigRef(k).getNumber(), k);
-        HashMap names = fromNames ? (HashMap) reader.getNamedDestinationFromNames() : (HashMap) reader.getNamedDestinationFromStrings();
-        for (Iterator> it = names.entrySet().iterator(); it.hasNext();) {
+        }
+        HashMap names = fromNames ? (HashMap) reader.getNamedDestinationFromNames()
+                : (HashMap) reader.getNamedDestinationFromStrings();
+        for (Iterator> it = names.entrySet().iterator(); it.hasNext(); ) {
             Map.Entry entry = it.next();
-            PdfArray arr = (PdfArray)entry.getValue();
+            PdfArray arr = (PdfArray) entry.getValue();
             StringBuilder s = new StringBuilder();
             try {
                 s.append(pages.get(arr.getAsIndirectObject(0).getNumber()));
                 s.append(' ').append(arr.getPdfObject(1).toString().substring(1));
-                for (int k = 2; k < arr.size(); ++k)
+                for (int k = 2; k < arr.size(); ++k) {
                     s.append(' ').append(arr.getPdfObject(k).toString());
+                }
                 entry.setValue(s.toString());
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 it.remove();
             }
         }
@@ -111,14 +111,16 @@ public static HashMap getNamedDestination(PdfReader reader, bool
      * >
      * <!ELEMENT Destination (Name)*>
      * 
-     * @param names the names
-     * @param out the export destination. The stream is not closed
-     * @param encoding the encoding according to IANA conventions
-     * @param onlyASCII codes above 127 will always be escaped with &#nn; if true,
-     * whatever the encoding
+     *
+     * @param names     the names
+     * @param out       the export destination. The stream is not closed
+     * @param encoding  the encoding according to IANA conventions
+     * @param onlyASCII codes above 127 will always be escaped with &#nn; if true, whatever the
+     *                  encoding
      * @throws IOException on error
      */
-    public static void exportToXML(HashMap names, OutputStream out, String encoding, boolean onlyASCII) throws IOException {
+    public static void exportToXML(HashMap names, OutputStream out, String encoding, boolean onlyASCII)
+            throws IOException {
         String jenc = IanaEncodings.getJavaEncoding(encoding);
         Writer wrt = new BufferedWriter(new OutputStreamWriter(out, jenc));
         exportToXML(names, wrt, encoding, onlyASCII);
@@ -126,11 +128,12 @@ public static void exportToXML(HashMap names, OutputStream out, String encoding,
 
     /**
      * Exports the destinations to XML.
-     * @param names the names
-     * @param wrt the export destination. The writer is not closed
-     * @param encoding the encoding according to IANA conventions
-     * @param onlyASCII codes above 127 will always be escaped with &#nn; if true,
-     * whatever the encoding
+     *
+     * @param names     the names
+     * @param wrt       the export destination. The writer is not closed
+     * @param encoding  the encoding according to IANA conventions
+     * @param onlyASCII codes above 127 will always be escaped with &#nn; if true, whatever the
+     *                  encoding
      * @throws IOException on error
      */
     public static void exportToXML(HashMap names, Writer wrt, String encoding, boolean onlyASCII) throws IOException {
@@ -153,9 +156,10 @@ public static void exportToXML(HashMap names, Writer wrt, String encoding, boole
 
     /**
      * Import the names from XML.
+     *
      * @param in the XML source. The stream is not closed
-     * @throws IOException on error
      * @return the names
+     * @throws IOException on error
      */
     public static HashMap importFromXML(InputStream in) throws IOException {
         SimpleNamedDestination names = new SimpleNamedDestination();
@@ -165,9 +169,10 @@ public static HashMap importFromXML(InputStream in) throws IOExc
 
     /**
      * Import the names from XML.
+     *
      * @param in the XML source. The reader is not closed
-     * @throws IOException on error
      * @return the names
+     * @throws IOException on error
      */
     public static HashMap importFromXML(Reader in) throws IOException {
         SimpleNamedDestination names = new SimpleNamedDestination();
@@ -183,18 +188,19 @@ static PdfArray createDestinationArray(String value, PdfWriter writer) {
         if (!tk.hasMoreTokens()) {
             ar.add(PdfName.XYZ);
             ar.add(new float[]{0, 10000, 0});
-        }
-        else {
+        } else {
             String fn = tk.nextToken();
-            if (fn.startsWith("/"))
+            if (fn.startsWith("/")) {
                 fn = fn.substring(1);
+            }
             ar.add(new PdfName(fn));
             for (int k = 0; k < 4 && tk.hasMoreTokens(); ++k) {
                 fn = tk.nextToken();
-                if (fn.equals("null"))
+                if (fn.equals("null")) {
                     ar.add(PdfNull.PDFNULL);
-                else
+                } else {
                     ar.add(new PdfNumber(fn));
+                }
             }
         }
         return ar;
@@ -217,16 +223,16 @@ public static PdfDictionary outputNamedDestinationAsNames(HashMap names, PdfWrit
         return dic;
     }
 
-    public static PdfDictionary outputNamedDestinationAsStrings(Map names, PdfWriter writer) throws IOException {
+    public static PdfDictionary outputNamedDestinationAsStrings(Map names, PdfWriter writer)
+            throws IOException {
         Map n2 = new HashMap<>();
-        for (Iterator> it = names.entrySet().iterator(); it.hasNext();) {
+        for (Iterator> it = names.entrySet().iterator(); it.hasNext(); ) {
             Map.Entry entry = it.next();
             try {
                 String value = entry.getValue();
                 PdfArray ar = createDestinationArray(value, writer);
                 n2.put(entry.getKey(), writer.addToBody(ar).getIndirectReference());
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 it.remove();
             }
         }
@@ -241,10 +247,11 @@ public static String escapeBinaryString(String s) {
                 buf.append('\\');
                 String octal = "00" + Integer.toOctalString(c);
                 buf.append(octal.substring(octal.length() - 3));
-            } else if (c == '\\')
+            } else if (c == '\\') {
                 buf.append("\\\\");
-            else
+            } else {
                 buf.append(c);
+            }
         }
         return buf.toString();
     }
@@ -269,19 +276,18 @@ public static String unEscapeBinaryString(String s) {
                         if (c >= '0' && c <= '7') {
                             ++k;
                             n = n * 8 + c - '0';
-                        }
-                        else {
+                        } else {
                             break;
                         }
                     }
                     --k;
-                    buf.append((char)n);
-                }
-                else
+                    buf.append((char) n);
+                } else {
                     buf.append(c);
-            }
-            else
+                }
+            } else {
                 buf.append(c);
+            }
         }
         return buf.toString();
     }
@@ -291,17 +297,21 @@ public void endDocument() {
 
     public void endElement(String tag) {
         if (tag.equals("Destination")) {
-            if (xmlLast == null && xmlNames != null)
+            if (xmlLast == null && xmlNames != null) {
                 return;
-            else
+            } else {
                 throw new RuntimeException(MessageLocalization.getComposedMessage("destination.end.tag.out.of.place"));
+            }
         }
-        if (!tag.equals("Name"))
+        if (!tag.equals("Name")) {
             throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.end.tag.1", tag));
-        if (xmlLast == null || xmlNames == null)
+        }
+        if (xmlLast == null || xmlNames == null) {
             throw new RuntimeException(MessageLocalization.getComposedMessage("name.end.tag.out.of.place"));
-        if (!xmlLast.containsKey("Page"))
+        }
+        if (!xmlLast.containsKey("Page")) {
             throw new RuntimeException(MessageLocalization.getComposedMessage("page.attribute.missing"));
+        }
         xmlNames.put(unEscapeBinaryString(xmlLast.get("Name")), xmlLast.get("Page"));
         xmlLast = null;
     }
@@ -314,21 +324,24 @@ public void startElement(String tag, Map h) {
             if (tag.equals("Destination")) {
                 xmlNames = new HashMap<>();
                 return;
-            }
-            else
+            } else {
                 throw new RuntimeException(MessageLocalization.getComposedMessage("root.element.is.not.destination"));
+            }
         }
-        if (!tag.equals("Name"))
+        if (!tag.equals("Name")) {
             throw new RuntimeException(MessageLocalization.getComposedMessage("tag.1.not.allowed", tag));
-        if (xmlLast != null)
+        }
+        if (xmlLast != null) {
             throw new RuntimeException(MessageLocalization.getComposedMessage("nested.tags.are.not.allowed"));
+        }
         xmlLast = new HashMap<>(h);
         xmlLast.put("Name", "");
     }
 
     public void text(String str) {
-        if (xmlLast == null)
+        if (xmlLast == null) {
             return;
+        }
         String name = xmlLast.get("Name");
         name += str;
         xmlLast.put("Name", name);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/SpotColor.java b/openpdf/src/main/java/com/lowagie/text/pdf/SpotColor.java
index 0cc293469..d41d65aec 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/SpotColor.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/SpotColor.java
@@ -52,8 +52,7 @@
 import java.awt.Color;
 
 /**
- *
- * @author  psoares
+ * @author psoares
  */
 public class SpotColor extends ExtendedColor {
 
@@ -63,23 +62,24 @@ public class SpotColor extends ExtendedColor {
 
     public SpotColor(PdfSpotColor spot, float tint) {
         this((spot.getAlternativeCS().getRed() / MAX_INT_COLOR_VALUE - MAX_FLOAT_COLOR_VALUE) * tint + 1,
-            (spot.getAlternativeCS().getGreen() / MAX_INT_COLOR_VALUE - MAX_FLOAT_COLOR_VALUE) * tint + 1,
-            (spot.getAlternativeCS().getBlue() / MAX_INT_COLOR_VALUE - MAX_FLOAT_COLOR_VALUE) * tint + 1,
-            (spot.getAlternativeCS().getAlpha() / MAX_INT_COLOR_VALUE - MAX_FLOAT_COLOR_VALUE) * tint + 1,
+                (spot.getAlternativeCS().getGreen() / MAX_INT_COLOR_VALUE - MAX_FLOAT_COLOR_VALUE) * tint + 1,
+                (spot.getAlternativeCS().getBlue() / MAX_INT_COLOR_VALUE - MAX_FLOAT_COLOR_VALUE) * tint + 1,
+                (spot.getAlternativeCS().getAlpha() / MAX_INT_COLOR_VALUE - MAX_FLOAT_COLOR_VALUE) * tint + 1,
                 tint);
         this.spot = spot;
     }
 
     public SpotColor(float red, float green, float blue, float alpha, float tint) {
         super(TYPE_SEPARATION, red, green, blue, alpha);
-        this.spot = new PdfSpotColor("Color rgba(" + red + ", " + green + ", " + blue+ ", " + alpha + ")", new Color(red, green, blue, alpha));
+        this.spot = new PdfSpotColor("Color rgba(" + red + ", " + green + ", " + blue + ", " + alpha + ")",
+                new Color(red, green, blue, alpha));
         this.tint = tint;
     }
 
     public PdfSpotColor getPdfSpotColor() {
         return spot;
     }
-    
+
     public float getTint() {
         return tint;
     }
@@ -87,7 +87,7 @@ public float getTint() {
     public boolean equals(Object obj) {
         return this == obj;
     }
-    
+
     public int hashCode() {
         return spot.hashCode() ^ Float.floatToIntBits(tint);
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/StampContent.java b/openpdf/src/main/java/com/lowagie/text/pdf/StampContent.java
index 6d48d9461..b39a57f1d 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/StampContent.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/StampContent.java
@@ -47,35 +47,38 @@
 package com.lowagie.text.pdf;
 
 public class StampContent extends PdfContentByte {
+
     PdfStamperImp.PageStamp ps;
     PageResources pageResources;
-    
-    /** Creates a new instance of StampContent */
+
+    /**
+     * Creates a new instance of StampContent
+     */
     StampContent(PdfStamperImp stamper, PdfStamperImp.PageStamp ps) {
         super(stamper);
         this.ps = ps;
         pageResources = ps.pageResources;
     }
-    
+
     public void setAction(PdfAction action, float llx, float lly, float urx, float ury) {
-        ((PdfStamperImp)writer).addAnnotation(new PdfAnnotation(writer, llx, lly, urx, ury, action), ps.pageN);
+        ((PdfStamperImp) writer).addAnnotation(new PdfAnnotation(writer, llx, lly, urx, ury, action), ps.pageN);
     }
 
     /**
-     * Gets a duplicate of this PdfContentByte. All
-     * the members are copied by reference but the buffer stays different.
+     * Gets a duplicate of this PdfContentByte. All the members are copied by reference but the buffer
+     * stays different.
      *
      * @return a copy of this PdfContentByte
      */
     public PdfContentByte getDuplicate() {
-        return new StampContent((PdfStamperImp)writer, ps);
+        return new StampContent((PdfStamperImp) writer, ps);
     }
 
     PageResources getPageResources() {
         return pageResources;
     }
-    
+
     void addAnnotation(PdfAnnotation annot) {
-        ((PdfStamperImp)writer).addAnnotation(annot, ps.pageN);
+        ((PdfStamperImp) writer).addAnnotation(annot, ps.pageN);
     }
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/StandardDecryption.java b/openpdf/src/main/java/com/lowagie/text/pdf/StandardDecryption.java
index b152f116a..e7113ca01 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/StandardDecryption.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/StandardDecryption.java
@@ -52,11 +52,12 @@
 import com.lowagie.text.pdf.crypto.ARCFOUREncryption;
 
 public class StandardDecryption {
+
+    private static final int AES_128 = 4;
+    private static final int AES_256_V3 = 6;
     protected ARCFOUREncryption arcfour;
     protected AESCipher cipher;
     private byte[] key;
-    private static final int AES_128 = 4;
-    private static final int AES_256_V3 = 6;
     private boolean aes;
     private boolean initiated;
     private byte[] iv = new byte[16];
@@ -64,9 +65,10 @@ public class StandardDecryption {
 
     /**
      * Creates a new instance of StandardDecryption
-     * @param key a byte array containing the key
-     * @param off the begining of the key in the array
-     * @param len the length
+     *
+     * @param key      a byte array containing the key
+     * @param off      the begining of the key in the array
+     * @param len      the length
      * @param revision the aes revision
      */
     public StandardDecryption(byte[] key, int off, int len, int revision) {
@@ -74,18 +76,17 @@ public StandardDecryption(byte[] key, int off, int len, int revision) {
         if (aes) {
             this.key = new byte[len];
             System.arraycopy(key, off, this.key, 0, len);
-        }
-        else {
+        } else {
             arcfour = new ARCFOUREncryption();
             arcfour.prepareARCFOURKey(key, off, len);
         }
     }
-    
+
     public byte[] update(byte[] b, int off, int len) {
         if (aes) {
-            if (initiated)
+            if (initiated) {
                 return cipher.update(b, off, len);
-            else {
+            } else {
                 int left = Math.min(iv.length - ivptr, len);
                 System.arraycopy(b, off, iv, ivptr, left);
                 off += left;
@@ -94,24 +95,24 @@ public byte[] update(byte[] b, int off, int len) {
                 if (ivptr == iv.length) {
                     cipher = new AESCipher(false, key, iv);
                     initiated = true;
-                    if (len > 0)
+                    if (len > 0) {
                         return cipher.update(b, off, len);
+                    }
                 }
                 return null;
             }
-        }
-        else {
+        } else {
             byte[] b2 = new byte[len];
             arcfour.encryptARCFOUR(b, off, len, b2, 0);
             return b2;
         }
     }
-    
+
     public byte[] finish() {
         if (aes && cipher != null) {
             return cipher.doFinal();
-        }
-        else
+        } else {
             return null;
+        }
     }
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/TSAClient.java b/openpdf/src/main/java/com/lowagie/text/pdf/TSAClient.java
index e7cfcefb2..6a0642c1c 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/TSAClient.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/TSAClient.java
@@ -55,35 +55,38 @@
 /**
  * Time Stamp Authority client (caller) interface.
  * 
              
- * Interface used by the PdfPKCS7 digital signature builder to call
- * Time Stamp Authority providing RFC 3161 compliant time stamp token.
+ * Interface used by the PdfPKCS7 digital signature builder to call Time Stamp Authority providing RFC 3161 compliant
+ * time stamp token.
+ *
  * @author Martin Brunecky, 07/17/2007
- * @since    2.1.6
+ * @since 2.1.6
  */
 public interface TSAClient {
+
     /**
-     * Get the time stamp token size estimate.
-     * Implementation must return value large enough to accomodate the entire token
-     * returned by getTimeStampToken() _prior_ to actual getTimeStampToken() call.
-     * @return    an estimate of the token size
+     * Get the time stamp token size estimate. Implementation must return value large enough to accomodate the entire
+     * token returned by getTimeStampToken() _prior_ to actual getTimeStampToken() call.
+     *
+     * @return an estimate of the token size
      */
     int getTokenSizeEstimate();
 
     /**
      * Gets the MessageDigest to digest the data imprint
+     *
      * @return the digest algorithm name
      * @throws GeneralSecurityException a security problem
      */
     MessageDigest getMessageDigest() throws GeneralSecurityException;
-    
+
     /**
-     * Get RFC 3161 timeStampToken.
-     * Method may return null indicating that timestamp should be skipped.
-     * @param caller PdfPKCS7 - calling PdfPKCS7 instance (in case caller needs it)
+     * Get RFC 3161 timeStampToken. Method may return null indicating that timestamp should be skipped.
+     *
+     * @param caller  PdfPKCS7 - calling PdfPKCS7 instance (in case caller needs it)
      * @param imprint byte[] - data imprint to be time-stamped
      * @return byte[] - encoded, TSA signed data of the timeStampToken
      * @throws Exception - TSA request failed
      */
     byte[] getTimeStampToken(PdfPKCS7 caller, byte[] imprint) throws Exception;
-    
+
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/TSAClientBouncyCastle.java b/openpdf/src/main/java/com/lowagie/text/pdf/TSAClientBouncyCastle.java
index bd676a7f1..f11e0eaf4 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/TSAClientBouncyCastle.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/TSAClientBouncyCastle.java
@@ -50,7 +50,6 @@
 package com.lowagie.text.pdf;
 
 import com.lowagie.text.error_messages.MessageLocalization;
-
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -71,292 +70,286 @@
 import org.bouncycastle.tsp.TimeStampTokenInfo;
 
 /**
- * Time Stamp Authority Client interface implementation using Bouncy Castle
- * org.bouncycastle.tsp package.
+ * Time Stamp Authority Client interface implementation using Bouncy Castle org.bouncycastle.tsp package.
  * 
              
- * Created by Aiken Sam, 2006-11-15, refactored by Martin Brunecky, 07/15/2007
- * for ease of subclassing.
+ * Created by Aiken Sam, 2006-11-15, refactored by Martin Brunecky, 07/15/2007 for ease of subclassing.
  * 
              
  *
  * @since 2.1.6
  */
 public class TSAClientBouncyCastle implements TSAClient {
-  /** URL of the Time Stamp Authority */
-  protected String tsaURL;
-  /** TSA Username */
-  protected String tsaUsername;
-  /** TSA password */
-  protected String tsaPassword;
-  /** Estimate of the received time stamp token */
-  protected int tokSzEstimate;
-
-  private Proxy proxy;
-  private String policy;
-  private String digestName;
-
-  /**
-   * Creates an instance of a TSAClient that will use BouncyCastle.
-   *
-   * @param url
-   *          String - Time Stamp Authority URL (i.e.
-   *          "http://tsatest1.digistamp.com/TSA")
-   */
-  public TSAClientBouncyCastle(String url) {
-    this(url, null, null, 4096);
-  }
-
-  /**
-   * Creates an instance of a TSAClient that will use BouncyCastle.
-   *
-   * @param url
-   *          String - Time Stamp Authority URL (i.e.
-   *          "http://tsatest1.digistamp.com/TSA")
-   * @param username
-   *          String - user(account) name
-   * @param password
-   *          String - password
-   */
-  public TSAClientBouncyCastle(String url, String username, String password) {
-    this(url, username, password, 4096);
-  }
-
-  /**
-   * Constructor. Note the token size estimate is updated by each call, as the
-   * token size is not likely to change (as long as we call the same TSA using
-   * the same imprint length).
-   *
-   * @param url
-   *          String - Time Stamp Authority URL (i.e.
-   *          "http://tsatest1.digistamp.com/TSA")
-   * @param username
-   *          String - user(account) name
-   * @param password
-   *          String - password
-   * @param tokSzEstimate
-   *          int - estimated size of received time stamp token (DER encoded)
-   */
-  public TSAClientBouncyCastle(String url, String username, String password,
-      int tokSzEstimate) {
-    this.tsaURL = url;
-    this.tsaUsername = username;
-    this.tsaPassword = password;
-    this.tokSzEstimate = tokSzEstimate;
-  }
-
-  /**
-   * Get the token size estimate. Returned value reflects the result of the last
-   * succesfull call, padded
-   *
-   * @return an estimate of the token size
-   */
-  @Override
-  public int getTokenSizeEstimate() {
-    return tokSzEstimate;
-  }
-
-  /**
-   * Get the MessageDigest.
-   * Default algorithm `SHA-1` used as per algorithm used without tsaClient
-   * @see com.lowagie.text.pdf.PdfPKCS7#getEncodedPKCS7(byte[], java.util.Calendar, TSAClient, byte[]) (upto 1.3.11)
-   * or check status of https://github.com/LibrePDF/OpenPDF/issues/320
-   * @return SHA-1 MessageDigest
-   */
-  @Override
-  public MessageDigest getMessageDigest() throws GeneralSecurityException {
-    return MessageDigest.getInstance(isNotEmpty(digestName) ? digestName : "SHA-1");
-  }
-
-  /**
-   * Get RFC 3161 timeStampToken. Method may return null indicating that
-   * timestamp should be skipped.
-   *
-   * @param caller
-   *          PdfPKCS7 - calling PdfPKCS7 instance (in case caller needs it)
-   * @param imprint
-   *          byte[] - data imprint to be time-stamped
-   * @return byte[] - encoded, TSA signed data of the timeStampToken
-   * @throws Exception
-   *           - TSA request failed
-   * @see com.lowagie.text.pdf.TSAClient#getTimeStampToken(com.lowagie.text.pdf.PdfPKCS7,
-   *      byte[])
-   */
-  @Override
-  public byte[] getTimeStampToken(PdfPKCS7 caller, byte[] imprint)
-      throws Exception {
-    return getTimeStampToken(imprint);
-  }
-
-  /**
-   * Get timestamp token - Bouncy Castle request encoding / decoding layer
-   * @param imprint a byte array containing the imprint
-   * @return the timestamp token
-   * @throws Exception on error
-   */
-  protected byte[] getTimeStampToken(byte[] imprint) throws Exception {
-    byte[] respBytes = null;
-    try {
-      // Setup the time stamp request
-      TimeStampRequestGenerator tsqGenerator = new TimeStampRequestGenerator();
-      tsqGenerator.setCertReq(true);
-      if (isNotEmpty(policy)) {
-        tsqGenerator.setReqPolicy(new ASN1ObjectIdentifier(policy));
-      }
-      BigInteger nonce = BigInteger.valueOf(System.currentTimeMillis());
-      ASN1ObjectIdentifier digestOid = X509ObjectIdentifiers.id_SHA1;
-      if (isNotEmpty(digestName)) {
-          digestOid = new ASN1ObjectIdentifier(PdfPKCS7.getDigestOid(digestName));
-      }
-      TimeStampRequest request = tsqGenerator.generate(digestOid, imprint, nonce);
-      byte[] requestBytes = request.getEncoded();
-
-      // Call the communications layer
-      respBytes = getTSAResponse(requestBytes);
-
-      // Handle the TSA response
-      TimeStampResponse response = new TimeStampResponse(respBytes);
-
-      // validate communication level attributes (RFC 3161 PKIStatus)
-      response.validate(request);
-      PKIFailureInfo failure = response.getFailInfo();
-      int value = (failure == null) ? 0 : failure.intValue();
-      if (value != 0) {
-        // @todo: Translate value of 15 error codes defined by
-        // PKIFailureInfo to string
-        throw new Exception(MessageLocalization.getComposedMessage(
-            "invalid.tsa.1.response.code.2", tsaURL, String.valueOf(value)));
-      }
-      // @todo: validate the time stap certificate chain (if we want
-      // assure we do not sign using an invalid timestamp).
-
-      // extract just the time stamp token (removes communication status
-      // info)
-      TimeStampToken tsToken = response.getTimeStampToken();
-      if (tsToken == null) {
-        throw new Exception(MessageLocalization.getComposedMessage(
-            "tsa.1.failed.to.return.time.stamp.token.2", tsaURL,
-            response.getStatusString()));
-      }
-      TimeStampTokenInfo info = tsToken.getTimeStampInfo(); // to view
-                                                            // details
-      byte[] encoded = tsToken.getEncoded();
-      long stop = System.currentTimeMillis();
-
-      // Update our token size estimate for the next call (padded to be
-      // safe)
-      this.tokSzEstimate = encoded.length + 32;
-      return encoded;
-    } catch (Exception e) {
-      throw e;
-    } catch (Throwable t) {
-      throw new Exception(MessageLocalization.getComposedMessage(
-          "failed.to.get.tsa.response.from.1", tsaURL), t);
+
+    /**
+     * URL of the Time Stamp Authority
+     */
+    protected String tsaURL;
+    /**
+     * TSA Username
+     */
+    protected String tsaUsername;
+    /**
+     * TSA password
+     */
+    protected String tsaPassword;
+    /**
+     * Estimate of the received time stamp token
+     */
+    protected int tokSzEstimate;
+
+    private Proxy proxy;
+    private String policy;
+    private String digestName;
+
+    /**
+     * Creates an instance of a TSAClient that will use BouncyCastle.
+     *
+     * @param url String - Time Stamp Authority URL (i.e. "http://tsatest1.digistamp.com/TSA")
+     */
+    public TSAClientBouncyCastle(String url) {
+        this(url, null, null, 4096);
+    }
+
+    /**
+     * Creates an instance of a TSAClient that will use BouncyCastle.
+     *
+     * @param url      String - Time Stamp Authority URL (i.e. "http://tsatest1.digistamp.com/TSA")
+     * @param username String - user(account) name
+     * @param password String - password
+     */
+    public TSAClientBouncyCastle(String url, String username, String password) {
+        this(url, username, password, 4096);
+    }
+
+    /**
+     * Constructor. Note the token size estimate is updated by each call, as the token size is not likely to change (as
+     * long as we call the same TSA using the same imprint length).
+     *
+     * @param url           String - Time Stamp Authority URL (i.e. "http://tsatest1.digistamp.com/TSA")
+     * @param username      String - user(account) name
+     * @param password      String - password
+     * @param tokSzEstimate int - estimated size of received time stamp token (DER encoded)
+     */
+    public TSAClientBouncyCastle(String url, String username, String password,
+            int tokSzEstimate) {
+        this.tsaURL = url;
+        this.tsaUsername = username;
+        this.tsaPassword = password;
+        this.tokSzEstimate = tokSzEstimate;
+    }
+
+    private static boolean isNotEmpty(String arg) {
+        return arg != null && !arg.isEmpty();
+    }
+
+    /**
+     * Get the token size estimate. Returned value reflects the result of the last succesfull call, padded
+     *
+     * @return an estimate of the token size
+     */
+    @Override
+    public int getTokenSizeEstimate() {
+        return tokSzEstimate;
+    }
+
+    /**
+     * Get the MessageDigest. Default algorithm `SHA-1` used as per algorithm used without tsaClient
+     *
+     * @return SHA-1 MessageDigest
+     * @see com.lowagie.text.pdf.PdfPKCS7#getEncodedPKCS7(byte[], java.util.Calendar, TSAClient, byte[]) (upto 1.3.11)
+     * or check status of https://github.com/LibrePDF/OpenPDF/issues/320
+     */
+    @Override
+    public MessageDigest getMessageDigest() throws GeneralSecurityException {
+        return MessageDigest.getInstance(isNotEmpty(digestName) ? digestName : "SHA-1");
+    }
+
+    /**
+     * Get RFC 3161 timeStampToken. Method may return null indicating that timestamp should be skipped.
+     *
+     * @param caller  PdfPKCS7 - calling PdfPKCS7 instance (in case caller needs it)
+     * @param imprint byte[] - data imprint to be time-stamped
+     * @return byte[] - encoded, TSA signed data of the timeStampToken
+     * @throws Exception - TSA request failed
+     * @see com.lowagie.text.pdf.TSAClient#getTimeStampToken(com.lowagie.text.pdf.PdfPKCS7, byte[])
+     */
+    @Override
+    public byte[] getTimeStampToken(PdfPKCS7 caller, byte[] imprint)
+            throws Exception {
+        return getTimeStampToken(imprint);
+    }
+
+    /**
+     * Get timestamp token - Bouncy Castle request encoding / decoding layer
+     *
+     * @param imprint a byte array containing the imprint
+     * @return the timestamp token
+     * @throws Exception on error
+     */
+    protected byte[] getTimeStampToken(byte[] imprint) throws Exception {
+        byte[] respBytes = null;
+        try {
+            // Setup the time stamp request
+            TimeStampRequestGenerator tsqGenerator = new TimeStampRequestGenerator();
+            tsqGenerator.setCertReq(true);
+            if (isNotEmpty(policy)) {
+                tsqGenerator.setReqPolicy(new ASN1ObjectIdentifier(policy));
+            }
+            BigInteger nonce = BigInteger.valueOf(System.currentTimeMillis());
+            ASN1ObjectIdentifier digestOid = X509ObjectIdentifiers.id_SHA1;
+            if (isNotEmpty(digestName)) {
+                digestOid = new ASN1ObjectIdentifier(PdfPKCS7.getDigestOid(digestName));
+            }
+            TimeStampRequest request = tsqGenerator.generate(digestOid, imprint, nonce);
+            byte[] requestBytes = request.getEncoded();
+
+            // Call the communications layer
+            respBytes = getTSAResponse(requestBytes);
+
+            // Handle the TSA response
+            TimeStampResponse response = new TimeStampResponse(respBytes);
+
+            // validate communication level attributes (RFC 3161 PKIStatus)
+            response.validate(request);
+            PKIFailureInfo failure = response.getFailInfo();
+            int value = (failure == null) ? 0 : failure.intValue();
+            if (value != 0) {
+                // @todo: Translate value of 15 error codes defined by
+                // PKIFailureInfo to string
+                throw new Exception(MessageLocalization.getComposedMessage(
+                        "invalid.tsa.1.response.code.2", tsaURL, String.valueOf(value)));
+            }
+            // @todo: validate the time stap certificate chain (if we want
+            // assure we do not sign using an invalid timestamp).
+
+            // extract just the time stamp token (removes communication status
+            // info)
+            TimeStampToken tsToken = response.getTimeStampToken();
+            if (tsToken == null) {
+                throw new Exception(MessageLocalization.getComposedMessage(
+                        "tsa.1.failed.to.return.time.stamp.token.2", tsaURL,
+                        response.getStatusString()));
+            }
+            TimeStampTokenInfo info = tsToken.getTimeStampInfo(); // to view
+            // details
+            byte[] encoded = tsToken.getEncoded();
+            long stop = System.currentTimeMillis();
+
+            // Update our token size estimate for the next call (padded to be
+            // safe)
+            this.tokSzEstimate = encoded.length + 32;
+            return encoded;
+        } catch (Exception e) {
+            throw e;
+        } catch (Throwable t) {
+            throw new Exception(MessageLocalization.getComposedMessage(
+                    "failed.to.get.tsa.response.from.1", tsaURL), t);
+        }
+    }
+
+    /**
+     * Get timestamp token - communications layer
+     *
+     * @param requestBytes the request bytes
+     * @return - byte[] - TSA response, raw bytes (RFC 3161 encoded)
+     * @throws Exception on error
+     */
+    protected byte[] getTSAResponse(byte[] requestBytes) throws Exception {
+        // Setup the TSA connection
+        URL url = new URL(tsaURL);
+        URLConnection tsaConnection;
+        Proxy tmpProxy = proxy == null ? Proxy.NO_PROXY : proxy;
+        tsaConnection = url.openConnection(tmpProxy);
+
+        tsaConnection.setDoInput(true);
+        tsaConnection.setDoOutput(true);
+        tsaConnection.setUseCaches(false);
+        tsaConnection.setRequestProperty("Content-Type",
+                "application/timestamp-query");
+        // tsaConnection.setRequestProperty("Content-Transfer-Encoding",
+        // "base64");
+        tsaConnection.setRequestProperty("Content-Transfer-Encoding", "binary");
+
+        if (isNotEmpty(tsaUsername)) {
+            String userPassword = tsaUsername + ":" + tsaPassword;
+            tsaConnection.setRequestProperty("Authorization", "Basic "
+                    + new String(Base64.getEncoder().encode(userPassword.getBytes())));
+        }
+        OutputStream out = tsaConnection.getOutputStream();
+        out.write(requestBytes);
+        out.close();
+
+        // Get TSA response as a byte array
+        InputStream inp = tsaConnection.getInputStream();
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int bytesRead = 0;
+        while ((bytesRead = inp.read(buffer, 0, buffer.length)) >= 0) {
+            baos.write(buffer, 0, bytesRead);
+        }
+        byte[] respBytes = baos.toByteArray();
+
+        String encoding = tsaConnection.getContentEncoding();
+        if (encoding != null && encoding.equalsIgnoreCase("base64")) {
+            respBytes = Base64.getDecoder().decode(respBytes);
+        }
+        return respBytes;
     }
-  }
-
-  /**
-   * Get timestamp token - communications layer
-   * @param requestBytes the request bytes
-   * @return - byte[] - TSA response, raw bytes (RFC 3161 encoded)
-   * @throws Exception on error
-   */
-  protected byte[] getTSAResponse(byte[] requestBytes) throws Exception {
-    // Setup the TSA connection
-    URL url = new URL(tsaURL);
-    URLConnection tsaConnection;
-    Proxy tmpProxy = proxy == null ? Proxy.NO_PROXY : proxy;
-    tsaConnection = url.openConnection(tmpProxy);
-
-    tsaConnection.setDoInput(true);
-    tsaConnection.setDoOutput(true);
-    tsaConnection.setUseCaches(false);
-    tsaConnection.setRequestProperty("Content-Type",
-        "application/timestamp-query");
-    // tsaConnection.setRequestProperty("Content-Transfer-Encoding",
-    // "base64");
-    tsaConnection.setRequestProperty("Content-Transfer-Encoding", "binary");
-
-    if (isNotEmpty(tsaUsername)) {
-      String userPassword = tsaUsername + ":" + tsaPassword;
-      tsaConnection.setRequestProperty("Authorization", "Basic "
-          + new String(Base64.getEncoder().encode(userPassword.getBytes())));
+
+    /**
+     * Proxy object used for URL connections.
+     *
+     * @return Proxy object
+     */
+    public Proxy getProxy() {
+        return proxy;
     }
-    OutputStream out = tsaConnection.getOutputStream();
-    out.write(requestBytes);
-    out.close();
-
-    // Get TSA response as a byte array
-    InputStream inp = tsaConnection.getInputStream();
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    byte[] buffer = new byte[1024];
-    int bytesRead = 0;
-    while ((bytesRead = inp.read(buffer, 0, buffer.length)) >= 0) {
-      baos.write(buffer, 0, bytesRead);
+
+    /**
+     * Sets Proxy which will be used for URL connection.
+     *
+     * @param aProxy Proxy to set
+     */
+    public void setProxy(final Proxy aProxy) {
+        this.proxy = aProxy;
+    }
+
+    /**
+     * Gets Policy OID of TSA request.
+     */
+    public String getPolicy() {
+        return policy;
+    }
+
+    /**
+     * Sets Policy OID of TSA request.
+     *
+     * @param policy oid
+     */
+    public void setPolicy(String policy) {
+        this.policy = policy;
+    }
+
+    public String getTsaURL() {
+        return tsaURL;
+    }
+
+    public String getTsaUsername() {
+        return tsaUsername;
+    }
+
+    public String getTsaPassword() {
+        return tsaPassword;
+    }
+
+    public int getTokSzEstimate() {
+        return tokSzEstimate;
+    }
+
+    public String getDigestName() {
+        return digestName;
     }
-    byte[] respBytes = baos.toByteArray();
 
-    String encoding = tsaConnection.getContentEncoding();
-    if (encoding != null && encoding.equalsIgnoreCase("base64")) {
-      respBytes = Base64.getDecoder().decode(respBytes);
+    public void setDigestName(String hashAlgorithm) {
+        this.digestName = hashAlgorithm;
     }
-    return respBytes;
-  }
-
-  /**
-   * Sets Proxy which will be used for URL connection.
-   * @param aProxy Proxy to set
-   */
-  public void setProxy(final Proxy aProxy) {
-      this.proxy = aProxy;
-  }
-
-  /**
-   * Proxy object used for URL connections.
-   * @return Proxy object
-   */
-  public Proxy getProxy() {
-      return proxy;
-  }
-
-  /**
-   * Gets Policy OID of TSA request.
-   */
-  public String getPolicy() {
-      return policy;
-  }
-
-  /**
-   * Sets Policy OID of TSA request.
-   * @param policy oid
-   */
-  public void setPolicy(String policy) {
-      this.policy = policy;
-  }
-
-  public String getTsaURL() {
-      return tsaURL;
-  }
-
-  public String getTsaUsername() {
-      return tsaUsername;
-  }
-
-  public String getTsaPassword() {
-      return tsaPassword;
-  }
-
-  public int getTokSzEstimate() {
-      return tokSzEstimate;
-  }
-
-  public String getDigestName() {
-      return digestName;
-  }
-
-  public void setDigestName(String hashAlgorithm) {
-      this.digestName = hashAlgorithm;
-  }
-
-  private static boolean isNotEmpty(String arg) {
-      return arg != null && !arg.isEmpty();
-  }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/TTFCache.java b/openpdf/src/main/java/com/lowagie/text/pdf/TTFCache.java
index 3a19b77d8..3292b5735 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/TTFCache.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/TTFCache.java
@@ -1,42 +1,39 @@
 package com.lowagie.text.pdf;
 
 import com.lowagie.text.ExceptionConverter;
-import org.apache.fop.fonts.apps.TTFReader;
-import org.apache.fop.fonts.truetype.FontFileReader;
-import org.apache.fop.fonts.truetype.TTFFile;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import org.apache.fop.fonts.apps.TTFReader;
+import org.apache.fop.fonts.truetype.FontFileReader;
+import org.apache.fop.fonts.truetype.TTFFile;
 
 /**
- *
- *
- * @author  Gajendra kumar (raaz2.gajendra@gmail.com)
+ * @author Gajendra kumar (raaz2.gajendra@gmail.com)
  */
 public class TTFCache {
 
-    private static Map ttfFileMap =new ConcurrentHashMap<>();
+    private static Map ttfFileMap = new ConcurrentHashMap<>();
 
     public static TTFFile getTTFFile(String fileName, TrueTypeFontUnicode ttu) {
 
-        if (ttfFileMap.containsKey(fileName)){
+        if (ttfFileMap.containsKey(fileName)) {
             return ttfFileMap.get(fileName);
         }
         TTFReader app = new TTFReader();
         TTFFile ttf = null;
         try {
             ttf = loadTTF(app, fileName, ttu);
-            ttfFileMap.put(fileName,ttf);
+            ttfFileMap.put(fileName, ttf);
             return ttf;
         } catch (IOException e) {
             throw new ExceptionConverter(e);
         }
     }
 
-    private static TTFFile loadTTF(TTFReader app, String fileName, TrueTypeFontUnicode ttu) throws IOException{
+    private static TTFFile loadTTF(TTFReader app, String fileName, TrueTypeFontUnicode ttu) throws IOException {
 
         try {
             return app.loadTTF(fileName, null, true, true);
@@ -44,14 +41,14 @@ private static TTFFile loadTTF(TTFReader app, String fileName, TrueTypeFontUnico
             TTFFile ttfFile = new TTFFile(true, true);
             InputStream stream = BaseFont.getResourceStream(fileName, null);
             try {
-                if (stream == null){
+                if (stream == null) {
                     stream = getStreamFromFont(ttu);
                 }
                 FontFileReader reader = new FontFileReader(stream);
                 String fontName = null;
                 ttfFile.readFont(reader, fontName);
             } finally {
-                if (stream!=null){
+                if (stream != null) {
                     stream.close();
                 }
             }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/TextField.java b/openpdf/src/main/java/com/lowagie/text/pdf/TextField.java
index 08c8c4267..3003d4554 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/TextField.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/TextField.java
@@ -47,11 +47,6 @@
 
 package com.lowagie.text.pdf;
 
-import java.awt.Color;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.ibm.icu.text.Bidi;
 import com.lowagie.text.Chunk;
 import com.lowagie.text.DocumentException;
@@ -59,62 +54,87 @@
 import com.lowagie.text.Font;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.Rectangle;
+import java.awt.Color;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
- * Supports text, combo and list fields generating the correct appearances.
- * All the option in the Acrobat GUI are supported in an easy to use API.
+ * Supports text, combo and list fields generating the correct appearances. All the option in the Acrobat GUI are
+ * supported in an easy to use API.
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class TextField extends BaseField {
-    
-    /** Holds value of property defaultText. */
+
+    /**
+     * Holds value of property defaultText.
+     */
     private String defaultText;
-    
-    /** Holds value of property choices. */
+
+    /**
+     * Holds value of property choices.
+     */
     private String[] choices;
-    
-    /** Holds value of property choiceExports. */
+
+    /**
+     * Holds value of property choiceExports.
+     */
     private String[] choiceExports;
-    
-    /** Holds value of property choiceSelection. */
+
+    /**
+     * Holds value of property choiceSelection.
+     */
     private ArrayList choiceSelections = new ArrayList<>();
-    
+
     private int topFirst;
-    
+
     private float extraMarginLeft;
     private float extraMarginTop;
-    
+    /**
+     * Holds value of property substitutionFonts.
+     */
+    private List substitutionFonts;
+    /**
+     * Holds value of property extensionFont.
+     */
+    private BaseFont extensionFont;
+
     /**
      * Creates a new TextField.
-     * @param writer the document PdfWriter
-     * @param box the field location and dimensions
-     * @param fieldName the field name. If null only the widget keys
-     * will be included in the field allowing it to be used as a kid field.
+     *
+     * @param writer    the document PdfWriter
+     * @param box       the field location and dimensions
+     * @param fieldName the field name. If null only the widget keys will be included in the field allowing
+     *                  it to be used as a kid field.
      */
     public TextField(PdfWriter writer, Rectangle box, String fieldName) {
         super(writer, box, fieldName);
     }
 
     private static boolean checkRTL(String text) {
-        if (text == null || text.isEmpty())
+        if (text == null || text.isEmpty()) {
             return false;
+        }
         char[] cc = text.toCharArray();
         for (int c : cc) {
-            if (c >= 0x590 && c < 0x0780)
+            if (c >= 0x590 && c < 0x0780) {
                 return true;
+            }
         }
         return false;
     }
-    
+
     private static int textRunDirectionDefault(String ptext) {
         return checkRTL(ptext) ? PdfWriter.RUN_DIRECTION_LTR : PdfWriter.RUN_DIRECTION_NO_BIDI;
     }
 
     /**
      * Chose the run direction of a text field by it's content
-     * 
+     *
      * @param ptext text field content
-     * @return int run direction (PdfWriter.RUN_DIRECTION_LTR or PdfWriter.RUN_DIRECTION_RTL or PdfWriter.RUN_DIRECTION_NO_BIDI)
+     * @return int run direction (PdfWriter.RUN_DIRECTION_LTR or PdfWriter.RUN_DIRECTION_RTL or
+     * PdfWriter.RUN_DIRECTION_NO_BIDI)
      */
     private static int textRunDirectionByContent(String ptext) {
         if (ptext == null || ptext.length() == 0) {
@@ -162,35 +182,19 @@ private static int textRunDirection(String ptext) {
             return textRunDirectionDefault(ptext);
         }
     }
-    
+
     private static void changeFontSize(Phrase p, float size) {
-        for (Object o : p) ((Chunk) o).getFont().setSize(size);
-    }
-    
-    private Phrase composePhrase(String text, BaseFont ufont, Color color, float fontSize) {
-        Phrase phrase = null;
-        if (extensionFont == null && (substitutionFonts == null || substitutionFonts.isEmpty()))
-            phrase = new Phrase(new Chunk(text, new Font(ufont, fontSize, 0, color)));
-        else {
-            FontSelector fs = new FontSelector();
-            fs.addFont(new Font(ufont, fontSize, 0, color));
-            if (extensionFont != null)
-                fs.addFont(new Font(extensionFont, fontSize, 0, color));
-            if (substitutionFonts != null) {
-                for (BaseFont substitutionFont : substitutionFonts)
-                    fs.addFont(new Font(substitutionFont, fontSize, 0, color));
-            }
-            phrase = fs.process(text);
+        for (Object o : p) {
+            ((Chunk) o).getFont().setSize(size);
         }
-        return phrase;
     }
-    
+
     /**
      * Removes CRLF from a String.
-     * 
+     *
      * @param text the String to remove the CRLF from
      * @return String
-     * @since    2.1.5
+     * @since 2.1.5
      */
     public static String removeCRLF(String text) {
         if (text.indexOf('\n') >= 0 || text.indexOf('\r') >= 0) {
@@ -198,36 +202,57 @@ public static String removeCRLF(String text) {
             StringBuilder sb = new StringBuilder(p.length);
             for (int k = 0; k < p.length; ++k) {
                 char c = p[k];
-                if (c == '\n')
+                if (c == '\n') {
                     sb.append(' ');
-                else if (c == '\r') {
+                } else if (c == '\r') {
                     sb.append(' ');
-                    if (k < p.length - 1 && p[k + 1] == '\n')
+                    if (k < p.length - 1 && p[k + 1] == '\n') {
                         ++k;
-                }
-                else
+                    }
+                } else {
                     sb.append(c);
+                }
             }
             return sb.toString();
         }
         return text;
     }
-    
+
     /**
-     * Obfuscates a password String.
-     * Every character is replaced by an asterisk (*).
-     * 
-     * @param text  the text to obfuscate
+     * Obfuscates a password String. Every character is replaced by an asterisk (*).
+     *
+     * @param text the text to obfuscate
      * @return String
-     * @since    2.1.5
+     * @since 2.1.5
      */
     public static String obfuscatePassword(String text) {
         char[] pchar = new char[text.length()];
-        for (int i = 0; i < text.length(); i++)
+        for (int i = 0; i < text.length(); i++) {
             pchar[i] = '*';
+        }
         return new String(pchar);
     }
-    
+
+    private Phrase composePhrase(String text, BaseFont ufont, Color color, float fontSize) {
+        Phrase phrase = null;
+        if (extensionFont == null && (substitutionFonts == null || substitutionFonts.isEmpty())) {
+            phrase = new Phrase(new Chunk(text, new Font(ufont, fontSize, 0, color)));
+        } else {
+            FontSelector fs = new FontSelector();
+            fs.addFont(new Font(ufont, fontSize, 0, color));
+            if (extensionFont != null) {
+                fs.addFont(new Font(extensionFont, fontSize, 0, color));
+            }
+            if (substitutionFonts != null) {
+                for (BaseFont substitutionFont : substitutionFonts) {
+                    fs.addFont(new Font(substitutionFont, fontSize, 0, color));
+                }
+            }
+            phrase = fs.process(text);
+        }
+        return phrase;
+    }
+
     /**
      * Flip text alignment for RTL texts Not sure why but this is needed
      */
@@ -247,19 +272,22 @@ private int getTextAlignment(int runDirection) {
 
     /**
      * Get the PdfAppearance of a text or combo field
-     * @throws IOException on error
-     * @throws DocumentException on error
+     *
      * @return A PdfAppearance
+     * @throws IOException       on error
+     * @throws DocumentException on error
      */
     public PdfAppearance getAppearance() throws IOException, DocumentException {
-        PdfAppearance app = getBorderAppearance(super.writer,super.box,super.rotation,super.backgroundColor,super.borderStyle,super.borderWidth,super.borderColor,super.options,super.maxCharacterLength);
+        PdfAppearance app = getBorderAppearance(super.writer, super.box, super.rotation, super.backgroundColor,
+                super.borderStyle, super.borderWidth, super.borderColor, super.options, super.maxCharacterLength);
         app.beginVariableText();
         if (text == null || text.length() == 0) {
             app.endVariableText();
             return app;
         }
-        
-        boolean borderExtra = borderStyle == PdfBorderDictionary.STYLE_BEVELED || borderStyle == PdfBorderDictionary.STYLE_INSET;
+
+        boolean borderExtra =
+                borderStyle == PdfBorderDictionary.STYLE_BEVELED || borderStyle == PdfBorderDictionary.STYLE_INSET;
         float h = box.getHeight() - borderWidth * 2 - extraMarginTop;
         float bw2 = borderWidth;
         if (borderExtra) {
@@ -273,12 +301,13 @@ public PdfAppearance getAppearance() throws IOException, DocumentException {
         app.clip();
         app.newPath();
         String ptext;
-        if ((options & PASSWORD) != 0)
+        if ((options & PASSWORD) != 0) {
             ptext = obfuscatePassword(text);
-        else if ((options & MULTILINE) == 0)
+        } else if ((options & MULTILINE) == 0) {
             ptext = removeCRLF(text);
-        else
+        } else {
             ptext = text; //fixed by Kazuya Ujihara (ujihara.jp)
+        }
         BaseFont ufont = getRealFont();
         Color fcolor = (textColor == null) ? GrayColor.GRAYBLACK : textColor;
         int rtl = textRunDirection(ptext);
@@ -291,8 +320,9 @@ else if ((options & MULTILINE) == 0)
             if (usize == 0) {
                 usize = h / factor;
                 if (usize > 4) {
-                    if (usize > 12)
+                    if (usize > 12) {
                         usize = 12;
+                    }
                     float step = Math.max((usize - 4) / 10, 0.2f);
                     ct.setSimpleColumn(0, -h, width, 0);
                     ct.setAlignment(getTextAlignment(rtl));
@@ -303,12 +333,14 @@ else if ((options & MULTILINE) == 0)
                         ct.setText(phrase);
                         ct.setLeading(factor * usize);
                         int status = ct.go(true);
-                        if ((status & ColumnText.NO_MORE_COLUMN) == 0)
+                        if ((status & ColumnText.NO_MORE_COLUMN) == 0) {
                             break;
+                        }
                     }
                 }
-                if (usize < 4)
+                if (usize < 4) {
                     usize = 4;
+                }
             }
             changeFontSize(phrase, usize);
             ct.setCanvas(app);
@@ -320,23 +352,27 @@ else if ((options & MULTILINE) == 0)
             ct.setRunDirection(rtl);
             ct.setText(phrase);
             ct.go();
-        }
-        else {
+        } else {
             if (usize == 0) {
-                float maxCalculatedSize = h / (ufont.getFontDescriptor(BaseFont.BBOXURX, 1) - ufont.getFontDescriptor(BaseFont.BBOXLLY, 1));
+                float maxCalculatedSize =
+                        h / (ufont.getFontDescriptor(BaseFont.BBOXURX, 1) - ufont.getFontDescriptor(BaseFont.BBOXLLY,
+                                1));
                 changeFontSize(phrase, 1);
                 float wd = ColumnText.getWidth(phrase, rtl, 0);
-                if (wd == 0)
+                if (wd == 0) {
                     usize = maxCalculatedSize;
-                else
+                } else {
                     usize = Math.min(maxCalculatedSize, (box.getWidth() - extraMarginLeft - 4 * offsetX) / wd);
-                if (usize < 4)
+                }
+                if (usize < 4) {
                     usize = 4;
+                }
             }
             changeFontSize(phrase, usize);
-            float offsetY = offX + ((box.getHeight() - 2*offX) - ufont.getFontDescriptor(BaseFont.ASCENT, usize)) / 2;
-            if (offsetY < offX)
+            float offsetY = offX + ((box.getHeight() - 2 * offX) - ufont.getFontDescriptor(BaseFont.ASCENT, usize)) / 2;
+            if (offsetY < offX) {
                 offsetY = offX;
+            }
             if (offsetY - offX < -ufont.getFontDescriptor(BaseFont.DESCENT, usize)) {
                 float ny = -ufont.getFontDescriptor(BaseFont.DESCENT, usize) + offX;
                 float dy = box.getHeight() - offX - ufont.getFontDescriptor(BaseFont.ASCENT, usize);
@@ -345,16 +381,18 @@ else if ((options & MULTILINE) == 0)
             if ((options & COMB) != 0 && maxCharacterLength > 0) {
                 int textLen = Math.min(maxCharacterLength, ptext.length());
                 int position = 0;
-                if (alignment == Element.ALIGN_RIGHT)
+                if (alignment == Element.ALIGN_RIGHT) {
                     position = maxCharacterLength - textLen;
-                else if (alignment == Element.ALIGN_CENTER)
+                } else if (alignment == Element.ALIGN_CENTER) {
                     position = (maxCharacterLength - textLen) / 2;
+                }
                 float step = (box.getWidth() - extraMarginLeft) / maxCharacterLength;
                 float start = step / 2 + position * step;
-                if (textColor == null)
+                if (textColor == null) {
                     app.setGrayFill(0);
-                else
+                } else {
                     app.setColorFill(textColor);
+                }
                 app.beginText();
                 for (Object o : phrase) {
                     Chunk ck = (Chunk) o;
@@ -370,18 +408,17 @@ else if (alignment == Element.ALIGN_CENTER)
                     }
                 }
                 app.endText();
-            }
-            else {
+            } else {
                 float x;
                 switch (alignment) {
-                case Element.ALIGN_RIGHT:
-                    x = extraMarginLeft + box.getWidth() - (2 * offsetX);
-                    break;
-                case Element.ALIGN_CENTER:
-                    x = extraMarginLeft + (box.getWidth() / 2);
-                    break;
-                default:
-                    x = extraMarginLeft + (2 * offsetX);
+                    case Element.ALIGN_RIGHT:
+                        x = extraMarginLeft + box.getWidth() - (2 * offsetX);
+                        break;
+                    case Element.ALIGN_CENTER:
+                        x = extraMarginLeft + (box.getWidth() / 2);
+                        break;
+                    default:
+                        x = extraMarginLeft + (2 * offsetX);
                 }
                 ColumnText.showTextAligned(app, alignment, phrase, x, offsetY - extraMarginTop, 0, rtl, 0);
             }
@@ -393,56 +430,62 @@ else if (alignment == Element.ALIGN_CENTER)
 
     /**
      * Get the PdfAppearance of a list field
-     * @throws IOException on error
-     * @throws DocumentException on error
+     *
      * @return A PdfAppearance
+     * @throws IOException       on error
+     * @throws DocumentException on error
      */
     PdfAppearance getListAppearance() throws IOException, DocumentException {
-        PdfAppearance app = getBorderAppearance(super.writer,super.box,super.rotation,super.backgroundColor,super.borderStyle,super.borderWidth,super.borderColor,super.options,super.maxCharacterLength);
+        PdfAppearance app = getBorderAppearance(super.writer, super.box, super.rotation, super.backgroundColor,
+                super.borderStyle, super.borderWidth, super.borderColor, super.options, super.maxCharacterLength);
         if (choices == null || choices.length == 0) {
             return app;
         }
         app.beginVariableText();
-        
+
         int topChoice = getTopChoice();
 
         BaseFont ufont = getRealFont();
         float usize = fontSize;
-        if (usize == 0)
+        if (usize == 0) {
             usize = 12;
+        }
 
-        boolean borderExtra = borderStyle == PdfBorderDictionary.STYLE_BEVELED || borderStyle == PdfBorderDictionary.STYLE_INSET;
+        boolean borderExtra =
+                borderStyle == PdfBorderDictionary.STYLE_BEVELED || borderStyle == PdfBorderDictionary.STYLE_INSET;
         float h = box.getHeight() - borderWidth * 2;
         float offsetX = borderWidth;
         if (borderExtra) {
             h -= borderWidth * 2;
             offsetX *= 2;
         }
-        
-        float leading = ufont.getFontDescriptor(BaseFont.BBOXURY, usize) - ufont.getFontDescriptor(BaseFont.BBOXLLY, usize);
-        int maxFit = (int)(h / leading) + 1;
+
+        float leading =
+                ufont.getFontDescriptor(BaseFont.BBOXURY, usize) - ufont.getFontDescriptor(BaseFont.BBOXLLY, usize);
+        int maxFit = (int) (h / leading) + 1;
         int first = 0;
         int last = 0;
         first = topChoice;
         last = first + maxFit;
-        if (last > choices.length)
+        if (last > choices.length) {
             last = choices.length;
+        }
         topFirst = first;
         app.saveState();
         app.rectangle(offsetX, offsetX, box.getWidth() - 2 * offsetX, box.getHeight() - 2 * offsetX);
         app.clip();
         app.newPath();
         Color fcolor = (textColor == null) ? GrayColor.GRAYBLACK : textColor;
-        
-        
+
         // background boxes for selected value[s]
         app.setColorFill(new Color(10, 36, 106));
         for (Object choiceSelection : choiceSelections) {
             int curChoice = (Integer) choiceSelection;
-            // only draw selections within our display range... not strictly necessary with 
-            // that clipping rect from above, but it certainly doesn't hurt either 
+            // only draw selections within our display range... not strictly necessary with
+            // that clipping rect from above, but it certainly doesn't hurt either
             if (curChoice >= first && curChoice <= last) {
-                app.rectangle(offsetX, offsetX + h - (curChoice - first + 1) * leading, box.getWidth() - 2 * offsetX, leading);
+                app.rectangle(offsetX, offsetX + h - (curChoice - first + 1) * leading, box.getWidth() - 2 * offsetX,
+                        leading);
                 app.fill();
             }
         }
@@ -464,15 +507,18 @@ PdfAppearance getListAppearance() throws IOException, DocumentException {
 
     /**
      * Gets a new text field.
-     * @throws IOException on error
-     * @throws DocumentException on error
+     *
      * @return a new text field
-     */    
+     * @throws IOException       on error
+     * @throws DocumentException on error
+     */
     public PdfFormField getTextField() throws IOException, DocumentException {
-        if (maxCharacterLength <= 0)
+        if (maxCharacterLength <= 0) {
             options &= ~COMB;
-        if ((options & COMB) != 0)
+        }
+        if ((options & COMB) != 0) {
             options &= ~MULTILINE;
+        }
         PdfFormField field = PdfFormField.createTextField(writer, false, false, maxCharacterLength);
         field.setWidget(box, PdfAnnotation.HIGHLIGHT_INVERT);
         switch (alignment) {
@@ -483,45 +529,59 @@ public PdfFormField getTextField() throws IOException, DocumentException {
                 field.setQuadding(PdfFormField.Q_RIGHT);
                 break;
         }
-        if (rotation != 0)
+        if (rotation != 0) {
             field.setMKRotation(rotation);
+        }
         if (fieldName != null) {
             field.setFieldName(fieldName);
-            if (!"".equals(text))
+            if (!"".equals(text)) {
                 field.setValueAsString(text);
-            if (defaultText != null)
+            }
+            if (defaultText != null) {
                 field.setDefaultValueAsString(defaultText);
-            if ((options & READ_ONLY) != 0)
+            }
+            if ((options & READ_ONLY) != 0) {
                 field.setFieldFlags(PdfFormField.FF_READ_ONLY);
-            if ((options & REQUIRED) != 0)
+            }
+            if ((options & REQUIRED) != 0) {
                 field.setFieldFlags(PdfFormField.FF_REQUIRED);
-            if ((options & MULTILINE) != 0)
+            }
+            if ((options & MULTILINE) != 0) {
                 field.setFieldFlags(PdfFormField.FF_MULTILINE);
-            if ((options & DO_NOT_SCROLL) != 0)
+            }
+            if ((options & DO_NOT_SCROLL) != 0) {
                 field.setFieldFlags(PdfFormField.FF_DONOTSCROLL);
-            if ((options & PASSWORD) != 0)
+            }
+            if ((options & PASSWORD) != 0) {
                 field.setFieldFlags(PdfFormField.FF_PASSWORD);
-            if ((options & FILE_SELECTION) != 0)
+            }
+            if ((options & FILE_SELECTION) != 0) {
                 field.setFieldFlags(PdfFormField.FF_FILESELECT);
-            if ((options & DO_NOT_SPELL_CHECK) != 0)
+            }
+            if ((options & DO_NOT_SPELL_CHECK) != 0) {
                 field.setFieldFlags(PdfFormField.FF_DONOTSPELLCHECK);
-            if ((options & COMB) != 0)
+            }
+            if ((options & COMB) != 0) {
                 field.setFieldFlags(PdfFormField.FF_COMB);
+            }
         }
         field.setBorderStyle(new PdfBorderDictionary(borderWidth, borderStyle, new PdfDashPattern(3)));
         PdfAppearance tp = getAppearance();
         field.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, tp);
-        PdfAppearance da = (PdfAppearance)tp.getDuplicate();
+        PdfAppearance da = (PdfAppearance) tp.getDuplicate();
         da.setFontAndSize(getRealFont(), fontSize);
-        if (textColor == null)
+        if (textColor == null) {
             da.setGrayFill(0);
-        else
+        } else {
             da.setColorFill(textColor);
+        }
         field.setDefaultAppearanceString(da);
-        if (borderColor != null)
+        if (borderColor != null) {
             field.setMKBorderColor(borderColor);
-        if (backgroundColor != null)
+        }
+        if (backgroundColor != null) {
             field.setMKBackgroundColor(backgroundColor);
+        }
         switch (visibility) {
             case HIDDEN:
                 field.setFlags(PdfAnnotation.FLAGS_PRINT | PdfAnnotation.FLAGS_HIDDEN);
@@ -537,43 +597,45 @@ public PdfFormField getTextField() throws IOException, DocumentException {
         }
         return field;
     }
-    
+
     /**
      * Gets a new combo field.
-     * @throws IOException on error
-     * @throws DocumentException on error
+     *
      * @return a new combo field
-     */    
+     * @throws IOException       on error
+     * @throws DocumentException on error
+     */
     public PdfFormField getComboField() throws IOException, DocumentException {
         return getChoiceField(false);
     }
-    
+
     /**
      * Gets a new list field.
-     * @throws IOException on error
-     * @throws DocumentException on error
+     *
      * @return a new list field
-     */    
+     * @throws IOException       on error
+     * @throws DocumentException on error
+     */
     public PdfFormField getListField() throws IOException, DocumentException {
         return getChoiceField(true);
     }
-    
+
     private int getTopChoice() {
-        if (choiceSelections == null || choiceSelections.size() ==0) {
+        if (choiceSelections == null || choiceSelections.size() == 0) {
             return 0;
         }
-        
+
         Integer firstValue = choiceSelections.get(0);
-        
+
         if (firstValue == null) {
             return 0;
         }
-        
+
         int topChoice = 0;
         if (choices != null) {
             topChoice = firstValue;
-            topChoice = Math.min( topChoice, choices.length );
-            topChoice = Math.max( 0, topChoice);
+            topChoice = Math.min(topChoice, choices.length);
+            topChoice = Math.max(0, topChoice);
         } // else topChoice still 0
         return topChoice;
     }
@@ -581,43 +643,50 @@ private int getTopChoice() {
     protected PdfFormField getChoiceField(boolean isList) throws IOException, DocumentException {
         options &= (~MULTILINE) & (~COMB);
         String[] uchoices = choices;
-        if (uchoices == null)
+        if (uchoices == null) {
             uchoices = new String[0];
+        }
 
         int topChoice = getTopChoice();
 
-        if (text == null)
+        if (text == null) {
             text = ""; //fixed by Kazuya Ujihara (ujihara.jp)
+        }
 
-        if (topChoice >= 0)
+        if (topChoice >= 0) {
             text = uchoices[topChoice];
-        
+        }
+
         PdfFormField field = null;
         String[][] mix = null;
-        
+
         if (choiceExports == null) {
-            if (isList)
+            if (isList) {
                 field = PdfFormField.createList(writer, uchoices, topChoice);
-            else
+            } else {
                 field = PdfFormField.createCombo(writer, (options & EDIT) != 0, uchoices, topChoice);
-        }
-        else {
+            }
+        } else {
             mix = new String[uchoices.length][2];
-            for (int k = 0; k < mix.length; ++k)
+            for (int k = 0; k < mix.length; ++k) {
                 mix[k][0] = mix[k][1] = uchoices[k];
+            }
             int top = Math.min(uchoices.length, choiceExports.length);
             for (int k = 0; k < top; ++k) {
-                if (choiceExports[k] != null)
+                if (choiceExports[k] != null) {
                     mix[k][0] = choiceExports[k];
+                }
             }
-            if (isList)
+            if (isList) {
                 field = PdfFormField.createList(writer, mix, topChoice);
-            else
+            } else {
                 field = PdfFormField.createCombo(writer, (options & EDIT) != 0, mix, topChoice);
+            }
         }
         field.setWidget(box, PdfAnnotation.HIGHLIGHT_INVERT);
-        if (rotation != 0)
+        if (rotation != 0) {
             field.setMKRotation(rotation);
+        }
         if (fieldName != null) {
             field.setFieldName(fieldName);
             if (uchoices.length > 0) {
@@ -626,48 +695,55 @@ protected PdfFormField getChoiceField(boolean isList) throws IOException, Docume
                         field.setValueAsString(mix[topChoice][0]);
                         field.setDefaultValueAsString(mix[topChoice][0]);
                     } else {
-                        writeMultipleValues( field, mix);
+                        writeMultipleValues(field, mix);
                     }
                 } else {
                     if (choiceSelections.size() < 2) {
                         field.setValueAsString(text);
                         field.setDefaultValueAsString(text);
                     } else {
-                        writeMultipleValues( field, null );
+                        writeMultipleValues(field, null);
                     }
                 }
             }
-            if ((options & READ_ONLY) != 0)
+            if ((options & READ_ONLY) != 0) {
                 field.setFieldFlags(PdfFormField.FF_READ_ONLY);
-            if ((options & REQUIRED) != 0)
+            }
+            if ((options & REQUIRED) != 0) {
                 field.setFieldFlags(PdfFormField.FF_REQUIRED);
-            if ((options & DO_NOT_SPELL_CHECK) != 0)
+            }
+            if ((options & DO_NOT_SPELL_CHECK) != 0) {
                 field.setFieldFlags(PdfFormField.FF_DONOTSPELLCHECK);
+            }
             if ((options & MULTISELECT) != 0) {
-                field.setFieldFlags( PdfFormField.FF_MULTISELECT );
+                field.setFieldFlags(PdfFormField.FF_MULTISELECT);
             }
         }
         field.setBorderStyle(new PdfBorderDictionary(borderWidth, borderStyle, new PdfDashPattern(3)));
         PdfAppearance tp;
         if (isList) {
             tp = getListAppearance();
-            if (topFirst > 0)
+            if (topFirst > 0) {
                 field.put(PdfName.TI, new PdfNumber(topFirst));
-        }
-        else
+            }
+        } else {
             tp = getAppearance();
+        }
         field.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, tp);
-        PdfAppearance da = (PdfAppearance)tp.getDuplicate();
+        PdfAppearance da = (PdfAppearance) tp.getDuplicate();
         da.setFontAndSize(getRealFont(), fontSize);
-        if (textColor == null)
+        if (textColor == null) {
             da.setGrayFill(0);
-        else
+        } else {
             da.setColorFill(textColor);
+        }
         field.setDefaultAppearanceString(da);
-        if (borderColor != null)
+        if (borderColor != null) {
             field.setMKBorderColor(borderColor);
-        if (backgroundColor != null)
+        }
+        if (backgroundColor != null) {
             field.setMKBackgroundColor(backgroundColor);
+        }
         switch (visibility) {
             case HIDDEN:
                 field.setFlags(PdfAnnotation.FLAGS_PRINT | PdfAnnotation.FLAGS_HIDDEN);
@@ -691,141 +767,148 @@ private void writeMultipleValues(PdfFormField field, String[][] mix) {
             int idx = (Integer) choiceSelection;
             indexes.add(new PdfNumber(idx));
 
-            if (mix != null)
+            if (mix != null) {
                 values.add(new PdfString(mix[idx][0]));
-            else if (choices != null)
+            } else if (choices != null) {
                 values.add(new PdfString(choices[idx]));
+            }
         }
-        
-        field.put( PdfName.V, values );
-        field.put( PdfName.I, indexes );
+
+        field.put(PdfName.V, values);
+        field.put(PdfName.I, indexes);
 
     }
-    
+
     /**
      * Gets the default text.
+     *
      * @return the default text
      */
     public String getDefaultText() {
         return this.defaultText;
     }
-    
+
     /**
      * Sets the default text. It is only meaningful for text fields.
+     *
      * @param defaultText the default text
      */
     public void setDefaultText(String defaultText) {
         this.defaultText = defaultText;
     }
-    
+
     /**
      * Gets the choices to be presented to the user in list/combo fields.
+     *
      * @return the choices to be presented to the user
      */
     public String[] getChoices() {
         return this.choices;
     }
-    
+
     /**
      * Sets the choices to be presented to the user in list/combo fields.
+     *
      * @param choices the choices to be presented to the user
      */
     public void setChoices(String[] choices) {
         this.choices = choices;
     }
-    
+
     /**
      * Gets the export values in list/combo fields.
+     *
      * @return the export values in list/combo fields
      */
     public String[] getChoiceExports() {
         return this.choiceExports;
     }
-    
+
     /**
-     * Sets the export values in list/combo fields. If this array
-     * is null then the choice values will also be used
-     * as the export values.
+     * Sets the export values in list/combo fields. If this array is null then the choice values will also
+     * be used as the export values.
+     *
      * @param choiceExports the export values in list/combo fields
      */
     public void setChoiceExports(String[] choiceExports) {
         this.choiceExports = choiceExports;
     }
-    
+
     /**
      * Gets the zero based index of the selected item.
+     *
      * @return the zero based index of the selected item
      */
     public int getChoiceSelection() {
         return getTopChoice();
     }
-    
-    public ArrayList gteChoiceSelections() {
-        return choiceSelections;
-    }
 
     /**
      * Sets the zero based index of the selected item.
+     *
      * @param choiceSelection the zero based index of the selected item
      */
     public void setChoiceSelection(int choiceSelection) {
         choiceSelections = new ArrayList<>();
         choiceSelections.add(choiceSelection);
     }
-    
+
+    public ArrayList gteChoiceSelections() {
+        return choiceSelections;
+    }
+
     /**
-     * adds another (or a first I suppose) selection to a MULTISELECT list.
-     * This doesn't do anything unless {@code this.options & MUTLISELECT != 0}
+     * adds another (or a first I suppose) selection to a MULTISELECT list. This doesn't do anything unless
+     * {@code this.options & MUTLISELECT != 0}
+     *
      * @param selection new selection
      */
-    public void addChoiceSelection( int selection) {
+    public void addChoiceSelection(int selection) {
         if ((this.options & BaseField.MULTISELECT) != 0) {
             choiceSelections.add(selection);
         }
     }
 
     /**
-     * replaces the existing selections with the param. If this field isn't a MULTISELECT
-     * list, all but the first element will be removed.
+     * replaces the existing selections with the param. If this field isn't a MULTISELECT list, all but the first
+     * element will be removed.
+     *
      * @param selections new selections.  If null, it clear()s the underlying ArrayList.
      */
-    public void setChoiceSelections(List selections ) {
+    public void setChoiceSelections(List selections) {
         if (selections != null) {
-            choiceSelections = new ArrayList<>( selections );
-            if (choiceSelections.size() > 1 && (options & BaseField.MULTISELECT) == 0 ) {
+            choiceSelections = new ArrayList<>(selections);
+            if (choiceSelections.size() > 1 && (options & BaseField.MULTISELECT) == 0) {
                 // can't have multiple selections in a single-select field
                 while (choiceSelections.size() > 1) {
-                    choiceSelections.remove( 1 );
+                    choiceSelections.remove(1);
                 }
             }
-            
-        } else { 
+
+        } else {
             choiceSelections.clear();
         }
     }
-    
+
     int getTopFirst() {
         return topFirst;
     }
-    
+
     /**
      * Sets extra margins in text fields to better mimic the Acrobat layout.
+     *
      * @param extraMarginLeft the extra margin left
-     * @param extraMarginTop the extra margin top
-     */    
+     * @param extraMarginTop  the extra margin top
+     */
     public void setExtraMargin(float extraMarginLeft, float extraMarginTop) {
         this.extraMarginLeft = extraMarginLeft;
         this.extraMarginTop = extraMarginTop;
     }
 
     /**
-     * Holds value of property substitutionFonts.
-     */
-    private List substitutionFonts;
-
-    /**
-     * Gets the list of substitution fonts. The list is composed of BaseFont and can be null. The fonts in this list will be used if the original
-     * font doesn't contain the needed glyphs.
+     * Gets the list of substitution fonts. The list is composed of BaseFont and can be null.
+     * The fonts in this list will be used if the original font doesn't contain the needed glyphs.
+     *
      * @return the list
      */
     public List getSubstitutionFontList() {
@@ -833,8 +916,9 @@ public List getSubstitutionFontList() {
     }
 
     /**
-     * Sets a list of substitution fonts. The list is composed of BaseFont and can also be null. The fonts in this list will be used if the original
-     * font doesn't contain the needed glyphs.
+     * Sets a list of substitution fonts. The list is composed of BaseFont and can also be
+     * null. The fonts in this list will be used if the original font doesn't contain the needed glyphs.
+     *
      * @param substitutionFonts the list
      */
     public void setSubstitutionFontList(List substitutionFonts) {
@@ -842,13 +926,8 @@ public void setSubstitutionFontList(List substitutionFonts) {
     }
 
     /**
-     * Holds value of property extensionFont.
-     */
-    private BaseFont extensionFont;
-
-    /**
-     * Gets the extensionFont. This font will be searched before the
-     * substitution fonts. It may be null.
+     * Gets the extensionFont. This font will be searched before the substitution fonts. It may be null.
+     *
      * @return the extensionFont
      */
     public BaseFont getExtensionFont() {
@@ -856,8 +935,8 @@ public BaseFont getExtensionFont() {
     }
 
     /**
-     * Sets the extensionFont. This font will be searched before the
-     * substitution fonts. It may be null.
+     * Sets the extensionFont. This font will be searched before the substitution fonts. It may be null.
+     *
      * @param extensionFont New value of property extensionFont.
      */
     public void setExtensionFont(BaseFont extensionFont) {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFont.java b/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFont.java
index 193e85458..64100b556 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFont.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFont.java
@@ -49,20 +49,20 @@
 
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.ExceptionConverter;
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.lowagie.text.error_messages.MessageLocalization;
-
-import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.ExceptionConverter;
 
 
-/** Reads a Truetype font
+/**
+ * Reads a Truetype font
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
@@ -136,81 +136,85 @@ class TrueTypeFont extends BaseFont {
             "708 Arabic; ASMO 708",
             "850 WE/Latin 1",
             "437 US"};
- 
+
     protected boolean justNames = false;
-    /** Contains the location of the several tables. The key is the name of
-     * the table and the value is an int[2] where position 0
-     * is the offset from the start of the file and position 1 is the length
-     * of the table.
+    /**
+     * Contains the location of the several tables. The key is the name of the table and the value is an
+     * int[2] where position 0 is the offset from the start of the file and position 1 is the length of
+     * the table.
      */
     protected HashMap tables;
-    /** The file in use.
+    /**
+     * The file in use.
      */
     protected RandomAccessFileOrArray rf;
-    /** The file name.
+    /**
+     * The file name.
      */
     protected String fileName;
-    
+
     protected boolean cff = false;
-    
+
     protected int cffOffset;
-    
+
     protected int cffLength;
-    
-    /** The offset from the start of the file to the table directory.
-     * It is 0 for TTF and may vary for TTC depending on the chosen font.
-     */    
+
+    /**
+     * The offset from the start of the file to the table directory. It is 0 for TTF and may vary for TTC depending on
+     * the chosen font.
+     */
     protected int directoryOffset;
-    /** The index for the TTC font. It is an empty String for a
-     * TTF file.
-     */    
+    /**
+     * The index for the TTC font. It is an empty String for a TTF file.
+     */
     protected String ttcIndex;
-    /** The style modifier */
+    /**
+     * The style modifier
+     */
     protected String style = "";
-    /** The content of table 'head'.
+    /**
+     * The content of table 'head'.
      */
     protected FontHeader head = new FontHeader();
-    /** The content of table 'hhea'.
+    /**
+     * The content of table 'hhea'.
      */
     protected HorizontalHeader hhea = new HorizontalHeader();
-    /** The content of table 'OS/2'.
+    /**
+     * The content of table 'OS/2'.
      */
     protected WindowsMetrics os_2 = new WindowsMetrics();
     /**
-     * The width of the glyphs. This is essentially the content of table
-     * 'hmtx' normalized to 1000 units.
+     * The width of the glyphs. This is essentially the content of table 'hmtx' normalized to 1000 units.
      */
     protected int[] GlyphWidths;
 
     protected int[][] bboxes;
-    /** The map containing the code information for the table 'cmap', encoding 1.0.
-     * The key is the code and the value is an int[2] where position 0
-     * is the glyph number and position 1 is the glyph width normalized to 1000
+    /**
+     * The map containing the code information for the table 'cmap', encoding 1.0. The key is the code and the value is
+     * an int[2] where position 0 is the glyph number and position 1 is the glyph width normalized to 1000
      * units.
      */
     protected HashMap cmap10;
-    /** The map containing the code information for the table 'cmap', encoding 3.1
-     * in Unicode.
-     * 
              
-     * The key is the code and the value is an int[2] where position 0
-     * is the glyph number and position 1 is the glyph width normalized to 1000
-     * units.
+    /**
+     * The map containing the code information for the table 'cmap', encoding 3.1 in Unicode.
+     * 
              
+     * The key is the code and the value is an int[2] where position 0 is the glyph number and position 1
+     * is the glyph width normalized to 1000 units.
      */
     protected HashMap cmap31;
 
     protected HashMap cmapExt;
 
-    /** The map containing the kerning information. It represents the content of
-     * table 'kern'. The key is an Integer where the top 16 bits
-     * are the glyph number for the first character and the lower 16 bits are the
-     * glyph number for the second character. The value is the amount of kerning in
-     * normalized 1000 units as an Integer. This value is usually negative.
+    /**
+     * The map containing the kerning information. It represents the content of table 'kern'. The key is an
+     * Integer where the top 16 bits are the glyph number for the first character and the lower 16 bits
+     * are the glyph number for the second character. The value is the amount of kerning in normalized 1000 units as an
+     * Integer. This value is usually negative.
      */
     protected IntHashtable kerning = new IntHashtable();
     /**
-     * The font name.
-     * This name is usually extracted from the table 'name' with
-     * the 'Name ID' 6.
+     * The font name. This name is usually extracted from the table 'name' with the 'Name ID' 6.
      */
     protected String fontName;
 
@@ -228,147 +232,43 @@ class TrueTypeFont extends BaseFont {
      * The family name of the font
      */
     protected String[][] familyName;
-    /** The italic angle. It is usually extracted from the 'post' table or in it's
-     * absence with the code:
-     * 
              
+    /**
+     * The italic angle. It is usually extracted from the 'post' table or in it's absence with the code:
+     * 
              
      * 
                    * -Math.atan2(hhea.caretSlopeRun, hhea.caretSlopeRise) * 180 / Math.PI
      * 
              
      */
     protected double italicAngle;
-    /** true if all the glyphs have the same width.
+    /**
+     * true if all the glyphs have the same width.
      */
     protected boolean isFixedPitch = false;
-    
+
     protected int underlinePosition;
-    
+
     protected int underlineThickness;
-    
-    /** The components of table 'head'.
-     */
-    protected static class FontHeader {
-        /** A variable. */
-        int flags;
-        /** A variable. */
-        int unitsPerEm;
-        /** A variable. */
-        short xMin;
-        /** A variable. */
-        short yMin;
-        /** A variable. */
-        short xMax;
-        /** A variable. */
-        short yMax;
-        /** A variable. */
-        int macStyle;
-    }
-    
-    /** The components of table 'hhea'.
-     */
-    protected static class HorizontalHeader {
-        /** A variable. */
-        short Ascender;
-        /** A variable. */
-        short Descender;
-        /** A variable. */
-        short LineGap;
-        /** A variable. */
-        int advanceWidthMax;
-        /** A variable. */
-        short minLeftSideBearing;
-        /** A variable. */
-        short minRightSideBearing;
-        /** A variable. */
-        short xMaxExtent;
-        /** A variable. */
-        short caretSlopeRise;
-        /** A variable. */
-        short caretSlopeRun;
-        /** A variable. */
-        int numberOfHMetrics;
-    }
-    
-    /** The components of table 'OS/2'.
-     */
-    protected static class WindowsMetrics {
-        /** A variable. */
-        short xAvgCharWidth;
-        /** A variable. */
-        int usWeightClass;
-        /** A variable. */
-        int usWidthClass;
-        /** A variable. */
-        short fsType;
-        /** A variable. */
-        short ySubscriptXSize;
-        /** A variable. */
-        short ySubscriptYSize;
-        /** A variable. */
-        short ySubscriptXOffset;
-        /** A variable. */
-        short ySubscriptYOffset;
-        /** A variable. */
-        short ySuperscriptXSize;
-        /** A variable. */
-        short ySuperscriptYSize;
-        /** A variable. */
-        short ySuperscriptXOffset;
-        /** A variable. */
-        short ySuperscriptYOffset;
-        /** A variable. */
-        short yStrikeoutSize;
-        /** A variable. */
-        short yStrikeoutPosition;
-        /** A variable. */
-        short sFamilyClass;
-        /**
-         * A variable.
-         */
-        byte[] panose = new byte[10];
-        /**
-         * A variable.
-         */
-        byte[] achVendID = new byte[4];
-        /** A variable. */
-        int fsSelection;
-        /** A variable. */
-        int usFirstCharIndex;
-        /** A variable. */
-        int usLastCharIndex;
-        /** A variable. */
-        short sTypoAscender;
-        /** A variable. */
-        short sTypoDescender;
-        /** A variable. */
-        short sTypoLineGap;
-        /** A variable. */
-        int usWinAscent;
-        /** A variable. */
-        int usWinDescent;
-        /** A variable. */
-        int ulCodePageRange1;
-        /** A variable. */
-        int ulCodePageRange2;
-        /** A variable. */
-        int sCapHeight;
-    }
-    
-    /** This constructor is present to allow extending the class.
+
+    /**
+     * This constructor is present to allow extending the class.
      */
     protected TrueTypeFont() {
     }
-    
-    /** Creates a new TrueType font.
-     * @param ttFile the location of the font on file. The file must end in '.ttf' or
-     * '.ttc' but can have modifiers after the name
-     * @param enc the encoding to be applied to this font
-     * @param emb true if the font is to be embedded in the PDF
+
+    /**
+     * Creates a new TrueType font.
+     *
+     * @param ttFile the location of the font on file. The file must end in '.ttf' or '.ttc' but can have modifiers
+     *               after the name
+     * @param enc    the encoding to be applied to this font
+     * @param emb    true if the font is to be embedded in the PDF
      * @param ttfAfm the font as a byte array
      * @throws DocumentException the font is invalid
-     * @throws IOException the font file could not be read
-     * @since    2.1.5
+     * @throws IOException       the font file could not be read
+     * @since 2.1.5
      */
-    TrueTypeFont(String ttFile, String enc, boolean emb, byte[] ttfAfm, boolean justNames, boolean forceRead) throws DocumentException, IOException {
+    TrueTypeFont(String ttFile, String enc, boolean emb, byte[] ttfAfm, boolean justNames, boolean forceRead)
+            throws DocumentException, IOException {
         this.justNames = justNames;
         String nameBase = getBaseName(ttFile);
         String ttcName = getTTCName(nameBase);
@@ -380,44 +280,86 @@ protected TrueTypeFont() {
         fileName = ttcName;
         fontType = FONT_TYPE_TT;
         ttcIndex = "";
-        if (ttcName.length() < nameBase.length())
+        if (ttcName.length() < nameBase.length()) {
             ttcIndex = nameBase.substring(ttcName.length() + 1);
-        if (fileName.toLowerCase().endsWith(".ttf") || fileName.toLowerCase().endsWith(".otf") || fileName.toLowerCase().endsWith(".ttc")) {
+        }
+        if (fileName.toLowerCase().endsWith(".ttf") || fileName.toLowerCase().endsWith(".otf") || fileName.toLowerCase()
+                .endsWith(".ttc")) {
             process(ttfAfm, forceRead);
-            if (!justNames && embedded && os_2.fsType == 2)
-                throw new DocumentException(MessageLocalization.getComposedMessage("1.cannot.be.embedded.due.to.licensing.restrictions", fileName + style));
+            if (!justNames && embedded && os_2.fsType == 2) {
+                throw new DocumentException(
+                        MessageLocalization.getComposedMessage("1.cannot.be.embedded.due.to.licensing.restrictions",
+                                fileName + style));
+            }
+        } else {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("1.is.not.a.ttf.otf.or.ttc.font.file", fileName + style));
         }
-        else
-            throw new DocumentException(MessageLocalization.getComposedMessage("1.is.not.a.ttf.otf.or.ttc.font.file", fileName + style));
-        if (!encoding.startsWith("#"))
+        if (!encoding.startsWith("#")) {
             PdfEncodings.convertToBytes(" ", enc); // check if the encoding exists
+        }
         createEncoding();
     }
-    
-    /** Gets the name from a composed TTC file name.
-     * If I have for input "myfont.ttc,2" the return will
-     * be "myfont.ttc".
+
+    /**
+     * Gets the name from a composed TTC file name. If I have for input "myfont.ttc,2" the return will be "myfont.ttc".
+     *
      * @param name the full name
      * @return the simple file name
-     */    
+     */
     protected static String getTTCName(String name) {
         int idx = name.toLowerCase().indexOf(".ttc,");
-        if (idx < 0)
+        if (idx < 0) {
             return name;
-        else
+        } else {
             return name.substring(0, idx + 4);
+        }
+    }
+
+    protected static int[] compactRanges(ArrayList ranges) {
+        List simp = new ArrayList<>();
+        for (Object range : ranges) {
+            int[] r = (int[]) range;
+            for (int j = 0; j < r.length; j += 2) {
+                if (r.length > j + 1) {
+                    simp.add(new int[]{Math.max(0, Math.min(r[j], r[j + 1])),
+                            Math.min(0xffff, Math.max(r[j], r[j + 1]))});
+                }
+            }
+        }
+        for (int k1 = 0; k1 < simp.size() - 1; ++k1) {
+            for (int k2 = k1 + 1; k2 < simp.size(); ++k2) {
+                int[] r1 = simp.get(k1);
+                int[] r2 = simp.get(k2);
+                if ((r1[0] >= r2[0] && r1[0] <= r2[1]) || (r1[1] >= r2[0] && r1[0] <= r2[1])) {
+                    r1[0] = Math.min(r1[0], r2[0]);
+                    r1[1] = Math.max(r1[1], r2[1]);
+                    simp.remove(k2);
+                    --k2;
+                }
+            }
+        }
+        int[] s = new int[simp.size() * 2];
+        for (int k = 0; k < simp.size(); ++k) {
+            int[] r = simp.get(k);
+            s[k * 2] = r[0];
+            s[k * 2 + 1] = r[1];
+        }
+        return s;
     }
-    
-    
+
     /**
      * Reads the tables 'head', 'hhea', 'OS/2' and 'post' filling several variables.
+     *
      * @throws DocumentException the font is invalid
-     * @throws IOException the font file could not be read
+     * @throws IOException       the font file could not be read
      */
     void fillTables() throws DocumentException, IOException {
         int[] table_location = tables.get("head");
-        if (table_location == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "head", fileName + style));
+        if (table_location == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "head", fileName + style));
+        }
         rf.seek(table_location[0] + 16);
         head.flags = rf.readUnsignedShort();
         head.unitsPerEm = rf.readUnsignedShort();
@@ -427,10 +369,12 @@ void fillTables() throws DocumentException, IOException {
         head.xMax = rf.readShort();
         head.yMax = rf.readShort();
         head.macStyle = rf.readUnsignedShort();
-        
+
         table_location = tables.get("hhea");
-        if (table_location == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "hhea", fileName + style));
+        if (table_location == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "hhea", fileName + style));
+        }
         rf.seek(table_location[0] + 4);
         hhea.Ascender = rf.readShort();
         hhea.Descender = rf.readShort();
@@ -443,10 +387,12 @@ void fillTables() throws DocumentException, IOException {
         hhea.caretSlopeRun = rf.readShort();
         rf.skipBytes(12);
         hhea.numberOfHMetrics = rf.readUnsignedShort();
-        
+
         table_location = tables.get("OS/2");
-        if (table_location == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "OS/2", fileName + style));
+        if (table_location == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "OS/2", fileName + style));
+        }
         rf.seek(table_location[0]);
         int version = rf.readUnsignedShort();
         os_2.xAvgCharWidth = rf.readShort();
@@ -472,8 +418,9 @@ void fillTables() throws DocumentException, IOException {
         os_2.usLastCharIndex = rf.readUnsignedShort();
         os_2.sTypoAscender = rf.readShort();
         os_2.sTypoDescender = rf.readShort();
-        if (os_2.sTypoDescender > 0)
-            os_2.sTypoDescender = (short)(-os_2.sTypoDescender);
+        if (os_2.sTypoDescender > 0) {
+            os_2.sTypoDescender = (short) (-os_2.sTypoDescender);
+        }
         os_2.sTypoLineGap = rf.readShort();
         os_2.usWinAscent = rf.readUnsignedShort();
         os_2.usWinDescent = rf.readUnsignedShort();
@@ -486,10 +433,10 @@ void fillTables() throws DocumentException, IOException {
         if (version > 1) {
             rf.skipBytes(2);
             os_2.sCapHeight = rf.readShort();
+        } else {
+            os_2.sCapHeight = (int) (0.7 * head.unitsPerEm);
         }
-        else
-            os_2.sCapHeight = (int)(0.7 * head.unitsPerEm);
-        
+
         table_location = tables.get("post");
         if (table_location == null) {
             italicAngle = -Math.atan2(hhea.caretSlopeRun, hhea.caretSlopeRise) * 180 / Math.PI;
@@ -503,18 +450,21 @@ void fillTables() throws DocumentException, IOException {
         underlineThickness = rf.readShort();
         isFixedPitch = rf.readInt() != 0;
     }
-    
+
     /**
      * Gets the Postscript font name.
-     * @throws DocumentException the font is invalid
-     * @throws IOException the font file could not be read
+     *
      * @return the Postscript font name
+     * @throws DocumentException the font is invalid
+     * @throws IOException       the font file could not be read
      */
     String getBaseFont() throws DocumentException, IOException {
         int[] table_location;
         table_location = tables.get("name");
-        if (table_location == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "name", fileName + style));
+        if (table_location == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "name", fileName + style));
+        }
         rf.seek(table_location[0] + 2);
         int numRecords = rf.readUnsignedShort();
         int startOfStorage = rf.readUnsignedShort();
@@ -527,26 +477,31 @@ String getBaseFont() throws DocumentException, IOException {
             int offset = rf.readUnsignedShort();
             if (nameID == 6) {
                 rf.seek(table_location[0] + startOfStorage + offset);
-                if (platformID == 0 || platformID == 3)
+                if (platformID == 0 || platformID == 3) {
                     return readUnicodeString(length);
-                else
+                } else {
                     return readStandardString(length);
+                }
             }
         }
         File file = new File(fileName);
         return file.getName().replace(' ', '-');
     }
-    
-    /** Extracts the names of the font in all the languages available.
+
+    /**
+     * Extracts the names of the font in all the languages available.
+     *
      * @param id the name id to retrieve
      * @throws DocumentException on error
-     * @throws IOException on error
-     */    
+     * @throws IOException       on error
+     */
     String[][] getNames(int id) throws DocumentException, IOException {
         int[] table_location;
         table_location = tables.get("name");
-        if (table_location == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "name", fileName + style));
+        if (table_location == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "name", fileName + style));
+        }
         rf.seek(table_location[0] + 2);
         int numRecords = rf.readUnsignedShort();
         int startOfStorage = rf.readUnsignedShort();
@@ -562,31 +517,35 @@ String[][] getNames(int id) throws DocumentException, IOException {
                 int pos = rf.getFilePointer();
                 rf.seek(table_location[0] + startOfStorage + offset);
                 String name;
-                if (platformID == 0 || platformID == 3 || (platformID == 2 && platformEncodingID == 1)){
+                if (platformID == 0 || platformID == 3 || (platformID == 2 && platformEncodingID == 1)) {
                     name = readUnicodeString(length);
-                }
-                else {
+                } else {
                     name = readStandardString(length);
                 }
                 names.add(new String[]{String.valueOf(platformID),
-                    String.valueOf(platformEncodingID), String.valueOf(languageID), name});
+                        String.valueOf(platformEncodingID), String.valueOf(languageID), name});
                 rf.seek(pos);
             }
         }
         String[][] thisName = new String[names.size()][];
-        for (int k = 0; k < names.size(); ++k)
+        for (int k = 0; k < names.size(); ++k) {
             thisName[k] = names.get(k);
+        }
         return thisName;
     }
-    
-    /** Extracts all the names of the names-Table
+
+    /**
+     * Extracts all the names of the names-Table
+     *
      * @throws DocumentException on error
-     * @throws IOException on error
-     */    
+     * @throws IOException       on error
+     */
     String[][] getAllNames() throws DocumentException, IOException {
         int[] table_location = tables.get("name");
-        if (table_location == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "name", fileName + style));
+        if (table_location == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "name", fileName + style));
+        }
         rf.seek(table_location[0] + 2);
         int numRecords = rf.readUnsignedShort();
         int startOfStorage = rf.readUnsignedShort();
@@ -601,10 +560,9 @@ String[][] getAllNames() throws DocumentException, IOException {
             int pos = rf.getFilePointer();
             rf.seek(table_location[0] + startOfStorage + offset);
             String name;
-            if (platformID == 0 || platformID == 3 || (platformID == 2 && platformEncodingID == 1)){
+            if (platformID == 0 || platformID == 3 || (platformID == 2 && platformEncodingID == 1)) {
                 name = readUnicodeString(length);
-            }
-            else {
+            } else {
                 name = readStandardString(length);
             }
             names.add(new String[]{String.valueOf(nameID), String.valueOf(platformID),
@@ -612,11 +570,12 @@ String[][] getAllNames() throws DocumentException, IOException {
             rf.seek(pos);
         }
         String[][] thisName = new String[names.size()][];
-        for (int k = 0; k < names.size(); ++k)
+        for (int k = 0; k < names.size(); ++k) {
             thisName[k] = names.get(k);
+        }
         return thisName;
     }
-    
+
     void checkCff() {
         int[] table_location;
         table_location = tables.get("CFF ");
@@ -627,38 +586,50 @@ void checkCff() {
         }
     }
 
-    /** Reads the font data.
+    /**
+     * Reads the font data.
+     *
      * @param ttfAfm the font as a byte array, possibly null
      * @throws DocumentException the font is invalid
-     * @throws IOException the font file could not be read
-     * @since    2.1.5
+     * @throws IOException       the font file could not be read
+     * @since 2.1.5
      */
     void process(byte[] ttfAfm, boolean preload) throws DocumentException, IOException {
         tables = new HashMap<>();
-        
+
         try {
-            if (ttfAfm == null)
+            if (ttfAfm == null) {
                 rf = new RandomAccessFileOrArray(fileName, preload, Document.plainRandomAccess);
-            else
+            } else {
                 rf = new RandomAccessFileOrArray(ttfAfm);
+            }
             if (ttcIndex.length() > 0) {
                 int dirIdx = Integer.parseInt(ttcIndex);
-                if (dirIdx < 0)
-                    throw new DocumentException(MessageLocalization.getComposedMessage("the.font.index.for.1.must.be.positive", fileName));
+                if (dirIdx < 0) {
+                    throw new DocumentException(
+                            MessageLocalization.getComposedMessage("the.font.index.for.1.must.be.positive", fileName));
+                }
                 String mainTag = readStandardString(4);
-                if (!mainTag.equals("ttcf"))
-                    throw new DocumentException(MessageLocalization.getComposedMessage("1.is.not.a.valid.ttc.file", fileName));
+                if (!mainTag.equals("ttcf")) {
+                    throw new DocumentException(
+                            MessageLocalization.getComposedMessage("1.is.not.a.valid.ttc.file", fileName));
+                }
                 rf.skipBytes(4);
                 int dirCount = rf.readInt();
-                if (dirIdx >= dirCount)
-                    throw new DocumentException(MessageLocalization.getComposedMessage("the.font.index.for.1.must.be.between.0.and.2.it.was.3", fileName, String.valueOf(dirCount - 1), String.valueOf(dirIdx)));
+                if (dirIdx >= dirCount) {
+                    throw new DocumentException(MessageLocalization.getComposedMessage(
+                            "the.font.index.for.1.must.be.between.0.and.2.it.was.3", fileName,
+                            String.valueOf(dirCount - 1), String.valueOf(dirIdx)));
+                }
                 rf.skipBytes(dirIdx * 4);
                 directoryOffset = rf.readInt();
             }
             rf.seek(directoryOffset);
             int ttId = rf.readInt();
-            if (ttId != 0x00010000 && ttId != 0x4F54544F)
-                throw new DocumentException(MessageLocalization.getComposedMessage("1.is.not.a.valid.ttf.or.otf.file", fileName));
+            if (ttId != 0x00010000 && ttId != 0x4F54544F) {
+                throw new DocumentException(
+                        MessageLocalization.getComposedMessage("1.is.not.a.valid.ttf.or.otf.file", fileName));
+            }
             int num_tables = rf.readUnsignedShort();
             rf.skipBytes(6);
             for (int k = 0; k < num_tables; ++k) {
@@ -681,18 +652,19 @@ void process(byte[] ttfAfm, boolean preload) throws DocumentException, IOExcepti
                 readKerning();
                 readBbox();
             }
-        }
-        finally {
+        } finally {
             if (rf != null) {
                 rf.close();
-                if (!embedded)
+                if (!embedded) {
                     rf = null;
+                }
             }
         }
     }
-    
-    /** Reads a String from the font file as bytes using the Cp1252
-     *  encoding.
+
+    /**
+     * Reads a String from the font file as bytes using the Cp1252 encoding.
+     *
      * @param length the length of bytes to read
      * @return the String read
      * @throws IOException the font file could not be read
@@ -702,16 +674,15 @@ protected String readStandardString(int length) throws IOException {
         rf.readFully(buf);
         try {
             return new String(buf, WINANSI);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
     }
-    
-    /** Reads a Unicode String from the font file. Each character is
-     *  represented by two bytes.
-     * @param length the length of bytes to read. The String will have length/2
-     * characters
+
+    /**
+     * Reads a Unicode String from the font file. Each character is represented by two bytes.
+     *
+     * @param length the length of bytes to read. The String will have length/2 characters
      * @return the String read
      * @throws IOException the font file could not be read
      */
@@ -723,16 +694,20 @@ protected String readUnicodeString(int length) throws IOException {
         }
         return buf.toString();
     }
-    
-    /** Reads the glyphs widths. The widths are extracted from the table 'hmtx'.
-     *  The glyphs are normalized to 1000 units.
+
+    /**
+     * Reads the glyphs widths. The widths are extracted from the table 'hmtx'. The glyphs are normalized to 1000
+     * units.
+     *
      * @throws DocumentException the font is invalid
-     * @throws IOException the font file could not be read
+     * @throws IOException       the font file could not be read
      */
     protected void readGlyphWidths() throws DocumentException, IOException {
         int[] table_location = tables.get("hmtx");
-        if (table_location == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "hmtx", fileName + style));
+        if (table_location == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "hmtx", fileName + style));
+        }
         rf.seek(table_location[0]);
         GlyphWidths = new int[hhea.numberOfHMetrics];
         for (int k = 0; k < hhea.numberOfHMetrics; ++k) {
@@ -740,43 +715,52 @@ protected void readGlyphWidths() throws DocumentException, IOException {
             rf.readUnsignedShort();
         }
     }
-    
-    /** Gets a glyph width.
+
+    /**
+     * Gets a glyph width.
+     *
      * @param glyph the glyph to get the width of
      * @return the width of the glyph in normalized 1000 units
      */
     protected int getGlyphWidth(int glyph) {
-        if (glyph >= GlyphWidths.length)
+        if (glyph >= GlyphWidths.length) {
             glyph = GlyphWidths.length - 1;
+        }
         return GlyphWidths[glyph];
     }
-    
+
     private void readBbox() throws DocumentException, IOException {
         int[] tableLocation = tables.get("head");
-        if (tableLocation == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "head", fileName + style));
+        if (tableLocation == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "head", fileName + style));
+        }
         rf.seek(tableLocation[0] + TrueTypeFontSubSet.HEAD_LOCA_FORMAT_OFFSET);
         boolean locaShortTable = (rf.readUnsignedShort() == 0);
         tableLocation = tables.get("loca");
-        if (tableLocation == null)
+        if (tableLocation == null) {
             return;
+        }
         rf.seek(tableLocation[0]);
         int[] locaTable;
         if (locaShortTable) {
             int entries = tableLocation[1] / 2;
             locaTable = new int[entries];
-            for (int k = 0; k < entries; ++k)
+            for (int k = 0; k < entries; ++k) {
                 locaTable[k] = rf.readUnsignedShort() * 2;
-        }
-        else {
+            }
+        } else {
             int entries = tableLocation[1] / 4;
             locaTable = new int[entries];
-            for (int k = 0; k < entries; ++k)
+            for (int k = 0; k < entries; ++k) {
                 locaTable[k] = rf.readInt();
+            }
         }
         tableLocation = tables.get("glyf");
-        if (tableLocation == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "glyf", fileName + style));
+        if (tableLocation == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "glyf", fileName + style));
+        }
         int tableGlyphOffset = tableLocation[0];
         bboxes = new int[locaTable.length - 1][];
         for (int glyph = 0; glyph < locaTable.length - 1; ++glyph) {
@@ -784,23 +768,27 @@ private void readBbox() throws DocumentException, IOException {
             if (start != locaTable[glyph + 1]) {
                 rf.seek(tableGlyphOffset + start + 2);
                 bboxes[glyph] = new int[]{
-                    (rf.readShort() * 1000) / head.unitsPerEm,
-                    (rf.readShort() * 1000) / head.unitsPerEm,
-                    (rf.readShort() * 1000) / head.unitsPerEm,
-                    (rf.readShort() * 1000) / head.unitsPerEm};
+                        (rf.readShort() * 1000) / head.unitsPerEm,
+                        (rf.readShort() * 1000) / head.unitsPerEm,
+                        (rf.readShort() * 1000) / head.unitsPerEm,
+                        (rf.readShort() * 1000) / head.unitsPerEm};
             }
         }
     }
-    
-    /** Reads the several maps from the table 'cmap'. The maps of interest are 1.0 for symbolic
-     *  fonts and 3.1 for all others. A symbolic font is defined as having the map 3.0.
+
+    /**
+     * Reads the several maps from the table 'cmap'. The maps of interest are 1.0 for symbolic fonts and 3.1 for all
+     * others. A symbolic font is defined as having the map 3.0.
+     *
      * @throws DocumentException the font is invalid
-     * @throws IOException the font file could not be read
+     * @throws IOException       the font file could not be read
      */
     void readCMaps() throws DocumentException, IOException {
         int[] table_location = tables.get("cmap");
-        if (table_location == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "cmap", fileName + style));
+        if (table_location == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "cmap", fileName + style));
+        }
         rf.seek(table_location[0]);
         rf.skipBytes(2);
         int num_tables = rf.readUnsignedShort();
@@ -816,11 +804,9 @@ void readCMaps() throws DocumentException, IOException {
             if (platId == 3 && platSpecId == 0) {
                 fontSpecific = true;
                 map30 = offset;
-            }
-            else if (platId == 3 && platSpecId == 1) {
+            } else if (platId == 3 && platSpecId == 1) {
                 map31 = offset;
-            }
-            else if (platId == 3 && platSpecId == 10) {
+            } else if (platId == 3 && platSpecId == 10) {
                 mapExt = offset;
             }
             if (platId == 1 && platSpecId == 0) {
@@ -896,9 +882,11 @@ HashMap readFormat12() throws IOException {
         }
         return h;
     }
-    
-    /** The information in the maps of the table 'cmap' is coded in several formats.
-     *  Format 0 is the Apple standard character to glyph index mapping table.
+
+    /**
+     * The information in the maps of the table 'cmap' is coded in several formats. Format 0 is the Apple standard
+     * character to glyph index mapping table.
+     *
      * @return a HashMap representing this map
      * @throws IOException the font file could not be read
      */
@@ -913,9 +901,11 @@ HashMap readFormat0() throws IOException {
         }
         return h;
     }
-    
-    /** The information in the maps of the table 'cmap' is coded in several formats.
-     *  Format 4 is the Microsoft standard character to glyph index mapping table.
+
+    /**
+     * The information in the maps of the table 'cmap' is coded in several formats. Format 4 is the Microsoft standard
+     * character to glyph index mapping table.
+     *
      * @return a HashMap representing this map
      * @throws IOException the font file could not be read
      */
@@ -951,11 +941,11 @@ HashMap readFormat4() throws IOException {
             for (int j = startCount[k]; j <= endCount[k] && j != 0xFFFF; ++j) {
                 if (idRO[k] == 0) {
                     glyph = (j + idDelta[k]) & 0xFFFF;
-                }
-                else {
+                } else {
                     int idx = k + idRO[k] / 2 - segCount + j - startCount[k];
-                    if (idx >= glyphId.length)
+                    if (idx >= glyphId.length) {
                         continue;
+                    }
                     glyph = (glyphId[idx] + idDelta[k]) & 0xFFFF;
                 }
                 int[] r = new int[2];
@@ -966,10 +956,11 @@ HashMap readFormat4() throws IOException {
         }
         return h;
     }
-    
-    /** The information in the maps of the table 'cmap' is coded in several formats.
-     *  Format 6 is a trimmed table mapping. It is similar to format 0 but can have
-     *  less than 256 entries.
+
+    /**
+     * The information in the maps of the table 'cmap' is coded in several formats. Format 6 is a trimmed table mapping.
+     * It is similar to format 0 but can have less than 256 entries.
+     *
      * @return a HashMap representing this map
      * @throws IOException the font file could not be read
      */
@@ -986,14 +977,17 @@ HashMap readFormat6() throws IOException {
         }
         return h;
     }
-    
-    /** Reads the kerning information from the 'kern' table.
+
+    /**
+     * Reads the kerning information from the 'kern' table.
+     *
      * @throws IOException the font file could not be read
      */
     void readKerning() throws IOException {
         int[] table_location = tables.get("kern");
-        if (table_location == null)
+        if (table_location == null) {
             return;
+        }
         rf.seek(table_location[0] + 2);
         int nTables = rf.readUnsignedShort();
         int checkpoint = table_location[0] + 4;
@@ -1015,98 +1009,117 @@ void readKerning() throws IOException {
             }
         }
     }
-    
-    /** Gets the kerning between two Unicode chars.
+
+    /**
+     * Gets the kerning between two Unicode chars.
+     *
      * @param char1 the first char
      * @param char2 the second char
      * @return the kerning to be applied
      */
     public int getKerning(int char1, int char2) {
         int[] metrics = getMetricsTT(char1);
-        if (metrics == null)
+        if (metrics == null) {
             return 0;
+        }
         int c1 = metrics[0];
         metrics = getMetricsTT(char2);
-        if (metrics == null)
+        if (metrics == null) {
             return 0;
+        }
         int c2 = metrics[0];
         return kerning.get((c1 << 16) + c2);
     }
-    
-    /** Gets the width from the font according to the unicode char c.
-     * If the name is null it's a symbolic font.
-     * @param c the unicode char
+
+    /**
+     * Gets the width from the font according to the unicode char c. If the name is null it's
+     * a symbolic font.
+     *
+     * @param c    the unicode char
      * @param name the glyph name
      * @return the width of the char
      */
     int getRawWidth(int c, String name) {
         int[] metric = getMetricsTT(c);
-        if (metric == null)
+        if (metric == null) {
             return 0;
+        }
         return metric[1];
     }
-    
-    /** Generates the font descriptor for this font.
-     * @return the PdfDictionary containing the font descriptor or null
+
+    /**
+     * Generates the font descriptor for this font.
+     *
      * @param subsetPrefix the subset prefix
-     * @param fontStream the indirect reference to a PdfStream containing the font or null
+     * @param fontStream   the indirect reference to a PdfStream containing the font or null
+     * @return the PdfDictionary containing the font descriptor or null
      */
-    protected PdfDictionary getFontDescriptor(PdfIndirectReference fontStream, String subsetPrefix, PdfIndirectReference cidset) {
+    protected PdfDictionary getFontDescriptor(PdfIndirectReference fontStream, String subsetPrefix,
+            PdfIndirectReference cidset) {
         PdfDictionary dic = new PdfDictionary(PdfName.FONTDESCRIPTOR);
         dic.put(PdfName.ASCENT, new PdfNumber(os_2.sTypoAscender * 1000 / head.unitsPerEm));
         dic.put(PdfName.CAPHEIGHT, new PdfNumber(os_2.sCapHeight * 1000 / head.unitsPerEm));
         dic.put(PdfName.DESCENT, new PdfNumber(os_2.sTypoDescender * 1000 / head.unitsPerEm));
         dic.put(PdfName.FONTBBOX, new PdfRectangle(
-        head.xMin * 1000 / head.unitsPerEm,
-        head.yMin * 1000 / head.unitsPerEm,
-        head.xMax * 1000 / head.unitsPerEm,
-        head.yMax * 1000 / head.unitsPerEm));
-        if (cidset != null)
+                head.xMin * 1000 / head.unitsPerEm,
+                head.yMin * 1000 / head.unitsPerEm,
+                head.xMax * 1000 / head.unitsPerEm,
+                head.yMax * 1000 / head.unitsPerEm));
+        if (cidset != null) {
             dic.put(PdfName.CIDSET, cidset);
+        }
         if (cff) {
-            if (encoding.startsWith("Identity-"))
-                dic.put(PdfName.FONTNAME, new PdfName(subsetPrefix + fontName+"-"+encoding));
-            else
+            if (encoding.startsWith("Identity-")) {
+                dic.put(PdfName.FONTNAME, new PdfName(subsetPrefix + fontName + "-" + encoding));
+            } else {
                 dic.put(PdfName.FONTNAME, new PdfName(subsetPrefix + fontName + style));
-        }
-        else
+            }
+        } else {
             dic.put(PdfName.FONTNAME, new PdfName(subsetPrefix + fontName + style));
+        }
         dic.put(PdfName.ITALICANGLE, new PdfNumber(italicAngle));
         dic.put(PdfName.STEMV, new PdfNumber(80));
         if (fontStream != null) {
-            if (cff)
+            if (cff) {
                 dic.put(PdfName.FONTFILE3, fontStream);
-            else
+            } else {
                 dic.put(PdfName.FONTFILE2, fontStream);
+            }
         }
         int flags = 0;
-        if (isFixedPitch)
+        if (isFixedPitch) {
             flags |= 1;
+        }
         flags |= fontSpecific ? 4 : 32;
-        if ((head.macStyle & 2) != 0)
+        if ((head.macStyle & 2) != 0) {
             flags |= 64;
-        if ((head.macStyle & 1) != 0)
+        }
+        if ((head.macStyle & 1) != 0) {
             flags |= 262144;
+        }
         dic.put(PdfName.FLAGS, new PdfNumber(flags));
-        
+
         return dic;
     }
-    
-    /** Generates the font dictionary for this font.
+
+    /**
+     * Generates the font dictionary for this font.
+     *
+     * @param subsetPrefix   the subset prefix
+     * @param firstChar      the first valid character
+     * @param lastChar       the last valid character
+     * @param shortTag       a 256 bytes long byte array where each unused byte is represented by 0
+     * @param fontDescriptor the indirect reference to a PdfDictionary containing the font descriptor or
+     *                       null
      * @return the PdfDictionary containing the font dictionary
-     * @param subsetPrefix the subset prefix
-     * @param firstChar the first valid character
-     * @param lastChar the last valid character
-     * @param shortTag a 256 bytes long byte array where each unused byte is represented by 0
-     * @param fontDescriptor the indirect reference to a PdfDictionary containing the font descriptor or null
      */
-    protected PdfDictionary getFontBaseType(PdfIndirectReference fontDescriptor, String subsetPrefix, int firstChar, int lastChar, byte[] shortTag) {
+    protected PdfDictionary getFontBaseType(PdfIndirectReference fontDescriptor, String subsetPrefix, int firstChar,
+            int lastChar, byte[] shortTag) {
         PdfDictionary dic = new PdfDictionary(PdfName.FONT);
         if (cff) {
             dic.put(PdfName.SUBTYPE, PdfName.TYPE1);
             dic.put(PdfName.BASEFONT, new PdfName(fontName + style));
-        }
-        else {
+        } else {
             dic.put(PdfName.SUBTYPE, PdfName.TRUETYPE);
             dic.put(PdfName.BASEFONT, new PdfName(subsetPrefix + fontName + style));
         }
@@ -1118,12 +1131,13 @@ protected PdfDictionary getFontBaseType(PdfIndirectReference fontDescriptor, Str
                     break;
                 }
             }
-        if (encoding.equals("Cp1252") || encoding.equals("MacRoman"))
-                dic.put(PdfName.ENCODING, encoding.equals("Cp1252") ? PdfName.WIN_ANSI_ENCODING : PdfName.MAC_ROMAN_ENCODING);
-            else {
+            if (encoding.equals("Cp1252") || encoding.equals("MacRoman")) {
+                dic.put(PdfName.ENCODING,
+                        encoding.equals("Cp1252") ? PdfName.WIN_ANSI_ENCODING : PdfName.MAC_ROMAN_ENCODING);
+            } else {
                 PdfDictionary enc = new PdfDictionary(PdfName.ENCODING);
                 PdfArray dif = new PdfArray();
-                boolean gap = true;                
+                boolean gap = true;
                 for (int k = firstChar; k <= lastChar; ++k) {
                     if (shortTag[k] != 0) {
                         if (gap) {
@@ -1131,9 +1145,9 @@ protected PdfDictionary getFontBaseType(PdfIndirectReference fontDescriptor, Str
                             gap = false;
                         }
                         dif.add(new PdfName(differences[k]));
-                    }
-                    else
+                    } else {
                         gap = true;
+                    }
                 }
                 enc.put(PdfName.DIFFERENCES, dif);
                 dic.put(PdfName.ENCODING, enc);
@@ -1143,17 +1157,19 @@ protected PdfDictionary getFontBaseType(PdfIndirectReference fontDescriptor, Str
         dic.put(PdfName.LASTCHAR, new PdfNumber(lastChar));
         PdfArray wd = new PdfArray();
         for (int k = firstChar; k <= lastChar; ++k) {
-            if (shortTag[k] == 0)
+            if (shortTag[k] == 0) {
                 wd.add(new PdfNumber(0));
-            else
+            } else {
                 wd.add(new PdfNumber(widths[k]));
+            }
         }
         dic.put(PdfName.WIDTHS, wd);
-        if (fontDescriptor != null)
+        if (fontDescriptor != null) {
             dic.put(PdfName.FONTDESCRIPTOR, fontDescriptor);
+        }
         return dic;
     }
-    
+
     protected byte[] getFullFont() throws IOException {
         RandomAccessFileOrArray rf2 = null;
         try {
@@ -1162,60 +1178,36 @@ protected byte[] getFullFont() throws IOException {
             byte[] b = new byte[rf2.length()];
             rf2.readFully(b);
             return b;
-        } 
-        finally {
-            try {if (rf2 != null) {rf2.close();}} catch (Exception e) {}
+        } finally {
+            try {
+                if (rf2 != null) {
+                    rf2.close();
+                }
+            } catch (Exception e) {
+            }
         }
     }
-    
-    protected static int[] compactRanges(ArrayList ranges) {
-        List simp = new ArrayList<>();
-        for (Object range : ranges) {
-            int[] r = (int[]) range;
-            for (int j = 0; j < r.length; j += 2) {
-                if (r.length > j + 1){
-                    simp.add(new int[]{Math.max(0, Math.min(r[j], r[j + 1])), Math.min(0xffff, Math.max(r[j], r[j + 1]))});
-                }
-            }
-        }
-        for (int k1 = 0; k1 < simp.size() - 1; ++k1) {
-            for (int k2 = k1 + 1; k2 < simp.size(); ++k2) {
-                int[] r1 = simp.get(k1);
-                int[] r2 = simp.get(k2);
-                if ((r1[0] >= r2[0] && r1[0] <= r2[1]) || (r1[1] >= r2[0] && r1[0] <= r2[1])) {
-                    r1[0] = Math.min(r1[0], r2[0]);
-                    r1[1] = Math.max(r1[1], r2[1]);
-                    simp.remove(k2);
-                    --k2;
-                }
-            }
-        }
-        int[] s = new int[simp.size() * 2];
-        for (int k = 0; k < simp.size(); ++k) {
-            int[] r = simp.get(k);
-            s[k * 2] = r[0];
-            s[k * 2 + 1] = r[1];
-        }
-        return s;
-    }
-    
+
     protected void addRangeUni(Map longTag, boolean includeMetrics, boolean subsetp) {
         if (!subsetp && (subsetRanges != null || directoryOffset > 0)) {
-            int[] rg = (subsetRanges == null && directoryOffset > 0) ? new int[]{0, 0xffff} : compactRanges(subsetRanges);
+            int[] rg =
+                    (subsetRanges == null && directoryOffset > 0) ? new int[]{0, 0xffff} : compactRanges(subsetRanges);
             Map usemap;
-            if (!fontSpecific && cmap31 != null) 
+            if (!fontSpecific && cmap31 != null) {
                 usemap = cmap31;
-            else if (fontSpecific && cmap10 != null) 
+            } else if (fontSpecific && cmap10 != null) {
                 usemap = cmap10;
-            else if (cmap31 != null) 
+            } else if (cmap31 != null) {
                 usemap = cmap31;
-            else 
+            } else {
                 usemap = cmap10;
+            }
             for (Map.Entry e : usemap.entrySet()) {
                 int[] v = e.getValue();
                 Integer gi = v[0];
-                if (longTag.containsKey(gi))
+                if (longTag.containsKey(gi)) {
                     continue;
+                }
                 int c = e.getKey();
                 boolean skip = true;
                 for (int k = 0; k < rg.length; k += 2) {
@@ -1224,17 +1216,20 @@ else if (cmap31 != null)
                         break;
                     }
                 }
-                if (!skip)
+                if (!skip) {
                     longTag.put(gi, includeMetrics ? new int[]{v[0], v[1], c} : null);
+                }
             }
         }
     }
-    
-    /** Outputs to the writer the font dictionaries and streams.
+
+    /**
+     * Outputs to the writer the font dictionaries and streams.
+     *
      * @param writer the writer for this document
-     * @param ref the font indirect reference
+     * @param ref    the font indirect reference
      * @param params several parameters that depend on the font type
-     * @throws IOException on error
+     * @throws IOException       on error
      * @throws DocumentException error in generating the object
      */
     void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) throws DocumentException, IOException {
@@ -1242,12 +1237,13 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
         int lastChar = (Integer) params[1];
         byte[] shortTag = (byte[]) params[2];
         boolean subsetp = (Boolean) params[3] && subset;
-        
+
         if (!subsetp) {
             firstChar = 0;
             lastChar = shortTag.length - 1;
-            for (int k = 0; k < shortTag.length; ++k)
+            for (int k = 0; k < shortTag.length; ++k) {
                 shortTag[k] = 1;
+            }
         }
         PdfIndirectReference ind_font = null;
         PdfObject pobj = null;
@@ -1258,36 +1254,38 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
                 pobj = new StreamFont(readCffFont(), "Type1C", compressionLevel);
                 obj = writer.addToBody(pobj);
                 ind_font = obj.getIndirectReference();
-            }
-            else {
-                if (subsetp)
+            } else {
+                if (subsetp) {
                     subsetPrefix = createSubsetPrefix();
+                }
                 HashMap glyphs = new HashMap<>();
                 for (int k = firstChar; k <= lastChar; ++k) {
                     if (shortTag[k] != 0) {
                         int[] metrics = null;
                         if (specialMap != null) {
                             int[] cd = GlyphList.nameToUnicode(differences[k]);
-                            if (cd != null)
+                            if (cd != null) {
                                 metrics = getMetricsTT(cd[0]);
-                        }
-                        else {
-                            if (fontSpecific)
+                            }
+                        } else {
+                            if (fontSpecific) {
                                 metrics = getMetricsTT(k);
-                            else
+                            } else {
                                 metrics = getMetricsTT(unicodeDifferences[k]);
+                            }
                         }
-                        if (metrics != null)
+                        if (metrics != null) {
                             glyphs.put(metrics[0], null);
+                        }
                     }
                 }
                 addRangeUni(glyphs, false, subsetp);
                 byte[] b = null;
                 if (subsetp || directoryOffset != 0 || subsetRanges != null) {
-                    TrueTypeFontSubSet sb = new TrueTypeFontSubSet(fileName, new RandomAccessFileOrArray(rf), glyphs, directoryOffset, true, !subsetp);
+                    TrueTypeFontSubSet sb = new TrueTypeFontSubSet(fileName, new RandomAccessFileOrArray(rf), glyphs,
+                            directoryOffset, true, !subsetp);
                     b = sb.process();
-                }
-                else {
+                } else {
                     b = getFullFont();
                 }
                 int[] lengths = new int[]{b.length};
@@ -1297,20 +1295,20 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
             }
         }
         pobj = getFontDescriptor(ind_font, subsetPrefix, null);
-        if (pobj != null){
+        if (pobj != null) {
             obj = writer.addToBody(pobj);
             ind_font = obj.getIndirectReference();
         }
         pobj = getFontBaseType(ind_font, subsetPrefix, firstChar, lastChar, shortTag);
         writer.addToBody(pobj, ref);
     }
-    
+
     /**
-     * If this font file is using the Compact Font File Format, then this method
-     * will return the raw bytes needed for the font stream. If this method is
-     * ever made public: make sure to add a test if (cff == true).
-     * @return    a byte array
-     * @since    2.1.3
+     * If this font file is using the Compact Font File Format, then this method will return the raw bytes needed for
+     * the font stream. If this method is ever made public: make sure to add a test if (cff == true).
+     *
+     * @return a byte array
+     * @since 2.1.3
      */
     protected byte[] readCffFont() throws IOException {
         RandomAccessFileOrArray rf2 = new RandomAccessFileOrArray(rf);
@@ -1319,12 +1317,10 @@ protected byte[] readCffFont() throws IOException {
             rf2.reOpen();
             rf2.seek(cffOffset);
             rf2.readFully(b);
-        }
-        finally {
+        } finally {
             try {
                 rf2.close();
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 // empty on purpose
             }
         }
@@ -1333,27 +1329,28 @@ protected byte[] readCffFont() throws IOException {
 
     /**
      * Returns a PdfStream object with the full font program.
-     * @return    a PdfStream with the font program
-     * @since    2.1.3
+     *
+     * @return a PdfStream with the font program
+     * @since 2.1.3
      */
     public PdfStream getFullFontStream() throws IOException, DocumentException {
         if (cff) {
             return new StreamFont(readCffFont(), "Type1C", compressionLevel);
-        }
-        else {
+        } else {
             byte[] b = getFullFont();
             int[] lengths = new int[]{b.length};
             return new StreamFont(b, lengths, compressionLevel);
         }
     }
-    
-    /** Gets the font parameter identified by key. Valid values
-     * for key are ASCENT, CAPHEIGHT, DESCENT
-     * and ITALICANGLE.
-     * @param key the parameter to be extracted
+
+    /**
+     * Gets the font parameter identified by key. Valid values for key are
+     * ASCENT, CAPHEIGHT, DESCENT and ITALICANGLE.
+     *
+     * @param key      the parameter to be extracted
      * @param fontSize the font size in points
      * @return the parameter in points
-     */    
+     */
     public float getFontDescriptor(int key, float fontSize) {
         switch (key) {
             case ASCENT:
@@ -1363,7 +1360,7 @@ public float getFontDescriptor(int key, float fontSize) {
             case DESCENT:
                 return os_2.sTypoDescender * fontSize / head.unitsPerEm;
             case ITALICANGLE:
-                return (float)italicAngle;
+                return (float) italicAngle;
             case BBOXLLX:
                 return fontSize * head.xMin / head.unitsPerEm;
             case BBOXLLY:
@@ -1399,138 +1396,361 @@ public float getFontDescriptor(int key, float fontSize) {
         }
         return 0;
     }
-    
-    /** Gets the glyph index and metrics for a character.
+
+    /**
+     * Gets the glyph index and metrics for a character.
+     *
      * @param c the character
      * @return an int array with {glyph index, width}
-     */    
+     */
     public int[] getMetricsTT(int c) {
-        if (cmapExt != null)
+        if (cmapExt != null) {
             return cmapExt.get(c);
-        if (!fontSpecific && cmap31 != null) 
+        }
+        if (!fontSpecific && cmap31 != null) {
             return cmap31.get(c);
-        if (fontSpecific && cmap10 != null) 
+        }
+        if (fontSpecific && cmap10 != null) {
             return cmap10.get(c);
-        if (cmap31 != null) 
+        }
+        if (cmap31 != null) {
             return cmap31.get(c);
-        if (cmap10 != null) 
+        }
+        if (cmap10 != null) {
             return cmap10.get(c);
+        }
         return null;
     }
 
-    /** Gets the postscript font name.
+    /**
+     * Gets the postscript font name.
+     *
      * @return the postscript font name
      */
     public String getPostscriptFontName() {
         return fontName;
     }
 
-    /** Gets the code pages supported by the font.
+    /**
+     * Sets the font name that will appear in the pdf font dictionary. Use with care as it can easily make a font
+     * unreadable if not embedded.
+     *
+     * @param name the new font name
+     */
+    public void setPostscriptFontName(String name) {
+        fontName = name;
+    }
+
+    /**
+     * Gets the code pages supported by the font.
+     *
      * @return the code pages supported by the font
      */
     public String[] getCodePagesSupported() {
-        long cp = (((long)os_2.ulCodePageRange2) << 32) + (os_2.ulCodePageRange1 & 0xffffffffL);
+        long cp = (((long) os_2.ulCodePageRange2) << 32) + (os_2.ulCodePageRange1 & 0xffffffffL);
         int count = 0;
         long bit = 1;
         for (int k = 0; k < 64; ++k) {
-            if ((cp & bit) != 0 && codePages[k] != null)
+            if ((cp & bit) != 0 && codePages[k] != null) {
                 ++count;
+            }
             bit <<= 1;
         }
         String[] ret = new String[count];
         count = 0;
         bit = 1;
         for (int k = 0; k < 64; ++k) {
-            if ((cp & bit) != 0 && codePages[k] != null)
+            if ((cp & bit) != 0 && codePages[k] != null) {
                 ret[count++] = codePages[k];
+            }
             bit <<= 1;
         }
         return ret;
     }
-    
-    /** Gets the full name of the font. If it is a True Type font
-     * each array element will have {Platform ID, Platform Encoding ID,
-     * Language ID, font name}. The interpretation of this values can be
-     * found in the Open Type specification, chapter 2, in the 'name' table.
              
-     * For the other fonts the array has a single element with {"", "", "",
-     * font name}.
+
+    /**
+     * Gets the full name of the font. If it is a True Type font each array element will have {Platform ID, Platform
+     * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type
+     * specification, chapter 2, in the 'name' table.
               For the other fonts the array has a single element with {"",
+     * "", "", font name}.
+     *
      * @return the full name of the font
      */
     public String[][] getFullFontName() {
         return fullName;
     }
-    
-    /** Gets all the entries of the Names-Table. If it is a True Type font
-     * each array element will have {Name ID, Platform ID, Platform Encoding ID,
-     * Language ID, font name}. The interpretation of this values can be
-     * found in the Open Type specification, chapter 2, in the 'name' table.
              
-     * For the other fonts the array has a single element with {"", "", "",
-     * font name}.
+
+    /**
+     * Gets all the entries of the Names-Table. If it is a True Type font each array element will have {Name ID,
+     * Platform ID, Platform Encoding ID, Language ID, font name}. The interpretation of this values can be found in the
+     * Open Type specification, chapter 2, in the 'name' table.
               For the other fonts the array has a single element
+     * with {"", "", "", font name}.
+     *
      * @return the full name of the font
      */
     public String[][] getAllNameEntries() {
         return allNameEntries;
     }
-    
-    /** Gets the family name of the font. If it is a True Type font
-     * each array element will have {Platform ID, Platform Encoding ID,
-     * Language ID, font name}. The interpretation of this values can be
-     * found in the Open Type specification, chapter 2, in the 'name' table.
              
-     * For the other fonts the array has a single element with {"", "", "",
-     * font name}.
+
+    /**
+     * Gets the family name of the font. If it is a True Type font each array element will have {Platform ID, Platform
+     * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type
+     * specification, chapter 2, in the 'name' table.
               For the other fonts the array has a single element with {"",
+     * "", "", font name}.
+     *
      * @return the family name of the font
      */
     public String[][] getFamilyFontName() {
         return familyName;
     }
-    
-    /** Checks if the font has any kerning pairs.
+
+    /**
+     * Checks if the font has any kerning pairs.
+     *
      * @return true if the font has any kerning pairs
-     */    
+     */
     public boolean hasKernPairs() {
         return kerning.size() > 0;
-    }    
-    
-    /**
-     * Sets the font name that will appear in the pdf font dictionary.
-     * Use with care as it can easily make a font unreadable if not embedded.
-     * @param name the new font name
-     */    
-    public void setPostscriptFontName(String name) {
-        fontName = name;
     }
-    
+
     /**
      * Sets the kerning between two Unicode chars.
+     *
      * @param char1 the first char
      * @param char2 the second char
-     * @param kern the kerning to apply in normalized 1000 units
+     * @param kern  the kerning to apply in normalized 1000 units
      * @return true if the kerning was applied, false otherwise
      */
     public boolean setKerning(int char1, int char2, int kern) {
         int[] metrics = getMetricsTT(char1);
-        if (metrics == null)
+        if (metrics == null) {
             return false;
+        }
         int c1 = metrics[0];
         metrics = getMetricsTT(char2);
-        if (metrics == null)
+        if (metrics == null) {
             return false;
+        }
         int c2 = metrics[0];
         kerning.put((c1 << 16) + c2, kern);
         return true;
     }
-    
+
     protected int[] getRawCharBBox(int c, String name) {
         Map map;
-        if (name == null || cmap31 == null)
+        if (name == null || cmap31 == null) {
             map = cmap10;
-        else
+        } else {
             map = cmap31;
-        if (map == null)
+        }
+        if (map == null) {
             return null;
+        }
         int[] metric = map.get(c);
-        if (metric == null || bboxes == null)
+        if (metric == null || bboxes == null) {
             return null;
+        }
         return bboxes[metric[0]];
     }
+
+    /**
+     * The components of table 'head'.
+     */
+    protected static class FontHeader {
+
+        /**
+         * A variable.
+         */
+        int flags;
+        /**
+         * A variable.
+         */
+        int unitsPerEm;
+        /**
+         * A variable.
+         */
+        short xMin;
+        /**
+         * A variable.
+         */
+        short yMin;
+        /**
+         * A variable.
+         */
+        short xMax;
+        /**
+         * A variable.
+         */
+        short yMax;
+        /**
+         * A variable.
+         */
+        int macStyle;
+    }
+
+    /**
+     * The components of table 'hhea'.
+     */
+    protected static class HorizontalHeader {
+
+        /**
+         * A variable.
+         */
+        short Ascender;
+        /**
+         * A variable.
+         */
+        short Descender;
+        /**
+         * A variable.
+         */
+        short LineGap;
+        /**
+         * A variable.
+         */
+        int advanceWidthMax;
+        /**
+         * A variable.
+         */
+        short minLeftSideBearing;
+        /**
+         * A variable.
+         */
+        short minRightSideBearing;
+        /**
+         * A variable.
+         */
+        short xMaxExtent;
+        /**
+         * A variable.
+         */
+        short caretSlopeRise;
+        /**
+         * A variable.
+         */
+        short caretSlopeRun;
+        /**
+         * A variable.
+         */
+        int numberOfHMetrics;
+    }
+
+    /**
+     * The components of table 'OS/2'.
+     */
+    protected static class WindowsMetrics {
+
+        /**
+         * A variable.
+         */
+        short xAvgCharWidth;
+        /**
+         * A variable.
+         */
+        int usWeightClass;
+        /**
+         * A variable.
+         */
+        int usWidthClass;
+        /**
+         * A variable.
+         */
+        short fsType;
+        /**
+         * A variable.
+         */
+        short ySubscriptXSize;
+        /**
+         * A variable.
+         */
+        short ySubscriptYSize;
+        /**
+         * A variable.
+         */
+        short ySubscriptXOffset;
+        /**
+         * A variable.
+         */
+        short ySubscriptYOffset;
+        /**
+         * A variable.
+         */
+        short ySuperscriptXSize;
+        /**
+         * A variable.
+         */
+        short ySuperscriptYSize;
+        /**
+         * A variable.
+         */
+        short ySuperscriptXOffset;
+        /**
+         * A variable.
+         */
+        short ySuperscriptYOffset;
+        /**
+         * A variable.
+         */
+        short yStrikeoutSize;
+        /**
+         * A variable.
+         */
+        short yStrikeoutPosition;
+        /**
+         * A variable.
+         */
+        short sFamilyClass;
+        /**
+         * A variable.
+         */
+        byte[] panose = new byte[10];
+        /**
+         * A variable.
+         */
+        byte[] achVendID = new byte[4];
+        /**
+         * A variable.
+         */
+        int fsSelection;
+        /**
+         * A variable.
+         */
+        int usFirstCharIndex;
+        /**
+         * A variable.
+         */
+        int usLastCharIndex;
+        /**
+         * A variable.
+         */
+        short sTypoAscender;
+        /**
+         * A variable.
+         */
+        short sTypoDescender;
+        /**
+         * A variable.
+         */
+        short sTypoLineGap;
+        /**
+         * A variable.
+         */
+        int usWinAscent;
+        /**
+         * A variable.
+         */
+        int usWinDescent;
+        /**
+         * A variable.
+         */
+        int ulCodePageRange1;
+        /**
+         * A variable.
+         */
+        int ulCodePageRange2;
+        /**
+         * A variable.
+         */
+        int sCapHeight;
+    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFontSubSet.java b/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFontSubSet.java
index 1072a53e4..828c25f53 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFontSubSet.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFontSubSet.java
@@ -52,7 +52,6 @@
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.error_messages.MessageLocalization;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -60,12 +59,12 @@
 
 
 /**
- * Subsets a True Type font by removing the unneeded glyphs from
- * the font.
+ * Subsets a True Type font by removing the unneeded glyphs from the font.
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 class TrueTypeFontSubSet {
+
     static final String[] tableNamesSimple = {"cvt ", "fpgm", "glyf", "head",
             "hhea", "hmtx", "loca", "maxp", "prep"};
     static final String[] tableNamesCmap = {"cmap", "cvt ", "fpgm", "glyf", "head",
@@ -86,10 +85,9 @@ class TrueTypeFontSubSet {
 
 
     /**
-     * Contains the location of the several tables. The key is the name of
-     * the table and the value is an int[3] where position 0
-     * is the checksum, position 1 is the offset from the start of the file
-     * and position 2 is the length of the table.
+     * Contains the location of the several tables. The key is the name of the table and the value is an
+     * int[3] where position 0 is the checksum, position 1 is the offset from the start of the file and
+     * position 2 is the length of the table.
      */
     protected HashMap tableDirectory;
     /**
@@ -124,7 +122,8 @@ class TrueTypeFontSubSet {
      * @param glyphsUsed      the glyphs used
      * @param includeCmap     true if the table cmap is to be included in the generated font
      */
-    TrueTypeFontSubSet(String fileName, RandomAccessFileOrArray rf, HashMap glyphsUsed, int directoryOffset, boolean includeCmap, boolean includeExtras) {
+    TrueTypeFontSubSet(String fileName, RandomAccessFileOrArray rf, HashMap glyphsUsed,
+            int directoryOffset, boolean includeCmap, boolean includeExtras) {
         this.fileName = fileName;
         this.rf = rf;
         this.glyphsUsed = glyphsUsed;
@@ -164,22 +163,25 @@ protected void assembleFont() throws IOException {
         int[] tableLocation;
         int fullFontSize = 0;
         String[] tableNames;
-        if (includeExtras)
+        if (includeExtras) {
             tableNames = tableNamesExtra;
-        else {
-            if (includeCmap)
+        } else {
+            if (includeCmap) {
                 tableNames = tableNamesCmap;
-            else
+            } else {
                 tableNames = tableNamesSimple;
+            }
         }
         int tablesUsed = 2;
         int len = 0;
         for (String name : tableNames) {
-            if (name.equals("glyf") || name.equals("loca"))
+            if (name.equals("glyf") || name.equals("loca")) {
                 continue;
+            }
             tableLocation = tableDirectory.get(name);
-            if (tableLocation == null)
+            if (tableLocation == null) {
                 continue;
+            }
             ++tablesUsed;
             fullFontSize += (tableLocation[TABLE_LENGTH] + 3) & (~3);
         }
@@ -197,8 +199,9 @@ protected void assembleFont() throws IOException {
         writeFontShort((tablesUsed - (1 << selector)) * 16);
         for (String name : tableNames) {
             tableLocation = tableDirectory.get(name);
-            if (tableLocation == null)
+            if (tableLocation == null) {
                 continue;
+            }
             writeFontString(name);
             if (name.equals("glyf")) {
                 writeFontInt(calculateChecksum(newGlyfTable));
@@ -216,8 +219,9 @@ protected void assembleFont() throws IOException {
         }
         for (String name : tableNames) {
             tableLocation = tableDirectory.get(name);
-            if (tableLocation == null)
+            if (tableLocation == null) {
                 continue;
+            }
             if (name.equals("glyf")) {
                 System.arraycopy(newGlyfTable, 0, outFont, fontPtr, newGlyfTable.length);
                 fontPtr += newGlyfTable.length;
@@ -238,8 +242,9 @@ protected void createTableDirectory() throws IOException, DocumentException {
         tableDirectory = new HashMap<>();
         rf.seek(directoryOffset);
         int id = rf.readInt();
-        if (id != 0x00010000)
+        if (id != 0x00010000) {
             throw new DocumentException(MessageLocalization.getComposedMessage("1.is.not.a.true.type.file", fileName));
+        }
         int num_tables = rf.readUnsignedShort();
         rf.skipBytes(6);
         for (int k = 0; k < num_tables; ++k) {
@@ -255,32 +260,39 @@ protected void createTableDirectory() throws IOException, DocumentException {
     protected void readLoca() throws IOException, DocumentException {
         int[] tableLocation;
         tableLocation = tableDirectory.get("head");
-        if (tableLocation == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "head", fileName));
+        if (tableLocation == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "head", fileName));
+        }
         rf.seek(tableLocation[TABLE_OFFSET] + HEAD_LOCA_FORMAT_OFFSET);
         locaShortTable = (rf.readUnsignedShort() == 0);
         tableLocation = tableDirectory.get("loca");
-        if (tableLocation == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "loca", fileName));
+        if (tableLocation == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "loca", fileName));
+        }
         rf.seek(tableLocation[TABLE_OFFSET]);
         if (locaShortTable) {
             int entries = tableLocation[TABLE_LENGTH] / 2;
             locaTable = new int[entries];
-            for (int k = 0; k < entries; ++k)
+            for (int k = 0; k < entries; ++k) {
                 locaTable[k] = rf.readUnsignedShort() * 2;
+            }
         } else {
             int entries = tableLocation[TABLE_LENGTH] / 4;
             locaTable = new int[entries];
-            for (int k = 0; k < entries; ++k)
+            for (int k = 0; k < entries; ++k) {
                 locaTable[k] = rf.readInt();
+            }
         }
     }
 
     protected void createNewGlyphTables() throws IOException {
         newLocaTable = new int[locaTable.length];
         int[] activeGlyphs = new int[glyphsInList.size()];
-        for (int k = 0; k < activeGlyphs.length; ++k)
+        for (int k = 0; k < activeGlyphs.length; ++k) {
             activeGlyphs[k] = glyphsInList.get(k);
+        }
         Arrays.sort(activeGlyphs);
         int glyfSize = 0;
         for (int glyph : activeGlyphs) {
@@ -311,18 +323,20 @@ protected void createNewGlyphTables() throws IOException {
     }
 
     protected void locaTobytes() {
-        if (locaShortTable)
+        if (locaShortTable) {
             locaTableRealSize = newLocaTable.length * 2;
-        else
+        } else {
             locaTableRealSize = newLocaTable.length * 4;
+        }
         newLocaTableOut = new byte[(locaTableRealSize + 3) & (~3)];
         outFont = newLocaTableOut;
         fontPtr = 0;
         for (int i : newLocaTable) {
-            if (locaShortTable)
+            if (locaShortTable) {
                 writeFontShort(i / 2);
-            else
+            } else {
                 writeFontInt(i);
+            }
         }
 
     }
@@ -330,15 +344,18 @@ protected void locaTobytes() {
     protected void flatGlyphs() throws IOException, DocumentException {
         int[] tableLocation;
         tableLocation = tableDirectory.get("glyf");
-        if (tableLocation == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "glyf", fileName));
+        if (tableLocation == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("table.1.does.not.exist.in.2", "glyf", fileName));
+        }
         Integer glyph0 = 0;
         if (!glyphsUsed.containsKey(glyph0)) {
             glyphsUsed.put(glyph0, null);
             glyphsInList.add(glyph0);
         }
         tableGlyphOffset = tableLocation[TABLE_OFFSET];
-        for (int k = 0; k < glyphsInList.size(); ++k) {    // TODO: concurrent List modification error in checkGlyphComposite(glyph)
+        for (int k = 0; k < glyphsInList.size();
+                ++k) {    // TODO: concurrent List modification error in checkGlyphComposite(glyph)
             int glyph = glyphsInList.get(k);
             checkGlyphComposite(glyph);
         }
@@ -347,11 +364,14 @@ protected void flatGlyphs() throws IOException, DocumentException {
     protected void checkGlyphComposite(int glyph) throws IOException {
         int start = locaTable[glyph];
         if (start == locaTable[glyph + 1]) // no contour
+        {
             return;
+        }
         rf.seek(tableGlyphOffset + start);
         int numContours = rf.readShort();
-        if (numContours >= 0)
+        if (numContours >= 0) {
             return;
+        }
         rf.skipBytes(8);
         for (; ; ) {
             int flags = rf.readUnsignedShort();
@@ -360,26 +380,29 @@ protected void checkGlyphComposite(int glyph) throws IOException {
                 glyphsUsed.put(cGlyph, null);
                 glyphsInList.add(cGlyph);
             }
-            if ((flags & MORE_COMPONENTS) == 0)
+            if ((flags & MORE_COMPONENTS) == 0) {
                 return;
+            }
             int skip;
-            if ((flags & ARG_1_AND_2_ARE_WORDS) != 0)
+            if ((flags & ARG_1_AND_2_ARE_WORDS) != 0) {
                 skip = 4;
-            else
+            } else {
                 skip = 2;
-            if ((flags & WE_HAVE_A_SCALE) != 0)
+            }
+            if ((flags & WE_HAVE_A_SCALE) != 0) {
                 skip += 2;
-            else if ((flags & WE_HAVE_AN_X_AND_Y_SCALE) != 0)
+            } else if ((flags & WE_HAVE_AN_X_AND_Y_SCALE) != 0) {
                 skip += 4;
-            if ((flags & WE_HAVE_A_TWO_BY_TWO) != 0)
+            }
+            if ((flags & WE_HAVE_A_TWO_BY_TWO) != 0) {
                 skip += 8;
+            }
             rf.skipBytes(skip);
         }
     }
 
     /**
-     * Reads a String from the font file as bytes using the Cp1252
-     * encoding.
+     * Reads a String from the font file as bytes using the Cp1252 encoding.
      *
      * @param length the length of bytes to read
      * @return the String read
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFontUnicode.java b/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFontUnicode.java
index 10427215e..125133939 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFontUnicode.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/TrueTypeFontUnicode.java
@@ -52,7 +52,6 @@
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Utilities;
 import com.lowagie.text.error_messages.MessageLocalization;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -61,33 +60,35 @@
 import java.util.List;
 import java.util.Map;
 
-/** Represents a True Type font with Unicode encoding. All the character
- * in the font can be used directly by using the encoding Identity-H or
- * Identity-V. This is the only way to represent some character sets such
- * as Thai.
- * @author  Paulo Soares (psoares@consiste.pt)
+/**
+ * Represents a True Type font with Unicode encoding. All the character in the font can be used directly by using the
+ * encoding Identity-H or Identity-V. This is the only way to represent some character sets such as Thai.
+ *
+ * @author Paulo Soares (psoares@consiste.pt)
  */
-class TrueTypeFontUnicode extends TrueTypeFont implements Comparator{
-    
+class TrueTypeFontUnicode extends TrueTypeFont implements Comparator {
+
+    private static final byte[] rotbits = {(byte) 0x80, (byte) 0x40, (byte) 0x20, (byte) 0x10, (byte) 0x08, (byte) 0x04,
+            (byte) 0x02, (byte) 0x01};
     /**
      * true if the encoding is vertical.
-     */    
+     */
     boolean vertical = false;
-    
     Map inverseCmap;
 
     /**
-     * Creates a new TrueType font addressed by Unicode characters. The font
-     * will always be embedded.
-     * @param ttFile the location of the font on file. The file must end in '.ttf'.
-     * The modifiers after the name are ignored.
-     * @param enc the encoding to be applied to this font
-     * @param emb true if the font is to be embedded in the PDF
+     * Creates a new TrueType font addressed by Unicode characters. The font will always be embedded.
+     *
+     * @param ttFile the location of the font on file. The file must end in '.ttf'. The modifiers after the name are
+     *               ignored.
+     * @param enc    the encoding to be applied to this font
+     * @param emb    true if the font is to be embedded in the PDF
      * @param ttfAfm the font as a byte array
      * @throws DocumentException the font is invalid
-     * @throws IOException the font file could not be read
+     * @throws IOException       the font file could not be read
      */
-    TrueTypeFontUnicode(String ttFile, String enc, boolean emb, byte[] ttfAfm, boolean forceRead) throws DocumentException, IOException {
+    TrueTypeFontUnicode(String ttFile, String enc, boolean emb, byte[] ttfAfm, boolean forceRead)
+            throws DocumentException, IOException {
         String nameBase = getBaseName(ttFile);
         String ttcName = getTTCName(nameBase);
         if (nameBase.length() < ttFile.length()) {
@@ -97,17 +98,24 @@ class TrueTypeFontUnicode extends TrueTypeFont implements Comparator{
         embedded = emb;
         fileName = ttcName;
         ttcIndex = "";
-        if (ttcName.length() < nameBase.length())
+        if (ttcName.length() < nameBase.length()) {
             ttcIndex = nameBase.substring(ttcName.length() + 1);
+        }
         fontType = FONT_TYPE_TTUNI;
-        if ((fileName.toLowerCase().endsWith(".ttf") || fileName.toLowerCase().endsWith(".otf") || fileName.toLowerCase().endsWith(".ttc")) && ((enc.equals(IDENTITY_H) || enc.equals(IDENTITY_V)) && emb)) {
+        if ((fileName.toLowerCase().endsWith(".ttf") || fileName.toLowerCase().endsWith(".otf")
+                || fileName.toLowerCase().endsWith(".ttc")) && ((enc.equals(IDENTITY_H) || enc.equals(IDENTITY_V))
+                && emb)) {
             process(ttfAfm, forceRead);
-            if (os_2.fsType == 2)
-                throw new DocumentException(MessageLocalization.getComposedMessage("1.cannot.be.embedded.due.to.licensing.restrictions", fileName + style));
+            if (os_2.fsType == 2) {
+                throw new DocumentException(
+                        MessageLocalization.getComposedMessage("1.cannot.be.embedded.due.to.licensing.restrictions",
+                                fileName + style));
+            }
             // Sivan
-            if ((cmap31 == null && !fontSpecific) || (cmap10 == null && fontSpecific))
-                directTextToByte=true;
-                //throw new DocumentException(MessageLocalization.getComposedMessage("1.2.does.not.contain.an.usable.cmap", fileName, style));
+            if ((cmap31 == null && !fontSpecific) || (cmap10 == null && fontSpecific)) {
+                directTextToByte = true;
+            }
+            //throw new DocumentException(MessageLocalization.getComposedMessage("1.2.does.not.contain.an.usable.cmap", fileName, style));
             if (fontSpecific) {
                 fontSpecific = false;
                 String tempEncoding = encoding;
@@ -116,12 +124,34 @@ class TrueTypeFontUnicode extends TrueTypeFont implements Comparator{
                 encoding = tempEncoding;
                 fontSpecific = true;
             }
+        } else {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("1.2.is.not.a.ttf.font.file", fileName, style));
         }
-        else
-            throw new DocumentException(MessageLocalization.getComposedMessage("1.2.is.not.a.ttf.font.file", fileName, style));
         vertical = enc.endsWith("V");
     }
-    
+
+    private static String toHex4(int n) {
+        String s = "0000" + Integer.toHexString(n);
+        return s.substring(s.length() - 4);
+    }
+
+    /**
+     * Gets an hex string in the format "<HHHH>".
+     *
+     * @param n the number
+     * @return the hex string
+     */
+    static String toHex(int n) {
+        if (n < 0x10000) {
+            return "<" + toHex4(n) + ">";
+        }
+        n -= 0x10000;
+        int high = (n / 0x400) + 0xd800;
+        int low = (n % 0x400) + 0xdc00;
+        return "[<" + toHex4(high) + toHex4(low) + ">]";
+    }
+
     void readCMaps() throws DocumentException, IOException {
         super.readCMaps();
 
@@ -142,85 +172,90 @@ void readCMaps() throws DocumentException, IOException {
             }
         }
     }
-    
+
     protected Integer getCharacterCode(int code) {
         return inverseCmap == null ? null : inverseCmap.get(code);
     }
-    
-    
+
     /**
      * Gets the width of a char in normalized 1000 units.
+     *
      * @param char1 the unicode char to get the width of
      * @return the width in normalized 1000 units
      */
     public int getWidth(int char1) {
-        if (vertical)
+        if (vertical) {
             return 1000;
+        }
         if (fontSpecific) {
-            if ((char1 & 0xff00) == 0 || (char1 & 0xff00) == 0xf000)
+            if ((char1 & 0xff00) == 0 || (char1 & 0xff00) == 0xf000) {
                 return getRawWidth(char1 & 0xff, null);
-            else
+            } else {
                 return 0;
-        }
-        else {
+            }
+        } else {
             return getRawWidth(char1, encoding);
         }
     }
-    
+
     /**
      * Gets the width of a String in normalized 1000 units.
+     *
      * @param text the String to get the width of
      * @return the width in normalized 1000 units
      */
     public int getWidth(String text) {
-        if (vertical)
+        if (vertical) {
             return text.length() * 1000;
+        }
         int total = 0;
         if (fontSpecific) {
             char[] cc = text.toCharArray();
             int len = cc.length;
             for (char c : cc) {
-                if ((c & 0xff00) == 0 || (c & 0xff00) == 0xf000)
+                if ((c & 0xff00) == 0 || (c & 0xff00) == 0xf000) {
                     total += getRawWidth(c & 0xff, null);
+                }
             }
-        }
-        else {
+        } else {
             int len = text.length();
             for (int k = 0; k < len; ++k) {
                 if (Utilities.isSurrogatePair(text, k)) {
                     total += getRawWidth(Utilities.convertToUtf32(text, k), encoding);
                     ++k;
-                }
-                else
+                } else {
                     total += getRawWidth(text.charAt(k), encoding);
+                }
             }
         }
         return total;
     }
 
-    /** Creates a ToUnicode CMap to allow copy and paste from Acrobat.
-     * @param metrics metrics[0] contains the glyph index and metrics[2]
-     * contains the Unicode code
+    /**
+     * Creates a ToUnicode CMap to allow copy and paste from Acrobat.
+     *
+     * @param metrics metrics[0] contains the glyph index and metrics[2] contains the Unicode code
      * @return the stream representing this CMap or null
-     */    
+     */
     private PdfStream getToUnicode(int[][] metrics) {
         metrics = filterCmapMetrics(metrics);
-        if (metrics.length == 0)
+        if (metrics.length == 0) {
             return null;
+        }
         StringBuilder buf = new StringBuilder(
-        "/CIDInit /ProcSet findresource begin\n" +
-        "12 dict begin\n" +
-        "begincmap\n" +
-        "/CIDSystemInfo\n" +
-        "<< /Registry (TTX+0)\n" +
-        "/Ordering (T42UV)\n" +
-        "/Supplement 0\n" +
-        ">> def\n" +
-        "/CMapName /TTX+0 def\n" +
-        "/CMapType 2 def\n" +
-        "1 begincodespacerange\n" +
-        "<0000>\n" +
-        "endcodespacerange\n");
+                "/CIDInit /ProcSet findresource begin\n" +
+                        "12 dict begin\n" +
+                        "begincmap\n" +
+                        "/CIDSystemInfo\n" +
+                        "<< /Registry (TTX+0)\n" +
+                        "/Ordering (T42UV)\n" +
+                        "/Supplement 0\n" +
+                        ">> def\n" +
+                        "/CMapName /TTX+0 def\n" +
+                        "/CMapType 2 def\n" +
+                        "1 begincodespacerange\n" +
+                        "<0000>\n" +
+                        "endcodespacerange\n");
         int size = 0;
         for (int k = 0; k < metrics.length; ++k) {
             if (size == 0) {
@@ -236,16 +271,16 @@ private PdfStream getToUnicode(int[][] metrics) {
             buf.append(fromTo).append(fromTo).append(toHex(metric[2])).append('\n');
         }
         buf.append(
-        "endbfrange\n" +
-        "endcmap\n" +
-        "CMapName currentdict /CMap defineresource pop\n" +
-        "end end\n");
+                "endbfrange\n" +
+                        "endcmap\n" +
+                        "CMapName currentdict /CMap defineresource pop\n" +
+                        "end end\n");
         String s = buf.toString();
         PdfStream stream = new PdfStream(PdfEncodings.convertToBytes(s, null));
         stream.flateCompress(compressionLevel);
         return stream;
     }
-    
+
     private int[][] filterCmapMetrics(int[][] metrics) {
         if (metrics.length == 0) {
             return metrics;
@@ -269,45 +304,29 @@ private int[][] filterCmapMetrics(int[][] metrics) {
 
         return cmapMetrics.toArray(new int[0][]);
     }
-    
-    private static String toHex4(int n) {
-        String s = "0000" + Integer.toHexString(n);
-        return s.substring(s.length() - 4);
-    }
-    
-    /** Gets an hex string in the format "<HHHH>".
-     * @param n the number
-     * @return the hex string
-     */    
-    static String toHex(int n) {
-        if (n < 0x10000)
-            return "<" + toHex4(n) + ">";
-        n -= 0x10000;
-        int high = (n / 0x400) + 0xd800;
-        int low = (n % 0x400) + 0xdc00;
-        return "[<" + toHex4(high) + toHex4(low) + ">]";
-    }
-    
-    /** Generates the CIDFontTyte2 dictionary.
+
+    /**
+     * Generates the CIDFontTyte2 dictionary.
+     *
      * @param fontDescriptor the indirect reference to the font descriptor
-     * @param subsetPrefix the subset prefix
-     * @param metrics the horizontal width metrics
+     * @param subsetPrefix   the subset prefix
+     * @param metrics        the horizontal width metrics
      * @return a stream
-     */    
+     */
     private PdfDictionary getCIDFontType2(PdfIndirectReference fontDescriptor, String subsetPrefix, int[][] metrics) {
         PdfDictionary dic = new PdfDictionary(PdfName.FONT);
         // sivan; cff
         if (cff) {
             dic.put(PdfName.SUBTYPE, PdfName.CIDFONTTYPE0);
-            dic.put(PdfName.BASEFONT, new PdfName(subsetPrefix+fontName+"-"+encoding));
-        }
-        else {
+            dic.put(PdfName.BASEFONT, new PdfName(subsetPrefix + fontName + "-" + encoding));
+        } else {
             dic.put(PdfName.SUBTYPE, PdfName.CIDFONTTYPE2);
             dic.put(PdfName.BASEFONT, new PdfName(subsetPrefix + fontName));
         }
         dic.put(PdfName.FONTDESCRIPTOR, fontDescriptor);
-        if (!cff)
-          dic.put(PdfName.CIDTOGIDMAP,PdfName.IDENTITY);
+        if (!cff) {
+            dic.put(PdfName.CIDTOGIDMAP, PdfName.IDENTITY);
+        }
         PdfDictionary cdic = new PdfDictionary();
         cdic.put(PdfName.REGISTRY, new PdfString("Adobe"));
         cdic.put(PdfName.ORDERING, new PdfString("Identity"));
@@ -320,8 +339,9 @@ private PdfDictionary getCIDFontType2(PdfIndirectReference fontDescriptor, Strin
             boolean firstTime = true;
             for (int[] metric1 : metrics) {
                 int[] metric = metric1;
-                if (metric[1] == 1000)
+                if (metric[1] == 1000) {
                     continue;
+                }
                 int m = metric[0];
                 if (m == lastNumber + 1) {
                     buf.append(' ').append(metric[1]);
@@ -341,54 +361,62 @@ private PdfDictionary getCIDFontType2(PdfIndirectReference fontDescriptor, Strin
         }
         return dic;
     }
-    
-    /** Generates the font dictionary.
-     * @param descendant the descendant dictionary
+
+    /**
+     * Generates the font dictionary.
+     *
+     * @param descendant   the descendant dictionary
      * @param subsetPrefix the subset prefix
-     * @param toUnicode the ToUnicode stream
+     * @param toUnicode    the ToUnicode stream
      * @return the stream
-     */    
-    private PdfDictionary getFontBaseType(PdfIndirectReference descendant, String subsetPrefix, PdfIndirectReference toUnicode) {
+     */
+    private PdfDictionary getFontBaseType(PdfIndirectReference descendant, String subsetPrefix,
+            PdfIndirectReference toUnicode) {
         PdfDictionary dic = new PdfDictionary(PdfName.FONT);
 
         dic.put(PdfName.SUBTYPE, PdfName.TYPE0);
         // The PDF Reference manual advises to add -encoding to CID font names
-        if (cff)
-          dic.put(PdfName.BASEFONT, new PdfName(subsetPrefix+fontName+"-"+encoding));
-          //dic.put(PdfName.BASEFONT, new PdfName(subsetPrefix+fontName));
-        else
-          dic.put(PdfName.BASEFONT, new PdfName(subsetPrefix + fontName));
-          //dic.put(PdfName.BASEFONT, new PdfName(fontName));
+        if (cff) {
+            dic.put(PdfName.BASEFONT, new PdfName(subsetPrefix + fontName + "-" + encoding));
+        }
+        //dic.put(PdfName.BASEFONT, new PdfName(subsetPrefix+fontName));
+        else {
+            dic.put(PdfName.BASEFONT, new PdfName(subsetPrefix + fontName));
+        }
+        //dic.put(PdfName.BASEFONT, new PdfName(fontName));
         dic.put(PdfName.ENCODING, new PdfName(encoding));
         dic.put(PdfName.DESCENDANTFONTS, new PdfArray(descendant));
-        if (toUnicode != null)
-            dic.put(PdfName.TOUNICODE, toUnicode);  
+        if (toUnicode != null) {
+            dic.put(PdfName.TOUNICODE, toUnicode);
+        }
         return dic;
     }
 
-    /** The method used to sort the metrics array.
+    /**
+     * The method used to sort the metrics array.
+     *
      * @param o1 the first element
      * @param o2 the second element
      * @return the comparison
-     */    
+     */
     public int compare(Object o1, Object o2) {
-        int m1 = ((int[])o1)[0];
-        int m2 = ((int[])o2)[0];
+        int m1 = ((int[]) o1)[0];
+        int m2 = ((int[]) o2)[0];
         return Integer.compare(m1, m2);
     }
-    
-    private static final byte[] rotbits = {(byte)0x80,(byte)0x40,(byte)0x20,(byte)0x10,(byte)0x08,(byte)0x04,(byte)0x02,(byte)0x01};
-    
-    /** Outputs to the writer the font dictionaries and streams.
+
+    /**
+     * Outputs to the writer the font dictionaries and streams.
+     *
      * @param writer the writer for this document
-     * @param ref the font indirect reference
+     * @param ref    the font indirect reference
      * @param params several parameters that depend on the font type
-     * @throws IOException on error
+     * @throws IOException       on error
      * @throws DocumentException error in generating the object
      */
     @SuppressWarnings("unchecked")
     void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) throws DocumentException, IOException {
-        HashMap longTag = (HashMap)params[0];
+        HashMap longTag = (HashMap) params[0];
         addRangeUni(longTag, true, subset);
         int[][] metrics = longTag.values().toArray(new int[0][]);
         Arrays.sort(metrics, this);
@@ -396,12 +424,12 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
         PdfObject pobj = null;
         PdfIndirectObject obj = null;
         PdfIndirectReference cidset = null;
-        if (includeCidSet || writer.getPDFXConformance() == PdfWriter.PDFA1A || writer.getPDFXConformance() == PdfWriter.PDFA1B) {
+        if (includeCidSet || writer.getPDFXConformance() == PdfWriter.PDFA1A
+                || writer.getPDFXConformance() == PdfWriter.PDFA1B) {
             PdfStream stream;
             if (metrics.length == 0) {
-                stream = new PdfStream(new byte[]{(byte)0x80});
-            }
-            else {
+                stream = new PdfStream(new byte[]{(byte) 0x80});
+            } else {
                 int top = metrics[metrics.length - 1][0];
                 byte[] bt = new byte[top / 8 + 1];
                 for (int[] metric : metrics) {
@@ -417,7 +445,7 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
         if (cff) {
             byte[] b = readCffFont();
             if (subset || subsetRanges != null) {
-                CFFFontSubset cff = new CFFFontSubset(new RandomAccessFileOrArray(b),longTag);
+                CFFFontSubset cff = new CFFFontSubset(new RandomAccessFileOrArray(b), longTag);
                 b = cff.Process(cff.getNames()[0]);
             }
             pobj = new StreamFont(b, "CIDFontType0C", compressionLevel);
@@ -426,10 +454,10 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
         } else {
             byte[] b;
             if (subset || directoryOffset != 0) {
-                TrueTypeFontSubSet sb = new TrueTypeFontSubSet(fileName, new RandomAccessFileOrArray(rf), longTag, directoryOffset, false, false);
+                TrueTypeFontSubSet sb = new TrueTypeFontSubSet(fileName, new RandomAccessFileOrArray(rf), longTag,
+                        directoryOffset, false, false);
                 b = sb.process();
-            }
-            else {
+            } else {
                 b = getFullFont();
             }
             int[] lengths = new int[]{b.length};
@@ -438,8 +466,9 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
             ind_font = obj.getIndirectReference();
         }
         String subsetPrefix = "";
-        if (subset)
+        if (subset) {
             subsetPrefix = createSubsetPrefix();
+        }
         PdfDictionary dic = getFontDescriptor(ind_font, subsetPrefix, cidset);
         obj = writer.addToBody(dic);
         ind_font = obj.getIndirectReference();
@@ -450,7 +479,7 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
 
         pobj = getToUnicode(metrics);
         PdfIndirectReference toUnicodeRef = null;
-        
+
         if (pobj != null) {
             obj = writer.addToBody(pobj);
             toUnicodeRef = obj.getIndirectReference();
@@ -459,11 +488,12 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
         pobj = getFontBaseType(ind_font, subsetPrefix, toUnicodeRef);
         writer.addToBody(pobj, ref);
     }
-    
+
     /**
      * Returns a PdfStream object with the full font program.
-     * @return    a PdfStream with the font program
-     * @since    2.1.3
+     *
+     * @return a PdfStream with the font program
+     * @since 2.1.3
      */
     public PdfStream getFullFontStream() throws IOException, DocumentException {
         if (cff) {
@@ -471,11 +501,13 @@ public PdfStream getFullFontStream() throws IOException, DocumentException {
         }
         return super.getFullFontStream();
     }
-    
-    /** A forbidden operation. Will throw a null pointer exception.
+
+    /**
+     * A forbidden operation. Will throw a null pointer exception.
+     *
      * @param text the text
      * @return always null
-     */    
+     */
     byte[] convertToBytes(String text) {
         return null;
     }
@@ -484,32 +516,39 @@ byte[] convertToBytes(int char1) {
         return null;
     }
 
-    /** Gets the glyph index and metrics for a character.
+    /**
+     * Gets the glyph index and metrics for a character.
+     *
      * @param c the character
      * @return an int array with {glyph index, width}
-     */    
+     */
     public int[] getMetricsTT(int c) {
-        if (cmapExt != null)
+        if (cmapExt != null) {
             return cmapExt.get(c);
+        }
         Map map;
-        if (fontSpecific)
+        if (fontSpecific) {
             map = cmap10;
-        else
+        } else {
             map = cmap31;
-        if (map == null)
+        }
+        if (map == null) {
             return null;
+        }
         if (fontSpecific) {
-            if ((c & 0xffffff00) == 0 || (c & 0xffffff00) == 0xf000)
+            if ((c & 0xffffff00) == 0 || (c & 0xffffff00) == 0xf000) {
                 return map.get(c & 0xff);
-            else
+            } else {
                 return null;
-        }
-        else
+            }
+        } else {
             return map.get(c);
+        }
     }
-    
+
     /**
      * Checks if a character exists in this font.
+     *
      * @param c the character to check
      * @return true if the character has a glyph,
      * false otherwise
@@ -517,28 +556,32 @@ public int[] getMetricsTT(int c) {
     public boolean charExists(int c) {
         return getMetricsTT(c) != null;
     }
-    
+
     /**
      * Sets the character advance.
-     * @param c the character
+     *
+     * @param c       the character
      * @param advance the character advance normalized to 1000 units
      * @return true if the advance was set,
      * false otherwise
      */
     public boolean setCharAdvance(int c, int advance) {
         int[] m = getMetricsTT(c);
-        if (m == null)
+        if (m == null) {
             return false;
+        }
         m[1] = advance;
         return true;
     }
-    
+
     public int[] getCharBBox(int c) {
-        if (bboxes == null)
+        if (bboxes == null) {
             return null;
+        }
         int[] m = getMetricsTT(c);
-        if (m == null)
+        if (m == null) {
             return null;
+        }
         return bboxes[m[0]];
     }
 
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/Type1Font.java b/openpdf/src/main/java/com/lowagie/text/pdf/Type1Font.java
index 644336107..617bc37c0 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/Type1Font.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/Type1Font.java
@@ -49,136 +49,159 @@
 
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.error_messages.MessageLocalization;
+import com.lowagie.text.pdf.fonts.FontsResourceAnchor;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
-import com.lowagie.text.error_messages.MessageLocalization;
-
-import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.pdf.fonts.FontsResourceAnchor;
 
-/** Reads a Type1 font
+/**
+ * Reads a Type1 font
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
-class Type1Font extends BaseFont
-{
-    private static FontsResourceAnchor resourceAnchor;
+class Type1Font extends BaseFont {
 
+    /**
+     * Types of records in a PFB file. ASCII is 1 and BINARY is 2. They have to appear in the PFB file in this
+     * sequence.
+     */
+    private static final int[] PFB_TYPES = {1, 2, 1};
+    private static FontsResourceAnchor resourceAnchor;
     /**
      * The PFB file if the input was made with a byte array.
      */
     protected byte[] pfb;
-/** The Postscript font name.
- */
+    /**
+     * The Postscript font name.
+     */
     private String FontName;
-/** The full name of the font.
- */
+    /**
+     * The full name of the font.
+     */
     private String FullName;
-/** The family name of the font.
- */
+    /**
+     * The family name of the font.
+     */
     private String FamilyName;
-/** The weight of the font: normal, bold, etc.
- */
+    /**
+     * The weight of the font: normal, bold, etc.
+     */
     private String Weight = "";
-/** The italic angle of the font, usually 0.0 or negative.
- */
+    /**
+     * The italic angle of the font, usually 0.0 or negative.
+     */
     private float ItalicAngle = 0.0f;
-/** true if all the characters have the same
- *  width.
- */
+    /**
+     * true if all the characters have the same
+     * width.
+     */
     private boolean IsFixedPitch = false;
-/** The character set of the font.
- */
+    /**
+     * The character set of the font.
+     */
     private String CharacterSet;
-/** The llx of the FontBox.
- */
+    /**
+     * The llx of the FontBox.
+     */
     private int llx = -50;
-/** The lly of the FontBox.
- */
+    /**
+     * The lly of the FontBox.
+     */
     private int lly = -200;
-/** The lurx of the FontBox.
- */
+    /**
+     * The lurx of the FontBox.
+     */
     private int urx = 1000;
-/** The ury of the FontBox.
- */
+    /**
+     * The ury of the FontBox.
+     */
     private int ury = 900;
-/** The underline position.
- */
+    /**
+     * The underline position.
+     */
     private int UnderlinePosition = -100;
-/** The underline thickness.
- */
+    /**
+     * The underline thickness.
+     */
     private int UnderlineThickness = 50;
-/** The font's encoding name. This encoding is 'StandardEncoding' or
- *  'AdobeStandardEncoding' for a font that can be totally encoded
- *  according to the characters names. For all other names the
- *  font is treated as symbolic.
- */
+    /**
+     * The font's encoding name. This encoding is 'StandardEncoding' or 'AdobeStandardEncoding' for a font that can be
+     * totally encoded according to the characters names. For all other names the font is treated as symbolic.
+     */
     private String EncodingScheme = "FontSpecific";
-/** A variable.
- */
+    /**
+     * A variable.
+     */
     private int CapHeight = 700;
-/** A variable.
- */
+    /**
+     * A variable.
+     */
     private int XHeight = 480;
-/** A variable.
- */
+    /**
+     * A variable.
+     */
     private int Ascender = 800;
-/** A variable.
- */
+    /**
+     * A variable.
+     */
     private int Descender = -200;
-/** A variable.
- */
+    /**
+     * A variable.
+     */
     private int StdHW;
-/** A variable.
- */
+    /**
+     * A variable.
+     */
     private int StdVW = 80;
-    
-/** Represents the section CharMetrics in the AFM file. Each
- *  value of this array contains a Object[4] with an
- *  Integer, Integer, String and int[]. This is the code, width, name and char bbox.
- *  The key is the name of the char and also an Integer with the char number.
- */
+    /**
+     * Represents the section CharMetrics in the AFM file. Each value of this array contains a Object[4]
+     * with an Integer, Integer, String and int[]. This is the code, width, name and char bbox. The key is the name of
+     * the char and also an Integer with the char number.
+     */
     private Map CharMetrics = new HashMap<>();
-/** Represents the section KernPairs in the AFM file. The key is
- *  the name of the first character and the value is a Object[]
- *  with 2 elements for each kern pair. Position 0 is the name of
- *  the second character and position 1 is the kerning distance. This is
- *  repeated for all the pairs.
- */
+    /**
+     * Represents the section KernPairs in the AFM file. The key is the name of the first character and the value is a
+     * Object[] with 2 elements for each kern pair. Position 0 is the name of the second character and
+     * position 1 is the kerning distance. This is repeated for all the pairs.
+     */
     private Map KernPairs = new HashMap<>();
-/** The file in use.
- */
+    /**
+     * The file in use.
+     */
     private String fileName;
-/** true if this font is one of the 14 built in fonts.
- */
-    private boolean builtinFont = false;
     /**
-     * Types of records in a PFB file. ASCII is 1 and BINARY is 2.
-     * They have to appear in the PFB file in this sequence.
+     * true if this font is one of the 14 built in fonts.
      */
-    private static final int[] PFB_TYPES = {1, 2, 1};
-    
-    /** Creates a new Type1 font.
-     * @param ttfAfm the AFM file if the input is made with a byte array
-     * @param pfb the PFB file if the input is made with a byte array
-     * @param afmFile the name of one of the 14 built-in fonts or the location of an AFM file. The file must end in '.afm'
-     * @param enc the encoding to be applied to this font
-     * @param emb true if the font is to be embedded in the PDF
+    private boolean builtinFont = false;
+
+    /**
+     * Creates a new Type1 font.
+     *
+     * @param ttfAfm  the AFM file if the input is made with a byte array
+     * @param pfb     the PFB file if the input is made with a byte array
+     * @param afmFile the name of one of the 14 built-in fonts or the location of an AFM file. The file must end in
+     *                '.afm'
+     * @param enc     the encoding to be applied to this font
+     * @param emb     true if the font is to be embedded in the PDF
      * @throws DocumentException the AFM file is invalid
-     * @throws IOException the AFM file could not be read
-     * @since    2.1.5
+     * @throws IOException       the AFM file could not be read
+     * @since 2.1.5
      */
     Type1Font(String afmFile, String enc, boolean emb, byte[] ttfAfm, byte[] pfb, boolean forceRead)
-        throws DocumentException, IOException {
-        if (emb && ttfAfm != null && pfb == null)
-            throw new DocumentException(MessageLocalization.getComposedMessage("two.byte.arrays.are.needed.if.the.type1.font.is.embedded"));
-        if (emb && ttfAfm != null)
+            throws DocumentException, IOException {
+        if (emb && ttfAfm != null && pfb == null) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("two.byte.arrays.are.needed.if.the.type1.font.is.embedded"));
+        }
+        if (emb && ttfAfm != null) {
             this.pfb = pfb;
+        }
         encoding = enc;
         embedded = emb;
         fileName = afmFile;
@@ -190,8 +213,9 @@ class Type1Font extends BaseFont
             builtinFont = true;
             byte[] buf = new byte[1024];
             try {
-                if (resourceAnchor == null)
+                if (resourceAnchor == null) {
                     resourceAnchor = new FontsResourceAnchor();
+                }
                 is = getResourceStream(RESOURCE_PATH + afmFile + ".afm", resourceAnchor.getClass().getClassLoader());
                 if (is == null) {
                     String msg = MessageLocalization.getComposedMessage("1.not.found.as.resource", afmFile);
@@ -201,18 +225,17 @@ class Type1Font extends BaseFont
                 ByteArrayOutputStream out = new ByteArrayOutputStream();
                 while (true) {
                     int size = is.read(buf);
-                    if (size < 0)
+                    if (size < 0) {
                         break;
+                    }
                     out.write(buf, 0, size);
                 }
                 buf = out.toByteArray();
-            }
-            finally {
+            } finally {
                 if (is != null) {
                     try {
                         is.close();
-                    }
-                    catch (Exception e) {
+                    } catch (Exception e) {
                         // empty on purpose
                     }
                 }
@@ -220,134 +243,138 @@ class Type1Font extends BaseFont
             try {
                 rf = new RandomAccessFileOrArray(buf);
                 process(rf);
-            }
-            finally {
+            } finally {
                 if (rf != null) {
                     try {
                         rf.close();
-                    }
-                    catch (Exception e) {
+                    } catch (Exception e) {
                         // empty on purpose
                     }
                 }
             }
-        }
-        else if (afmFile.toLowerCase().endsWith(".afm")) {
+        } else if (afmFile.toLowerCase().endsWith(".afm")) {
             try {
-                if (ttfAfm == null)
+                if (ttfAfm == null) {
                     rf = new RandomAccessFileOrArray(afmFile, forceRead, Document.plainRandomAccess);
-                else
+                } else {
                     rf = new RandomAccessFileOrArray(ttfAfm);
+                }
                 process(rf);
-            }
-            finally {
+            } finally {
                 if (rf != null) {
                     try {
                         rf.close();
-                    }
-                    catch (Exception e) {
+                    } catch (Exception e) {
                         // empty on purpose
                     }
                 }
             }
-        }
-        else if (afmFile.toLowerCase().endsWith(".pfm")) {
+        } else if (afmFile.toLowerCase().endsWith(".pfm")) {
             try {
                 ByteArrayOutputStream ba = new ByteArrayOutputStream();
-                if (ttfAfm == null)
+                if (ttfAfm == null) {
                     rf = new RandomAccessFileOrArray(afmFile, forceRead, Document.plainRandomAccess);
-                else
+                } else {
                     rf = new RandomAccessFileOrArray(ttfAfm);
+                }
                 Pfm2afm.convert(rf, ba);
                 rf.close();
                 rf = new RandomAccessFileOrArray(ba.toByteArray());
                 process(rf);
-            }
-            finally {
+            } finally {
                 if (rf != null) {
                     try {
                         rf.close();
-                    }
-                    catch (Exception e) {
+                    } catch (Exception e) {
                         // empty on purpose
                     }
                 }
             }
+        } else {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("1.is.not.an.afm.or.pfm.font.file", afmFile));
         }
-        else
-            throw new DocumentException(MessageLocalization.getComposedMessage("1.is.not.an.afm.or.pfm.font.file", afmFile));
 
         EncodingScheme = EncodingScheme.trim();
         if (EncodingScheme.equals("AdobeStandardEncoding") || EncodingScheme.equals("StandardEncoding")) {
             fontSpecific = false;
         }
-        if (!encoding.startsWith("#"))
+        if (!encoding.startsWith("#")) {
             PdfEncodings.convertToBytes(" ", enc); // check if the encoding exists
+        }
         createEncoding();
     }
-    
-/** Gets the width from the font according to the name or,
- * if the name is null, meaning it is a symbolic font,
- * the char c.
- * @param c the char if the font is symbolic
- * @param name the glyph name
- * @return the width of the char
- */
+
+    /**
+     * Gets the width from the font according to the name or, if the name is null, meaning it
+     * is a symbolic font, the char c.
+     *
+     * @param c    the char if the font is symbolic
+     * @param name the glyph name
+     * @return the width of the char
+     */
     int getRawWidth(int c, String name) {
         Object[] metrics;
         if (name == null) { // font specific
             metrics = CharMetrics.get(c);
-        }
-        else {
-            if (name.equals(".notdef"))
+        } else {
+            if (name.equals(".notdef")) {
                 return 0;
+            }
             metrics = CharMetrics.get(name);
         }
-        if (metrics != null)
+        if (metrics != null) {
             return (Integer) (metrics[1]);
+        }
         return 0;
     }
-    
-/** Gets the kerning between two Unicode characters. The characters
- * are converted to names and this names are used to find the kerning
- * pairs in the HashMap KernPairs.
- * @param char1 the first char
- * @param char2 the second char
- * @return the kerning to be applied
- */
-    public int getKerning(int char1, int char2)
-    {
+
+    /**
+     * Gets the kerning between two Unicode characters. The characters are converted to names and this names are used to
+     * find the kerning pairs in the HashMap KernPairs.
+     *
+     * @param char1 the first char
+     * @param char2 the second char
+     * @return the kerning to be applied
+     */
+    public int getKerning(int char1, int char2) {
         String first = GlyphList.unicodeToName(char1);
-        if (first == null)
+        if (first == null) {
             return 0;
+        }
         String second = GlyphList.unicodeToName(char2);
-        if (second == null)
+        if (second == null) {
             return 0;
+        }
         Object[] obj = KernPairs.get(first);
-        if (obj == null)
+        if (obj == null) {
             return 0;
+        }
         for (int k = 0; k < obj.length; k += 2) {
-            if (second.equals(obj[k]) && obj.length > k + 1)
+            if (second.equals(obj[k]) && obj.length > k + 1) {
                 return (Integer) obj[k + 1];
+            }
         }
         return 0;
     }
-    
-    
-    /** Reads the font metrics
+
+
+    /**
+     * Reads the font metrics
+     *
      * @param rf the AFM file
      * @throws DocumentException the AFM file is invalid
-     * @throws IOException the AFM file could not be read
+     * @throws IOException       the AFM file could not be read
      */
-    public void process(RandomAccessFileOrArray rf) throws DocumentException, IOException
-    {
+    public void process(RandomAccessFileOrArray rf) throws DocumentException, IOException {
         String line;
         boolean isMetrics = false;
         label:
         while ((line = rf.readLine()) != null) {
             StringTokenizer tok = new StringTokenizer(line, " ,\n\r\t\f");
-            if (!tok.hasMoreTokens())
+            if (!tok.hasMoreTokens()) {
                 continue;
+            }
             String ident = tok.nextToken();
             switch (ident) {
                 case "FontName":
@@ -409,16 +436,17 @@ public void process(RandomAccessFileOrArray rf) throws DocumentException, IOExce
                     break label;
             }
         }
-        if (!isMetrics)
-            throw new DocumentException(MessageLocalization.getComposedMessage("missing.startcharmetrics.in.1", fileName));
-        while ((line = rf.readLine()) != null)
-        {
+        if (!isMetrics) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("missing.startcharmetrics.in.1", fileName));
+        }
+        while ((line = rf.readLine()) != null) {
             StringTokenizer tok = new StringTokenizer(line);
-            if (!tok.hasMoreTokens())
+            if (!tok.hasMoreTokens()) {
                 continue;
+            }
             String ident = tok.nextToken();
-            if (ident.equals("EndCharMetrics"))
-            {
+            if (ident.equals("EndCharMetrics")) {
                 isMetrics = false;
                 break;
             }
@@ -428,11 +456,11 @@ public void process(RandomAccessFileOrArray rf) throws DocumentException, IOExce
             int[] B = null;
 
             tok = new StringTokenizer(line, ";");
-            while (tok.hasMoreTokens())
-            {
+            while (tok.hasMoreTokens()) {
                 StringTokenizer tokc = new StringTokenizer(tok.nextToken());
-                if (!tokc.hasMoreTokens())
+                if (!tokc.hasMoreTokens()) {
                     continue;
+                }
                 ident = tokc.nextToken();
                 switch (ident) {
                     case "C":
@@ -453,49 +481,53 @@ public void process(RandomAccessFileOrArray rf) throws DocumentException, IOExce
                 }
             }
             Object[] metrics = new Object[]{C, WX, N, B};
-            if (C >= 0)
+            if (C >= 0) {
                 CharMetrics.put(C, metrics);
+            }
             CharMetrics.put(N, metrics);
         }
-        if (isMetrics)
-            throw new DocumentException(MessageLocalization.getComposedMessage("missing.endcharmetrics.in.1", fileName));
+        if (isMetrics) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("missing.endcharmetrics.in.1", fileName));
+        }
         if (!CharMetrics.containsKey("nonbreakingspace")) {
             Object[] space = CharMetrics.get("space");
-            if (space != null)
+            if (space != null) {
                 CharMetrics.put("nonbreakingspace", space);
+            }
         }
-        while ((line = rf.readLine()) != null)
-        {
+        while ((line = rf.readLine()) != null) {
             StringTokenizer tok = new StringTokenizer(line);
-            if (!tok.hasMoreTokens())
+            if (!tok.hasMoreTokens()) {
                 continue;
+            }
             String ident = tok.nextToken();
-            if (ident.equals("EndFontMetrics"))
+            if (ident.equals("EndFontMetrics")) {
                 return;
-            if (ident.equals("StartKernPairs"))
-            {
+            }
+            if (ident.equals("StartKernPairs")) {
                 isMetrics = true;
                 break;
             }
         }
-        if (!isMetrics)
-            throw new DocumentException(MessageLocalization.getComposedMessage("missing.endfontmetrics.in.1", fileName));
-        while ((line = rf.readLine()) != null)
-        {
+        if (!isMetrics) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("missing.endfontmetrics.in.1", fileName));
+        }
+        while ((line = rf.readLine()) != null) {
             StringTokenizer tok = new StringTokenizer(line);
-            if (!tok.hasMoreTokens())
+            if (!tok.hasMoreTokens()) {
                 continue;
+            }
             String ident = tok.nextToken();
-            if (ident.equals("KPX"))
-            {
+            if (ident.equals("KPX")) {
                 String first = tok.nextToken();
                 String second = tok.nextToken();
                 int width = Integer.parseInt(tok.nextToken());
                 Object[] relates = KernPairs.get(first);
-                if (relates == null)
+                if (relates == null) {
                     KernPairs.put(first, new Object[]{second, width});
-                else
-                {
+                } else {
                     int n = relates.length;
                     Object[] relates2 = new Object[n + 2];
                     System.arraycopy(relates, 0, relates2, 0, n);
@@ -503,45 +535,50 @@ public void process(RandomAccessFileOrArray rf) throws DocumentException, IOExce
                     relates2[n + 1] = width;
                     KernPairs.put(first, relates2);
                 }
-            }
-            else if (ident.equals("EndKernPairs"))
-            {
+            } else if (ident.equals("EndKernPairs")) {
                 isMetrics = false;
                 break;
             }
         }
-        if (isMetrics)
+        if (isMetrics) {
             throw new DocumentException(MessageLocalization.getComposedMessage("missing.endkernpairs.in.1", fileName));
+        }
         rf.close();
     }
-    
-/** If the embedded flag is false or if the font is
- *  one of the 14 built in types, it returns null,
- * otherwise the font is read and output in a PdfStream object.
- * @return the PdfStream containing the font or null
- * @throws DocumentException if there is an error reading the font
- * @since 2.1.3
- */
-    public PdfStream getFullFontStream() throws DocumentException
-    {
-        if (builtinFont || !embedded)
+
+    /**
+     * If the embedded flag is false or if the font is one of the 14 built in types, it returns
+     * null, otherwise the font is read and output in a PdfStream object.
+     *
+     * @return the PdfStream containing the font or null
+     * @throws DocumentException if there is an error reading the font
+     * @since 2.1.3
+     */
+    public PdfStream getFullFontStream() throws DocumentException {
+        if (builtinFont || !embedded) {
             return null;
+        }
         RandomAccessFileOrArray rf = null;
         try {
             String filePfb = fileName.substring(0, fileName.length() - 3) + "pfb";
-            if (pfb == null)
+            if (pfb == null) {
                 rf = new RandomAccessFileOrArray(filePfb, true, Document.plainRandomAccess);
-            else
+            } else {
                 rf = new RandomAccessFileOrArray(pfb);
+            }
             int fileLength = rf.length();
             byte[] st = new byte[fileLength - 18];
             int[] lengths = new int[3];
             int bytePtr = 0;
             for (int k = 0; k < 3; ++k) {
-                if (rf.read() != 0x80)
-                    throw new DocumentException(MessageLocalization.getComposedMessage("start.marker.missing.in.1", filePfb));
-                if (rf.read() != PFB_TYPES[k])
-                    throw new DocumentException(MessageLocalization.getComposedMessage("incorrect.segment.type.in.1", filePfb));
+                if (rf.read() != 0x80) {
+                    throw new DocumentException(
+                            MessageLocalization.getComposedMessage("start.marker.missing.in.1", filePfb));
+                }
+                if (rf.read() != PFB_TYPES[k]) {
+                    throw new DocumentException(
+                            MessageLocalization.getComposedMessage("incorrect.segment.type.in.1", filePfb));
+                }
                 int size = rf.read();
                 size += rf.read() << 8;
                 size += rf.read() << 16;
@@ -549,38 +586,38 @@ public PdfStream getFullFontStream() throws DocumentException
                 lengths[k] = size;
                 while (size != 0) {
                     int got = rf.read(st, bytePtr, size);
-                    if (got < 0)
-                        throw new DocumentException(MessageLocalization.getComposedMessage("premature.end.in.1", filePfb));
+                    if (got < 0) {
+                        throw new DocumentException(
+                                MessageLocalization.getComposedMessage("premature.end.in.1", filePfb));
+                    }
                     bytePtr += got;
                     size -= got;
                 }
             }
             return new StreamFont(st, lengths, compressionLevel);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw new DocumentException(e);
-        }
-        finally {
+        } finally {
             if (rf != null) {
                 try {
                     rf.close();
-                }
-                catch (Exception e) {
+                } catch (Exception e) {
                     // empty on purpose
                 }
             }
         }
     }
-    
-/** Generates the font descriptor for this font or null if it is
- * one of the 14 built in fonts.
- * @param fontStream the indirect reference to a PdfStream containing the font or null
- * @return the PdfDictionary containing the font descriptor or null
- */
-    private PdfDictionary getFontDescriptor(PdfIndirectReference fontStream)
-    {
-        if (builtinFont)
+
+    /**
+     * Generates the font descriptor for this font or null if it is one of the 14 built in fonts.
+     *
+     * @param fontStream the indirect reference to a PdfStream containing the font or null
+     * @return the PdfDictionary containing the font descriptor or null
+     */
+    private PdfDictionary getFontDescriptor(PdfIndirectReference fontStream) {
+        if (builtinFont) {
             return null;
+        }
         PdfDictionary dic = new PdfDictionary(PdfName.FONTDESCRIPTOR);
         dic.put(PdfName.ASCENT, new PdfNumber(Ascender));
         dic.put(PdfName.CAPHEIGHT, new PdfNumber(CapHeight));
@@ -589,32 +626,40 @@ private PdfDictionary getFontDescriptor(PdfIndirectReference fontStream)
         dic.put(PdfName.FONTNAME, new PdfName(FontName));
         dic.put(PdfName.ITALICANGLE, new PdfNumber(ItalicAngle));
         dic.put(PdfName.STEMV, new PdfNumber(StdVW));
-        if (fontStream != null)
+        if (fontStream != null) {
             dic.put(PdfName.FONTFILE, fontStream);
+        }
         int flags = 0;
-        if (IsFixedPitch)
+        if (IsFixedPitch) {
             flags |= 1;
+        }
         flags |= fontSpecific ? 4 : 32;
-        if (ItalicAngle < 0)
+        if (ItalicAngle < 0) {
             flags |= 64;
-        if (FontName.contains("Caps") || FontName.endsWith("SC"))
+        }
+        if (FontName.contains("Caps") || FontName.endsWith("SC")) {
             flags |= 131072;
-        if (Weight.equals("Bold"))
+        }
+        if (Weight.equals("Bold")) {
             flags |= 262144;
+        }
         dic.put(PdfName.FLAGS, new PdfNumber(flags));
-        
+
         return dic;
     }
-    
-    /** Generates the font dictionary for this font.
+
+    /**
+     * Generates the font dictionary for this font.
+     *
+     * @param firstChar      the first valid character
+     * @param lastChar       the last valid character
+     * @param shortTag       a 256 bytes long byte array where each unused byte is represented by 0
+     * @param fontDescriptor the indirect reference to a PdfDictionary containing the font descriptor or
+     *                       null
      * @return the PdfDictionary containing the font dictionary
-     * @param firstChar the first valid character
-     * @param lastChar the last valid character
-     * @param shortTag a 256 bytes long byte array where each unused byte is represented by 0
-     * @param fontDescriptor the indirect reference to a PdfDictionary containing the font descriptor or null
      */
-    private PdfDictionary getFontBaseType(PdfIndirectReference fontDescriptor, int firstChar, int lastChar, byte[] shortTag)
-    {
+    private PdfDictionary getFontBaseType(PdfIndirectReference fontDescriptor, int firstChar, int lastChar,
+            byte[] shortTag) {
         PdfDictionary dic = new PdfDictionary(PdfName.FONT);
         dic.put(PdfName.SUBTYPE, PdfName.TYPE1);
         dic.put(PdfName.BASEFONT, new PdfName(FontName));
@@ -626,12 +671,13 @@ private PdfDictionary getFontBaseType(PdfIndirectReference fontDescriptor, int f
                     break;
                 }
             }
-            if (stdEncoding)
-                dic.put(PdfName.ENCODING, encoding.equals("Cp1252") ? PdfName.WIN_ANSI_ENCODING : PdfName.MAC_ROMAN_ENCODING);
-            else {
+            if (stdEncoding) {
+                dic.put(PdfName.ENCODING,
+                        encoding.equals("Cp1252") ? PdfName.WIN_ANSI_ENCODING : PdfName.MAC_ROMAN_ENCODING);
+            } else {
                 PdfDictionary enc = new PdfDictionary(PdfName.ENCODING);
                 PdfArray dif = new PdfArray();
-                boolean gap = true;                
+                boolean gap = true;
                 for (int k = firstChar; k <= lastChar; ++k) {
                     if (shortTag[k] != 0) {
                         if (gap) {
@@ -639,9 +685,9 @@ private PdfDictionary getFontBaseType(PdfIndirectReference fontDescriptor, int f
                             gap = false;
                         }
                         dif.add(new PdfName(differences[k]));
-                    }
-                    else
+                    } else {
                         gap = true;
+                    }
                 }
                 enc.put(PdfName.DIFFERENCES, dif);
                 dic.put(PdfName.ENCODING, enc);
@@ -652,23 +698,27 @@ private PdfDictionary getFontBaseType(PdfIndirectReference fontDescriptor, int f
             dic.put(PdfName.LASTCHAR, new PdfNumber(lastChar));
             PdfArray wd = new PdfArray();
             for (int k = firstChar; k <= lastChar; ++k) {
-                if (shortTag[k] == 0)
+                if (shortTag[k] == 0) {
                     wd.add(new PdfNumber(0));
-                else
+                } else {
                     wd.add(new PdfNumber(widths[k]));
+                }
             }
             dic.put(PdfName.WIDTHS, wd);
         }
-        if (!builtinFont && fontDescriptor != null)
+        if (!builtinFont && fontDescriptor != null) {
             dic.put(PdfName.FONTDESCRIPTOR, fontDescriptor);
+        }
         return dic;
     }
-    
-    /** Outputs to the writer the font dictionaries and streams.
+
+    /**
+     * Outputs to the writer the font dictionaries and streams.
+     *
      * @param writer the writer for this document
-     * @param ref the font indirect reference
+     * @param ref    the font indirect reference
      * @param params several parameters that depend on the font type
-     * @throws IOException on error
+     * @throws IOException       on error
      * @throws DocumentException error in generating the object
      */
     void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) throws DocumentException, IOException {
@@ -679,34 +729,37 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
         if (!subsetp) {
             firstChar = 0;
             lastChar = shortTag.length - 1;
-            for (int k = 0; k < shortTag.length; ++k)
+            for (int k = 0; k < shortTag.length; ++k) {
                 shortTag[k] = 1;
+            }
         }
         PdfIndirectReference ind_font = null;
         PdfObject pobj = null;
         PdfIndirectObject obj = null;
         pobj = getFullFontStream();
-        if (pobj != null){
+        if (pobj != null) {
             obj = writer.addToBody(pobj);
             ind_font = obj.getIndirectReference();
         }
         pobj = getFontDescriptor(ind_font);
-        if (pobj != null){
+        if (pobj != null) {
             obj = writer.addToBody(pobj);
             ind_font = obj.getIndirectReference();
         }
         pobj = getFontBaseType(ind_font, firstChar, lastChar, shortTag);
         writer.addToBody(pobj, ref);
     }
-    
-    /** Gets the font parameter identified by key. Valid values
-     * for key are ASCENT, CAPHEIGHT, DESCENT,
+
+    /**
+     * Gets the font parameter identified by key. Valid values for key are
+     * ASCENT, CAPHEIGHT, DESCENT,
      * ITALICANGLE, BBOXLLX, BBOXLLY, BBOXURX
      * and BBOXURY.
-     * @param key the parameter to be extracted
+     *
+     * @param key      the parameter to be extracted
      * @param fontSize the font size in points
      * @return the parameter in points
-     */    
+     */
     public float getFontDescriptor(int key, float fontSize) {
         switch (key) {
             case AWT_ASCENT:
@@ -738,80 +791,88 @@ public float getFontDescriptor(int key, float fontSize) {
         }
         return 0;
     }
-    
-    /** Gets the postscript font name.
+
+    /**
+     * Gets the postscript font name.
+     *
      * @return the postscript font name
      */
     public String getPostscriptFontName() {
         return FontName;
     }
-    
-    /** Gets the full name of the font. If it is a True Type font
-     * each array element will have {Platform ID, Platform Encoding ID,
-     * Language ID, font name}. The interpretation of this values can be
-     * found in the Open Type specification, chapter 2, in the 'name' table.
              
-     * For the other fonts the array has a single element with {"", "", "",
-     * font name}.
+
+    /**
+     * Sets the font name that will appear in the pdf font dictionary. Use with care as it can easily make a font
+     * unreadable if not embedded.
+     *
+     * @param name the new font name
+     */
+    public void setPostscriptFontName(String name) {
+        FontName = name;
+    }
+
+    /**
+     * Gets the full name of the font. If it is a True Type font each array element will have {Platform ID, Platform
+     * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type
+     * specification, chapter 2, in the 'name' table.
               For the other fonts the array has a single element with {"",
+     * "", "", font name}.
+     *
      * @return the full name of the font
      */
     public String[][] getFullFontName() {
         return new String[][]{{"", "", "", FullName}};
     }
-    
-    /** Gets all the entries of the names-table. If it is a True Type font
-     * each array element will have {Name ID, Platform ID, Platform Encoding ID,
-     * Language ID, font name}. The interpretation of this values can be
-     * found in the Open Type specification, chapter 2, in the 'name' table.
              
-     * For the other fonts the array has a single element with {"4", "", "", "",
-     * font name}.
+
+    /**
+     * Gets all the entries of the names-table. If it is a True Type font each array element will have {Name ID,
+     * Platform ID, Platform Encoding ID, Language ID, font name}. The interpretation of this values can be found in the
+     * Open Type specification, chapter 2, in the 'name' table.
               For the other fonts the array has a single element
+     * with {"4", "", "", "", font name}.
+     *
      * @return the full name of the font
      */
     public String[][] getAllNameEntries() {
         return new String[][]{{"4", "", "", "", FullName}};
     }
-    
-    /** Gets the family name of the font. If it is a True Type font
-     * each array element will have {Platform ID, Platform Encoding ID,
-     * Language ID, font name}. The interpretation of this values can be
-     * found in the Open Type specification, chapter 2, in the 'name' table.
              
-     * For the other fonts the array has a single element with {"", "", "",
-     * font name}.
+
+    /**
+     * Gets the family name of the font. If it is a True Type font each array element will have {Platform ID, Platform
+     * Encoding ID, Language ID, font name}. The interpretation of this values can be found in the Open Type
+     * specification, chapter 2, in the 'name' table.
               For the other fonts the array has a single element with {"",
+     * "", "", font name}.
+     *
      * @return the family name of the font
      */
     public String[][] getFamilyFontName() {
         return new String[][]{{"", "", "", FamilyName}};
     }
-    
-    /** Checks if the font has any kerning pairs.
+
+    /**
+     * Checks if the font has any kerning pairs.
+     *
      * @return true if the font has any kerning pairs
-     */    
+     */
     public boolean hasKernPairs() {
         return !KernPairs.isEmpty();
     }
-    
-    /**
-     * Sets the font name that will appear in the pdf font dictionary.
-     * Use with care as it can easily make a font unreadable if not embedded.
-     * @param name the new font name
-     */    
-    public void setPostscriptFontName(String name) {
-        FontName = name;
-    }
-    
+
     /**
      * Sets the kerning between two Unicode chars.
+     *
      * @param char1 the first char
      * @param char2 the second char
-     * @param kern the kerning to apply in normalized 1000 units
+     * @param kern  the kerning to apply in normalized 1000 units
      * @return true if the kerning was applied, false otherwise
      */
     public boolean setKerning(int char1, int char2, int kern) {
         String first = GlyphList.unicodeToName(char1);
-        if (first == null)
+        if (first == null) {
             return false;
+        }
         String second = GlyphList.unicodeToName(char2);
-        if (second == null)
+        if (second == null) {
             return false;
+        }
         Object[] obj = KernPairs.get(first);
         if (obj == null) {
             obj = new Object[]{second, kern};
@@ -832,20 +893,21 @@ public boolean setKerning(int char1, int char2, int kern) {
         KernPairs.put(first, obj2);
         return true;
     }
-    
+
     protected int[] getRawCharBBox(int c, String name) {
         Object[] metrics;
         if (name == null) { // font specific
             metrics = CharMetrics.get(c);
-        }
-        else {
-            if (name.equals(".notdef"))
+        } else {
+            if (name.equals(".notdef")) {
                 return null;
+            }
             metrics = CharMetrics.get(name);
         }
-        if (metrics != null)
-            return ((int[])(metrics[3]));
+        if (metrics != null) {
+            return ((int[]) (metrics[3]));
+        }
         return null;
     }
-    
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/Type3Font.java b/openpdf/src/main/java/com/lowagie/text/pdf/Type3Font.java
index 19bc0316d..ca06bf498 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/Type3Font.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/Type3Font.java
@@ -47,18 +47,16 @@
 
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.lowagie.text.error_messages.MessageLocalization;
-
-import com.lowagie.text.DocumentException;
-
 /**
  * A class to support Type3 fonts.
  */
 public class Type3Font extends BaseFont {
-    
+
     private boolean[] usedSlot;
     private IntHashtable widths3 = new IntHashtable();
     private Map char2glyph = new HashMap<>();
@@ -66,22 +64,22 @@ public class Type3Font extends BaseFont {
     private float llx = Float.NaN, lly, urx, ury;
     private PageResources pageResources = new PageResources();
     private boolean colorized;
-    
+
     /**
      * Creates a Type3 font.
-     * @param writer the writer
-     * @param chars an array of chars corresponding to the glyphs used (not used, present for compatibility only)
-     * @param colorized if true the font may specify color, if false no color commands are allowed
-     * and only images as masks can be used
-     */    
+     *
+     * @param writer    the writer
+     * @param chars     an array of chars corresponding to the glyphs used (not used, present for compatibility only)
+     * @param colorized if true the font may specify color, if false no color commands are
+     *                  allowed and only images as masks can be used
+     */
     public Type3Font(PdfWriter writer, char[] chars, boolean colorized) {
         this(writer, colorized);
     }
-    
+
     /**
-     * Creates a Type3 font. This implementation assumes that the /FontMatrix is
-     * [0.001 0 0 0.001 0 0] or a 1000-unit glyph coordinate system.
-     * An example:
+     * Creates a Type3 font. This implementation assumes that the /FontMatrix is [0.001 0 0 0.001 0 0] or a 1000-unit
+     * glyph coordinate system. An example:
      * 
                    * Document document = new Document(PageSize.A4);
      * PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("type3.pdf"));
@@ -99,48 +97,52 @@ public Type3Font(PdfWriter writer, char[] chars, boolean colorized) {
      * document.add(new Paragraph("ababab", f));
      * document.close();
      * 
              
-     * @param writer the writer
-     * @param colorized if true the font may specify color, if false no color commands are allowed
-     * and only images as masks can be used
-     */    
+     *
+     * @param writer    the writer
+     * @param colorized if true the font may specify color, if false no color commands are
+     *                  allowed and only images as masks can be used
+     */
     public Type3Font(PdfWriter writer, boolean colorized) {
         this.writer = writer;
         this.colorized = colorized;
         fontType = FONT_TYPE_T3;
         usedSlot = new boolean[256];
     }
-    
+
     /**
      * Defines a glyph. If the character was already defined it will return the same content
-     * @param c the character to match this glyph.
-     * @param wx the advance this character will have
+     *
+     * @param c   the character to match this glyph.
+     * @param wx  the advance this character will have
      * @param llx the X lower left corner of the glyph bounding box. If the colorize option is
-     * true the value is ignored
+     *            true the value is ignored
      * @param lly the Y lower left corner of the glyph bounding box. If the colorize option is
-     * true the value is ignored
+     *            true the value is ignored
      * @param urx the X upper right corner of the glyph bounding box. If the colorize option is
-     * true the value is ignored
+     *            true the value is ignored
      * @param ury the Y upper right corner of the glyph bounding box. If the colorize option is
-     * true the value is ignored
+     *            true the value is ignored
      * @return a content where the glyph can be defined
-     */    
+     */
     public PdfContentByte defineGlyph(char c, float wx, float llx, float lly, float urx, float ury) {
-        if (c == 0 || c > 255)
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.char.1.doesn.t.belong.in.this.type3.font", (int)c));
+        if (c == 0 || c > 255) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("the.char.1.doesn.t.belong.in.this.type3.font", (int) c));
+        }
         usedSlot[c] = true;
         Integer ck = (int) c;
         Type3Glyph glyph = char2glyph.get(ck);
-        if (glyph != null)
+        if (glyph != null) {
             return glyph;
-        widths3.put(c, (int)wx);
+        }
+        widths3.put(c, (int) wx);
         if (!colorized) {
             if (Float.isNaN(this.llx)) {
                 this.llx = llx;
                 this.lly = lly;
                 this.urx = urx;
                 this.ury = ury;
-            }
-            else {
+            } else {
                 this.llx = Math.min(this.llx, llx);
                 this.lly = Math.min(this.lly, lly);
                 this.urx = Math.max(this.urx, urx);
@@ -151,73 +153,80 @@ public PdfContentByte defineGlyph(char c, float wx, float llx, float lly, float
         char2glyph.put(ck, glyph);
         return glyph;
     }
-    
+
     public String[][] getFamilyFontName() {
         return getFullFontName();
     }
-    
+
     public float getFontDescriptor(int key, float fontSize) {
         return 0;
     }
-    
+
     public String[][] getFullFontName() {
         return new String[][]{{"", "", "", ""}};
     }
-    
+
     /**
      * @since 2.0.8
-     */    
+     */
     public String[][] getAllNameEntries() {
         return new String[][]{{"4", "", "", "", ""}};
     }
-    
+
     public int getKerning(int char1, int char2) {
         return 0;
     }
-    
+
     public String getPostscriptFontName() {
         return "";
     }
-    
+
+    public void setPostscriptFontName(String name) {
+    }
+
     protected int[] getRawCharBBox(int c, String name) {
         return null;
     }
-    
+
     int getRawWidth(int c, String name) {
         return 0;
     }
-    
+
     public boolean hasKernPairs() {
         return false;
     }
-    
+
     public boolean setKerning(int char1, int char2, int kern) {
         return false;
     }
-    
-    public void setPostscriptFontName(String name) {
-    }
-    
-    void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) throws com.lowagie.text.DocumentException, java.io.IOException {
-        if (this.writer != writer)
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("type3.font.used.with.the.wrong.pdfwriter"));
-        
+
+    void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params)
+            throws com.lowagie.text.DocumentException, java.io.IOException {
+        if (this.writer != writer) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("type3.font.used.with.the.wrong.pdfwriter"));
+        }
+
         // Get first & lastchar ...
         int firstChar = 0;
-        while( firstChar < usedSlot.length && !usedSlot[firstChar] ) firstChar++;
-        
-        if ( firstChar == usedSlot.length ) {
+        while (firstChar < usedSlot.length && !usedSlot[firstChar]) {
+            firstChar++;
+        }
+
+        if (firstChar == usedSlot.length) {
             throw new DocumentException(MessageLocalization.getComposedMessage("no.glyphs.defined.for.type3.font"));
         }
         int lastChar = usedSlot.length - 1;
-        while( lastChar >= firstChar && !usedSlot[lastChar] ) lastChar--;
-        
+        while (lastChar >= firstChar && !usedSlot[lastChar]) {
+            lastChar--;
+        }
+
         int[] widths = new int[lastChar - firstChar + 1];
         int[] invOrd = new int[lastChar - firstChar + 1];
-        
+
         int invOrdIndx = 0, w = 0;
-        for( int u = firstChar; u<=lastChar; u++, w++ ) {
-            if ( usedSlot[u] ) {
+        for (int u = firstChar; u <= lastChar; u++, w++) {
+            if (usedSlot[u]) {
                 invOrd[invOrdIndx++] = u;
                 widths[w] = widths3.get(u);
             }
@@ -234,8 +243,9 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
             ++last;
             int c2 = invOrd[k];
             String s = GlyphList.unicodeToName(c2);
-            if (s == null)
+            if (s == null) {
                 s = "a" + c2;
+            }
             PdfName n = new PdfName(s);
             diffs.add(n);
             Type3Glyph glyph = char2glyph.get(c2);
@@ -246,10 +256,11 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
         }
         PdfDictionary font = new PdfDictionary(PdfName.FONT);
         font.put(PdfName.SUBTYPE, PdfName.TYPE3);
-        if (colorized)
+        if (colorized) {
             font.put(PdfName.FONTBBOX, new PdfRectangle(0, 0, 0, 0));
-        else
+        } else {
             font.put(PdfName.FONTBBOX, new PdfRectangle(llx, lly, urx, ury));
+        }
         font.put(PdfName.FONTMATRIX, new PdfArray(new float[]{0.001f, 0, 0, 0.001f, 0, 0}));
         font.put(PdfName.CHARPROCS, writer.addToBody(charprocs).getIndirectReference());
         PdfDictionary encoding = new PdfDictionary();
@@ -258,59 +269,69 @@ void writeFont(PdfWriter writer, PdfIndirectReference ref, Object[] params) thro
         font.put(PdfName.FIRSTCHAR, new PdfNumber(firstChar));
         font.put(PdfName.LASTCHAR, new PdfNumber(lastChar));
         font.put(PdfName.WIDTHS, writer.addToBody(new PdfArray(widths)).getIndirectReference());
-        if (pageResources.hasResources())
+        if (pageResources.hasResources()) {
             font.put(PdfName.RESOURCES, writer.addToBody(pageResources.getResources()).getIndirectReference());
+        }
         writer.addToBody(font, ref);
     }
-    
+
     /**
      * Always returns null, because you can't get the FontStream of a Type3 font.
-        * @return    null
-     * @since    2.1.3
+     *
+     * @return null
+     * @since 2.1.3
      */
     public PdfStream getFullFontStream() {
         return null;
     }
-    
-    
+
+
     byte[] convertToBytes(String text) {
         char[] cc = text.toCharArray();
         byte[] b = new byte[cc.length];
         int p = 0;
         for (char c : cc) {
-            if (charExists(c))
+            if (charExists(c)) {
                 b[p++] = (byte) c;
+            }
         }
-        if (b.length == p)
+        if (b.length == p) {
             return b;
+        }
         byte[] b2 = new byte[p];
         System.arraycopy(b, 0, b2, 0, p);
         return b2;
     }
-    
+
     byte[] convertToBytes(int char1) {
-        if (charExists(char1))
-            return new byte[]{(byte)char1};
-        else return new byte[0];
+        if (charExists(char1)) {
+            return new byte[]{(byte) char1};
+        } else {
+            return new byte[0];
+        }
     }
-    
+
     public int getWidth(int char1) {
-        if (!widths3.containsKey(char1))
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.char.1.is.not.defined.in.a.type3.font", char1));
+        if (!widths3.containsKey(char1)) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("the.char.1.is.not.defined.in.a.type3.font", char1));
+        }
         return widths3.get(char1);
     }
-    
+
     public int getWidth(String text) {
         char[] c = text.toCharArray();
         int total = 0;
-        for (char c1 : c) total += getWidth(c1);
+        for (char c1 : c) {
+            total += getWidth(c1);
+        }
         return total;
     }
-    
+
     public int[] getCharBBox(int c) {
         return null;
     }
-    
+
     public boolean charExists(int c) {
         if (c > 0 && c < 256) {
             return usedSlot[c];
@@ -318,9 +339,9 @@ public boolean charExists(int c) {
             return false;
         }
     }
-    
+
     public boolean setCharAdvance(int c, int advance) {
         return false;
     }
-    
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/Type3Glyph.java b/openpdf/src/main/java/com/lowagie/text/pdf/Type3Glyph.java
index db526f678..a8d86b821 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/Type3Glyph.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/Type3Glyph.java
@@ -46,9 +46,11 @@
  */
 
 package com.lowagie.text.pdf;
+
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.error_messages.MessageLocalization;
+
 /**
  * The content where Type3 glyphs are written to.
  */
@@ -56,33 +58,37 @@ public final class Type3Glyph extends PdfContentByte {
 
     private PageResources pageResources;
     private boolean colorized;
-    
+
     private Type3Glyph() {
         super(null);
     }
-    
-    Type3Glyph(PdfWriter writer, PageResources pageResources, float wx, float llx, float lly, float urx, float ury, boolean colorized) {
+
+    Type3Glyph(PdfWriter writer, PageResources pageResources, float wx, float llx, float lly, float urx, float ury,
+            boolean colorized) {
         super(writer);
         this.pageResources = pageResources;
         this.colorized = colorized;
         if (colorized) {
             content.append(wx).append(" 0 d0\n");
-        }
-        else {
-            content.append(wx).append(" 0 ").append(llx).append(' ').append(lly).append(' ').append(urx).append(' ').append(ury).append(" d1\n");
+        } else {
+            content.append(wx).append(" 0 ").append(llx).append(' ').append(lly).append(' ').append(urx).append(' ')
+                    .append(ury).append(" d1\n");
         }
     }
-    
+
     PageResources getPageResources() {
         return pageResources;
     }
 
-    public void addImage(Image image, float a, float b, float c, float d, float e, float f, boolean inlineImage) throws DocumentException {
-        if (!colorized && (!image.isMask() || !(image.getBpc() == 1 || image.getBpc() > 0xff)))
-            throw new DocumentException(MessageLocalization.getComposedMessage("not.colorized.typed3.fonts.only.accept.mask.images"));
+    public void addImage(Image image, float a, float b, float c, float d, float e, float f, boolean inlineImage)
+            throws DocumentException {
+        if (!colorized && (!image.isMask() || !(image.getBpc() == 1 || image.getBpc() > 0xff))) {
+            throw new DocumentException(
+                    MessageLocalization.getComposedMessage("not.colorized.typed3.fonts.only.accept.mask.images"));
+        }
         super.addImage(image, a, b, c, d, e, f, inlineImage);
     }
-    
+
     public PdfContentByte getDuplicate() {
         Type3Glyph dup = new Type3Glyph();
         dup.writer = writer;
@@ -91,5 +97,5 @@ public PdfContentByte getDuplicate() {
         dup.colorized = colorized;
         return dup;
     }
-    
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/UnembedFontPdfSmartCopy.java b/openpdf/src/main/java/com/lowagie/text/pdf/UnembedFontPdfSmartCopy.java
index 71639b04c..4e68a471b 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/UnembedFontPdfSmartCopy.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/UnembedFontPdfSmartCopy.java
@@ -1,23 +1,23 @@
 package com.lowagie.text.pdf;
 
-import java.io.IOException;
-import java.io.OutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
+import java.io.IOException;
+import java.io.OutputStream;
 
 /**
- * Makes a copy of a PDF, unembedding all embedded fonts. All font headers and descriptors are preserved and only the font file is removed.
+ * Makes a copy of a PDF, unembedding all embedded fonts. All font headers and descriptors are preserved and only the
+ * font file is removed.
  */
 public class UnembedFontPdfSmartCopy extends PdfSmartCopy {
-    
+
     public UnembedFontPdfSmartCopy(Document document, OutputStream os)
             throws DocumentException {
         super(document, os);
     }
 
     protected PdfDictionary copyDictionary(PdfDictionary in)
-        throws IOException, BadPdfFormatException {
+            throws IOException, BadPdfFormatException {
 
         PdfDictionary out = new PdfDictionary();
         PdfObject type = PdfReader.getPdfObjectRelease(in.get(PdfName.TYPE));
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/VerticalText.java b/openpdf/src/main/java/com/lowagie/text/pdf/VerticalText.java
index 3a41d0745..f9bb5d8f0 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/VerticalText.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/VerticalText.java
@@ -46,77 +46,98 @@
  * https://github.com/LibrePDF/OpenPDF
  */
 package com.lowagie.text.pdf;
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import com.lowagie.text.error_messages.MessageLocalization;
 
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Element;
 import com.lowagie.text.Phrase;
+import com.lowagie.text.error_messages.MessageLocalization;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Iterator;
 
-/** Writes text vertically. Note that the naming is done according
- * to horizontal text although it refers to vertical text.
- * A line with the alignment Element.LEFT_ALIGN will actually
- * be top aligned.
+/**
+ * Writes text vertically. Note that the naming is done according to horizontal text although it refers to vertical
+ * text. A line with the alignment Element.LEFT_ALIGN will actually be top aligned.
  */
 public class VerticalText {
 
-/** Signals that there are no more text available. */    
+    /**
+     * Signals that there are no more text available.
+     */
     public static final int NO_MORE_TEXT = 1;
-    
-/** Signals that there is no more column. */    
+
+    /**
+     * Signals that there is no more column.
+     */
     public static final int NO_MORE_COLUMN = 2;
 
-/** The chunks that form the text. */    
+    /**
+     * The chunks that form the text.
+     */
     protected ArrayList chunks = new ArrayList<>();
 
-    /** The PdfContent where the text will be written to. */    
+    /**
+     * The PdfContent where the text will be written to.
+     */
     protected PdfContentByte text;
-    
-    /** The column alignment. Default is left alignment. */
+
+    /**
+     * The column alignment. Default is left alignment.
+     */
     protected int alignment = Element.ALIGN_LEFT;
 
-    /** Marks the chunks to be eliminated when the line is written. */
+    /**
+     * Marks the chunks to be eliminated when the line is written.
+     */
     protected int currentChunkMarker = -1;
-    
-    /** The chunk created by the splitting. */
+
+    /**
+     * The chunk created by the splitting.
+     */
     protected PdfChunk currentStandbyChunk;
-    
-    /** The chunk created by the splitting. */
+
+    /**
+     * The chunk created by the splitting.
+     */
     protected String splittedChunkText;
 
-    /** The leading
-     */    
+    /**
+     * The leading
+     */
     protected float leading;
-    
-    /** The X coordinate.
-     */    
+
+    /**
+     * The X coordinate.
+     */
     protected float startX;
-    
-    /** The Y coordinate.
-     */    
+
+    /**
+     * The Y coordinate.
+     */
     protected float startY;
-    
-    /** The maximum number of vertical lines.
-     */    
+
+    /**
+     * The maximum number of vertical lines.
+     */
     protected int maxLines;
-    
-    /** The height of the text.
-     */    
+
+    /**
+     * The height of the text.
+     */
     protected float height;
-    
-    /** Creates new VerticalText
-     * @param text the place where the text will be written to. Can
-     * be a template.
+
+    /**
+     * Creates new VerticalText
+     *
+     * @param text the place where the text will be written to. Can be a template.
      */
     public VerticalText(PdfContentByte text) {
         this.text = text;
     }
-    
+
     /**
      * Adds a Phrase to the current text array.
+     *
      * @param phrase the text
      */
     public void addText(Phrase phrase) {
@@ -124,22 +145,25 @@ public void addText(Phrase phrase) {
             chunks.add(new PdfChunk((Chunk) o, null));
         }
     }
-    
+
     /**
      * Adds a Chunk to the current text array.
+     *
      * @param chunk the text
      */
     public void addText(Chunk chunk) {
         chunks.add(new PdfChunk(chunk, null));
     }
 
-    /** Sets the layout.
-     * @param startX the top right X line position
-     * @param startY the top right Y line position
-     * @param height the height of the lines
+    /**
+     * Sets the layout.
+     *
+     * @param startX   the top right X line position
+     * @param startY   the top right Y line position
+     * @param height   the height of the lines
      * @param maxLines the maximum number of lines
-     * @param leading the separation between the lines
-     */    
+     * @param leading  the separation between the lines
+     */
     public void setVerticalLayout(float startX, float startY, float height, int maxLines, float leading) {
         this.startX = startX;
         this.startY = startY;
@@ -147,29 +171,35 @@ public void setVerticalLayout(float startX, float startY, float height, int maxL
         this.maxLines = maxLines;
         setLeading(leading);
     }
-    
-    /** Sets the separation between the vertical lines.
-     * @param leading the vertical line separation
-     */    
-    public void setLeading(float leading) {
-        this.leading = leading;
-    }
 
-    /** Gets the separation between the vertical lines.
+    /**
+     * Gets the separation between the vertical lines.
+     *
      * @return the vertical line separation
-     */    
+     */
     public float getLeading() {
         return leading;
     }
-    
+
+    /**
+     * Sets the separation between the vertical lines.
+     *
+     * @param leading the vertical line separation
+     */
+    public void setLeading(float leading) {
+        this.leading = leading;
+    }
+
     /**
      * Creates a line from the chunk array.
+     *
      * @param width the width of the line
      * @return the line or null if no more chunks
      */
     protected PdfLine createLine(float width) {
-        if (chunks.isEmpty())
+        if (chunks.isEmpty()) {
             return null;
+        }
         splittedChunkText = null;
         currentStandbyChunk = null;
         PdfLine line = new PdfLine(0, width, alignment, 0);
@@ -186,13 +216,14 @@ protected PdfLine createLine(float width) {
         }
         return line;
     }
-    
+
     /**
      * Normalizes the list of chunks when the line is accepted.
      */
     protected void shortenChunkArray() {
-        if (currentChunkMarker < 0)
+        if (currentChunkMarker < 0) {
             return;
+        }
         if (currentChunkMarker >= chunks.size()) {
             chunks.clear();
             return;
@@ -207,33 +238,37 @@ protected void shortenChunkArray() {
 
     /**
      * Outputs the lines to the document. It is equivalent to go(false).
-     * @return returns the result of the operation. It can be NO_MORE_TEXT
-     * and/or NO_MORE_COLUMN
+     *
+     * @return returns the result of the operation. It can be NO_MORE_TEXT and/or
+     * NO_MORE_COLUMN
      */
     public int go() {
         return go(false);
     }
-    
+
     /**
      * Outputs the lines to the document. The output can be simulated.
+     *
      * @param simulate true to simulate the writing to the document
-     * @return returns the result of the operation. It can be NO_MORE_TEXT
-     * and/or NO_MORE_COLUMN
+     * @return returns the result of the operation. It can be NO_MORE_TEXT and/or
+     * NO_MORE_COLUMN
      */
     public int go(boolean simulate) {
         boolean dirty = false;
         PdfContentByte graphics = null;
         if (text != null) {
             graphics = text.getDuplicate();
+        } else if (!simulate) {
+            throw new NullPointerException(MessageLocalization.getComposedMessage(
+                    "verticaltext.go.with.simulate.eq.eq.false.and.text.eq.eq.null"));
         }
-        else if (!simulate)
-            throw new NullPointerException(MessageLocalization.getComposedMessage("verticaltext.go.with.simulate.eq.eq.false.and.text.eq.eq.null"));
         int status = 0;
-        for (;;) {
+        for (; ; ) {
             if (maxLines <= 0) {
                 status = NO_MORE_COLUMN;
-                if (chunks.isEmpty())
+                if (chunks.isEmpty()) {
                     status |= NO_MORE_TEXT;
+                }
                 break;
             }
             if (chunks.isEmpty()) {
@@ -259,92 +294,109 @@ else if (!simulate)
         }
         return status;
     }
-    
+
     void writeLine(PdfLine line, PdfContentByte text, PdfContentByte graphics) {
         PdfFont currentFont = null;
         PdfChunk chunk;
         for (Iterator j = line.iterator(); j.hasNext(); ) {
             chunk = (PdfChunk) j.next();
-            
+
             if (chunk.font().compareTo(currentFont) != 0) {
                 currentFont = chunk.font();
                 text.setFontAndSize(currentFont.getFont(), currentFont.size());
             }
             Color color = chunk.color();
-            if (color != null)
+            if (color != null) {
                 text.setColorFill(color);
+            }
             text.showText(chunk.toString());
-            if (color != null)
+            if (color != null) {
                 text.resetRGBColorFill();
+            }
         }
     }
-    
-    /** Sets the new text origin.
+
+    /**
+     * Sets the new text origin.
+     *
      * @param startX the X coordinate
      * @param startY the Y coordinate
-     */    
+     */
     public void setOrigin(float startX, float startY) {
         this.startX = startX;
         this.startY = startY;
     }
-    
-    /** Gets the X coordinate where the next line will be written. This value will change
-     * after each call to go().
-     * @return  the X coordinate
-     */    
+
+    /**
+     * Gets the X coordinate where the next line will be written. This value will change after each call to
+     * go().
+     *
+     * @return the X coordinate
+     */
     public float getOriginX() {
         return startX;
     }
 
-    /** Gets the Y coordinate where the next line will be written.
-     * @return  the Y coordinate
-     */    
+    /**
+     * Gets the Y coordinate where the next line will be written.
+     *
+     * @return the Y coordinate
+     */
     public float getOriginY() {
         return startY;
     }
-    
-    /** Gets the maximum number of available lines. This value will change
-     * after each call to go().
+
+    /**
+     * Gets the maximum number of available lines. This value will change after each call to go().
+     *
      * @return Value of property maxLines.
      */
     public int getMaxLines() {
         return maxLines;
     }
-    
-    /** Sets the maximum number of lines.
+
+    /**
+     * Sets the maximum number of lines.
+     *
      * @param maxLines the maximum number of lines
      */
     public void setMaxLines(int maxLines) {
         this.maxLines = maxLines;
     }
-    
-    /** Gets the height of the line
+
+    /**
+     * Gets the height of the line
+     *
      * @return the height
      */
     public float getHeight() {
         return height;
     }
-    
-    /** Sets the height of the line
+
+    /**
+     * Sets the height of the line
+     *
      * @param height the new height
      */
     public void setHeight(float height) {
         this.height = height;
     }
-    
-    /**
-     * Sets the alignment.
-     * @param alignment the alignment
-     */
-    public void setAlignment(int alignment) {
-        this.alignment = alignment;
-    }
-    
+
     /**
      * Gets the alignment.
+     *
      * @return the alignment
      */
     public int getAlignment() {
         return alignment;
     }
+
+    /**
+     * Sets the alignment.
+     *
+     * @param alignment the alignment
+     */
+    public void setAlignment(int alignment) {
+        this.alignment = alignment;
+    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/XfaForm.java b/openpdf/src/main/java/com/lowagie/text/pdf/XfaForm.java
index 6708bfb9d..08b67d498 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/XfaForm.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/XfaForm.java
@@ -74,10 +74,12 @@
 
 /**
  * Processes XFA forms.
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class XfaForm {
 
+    public static final String XFA_DATA_SCHEMA = "http://www.xfa.org/schema/xfa-data/1.0/";
     private Xml2SomTemplate templateSom;
     private Node templateNode;
     private Xml2SomDatasets datasetsSom;
@@ -87,36 +89,21 @@ public class XfaForm {
     private boolean xfaPresent;
     private org.w3c.dom.Document domDocument;
     private boolean changed;
-    public static final String XFA_DATA_SCHEMA = "http://www.xfa.org/schema/xfa-data/1.0/";
-    
+
     /**
      * An empty constructor to build on.
      */
     public XfaForm() {
     }
-    
-    /**
-     * Return the XFA Object, could be an array, could be a Stream.
-     * Returns null f no XFA Object is present.
-     * @param    reader    a PdfReader instance
-     * @return    the XFA object
-     * @since    2.1.3
-     */
-    public static PdfObject getXfaObject(PdfReader reader) {
-        PdfDictionary af = (PdfDictionary)PdfReader.getPdfObjectReleaseNullConverting(reader.getCatalog().get(PdfName.ACROFORM));
-        if (af == null) {
-            return null;
-        }
-        return PdfReader.getPdfObjectRelease(af.get(PdfName.XFA));
-    }
-    
+
     /**
-     * A constructor from a PdfReader. It basically does everything
-     * from finding the XFA stream to the XML parsing.
+     * A constructor from a PdfReader. It basically does everything from finding the XFA stream to the XML
+     * parsing.
+     *
      * @param reader the reader
-     * @throws java.io.IOException on error
+     * @throws java.io.IOException                            on error
      * @throws javax.xml.parsers.ParserConfigurationException on error
-     * @throws org.xml.sax.SAXException on error
+     * @throws org.xml.sax.SAXException                       on error
      */
     public XfaForm(PdfReader reader) throws IOException, ParserConfigurationException, SAXException {
         this.reader = reader;
@@ -128,17 +115,16 @@ public XfaForm(PdfReader reader) throws IOException, ParserConfigurationExceptio
         xfaPresent = true;
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         if (xfa.isArray()) {
-            PdfArray ar = (PdfArray)xfa;
+            PdfArray ar = (PdfArray) xfa;
             for (int k = 1; k < ar.size(); k += 2) {
                 PdfObject ob = ar.getDirectObject(k);
                 if (ob instanceof PRStream) {
-                    byte[] b = PdfReader.getStreamBytes((PRStream)ob);
+                    byte[] b = PdfReader.getStreamBytes((PRStream) ob);
                     bout.write(b);
                 }
             }
-        }
-        else if (xfa instanceof PRStream) {
-            byte[] b = PdfReader.getStreamBytes((PRStream)xfa);
+        } else if (xfa instanceof PRStream) {
+            byte[] b = PdfReader.getStreamBytes((PRStream) xfa);
             bout.write(b);
         }
         bout.close();
@@ -146,51 +132,42 @@ else if (xfa instanceof PRStream) {
         fact.setNamespaceAware(true);
         DocumentBuilder db = fact.newDocumentBuilder();
         db.setEntityResolver((publicId, systemId) -> new InputSource(new StringReader("")));
-        domDocument = db.parse(new ByteArrayInputStream(bout.toByteArray()));   
+        domDocument = db.parse(new ByteArrayInputStream(bout.toByteArray()));
         extractNodes();
     }
-    
+
     /**
-     * Extracts the nodes from the domDocument.
-     * @since    2.1.5
+     * Return the XFA Object, could be an array, could be a Stream. Returns null f no XFA Object is present.
+     *
+     * @param reader a PdfReader instance
+     * @return the XFA object
+     * @since 2.1.3
      */
-    private void extractNodes() {
-        Node n = domDocument.getFirstChild();
-        while (n.getChildNodes().getLength() == 0) {
-            n = n.getNextSibling();
-        }
-        n = n.getFirstChild();
-        while (n != null) {
-            if (n.getNodeType() == Node.ELEMENT_NODE) {
-                String s = n.getLocalName();
-                if (s.equals("template")) {
-                    templateNode = n;
-                    templateSom = new Xml2SomTemplate(n);
-                }
-                else if (s.equals("datasets")) {
-                    datasetsNode = n;
-                    datasetsSom = new Xml2SomDatasets(n.getFirstChild());
-                }
-            }
-            n = n.getNextSibling();
+    public static PdfObject getXfaObject(PdfReader reader) {
+        PdfDictionary af = (PdfDictionary) PdfReader.getPdfObjectReleaseNullConverting(
+                reader.getCatalog().get(PdfName.ACROFORM));
+        if (af == null) {
+            return null;
         }
+        return PdfReader.getPdfObjectRelease(af.get(PdfName.XFA));
     }
-    
+
     /**
      * Sets the XFA key from a byte array. The old XFA is erased.
-     * @param form the data
+     *
+     * @param form   the data
      * @param reader the reader
      * @param writer the writer
      * @throws java.io.IOException on error
      */
     public static void setXfa(XfaForm form, PdfReader reader, PdfWriter writer) throws IOException {
-        PdfDictionary af = (PdfDictionary)PdfReader.getPdfObjectRelease(reader.getCatalog().get(PdfName.ACROFORM));
+        PdfDictionary af = (PdfDictionary) PdfReader.getPdfObjectRelease(reader.getCatalog().get(PdfName.ACROFORM));
         if (af == null) {
             return;
         }
         PdfObject xfa = getXfaObject(reader);
         if (xfa.isArray()) {
-            PdfArray ar = (PdfArray)xfa;
+            PdfArray ar = (PdfArray) xfa;
             int t = -1;
             int d = -1;
             for (int k = 0; k < ar.size(); k += 2) {
@@ -222,20 +199,12 @@ public static void setXfa(XfaForm form, PdfReader reader, PdfWriter writer) thro
         af.put(PdfName.XFA, ref);
     }
 
-    /**
-     * Sets the XFA key from the instance data. The old XFA is erased.
-     * @param writer the writer
-     * @throws java.io.IOException on error
-     */
-    public void setXfa(PdfWriter writer) throws IOException {
-        setXfa(this, reader, writer);
-    }
-
     /**
      * Serializes a XML document to a byte array.
+     *
      * @param n the XML document
-     * @throws java.io.IOException on error
      * @return the serialized XML document
+     * @throws java.io.IOException on error
      */
     public static byte[] serializeDoc(Node n) throws IOException {
         XmlDomWriter xw = new XmlDomWriter();
@@ -246,137 +215,186 @@ public static byte[] serializeDoc(Node n) throws IOException {
         fout.close();
         return fout.toByteArray();
     }
-    
+
+    /**
+     * Gets all the text contained in the child nodes of this node.
+     *
+     * @param n the Node
+     * @return the text found or "" if no text was found
+     */
+    public static String getNodeText(Node n) {
+        if (n == null) {
+            return "";
+        }
+        return getNodeText(n, "");
+
+    }
+
+    private static String getNodeText(Node n, String name) {
+        Node n2 = n.getFirstChild();
+        while (n2 != null) {
+            if (n2.getNodeType() == Node.ELEMENT_NODE) {
+                name = getNodeText(n2, name);
+            } else if (n2.getNodeType() == Node.TEXT_NODE) {
+                name += n2.getNodeValue();
+            }
+            n2 = n2.getNextSibling();
+        }
+        return name;
+    }
+
+    /**
+     * Extracts the nodes from the domDocument.
+     *
+     * @since 2.1.5
+     */
+    private void extractNodes() {
+        Node n = domDocument.getFirstChild();
+        while (n.getChildNodes().getLength() == 0) {
+            n = n.getNextSibling();
+        }
+        n = n.getFirstChild();
+        while (n != null) {
+            if (n.getNodeType() == Node.ELEMENT_NODE) {
+                String s = n.getLocalName();
+                if (s.equals("template")) {
+                    templateNode = n;
+                    templateSom = new Xml2SomTemplate(n);
+                } else if (s.equals("datasets")) {
+                    datasetsNode = n;
+                    datasetsSom = new Xml2SomDatasets(n.getFirstChild());
+                }
+            }
+            n = n.getNextSibling();
+        }
+    }
+
+    /**
+     * Sets the XFA key from the instance data. The old XFA is erased.
+     *
+     * @param writer the writer
+     * @throws java.io.IOException on error
+     */
+    public void setXfa(PdfWriter writer) throws IOException {
+        setXfa(this, reader, writer);
+    }
+
     /**
      * Returns true if it is a XFA form.
+     *
      * @return true if it is a XFA form
      */
     public boolean isXfaPresent() {
         return xfaPresent;
     }
 
+    /**
+     * Sets the XFA form flag signaling that this is a valid XFA form.
+     *
+     * @param xfaPresent the XFA form flag signaling that this is a valid XFA form
+     */
+    public void setXfaPresent(boolean xfaPresent) {
+        this.xfaPresent = xfaPresent;
+    }
+
     /**
      * Gets the top level DOM document.
+     *
      * @return the top level DOM document
      */
     public org.w3c.dom.Document getDomDocument() {
         return domDocument;
     }
-    
-    
+
     /**
-     * Finds the complete field name contained in the "classic" forms from a partial
-     * name.
+     * Sets the top DOM document.
+     *
+     * @param domDocument the top DOM document
+     */
+    public void setDomDocument(org.w3c.dom.Document domDocument) {
+        this.domDocument = domDocument;
+        extractNodes();
+    }
+
+    /**
+     * Finds the complete field name contained in the "classic" forms from a partial name.
+     *
      * @param name the complete or partial name
-     * @param af the fields
+     * @param af   the fields
      * @return the complete name or null if not found
      */
     public String findFieldName(String name, AcroFields af) {
         Map items = af.getAllFields();
-        if (items.containsKey(name))
+        if (items.containsKey(name)) {
             return name;
+        }
         if (acroFieldsSom == null) {
-            if (items.isEmpty() && xfaPresent)
+            if (items.isEmpty() && xfaPresent) {
                 acroFieldsSom = new AcroFieldsSearch(datasetsSom.getNodesByName().keySet());
-            else
+            } else {
                 acroFieldsSom = new AcroFieldsSearch(items.keySet());
+            }
         }
-        if (acroFieldsSom.getLongByShortNames().containsKey(name))
+        if (acroFieldsSom.getLongByShortNames().containsKey(name)) {
             return acroFieldsSom.getLongByShortNames().get(name);
+        }
         return acroFieldsSom.inverseSearch(Xml2Som.splitParts(name));
     }
-    
+
     /**
-     * Finds the complete SOM name contained in the datasets section from a 
-     * possibly partial name.
+     * Finds the complete SOM name contained in the datasets section from a possibly partial name.
+     *
      * @param name the complete or partial name
      * @return the complete name or null if not found
      */
     public String findDatasetsName(String name) {
-        if (datasetsSom.getNodesByName().containsKey(name))
+        if (datasetsSom.getNodesByName().containsKey(name)) {
             return name;
+        }
         return datasetsSom.inverseSearch(Xml2Som.splitParts(name));
     }
 
     /**
-     * Finds the Node contained in the datasets section from a 
-     * possibly partial name.
+     * Finds the Node contained in the datasets section from a possibly partial name.
+     *
      * @param name the complete or partial name
      * @return the Node or null if not found
      */
     public Node findDatasetsNode(String name) {
-        if (name == null)
+        if (name == null) {
             return null;
+        }
         name = findDatasetsName(name);
-        if (name == null)
+        if (name == null) {
             return null;
+        }
         return datasetsSom.getNodesByName().get(name);
     }
 
     /**
-     * Gets all the text contained in the child nodes of this node.
-     * @param n the Node
-     * @return the text found or "" if no text was found
-     */
-    public static String getNodeText(Node n) {
-        if (n == null)
-            return "";
-        return getNodeText(n, "");
-        
-    }
-    
-    private static String getNodeText(Node n, String name) {
-        Node n2 = n.getFirstChild();
-        while (n2 != null) {
-            if (n2.getNodeType() == Node.ELEMENT_NODE) {
-                name = getNodeText(n2, name);
-            }
-            else if (n2.getNodeType() == Node.TEXT_NODE) {
-                name += n2.getNodeValue();
-            }
-            n2 = n2.getNextSibling();
-        }
-        return name;
-    }
-    
-    /**
-     * Sets the text of this node. All the child's node are deleted and a new
-     * child text node is created.
-     * @param n the Node to add the text to
+     * Sets the text of this node. All the child's node are deleted and a new child text node is created.
+     *
+     * @param n    the Node to add the text to
      * @param text the text to add
      */
     public void setNodeText(Node n, String text) {
-        if (n == null)
+        if (n == null) {
             return;
+        }
         Node nc;
         while ((nc = n.getFirstChild()) != null) {
             n.removeChild(nc);
         }
-        if (n.getAttributes().getNamedItemNS(XFA_DATA_SCHEMA, "dataNode") != null)
+        if (n.getAttributes().getNamedItemNS(XFA_DATA_SCHEMA, "dataNode") != null) {
             n.getAttributes().removeNamedItemNS(XFA_DATA_SCHEMA, "dataNode");
+        }
         n.appendChild(domDocument.createTextNode(text));
         changed = true;
     }
-    
-    /**
-     * Sets the XFA form flag signaling that this is a valid XFA form.
-     * @param xfaPresent the XFA form flag signaling that this is a valid XFA form
-     */
-    public void setXfaPresent(boolean xfaPresent) {
-        this.xfaPresent = xfaPresent;
-    }
-
-    /**
-     * Sets the top DOM document.
-     * @param domDocument the top DOM document
-     */
-    public void setDomDocument(org.w3c.dom.Document domDocument) {
-        this.domDocument = domDocument;
-        extractNodes();
-    }
 
     /**
      * Gets the PdfReader used by this instance.
+     *
      * @return the PdfReader used by this instance
      */
     public PdfReader getReader() {
@@ -385,6 +403,7 @@ public PdfReader getReader() {
 
     /**
      * Sets the PdfReader to be used by this instance.
+     *
      * @param reader the PdfReader to be used by this instance
      */
     public void setReader(PdfReader reader) {
@@ -393,6 +412,7 @@ public void setReader(PdfReader reader) {
 
     /**
      * Checks if this XFA form was changed.
+     *
      * @return true if this XFA form was changed
      */
     public boolean isChanged() {
@@ -401,40 +421,139 @@ public boolean isChanged() {
 
     /**
      * Sets the changed status of this XFA instance.
+     *
      * @param changed the changed status of this XFA instance
      */
-    public void setChanged(boolean changed) {
-        this.changed = changed;
+    public void setChanged(boolean changed) {
+        this.changed = changed;
+    }
+
+    /**
+     * Gets the class that contains the template processing section of the XFA.
+     *
+     * @return the class that contains the template processing section of the XFA
+     */
+    public Xml2SomTemplate getTemplateSom() {
+        return templateSom;
+    }
+
+    /**
+     * Sets the class that contains the template processing section of the XFA
+     *
+     * @param templateSom the class that contains the template processing section of the XFA
+     */
+    public void setTemplateSom(Xml2SomTemplate templateSom) {
+        this.templateSom = templateSom;
+    }
+
+    /**
+     * Gets the class that contains the datasets processing section of the XFA.
+     *
+     * @return the class that contains the datasets processing section of the XFA
+     */
+    public Xml2SomDatasets getDatasetsSom() {
+        return datasetsSom;
+    }
+
+    /**
+     * Sets the class that contains the datasets processing section of the XFA.
+     *
+     * @param datasetsSom the class that contains the datasets processing section of the XFA
+     */
+    public void setDatasetsSom(Xml2SomDatasets datasetsSom) {
+        this.datasetsSom = datasetsSom;
+    }
+
+    /**
+     * Gets the class that contains the "classic" fields processing.
+     *
+     * @return the class that contains the "classic" fields processing
+     */
+    public AcroFieldsSearch getAcroFieldsSom() {
+        return acroFieldsSom;
+    }
+
+    /**
+     * Sets the class that contains the "classic" fields processing.
+     *
+     * @param acroFieldsSom the class that contains the "classic" fields processing
+     */
+    public void setAcroFieldsSom(AcroFieldsSearch acroFieldsSom) {
+        this.acroFieldsSom = acroFieldsSom;
+    }
+
+    /**
+     * Gets the Node that corresponds to the datasets part.
+     *
+     * @return the Node that corresponds to the datasets part
+     */
+    public Node getDatasetsNode() {
+        return datasetsNode;
+    }
+
+    public void fillXfaForm(File file) throws ParserConfigurationException, SAXException, IOException {
+        fillXfaForm(new FileInputStream(file));
+    }
+
+    public void fillXfaForm(InputStream is) throws ParserConfigurationException, SAXException, IOException {
+        fillXfaForm(new InputSource(is));
+    }
+
+    public void fillXfaForm(InputSource is) throws ParserConfigurationException, SAXException, IOException {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        db.setEntityResolver((publicId, systemId) -> new InputSource(new StringReader("")));
+        Document newdoc = db.parse(is);
+        fillXfaForm(newdoc.getDocumentElement());
+    }
+
+    /**
+     * Replaces the data under datasets/data.
+     *
+     * @param node node to fill data under
+     * @since iText 5.0.0
+     */
+    public void fillXfaForm(Node node) {
+        Node data = datasetsNode.getFirstChild();
+        NodeList list = data.getChildNodes();
+        if (list.getLength() == 0) {
+            data.appendChild(domDocument.importNode(node, true));
+        } else {
+            data.replaceChild(domDocument.importNode(node, true), data.getFirstChild());
+        }
+        extractNodes();
+        setChanged(true);
     }
-    
+
     /**
-     * A structure to store each part of a SOM name and link it to the next part
-     * beginning from the lower hierarchy.
+     * A structure to store each part of a SOM name and link it to the next part beginning from the lower hierarchy.
      */
     public static class InverseStore {
+
         protected List part = new ArrayList<>();
         protected List follow = new ArrayList<>();
-        
+
         /**
-         * Gets the full name by traversing the hierarchy using only the
-         * index 0.
+         * Gets the full name by traversing the hierarchy using only the index 0.
+         *
          * @return the full name
          */
         public String getDefaultName() {
             InverseStore store = this;
             while (true) {
                 Object obj = store.follow.get(0);
-                if (obj instanceof String)
-                    return (String)obj;
-                store = (InverseStore)obj;
+                if (obj instanceof String) {
+                    return (String) obj;
+                }
+                store = (InverseStore) obj;
             }
         }
-        
+
         /**
-         * Search the current node for a similar name. A similar name starts
-         * with the same name but has a different index. For example, "detail[3]" 
-         * is similar to "detail[9]". The main use is to discard names that
-         * correspond to out of bounds records.
+         * Search the current node for a similar name. A similar name starts with the same name but has a different
+         * index. For example, "detail[3]" is similar to "detail[9]". The main use is to discard names that correspond
+         * to out of bounds records.
+         *
          * @param name the name to search
          * @return true if a similitude was found
          */
@@ -442,44 +561,50 @@ public boolean isSimilar(String name) {
             int idx = name.indexOf('[');
             name = name.substring(0, idx + 1);
             for (String o : part) {
-                if (o.startsWith(name))
+                if (o.startsWith(name)) {
                     return true;
+                }
             }
             return false;
         }
     }
 
     /**
-     * Another stack implementation. The main use is to facilitate
-     * the porting to other languages.
+     * Another stack implementation. The main use is to facilitate the porting to other languages.
      */
     public static class Stack2 extends ArrayList {
+
         private static final long serialVersionUID = -7451476576174095212L;
 
         /**
          * Looks at the object at the top of this stack without removing it from the stack.
+         *
          * @return the object at the top of this stack
          */
         public String peek() {
-            if (size() == 0)
+            if (size() == 0) {
                 throw new EmptyStackException();
+            }
             return get(size() - 1);
         }
-        
+
         /**
          * Removes the object at the top of this stack and returns that object as the value of this function.
-         * @return the object at the top of this stack 
+         *
+         * @return the object at the top of this stack
          */
         public String pop() {
-            if (size() == 0)
+            if (size() == 0) {
                 throw new EmptyStackException();
+            }
             String ret = get(size() - 1);
             remove(size() - 1);
             return ret;
         }
-        
+
         /**
          * Pushes an item onto the top of this stack.
+         *
          * @param item the item to be pushed onto this stack
          * @return the item argument
          */
@@ -487,20 +612,22 @@ public String push(String item) {
             add(item);
             return item;
         }
-        
+
         /**
          * Tests if this stack is empty.
+         *
          * @return true if and only if this stack contains no items; false otherwise
          */
         public boolean empty() {
             return size() == 0;
         }
     }
-    
+
     /**
      * A class for some basic SOM processing.
      */
     public static class Xml2Som {
+
         /**
          * The order the names appear in the XML, depth first.
          */
@@ -524,15 +651,18 @@ public static class Xml2Som {
 
         /**
          * Escapes a SOM string fragment replacing "." with "\.".
+         *
          * @param s the unescaped string
          * @return the escaped string
          */
         public static String escapeSom(String s) {
-            if(s==null)
+            if (s == null) {
                 return "";
+            }
             int idx = s.indexOf('.');
-            if (idx < 0)
+            if (idx < 0) {
                 return s;
+            }
             StringBuilder sb = new StringBuilder();
             int last = 0;
             while (idx >= 0) {
@@ -547,13 +677,15 @@ public static String escapeSom(String s) {
 
         /**
          * Unescapes a SOM string fragment replacing "\." with ".".
+         *
          * @param s the escaped string
          * @return the unescaped string
          */
         public static String unescapeSom(String s) {
             int idx = s.indexOf('\\');
-            if (idx < 0)
+            if (idx < 0) {
                 return s;
+            }
             StringBuilder sb = new StringBuilder();
             int last = 0;
             while (idx >= 0) {
@@ -565,58 +697,41 @@ public static String unescapeSom(String s) {
             return sb.toString();
         }
 
-        /**
-         * Outputs the stack as the sequence of elements separated
-         * by '.'.
-         * @return the stack as the sequence of elements separated by '.'
-         */
-        protected String printStack() {
-            if (stack.empty())
-                return "";
-            StringBuilder s = new StringBuilder();
-            for (String o : stack) s.append('.').append(o);
-            return s.substring(1);
-        }
-        
         /**
          * Gets the name with the #subform removed.
+         *
          * @param s the long name
          * @return the short name
          */
         public static String getShortName(String s) {
             int idx = s.indexOf(".#subform[");
-            if (idx < 0)
+            if (idx < 0) {
                 return s;
+            }
             int last = 0;
             StringBuilder sb = new StringBuilder();
             while (idx >= 0) {
                 sb.append(s, last, idx);
                 idx = s.indexOf("]", idx + 10);
-                if (idx < 0)
+                if (idx < 0) {
                     return sb.toString();
+                }
                 last = idx + 1;
                 idx = s.indexOf(".#subform[", last);
             }
             sb.append(s.substring(last));
             return sb.toString();
         }
-        
-        /**
-         * Adds a SOM name to the search node chain.
-         * @param unstack the SOM name
-         */
-        public void inverseSearchAdd(String unstack) {
-            addSomNameToSearchNodeChain(inverseSearch, stack, unstack);
-        }
 
-        
         /**
          * Adds a SOM name to the search node chain.
+         *
          * @param inverseSearch the start point
-         * @param stack the stack with the separated SOM parts
-         * @param unstack the full name
+         * @param stack         the stack with the separated SOM parts
+         * @param unstack       the full name
          */
-        public static void addSomNameToSearchNodeChain(Map inverseSearch, Stack2 stack, String unstack) {
+        public static void addSomNameToSearchNodeChain(Map inverseSearch, Stack2 stack,
+                String unstack) {
             String last = stack.peek();
             InverseStore store = inverseSearch.get(last);
             if (store == null) {
@@ -631,47 +746,25 @@ public static void addSomNameToSearchNodeChain(Map inverse
                     store.part.add(last);
                     store2 = new InverseStore();
                     store.follow.add(store2);
+                } else {
+                    store2 = (InverseStore) store.follow.get(idx);
                 }
-                else
-                    store2 = (InverseStore)store.follow.get(idx);
                 store = store2;
             }
             store.part.add("");
             store.follow.add(unstack);
         }
 
-        /**
-         * Searches the SOM hierarchy from the bottom.
-         * @param parts the SOM parts
-         * @return the full name or null if not found
-         */
-        public String inverseSearch(List parts) {
-            if (parts.isEmpty())
-                return null;
-            InverseStore store = inverseSearch.get(parts.get(parts.size() - 1));
-            if (store == null)
-                return null;
-            for (int k = parts.size() - 2; k >= 0; --k) {
-                String part = parts.get(k);
-                int idx = store.part.indexOf(part);
-                if (idx < 0) {
-                    if (store.isSimilar(part))
-                        return null;
-                    return store.getDefaultName();
-                }
-                store = (InverseStore)store.follow.get(idx);
-            }
-            return store.getDefaultName();
-        }
-    
         /**
          * Splits a SOM name in the individual parts.
+         *
          * @param name the full SOM name
          * @return the split name
          */
         public static Stack2 splitParts(String name) {
-            while (name.startsWith("."))
+            while (name.startsWith(".")) {
                 name = name.substring(1);
+            }
             Stack2 parts = new Stack2();
             int last = 0;
             int pos = 0;
@@ -680,30 +773,89 @@ public static Stack2 splitParts(String name) {
                 pos = last;
                 while (true) {
                     pos = name.indexOf('.', pos);
-                    if (pos < 0)
+                    if (pos < 0) {
                         break;
-                    if (name.charAt(pos - 1) == '\\')
+                    }
+                    if (name.charAt(pos - 1) == '\\') {
                         ++pos;
-                    else
+                    } else {
                         break;
+                    }
                 }
-                if (pos < 0)
+                if (pos < 0) {
                     break;
+                }
                 part = name.substring(last, pos);
-                if (!part.endsWith("]"))
+                if (!part.endsWith("]")) {
                     part += "[0]";
+                }
                 parts.add(part);
                 last = pos + 1;
             }
             part = name.substring(last);
-            if (!part.endsWith("]"))
+            if (!part.endsWith("]")) {
                 part += "[0]";
+            }
             parts.add(part);
             return parts;
         }
 
+        /**
+         * Outputs the stack as the sequence of elements separated by '.'.
+         *
+         * @return the stack as the sequence of elements separated by '.'
+         */
+        protected String printStack() {
+            if (stack.empty()) {
+                return "";
+            }
+            StringBuilder s = new StringBuilder();
+            for (String o : stack) {
+                s.append('.').append(o);
+            }
+            return s.substring(1);
+        }
+
+        /**
+         * Adds a SOM name to the search node chain.
+         *
+         * @param unstack the SOM name
+         */
+        public void inverseSearchAdd(String unstack) {
+            addSomNameToSearchNodeChain(inverseSearch, stack, unstack);
+        }
+
+        /**
+         * Searches the SOM hierarchy from the bottom.
+         *
+         * @param parts the SOM parts
+         * @return the full name or null if not found
+         */
+        public String inverseSearch(List parts) {
+            if (parts.isEmpty()) {
+                return null;
+            }
+            InverseStore store = inverseSearch.get(parts.get(parts.size() - 1));
+            if (store == null) {
+                return null;
+            }
+            for (int k = parts.size() - 2; k >= 0; --k) {
+                String part = parts.get(k);
+                int idx = store.part.indexOf(part);
+                if (idx < 0) {
+                    if (store.isSimilar(part)) {
+                        return null;
+                    }
+                    return store.getDefaultName();
+                }
+                store = (InverseStore) store.follow.get(idx);
+            }
+            return store.getDefaultName();
+        }
+
         /**
          * Gets the order the names appear in the XML, depth first.
+         *
          * @return the order the names appear in the XML, depth first
          */
         public List getNamesOrder() {
@@ -712,6 +864,7 @@ public List getNamesOrder() {
 
         /**
          * Sets the order the names appear in the XML, depth first
+         *
          * @param order the order the names appear in the XML, depth first
          */
         public void setNamesOrder(List order) {
@@ -720,6 +873,7 @@ public void setNamesOrder(List order) {
 
         /**
          * Gets the mapping of full names to nodes.
+         *
          * @return the mapping of full names to nodes
          */
         public Map getNodesByName() {
@@ -728,6 +882,7 @@ public Map getNodesByName() {
 
         /**
          * Sets the mapping of full names to nodes.
+         *
          * @param name2Node the mapping of full names to nodes
          */
         public void setNodesByName(Map name2Node) {
@@ -736,6 +891,7 @@ public void setNodesByName(Map name2Node) {
 
         /**
          * Gets the data to do a search from the bottom hierarchy.
+         *
          * @return the data to do a search from the bottom hierarchy
          */
         public Map getInverseSearchData() {
@@ -744,20 +900,23 @@ public Map getInverseSearchData() {
 
         /**
          * Sets the data to do a search from the bottom hierarchy.
+         *
          * @param inverseSearch the data to do a search from the bottom hierarchy
          */
         public void setInverseSearchData(Map inverseSearch) {
             this.inverseSearch = inverseSearch;
         }
     }
-    
+
     /**
      * Processes the datasets section in the XFA form.
      */
     public static class Xml2SomDatasets extends Xml2Som {
+
         /**
-         * Creates a new instance from the datasets node. This expects
-         * not the datasets but the data node that comes below.
+         * Creates a new instance from the datasets node. This expects not the datasets but the data node that comes
+         * below.
+         *
          * @param n the datasets node
          */
         public Xml2SomDatasets(Node n) {
@@ -769,9 +928,33 @@ public Xml2SomDatasets(Node n) {
             processDatasetsInternal(n);
         }
 
+        private static boolean hasChildren(Node n) {
+            Node dataNodeN = n.getAttributes().getNamedItemNS(XFA_DATA_SCHEMA, "dataNode");
+            if (dataNodeN != null) {
+                String dataNode = dataNodeN.getNodeValue();
+                if ("dataGroup".equals(dataNode)) {
+                    return true;
+                } else if ("dataValue".equals(dataNode)) {
+                    return false;
+                }
+            }
+            if (!n.hasChildNodes()) {
+                return false;
+            }
+            Node n2 = n.getFirstChild();
+            while (n2 != null) {
+                if (n2.getNodeType() == Node.ELEMENT_NODE) {
+                    return true;
+                }
+                n2 = n2.getNextSibling();
+            }
+            return false;
+        }
+
         /**
          * Inserts a new Node that will match the short name.
-         * @param n the datasets top Node
+         *
+         * @param n         the datasets top Node
          * @param shortName the short name
          * @return the new Node of the inserted name
          */
@@ -791,8 +974,9 @@ public Node insertNode(Node n, String shortName) {
                         String s = escapeSom(n2.getLocalName());
                         if (s.equals(name)) {
                             ++found;
-                            if (found == idx)
+                            if (found == idx) {
                                 break;
+                            }
                         }
                     }
                 }
@@ -810,27 +994,6 @@ public Node insertNode(Node n, String shortName) {
             order.add(shortName);
             return n2;
         }
-        
-        private static boolean hasChildren(Node n) {
-            Node dataNodeN = n.getAttributes().getNamedItemNS(XFA_DATA_SCHEMA, "dataNode");
-            if (dataNodeN != null) {
-                String dataNode = dataNodeN.getNodeValue();
-                if ("dataGroup".equals(dataNode))
-                    return true;
-                else if ("dataValue".equals(dataNode))
-                    return false;
-            }
-            if (!n.hasChildNodes())
-                return false;
-            Node n2 = n.getFirstChild();
-            while (n2 != null) {
-                if (n2.getNodeType() == Node.ELEMENT_NODE) {
-                    return true;
-                }
-                n2 = n2.getNextSibling();
-            }
-            return false;
-        }
 
         private void processDatasetsInternal(Node n) {
             Map ss = new HashMap<>();
@@ -839,17 +1002,17 @@ private void processDatasetsInternal(Node n) {
                 if (n2.getNodeType() == Node.ELEMENT_NODE) {
                     String s = escapeSom(n2.getLocalName());
                     Integer i = ss.get(s);
-                    if (i == null)
+                    if (i == null) {
                         i = 0;
-                    else
+                    } else {
                         i = i + 1;
+                    }
                     ss.put(s, i);
                     if (hasChildren(n2)) {
                         stack.push(s + "[" + i.toString() + "]");
                         processDatasetsInternal(n2);
                         stack.pop();
-                    }
-                    else {
+                    } else {
                         stack.push(s + "[" + i.toString() + "]");
                         String unstack = printStack();
                         order.add(unstack);
@@ -867,10 +1030,12 @@ private void processDatasetsInternal(Node n) {
      * A class to process "classic" fields.
      */
     public static class AcroFieldsSearch extends Xml2Som {
+
         private Map acroShort2LongName;
 
         /**
          * Creates a new instance from a Collection with the full names.
+         *
          * @param items the Collection
          */
         public AcroFieldsSearch(Collection items) {
@@ -884,8 +1049,8 @@ public AcroFieldsSearch(Collection items) {
         }
 
         /**
-         * Gets the mapping from short names to long names. A long
-         * name may contain the #subform name part.
+         * Gets the mapping from short names to long names. A long name may contain the #subform name part.
+         *
          * @return the mapping from short names to long names
          */
         public Map getLongByShortNames() {
@@ -893,8 +1058,8 @@ public Map getLongByShortNames() {
         }
 
         /**
-         * Sets the mapping from short names to long names. A long
-         * name may contain the #subform name part.
+         * Sets the mapping from short names to long names. A long name may contain the #subform name part.
+         *
          * @param acroShort2LongName the mapping from short names to long names
          */
         public void setLongByShortNames(Map acroShort2LongName) {
@@ -906,11 +1071,13 @@ public void setLongByShortNames(Map acroShort2LongName) {
      * Processes the template section in the XFA form.
      */
     public static class Xml2SomTemplate extends Xml2Som {
+
         private boolean dynamicForm;
         private int templateLevel;
-        
+
         /**
          * Creates a new instance from the datasets node.
+         *
          * @param n the template node
          */
         public Xml2SomTemplate(Node n) {
@@ -925,15 +1092,18 @@ public Xml2SomTemplate(Node n) {
 
         /**
          * Gets the field type as described in the template section of the XFA.
+         *
          * @param s the exact template name
          * @return the field type or null if not found
          */
         public String getFieldType(String s) {
             Node n = name2Node.get(s);
-            if (n == null)
+            if (n == null) {
                 return null;
-            if (n.getLocalName().equals("exclGroup"))
+            }
+            if (n.getLocalName().equals("exclGroup")) {
                 return "exclGroup";
+            }
             Node ui = n.getFirstChild();
             while (ui != null) {
                 if (ui.getNodeType() == Node.ELEMENT_NODE && ui.getLocalName().equals("ui")) {
@@ -941,11 +1111,13 @@ public String getFieldType(String s) {
                 }
                 ui = ui.getNextSibling();
             }
-            if (ui == null)
+            if (ui == null) {
                 return null;
+            }
             Node type = ui.getFirstChild();
             while (type != null) {
-                if (type.getNodeType() == Node.ELEMENT_NODE && !(type.getLocalName().equals("extras") && type.getLocalName().equals("picture"))) {
+                if (type.getNodeType() == Node.ELEMENT_NODE && !(type.getLocalName().equals("extras")
+                        && type.getLocalName().equals("picture"))) {
                     return type.getLocalName();
                 }
                 type = type.getNextSibling();
@@ -954,8 +1126,9 @@ public String getFieldType(String s) {
         }
 
         private void processTemplate(Node n, Map ff) {
-            if (ff == null)
+            if (ff == null) {
                 ff = new HashMap<>();
+            }
             Map ss = new HashMap<>();
             Node n2 = n.getFirstChild();
             while (n2 != null) {
@@ -973,33 +1146,34 @@ private void processTemplate(Node n, Map ff) {
                         if (annon) {
                             i = anform;
                             ++anform;
-                        }
-                        else {
+                        } else {
                             i = ss.get(nn);
-                            if (i == null)
+                            if (i == null) {
                                 i = 0;
-                            else
+                            } else {
                                 i = i + 1;
+                            }
                             ss.put(nn, i);
                         }
                         stack.push(nn + "[" + i.toString() + "]");
                         ++templateLevel;
-                        if (annon)
+                        if (annon) {
                             processTemplate(n2, ff);
-                        else
+                        } else {
                             processTemplate(n2, null);
+                        }
                         --templateLevel;
                         stack.pop();
-                    }
-                    else if ("field".equals(s) || "exclGroup".equals(s)) {
+                    } else if ("field".equals(s) || "exclGroup".equals(s)) {
                         Node name = n2.getAttributes().getNamedItem("name");
                         if (name != null) {
                             String nn = escapeSom(name.getNodeValue());
                             Integer i = ff.get(nn);
-                            if (i == null)
+                            if (i == null) {
                                 i = 0;
-                            else
+                            } else {
                                 i = i + 1;
+                            }
                             ff.put(nn, i);
                             stack.push(nn + "[" + i.toString() + "]");
                             String unstack = printStack();
@@ -1008,22 +1182,34 @@ else if ("field".equals(s) || "exclGroup".equals(s)) {
                             name2Node.put(unstack, n2);
                             stack.pop();
                         }
-                    }
-                    else if (!dynamicForm && templateLevel > 0 && "occur".equals(s)) {
+                    } else if (!dynamicForm && templateLevel > 0 && "occur".equals(s)) {
                         int initial = 1;
                         int min = 1;
                         int max = 1;
                         Node a = n2.getAttributes().getNamedItem("initial");
-                        if (a != null)
-                            try{initial = Integer.parseInt(a.getNodeValue().trim());}catch(Exception e){}
+                        if (a != null) {
+                            try {
+                                initial = Integer.parseInt(a.getNodeValue().trim());
+                            } catch (Exception e) {
+                            }
+                        }
                         a = n2.getAttributes().getNamedItem("min");
-                        if (a != null)
-                            try{min = Integer.parseInt(a.getNodeValue().trim());}catch(Exception e){}
+                        if (a != null) {
+                            try {
+                                min = Integer.parseInt(a.getNodeValue().trim());
+                            } catch (Exception e) {
+                            }
+                        }
                         a = n2.getAttributes().getNamedItem("max");
-                        if (a != null)
-                            try{max = Integer.parseInt(a.getNodeValue().trim());}catch(Exception e){}
-                        if (initial != min || min != max)
+                        if (a != null) {
+                            try {
+                                max = Integer.parseInt(a.getNodeValue().trim());
+                            } catch (Exception e) {
+                            }
+                        }
+                        if (initial != min || min != max) {
                             dynamicForm = true;
+                        }
                     }
                 }
                 n2 = n2.getNextSibling();
@@ -1033,6 +1219,7 @@ else if (!dynamicForm && templateLevel > 0 && "occur".equals(s)) {
         /**
          * true if it's a dynamic form; false
          * if it's a static form.
+         *
          * @return true if it's a dynamic form; false
          * if it's a static form
          */
@@ -1042,102 +1229,11 @@ public boolean isDynamicForm() {
 
         /**
          * Sets the dynamic form flag. It doesn't change the template.
+         *
          * @param dynamicForm the dynamic form flag
          */
         public void setDynamicForm(boolean dynamicForm) {
             this.dynamicForm = dynamicForm;
         }
     }
-
-    /**
-     * Gets the class that contains the template processing section of the XFA.
-     * @return the class that contains the template processing section of the XFA
-     */
-    public Xml2SomTemplate getTemplateSom() {
-        return templateSom;
-    }
-
-    /**
-     * Sets the class that contains the template processing section of the XFA
-     * @param templateSom the class that contains the template processing section of the XFA
-     */
-    public void setTemplateSom(Xml2SomTemplate templateSom) {
-        this.templateSom = templateSom;
-    }
-
-    /**
-     * Gets the class that contains the datasets processing section of the XFA.
-     * @return the class that contains the datasets processing section of the XFA
-     */
-    public Xml2SomDatasets getDatasetsSom() {
-        return datasetsSom;
-    }
-
-    /**
-     * Sets the class that contains the datasets processing section of the XFA.
-     * @param datasetsSom the class that contains the datasets processing section of the XFA
-     */
-    public void setDatasetsSom(Xml2SomDatasets datasetsSom) {
-        this.datasetsSom = datasetsSom;
-    }
-
-    /**
-     * Gets the class that contains the "classic" fields processing.
-     * @return the class that contains the "classic" fields processing
-     */
-    public AcroFieldsSearch getAcroFieldsSom() {
-        return acroFieldsSom;
-    }
-
-    /**
-     * Sets the class that contains the "classic" fields processing.
-     * @param acroFieldsSom the class that contains the "classic" fields processing
-     */
-    public void setAcroFieldsSom(AcroFieldsSearch acroFieldsSom) {
-        this.acroFieldsSom = acroFieldsSom;
-    }
-    
-    /**
-     * Gets the Node that corresponds to the datasets part.
-     * @return the Node that corresponds to the datasets part
-     */
-    public Node getDatasetsNode() {
-        return datasetsNode;
-    }
-    
-    public void fillXfaForm(File file) throws ParserConfigurationException, SAXException, IOException {
-        fillXfaForm(new FileInputStream(file));
-    }
-    
-    public void fillXfaForm(InputStream is) throws ParserConfigurationException, SAXException, IOException {
-        fillXfaForm(new InputSource(is));
-    }
-        
-    
-    public void fillXfaForm(InputSource is) throws ParserConfigurationException, SAXException, IOException {
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db = dbf.newDocumentBuilder(); 
-        db.setEntityResolver((publicId, systemId) -> new InputSource(new StringReader("")));
-        Document newdoc = db.parse(is);
-        fillXfaForm(newdoc.getDocumentElement());
-    }
-    
-    /**
-     * Replaces the data under datasets/data.
-     *
-     * @param node node to fill data under
-     * @since    iText 5.0.0
-     */
-    public void fillXfaForm(Node node) {
-        Node data = datasetsNode.getFirstChild();
-        NodeList list = data.getChildNodes();
-        if (list.getLength() == 0) {
-            data.appendChild(domDocument.importNode(node, true));
-        }
-        else {
-            data.replaceChild(domDocument.importNode(node, true), data.getFirstChild());
-        }
-        extractNodes();
-        setChanged(true);
-    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/XfdfReader.java b/openpdf/src/main/java/com/lowagie/text/pdf/XfdfReader.java
index 323f84c4f..a1fe436bb 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/XfdfReader.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/XfdfReader.java
@@ -51,7 +51,6 @@
 import com.lowagie.text.error_messages.MessageLocalization;
 import com.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
 import com.lowagie.text.xml.simpleparser.SimpleXMLParser;
-
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/codec/CCITTG4Encoder.java b/openpdf/src/main/java/com/lowagie/text/pdf/codec/CCITTG4Encoder.java
index 10f5e401e..3f6e121e3 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/codec/CCITTG4Encoder.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/codec/CCITTG4Encoder.java
@@ -54,6 +54,52 @@
  * Encodes data in the CCITT G4 FAX format.
  */
 public class CCITTG4Encoder {
+
+    private static final int LENGTH = 0; /* bit length of g3 code */
+    private static final int CODE = 1;   /* g3 code */
+    private static final int RUNLEN = 2; /* run length in bits */
+    private static final int EOL = 0x001; /* EOL code value - 0000 0000 0000 1 */
+    /* status values returned instead of a run length */
+    private static final int G3CODE_EOL = -1;     /* NB: ACT_EOL - ACT_WRUNT */
+    private static final int G3CODE_INVALID = -2; /* NB: ACT_INVALID - ACT_WRUNT */
+    private static final int G3CODE_EOF = -3;     /* end of input data */
+    private static final int G3CODE_INCOMP = -4;  /* incomplete run code */
+    private static byte[] zeroruns = {
+            8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,    /* 0x00 - 0x0f */
+            3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,    /* 0x10 - 0x1f */
+            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,    /* 0x20 - 0x2f */
+            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,    /* 0x30 - 0x3f */
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x40 - 0x4f */
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x50 - 0x5f */
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x60 - 0x6f */
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x70 - 0x7f */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x80 - 0x8f */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x90 - 0x9f */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0xa0 - 0xaf */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0xb0 - 0xbf */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0xc0 - 0xcf */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0xd0 - 0xdf */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0xe0 - 0xef */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0    /* 0xf0 - 0xff */
+    };
+    private static byte[] oneruns = {
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x00 - 0x0f */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x10 - 0x1f */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x20 - 0x2f */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x30 - 0x3f */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x40 - 0x4f */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x50 - 0x5f */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x60 - 0x6f */
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x70 - 0x7f */
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x80 - 0x8f */
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x90 - 0x9f */
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0xa0 - 0xaf */
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0xb0 - 0xbf */
+            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,    /* 0xc0 - 0xcf */
+            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,    /* 0xd0 - 0xdf */
+            3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,    /* 0xe0 - 0xef */
+            4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 8    /* 0xf0 - 0xff */
+    };
     private int rowbytes;
     private int rowpixels;
     private int bit = 8;
@@ -63,23 +109,374 @@ public class CCITTG4Encoder {
     private byte[] dataBp;
     private int offsetData;
     private int sizeData;
-    
+    private int[][] TIFFFaxWhiteCodes = {
+            {8, 0x35, 0},    /* 0011 0101 */
+            {6, 0x7, 1},    /* 0001 11 */
+            {4, 0x7, 2},    /* 0111 */
+            {4, 0x8, 3},    /* 1000 */
+            {4, 0xB, 4},    /* 1011 */
+            {4, 0xC, 5},    /* 1100 */
+            {4, 0xE, 6},    /* 1110 */
+            {4, 0xF, 7},    /* 1111 */
+            {5, 0x13, 8},    /* 1001 1 */
+            {5, 0x14, 9},    /* 1010 0 */
+            {5, 0x7, 10},    /* 0011 1 */
+            {5, 0x8, 11},    /* 0100 0 */
+            {6, 0x8, 12},    /* 0010 00 */
+            {6, 0x3, 13},    /* 0000 11 */
+            {6, 0x34, 14},    /* 1101 00 */
+            {6, 0x35, 15},    /* 1101 01 */
+            {6, 0x2A, 16},    /* 1010 10 */
+            {6, 0x2B, 17},    /* 1010 11 */
+            {7, 0x27, 18},    /* 0100 111 */
+            {7, 0xC, 19},    /* 0001 100 */
+            {7, 0x8, 20},    /* 0001 000 */
+            {7, 0x17, 21},    /* 0010 111 */
+            {7, 0x3, 22},    /* 0000 011 */
+            {7, 0x4, 23},    /* 0000 100 */
+            {7, 0x28, 24},    /* 0101 000 */
+            {7, 0x2B, 25},    /* 0101 011 */
+            {7, 0x13, 26},    /* 0010 011 */
+            {7, 0x24, 27},    /* 0100 100 */
+            {7, 0x18, 28},    /* 0011 000 */
+            {8, 0x2, 29},    /* 0000 0010 */
+            {8, 0x3, 30},    /* 0000 0011 */
+            {8, 0x1A, 31},    /* 0001 1010 */
+            {8, 0x1B, 32},    /* 0001 1011 */
+            {8, 0x12, 33},    /* 0001 0010 */
+            {8, 0x13, 34},    /* 0001 0011 */
+            {8, 0x14, 35},    /* 0001 0100 */
+            {8, 0x15, 36},    /* 0001 0101 */
+            {8, 0x16, 37},    /* 0001 0110 */
+            {8, 0x17, 38},    /* 0001 0111 */
+            {8, 0x28, 39},    /* 0010 1000 */
+            {8, 0x29, 40},    /* 0010 1001 */
+            {8, 0x2A, 41},    /* 0010 1010 */
+            {8, 0x2B, 42},    /* 0010 1011 */
+            {8, 0x2C, 43},    /* 0010 1100 */
+            {8, 0x2D, 44},    /* 0010 1101 */
+            {8, 0x4, 45},    /* 0000 0100 */
+            {8, 0x5, 46},    /* 0000 0101 */
+            {8, 0xA, 47},    /* 0000 1010 */
+            {8, 0xB, 48},    /* 0000 1011 */
+            {8, 0x52, 49},    /* 0101 0010 */
+            {8, 0x53, 50},    /* 0101 0011 */
+            {8, 0x54, 51},    /* 0101 0100 */
+            {8, 0x55, 52},    /* 0101 0101 */
+            {8, 0x24, 53},    /* 0010 0100 */
+            {8, 0x25, 54},    /* 0010 0101 */
+            {8, 0x58, 55},    /* 0101 1000 */
+            {8, 0x59, 56},    /* 0101 1001 */
+            {8, 0x5A, 57},    /* 0101 1010 */
+            {8, 0x5B, 58},    /* 0101 1011 */
+            {8, 0x4A, 59},    /* 0100 1010 */
+            {8, 0x4B, 60},    /* 0100 1011 */
+            {8, 0x32, 61},    /* 0011 0010 */
+            {8, 0x33, 62},    /* 0011 0011 */
+            {8, 0x34, 63},    /* 0011 0100 */
+            {5, 0x1B, 64},    /* 1101 1 */
+            {5, 0x12, 128},    /* 1001 0 */
+            {6, 0x17, 192},    /* 0101 11 */
+            {7, 0x37, 256},    /* 0110 111 */
+            {8, 0x36, 320},    /* 0011 0110 */
+            {8, 0x37, 384},    /* 0011 0111 */
+            {8, 0x64, 448},    /* 0110 0100 */
+            {8, 0x65, 512},    /* 0110 0101 */
+            {8, 0x68, 576},    /* 0110 1000 */
+            {8, 0x67, 640},    /* 0110 0111 */
+            {9, 0xCC, 704},    /* 0110 0110 0 */
+            {9, 0xCD, 768},    /* 0110 0110 1 */
+            {9, 0xD2, 832},    /* 0110 1001 0 */
+            {9, 0xD3, 896},    /* 0110 1001 1 */
+            {9, 0xD4, 960},    /* 0110 1010 0 */
+            {9, 0xD5, 1024},    /* 0110 1010 1 */
+            {9, 0xD6, 1088},    /* 0110 1011 0 */
+            {9, 0xD7, 1152},    /* 0110 1011 1 */
+            {9, 0xD8, 1216},    /* 0110 1100 0 */
+            {9, 0xD9, 1280},    /* 0110 1100 1 */
+            {9, 0xDA, 1344},    /* 0110 1101 0 */
+            {9, 0xDB, 1408},    /* 0110 1101 1 */
+            {9, 0x98, 1472},    /* 0100 1100 0 */
+            {9, 0x99, 1536},    /* 0100 1100 1 */
+            {9, 0x9A, 1600},    /* 0100 1101 0 */
+            {6, 0x18, 1664},    /* 0110 00 */
+            {9, 0x9B, 1728},    /* 0100 1101 1 */
+            {11, 0x8, 1792},    /* 0000 0001 000 */
+            {11, 0xC, 1856},    /* 0000 0001 100 */
+            {11, 0xD, 1920},    /* 0000 0001 101 */
+            {12, 0x12, 1984},    /* 0000 0001 0010 */
+            {12, 0x13, 2048},    /* 0000 0001 0011 */
+            {12, 0x14, 2112},    /* 0000 0001 0100 */
+            {12, 0x15, 2176},    /* 0000 0001 0101 */
+            {12, 0x16, 2240},    /* 0000 0001 0110 */
+            {12, 0x17, 2304},    /* 0000 0001 0111 */
+            {12, 0x1C, 2368},    /* 0000 0001 1100 */
+            {12, 0x1D, 2432},    /* 0000 0001 1101 */
+            {12, 0x1E, 2496},    /* 0000 0001 1110 */
+            {12, 0x1F, 2560},    /* 0000 0001 1111 */
+            {12, 0x1, G3CODE_EOL},    /* 0000 0000 0001 */
+            {9, 0x1, G3CODE_INVALID},    /* 0000 0000 1 */
+            {10, 0x1, G3CODE_INVALID},    /* 0000 0000 01 */
+            {11, 0x1, G3CODE_INVALID},    /* 0000 0000 001 */
+            {12, 0x0, G3CODE_INVALID}    /* 0000 0000 0000 */
+    };
+    private int[][] TIFFFaxBlackCodes = {
+            {10, 0x37, 0},    /* 0000 1101 11 */
+            {3, 0x2, 1},    /* 010 */
+            {2, 0x3, 2},    /* 11 */
+            {2, 0x2, 3},    /* 10 */
+            {3, 0x3, 4},    /* 011 */
+            {4, 0x3, 5},    /* 0011 */
+            {4, 0x2, 6},    /* 0010 */
+            {5, 0x3, 7},    /* 0001 1 */
+            {6, 0x5, 8},    /* 0001 01 */
+            {6, 0x4, 9},    /* 0001 00 */
+            {7, 0x4, 10},    /* 0000 100 */
+            {7, 0x5, 11},    /* 0000 101 */
+            {7, 0x7, 12},    /* 0000 111 */
+            {8, 0x4, 13},    /* 0000 0100 */
+            {8, 0x7, 14},    /* 0000 0111 */
+            {9, 0x18, 15},    /* 0000 1100 0 */
+            {10, 0x17, 16},    /* 0000 0101 11 */
+            {10, 0x18, 17},    /* 0000 0110 00 */
+            {10, 0x8, 18},    /* 0000 0010 00 */
+            {11, 0x67, 19},    /* 0000 1100 111 */
+            {11, 0x68, 20},    /* 0000 1101 000 */
+            {11, 0x6C, 21},    /* 0000 1101 100 */
+            {11, 0x37, 22},    /* 0000 0110 111 */
+            {11, 0x28, 23},    /* 0000 0101 000 */
+            {11, 0x17, 24},    /* 0000 0010 111 */
+            {11, 0x18, 25},    /* 0000 0011 000 */
+            {12, 0xCA, 26},    /* 0000 1100 1010 */
+            {12, 0xCB, 27},    /* 0000 1100 1011 */
+            {12, 0xCC, 28},    /* 0000 1100 1100 */
+            {12, 0xCD, 29},    /* 0000 1100 1101 */
+            {12, 0x68, 30},    /* 0000 0110 1000 */
+            {12, 0x69, 31},    /* 0000 0110 1001 */
+            {12, 0x6A, 32},    /* 0000 0110 1010 */
+            {12, 0x6B, 33},    /* 0000 0110 1011 */
+            {12, 0xD2, 34},    /* 0000 1101 0010 */
+            {12, 0xD3, 35},    /* 0000 1101 0011 */
+            {12, 0xD4, 36},    /* 0000 1101 0100 */
+            {12, 0xD5, 37},    /* 0000 1101 0101 */
+            {12, 0xD6, 38},    /* 0000 1101 0110 */
+            {12, 0xD7, 39},    /* 0000 1101 0111 */
+            {12, 0x6C, 40},    /* 0000 0110 1100 */
+            {12, 0x6D, 41},    /* 0000 0110 1101 */
+            {12, 0xDA, 42},    /* 0000 1101 1010 */
+            {12, 0xDB, 43},    /* 0000 1101 1011 */
+            {12, 0x54, 44},    /* 0000 0101 0100 */
+            {12, 0x55, 45},    /* 0000 0101 0101 */
+            {12, 0x56, 46},    /* 0000 0101 0110 */
+            {12, 0x57, 47},    /* 0000 0101 0111 */
+            {12, 0x64, 48},    /* 0000 0110 0100 */
+            {12, 0x65, 49},    /* 0000 0110 0101 */
+            {12, 0x52, 50},    /* 0000 0101 0010 */
+            {12, 0x53, 51},    /* 0000 0101 0011 */
+            {12, 0x24, 52},    /* 0000 0010 0100 */
+            {12, 0x37, 53},    /* 0000 0011 0111 */
+            {12, 0x38, 54},    /* 0000 0011 1000 */
+            {12, 0x27, 55},    /* 0000 0010 0111 */
+            {12, 0x28, 56},    /* 0000 0010 1000 */
+            {12, 0x58, 57},    /* 0000 0101 1000 */
+            {12, 0x59, 58},    /* 0000 0101 1001 */
+            {12, 0x2B, 59},    /* 0000 0010 1011 */
+            {12, 0x2C, 60},    /* 0000 0010 1100 */
+            {12, 0x5A, 61},    /* 0000 0101 1010 */
+            {12, 0x66, 62},    /* 0000 0110 0110 */
+            {12, 0x67, 63},    /* 0000 0110 0111 */
+            {10, 0xF, 64},    /* 0000 0011 11 */
+            {12, 0xC8, 128},    /* 0000 1100 1000 */
+            {12, 0xC9, 192},    /* 0000 1100 1001 */
+            {12, 0x5B, 256},    /* 0000 0101 1011 */
+            {12, 0x33, 320},    /* 0000 0011 0011 */
+            {12, 0x34, 384},    /* 0000 0011 0100 */
+            {12, 0x35, 448},    /* 0000 0011 0101 */
+            {13, 0x6C, 512},    /* 0000 0011 0110 0 */
+            {13, 0x6D, 576},    /* 0000 0011 0110 1 */
+            {13, 0x4A, 640},    /* 0000 0010 0101 0 */
+            {13, 0x4B, 704},    /* 0000 0010 0101 1 */
+            {13, 0x4C, 768},    /* 0000 0010 0110 0 */
+            {13, 0x4D, 832},    /* 0000 0010 0110 1 */
+            {13, 0x72, 896},    /* 0000 0011 1001 0 */
+            {13, 0x73, 960},    /* 0000 0011 1001 1 */
+            {13, 0x74, 1024},    /* 0000 0011 1010 0 */
+            {13, 0x75, 1088},    /* 0000 0011 1010 1 */
+            {13, 0x76, 1152},    /* 0000 0011 1011 0 */
+            {13, 0x77, 1216},    /* 0000 0011 1011 1 */
+            {13, 0x52, 1280},    /* 0000 0010 1001 0 */
+            {13, 0x53, 1344},    /* 0000 0010 1001 1 */
+            {13, 0x54, 1408},    /* 0000 0010 1010 0 */
+            {13, 0x55, 1472},    /* 0000 0010 1010 1 */
+            {13, 0x5A, 1536},    /* 0000 0010 1101 0 */
+            {13, 0x5B, 1600},    /* 0000 0010 1101 1 */
+            {13, 0x64, 1664},    /* 0000 0011 0010 0 */
+            {13, 0x65, 1728},    /* 0000 0011 0010 1 */
+            {11, 0x8, 1792},    /* 0000 0001 000 */
+            {11, 0xC, 1856},    /* 0000 0001 100 */
+            {11, 0xD, 1920},    /* 0000 0001 101 */
+            {12, 0x12, 1984},    /* 0000 0001 0010 */
+            {12, 0x13, 2048},    /* 0000 0001 0011 */
+            {12, 0x14, 2112},    /* 0000 0001 0100 */
+            {12, 0x15, 2176},    /* 0000 0001 0101 */
+            {12, 0x16, 2240},    /* 0000 0001 0110 */
+            {12, 0x17, 2304},    /* 0000 0001 0111 */
+            {12, 0x1C, 2368},    /* 0000 0001 1100 */
+            {12, 0x1D, 2432},    /* 0000 0001 1101 */
+            {12, 0x1E, 2496},    /* 0000 0001 1110 */
+            {12, 0x1F, 2560},    /* 0000 0001 1111 */
+            {12, 0x1, G3CODE_EOL},    /* 0000 0000 0001 */
+            {9, 0x1, G3CODE_INVALID},    /* 0000 0000 1 */
+            {10, 0x1, G3CODE_INVALID},    /* 0000 0000 01 */
+            {11, 0x1, G3CODE_INVALID},    /* 0000 0000 001 */
+            {12, 0x0, G3CODE_INVALID}    /* 0000 0000 0000 */
+    };
+    private int[] horizcode =
+            {3, 0x1, 0};        /* 001 */
+    private int[] passcode =
+            {4, 0x1, 0};        /* 0001 */
+    private int[][] vcodes = {
+            {7, 0x03, 0},    /* 0000 011 */
+            {6, 0x03, 0},    /* 0000 11 */
+            {3, 0x03, 0},    /* 011 */
+            {1, 0x1, 0},        /* 1 */
+            {3, 0x2, 0},        /* 010 */
+            {6, 0x02, 0},    /* 0000 10 */
+            {7, 0x02, 0}        /* 0000 010 */
+    };
+    private int[] msbmask =
+            {0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff};
+
     /**
      * Creates a new encoder.
+     *
      * @param width the line width
-     */    
+     */
     public CCITTG4Encoder(int width) {
         rowpixels = width;
         rowbytes = (rowpixels + 7) / 8;
         refline = new byte[rowbytes];
     }
-    
+
+    /**
+     * Encodes a full image.
+     *
+     * @param data   the data to encode
+     * @param width  the image width
+     * @param height the image height
+     * @return the encoded image
+     */
+    public static byte[] compress(byte[] data, int width, int height) {
+        CCITTG4Encoder g4 = new CCITTG4Encoder(width);
+        g4.fax4Encode(data, 0, g4.rowbytes * height);
+        return g4.close();
+    }
+
+    private static int find1span(byte[] bp, int offset, int bs, int be) {
+        int bits = be - bs;
+        int n, span;
+
+        int pos = offset + (bs >> 3);
+        /*
+         * Check partial byte on lhs.
+         */
+        if (bits > 0 && (n = (bs & 7)) != 0) {
+            span = oneruns[(bp[pos] << n) & 0xff];
+            if (span > 8 - n)        /* table value too generous */ {
+                span = 8 - n;
+            }
+            if (span > bits)    /* constrain span to bit range */ {
+                span = bits;
+            }
+            if (n + span < 8)        /* doesn't extend to edge of byte */ {
+                return span;
+            }
+            bits -= span;
+            pos++;
+        } else {
+            span = 0;
+        }
+        /*
+         * Scan full bytes for all 1's.
+         */
+        while (bits >= 8) {
+            if (bp[pos] != -1)    /* end of run */ {
+                return (span + oneruns[bp[pos] & 0xff]);
+            }
+            span += 8;
+            bits -= 8;
+            pos++;
+        }
+        /*
+         * Check partial byte on rhs.
+         */
+        if (bits > 0) {
+            n = oneruns[bp[pos] & 0xff];
+            span += (n > bits ? bits : n);
+        }
+        return span;
+    }
+
+    private static int find0span(byte[] bp, int offset, int bs, int be) {
+        int bits = be - bs;
+        int n, span;
+
+        int pos = offset + (bs >> 3);
+        /*
+         * Check partial byte on lhs.
+         */
+        if (bits > 0 && (n = (bs & 7)) != 0) {
+            span = zeroruns[(bp[pos] << n) & 0xff];
+            if (span > 8 - n)        /* table value too generous */ {
+                span = 8 - n;
+            }
+            if (span > bits)    /* constrain span to bit range */ {
+                span = bits;
+            }
+            if (n + span < 8)        /* doesn't extend to edge of byte */ {
+                return span;
+            }
+            bits -= span;
+            pos++;
+        } else {
+            span = 0;
+        }
+        /*
+         * Scan full bytes for all 1's.
+         */
+        while (bits >= 8) {
+            if (bp[pos] != 0)    /* end of run */ {
+                return (span + zeroruns[bp[pos] & 0xff]);
+            }
+            span += 8;
+            bits -= 8;
+            pos++;
+        }
+        /*
+         * Check partial byte on rhs.
+         */
+        if (bits > 0) {
+            n = zeroruns[bp[pos] & 0xff];
+            span += (n > bits ? bits : n);
+        }
+        return span;
+    }
+
+    private static int finddiff(byte[] bp, int offset, int bs, int be, int color) {
+        return bs + (color != 0 ? find1span(bp, offset, bs, be) : find0span(bp, offset, bs, be));
+    }
+
+    private static int finddiff2(byte[] bp, int offset, int bs, int be, int color) {
+        return bs < be ? finddiff(bp, offset, bs, be, color) : be;
+    }
+
     /**
      * Encodes a number of lines.
-     * @param data the data to be encoded
+     *
+     * @param data   the data to be encoded
      * @param offset the offset into the data
-     * @param size the size of the data to be encoded
-     */    
+     * @param size   the size of the data to be encoded
+     */
     public void fax4Encode(byte[] data, int offset, int size) {
         dataBp = data;
         offsetData = offset;
@@ -91,26 +488,13 @@ public void fax4Encode(byte[] data, int offset, int size) {
             sizeData -= rowbytes;
         }
     }
-    
 
-    /**
-     * Encodes a full image.
-     * @param data the data to encode
-     * @param width the image width
-     * @param height the image height
-     * @return the encoded image
-     */    
-    public static byte[] compress(byte[] data, int width, int height) {
-        CCITTG4Encoder g4 = new CCITTG4Encoder(width);
-        g4.fax4Encode(data, 0, g4.rowbytes * height);
-        return g4.close();
-    }
-    
     /**
      * Encodes a number of lines.
-     * @param data the data to be encoded
+     *
+     * @param data   the data to be encoded
      * @param height the number of lines to encode
-     */    
+     */
     public void fax4Encode(byte[] data, int height) {
         fax4Encode(data, 0, rowbytes * height);
     }
@@ -118,19 +502,19 @@ public void fax4Encode(byte[] data, int height) {
     private void putcode(int[] table) {
         putBits(table[CODE], table[LENGTH]);
     }
-    
+
     private void putspan(int span, int[][] tab) {
         int code, length;
-        
+
         while (span >= 2624) {
-            int[] te = tab[63 + (2560>>6)];
+            int[] te = tab[63 + (2560 >> 6)];
             code = te[CODE];
             length = te[LENGTH];
             putBits(code, length);
             span -= te[RUNLEN];
         }
         if (span >= 64) {
-            int[] te = tab[63 + (span>>6)];
+            int[] te = tab[63 + (span >> 6)];
             code = te[CODE];
             length = te[LENGTH];
             putBits(code, length);
@@ -140,461 +524,86 @@ private void putspan(int span, int[][] tab) {
         length = tab[span][LENGTH];
         putBits(code, length);
     }
-    
+
     private void putBits(int bits, int length) {
         while (length > bit) {
             data |= bits >> (length - bit);
             length -= bit;
-            outBuf.append((byte)data);
+            outBuf.append((byte) data);
             data = 0;
             bit = 8;
         }
         data |= (bits & msbmask[length]) << (bit - length);
         bit -= length;
         if (bit == 0) {
-            outBuf.append((byte)data);
+            outBuf.append((byte) data);
             data = 0;
             bit = 8;
         }
     }
-    
+
     private void Fax3Encode2DRow() {
         int a0 = 0;
         int a1 = (pixel(dataBp, offsetData, 0) != 0 ? 0 : finddiff(dataBp, offsetData, 0, rowpixels, 0));
         int b1 = (pixel(refline, 0, 0) != 0 ? 0 : finddiff(refline, 0, 0, rowpixels, 0));
         int a2, b2;
-        
-        for (;;) {
-            b2 = finddiff2(refline, 0, b1, rowpixels, pixel(refline, 0,b1));
+
+        for (; ; ) {
+            b2 = finddiff2(refline, 0, b1, rowpixels, pixel(refline, 0, b1));
             if (b2 >= a1) {
                 int d = b1 - a1;
                 if (!(-3 <= d && d <= 3)) {    /* horizontal mode */
-                    a2 = finddiff2(dataBp, offsetData, a1, rowpixels, pixel(dataBp, offsetData,a1));
+                    a2 = finddiff2(dataBp, offsetData, a1, rowpixels, pixel(dataBp, offsetData, a1));
                     putcode(horizcode);
-                    if (a0+a1 == 0 || pixel(dataBp, offsetData, a0) == 0) {
-                        putspan(a1-a0, TIFFFaxWhiteCodes);
-                        putspan(a2-a1, TIFFFaxBlackCodes);
+                    if (a0 + a1 == 0 || pixel(dataBp, offsetData, a0) == 0) {
+                        putspan(a1 - a0, TIFFFaxWhiteCodes);
+                        putspan(a2 - a1, TIFFFaxBlackCodes);
                     } else {
-                        putspan(a1-a0, TIFFFaxBlackCodes);
-                        putspan(a2-a1, TIFFFaxWhiteCodes);
+                        putspan(a1 - a0, TIFFFaxBlackCodes);
+                        putspan(a2 - a1, TIFFFaxWhiteCodes);
                     }
                     a0 = a2;
                 } else {            /* vertical mode */
-                    putcode(vcodes[d+3]);
+                    putcode(vcodes[d + 3]);
                     a0 = a1;
                 }
             } else {                /* pass mode */
                 putcode(passcode);
                 a0 = b2;
             }
-            if (a0 >= rowpixels)
+            if (a0 >= rowpixels) {
                 break;
-            a1 = finddiff(dataBp, offsetData, a0, rowpixels, pixel(dataBp, offsetData,a0));
-            b1 = finddiff(refline, 0, a0, rowpixels, pixel(dataBp, offsetData,a0) ^ 1);
-            b1 = finddiff(refline, 0, b1, rowpixels, pixel(dataBp, offsetData,a0));
+            }
+            a1 = finddiff(dataBp, offsetData, a0, rowpixels, pixel(dataBp, offsetData, a0));
+            b1 = finddiff(refline, 0, a0, rowpixels, pixel(dataBp, offsetData, a0) ^ 1);
+            b1 = finddiff(refline, 0, b1, rowpixels, pixel(dataBp, offsetData, a0));
         }
     }
-    
+
     private void Fax4PostEncode() {
         putBits(EOL, 12);
         putBits(EOL, 12);
         if (bit != 8) {
-            outBuf.append((byte)data);
+            outBuf.append((byte) data);
             data = 0;
             bit = 8;
         }
     }
-    
+
     /**
      * Closes the encoder and returns the encoded data.
+     *
      * @return the encoded data
-     */    
+     */
     public byte[] close() {
         Fax4PostEncode();
         return outBuf.toByteArray();
     }
-    
+
     private int pixel(byte[] data, int offset, int bit) {
-        if (bit >= rowpixels)
+        if (bit >= rowpixels) {
             return 0;
-        return ((data[offset + (bit >> 3)] & 0xff) >> (7-((bit)&7))) & 1;
-    }
-    
-    private static int find1span(byte[] bp, int offset, int bs, int be) {
-        int bits = be - bs;
-        int n, span;
-        
-        int pos = offset + (bs >> 3);
-        /*
-         * Check partial byte on lhs.
-         */
-        if (bits > 0 && (n = (bs & 7)) != 0) {
-            span = oneruns[(bp[pos] << n) & 0xff];
-            if (span > 8-n)        /* table value too generous */
-                span = 8-n;
-            if (span > bits)    /* constrain span to bit range */
-                span = bits;
-            if (n+span < 8)        /* doesn't extend to edge of byte */
-                return span;
-            bits -= span;
-            pos++;
-        } else
-            span = 0;
-        /*
-         * Scan full bytes for all 1's.
-         */
-        while (bits >= 8) {
-            if (bp[pos] != -1)    /* end of run */
-                return (span + oneruns[bp[pos] & 0xff]);
-            span += 8;
-            bits -= 8;
-            pos++;
         }
-        /*
-         * Check partial byte on rhs.
-         */
-        if (bits > 0) {
-            n = oneruns[bp[pos] & 0xff];
-            span += (n > bits ? bits : n);
-        }
-        return span;
+        return ((data[offset + (bit >> 3)] & 0xff) >> (7 - ((bit) & 7))) & 1;
     }
-    
-    private static int find0span(byte[] bp, int offset, int bs, int be) {
-        int bits = be - bs;
-        int n, span;
-        
-        int pos = offset + (bs >> 3);
-        /*
-         * Check partial byte on lhs.
-         */
-        if (bits > 0 && (n = (bs & 7)) != 0) {
-            span = zeroruns[(bp[pos] << n) & 0xff];
-            if (span > 8-n)        /* table value too generous */
-                span = 8-n;
-            if (span > bits)    /* constrain span to bit range */
-                span = bits;
-            if (n+span < 8)        /* doesn't extend to edge of byte */
-                return span;
-            bits -= span;
-            pos++;
-        } else
-            span = 0;
-        /*
-         * Scan full bytes for all 1's.
-         */
-        while (bits >= 8) {
-            if (bp[pos] != 0)    /* end of run */
-                return (span + zeroruns[bp[pos] & 0xff]);
-            span += 8;
-            bits -= 8;
-            pos++;
-        }
-        /*
-         * Check partial byte on rhs.
-         */
-        if (bits > 0) {
-            n = zeroruns[bp[pos] & 0xff];
-            span += (n > bits ? bits : n);
-        }
-        return span;
-    }
-    
-    private static int finddiff(byte[] bp, int offset, int bs, int be, int color) {
-        return bs + (color != 0 ? find1span(bp, offset, bs, be) : find0span(bp, offset, bs, be));
-    }
-    
-    private static int finddiff2(byte[] bp, int offset, int bs, int be, int color) {
-        return bs < be ? finddiff(bp, offset, bs, be, color) : be;
-    }
-
-    private static byte[] zeroruns = {
-            8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,    /* 0x00 - 0x0f */
-            3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,    /* 0x10 - 0x1f */
-            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,    /* 0x20 - 0x2f */
-            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,    /* 0x30 - 0x3f */
-            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x40 - 0x4f */
-            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x50 - 0x5f */
-            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x60 - 0x6f */
-            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x70 - 0x7f */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x80 - 0x8f */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x90 - 0x9f */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0xa0 - 0xaf */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0xb0 - 0xbf */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0xc0 - 0xcf */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0xd0 - 0xdf */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0xe0 - 0xef */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0    /* 0xf0 - 0xff */
-    };
-
-    private static byte[] oneruns = {
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x00 - 0x0f */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x10 - 0x1f */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x20 - 0x2f */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x30 - 0x3f */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x40 - 0x4f */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x50 - 0x5f */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x60 - 0x6f */
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x70 - 0x7f */
-            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x80 - 0x8f */
-            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0x90 - 0x9f */
-            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0xa0 - 0xaf */
-            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    /* 0xb0 - 0xbf */
-            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,    /* 0xc0 - 0xcf */
-            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,    /* 0xd0 - 0xdf */
-            3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,    /* 0xe0 - 0xef */
-            4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 8    /* 0xf0 - 0xff */
-    };
-
-    private static final int LENGTH = 0; /* bit length of g3 code */
-    private static final int CODE = 1;   /* g3 code */
-    private static final int RUNLEN = 2; /* run length in bits */
-
-    private static final int EOL = 0x001; /* EOL code value - 0000 0000 0000 1 */
-
-    /* status values returned instead of a run length */
-    private static final int G3CODE_EOL    = -1;     /* NB: ACT_EOL - ACT_WRUNT */
-    private static final int G3CODE_INVALID = -2; /* NB: ACT_INVALID - ACT_WRUNT */
-    private static final int G3CODE_EOF = -3;     /* end of input data */
-    private static final int G3CODE_INCOMP = -4;  /* incomplete run code */
-
-    private int[][] TIFFFaxWhiteCodes = {
-        { 8, 0x35, 0 },    /* 0011 0101 */
-        { 6, 0x7, 1 },    /* 0001 11 */
-        { 4, 0x7, 2 },    /* 0111 */
-        { 4, 0x8, 3 },    /* 1000 */
-        { 4, 0xB, 4 },    /* 1011 */
-        { 4, 0xC, 5 },    /* 1100 */
-        { 4, 0xE, 6 },    /* 1110 */
-        { 4, 0xF, 7 },    /* 1111 */
-        { 5, 0x13, 8 },    /* 1001 1 */
-        { 5, 0x14, 9 },    /* 1010 0 */
-        { 5, 0x7, 10 },    /* 0011 1 */
-        { 5, 0x8, 11 },    /* 0100 0 */
-        { 6, 0x8, 12 },    /* 0010 00 */
-        { 6, 0x3, 13 },    /* 0000 11 */
-        { 6, 0x34, 14 },    /* 1101 00 */
-        { 6, 0x35, 15 },    /* 1101 01 */
-        { 6, 0x2A, 16 },    /* 1010 10 */
-        { 6, 0x2B, 17 },    /* 1010 11 */
-        { 7, 0x27, 18 },    /* 0100 111 */
-        { 7, 0xC, 19 },    /* 0001 100 */
-        { 7, 0x8, 20 },    /* 0001 000 */
-        { 7, 0x17, 21 },    /* 0010 111 */
-        { 7, 0x3, 22 },    /* 0000 011 */
-        { 7, 0x4, 23 },    /* 0000 100 */
-        { 7, 0x28, 24 },    /* 0101 000 */
-        { 7, 0x2B, 25 },    /* 0101 011 */
-        { 7, 0x13, 26 },    /* 0010 011 */
-        { 7, 0x24, 27 },    /* 0100 100 */
-        { 7, 0x18, 28 },    /* 0011 000 */
-        { 8, 0x2, 29 },    /* 0000 0010 */
-        { 8, 0x3, 30 },    /* 0000 0011 */
-        { 8, 0x1A, 31 },    /* 0001 1010 */
-        { 8, 0x1B, 32 },    /* 0001 1011 */
-        { 8, 0x12, 33 },    /* 0001 0010 */
-        { 8, 0x13, 34 },    /* 0001 0011 */
-        { 8, 0x14, 35 },    /* 0001 0100 */
-        { 8, 0x15, 36 },    /* 0001 0101 */
-        { 8, 0x16, 37 },    /* 0001 0110 */
-        { 8, 0x17, 38 },    /* 0001 0111 */
-        { 8, 0x28, 39 },    /* 0010 1000 */
-        { 8, 0x29, 40 },    /* 0010 1001 */
-        { 8, 0x2A, 41 },    /* 0010 1010 */
-        { 8, 0x2B, 42 },    /* 0010 1011 */
-        { 8, 0x2C, 43 },    /* 0010 1100 */
-        { 8, 0x2D, 44 },    /* 0010 1101 */
-        { 8, 0x4, 45 },    /* 0000 0100 */
-        { 8, 0x5, 46 },    /* 0000 0101 */
-        { 8, 0xA, 47 },    /* 0000 1010 */
-        { 8, 0xB, 48 },    /* 0000 1011 */
-        { 8, 0x52, 49 },    /* 0101 0010 */
-        { 8, 0x53, 50 },    /* 0101 0011 */
-        { 8, 0x54, 51 },    /* 0101 0100 */
-        { 8, 0x55, 52 },    /* 0101 0101 */
-        { 8, 0x24, 53 },    /* 0010 0100 */
-        { 8, 0x25, 54 },    /* 0010 0101 */
-        { 8, 0x58, 55 },    /* 0101 1000 */
-        { 8, 0x59, 56 },    /* 0101 1001 */
-        { 8, 0x5A, 57 },    /* 0101 1010 */
-        { 8, 0x5B, 58 },    /* 0101 1011 */
-        { 8, 0x4A, 59 },    /* 0100 1010 */
-        { 8, 0x4B, 60 },    /* 0100 1011 */
-        { 8, 0x32, 61 },    /* 0011 0010 */
-        { 8, 0x33, 62 },    /* 0011 0011 */
-        { 8, 0x34, 63 },    /* 0011 0100 */
-        { 5, 0x1B, 64 },    /* 1101 1 */
-        { 5, 0x12, 128 },    /* 1001 0 */
-        { 6, 0x17, 192 },    /* 0101 11 */
-        { 7, 0x37, 256 },    /* 0110 111 */
-        { 8, 0x36, 320 },    /* 0011 0110 */
-        { 8, 0x37, 384 },    /* 0011 0111 */
-        { 8, 0x64, 448 },    /* 0110 0100 */
-        { 8, 0x65, 512 },    /* 0110 0101 */
-        { 8, 0x68, 576 },    /* 0110 1000 */
-        { 8, 0x67, 640 },    /* 0110 0111 */
-        { 9, 0xCC, 704 },    /* 0110 0110 0 */
-        { 9, 0xCD, 768 },    /* 0110 0110 1 */
-        { 9, 0xD2, 832 },    /* 0110 1001 0 */
-        { 9, 0xD3, 896 },    /* 0110 1001 1 */
-        { 9, 0xD4, 960 },    /* 0110 1010 0 */
-        { 9, 0xD5, 1024 },    /* 0110 1010 1 */
-        { 9, 0xD6, 1088 },    /* 0110 1011 0 */
-        { 9, 0xD7, 1152 },    /* 0110 1011 1 */
-        { 9, 0xD8, 1216 },    /* 0110 1100 0 */
-        { 9, 0xD9, 1280 },    /* 0110 1100 1 */
-        { 9, 0xDA, 1344 },    /* 0110 1101 0 */
-        { 9, 0xDB, 1408 },    /* 0110 1101 1 */
-        { 9, 0x98, 1472 },    /* 0100 1100 0 */
-        { 9, 0x99, 1536 },    /* 0100 1100 1 */
-        { 9, 0x9A, 1600 },    /* 0100 1101 0 */
-        { 6, 0x18, 1664 },    /* 0110 00 */
-        { 9, 0x9B, 1728 },    /* 0100 1101 1 */
-        { 11, 0x8, 1792 },    /* 0000 0001 000 */
-        { 11, 0xC, 1856 },    /* 0000 0001 100 */
-        { 11, 0xD, 1920 },    /* 0000 0001 101 */
-        { 12, 0x12, 1984 },    /* 0000 0001 0010 */
-        { 12, 0x13, 2048 },    /* 0000 0001 0011 */
-        { 12, 0x14, 2112 },    /* 0000 0001 0100 */
-        { 12, 0x15, 2176 },    /* 0000 0001 0101 */
-        { 12, 0x16, 2240 },    /* 0000 0001 0110 */
-        { 12, 0x17, 2304 },    /* 0000 0001 0111 */
-        { 12, 0x1C, 2368 },    /* 0000 0001 1100 */
-        { 12, 0x1D, 2432 },    /* 0000 0001 1101 */
-        { 12, 0x1E, 2496 },    /* 0000 0001 1110 */
-        { 12, 0x1F, 2560 },    /* 0000 0001 1111 */
-        { 12, 0x1, G3CODE_EOL },    /* 0000 0000 0001 */
-        { 9, 0x1, G3CODE_INVALID },    /* 0000 0000 1 */
-        { 10, 0x1, G3CODE_INVALID },    /* 0000 0000 01 */
-        { 11, 0x1, G3CODE_INVALID },    /* 0000 0000 001 */
-        { 12, 0x0, G3CODE_INVALID }    /* 0000 0000 0000 */
-    };
-
-    private int[][] TIFFFaxBlackCodes = {
-        { 10, 0x37, 0 },    /* 0000 1101 11 */
-        { 3, 0x2, 1 },    /* 010 */
-        { 2, 0x3, 2 },    /* 11 */
-        { 2, 0x2, 3 },    /* 10 */
-        { 3, 0x3, 4 },    /* 011 */
-        { 4, 0x3, 5 },    /* 0011 */
-        { 4, 0x2, 6 },    /* 0010 */
-        { 5, 0x3, 7 },    /* 0001 1 */
-        { 6, 0x5, 8 },    /* 0001 01 */
-        { 6, 0x4, 9 },    /* 0001 00 */
-        { 7, 0x4, 10 },    /* 0000 100 */
-        { 7, 0x5, 11 },    /* 0000 101 */
-        { 7, 0x7, 12 },    /* 0000 111 */
-        { 8, 0x4, 13 },    /* 0000 0100 */
-        { 8, 0x7, 14 },    /* 0000 0111 */
-        { 9, 0x18, 15 },    /* 0000 1100 0 */
-        { 10, 0x17, 16 },    /* 0000 0101 11 */
-        { 10, 0x18, 17 },    /* 0000 0110 00 */
-        { 10, 0x8, 18 },    /* 0000 0010 00 */
-        { 11, 0x67, 19 },    /* 0000 1100 111 */
-        { 11, 0x68, 20 },    /* 0000 1101 000 */
-        { 11, 0x6C, 21 },    /* 0000 1101 100 */
-        { 11, 0x37, 22 },    /* 0000 0110 111 */
-        { 11, 0x28, 23 },    /* 0000 0101 000 */
-        { 11, 0x17, 24 },    /* 0000 0010 111 */
-        { 11, 0x18, 25 },    /* 0000 0011 000 */
-        { 12, 0xCA, 26 },    /* 0000 1100 1010 */
-        { 12, 0xCB, 27 },    /* 0000 1100 1011 */
-        { 12, 0xCC, 28 },    /* 0000 1100 1100 */
-        { 12, 0xCD, 29 },    /* 0000 1100 1101 */
-        { 12, 0x68, 30 },    /* 0000 0110 1000 */
-        { 12, 0x69, 31 },    /* 0000 0110 1001 */
-        { 12, 0x6A, 32 },    /* 0000 0110 1010 */
-        { 12, 0x6B, 33 },    /* 0000 0110 1011 */
-        { 12, 0xD2, 34 },    /* 0000 1101 0010 */
-        { 12, 0xD3, 35 },    /* 0000 1101 0011 */
-        { 12, 0xD4, 36 },    /* 0000 1101 0100 */
-        { 12, 0xD5, 37 },    /* 0000 1101 0101 */
-        { 12, 0xD6, 38 },    /* 0000 1101 0110 */
-        { 12, 0xD7, 39 },    /* 0000 1101 0111 */
-        { 12, 0x6C, 40 },    /* 0000 0110 1100 */
-        { 12, 0x6D, 41 },    /* 0000 0110 1101 */
-        { 12, 0xDA, 42 },    /* 0000 1101 1010 */
-        { 12, 0xDB, 43 },    /* 0000 1101 1011 */
-        { 12, 0x54, 44 },    /* 0000 0101 0100 */
-        { 12, 0x55, 45 },    /* 0000 0101 0101 */
-        { 12, 0x56, 46 },    /* 0000 0101 0110 */
-        { 12, 0x57, 47 },    /* 0000 0101 0111 */
-        { 12, 0x64, 48 },    /* 0000 0110 0100 */
-        { 12, 0x65, 49 },    /* 0000 0110 0101 */
-        { 12, 0x52, 50 },    /* 0000 0101 0010 */
-        { 12, 0x53, 51 },    /* 0000 0101 0011 */
-        { 12, 0x24, 52 },    /* 0000 0010 0100 */
-        { 12, 0x37, 53 },    /* 0000 0011 0111 */
-        { 12, 0x38, 54 },    /* 0000 0011 1000 */
-        { 12, 0x27, 55 },    /* 0000 0010 0111 */
-        { 12, 0x28, 56 },    /* 0000 0010 1000 */
-        { 12, 0x58, 57 },    /* 0000 0101 1000 */
-        { 12, 0x59, 58 },    /* 0000 0101 1001 */
-        { 12, 0x2B, 59 },    /* 0000 0010 1011 */
-        { 12, 0x2C, 60 },    /* 0000 0010 1100 */
-        { 12, 0x5A, 61 },    /* 0000 0101 1010 */
-        { 12, 0x66, 62 },    /* 0000 0110 0110 */
-        { 12, 0x67, 63 },    /* 0000 0110 0111 */
-        { 10, 0xF, 64 },    /* 0000 0011 11 */
-        { 12, 0xC8, 128 },    /* 0000 1100 1000 */
-        { 12, 0xC9, 192 },    /* 0000 1100 1001 */
-        { 12, 0x5B, 256 },    /* 0000 0101 1011 */
-        { 12, 0x33, 320 },    /* 0000 0011 0011 */
-        { 12, 0x34, 384 },    /* 0000 0011 0100 */
-        { 12, 0x35, 448 },    /* 0000 0011 0101 */
-        { 13, 0x6C, 512 },    /* 0000 0011 0110 0 */
-        { 13, 0x6D, 576 },    /* 0000 0011 0110 1 */
-        { 13, 0x4A, 640 },    /* 0000 0010 0101 0 */
-        { 13, 0x4B, 704 },    /* 0000 0010 0101 1 */
-        { 13, 0x4C, 768 },    /* 0000 0010 0110 0 */
-        { 13, 0x4D, 832 },    /* 0000 0010 0110 1 */
-        { 13, 0x72, 896 },    /* 0000 0011 1001 0 */
-        { 13, 0x73, 960 },    /* 0000 0011 1001 1 */
-        { 13, 0x74, 1024 },    /* 0000 0011 1010 0 */
-        { 13, 0x75, 1088 },    /* 0000 0011 1010 1 */
-        { 13, 0x76, 1152 },    /* 0000 0011 1011 0 */
-        { 13, 0x77, 1216 },    /* 0000 0011 1011 1 */
-        { 13, 0x52, 1280 },    /* 0000 0010 1001 0 */
-        { 13, 0x53, 1344 },    /* 0000 0010 1001 1 */
-        { 13, 0x54, 1408 },    /* 0000 0010 1010 0 */
-        { 13, 0x55, 1472 },    /* 0000 0010 1010 1 */
-        { 13, 0x5A, 1536 },    /* 0000 0010 1101 0 */
-        { 13, 0x5B, 1600 },    /* 0000 0010 1101 1 */
-        { 13, 0x64, 1664 },    /* 0000 0011 0010 0 */
-        { 13, 0x65, 1728 },    /* 0000 0011 0010 1 */
-        { 11, 0x8, 1792 },    /* 0000 0001 000 */
-        { 11, 0xC, 1856 },    /* 0000 0001 100 */
-        { 11, 0xD, 1920 },    /* 0000 0001 101 */
-        { 12, 0x12, 1984 },    /* 0000 0001 0010 */
-        { 12, 0x13, 2048 },    /* 0000 0001 0011 */
-        { 12, 0x14, 2112 },    /* 0000 0001 0100 */
-        { 12, 0x15, 2176 },    /* 0000 0001 0101 */
-        { 12, 0x16, 2240 },    /* 0000 0001 0110 */
-        { 12, 0x17, 2304 },    /* 0000 0001 0111 */
-        { 12, 0x1C, 2368 },    /* 0000 0001 1100 */
-        { 12, 0x1D, 2432 },    /* 0000 0001 1101 */
-        { 12, 0x1E, 2496 },    /* 0000 0001 1110 */
-        { 12, 0x1F, 2560 },    /* 0000 0001 1111 */
-        { 12, 0x1, G3CODE_EOL },    /* 0000 0000 0001 */
-        { 9, 0x1, G3CODE_INVALID },    /* 0000 0000 1 */
-        { 10, 0x1, G3CODE_INVALID },    /* 0000 0000 01 */
-        { 11, 0x1, G3CODE_INVALID },    /* 0000 0000 001 */
-        { 12, 0x0, G3CODE_INVALID }    /* 0000 0000 0000 */
-    };
-    
-    private int[] horizcode =
-        { 3, 0x1, 0 };        /* 001 */
-    private int[] passcode =
-        { 4, 0x1, 0 };        /* 0001 */
-    private int[][] vcodes = {
-        { 7, 0x03, 0 },    /* 0000 011 */
-        { 6, 0x03, 0 },    /* 0000 11 */
-        { 3, 0x03, 0 },    /* 011 */
-        { 1, 0x1, 0 },        /* 1 */
-        { 3, 0x2, 0 },        /* 010 */
-        { 6, 0x02, 0 },    /* 0000 10 */
-        { 7, 0x02, 0 }        /* 0000 010 */
-    };
-    private int[] msbmask =
-    { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/InputMeta.java b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/InputMeta.java
index b3876cdd1..43a005947 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/InputMeta.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/InputMeta.java
@@ -49,61 +49,63 @@
 
 package com.lowagie.text.pdf.codec.wmf;
 
+import com.lowagie.text.Utilities;
 import java.awt.Color;
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.lowagie.text.Utilities;
-
 public class InputMeta {
-    
+
     InputStream in;
     int length;
-    
+
     public InputMeta(InputStream in) {
         this.in = in;
     }
 
-    public int readWord() throws IOException{
+    public int readWord() throws IOException {
         length += 2;
         int k1 = in.read();
-        if (k1 < 0)
+        if (k1 < 0) {
             return 0;
+        }
         return (k1 + (in.read() << 8)) & 0xffff;
     }
 
-    public int readShort() throws IOException{
+    public int readShort() throws IOException {
         int k = readWord();
-        if (k > 0x7fff)
+        if (k > 0x7fff) {
             k -= 0x10000;
+        }
         return k;
     }
 
-    public int readInt() throws IOException{
+    public int readInt() throws IOException {
         length += 4;
         int k1 = in.read();
-        if (k1 < 0)
+        if (k1 < 0) {
             return 0;
+        }
         int k2 = in.read() << 8;
         int k3 = in.read() << 16;
         return k1 + k2 + k3 + (in.read() << 24);
     }
-    
-    public int readByte() throws IOException{
+
+    public int readByte() throws IOException {
         ++length;
         return in.read() & 0xff;
     }
-    
-    public void skip(int len) throws IOException{
+
+    public void skip(int len) throws IOException {
         length += len;
         Utilities.skip(in, len);
     }
-    
+
     public int getLength() {
         return length;
     }
-    
-    public Color readColor() throws IOException{
+
+    public Color readColor() throws IOException {
         int red = readByte();
         int green = readByte();
         int blue = readByte();
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaBrush.java b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaBrush.java
index b17a2875c..2abb6bf51 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaBrush.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaBrush.java
@@ -48,6 +48,7 @@
  */
 
 package com.lowagie.text.pdf.codec.wmf;
+
 import java.awt.Color;
 import java.io.IOException;
 
@@ -78,15 +79,15 @@ public void init(InputMeta in) throws IOException {
         color = in.readColor();
         hatch = in.readWord();
     }
-    
+
     public int getStyle() {
         return style;
     }
-    
+
     public int getHatch() {
         return hatch;
     }
-    
+
     public Color getColor() {
         return color;
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaDo.java b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaDo.java
index 062d087ba..60850f96a 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaDo.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaDo.java
@@ -50,6 +50,11 @@
 
 package com.lowagie.text.pdf.codec.wmf;
 
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.Image;
+import com.lowagie.text.error_messages.MessageLocalization;
+import com.lowagie.text.pdf.BaseFont;
+import com.lowagie.text.pdf.PdfContentByte;
 import java.awt.Color;
 import java.awt.Point;
 import java.io.ByteArrayOutputStream;
@@ -59,82 +64,76 @@
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.Image;
-import com.lowagie.text.error_messages.MessageLocalization;
-import com.lowagie.text.pdf.BaseFont;
-import com.lowagie.text.pdf.PdfContentByte;
-
 public class MetaDo {
-    
-    public static final int META_SETBKCOLOR            = 0x0201;
-    public static final int META_SETBKMODE             = 0x0102;
-    public static final int META_SETMAPMODE            = 0x0103;
-    public static final int META_SETROP2               = 0x0104;
-    public static final int META_SETRELABS             = 0x0105;
-    public static final int META_SETPOLYFILLMODE       = 0x0106;
-    public static final int META_SETSTRETCHBLTMODE     = 0x0107;
-    public static final int META_SETTEXTCHAREXTRA      = 0x0108;
-    public static final int META_SETTEXTCOLOR          = 0x0209;
-    public static final int META_SETTEXTJUSTIFICATION  = 0x020A;
-    public static final int META_SETWINDOWORG          = 0x020B;
-    public static final int META_SETWINDOWEXT          = 0x020C;
-    public static final int META_SETVIEWPORTORG        = 0x020D;
-    public static final int META_SETVIEWPORTEXT        = 0x020E;
-    public static final int META_OFFSETWINDOWORG       = 0x020F;
-    public static final int META_SCALEWINDOWEXT        = 0x0410;
-    public static final int META_OFFSETVIEWPORTORG     = 0x0211;
-    public static final int META_SCALEVIEWPORTEXT      = 0x0412;
-    public static final int META_LINETO                = 0x0213;
-    public static final int META_MOVETO                = 0x0214;
-    public static final int META_EXCLUDECLIPRECT       = 0x0415;
-    public static final int META_INTERSECTCLIPRECT     = 0x0416;
-    public static final int META_ARC                   = 0x0817;
-    public static final int META_ELLIPSE               = 0x0418;
-    public static final int META_FLOODFILL             = 0x0419;
-    public static final int META_PIE                   = 0x081A;
-    public static final int META_RECTANGLE             = 0x041B;
-    public static final int META_ROUNDRECT             = 0x061C;
-    public static final int META_PATBLT                = 0x061D;
-    public static final int META_SAVEDC                = 0x001E;
-    public static final int META_SETPIXEL              = 0x041F;
-    public static final int META_OFFSETCLIPRGN         = 0x0220;
-    public static final int META_TEXTOUT               = 0x0521;
-    public static final int META_BITBLT                = 0x0922;
-    public static final int META_STRETCHBLT            = 0x0B23;
-    public static final int META_POLYGON               = 0x0324;
-    public static final int META_POLYLINE              = 0x0325;
-    public static final int META_ESCAPE                = 0x0626;
-    public static final int META_RESTOREDC             = 0x0127;
-    public static final int META_FILLREGION            = 0x0228;
-    public static final int META_FRAMEREGION           = 0x0429;
-    public static final int META_INVERTREGION          = 0x012A;
-    public static final int META_PAINTREGION           = 0x012B;
-    public static final int META_SELECTCLIPREGION      = 0x012C;
-    public static final int META_SELECTOBJECT          = 0x012D;
-    public static final int META_SETTEXTALIGN          = 0x012E;
-    public static final int META_CHORD                 = 0x0830;
-    public static final int META_SETMAPPERFLAGS        = 0x0231;
-    public static final int META_EXTTEXTOUT            = 0x0a32;
-    public static final int META_SETDIBTODEV           = 0x0d33;
-    public static final int META_SELECTPALETTE         = 0x0234;
-    public static final int META_REALIZEPALETTE        = 0x0035;
-    public static final int META_ANIMATEPALETTE        = 0x0436;
-    public static final int META_SETPALENTRIES         = 0x0037;
-    public static final int META_POLYPOLYGON           = 0x0538;
-    public static final int META_RESIZEPALETTE         = 0x0139;
-    public static final int META_DIBBITBLT             = 0x0940;
-    public static final int META_DIBSTRETCHBLT         = 0x0b41;
+
+    public static final int META_SETBKCOLOR = 0x0201;
+    public static final int META_SETBKMODE = 0x0102;
+    public static final int META_SETMAPMODE = 0x0103;
+    public static final int META_SETROP2 = 0x0104;
+    public static final int META_SETRELABS = 0x0105;
+    public static final int META_SETPOLYFILLMODE = 0x0106;
+    public static final int META_SETSTRETCHBLTMODE = 0x0107;
+    public static final int META_SETTEXTCHAREXTRA = 0x0108;
+    public static final int META_SETTEXTCOLOR = 0x0209;
+    public static final int META_SETTEXTJUSTIFICATION = 0x020A;
+    public static final int META_SETWINDOWORG = 0x020B;
+    public static final int META_SETWINDOWEXT = 0x020C;
+    public static final int META_SETVIEWPORTORG = 0x020D;
+    public static final int META_SETVIEWPORTEXT = 0x020E;
+    public static final int META_OFFSETWINDOWORG = 0x020F;
+    public static final int META_SCALEWINDOWEXT = 0x0410;
+    public static final int META_OFFSETVIEWPORTORG = 0x0211;
+    public static final int META_SCALEVIEWPORTEXT = 0x0412;
+    public static final int META_LINETO = 0x0213;
+    public static final int META_MOVETO = 0x0214;
+    public static final int META_EXCLUDECLIPRECT = 0x0415;
+    public static final int META_INTERSECTCLIPRECT = 0x0416;
+    public static final int META_ARC = 0x0817;
+    public static final int META_ELLIPSE = 0x0418;
+    public static final int META_FLOODFILL = 0x0419;
+    public static final int META_PIE = 0x081A;
+    public static final int META_RECTANGLE = 0x041B;
+    public static final int META_ROUNDRECT = 0x061C;
+    public static final int META_PATBLT = 0x061D;
+    public static final int META_SAVEDC = 0x001E;
+    public static final int META_SETPIXEL = 0x041F;
+    public static final int META_OFFSETCLIPRGN = 0x0220;
+    public static final int META_TEXTOUT = 0x0521;
+    public static final int META_BITBLT = 0x0922;
+    public static final int META_STRETCHBLT = 0x0B23;
+    public static final int META_POLYGON = 0x0324;
+    public static final int META_POLYLINE = 0x0325;
+    public static final int META_ESCAPE = 0x0626;
+    public static final int META_RESTOREDC = 0x0127;
+    public static final int META_FILLREGION = 0x0228;
+    public static final int META_FRAMEREGION = 0x0429;
+    public static final int META_INVERTREGION = 0x012A;
+    public static final int META_PAINTREGION = 0x012B;
+    public static final int META_SELECTCLIPREGION = 0x012C;
+    public static final int META_SELECTOBJECT = 0x012D;
+    public static final int META_SETTEXTALIGN = 0x012E;
+    public static final int META_CHORD = 0x0830;
+    public static final int META_SETMAPPERFLAGS = 0x0231;
+    public static final int META_EXTTEXTOUT = 0x0a32;
+    public static final int META_SETDIBTODEV = 0x0d33;
+    public static final int META_SELECTPALETTE = 0x0234;
+    public static final int META_REALIZEPALETTE = 0x0035;
+    public static final int META_ANIMATEPALETTE = 0x0436;
+    public static final int META_SETPALENTRIES = 0x0037;
+    public static final int META_POLYPOLYGON = 0x0538;
+    public static final int META_RESIZEPALETTE = 0x0139;
+    public static final int META_DIBBITBLT = 0x0940;
+    public static final int META_DIBSTRETCHBLT = 0x0b41;
     public static final int META_DIBCREATEPATTERNBRUSH = 0x0142;
-    public static final int META_STRETCHDIB            = 0x0f43;
-    public static final int META_EXTFLOODFILL          = 0x0548;
-    public static final int META_DELETEOBJECT          = 0x01f0;
-    public static final int META_CREATEPALETTE         = 0x00f7;
-    public static final int META_CREATEPATTERNBRUSH    = 0x01F9;
-    public static final int META_CREATEPENINDIRECT     = 0x02FA;
-    public static final int META_CREATEFONTINDIRECT    = 0x02FB;
-    public static final int META_CREATEBRUSHINDIRECT   = 0x02FC;
-    public static final int META_CREATEREGION          = 0x06FF;
+    public static final int META_STRETCHDIB = 0x0f43;
+    public static final int META_EXTFLOODFILL = 0x0548;
+    public static final int META_DELETEOBJECT = 0x01f0;
+    public static final int META_CREATEPALETTE = 0x00f7;
+    public static final int META_CREATEPATTERNBRUSH = 0x01F9;
+    public static final int META_CREATEPENINDIRECT = 0x02FA;
+    public static final int META_CREATEFONTINDIRECT = 0x02FB;
+    public static final int META_CREATEBRUSHINDIRECT = 0x02FC;
+    public static final int META_CREATEREGION = 0x06FF;
 
     public PdfContentByte cb;
     public InputMeta in;
@@ -149,8 +148,106 @@ public MetaDo(InputStream in, PdfContentByte cb) {
         this.cb = cb;
         this.in = new InputMeta(in);
     }
-    
-    public void readAll() throws IOException, DocumentException{
+
+    static float getArc(float xCenter, float yCenter, float xDot, float yDot) {
+        double s = Math.atan2(yDot - yCenter, xDot - xCenter);
+        if (s < 0) {
+            s += Math.PI * 2;
+        }
+        return (float) (s / Math.PI * 180);
+    }
+
+    public static byte[] wrapBMP(Image image) throws IOException {
+        if (image.getOriginalType() != Image.ORIGINAL_BMP) {
+            throw new IOException(MessageLocalization.getComposedMessage("only.bmp.can.be.wrapped.in.wmf"));
+        }
+        InputStream imgIn;
+        byte[] data = null;
+        if (image.getOriginalData() == null) {
+            imgIn = image.getUrl().openStream();
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            int b = 0;
+            while ((b = imgIn.read()) != -1) {
+                out.write(b);
+            }
+            imgIn.close();
+            data = out.toByteArray();
+        } else {
+            data = image.getOriginalData();
+        }
+        int sizeBmpWords = (data.length - 14 + 1) >>> 1;
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        // write metafile header
+        writeWord(os, 1);
+        writeWord(os, 9);
+        writeWord(os, 0x0300);
+        writeDWord(os, 9 + 4 + 5 + 5 + (13 + sizeBmpWords) + 3); // total metafile size
+        writeWord(os, 1);
+        writeDWord(os, 14 + sizeBmpWords); // max record size
+        writeWord(os, 0);
+        // write records
+        writeDWord(os, 4);
+        writeWord(os, META_SETMAPMODE);
+        writeWord(os, 8);
+
+        writeDWord(os, 5);
+        writeWord(os, META_SETWINDOWORG);
+        writeWord(os, 0);
+        writeWord(os, 0);
+
+        writeDWord(os, 5);
+        writeWord(os, META_SETWINDOWEXT);
+        writeWord(os, (int) image.getHeight());
+        writeWord(os, (int) image.getWidth());
+
+        writeDWord(os, 13 + sizeBmpWords);
+        writeWord(os, META_DIBSTRETCHBLT);
+        writeDWord(os, 0x00cc0020);
+        writeWord(os, (int) image.getHeight());
+        writeWord(os, (int) image.getWidth());
+        writeWord(os, 0);
+        writeWord(os, 0);
+        writeWord(os, (int) image.getHeight());
+        writeWord(os, (int) image.getWidth());
+        writeWord(os, 0);
+        writeWord(os, 0);
+        os.write(data, 14, data.length - 14);
+        if ((data.length & 1) == 1) {
+            os.write(0);
+        }
+//        writeDWord(os, 14 + sizeBmpWords);
+//        writeWord(os, META_STRETCHDIB);
+//        writeDWord(os, 0x00cc0020);
+//        writeWord(os, 0);
+//        writeWord(os, (int)image.height());
+//        writeWord(os, (int)image.width());
+//        writeWord(os, 0);
+//        writeWord(os, 0);
+//        writeWord(os, (int)image.height());
+//        writeWord(os, (int)image.width());
+//        writeWord(os, 0);
+//        writeWord(os, 0);
+//        os.write(data, 14, data.length - 14);
+//        if ((data.length & 1) == 1)
+//            os.write(0);
+
+        writeDWord(os, 3);
+        writeWord(os, 0);
+        os.close();
+        return os.toByteArray();
+    }
+
+    public static void writeWord(OutputStream os, int v) throws IOException {
+        os.write(v & 0xff);
+        os.write((v >>> 8) & 0xff);
+    }
+
+    public static void writeDWord(OutputStream os, int v) throws IOException {
+        writeWord(os, v & 0xffff);
+        writeWord(os, (v >>> 16) & 0xffff);
+    }
+
+    public void readAll() throws IOException, DocumentException {
         if (in.readInt() != 0x9AC6CDD7) {
             throw new DocumentException(MessageLocalization.getComposedMessage("not.a.placeable.windows.metafile"));
         }
@@ -160,8 +257,8 @@ public void readAll() throws IOException, DocumentException{
         right = in.readShort();
         bottom = in.readShort();
         inch = in.readWord();
-        state.setScalingX((float)(right - left) / (float)inch * 72f);
-        state.setScalingY((float)(bottom - top) / (float)inch * 72f);
+        state.setScalingX((float) (right - left) / (float) inch * 72f);
+        state.setScalingY((float) (bottom - top) / (float) inch * 72f);
         state.setOffsetWx(left);
         state.setOffsetWy(top);
         state.setExtentWx(right - left);
@@ -169,16 +266,17 @@ public void readAll() throws IOException, DocumentException{
         in.readInt();
         in.readWord();
         in.skip(18);
-        
+
         int tsize;
         int function;
         cb.setLineCap(1);
         cb.setLineJoin(1);
-        for (;;) {
+        for (; ; ) {
             int lenMarker = in.getLength();
             tsize = in.readInt();
-            if (tsize < 3)
+            if (tsize < 3) {
                 break;
+            }
             function = in.readWord();
             switch (function) {
                 case 0:
@@ -188,35 +286,30 @@ public void readAll() throws IOException, DocumentException{
                 case META_DIBCREATEPATTERNBRUSH:
                     state.addMetaObject(new MetaObject());
                     break;
-                case META_CREATEPENINDIRECT:
-                {
+                case META_CREATEPENINDIRECT: {
                     MetaPen pen = new MetaPen();
                     pen.init(in);
                     state.addMetaObject(pen);
                     break;
                 }
-                case META_CREATEBRUSHINDIRECT:
-                {
+                case META_CREATEBRUSHINDIRECT: {
                     MetaBrush brush = new MetaBrush();
                     brush.init(in);
                     state.addMetaObject(brush);
                     break;
                 }
-                case META_CREATEFONTINDIRECT:
-                {
+                case META_CREATEFONTINDIRECT: {
                     MetaFont font = new MetaFont();
                     font.init(in);
                     state.addMetaObject(font);
                     break;
                 }
-                case META_SELECTOBJECT:
-                {
+                case META_SELECTOBJECT: {
                     int idx = in.readWord();
                     state.selectMetaObject(idx, cb);
                     break;
                 }
-                case META_DELETEOBJECT:
-                {
+                case META_DELETEOBJECT: {
                     int idx = in.readWord();
                     state.deleteMetaObject(idx);
                     break;
@@ -224,8 +317,7 @@ public void readAll() throws IOException, DocumentException{
                 case META_SAVEDC:
                     state.saveState(cb);
                     break;
-                case META_RESTOREDC:
-                {
+                case META_RESTOREDC: {
                     int idx = in.readShort();
                     state.restoreState(idx, cb);
                     break;
@@ -238,15 +330,13 @@ public void readAll() throws IOException, DocumentException{
                     state.setExtentWy(in.readShort());
                     state.setExtentWx(in.readShort());
                     break;
-                case META_MOVETO:
-                {
+                case META_MOVETO: {
                     int y = in.readShort();
                     Point p = new Point(in.readShort(), y);
                     state.setCurrentPoint(p);
                     break;
                 }
-                case META_LINETO:
-                {
+                case META_LINETO: {
                     int y = in.readShort();
                     int x = in.readShort();
                     Point p = state.getCurrentPoint();
@@ -256,8 +346,7 @@ public void readAll() throws IOException, DocumentException{
                     state.setCurrentPoint(new Point(x, y));
                     break;
                 }
-                case META_POLYLINE:
-                {
+                case META_POLYLINE: {
                     state.setLineJoinPolygon(cb);
                     int len = in.readWord();
                     int x = in.readShort();
@@ -271,10 +360,10 @@ public void readAll() throws IOException, DocumentException{
                     cb.stroke();
                     break;
                 }
-                case META_POLYGON:
-                {
-                    if (isNullStrokeFill(false))
+                case META_POLYGON: {
+                    if (isNullStrokeFill(false)) {
                         break;
+                    }
                     int len = in.readWord();
                     int sx = in.readShort();
                     int sy = in.readShort();
@@ -288,14 +377,15 @@ public void readAll() throws IOException, DocumentException{
                     strokeAndFill();
                     break;
                 }
-                case META_POLYPOLYGON:
-                {
-                    if (isNullStrokeFill(false))
+                case META_POLYPOLYGON: {
+                    if (isNullStrokeFill(false)) {
                         break;
+                    }
                     int numPoly = in.readWord();
                     int[] lens = new int[numPoly];
-                    for (int k = 0; k < lens.length; ++k)
+                    for (int k = 0; k < lens.length; ++k) {
                         lens[k] = in.readWord();
+                    }
                     for (int len : lens) {
                         int sx = in.readShort();
                         int sy = in.readShort();
@@ -310,10 +400,10 @@ public void readAll() throws IOException, DocumentException{
                     strokeAndFill();
                     break;
                 }
-                case META_ELLIPSE:
-                {
-                    if (isNullStrokeFill(state.getLineNeutral()))
+                case META_ELLIPSE: {
+                    if (isNullStrokeFill(state.getLineNeutral())) {
                         break;
+                    }
                     int b = in.readShort();
                     int r = in.readShort();
                     int t = in.readShort();
@@ -322,10 +412,10 @@ public void readAll() throws IOException, DocumentException{
                     strokeAndFill();
                     break;
                 }
-                case META_ARC:
-                {
-                    if (isNullStrokeFill(state.getLineNeutral()))
+                case META_ARC: {
+                    if (isNullStrokeFill(state.getLineNeutral())) {
                         break;
+                    }
                     float yend = state.transformY(in.readShort());
                     float xend = state.transformX(in.readShort());
                     float ystart = state.transformY(in.readShort());
@@ -339,16 +429,17 @@ public void readAll() throws IOException, DocumentException{
                     float arc1 = getArc(cx, cy, xstart, ystart);
                     float arc2 = getArc(cx, cy, xend, yend);
                     arc2 -= arc1;
-                    if (arc2 <= 0)
+                    if (arc2 <= 0) {
                         arc2 += 360;
+                    }
                     cb.arc(l, b, r, t, arc1, arc2);
                     cb.stroke();
                     break;
                 }
-                case META_PIE:
-                {
-                    if (isNullStrokeFill(state.getLineNeutral()))
+                case META_PIE: {
+                    if (isNullStrokeFill(state.getLineNeutral())) {
                         break;
+                    }
                     float yend = state.transformY(in.readShort());
                     float xend = state.transformX(in.readShort());
                     float ystart = state.transformY(in.readShort());
@@ -362,11 +453,13 @@ public void readAll() throws IOException, DocumentException{
                     float arc1 = getArc(cx, cy, xstart, ystart);
                     float arc2 = getArc(cx, cy, xend, yend);
                     arc2 -= arc1;
-                    if (arc2 <= 0)
+                    if (arc2 <= 0) {
                         arc2 += 360;
+                    }
                     List ar = PdfContentByte.bezierArc(l, b, r, t, arc1, arc2);
-                    if (ar.isEmpty())
+                    if (ar.isEmpty()) {
                         break;
+                    }
                     float[] pt = ar.get(0);
                     cb.moveTo(cx, cy);
                     cb.lineTo(pt[0], pt[1]);
@@ -378,10 +471,10 @@ public void readAll() throws IOException, DocumentException{
                     strokeAndFill();
                     break;
                 }
-                case META_CHORD:
-                {
-                    if (isNullStrokeFill(state.getLineNeutral()))
+                case META_CHORD: {
+                    if (isNullStrokeFill(state.getLineNeutral())) {
                         break;
+                    }
                     float yend = state.transformY(in.readShort());
                     float xend = state.transformX(in.readShort());
                     float ystart = state.transformY(in.readShort());
@@ -395,11 +488,13 @@ public void readAll() throws IOException, DocumentException{
                     float arc1 = getArc(cx, cy, xstart, ystart);
                     float arc2 = getArc(cx, cy, xend, yend);
                     arc2 -= arc1;
-                    if (arc2 <= 0)
+                    if (arc2 <= 0) {
                         arc2 += 360;
+                    }
                     List ar = PdfContentByte.bezierArc(l, b, r, t, arc1, arc2);
-                    if (ar.isEmpty())
+                    if (ar.isEmpty()) {
                         break;
+                    }
                     float[] pt = ar.get(0);
                     cx = pt[0];
                     cy = pt[1];
@@ -412,10 +507,10 @@ public void readAll() throws IOException, DocumentException{
                     strokeAndFill();
                     break;
                 }
-                case META_RECTANGLE:
-                {
-                    if (isNullStrokeFill(true))
+                case META_RECTANGLE: {
+                    if (isNullStrokeFill(true)) {
                         break;
+                    }
                     float b = state.transformY(in.readShort());
                     float r = state.transformX(in.readShort());
                     float t = state.transformY(in.readShort());
@@ -424,10 +519,10 @@ public void readAll() throws IOException, DocumentException{
                     strokeAndFill();
                     break;
                 }
-                case META_ROUNDRECT:
-                {
-                    if (isNullStrokeFill(true))
+                case META_ROUNDRECT: {
+                    if (isNullStrokeFill(true)) {
                         break;
+                    }
                     float h = state.transformY(0) - state.transformY(in.readShort());
                     float w = state.transformX(in.readShort()) - state.transformX(0);
                     float b = state.transformY(in.readShort());
@@ -438,8 +533,7 @@ public void readAll() throws IOException, DocumentException{
                     strokeAndFill();
                     break;
                 }
-                case META_INTERSECTCLIPRECT:
-                {
+                case META_INTERSECTCLIPRECT: {
                     float b = state.transformY(in.readShort());
                     float r = state.transformX(in.readShort());
                     float t = state.transformY(in.readShort());
@@ -449,8 +543,7 @@ public void readAll() throws IOException, DocumentException{
                     cb.newPath();
                     break;
                 }
-                case META_EXTTEXTOUT:
-                {
+                case META_EXTTEXTOUT: {
                     int y = in.readShort();
                     int x = in.readShort();
                     int count = in.readWord();
@@ -468,37 +561,36 @@ public void readAll() throws IOException, DocumentException{
                     byte[] text = new byte[count];
                     int k;
                     for (k = 0; k < count; ++k) {
-                        byte c = (byte)in.readByte();
-                        if (c == 0)
+                        byte c = (byte) in.readByte();
+                        if (c == 0) {
                             break;
+                        }
                         text[k] = c;
                     }
                     String s;
                     try {
                         s = new String(text, 0, k, "Cp1252");
-                    }
-                    catch (UnsupportedEncodingException e) {
+                    } catch (UnsupportedEncodingException e) {
                         s = new String(text, 0, k);
                     }
                     outputText(x, y, flag, x1, y1, x2, y2, s);
                     break;
                 }
-                case META_TEXTOUT:
-                {
+                case META_TEXTOUT: {
                     int count = in.readWord();
                     byte[] text = new byte[count];
                     int k;
                     for (k = 0; k < count; ++k) {
-                        byte c = (byte)in.readByte();
-                        if (c == 0)
+                        byte c = (byte) in.readByte();
+                        if (c == 0) {
                             break;
+                        }
                         text[k] = c;
                     }
                     String s;
                     try {
                         s = new String(text, 0, k, "Cp1252");
-                    }
-                    catch (UnsupportedEncodingException e) {
+                    } catch (UnsupportedEncodingException e) {
                         s = new String(text, 0, k);
                     }
                     count = (count + 1) & 0xfffe;
@@ -523,8 +615,7 @@ public void readAll() throws IOException, DocumentException{
                 case META_SETPOLYFILLMODE:
                     state.setPolyFillMode(in.readWord());
                     break;
-                case META_SETPIXEL:
-                {
+                case META_SETPIXEL: {
                     Color color = in.readColor();
                     int y = in.readShort();
                     int x = in.readShort();
@@ -544,14 +635,14 @@ public void readAll() throws IOException, DocumentException{
         }
         state.cleanup(cb);
     }
-    
+
     public void outputText(int x, int y, int flag, int x1, int y1, int x2, int y2, String text) {
         MetaFont font = state.getCurrentFont();
         float refX = state.transformX(x);
         float refY = state.transformY(y);
         float angle = state.transformAngle(font.getAngle());
-        float sin = (float)Math.sin(angle);
-        float cos = (float)Math.cos(angle);
+        float sin = (float) Math.sin(angle);
+        float cos = (float) Math.cos(angle);
         float fontSize = font.getFontSize(state);
         BaseFont bf = font.getFont();
         int align = state.getTextAlign();
@@ -562,16 +653,18 @@ public void outputText(int x, int y, int flag, int x1, int y1, int x2, int y2, S
         float ury = bf.getFontDescriptor(BaseFont.BBOXURY, fontSize);
         cb.saveState();
         cb.concatCTM(cos, sin, -sin, cos, refX, refY);
-        if ((align & MetaState.TA_CENTER) == MetaState.TA_CENTER)
+        if ((align & MetaState.TA_CENTER) == MetaState.TA_CENTER) {
             tx = -textWidth / 2;
-        else if ((align & MetaState.TA_RIGHT) == MetaState.TA_RIGHT)
+        } else if ((align & MetaState.TA_RIGHT) == MetaState.TA_RIGHT) {
             tx = -textWidth;
-        if ((align & MetaState.TA_BASELINE) == MetaState.TA_BASELINE)
+        }
+        if ((align & MetaState.TA_BASELINE) == MetaState.TA_BASELINE) {
             ty = 0;
-        else if ((align & MetaState.TA_BOTTOM) == MetaState.TA_BOTTOM)
+        } else if ((align & MetaState.TA_BOTTOM) == MetaState.TA_BOTTOM) {
             ty = -descender;
-        else
+        } else {
             ty = -ury;
+        }
         Color textColor;
         if (state.getBackgroundMode() == MetaState.OPAQUE) {
             textColor = state.getCurrentBackgroundColor();
@@ -596,24 +689,26 @@ else if ((align & MetaState.TA_BOTTOM) == MetaState.TA_BOTTOM)
         }
         cb.restoreState();
     }
-    
+
     public boolean isNullStrokeFill(boolean isRectangle) {
         MetaPen pen = state.getCurrentPen();
         MetaBrush brush = state.getCurrentBrush();
         boolean noPen = (pen.getStyle() == MetaPen.PS_NULL);
         int style = brush.getStyle();
-        boolean isBrush = (style == MetaBrush.BS_SOLID || (style == MetaBrush.BS_HATCHED && state.getBackgroundMode() == MetaState.OPAQUE));
+        boolean isBrush = (style == MetaBrush.BS_SOLID || (style == MetaBrush.BS_HATCHED
+                && state.getBackgroundMode() == MetaState.OPAQUE));
         boolean result = noPen && !isBrush;
         if (!noPen) {
-            if (isRectangle)
+            if (isRectangle) {
                 state.setLineJoinRectangle(cb);
-            else
+            } else {
                 state.setLineJoinPolygon(cb);
+            }
         }
         return result;
     }
 
-    public void strokeAndFill(){
+    public void strokeAndFill() {
         MetaPen pen = state.getCurrentPen();
         MetaBrush brush = state.getCurrentBrush();
         int penStyle = pen.getStyle();
@@ -622,116 +717,21 @@ public void strokeAndFill(){
             cb.closePath();
             if (state.getPolyFillMode() == MetaState.ALTERNATE) {
                 cb.eoFill();
-            }
-            else {
+            } else {
                 cb.fill();
             }
-        }
-        else {
-            boolean isBrush = (brushStyle == MetaBrush.BS_SOLID || (brushStyle == MetaBrush.BS_HATCHED && state.getBackgroundMode() == MetaState.OPAQUE));
+        } else {
+            boolean isBrush = (brushStyle == MetaBrush.BS_SOLID || (brushStyle == MetaBrush.BS_HATCHED
+                    && state.getBackgroundMode() == MetaState.OPAQUE));
             if (isBrush) {
-                if (state.getPolyFillMode() == MetaState.ALTERNATE)
+                if (state.getPolyFillMode() == MetaState.ALTERNATE) {
                     cb.closePathEoFillStroke();
-                else
+                } else {
                     cb.closePathFillStroke();
-            }
-            else {
+                }
+            } else {
                 cb.closePathStroke();
             }
         }
     }
-    
-    static float getArc(float xCenter, float yCenter, float xDot, float yDot) {
-        double s = Math.atan2(yDot - yCenter, xDot - xCenter);
-        if (s < 0)
-            s += Math.PI * 2;
-        return (float)(s / Math.PI * 180);
-    }
-    
-    public static byte[] wrapBMP(Image image) throws IOException {
-        if (image.getOriginalType() != Image.ORIGINAL_BMP)
-            throw new IOException(MessageLocalization.getComposedMessage("only.bmp.can.be.wrapped.in.wmf"));
-        InputStream imgIn;
-        byte[] data = null;
-        if (image.getOriginalData() == null) {
-            imgIn = image.getUrl().openStream();
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            int b = 0;
-            while ((b = imgIn.read()) != -1)
-                out.write(b);
-            imgIn.close();
-            data = out.toByteArray();
-        }
-        else
-            data = image.getOriginalData();
-        int sizeBmpWords = (data.length - 14 + 1) >>> 1;
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        // write metafile header
-        writeWord(os, 1);
-        writeWord(os, 9);
-        writeWord(os, 0x0300);
-        writeDWord(os, 9 + 4 + 5 + 5 + (13 + sizeBmpWords) + 3); // total metafile size
-        writeWord(os, 1);
-        writeDWord(os, 14 + sizeBmpWords); // max record size
-        writeWord(os, 0);
-        // write records
-        writeDWord(os, 4);
-        writeWord(os, META_SETMAPMODE);
-        writeWord(os, 8);
-
-        writeDWord(os, 5);
-        writeWord(os, META_SETWINDOWORG);
-        writeWord(os, 0);
-        writeWord(os, 0);
-
-        writeDWord(os, 5);
-        writeWord(os, META_SETWINDOWEXT);
-        writeWord(os, (int)image.getHeight());
-        writeWord(os, (int)image.getWidth());
-
-        writeDWord(os, 13 + sizeBmpWords);
-        writeWord(os, META_DIBSTRETCHBLT);
-        writeDWord(os, 0x00cc0020);
-        writeWord(os, (int)image.getHeight());
-        writeWord(os, (int)image.getWidth());
-        writeWord(os, 0);
-        writeWord(os, 0);
-        writeWord(os, (int)image.getHeight());
-        writeWord(os, (int)image.getWidth());
-        writeWord(os, 0);
-        writeWord(os, 0);
-        os.write(data, 14, data.length - 14);
-        if ((data.length & 1) == 1)
-            os.write(0);
-//        writeDWord(os, 14 + sizeBmpWords);
-//        writeWord(os, META_STRETCHDIB);
-//        writeDWord(os, 0x00cc0020);
-//        writeWord(os, 0);
-//        writeWord(os, (int)image.height());
-//        writeWord(os, (int)image.width());
-//        writeWord(os, 0);
-//        writeWord(os, 0);
-//        writeWord(os, (int)image.height());
-//        writeWord(os, (int)image.width());
-//        writeWord(os, 0);
-//        writeWord(os, 0);
-//        os.write(data, 14, data.length - 14);
-//        if ((data.length & 1) == 1)
-//            os.write(0);
-
-        writeDWord(os, 3);
-        writeWord(os, 0);
-        os.close();
-        return os.toByteArray();
-    }
-
-    public static void writeWord(OutputStream os, int v) throws IOException {
-        os.write(v & 0xff);
-        os.write((v >>> 8) & 0xff);
-    }
-    
-    public static void writeDWord(OutputStream os, int v) throws IOException {
-        writeWord(os, v & 0xffff);
-        writeWord(os, (v >>> 16) & 0xffff);
-    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaFont.java b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaFont.java
index 5a16d8d59..12a599a3d 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaFont.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaFont.java
@@ -48,18 +48,18 @@
  */
 
 package com.lowagie.text.pdf.codec.wmf;
-import com.lowagie.text.Document;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.Locale;
-
 
+import com.lowagie.text.Document;
+import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
-import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.pdf.BaseFont;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Locale;
 
 public class MetaFont extends MetaObject {
+
     static final String[] fontNames = {
             "Courier", "Courier-Bold", "Courier-Oblique", "Courier-BoldOblique",
             "Helvetica", "Helvetica-Bold", "Helvetica-Oblique", "Helvetica-BoldOblique",
@@ -82,7 +82,7 @@ public class MetaFont extends MetaObject {
     static final int FF_MODERN = 3;
     static final int FF_SCRIPT = 4;
     static final int FF_DECORATIVE = 5;
-    static final int BOLDTHRESHOLD = 600;    
+    static final int BOLDTHRESHOLD = 600;
     static final int nameSize = 32;
     static final int ETO_OPAQUE = 2;
     static final int ETO_CLIPPED = 4;
@@ -105,7 +105,7 @@ public MetaFont() {
     public void init(InputMeta in) throws IOException {
         height = Math.abs(in.readShort());
         in.skip(2);
-        angle = (float)(in.readShort() / 1800.0 * Math.PI);
+        angle = (float) (in.readShort() / 1800.0 * Math.PI);
         in.skip(2);
         bold = (in.readShort() >= BOLDTHRESHOLD ? MARKER_BOLD : 0);
         italic = (in.readByte() != 0 ? MARKER_ITALIC : 0);
@@ -121,44 +121,41 @@ public void init(InputMeta in) throws IOException {
             if (c == 0) {
                 break;
             }
-            name[k] = (byte)c;
+            name[k] = (byte) c;
         }
         try {
             faceName = new String(name, 0, k, "Cp1252");
-        }
-        catch (UnsupportedEncodingException e) {
+        } catch (UnsupportedEncodingException e) {
             faceName = new String(name, 0, k);
         }
         faceName = faceName.toLowerCase(Locale.ROOT);
     }
-    
+
     public BaseFont getFont() {
-        if (font != null)
+        if (font != null) {
             return font;
-        Font ff2 = FontFactory.getFont(faceName, BaseFont.CP1252, true, 10, ((italic != 0) ? Font.ITALIC : 0) | ((bold != 0) ? Font.BOLD : 0));
+        }
+        Font ff2 = FontFactory.getFont(faceName, BaseFont.CP1252, true, 10,
+                ((italic != 0) ? Font.ITALIC : 0) | ((bold != 0) ? Font.BOLD : 0));
         font = ff2.getBaseFont();
-        if (font != null)
+        if (font != null) {
             return font;
+        }
         String fontName;
         if (faceName.contains("courier") || faceName.contains("terminal")
-            || faceName.contains("fixedsys")) {
+                || faceName.contains("fixedsys")) {
             fontName = fontNames[MARKER_COURIER + italic + bold];
-        }
-        else if (faceName.contains("ms sans serif") || faceName.contains("arial")
-            || faceName.contains("system")) {
+        } else if (faceName.contains("ms sans serif") || faceName.contains("arial")
+                || faceName.contains("system")) {
             fontName = fontNames[MARKER_HELVETICA + italic + bold];
-        }
-        else if (faceName.contains("arial black")) {
+        } else if (faceName.contains("arial black")) {
             fontName = fontNames[MARKER_HELVETICA + italic + MARKER_BOLD];
-        }
-        else if (faceName.contains("times") || faceName.contains("ms serif")
-            || faceName.contains("roman")) {
+        } else if (faceName.contains("times") || faceName.contains("ms serif")
+                || faceName.contains("roman")) {
             fontName = fontNames[MARKER_TIMES + italic + bold];
-        }
-        else if (faceName.contains("symbol")) {
+        } else if (faceName.contains("symbol")) {
             fontName = fontNames[MARKER_SYMBOL];
-        }
-        else {
+        } else {
             int pitch = pitchAndFamily & 3;
             int family = (pitchAndFamily >> 4) & 7;
             switch (family) {
@@ -173,8 +170,7 @@ else if (faceName.contains("symbol")) {
                 case FF_DECORATIVE:
                     fontName = fontNames[MARKER_HELVETICA + italic + bold];
                     break;
-                default:
-                {
+                default: {
                     switch (pitch) {
                         case FIXED_PITCH:
                             fontName = fontNames[MARKER_COURIER + italic + bold];
@@ -188,26 +184,25 @@ else if (faceName.contains("symbol")) {
         }
         try {
             font = BaseFont.createFont(fontName, "Cp1252", false);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
-        
+
         return font;
     }
-    
+
     public float getAngle() {
         return angle;
     }
-    
+
     public boolean isUnderline() {
         return underline;
     }
-    
+
     public boolean isStrikeout() {
         return strikeout;
     }
-    
+
     public float getFontSize(MetaState state) {
         return Math.abs(state.transformY(height) - state.transformY(0)) * Document.wmfFontCorrection;
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaObject.java b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaObject.java
index 0e70c7f3c..145f8dded 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaObject.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaObject.java
@@ -50,6 +50,7 @@
 package com.lowagie.text.pdf.codec.wmf;
 
 public class MetaObject {
+
     public static final int META_NOT_SUPPORTED = 0;
     public static final int META_PEN = 1;
     public static final int META_BRUSH = 2;
@@ -62,7 +63,7 @@ public MetaObject() {
     public MetaObject(int type) {
         this.type = type;
     }
-    
+
     public int getType() {
         return type;
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaPen.java b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaPen.java
index 46f13e5e5..1272c46fa 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaPen.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaPen.java
@@ -48,6 +48,7 @@
  */
 
 package com.lowagie.text.pdf.codec.wmf;
+
 import java.awt.Color;
 import java.io.IOException;
 
@@ -75,15 +76,15 @@ public void init(InputMeta in) throws IOException {
         in.readWord();
         color = in.readColor();
     }
-    
+
     public int getStyle() {
         return style;
     }
-    
+
     public int getPenWidth() {
         return penWidth;
     }
-    
+
     public Color getColor() {
         return color;
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaState.java b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaState.java
index 2022f1387..545ffe708 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaState.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/codec/wmf/MetaState.java
@@ -49,16 +49,15 @@
 
 package com.lowagie.text.pdf.codec.wmf;
 
+import com.lowagie.text.pdf.PdfContentByte;
 import java.awt.Color;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
 
-import com.lowagie.text.pdf.PdfContentByte;
-
 public class MetaState {
-    
+
     public static final int TA_NOUPDATECP = 0;
     public static final int TA_UPDATECP = 1;
     public static final int TA_LEFT = 0;
@@ -67,7 +66,7 @@ public class MetaState {
     public static final int TA_TOP = 0;
     public static final int TA_BOTTOM = 8;
     public static final int TA_BASELINE = 24;
-    
+
     public static final int TRANSPARENT = 1;
     public static final int OPAQUE = 2;
 
@@ -92,9 +91,11 @@ public class MetaState {
     public int extentWy;
     public float scalingX;
     public float scalingY;
-    
 
-    /** Creates new MetaState */
+
+    /**
+     * Creates new MetaState
+     */
     public MetaState() {
         savedStates = new Stack<>();
         MetaObjects = new ArrayList<>();
@@ -107,7 +108,7 @@ public MetaState() {
     public MetaState(MetaState state) {
         setMetaState(state);
     }
-    
+
     public void setMetaState(MetaState state) {
         savedStates = state.savedStates;
         MetaObjects = state.MetaObjects;
@@ -138,28 +139,27 @@ public void addMetaObject(MetaObject object) {
         }
         MetaObjects.add(object);
     }
-    
+
     public void selectMetaObject(int index, PdfContentByte cb) {
-        MetaObject obj = (MetaObject)MetaObjects.get(index);
-        if (obj == null)
+        MetaObject obj = (MetaObject) MetaObjects.get(index);
+        if (obj == null) {
             return;
+        }
         int style;
         switch (obj.getType()) {
             case MetaObject.META_BRUSH:
-                currentBrush = (MetaBrush)obj;
+                currentBrush = (MetaBrush) obj;
                 style = currentBrush.getStyle();
                 if (style == MetaBrush.BS_SOLID) {
                     Color color = currentBrush.getColor();
                     cb.setColorFill(color);
-                }
-                else if (style == MetaBrush.BS_HATCHED) {
+                } else if (style == MetaBrush.BS_HATCHED) {
                     Color color = currentBackgroundColor;
                     cb.setColorFill(color);
                 }
                 break;
-            case MetaObject.META_PEN:
-            {
-                currentPen = (MetaPen)obj;
+            case MetaObject.META_PEN: {
+                currentPen = (MetaPen) obj;
                 style = currentPen.getStyle();
                 if (style != MetaPen.PS_NULL) {
                     Color color = currentPen.getColor();
@@ -180,23 +180,22 @@ else if (style == MetaBrush.BS_HATCHED) {
                             break;
                         default:
                             cb.setLineDash(0);
-                            break;                            
+                            break;
                     }
                 }
                 break;
             }
-            case MetaObject.META_FONT:
-            {
-                currentFont = (MetaFont)obj;
+            case MetaObject.META_FONT: {
+                currentFont = (MetaFont) obj;
                 break;
             }
         }
     }
-    
+
     public void deleteMetaObject(int index) {
         MetaObjects.set(index, null);
     }
-    
+
     public void saveState(PdfContentByte cb) {
         cb.saveState();
         MetaState state = new MetaState(this);
@@ -205,12 +204,14 @@ public void saveState(PdfContentByte cb) {
 
     public void restoreState(int index, PdfContentByte cb) {
         int pops;
-        if (index < 0)
+        if (index < 0) {
             pops = Math.min(-index, savedStates.size());
-        else
+        } else {
             pops = Math.max(savedStates.size() - index, 0);
-        if (pops == 0)
+        }
+        if (pops == 0) {
             return;
+        }
         MetaState state = null;
         while (pops-- != 0) {
             cb.restoreState();
@@ -218,58 +219,59 @@ public void restoreState(int index, PdfContentByte cb) {
         }
         setMetaState(state);
     }
-    
+
     public void cleanup(PdfContentByte cb) {
         int k = savedStates.size();
-        while (k-- > 0)
+        while (k-- > 0) {
             cb.restoreState();
+        }
     }
-    
+
     public float transformX(int x) {
-        return ((float)x - offsetWx) * scalingX / extentWx;
+        return ((float) x - offsetWx) * scalingX / extentWx;
     }
 
     public float transformY(int y) {
-        return (1f - ((float)y - offsetWy) / extentWy) * scalingY;
+        return (1f - ((float) y - offsetWy) / extentWy) * scalingY;
     }
-    
+
     public void setScalingX(float scalingX) {
         this.scalingX = scalingX;
     }
-    
+
     public void setScalingY(float scalingY) {
         this.scalingY = scalingY;
     }
-    
+
     public void setOffsetWx(int offsetWx) {
         this.offsetWx = offsetWx;
     }
-    
+
     public void setOffsetWy(int offsetWy) {
         this.offsetWy = offsetWy;
     }
-    
+
     public void setExtentWx(int extentWx) {
         this.extentWx = extentWx;
     }
-    
+
     public void setExtentWy(int extentWy) {
         this.extentWy = extentWy;
     }
-    
+
     public float transformAngle(float angle) {
         float ta = scalingY < 0 ? -angle : angle;
-        return (float)(scalingX < 0 ? Math.PI - ta : ta);
-    }
-    
-    public void setCurrentPoint(Point p) {
-        currentPoint = p;
+        return (float) (scalingX < 0 ? Math.PI - ta : ta);
     }
 
     public Point getCurrentPoint() {
         return currentPoint;
     }
-    
+
+    public void setCurrentPoint(Point p) {
+        currentPoint = p;
+    }
+
     public MetaBrush getCurrentBrush() {
         return currentBrush;
     }
@@ -281,93 +283,113 @@ public MetaPen getCurrentPen() {
     public MetaFont getCurrentFont() {
         return currentFont;
     }
-    
-    /** Getter for property currentBackgroundColor.
+
+    /**
+     * Getter for property currentBackgroundColor.
+     *
      * @return Value of property currentBackgroundColor.
      */
     public Color getCurrentBackgroundColor() {
         return currentBackgroundColor;
     }
-    
-    /** Setter for property currentBackgroundColor.
+
+    /**
+     * Setter for property currentBackgroundColor.
+     *
      * @param currentBackgroundColor New value of property currentBackgroundColor.
      */
     public void setCurrentBackgroundColor(Color currentBackgroundColor) {
         this.currentBackgroundColor = currentBackgroundColor;
     }
-    
-    /** Getter for property currentTextColor.
+
+    /**
+     * Getter for property currentTextColor.
+     *
      * @return Value of property currentTextColor.
      */
     public Color getCurrentTextColor() {
         return currentTextColor;
     }
-    
-    /** Setter for property currentTextColor.
+
+    /**
+     * Setter for property currentTextColor.
+     *
      * @param currentTextColor New value of property currentTextColor.
      */
     public void setCurrentTextColor(Color currentTextColor) {
         this.currentTextColor = currentTextColor;
     }
-    
-    /** Getter for property backgroundMode.
+
+    /**
+     * Getter for property backgroundMode.
+     *
      * @return Value of property backgroundMode.
      */
     public int getBackgroundMode() {
         return backgroundMode;
     }
-    
-    /** Setter for property backgroundMode.
+
+    /**
+     * Setter for property backgroundMode.
+     *
      * @param backgroundMode New value of property backgroundMode.
      */
     public void setBackgroundMode(int backgroundMode) {
         this.backgroundMode = backgroundMode;
     }
-    
-    /** Getter for property textAlign.
+
+    /**
+     * Getter for property textAlign.
+     *
      * @return Value of property textAlign.
      */
     public int getTextAlign() {
         return textAlign;
     }
-    
-    /** Setter for property textAlign.
+
+    /**
+     * Setter for property textAlign.
+     *
      * @param textAlign New value of property textAlign.
      */
     public void setTextAlign(int textAlign) {
         this.textAlign = textAlign;
     }
-    
-    /** Getter for property polyFillMode.
+
+    /**
+     * Getter for property polyFillMode.
+     *
      * @return Value of property polyFillMode.
      */
     public int getPolyFillMode() {
         return polyFillMode;
     }
-    
-    /** Setter for property polyFillMode.
+
+    /**
+     * Setter for property polyFillMode.
+     *
      * @param polyFillMode New value of property polyFillMode.
      */
     public void setPolyFillMode(int polyFillMode) {
         this.polyFillMode = polyFillMode;
     }
-    
+
     public void setLineJoinRectangle(PdfContentByte cb) {
         if (lineJoin != 0) {
             lineJoin = 0;
             cb.setLineJoin(0);
         }
     }
-    
+
     public void setLineJoinPolygon(PdfContentByte cb) {
         if (lineJoin == 0) {
             lineJoin = 1;
             cb.setLineJoin(1);
         }
     }
-    
+
     public boolean getLineNeutral() {
         return (lineJoin == 0);
     }
-    
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollection.java b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollection.java
index 7734ffc9c..6dae25c84 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollection.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollection.java
@@ -6,59 +6,69 @@
 
 public class PdfCollection extends PdfDictionary {
 
-    /** A type of PDF Collection */
+    /**
+     * A type of PDF Collection
+     */
     public static final int DETAILS = 0;
-    /** A type of PDF Collection */
+    /**
+     * A type of PDF Collection
+     */
     public static final int TILE = 1;
-    /** A type of PDF Collection */
+    /**
+     * A type of PDF Collection
+     */
     public static final int HIDDEN = 2;
-    
+
     /**
      * Constructs a PDF Collection.
-     * @param    type    the type of PDF collection.
+     *
+     * @param type the type of PDF collection.
      */
     public PdfCollection(int type) {
         super(PdfName.COLLECTION);
-        switch(type) {
-        case TILE:
-            put(PdfName.VIEW, PdfName.T);
-            break;
-        case HIDDEN:
-            put(PdfName.VIEW, PdfName.H);
-            break;
-        default:
-            put(PdfName.VIEW, PdfName.D);
+        switch (type) {
+            case TILE:
+                put(PdfName.VIEW, PdfName.T);
+                break;
+            case HIDDEN:
+                put(PdfName.VIEW, PdfName.H);
+                break;
+            default:
+                put(PdfName.VIEW, PdfName.D);
         }
     }
-    
+
     /**
-     * Identifies the document that will be initially presented
-     * in the user interface.
-     * @param description    the description that was used when attaching the file to the document
+     * Identifies the document that will be initially presented in the user interface.
+     *
+     * @param description the description that was used when attaching the file to the document
      */
     public void setInitialDocument(String description) {
         put(PdfName.D, new PdfString(description, null));
     }
-    
-    /**
-     * Sets the Collection schema dictionary.
-     * @param schema    an overview of the collection fields
-     */
-    public void setSchema(PdfCollectionSchema schema) {
-        put(PdfName.SCHEMA, schema);
-    }
-    
+
     /**
      * Gets the Collection schema dictionary.
+     *
      * @return schema    an overview of the collection fields
      */
     public PdfCollectionSchema getSchema() {
-        return (PdfCollectionSchema)get(PdfName.SCHEMA);
+        return (PdfCollectionSchema) get(PdfName.SCHEMA);
     }
-    
+
+    /**
+     * Sets the Collection schema dictionary.
+     *
+     * @param schema an overview of the collection fields
+     */
+    public void setSchema(PdfCollectionSchema schema) {
+        put(PdfName.SCHEMA, schema);
+    }
+
     /**
      * Sets the Collection sort dictionary.
-     * @param sort    a collection sort dictionary
+     *
+     * @param sort a collection sort dictionary
      */
     public void setSort(PdfCollectionSort sort) {
         put(PdfName.SORT, sort);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionField.java b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionField.java
index ae0270a73..86d2bb70b 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionField.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionField.java
@@ -1,5 +1,6 @@
 package com.lowagie.text.pdf.collection;
 
+import com.lowagie.text.error_messages.MessageLocalization;
 import com.lowagie.text.pdf.PdfBoolean;
 import com.lowagie.text.pdf.PdfDate;
 import com.lowagie.text.pdf.PdfDictionary;
@@ -7,92 +8,112 @@
 import com.lowagie.text.pdf.PdfNumber;
 import com.lowagie.text.pdf.PdfObject;
 import com.lowagie.text.pdf.PdfString;
-import com.lowagie.text.error_messages.MessageLocalization;
 
 /**
  * @author blowagie
- *
  */
 public class PdfCollectionField extends PdfDictionary {
-    /** A possible type of collection field. */
+
+    /**
+     * A possible type of collection field.
+     */
     public static final int TEXT = 0;
-    /** A possible type of collection field. */
+    /**
+     * A possible type of collection field.
+     */
     public static final int DATE = 1;
-    /** A possible type of collection field. */
+    /**
+     * A possible type of collection field.
+     */
     public static final int NUMBER = 2;
-    /** A possible type of collection field. */
+    /**
+     * A possible type of collection field.
+     */
     public static final int FILENAME = 3;
-    /** A possible type of collection field. */
+    /**
+     * A possible type of collection field.
+     */
     public static final int DESC = 4;
-    /** A possible type of collection field. */
+    /**
+     * A possible type of collection field.
+     */
     public static final int MODDATE = 5;
-    /** A possible type of collection field. */
+    /**
+     * A possible type of collection field.
+     */
     public static final int CREATIONDATE = 6;
-    /** A possible type of collection field. */
+    /**
+     * A possible type of collection field.
+     */
     public static final int SIZE = 7;
-    
+
     /**
      * The type of the PDF collection field.
+     *
      * @since 2.1.2 (was called type previously)
      */
     protected int fieldType;
 
     /**
      * Creates a PdfCollectionField.
-     * @param name        the field name
-     * @param type        the field type
+     *
+     * @param name the field name
+     * @param type the field type
      */
     public PdfCollectionField(String name, int type) {
         super(PdfName.COLLECTIONFIELD);
         put(PdfName.N, new PdfString(name, PdfObject.TEXT_UNICODE));
         this.fieldType = type;
-        switch(type) {
-        default:
-            put(PdfName.SUBTYPE, PdfName.S);
-            break;
-        case DATE:
-            put(PdfName.SUBTYPE, PdfName.D);
-            break;
-        case NUMBER:
-            put(PdfName.SUBTYPE, PdfName.N);
-            break;
-        case FILENAME:
-            put(PdfName.SUBTYPE, PdfName.F);
-            break;
-        case DESC:
-            put(PdfName.SUBTYPE, PdfName.DESC);
-            break;
-        case MODDATE:
-            put(PdfName.SUBTYPE, PdfName.MODDATE);
-            break;
-        case CREATIONDATE:
-            put(PdfName.SUBTYPE, PdfName.CREATIONDATE);
-            break;
-        case SIZE:
-            put(PdfName.SUBTYPE, PdfName.SIZE);
-            break;
+        switch (type) {
+            default:
+                put(PdfName.SUBTYPE, PdfName.S);
+                break;
+            case DATE:
+                put(PdfName.SUBTYPE, PdfName.D);
+                break;
+            case NUMBER:
+                put(PdfName.SUBTYPE, PdfName.N);
+                break;
+            case FILENAME:
+                put(PdfName.SUBTYPE, PdfName.F);
+                break;
+            case DESC:
+                put(PdfName.SUBTYPE, PdfName.DESC);
+                break;
+            case MODDATE:
+                put(PdfName.SUBTYPE, PdfName.MODDATE);
+                break;
+            case CREATIONDATE:
+                put(PdfName.SUBTYPE, PdfName.CREATIONDATE);
+                break;
+            case SIZE:
+                put(PdfName.SUBTYPE, PdfName.SIZE);
+                break;
         }
     }
-    
+
     /**
      * The relative order of the field name. Fields are sorted in ascending order.
-     * @param i    a number indicating the order of the field
+     *
+     * @param i a number indicating the order of the field
      */
     public void setOrder(int i) {
         put(PdfName.O, new PdfNumber(i));
     }
-    
+
     /**
      * Sets the initial visibility of the field.
-     * @param visible    the default is true (visible)
+     *
+     * @param visible the default is true (visible)
      */
     public void setVisible(boolean visible) {
         put(PdfName.V, new PdfBoolean(visible));
     }
-    
+
     /**
      * Indication if the field value should be editable in the viewer.
-     * @param editable    the default is false (not editable)
+     *
+     * @param editable the default is false (not editable)
      */
     public void setEditable(boolean editable) {
         put(PdfName.E, new PdfBoolean(editable));
@@ -100,33 +121,37 @@ public void setEditable(boolean editable) {
 
     /**
      * Checks if the type of the field is suitable for a Collection Item.
+     *
      * @return true if it is a Collection item, false otherwise
      */
     public boolean isCollectionItem() {
-        switch(fieldType) {
-        case TEXT:
-        case DATE:
-        case NUMBER:
-            return true;
-        default:
-            return false;
+        switch (fieldType) {
+            case TEXT:
+            case DATE:
+            case NUMBER:
+                return true;
+            default:
+                return false;
         }
     }
-    
+
     /**
      * Returns a PdfObject that can be used as the value of a Collection Item.
-     * @param v    value    the value that has to be changed into a PdfObject (PdfString, PdfDate or PdfNumber)
-     * @return  a PdfObject that can be used as the value of a Collection Item.
+     *
+     * @param v value    the value that has to be changed into a PdfObject (PdfString, PdfDate or PdfNumber)
+     * @return a PdfObject that can be used as the value of a Collection Item.
      */
     public PdfObject getValue(String v) {
-        switch(fieldType) {
-        case TEXT:
-            return new PdfString(v, PdfObject.TEXT_UNICODE);
-        case DATE:
-            return new PdfDate(PdfDate.decode(v));
-        case NUMBER:
-            return new PdfNumber(v);
+        switch (fieldType) {
+            case TEXT:
+                return new PdfString(v, PdfObject.TEXT_UNICODE);
+            case DATE:
+                return new PdfDate(PdfDate.decode(v));
+            case NUMBER:
+                return new PdfNumber(v);
         }
-        throw new IllegalArgumentException(MessageLocalization.getComposedMessage("1.is.not.an.acceptable.value.for.the.field.2", v, get(PdfName.N).toString()));
+        throw new IllegalArgumentException(
+                MessageLocalization.getComposedMessage("1.is.not.an.acceptable.value.for.the.field.2", v,
+                        get(PdfName.N).toString()));
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionItem.java b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionItem.java
index e408656c3..31585b48e 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionItem.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionItem.java
@@ -1,126 +1,138 @@
 package com.lowagie.text.pdf.collection;
 
-import java.util.Calendar;
 import com.lowagie.text.error_messages.MessageLocalization;
-
 import com.lowagie.text.pdf.PdfDate;
 import com.lowagie.text.pdf.PdfDictionary;
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfNumber;
 import com.lowagie.text.pdf.PdfObject;
 import com.lowagie.text.pdf.PdfString;
+import java.util.Calendar;
 
 public class PdfCollectionItem extends PdfDictionary {
-    
-    /** The PdfCollectionSchema with the names and types of the items. */
+
+    /**
+     * The PdfCollectionSchema with the names and types of the items.
+     */
     PdfCollectionSchema schema;
-    
+
     /**
      * Constructs a Collection Item that can be added to a PdfFileSpecification.
+     *
      * @param schema the PdfCollectionSchema
      */
     public PdfCollectionItem(PdfCollectionSchema schema) {
         super(PdfName.COLLECTIONITEM);
         this.schema = schema;
     }
-    
+
     /**
      * Sets the value of the collection item.
+     *
      * @param value the value (a String)
-     * @param key the key
+     * @param key   the key
      */
     public void addItem(String key, String value) {
         PdfName fieldname = new PdfName(key);
-        PdfCollectionField field = (PdfCollectionField)schema.get(fieldname);
+        PdfCollectionField field = (PdfCollectionField) schema.get(fieldname);
         put(fieldname, field.getValue(value));
     }
-    
+
     /**
      * Sets the value of the collection item.
+     *
      * @param value the value (a PdfString)
-     * @param key the key
+     * @param key   the key
      */
     public void addItem(String key, PdfString value) {
         PdfName fieldname = new PdfName(key);
-        PdfCollectionField field = (PdfCollectionField)schema.get(fieldname);
+        PdfCollectionField field = (PdfCollectionField) schema.get(fieldname);
         if (field.fieldType == PdfCollectionField.TEXT) {
             put(fieldname, value);
         }
     }
-    
+
     /**
      * Sets the value of the collection item.
-     * @param d the value (a PdfDate)
+     *
+     * @param d   the value (a PdfDate)
      * @param key the key
      */
     public void addItem(String key, PdfDate d) {
         PdfName fieldname = new PdfName(key);
-        PdfCollectionField field = (PdfCollectionField)schema.get(fieldname);
+        PdfCollectionField field = (PdfCollectionField) schema.get(fieldname);
         if (field.fieldType == PdfCollectionField.DATE) {
             put(fieldname, d);
         }
     }
-    
+
     /**
      * Sets the value of the collection item.
-     * @param n the value (a PdfNumber)
+     *
+     * @param n   the value (a PdfNumber)
      * @param key the key
      */
     public void addItem(String key, PdfNumber n) {
         PdfName fieldname = new PdfName(key);
-        PdfCollectionField field = (PdfCollectionField)schema.get(fieldname);
+        PdfCollectionField field = (PdfCollectionField) schema.get(fieldname);
         if (field.fieldType == PdfCollectionField.NUMBER) {
             put(fieldname, n);
         }
     }
-    
+
     /**
      * Sets the value of the collection item.
-     * @param c the value (a Calendar)
+     *
+     * @param c   the value (a Calendar)
      * @param key the key
      */
     public void addItem(String key, Calendar c) {
         addItem(key, new PdfDate(c));
     }
-    
+
     /**
      * Sets the value of the collection item.
-     * @param i the value
+     *
+     * @param i   the value
      * @param key the key
      */
     public void addItem(String key, int i) {
         addItem(key, new PdfNumber(i));
     }
-    
+
     /**
      * Sets the value of the collection item.
-     * @param f the value
+     *
+     * @param f   the value
      * @param key the key
      */
     public void addItem(String key, float f) {
         addItem(key, new PdfNumber(f));
     }
-    
+
     /**
      * Sets the value of the collection item.
-     * @param d the value
+     *
+     * @param d   the value
      * @param key the key
      */
     public void addItem(String key, double d) {
         addItem(key, new PdfNumber(d));
     }
-    
+
     /**
-     * Adds a prefix for the Collection item.
-     * You can only use this method after you have set the value of the item.
-     * @param prefix    a prefix
-     * @param key       the key
+     * Adds a prefix for the Collection item. You can only use this method after you have set the value of the item.
+     *
+     * @param prefix a prefix
+     * @param key    the key
      */
     public void setPrefix(String key, String prefix) {
         PdfName fieldname = new PdfName(key);
         PdfObject o = get(fieldname);
-        if (o == null)
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("you.must.set.a.value.before.adding.a.prefix"));
+        if (o == null) {
+            throw new IllegalArgumentException(
+                    MessageLocalization.getComposedMessage("you.must.set.a.value.before.adding.a.prefix"));
+        }
         PdfDictionary dict = new PdfDictionary(PdfName.COLLECTIONSUBITEM);
         dict.put(PdfName.D, o);
         dict.put(PdfName.P, new PdfString(prefix, PdfObject.TEXT_UNICODE));
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionSchema.java b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionSchema.java
index 719f104a5..5ee88a6b2 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionSchema.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionSchema.java
@@ -4,17 +4,19 @@
 import com.lowagie.text.pdf.PdfName;
 
 public class PdfCollectionSchema extends PdfDictionary {
+
     /**
      * Creates a Collection Schema dictionary.
      */
     public PdfCollectionSchema() {
         super(PdfName.COLLECTIONSCHEMA);
     }
-    
+
     /**
      * Adds a Collection field to the Schema.
-     * @param name    the name of the collection field
-     * @param field    a Collection Field
+     *
+     * @param name  the name of the collection field
+     * @param field a Collection Field
      */
     public void addField(String name, PdfCollectionField field) {
         put(new PdfName(name), field);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionSort.java b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionSort.java
index 5bb55ebc2..1c71fea88 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionSort.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfCollectionSort.java
@@ -1,26 +1,28 @@
 package com.lowagie.text.pdf.collection;
 
+import com.lowagie.text.error_messages.MessageLocalization;
 import com.lowagie.text.pdf.PdfArray;
 import com.lowagie.text.pdf.PdfBoolean;
 import com.lowagie.text.pdf.PdfDictionary;
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfObject;
-import com.lowagie.text.error_messages.MessageLocalization;
 
 public class PdfCollectionSort extends PdfDictionary {
-    
+
     /**
      * Constructs a PDF Collection Sort Dictionary.
-     * @param key    the key of the field that will be used to sort entries
+     *
+     * @param key the key of the field that will be used to sort entries
      */
     public PdfCollectionSort(String key) {
         super(PdfName.COLLECTIONSORT);
         put(PdfName.S, new PdfName(key));
     }
-    
+
     /**
      * Constructs a PDF Collection Sort Dictionary.
-     * @param keys    the keys of the fields that will be used to sort entries
+     *
+     * @param keys the keys of the fields that will be used to sort entries
      */
     public PdfCollectionSort(String[] keys) {
         super(PdfName.COLLECTIONSORT);
@@ -30,41 +32,44 @@ public PdfCollectionSort(String[] keys) {
         }
         put(PdfName.S, array);
     }
-    
+
     /**
      * Defines the sort order of the field (ascending or descending).
-     * @param ascending    true is the default, use false for descending order
+     *
+     * @param ascending true is the default, use false for descending order
      */
     public void setSortOrder(boolean ascending) {
         PdfObject o = get(PdfName.S);
         if (o instanceof PdfName) {
             put(PdfName.A, new PdfBoolean(ascending));
-        }
-        else {
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("you.have.to.define.a.boolean.array.for.this.collection.sort.dictionary"));
+        } else {
+            throw new IllegalArgumentException(MessageLocalization.getComposedMessage(
+                    "you.have.to.define.a.boolean.array.for.this.collection.sort.dictionary"));
         }
     }
-    
+
     /**
      * Defines the sort order of the field (ascending or descending).
-     * @param ascending    an array with every element corresponding with a name of a field.
+     *
+     * @param ascending an array with every element corresponding with a name of a field.
      */
     public void setSortOrder(boolean[] ascending) {
         PdfObject o = get(PdfName.S);
         if (o instanceof PdfArray) {
-            if (((PdfArray)o).size() != ascending.length) {
-                throw new IllegalArgumentException(MessageLocalization.getComposedMessage("the.number.of.booleans.in.this.array.doesn.t.correspond.with.the.number.of.fields"));
+            if (((PdfArray) o).size() != ascending.length) {
+                throw new IllegalArgumentException(MessageLocalization.getComposedMessage(
+                        "the.number.of.booleans.in.this.array.doesn.t.correspond.with.the.number.of.fields"));
             }
             PdfArray array = new PdfArray();
             for (boolean b : ascending) {
                 array.add(new PdfBoolean(b));
             }
             put(PdfName.A, array);
-        }
-        else {
-            throw new IllegalArgumentException(MessageLocalization.getComposedMessage("you.need.a.single.boolean.for.this.collection.sort.dictionary"));
+        } else {
+            throw new IllegalArgumentException(MessageLocalization.getComposedMessage(
+                    "you.need.a.single.boolean.for.this.collection.sort.dictionary"));
         }
     }
-    
-    
+
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfTargetDictionary.java b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfTargetDictionary.java
index 2630a26b9..971667d28 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfTargetDictionary.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/collection/PdfTargetDictionary.java
@@ -7,85 +7,93 @@
 import com.lowagie.text.pdf.PdfString;
 
 public class PdfTargetDictionary extends PdfDictionary {
-    
+
     /**
      * Creates dictionary referring to a target document that is the parent of the current document.
-     * @param nested    null if this is the actual target, another target if this is only an intermediate target.
+     *
+     * @param nested null if this is the actual target, another target if this is only an intermediate target.
      */
     public PdfTargetDictionary(PdfTargetDictionary nested) {
         super();
         put(PdfName.R, PdfName.P);
-        if (nested != null)
+        if (nested != null) {
             setAdditionalPath(nested);
+        }
     }
-    
+
     /**
      * Creates a dictionary referring to a target document.
-     * @param child    if false, this refers to the parent document; if true, this refers to a child document, and you'll have to specify where to find the child using the other methods of this class
+     *
+     * @param child if false, this refers to the parent document; if true, this refers to a child document, and you'll
+     *              have to specify where to find the child using the other methods of this class
      */
     public PdfTargetDictionary(boolean child) {
         super();
         if (child) {
             put(PdfName.R, PdfName.C);
-        }
-        else {
+        } else {
             put(PdfName.R, PdfName.P);
         }
     }
-    
+
     /**
-     * If this dictionary refers to a child that is a document level attachment,
-     * you need to specify the name that was used to attach the document.
-     * @param    target    the name in the EmbeddedFiles name tree
+     * If this dictionary refers to a child that is a document level attachment, you need to specify the name that was
+     * used to attach the document.
+     *
+     * @param target the name in the EmbeddedFiles name tree
      */
     public void setEmbeddedFileName(String target) {
         put(PdfName.N, new PdfString(target, null));
     }
-    
+
     /**
-     * If this dictionary refers to a child that is a file attachment added to a page,
-     * you need to specify the name of the page (or use setFileAttachmentPage to specify the page number).
-     * Once you have specified the page, you still need to specify the attachment using another method.
-     * @param name    the named destination referring to the page with the file attachment.
+     * If this dictionary refers to a child that is a file attachment added to a page, you need to specify the name of
+     * the page (or use setFileAttachmentPage to specify the page number). Once you have specified the page, you still
+     * need to specify the attachment using another method.
+     *
+     * @param name the named destination referring to the page with the file attachment.
      */
     public void setFileAttachmentPagename(String name) {
         put(PdfName.P, new PdfString(name, null));
     }
-    
+
     /**
-     * If this dictionary refers to a child that is a file attachment added to a page,
-     * you need to specify the page number (or use setFileAttachmentPagename to specify a named destination).
-     * Once you have specified the page, you still need to specify the attachment using another method.
-     * @param page    the page number of the page with the file attachment.
+     * If this dictionary refers to a child that is a file attachment added to a page, you need to specify the page
+     * number (or use setFileAttachmentPagename to specify a named destination). Once you have specified the page, you
+     * still need to specify the attachment using another method.
+     *
+     * @param page the page number of the page with the file attachment.
      */
     public void setFileAttachmentPage(int page) {
         put(PdfName.P, new PdfNumber(page));
     }
-    
+
     /**
-     * If this dictionary refers to a child that is a file attachment added to a page,
-     * you need to specify the page with setFileAttachmentPage or setFileAttachmentPageName,
-     * and then specify the name of the attachment added to this page (or use setFileAttachmentIndex).
-     * @param name        the name of the attachment
+     * If this dictionary refers to a child that is a file attachment added to a page, you need to specify the page with
+     * setFileAttachmentPage or setFileAttachmentPageName, and then specify the name of the attachment added to this
+     * page (or use setFileAttachmentIndex).
+     *
+     * @param name the name of the attachment
      */
     public void setFileAttachmentName(String name) {
         put(PdfName.A, new PdfString(name, PdfObject.TEXT_UNICODE));
     }
-    
+
     /**
-     * If this dictionary refers to a child that is a file attachment added to a page,
-     * you need to specify the page with setFileAttachmentPage or setFileAttachmentPageName,
-     * and then specify the index of the attachment added to this page (or use setFileAttachmentName).
-     * @param annotation        the number of the attachment
+     * If this dictionary refers to a child that is a file attachment added to a page, you need to specify the page with
+     * setFileAttachmentPage or setFileAttachmentPageName, and then specify the index of the attachment added to this
+     * page (or use setFileAttachmentName).
+     *
+     * @param annotation the number of the attachment
      */
     public void setFileAttachmentIndex(int annotation) {
         put(PdfName.A, new PdfNumber(annotation));
     }
-    
+
     /**
-     * If this dictionary refers to an intermediate target, you can
-     * add the next target in the sequence.
-     * @param nested    the next target in the sequence
+     * If this dictionary refers to an intermediate target, you can add the next target in the sequence.
+     *
+     * @param nested the next target in the sequence
      */
     public void setAdditionalPath(PdfTargetDictionary nested) {
         put(PdfName.T, nested);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/crypto/AESCipher.java b/openpdf/src/main/java/com/lowagie/text/pdf/crypto/AESCipher.java
index a50bc6ceb..9bb0da618 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/crypto/AESCipher.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/crypto/AESCipher.java
@@ -57,49 +57,55 @@
 
 /**
  * Creates an AES Cipher with CBC and padding PKCS5/7.
- * 
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class AESCipher {
-  private final PaddedBufferedBlockCipher bp;
 
-  /** Creates a new instance of AESCipher
-   * @param forEncryption If it is for encryption
-   * @param iv            An initialization vector
-   * @param key           Bytes for key*/
-  public AESCipher(boolean forEncryption, byte[] key, byte[] iv) {
-    BlockCipher aes = new AESEngine();
-    BlockCipher cbc = new CBCBlockCipher(aes);
-    bp = new PaddedBufferedBlockCipher(cbc);
-    KeyParameter kp = new KeyParameter(key);
-    ParametersWithIV piv = new ParametersWithIV(kp, iv);
-    bp.init(forEncryption, piv);
-  }
+    private final PaddedBufferedBlockCipher bp;
+
+    /**
+     * Creates a new instance of AESCipher
+     *
+     * @param forEncryption If it is for encryption
+     * @param iv            An initialization vector
+     * @param key           Bytes for key
+     */
+    public AESCipher(boolean forEncryption, byte[] key, byte[] iv) {
+        BlockCipher aes = new AESEngine();
+        BlockCipher cbc = new CBCBlockCipher(aes);
+        bp = new PaddedBufferedBlockCipher(cbc);
+        KeyParameter kp = new KeyParameter(key);
+        ParametersWithIV piv = new ParametersWithIV(kp, iv);
+        bp.init(forEncryption, piv);
+    }
 
-  public byte[] update(byte[] inp, int inpOff, int inpLen) {
-    int neededLen = bp.getUpdateOutputSize(inpLen);
-    byte[] outp = null;
-    if (neededLen > 0)
-      outp = new byte[neededLen];
-    bp.processBytes(inp, inpOff, inpLen, outp, 0);
-    return outp;
-  }
+    public byte[] update(byte[] inp, int inpOff, int inpLen) {
+        int neededLen = bp.getUpdateOutputSize(inpLen);
+        byte[] outp = null;
+        if (neededLen > 0) {
+            outp = new byte[neededLen];
+        }
+        bp.processBytes(inp, inpOff, inpLen, outp, 0);
+        return outp;
+    }
 
-  public byte[] doFinal() {
-    int neededLen = bp.getOutputSize(0);
-    byte[] outp = new byte[neededLen];
-    int n;
-    try {
-      n = bp.doFinal(outp, 0);
-    } catch (Exception ex) {
-      return outp;
+    public byte[] doFinal() {
+        int neededLen = bp.getOutputSize(0);
+        byte[] outp = new byte[neededLen];
+        int n;
+        try {
+            n = bp.doFinal(outp, 0);
+        } catch (Exception ex) {
+            return outp;
+        }
+        if (n != outp.length) {
+            byte[] outp2 = new byte[n];
+            System.arraycopy(outp, 0, outp2, 0, n);
+            return outp2;
+        } else {
+            return outp;
+        }
     }
-    if (n != outp.length) {
-      byte[] outp2 = new byte[n];
-      System.arraycopy(outp, 0, outp2, 0, n);
-      return outp2;
-    } else
-      return outp;
-  }
 
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/crypto/ARCFOUREncryption.java b/openpdf/src/main/java/com/lowagie/text/pdf/crypto/ARCFOUREncryption.java
index c0b8e499a..e394ad76b 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/crypto/ARCFOUREncryption.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/crypto/ARCFOUREncryption.java
@@ -49,14 +49,17 @@
 package com.lowagie.text.pdf.crypto;
 
 public class ARCFOUREncryption {
+
     private byte[] state = new byte[256];
     private int x;
     private int y;
 
-    /** Creates a new instance of ARCFOUREncryption */
+    /**
+     * Creates a new instance of ARCFOUREncryption
+     */
     public ARCFOUREncryption() {
     }
-    
+
     public void prepareARCFOURKey(byte[] key) {
         prepareARCFOURKey(key, 0, key.length);
     }
@@ -64,8 +67,9 @@ public void prepareARCFOURKey(byte[] key) {
     public void prepareARCFOURKey(byte[] key, int off, int len) {
         int index1 = 0;
         int index2 = 0;
-        for (int k = 0; k < 256; ++k)
-            state[k] = (byte)k;
+        for (int k = 0; k < 256; ++k) {
+            state[k] = (byte) k;
+        }
         x = 0;
         y = 0;
         byte tmp;
@@ -87,7 +91,7 @@ public void encryptARCFOUR(byte[] dataIn, int off, int len, byte[] dataOut, int
             tmp = state[x];
             state[x] = state[y];
             state[y] = tmp;
-            dataOut[k - off + offOut] = (byte)(dataIn[k] ^ state[(state[x] + state[y]) & 255]);
+            dataOut[k - off + offOut] = (byte) (dataIn[k] ^ state[(state[x] + state[y]) & 255]);
         }
     }
 
@@ -101,5 +105,5 @@ public void encryptARCFOUR(byte[] dataIn, byte[] dataOut) {
 
     public void encryptARCFOUR(byte[] data) {
         encryptARCFOUR(data, 0, data.length, data, 0);
-    }   
+    }
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/crypto/IVGenerator.java b/openpdf/src/main/java/com/lowagie/text/pdf/crypto/IVGenerator.java
index 831f3a7f7..adec44237 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/crypto/IVGenerator.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/crypto/IVGenerator.java
@@ -50,12 +50,13 @@
 
 /**
  * An initialization vector generator for a CBC block encryption. It's a random generator based on ARCFOUR.
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public final class IVGenerator {
-    
+
     private static ARCFOUREncryption arcfour;
-    
+
     static {
         arcfour = new ARCFOUREncryption();
         long time = System.currentTimeMillis();
@@ -63,21 +64,25 @@ public final class IVGenerator {
         String s = time + "+" + mem;
         arcfour.prepareARCFOURKey(s.getBytes());
     }
-    
-    /** Creates a new instance of IVGenerator */
+
+    /**
+     * Creates a new instance of IVGenerator
+     */
     private IVGenerator() {
     }
-    
+
     /**
      * Gets a 16 byte random initialization vector.
+     *
      * @return a 16 byte random initialization vector
      */
     public static byte[] getIV() {
         return getIV(16);
     }
-    
+
     /**
      * Gets a random initialization vector.
+     *
      * @param len the length of the initialization vector
      * @return a random initialization vector
      */
@@ -87,5 +92,5 @@ public static byte[] getIV(int len) {
             arcfour.encryptARCFOUR(b);
         }
         return b;
-    }    
+    }
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/draw/DottedLineSeparator.java b/openpdf/src/main/java/com/lowagie/text/pdf/draw/DottedLineSeparator.java
index c86d3c890..ba3b50564 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/draw/DottedLineSeparator.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/draw/DottedLineSeparator.java
@@ -52,18 +52,21 @@
 import com.lowagie.text.pdf.PdfContentByte;
 
 /**
- * Element that draws a dotted line from left to right.
- * Can be added directly to a document or column.
- * Can also be used to create a separator chunk.
- * @since    2.1.2 
+ * Element that draws a dotted line from left to right. Can be added directly to a document or column. Can also be used
+ * to create a separator chunk.
+ *
+ * @since 2.1.2
  */
 public class DottedLineSeparator extends LineSeparator {
 
-    /** the gap between the dots. */
+    /**
+     * the gap between the dots.
+     */
     protected float gap = 5;
-    
+
     /**
-     * @see com.lowagie.text.pdf.draw.DrawInterface#draw(com.lowagie.text.pdf.PdfContentByte, float, float, float, float, float)
+     * @see com.lowagie.text.pdf.draw.DrawInterface#draw(com.lowagie.text.pdf.PdfContentByte, float, float, float,
+     * float, float)
      */
     public void draw(PdfContentByte canvas, float llx, float lly, float urx, float ury, float y) {
         canvas.saveState();
@@ -76,7 +79,8 @@ public void draw(PdfContentByte canvas, float llx, float lly, float urx, float u
 
     /**
      * Getter for the gap between the center of the dots of the dotted line.
-     * @return    the gap between the center of the dots
+     *
+     * @return the gap between the center of the dots
      */
     public float getGap() {
         return gap;
@@ -84,7 +88,8 @@ public float getGap() {
 
     /**
      * Setter for the gap between the center of the dots of the dotted line.
-     * @param    gap    the gap between the center of the dots
+     *
+     * @param gap the gap between the center of the dots
      */
     public void setGap(float gap) {
         this.gap = gap;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/draw/DrawInterface.java b/openpdf/src/main/java/com/lowagie/text/pdf/draw/DrawInterface.java
index 62783258a..640c1e36b 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/draw/DrawInterface.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/draw/DrawInterface.java
@@ -52,21 +52,22 @@
 import com.lowagie.text.pdf.PdfContentByte;
 
 /**
- * Interface for an Element that allows you to draw something at the current
- * vertical position. Trivial implementations are LineSeparator and VerticalPositionMark.
- * It is also used to define what has to be drawn by a separator chunk.
+ * Interface for an Element that allows you to draw something at the current vertical position. Trivial implementations
+ * are LineSeparator and VerticalPositionMark. It is also used to define what has to be drawn by a separator chunk.
+ *
  * @since 2.1.2
  */
 public interface DrawInterface {
+
     /**
-     * Implement this method if you want to draw something at the current Y position
-     * (for instance a line).
-     * @param    canvas    the canvas on which you can draw
-     * @param    llx        the x coordinate of the left page margin
-     * @param    lly        the y coordinate of the bottom page margin
-     * @param    urx        the x coordinate of the right page margin
-     * @param    ury        the y coordinate of the top page margin
-     * @param    y        the current y position on the page
+     * Implement this method if you want to draw something at the current Y position (for instance a line).
+     *
+     * @param canvas the canvas on which you can draw
+     * @param llx    the x coordinate of the left page margin
+     * @param lly    the y coordinate of the bottom page margin
+     * @param urx    the x coordinate of the right page margin
+     * @param ury    the y coordinate of the top page margin
+     * @param y      the current y position on the page
      */
     void draw(PdfContentByte canvas, float llx, float lly, float urx, float ury, float y);
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/draw/LineSeparator.java b/openpdf/src/main/java/com/lowagie/text/pdf/draw/LineSeparator.java
index f48f2c2b1..ec6027f01 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/draw/LineSeparator.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/draw/LineSeparator.java
@@ -51,34 +51,42 @@
 
 import com.lowagie.text.Element;
 import com.lowagie.text.pdf.PdfContentByte;
-
 import java.awt.Color;
 
 /**
- * Element that draws a solid line from left to right.
- * Can be added directly to a document or column.
- * Can also be used to create a separator chunk.
- * @author    Paulo Soares
- * @since    2.1.2
+ * Element that draws a solid line from left to right. Can be added directly to a document or column. Can also be used
+ * to create a separator chunk.
+ *
+ * @author Paulo Soares
+ * @since 2.1.2
  */
 public class LineSeparator extends VerticalPositionMark {
-    
-    /** The thickness of the line. */
+
+    /**
+     * The thickness of the line.
+     */
     protected float lineWidth = 1;
-    /** The width of the line as a percentage of the available page width. */
+    /**
+     * The width of the line as a percentage of the available page width.
+     */
     protected float percentage = 100;
-    /** The color of the line. */
+    /**
+     * The color of the line.
+     */
     protected Color lineColor;
-    /** The alignment of the line. */
+    /**
+     * The alignment of the line.
+     */
     protected int alignment = Element.ALIGN_CENTER;
-    
+
     /**
      * Creates a new instance of the LineSeparator class.
-     * @param lineWidth        the thickness of the line
-     * @param percentage    the width of the line as a percentage of the available page width
-     * @param lineColor            the color of the line
-     * @param align            the alignment
-     * @param offset        the offset of the line relative to the current baseline (negative = under the baseline)
+     *
+     * @param lineWidth  the thickness of the line
+     * @param percentage the width of the line as a percentage of the available page width
+     * @param lineColor  the color of the line
+     * @param align      the alignment
+     * @param offset     the offset of the line relative to the current baseline (negative = under the baseline)
      */
     public LineSeparator(float lineWidth, float percentage, Color lineColor, int align, float offset) {
         this.lineWidth = lineWidth;
@@ -89,14 +97,15 @@ public LineSeparator(float lineWidth, float percentage, Color lineColor, int ali
     }
 
     /**
-     * Creates a new instance of the LineSeparator class with
-     * default values: lineWidth 1 user unit, width 100%, centered with offset 0.
+     * Creates a new instance of the LineSeparator class with default values: lineWidth 1 user unit, width 100%,
+     * centered with offset 0.
      */
     public LineSeparator() {
     }
 
     /**
-     * @see com.lowagie.text.pdf.draw.DrawInterface#draw(com.lowagie.text.pdf.PdfContentByte, float, float, float, float, float)
+     * @see com.lowagie.text.pdf.draw.DrawInterface#draw(com.lowagie.text.pdf.PdfContentByte, float, float, float,
+     * float, float)
      */
     public void draw(PdfContentByte canvas, float llx, float lly, float urx, float ury, float y) {
         canvas.saveState();
@@ -106,17 +115,19 @@ public void draw(PdfContentByte canvas, float llx, float lly, float urx, float u
 
     /**
      * Draws a horizontal line.
-     * @param canvas    the canvas to draw on
-     * @param leftX        the left x coordinate
-     * @param rightX    the right x coordindate
-     * @param y            the y coordinate
+     *
+     * @param canvas the canvas to draw on
+     * @param leftX  the left x coordinate
+     * @param rightX the right x coordindate
+     * @param y      the y coordinate
      */
     public void drawLine(PdfContentByte canvas, float leftX, float rightX, float y) {
         float w;
-        if (getPercentage() < 0)
+        if (getPercentage() < 0) {
             w = -getPercentage();
-        else
+        } else {
             w = (rightX - leftX) * getPercentage() / 100.0f;
+        }
         float s;
         switch (getAlignment()) {
             case Element.ALIGN_LEFT:
@@ -130,16 +141,18 @@ public void drawLine(PdfContentByte canvas, float leftX, float rightX, float y)
                 break;
         }
         canvas.setLineWidth(getLineWidth());
-        if (getLineColor() != null)
+        if (getLineColor() != null) {
             canvas.setColorStroke(getLineColor());
+        }
         canvas.moveTo(s + leftX, y + offset);
         canvas.lineTo(s + w + leftX, y + offset);
         canvas.stroke();
     }
-    
+
     /**
      * Getter for the line width.
-     * @return    the thickness of the line that will be drawn.
+     *
+     * @return the thickness of the line that will be drawn.
      */
     public float getLineWidth() {
         return lineWidth;
@@ -147,7 +160,8 @@ public float getLineWidth() {
 
     /**
      * Setter for the line width.
-     * @param lineWidth    the thickness of the line that will be drawn.
+     *
+     * @param lineWidth the thickness of the line that will be drawn.
      */
     public void setLineWidth(float lineWidth) {
         this.lineWidth = lineWidth;
@@ -155,7 +169,8 @@ public void setLineWidth(float lineWidth) {
 
     /**
      * Setter for the width as a percentage of the available width.
-     * @return    a width percentage
+     *
+     * @return a width percentage
      */
     public float getPercentage() {
         return percentage;
@@ -163,7 +178,8 @@ public float getPercentage() {
 
     /**
      * Setter for the width as a percentage of the available width.
-     * @param percentage    a width percentage
+     *
+     * @param percentage a width percentage
      */
     public void setPercentage(float percentage) {
         this.percentage = percentage;
@@ -171,7 +187,8 @@ public void setPercentage(float percentage) {
 
     /**
      * Getter for the color of the line that will be drawn.
-     * @return    a color
+     *
+     * @return a color
      */
     public Color getLineColor() {
         return lineColor;
@@ -179,7 +196,8 @@ public Color getLineColor() {
 
     /**
      * Setter for the color of the line that will be drawn.
-     * @param color    a color
+     *
+     * @param color a color
      */
     public void setLineColor(Color color) {
         this.lineColor = color;
@@ -187,7 +205,8 @@ public void setLineColor(Color color) {
 
     /**
      * Getter for the alignment of the line.
-     * @return    an alignment value
+     *
+     * @return an alignment value
      */
     public int getAlignment() {
         return alignment;
@@ -195,7 +214,8 @@ public int getAlignment() {
 
     /**
      * Setter for the alignment of the line.
-     * @param align    an alignment value
+     *
+     * @param align an alignment value
      */
     public void setAlignment(int align) {
         this.alignment = align;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/draw/VerticalPositionMark.java b/openpdf/src/main/java/com/lowagie/text/pdf/draw/VerticalPositionMark.java
index 389d23f22..123f254b5 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/draw/VerticalPositionMark.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/draw/VerticalPositionMark.java
@@ -49,56 +49,59 @@
 
 package com.lowagie.text.pdf.draw;
 
-import java.util.ArrayList;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
 import com.lowagie.text.ElementListener;
 import com.lowagie.text.pdf.PdfContentByte;
+import java.util.ArrayList;
 
 /**
- * Helper class implementing the DrawInterface. Can be used to add
- * horizontal or vertical separators. Won't draw anything unless
- * you implement the draw method.
- * @since    2.1.2
+ * Helper class implementing the DrawInterface. Can be used to add horizontal or vertical separators. Won't draw
+ * anything unless you implement the draw method.
+ *
+ * @since 2.1.2
  */
 
 public class VerticalPositionMark implements DrawInterface, Element {
 
-    /** Another implementation of the DrawInterface; its draw method will overrule LineSeparator.draw(). */
+    /**
+     * Another implementation of the DrawInterface; its draw method will overrule LineSeparator.draw().
+     */
     protected DrawInterface drawInterface = null;
 
-    /** The offset for the line. */
+    /**
+     * The offset for the line.
+     */
     protected float offset = 0;
-    
+
     /**
-     * Creates a vertical position mark that won't draw anything unless
-     * you define a DrawInterface.
+     * Creates a vertical position mark that won't draw anything unless you define a DrawInterface.
      */
-    public VerticalPositionMark() {    
+    public VerticalPositionMark() {
     }
 
     /**
-     * Creates a vertical position mark that won't draw anything unless
-     * you define a DrawInterface.
-     * @param    drawInterface    the drawInterface for this vertical position mark.
-     * @param    offset            the offset for this vertical position mark.
+     * Creates a vertical position mark that won't draw anything unless you define a DrawInterface.
+     *
+     * @param drawInterface the drawInterface for this vertical position mark.
+     * @param offset        the offset for this vertical position mark.
      */
     public VerticalPositionMark(DrawInterface drawInterface, float offset) {
         this.drawInterface = drawInterface;
         this.offset = offset;
     }
-    
+
     /**
-     * @see com.lowagie.text.pdf.draw.DrawInterface#draw(com.lowagie.text.pdf.PdfContentByte, float, float, float, float, float)
+     * @see com.lowagie.text.pdf.draw.DrawInterface#draw(com.lowagie.text.pdf.PdfContentByte, float, float, float,
+     * float, float)
      */
     public void draw(PdfContentByte canvas, float llx, float lly, float urx, float ury, float y) {
         if (drawInterface != null) {
             drawInterface.draw(canvas, llx, lly, urx, ury, y + offset);
         }
     }
-    
+
     /**
      * @see com.lowagie.text.Element#process(com.lowagie.text.ElementListener)
      */
@@ -142,7 +145,8 @@ public ArrayList getChunks() {
 
     /**
      * Getter for the interface with the overruling draw() method.
-     * @return    a DrawInterface implementation
+     *
+     * @return a DrawInterface implementation
      */
     public DrawInterface getDrawInterface() {
         return drawInterface;
@@ -150,6 +154,7 @@ public DrawInterface getDrawInterface() {
 
     /**
      * Setter for the interface with the overruling draw() method.
+     *
      * @param drawInterface a DrawInterface implementation
      */
     public void setDrawInterface(DrawInterface drawInterface) {
@@ -158,17 +163,18 @@ public void setDrawInterface(DrawInterface drawInterface) {
 
     /**
      * Getter for the offset relative to the baseline of the current line.
-     * @return    an offset
+     *
+     * @return an offset
      */
     public float getOffset() {
         return offset;
     }
 
     /**
-     * Setter for the offset. The offset is relative to the current
-     * Y position. If you want to underline something, you have to
-     * choose a negative offset.
-     * @param offset    an offset
+     * Setter for the offset. The offset is relative to the current Y position. If you want to underline something, you
+     * have to choose a negative offset.
+     *
+     * @param offset an offset
      */
     public void setOffset(float offset) {
         this.offset = offset;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/events/FieldPositioningEvents.java b/openpdf/src/main/java/com/lowagie/text/pdf/events/FieldPositioningEvents.java
index 7e6f4e89d..c588fe256 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/events/FieldPositioningEvents.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/events/FieldPositioningEvents.java
@@ -46,17 +46,11 @@
  */
 package com.lowagie.text.pdf.events;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.lowagie.text.error_messages.MessageLocalization;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
-
-import com.lowagie.text.Rectangle;
 import com.lowagie.text.ExceptionConverter;
+import com.lowagie.text.Rectangle;
+import com.lowagie.text.error_messages.MessageLocalization;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfFormField;
 import com.lowagie.text.pdf.PdfName;
@@ -66,86 +60,105 @@
 import com.lowagie.text.pdf.PdfRectangle;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.TextField;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Class that can be used to position AcroForm fields.
  */
 public class FieldPositioningEvents extends PdfPageEventHelper implements PdfPCellEvent {
 
+    /**
+     * Some extra padding that will be taken into account when defining the widget.
+     */
+    public float padding;
     /**
      * Keeps a map with fields that are to be positioned in inGenericTag.
      */
     protected Map genericChunkFields = new HashMap<>();
-
     /**
      * Keeps the form field that is to be positioned in a cellLayout event.
      */
     protected PdfFormField cellField = null;
-    
     /**
-     * The PdfWriter to use when a field has to added in a cell event. 
+     * The PdfWriter to use when a field has to added in a cell event.
      */
     protected PdfWriter fieldWriter = null;
     /**
-     * The PdfFormField that is the parent of the field added in a cell event. 
+     * The PdfFormField that is the parent of the field added in a cell event.
      */
     protected PdfFormField parent = null;
-    
-    /** Creates a new event. This constructor will be used if you need to position fields with Chunk objects. */
-    public FieldPositioningEvents() {}
-    
-    /** Some extra padding that will be taken into account when defining the widget. */
-    public float padding;
-    
+
     /**
-     * Add a PdfFormField that has to be tied to a generic Chunk.
-     * @param field The PdfFormField
-     * @param text  The text
+     * Creates a new event. This constructor will be used if you need to position fields with Chunk objects.
      */
-    public void addField(String text, PdfFormField field) {
-        genericChunkFields.put(text, field);
+    public FieldPositioningEvents() {
     }
 
-    /** Creates a new event. This constructor will be used if you need to position fields with a Cell Event.
-     * @param writer    The PdfWriter
-     * @param field     The field to label the Event*/
+    /**
+     * Creates a new event. This constructor will be used if you need to position fields with a Cell Event.
+     *
+     * @param writer The PdfWriter
+     * @param field  The field to label the Event
+     */
     public FieldPositioningEvents(PdfWriter writer, PdfFormField field) {
         this.cellField = field;
         this.fieldWriter = writer;
-    }  
-    
-    /** Creates a new event. This constructor will be used if you need to position fields with a Cell Event.
-     * @param parent    The parent of the Event
-     * @param field     The field to label the Event*/
+    }
+
+    /**
+     * Creates a new event. This constructor will be used if you need to position fields with a Cell Event.
+     *
+     * @param parent The parent of the Event
+     * @param field  The field to label the Event
+     */
     public FieldPositioningEvents(PdfFormField parent, PdfFormField field) {
         this.cellField = field;
         this.parent = parent;
     }
-    
-    /** Creates a new event. This constructor will be used if you need to position fields with a Cell Event.
-     * @param writer    The PdfWriter
-     * @param text      The text to label the TextField
-     * @throws DocumentException    thrown when an error occurs in a Document
-     * @throws IOException          throw when an I/O operation fails*/
+
+    /**
+     * Creates a new event. This constructor will be used if you need to position fields with a Cell Event.
+     *
+     * @param writer The PdfWriter
+     * @param text   The text to label the TextField
+     * @throws DocumentException thrown when an error occurs in a Document
+     * @throws IOException       throw when an I/O operation fails
+     */
     public FieldPositioningEvents(PdfWriter writer, String text) throws IOException, DocumentException {
         this.fieldWriter = writer;
         TextField tf = new TextField(writer, new Rectangle(0, 0), text);
         tf.setFontSize(14);
         cellField = tf.getTextField();
-    }   
-    
-    /** Creates a new event. This constructor will be used if you need to position fields with a Cell Event.
-     * @param text      The label of the event
-     * @param parent    The parent of the new event
-     * @param writer    The PdfWriter
-     * @throws DocumentException    thrown when an error occurs in a Document
-     * @throws IOException          throw when an I/O operation fails*/
-    public FieldPositioningEvents(PdfWriter writer, PdfFormField parent, String text) throws IOException, DocumentException {
+    }
+
+    /**
+     * Creates a new event. This constructor will be used if you need to position fields with a Cell Event.
+     *
+     * @param text   The label of the event
+     * @param parent The parent of the new event
+     * @param writer The PdfWriter
+     * @throws DocumentException thrown when an error occurs in a Document
+     * @throws IOException       throw when an I/O operation fails
+     */
+    public FieldPositioningEvents(PdfWriter writer, PdfFormField parent, String text)
+            throws IOException, DocumentException {
         this.parent = parent;
         TextField tf = new TextField(writer, new Rectangle(0, 0), text);
         tf.setFontSize(14);
         cellField = tf.getTextField();
-    }  
+    }
+
+    /**
+     * Add a PdfFormField that has to be tied to a generic Chunk.
+     *
+     * @param field The PdfFormField
+     * @param text  The text
+     */
+    public void addField(String text, PdfFormField field) {
+        genericChunkFields.put(text, field);
+    }
 
     /**
      * @param padding The padding to set.
@@ -153,47 +166,60 @@ public FieldPositioningEvents(PdfWriter writer, PdfFormField parent, String text
     public void setPadding(float padding) {
         this.padding = padding;
     }
-    
+
     /**
      * @param parent The parent to set.
      */
     public void setParent(PdfFormField parent) {
         this.parent = parent;
     }
+
     /**
-     * @see com.lowagie.text.pdf.PdfPageEvent#onGenericTag(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document, com.lowagie.text.Rectangle, java.lang.String)
+     * @see com.lowagie.text.pdf.PdfPageEvent#onGenericTag(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document,
+     * com.lowagie.text.Rectangle, java.lang.String)
      */
     public void onGenericTag(PdfWriter writer, Document document,
             Rectangle rect, String text) {
         rect.setBottom(rect.getBottom() - 3);
         PdfFormField field = genericChunkFields.get(text);
         if (field == null) {
-            TextField tf = new TextField(writer, new Rectangle(rect.getLeft(padding), rect.getBottom(padding), rect.getRight(padding), rect.getTop(padding)), text);
+            TextField tf = new TextField(writer,
+                    new Rectangle(rect.getLeft(padding), rect.getBottom(padding), rect.getRight(padding),
+                            rect.getTop(padding)), text);
             tf.setFontSize(14);
             try {
                 field = tf.getTextField();
             } catch (Exception e) {
                 throw new ExceptionConverter(e);
             }
+        } else {
+            field.put(PdfName.RECT,
+                    new PdfRectangle(rect.getLeft(padding), rect.getBottom(padding), rect.getRight(padding),
+                            rect.getTop(padding)));
         }
-        else {
-            field.put(PdfName.RECT,  new PdfRectangle(rect.getLeft(padding), rect.getBottom(padding), rect.getRight(padding), rect.getTop(padding)));
-        }
-        if (parent == null)
+        if (parent == null) {
             writer.addAnnotation(field);
-        else
+        } else {
             parent.addKid(field);
+        }
     }
 
     /**
-     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell, com.lowagie.text.Rectangle, com.lowagie.text.pdf.PdfContentByte[])
+     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell, com.lowagie.text.Rectangle,
+     * com.lowagie.text.pdf.PdfContentByte[])
      */
     public void cellLayout(PdfPCell cell, Rectangle rect, PdfContentByte[] canvases) {
-        if (cellField == null || (fieldWriter == null && parent == null)) throw new IllegalArgumentException(MessageLocalization.getComposedMessage("you.have.used.the.wrong.constructor.for.this.fieldpositioningevents.class"));
-        cellField.put(PdfName.RECT, new PdfRectangle(rect.getLeft(padding), rect.getBottom(padding), rect.getRight(padding), rect.getTop(padding)));
-        if (parent == null)
+        if (cellField == null || (fieldWriter == null && parent == null)) {
+            throw new IllegalArgumentException(MessageLocalization.getComposedMessage(
+                    "you.have.used.the.wrong.constructor.for.this.fieldpositioningevents.class"));
+        }
+        cellField.put(PdfName.RECT,
+                new PdfRectangle(rect.getLeft(padding), rect.getBottom(padding), rect.getRight(padding),
+                        rect.getTop(padding)));
+        if (parent == null) {
             fieldWriter.addAnnotation(cellField);
-        else
+        } else {
             parent.addKid(cellField);
+        }
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/events/IndexEvents.java b/openpdf/src/main/java/com/lowagie/text/pdf/events/IndexEvents.java
index d2d634b86..642581412 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/events/IndexEvents.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/events/IndexEvents.java
@@ -60,7 +60,7 @@
 
 /**
  * Class for an index.
- * 
+ *
  * @author Michael Niedermair
  */
 public class IndexEvents extends PdfPageEventHelper {
@@ -69,37 +69,58 @@ public class IndexEvents extends PdfPageEventHelper {
      * keeps the indextag with the pagenumber
      */
     private Map indextag = new TreeMap<>();
-
-    /**
-     * All the text that is passed to this event, gets registered in the indexentry.
-     * 
-     * @see com.lowagie.text.pdf.PdfPageEventHelper#onGenericTag(
-     *      com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document,
-     *      com.lowagie.text.Rectangle, java.lang.String)
-     */
-    public void onGenericTag(PdfWriter writer, Document document,
-            Rectangle rect, String text) {
-        indextag.put(text, writer.getPageNumber());
-    }
-
-    // --------------------------------------------------------------------
     /**
      * indexcounter
      */
     private long indexcounter = 0;
 
+    // --------------------------------------------------------------------
     /**
      * the list for the index entry
      */
     private List indexentry = new ArrayList<>();
+    /**
+     * Comparator for sorting the index
+     */
+    private Comparator comparator = (en1, en2) -> {
+
+        int rt = 0;
+        if (en1.getIn1() != null && en2.getIn1() != null) {
+            if ((rt = en1.getIn1().compareToIgnoreCase(en2.getIn1())) == 0) {
+                // in1 equals
+                if (en1.getIn2() != null && en2.getIn2() != null) {
+                    if ((rt = en1.getIn2()
+                            .compareToIgnoreCase(en2.getIn2())) == 0) {
+                        // in2 equals
+                        if (en1.getIn3() != null && en2.getIn3() != null) {
+                            rt = en1.getIn3().compareToIgnoreCase(
+                                    en2.getIn3());
+                        }
+                    }
+                }
+            }
+        }
+        return rt;
+    };
+
+    /**
+     * All the text that is passed to this event, gets registered in the indexentry.
+     *
+     * @see com.lowagie.text.pdf.PdfPageEventHelper#onGenericTag(com.lowagie.text.pdf.PdfWriter,
+     * com.lowagie.text.Document, com.lowagie.text.Rectangle, java.lang.String)
+     */
+    public void onGenericTag(PdfWriter writer, Document document,
+            Rectangle rect, String text) {
+        indextag.put(text, writer.getPageNumber());
+    }
 
     /**
      * Create an index entry.
      *
-     * @param text  The text for the Chunk.
-     * @param in1   The first level.
-     * @param in2   The second level.
-     * @param in3   The third level.
+     * @param text The text for the Chunk.
+     * @param in1  The first level.
+     * @param in2  The second level.
+     * @param in3  The third level.
      * @return Returns the Chunk.
      */
     public Chunk create(final String text, final String in1, final String in2,
@@ -117,8 +138,8 @@ public Chunk create(final String text, final String in1, final String in2,
     /**
      * Create an index entry.
      *
-     * @param text  The text for the Chunk.
-     * @param in1   The first level.
+     * @param text The text for the Chunk.
+     * @param in1  The first level.
      * @return Returns the Chunk.
      */
     public Chunk create(final String text, final String in1) {
@@ -128,9 +149,9 @@ public Chunk create(final String text, final String in1) {
     /**
      * Create an index entry.
      *
-     * @param text  The text for the Chunk.
-     * @param in1   The first level.
-     * @param in2   The second level.
+     * @param text The text for the Chunk.
+     * @param in1  The first level.
+     * @param in2  The second level.
      * @return Returns the Chunk.
      */
     public Chunk create(final String text, final String in1, final String in2) {
@@ -140,10 +161,10 @@ public Chunk create(final String text, final String in1, final String in2) {
     /**
      * Create an index entry.
      *
-     * @param text  The text.
-     * @param in1   The first level.
-     * @param in2   The second level.
-     * @param in3   The third level.
+     * @param text The text.
+     * @param in1  The first level.
+     * @param in2  The second level.
+     * @param in3  The third level.
      */
     public void create(final Chunk text, final String in1, final String in2,
             final String in3) {
@@ -158,8 +179,8 @@ public void create(final Chunk text, final String in1, final String in2,
     /**
      * Create an index entry.
      *
-     * @param text  The text.
-     * @param in1   The first level.
+     * @param text The text.
+     * @param in1  The first level.
      */
     public void create(final Chunk text, final String in1) {
         create(text, in1, "", "");
@@ -168,40 +189,17 @@ public void create(final Chunk text, final String in1) {
     /**
      * Create an index entry.
      *
-     * @param text  The text.
-     * @param in1   The first level.
-     * @param in2   The second level.
+     * @param text The text.
+     * @param in1  The first level.
+     * @param in2  The second level.
      */
     public void create(final Chunk text, final String in1, final String in2) {
         create(text, in1, in2, "");
     }
 
-    /**
-     * Comparator for sorting the index
-     */
-    private Comparator comparator = (en1, en2) -> {
-
-        int rt = 0;
-        if (en1.getIn1() != null && en2.getIn1() != null) {
-            if ((rt = en1.getIn1().compareToIgnoreCase(en2.getIn1())) == 0) {
-                // in1 equals
-                if (en1.getIn2() != null && en2.getIn2() != null) {
-                    if ((rt = en1.getIn2()
-                            .compareToIgnoreCase(en2.getIn2())) == 0) {
-                        // in2 equals
-                        if (en1.getIn3() != null && en2.getIn3() != null) {
-                            rt = en1.getIn3().compareToIgnoreCase(
-                                    en2.getIn3());
-                        }
-                    }
-                }
-            }
-        }
-        return rt;
-    };
-
     /**
      * Set the comparator.
+     *
      * @param aComparator The comparator to set.
      */
     public void setComparator(Comparator aComparator) {
@@ -210,6 +208,7 @@ public void setComparator(Comparator aComparator) {
 
     /**
      * Returns the sorted list with the entries and the collected page numbers.
+     *
      * @return Returns the sorted list with the entries and the collected page numbers.
      */
     public List getSortedEntries() {
@@ -235,11 +234,12 @@ public List getSortedEntries() {
     }
 
     // --------------------------------------------------------------------
+
     /**
      * Class for an index entry.
      * 
              
-     * In the first step, only in1, in2,in3 and tag are used.
-     * After the collections of the index entries, pagenumbers are used.
+     * In the first step, only in1, in2,in3 and tag are used. After the collections of the index entries, pagenumbers
+     * are used.
      * 
              
      */
     public class Entry {
@@ -276,10 +276,11 @@ public class Entry {
 
         /**
          * Create a new object.
-         * @param aIn1   The first level.
-         * @param aIn2   The second level.
-         * @param aIn3   The third level.
-         * @param aTag   The tag.
+         *
+         * @param aIn1 The first level.
+         * @param aIn2 The second level.
+         * @param aIn3 The third level.
+         * @param aTag The tag.
          */
         public Entry(final String aIn1, final String aIn2, final String aIn3,
                 final String aTag) {
@@ -291,6 +292,7 @@ public Entry(final String aIn1, final String aIn2, final String aIn3,
 
         /**
          * Returns the in1.
+         *
          * @return Returns the in1.
          */
         public String getIn1() {
@@ -299,6 +301,7 @@ public String getIn1() {
 
         /**
          * Returns the in2.
+         *
          * @return Returns the in2.
          */
         public String getIn2() {
@@ -307,6 +310,7 @@ public String getIn2() {
 
         /**
          * Returns the in3.
+         *
          * @return Returns the in3.
          */
         public String getIn3() {
@@ -315,6 +319,7 @@ public String getIn3() {
 
         /**
          * Returns the tag.
+         *
          * @return Returns the tag.
          */
         public String getTag() {
@@ -323,6 +328,7 @@ public String getTag() {
 
         /**
          * Returns the pagenumber for this entry.
+         *
          * @return Returns the pagenumber for this entry.
          */
         public int getPageNumber() {
@@ -336,8 +342,9 @@ public int getPageNumber() {
 
         /**
          * Add a pagenumber.
-         * @param number    The page number.
-         * @param tag       The tag.
+         *
+         * @param number The page number.
+         * @param tag    The tag.
          */
         public void addPageNumberAndTag(final int number, final String tag) {
             pagenumbers.add(number);
@@ -346,6 +353,7 @@ public void addPageNumberAndTag(final int number, final String tag) {
 
         /**
          * Returns the key for the map-entry.
+         *
          * @return Returns the key for the map-entry.
          */
         public String getKey() {
@@ -354,6 +362,7 @@ public String getKey() {
 
         /**
          * Returns the pagenumbers.
+         *
          * @return Returns the pagenumbers.
          */
         public List getPagenumbers() {
@@ -362,6 +371,7 @@ public List getPagenumbers() {
 
         /**
          * Returns the tags.
+         *
          * @return Returns the tags.
          */
         public List getTags() {
@@ -370,6 +380,7 @@ public List getTags() {
 
         /**
          * print the entry (only for test)
+         *
          * @return the toString implementation of the entry
          */
         public String toString() {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPCellEventForwarder.java b/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPCellEventForwarder.java
index 39196f883..46bbf3291 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPCellEventForwarder.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPCellEventForwarder.java
@@ -49,28 +49,28 @@
 
 package com.lowagie.text.pdf.events;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPCellEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
- * If you want to add more than one event to a cell,
- * you have to construct a PdfPCellEventForwarder, add the
- * different events to this object and add the forwarder to
- * the PdfPCell.
+ * If you want to add more than one event to a cell, you have to construct a PdfPCellEventForwarder, add the different
+ * events to this object and add the forwarder to the PdfPCell.
  */
 
 public class PdfPCellEventForwarder implements PdfPCellEvent {
 
-    /** ArrayList containing all the PageEvents that have to be executed. */
+    /**
+     * ArrayList containing all the PageEvents that have to be executed.
+     */
     protected List events = new ArrayList<>();
-    
-    /** 
+
+    /**
      * Add a page event to the forwarder.
+     *
      * @param event an event that has to be added to the forwarder.
      */
     public void addCellEvent(PdfPCellEvent event) {
@@ -78,7 +78,8 @@ public void addCellEvent(PdfPCellEvent event) {
     }
 
     /**
-     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell, com.lowagie.text.Rectangle, com.lowagie.text.pdf.PdfContentByte[])
+     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell, com.lowagie.text.Rectangle,
+     * com.lowagie.text.pdf.PdfContentByte[])
      */
     public void cellLayout(PdfPCell cell, Rectangle position, PdfContentByte[] canvases) {
         PdfPCellEvent event;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPTableEventForwarder.java b/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPTableEventForwarder.java
index 6b6ae72d5..20de1956a 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPTableEventForwarder.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPTableEventForwarder.java
@@ -49,27 +49,27 @@
 
 package com.lowagie.text.pdf.events;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfPTableEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
- * If you want to add more than one page event to a PdfPTable,
- * you have to construct a PdfPTableEventForwarder, add the
- * different events to this object and add the forwarder to
- * the PdfWriter.
+ * If you want to add more than one page event to a PdfPTable, you have to construct a PdfPTableEventForwarder, add the
+ * different events to this object and add the forwarder to the PdfWriter.
  */
 
 public class PdfPTableEventForwarder implements PdfPTableEvent {
 
-    /** ArrayList containing all the PageEvents that have to be executed. */
+    /**
+     * ArrayList containing all the PageEvents that have to be executed.
+     */
     protected List events = new ArrayList<>();
-    
-    /** 
+
+    /**
      * Add a page event to the forwarder.
+     *
      * @param event an event that has to be added to the forwarder.
      */
     public void addTableEvent(PdfPTableEvent event) {
@@ -77,9 +77,11 @@ public void addTableEvent(PdfPTableEvent event) {
     }
 
     /**
-     * @see com.lowagie.text.pdf.PdfPTableEvent#tableLayout(com.lowagie.text.pdf.PdfPTable, float[][], float[], int, int, com.lowagie.text.pdf.PdfContentByte[])
+     * @see com.lowagie.text.pdf.PdfPTableEvent#tableLayout(com.lowagie.text.pdf.PdfPTable, float[][], float[], int,
+     * int, com.lowagie.text.pdf.PdfContentByte[])
      */
-    public void tableLayout(PdfPTable table, float[][] widths, float[] heights, int headerRows, int rowStart, PdfContentByte[] canvases) {
+    public void tableLayout(PdfPTable table, float[][] widths, float[] heights, int headerRows, int rowStart,
+            PdfContentByte[] canvases) {
         PdfPTableEvent event;
         for (Object event1 : events) {
             event = (PdfPTableEvent) event1;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPageEventForwarder.java b/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPageEventForwarder.java
index 10a3d4cef..76ee12d47 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPageEventForwarder.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/events/PdfPageEventForwarder.java
@@ -49,42 +49,40 @@
 
 package com.lowagie.text.pdf.events;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfPageEvent;
 import com.lowagie.text.pdf.PdfWriter;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
- * If you want to add more than one page event to a PdfWriter,
- * you have to construct a PdfPageEventForwarder, add the
- * different events to this object and add the forwarder to
- * the PdfWriter.
+ * If you want to add more than one page event to a PdfWriter, you have to construct a PdfPageEventForwarder, add the
+ * different events to this object and add the forwarder to the PdfWriter.
  */
 
 public class PdfPageEventForwarder implements PdfPageEvent {
 
-    /** ArrayList containing all the PageEvents that have to be executed. */
+    /**
+     * ArrayList containing all the PageEvents that have to be executed.
+     */
     protected List events = new ArrayList<>();
-    
-    /** 
+
+    /**
      * Add a page event to the forwarder.
+     *
      * @param event an event that has to be added to the forwarder.
      */
     public void addPageEvent(PdfPageEvent event) {
         events.add(event);
     }
-    
+
     /**
      * Called when the document is opened.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
      */
     public void onOpenDocument(PdfWriter writer, Document document) {
         PdfPageEvent event;
@@ -96,14 +94,12 @@ public void onOpenDocument(PdfWriter writer, Document document) {
 
     /**
      * Called when a page is initialized.
-     * 
              
-     * Note that if even if a page is not written this method is still called.
-     * It is preferable to use onEndPage to avoid infinite loops.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
+     * 
              
+     * Note that if even if a page is not written this method is still called. It is preferable to use
+     * onEndPage to avoid infinite loops.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
      */
     public void onStartPage(PdfWriter writer, Document document) {
         PdfPageEvent event;
@@ -114,13 +110,10 @@ public void onStartPage(PdfWriter writer, Document document) {
     }
 
     /**
-     * Called when a page is finished, just before being written to the
-     * document.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
+     * Called when a page is finished, just before being written to the document.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
      */
     public void onEndPage(PdfWriter writer, Document document) {
         PdfPageEvent event;
@@ -132,14 +125,11 @@ public void onEndPage(PdfWriter writer, Document document) {
 
     /**
      * Called when the document is closed.
-     * 
              
-     * Note that this method is called with the page number equal to the last
-     * page plus one.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
+     * 
              
+     * Note that this method is called with the page number equal to the last page plus one.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
      */
     public void onCloseDocument(PdfWriter writer, Document document) {
         PdfPageEvent event;
@@ -151,17 +141,13 @@ public void onCloseDocument(PdfWriter writer, Document document) {
 
     /**
      * Called when a Paragraph is written.
-     * 
              
+     * 
              
      * paragraphPosition will hold the height at which the
-     * paragraph will be written to. This is useful to insert bookmarks with
-     * more control.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
-     * @param paragraphPosition
-     *            the position the paragraph will be written to
+     * paragraph will be written to. This is useful to insert bookmarks with more control.
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the paragraph will be written to
      */
     public void onParagraph(PdfWriter writer, Document document,
             float paragraphPosition) {
@@ -174,16 +160,13 @@ public void onParagraph(PdfWriter writer, Document document,
 
     /**
      * Called when a Paragraph is written.
-     * 
              
+     * 
              
      * paragraphPosition will hold the height of the end of the
      * paragraph.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
-     * @param paragraphPosition
-     *            the position of the end of the paragraph
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position of the end of the paragraph
      */
     public void onParagraphEnd(PdfWriter writer, Document document,
             float paragraphPosition) {
@@ -196,18 +179,14 @@ public void onParagraphEnd(PdfWriter writer, Document document,
 
     /**
      * Called when a Chapter is written.
-     * 
              
+     * 
              
      * position will hold the height at which the chapter will be
      * written to.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
-     * @param paragraphPosition
-     *            the position the chapter will be written to
-     * @param title
-     *            the title of the Chapter
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the chapter will be written to
+     * @param title             the title of the Chapter
      */
     public void onChapter(PdfWriter writer, Document document,
             float paragraphPosition, Paragraph title) {
@@ -220,15 +199,12 @@ public void onChapter(PdfWriter writer, Document document,
 
     /**
      * Called when the end of a Chapter is reached.
-     * 
              
+     * 
              
      * position will hold the height of the end of the chapter.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
-     * @param position
-     *            the position of the end of the chapter.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     * @param position the position of the end of the chapter.
      */
     public void onChapterEnd(PdfWriter writer, Document document, float position) {
         PdfPageEvent event;
@@ -240,20 +216,15 @@ public void onChapterEnd(PdfWriter writer, Document document, float position) {
 
     /**
      * Called when a Section is written.
-     * 
              
+     * 
              
      * position will hold the height at which the section will be
      * written to.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
-     * @param paragraphPosition
-     *            the position the section will be written to
-     * @param depth
-     *            the number depth of the Section
-     * @param title
-     *            the title of the section
+     *
+     * @param writer            the PdfWriter for this document
+     * @param document          the document
+     * @param paragraphPosition the position the section will be written to
+     * @param depth             the number depth of the Section
+     * @param title             the title of the section
      */
     public void onSection(PdfWriter writer, Document document,
             float paragraphPosition, int depth, Paragraph title) {
@@ -266,15 +237,12 @@ public void onSection(PdfWriter writer, Document document,
 
     /**
      * Called when the end of a Section is reached.
-     * 
              
+     * 
              
      * position will hold the height of the section end.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
-     * @param position
-     *            the position of the end of the section
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     * @param position the position of the end of the section
      */
     public void onSectionEnd(PdfWriter writer, Document document, float position) {
         PdfPageEvent event;
@@ -286,19 +254,14 @@ public void onSectionEnd(PdfWriter writer, Document document, float position) {
 
     /**
      * Called when a Chunk with a generic tag is written.
-     * 
              
-     * It is useful to pinpoint the Chunk location to generate
-     * bookmarks, for example.
-     * 
-     * @param writer
-     *            the PdfWriter for this document
-     * @param document
-     *            the document
-     * @param rect
-     *            the Rectangle containing the Chunk
-     *            
-     * @param text
-     *            the text of the tag
+     * 
              
+     * It is useful to pinpoint the Chunk location to generate bookmarks, for example.
+     *
+     * @param writer   the PdfWriter for this document
+     * @param document the document
+     * @param rect     the Rectangle containing the Chunk
+     *                 
+     * @param text     the text of the tag
      */
     public void onGenericTag(PdfWriter writer, Document document,
             Rectangle rect, String text) {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/fonts/FontsResourceAnchor.java b/openpdf/src/main/java/com/lowagie/text/pdf/fonts/FontsResourceAnchor.java
index c1d178e7a..c3ab68636 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/fonts/FontsResourceAnchor.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/fonts/FontsResourceAnchor.java
@@ -52,11 +52,11 @@
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class FontsResourceAnchor {
-    
+
     /**
      * Creates a FontsResourceAnchor
      */
     public FontsResourceAnchor() {
     }
-    
+
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cjkencodings.properties b/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cjkencodings.properties
index 3db5c4767..806d3edec 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cjkencodings.properties
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cjkencodings.properties
@@ -3,13 +3,10 @@ UniJIS-UCS2-H=UniJIS-UCS2-H
 UniJIS-UCS2-V=UniJIS-UCS2-H UniJIS-UCS2-V
 UniJIS-UCS2-HW-H=UniJIS-UCS2-H UniJIS-UCS2-HW-H
 UniJIS-UCS2-HW-V=UniJIS-UCS2-H UniJIS-UCS2-HW-V
-
 UniGB-UCS2-H=UniGB-UCS2-H
 UniGB-UCS2-V=UniGB-UCS2-H UniGB-UCS2-V
-
 UniCNS-UCS2-H=UniCNS-UCS2-H
 UniCNS-UCS2-V=UniCNS-UCS2-H UniCNS-UCS2-V
-
 UniKS-UCS2-H=UniKS-UCS2-H
 UniKS-UCS2-V=UniKS-UCS2-H UniKS-UCS2-V
 
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CMap.java b/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CMap.java
index f61828649..80d1e90e0 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CMap.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CMap.java
@@ -1,38 +1,29 @@
 /**
- * Copyright (c) 2005, www.fontbox.org
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of fontbox; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * Copyright (c) 2005, www.fontbox.org All rights reserved.
+ * 
              
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+ * following conditions are met:
+ * 
              
+ * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+ * disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+ * the following disclaimer in the documentation and/or other materials provided with the distribution. 3. Neither the
+ * name of fontbox; nor the names of its contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * 
              
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ * 
              
  * http://www.fontbox.org
- *
  */
 package com.lowagie.text.pdf.fonts.cmaps;
 
-import java.io.IOException;
 import com.lowagie.text.error_messages.MessageLocalization;
-
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -42,10 +33,10 @@
  * This class represents a CMap file.
  *
  * @author Ben Litchfield (ben@benlitchfield.com)
- * @since    2.1.4
+ * @since 2.1.4
  */
-public class CMap
-{
+public class CMap {
+
     private List codeSpaceRanges = new ArrayList<>();
     private Map singleByteMappings = new HashMap<>();
     private Map doubleByteMappings = new HashMap<>();
@@ -53,41 +44,37 @@ public class CMap
     /**
      * Creates a new instance of CMap.
      */
-    public CMap()
-    {
+    public CMap() {
         //default constructor
     }
-    
+
     /**
      * This will tell if this cmap has any one byte mappings.
-     * 
+     *
      * @return true If there are any one byte mappings, false otherwise.
      */
-    public boolean hasOneByteMappings()
-    {
+    public boolean hasOneByteMappings() {
         return !singleByteMappings.isEmpty();
     }
-    
+
     /**
      * This will tell if this cmap has any two byte mappings.
-     * 
+     *
      * @return true If there are any two byte mappings, false otherwise.
      */
-    public boolean hasTwoByteMappings()
-    {
+    public boolean hasTwoByteMappings() {
         return !doubleByteMappings.isEmpty();
     }
 
     /**
      * This will perform a lookup into the map.
-     * 
+     * 
              
      * Some characters (e.g. ligatures) decode to character sequences.
      *
      * @param code The code used to lookup.
      * @return The string that matches the lookup.
      */
-    public String lookup(char code)
-    {
+    public String lookup(char code) {
         String result = null;
         if (hasTwoByteMappings()) {
             result = doubleByteMappings.get((int) code);
@@ -101,31 +88,26 @@ public String lookup(char code)
     /**
      * This will perform a lookup into the map.
      *
-     * @param code The code used to lookup.
+     * @param code   The code used to lookup.
      * @param offset The offset into the byte array.
      * @param length The length of the data we are getting.
-     *
      * @return The string that matches the lookup.
      */
-    public String lookup( byte[] code, int offset, int length )
-    {
+    public String lookup(byte[] code, int offset, int length) {
 
         String result = null;
         Integer key = null;
-        if( length == 1 )
-        {
-            
+        if (length == 1) {
+
             key = code[offset] & 0xff;
-            result = singleByteMappings.get( key );
-        }
-        else if( length == 2 )
-        {
+            result = singleByteMappings.get(key);
+        } else if (length == 2) {
             int intKey = code[offset] & 0xff;
             intKey <<= 8;
-            intKey += code[offset+1] & 0xff;
+            intKey += code[offset + 1] & 0xff;
             key = intKey;
 
-            result = doubleByteMappings.get( key );
+            result = doubleByteMappings.get(key);
         }
 
         return result;
@@ -134,27 +116,22 @@ else if( length == 2 )
     /**
      * This will add a mapping.
      *
-     * @param src The src to the mapping.
+     * @param src  The src to the mapping.
      * @param dest The dest to the mapping.
-     *
      * @throws IOException if the src is invalid.
      */
-    public void addMapping( byte[] src, String dest ) throws IOException
-    {
-        if( src.length == 1 )
-        {
-            singleByteMappings.put(src[0] & 0xff, dest );
-        }
-        else if( src.length == 2 )
-        {
-            int intSrc = src[0]&0xFF;
+    public void addMapping(byte[] src, String dest) throws IOException {
+        if (src.length == 1) {
+            singleByteMappings.put(src[0] & 0xff, dest);
+        } else if (src.length == 2) {
+            int intSrc = src[0] & 0xFF;
             intSrc <<= 8;
-            intSrc |= (src[1]&0xFF);
-            doubleByteMappings.put(intSrc, dest );
-        }
-        else
-        {
-            throw new IOException(MessageLocalization.getComposedMessage("mapping.code.should.be.1.or.two.bytes.and.not.1", src.length));
+            intSrc |= (src[1] & 0xFF);
+            doubleByteMappings.put(intSrc, dest);
+        } else {
+            throw new IOException(
+                    MessageLocalization.getComposedMessage("mapping.code.should.be.1.or.two.bytes.and.not.1",
+                            src.length));
         }
     }
 
@@ -164,9 +141,8 @@ else if( src.length == 2 )
      *
      * @param range A single codespace range.
      */
-    public void addCodespaceRange( CodespaceRange range )
-    {
-        codeSpaceRanges.add( range );
+    public void addCodespaceRange(CodespaceRange range) {
+        codeSpaceRanges.add(range);
     }
 
     /**
@@ -174,8 +150,7 @@ public void addCodespaceRange( CodespaceRange range )
      *
      * @return Value of property codeSpaceRanges.
      */
-    public List getCodeSpaceRanges()
-    {
+    public List getCodeSpaceRanges() {
         return codeSpaceRanges;
     }
 
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CMapParser.java b/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CMapParser.java
index a992e6a06..4e45c281a 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CMapParser.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CMapParser.java
@@ -1,41 +1,32 @@
 /**
- * Copyright (c) 2005-2006, www.fontbox.org
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of fontbox; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * Copyright (c) 2005-2006, www.fontbox.org All rights reserved.
+ * 
              
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+ * following conditions are met:
+ * 
              
+ * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+ * disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+ * the following disclaimer in the documentation and/or other materials provided with the distribution. 3. Neither the
+ * name of fontbox; nor the names of its contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * 
              
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ * 
              
  * http://www.fontbox.org
- *
  */
 package com.lowagie.text.pdf.fonts.cmaps;
 
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.io.FileInputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PushbackInputStream;
-import com.lowagie.text.error_messages.MessageLocalization;
-
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -47,24 +38,39 @@
  *
  * @author Ben Litchfield
  * @version $Revision: 4065 $
- * @since    2.1.4
+ * @since 2.1.4
  */
-public class CMapParser
-{
+public class CMapParser {
+
     private static final String BEGIN_CODESPACE_RANGE = "begincodespacerange";
     private static final String BEGIN_BASE_FONT_CHAR = "beginbfchar";
     private static final String BEGIN_BASE_FONT_RANGE = "beginbfrange";
-    
+
     private static final String MARK_END_OF_DICTIONARY = ">>";
     private static final String MARK_END_OF_ARRAY = "]";
-    
+
     private byte[] tokenParserByteBuffer = new byte[512];
 
     /**
      * Creates a new instance of CMapParser.
      */
-    public CMapParser()
-    {
+    public CMapParser() {
+    }
+
+    /**
+     * A simple class to test parsing of cmap files.
+     *
+     * @param args Some command line arguments.
+     * @throws Exception If there is an error parsing the file.
+     */
+    public static void main(String[] args) throws Exception {
+        if (args.length != 1) {
+            System.err.println("usage: java org.pdfbox.cmapparser.CMapParser ");
+            System.exit(-1);
+        }
+        CMapParser parser = new CMapParser();
+        CMap result = parser.parse(new FileInputStream(args[0]));
+        System.out.println("Result:" + result);
     }
 
     /**
@@ -72,20 +78,16 @@ public CMapParser()
      *
      * @param input The CMAP stream to parse.
      * @return The parsed stream as a java object.
-     *
      * @throws IOException If there is an error parsing the stream.
      */
-    public CMap parse( InputStream input ) throws IOException
-    {
-        PushbackInputStream cmapStream = new PushbackInputStream( input );
+    public CMap parse(InputStream input) throws IOException {
+        PushbackInputStream cmapStream = new PushbackInputStream(input);
         CMap result = new CMap();
         Object previousToken = null;
         Object token = null;
-        while( (token = parseNextToken( cmapStream )) != null )
-        {
-            if( token instanceof Operator )
-            {
-                Operator op = (Operator)token;
+        while ((token = parseNextToken(cmapStream)) != null) {
+            if (token instanceof Operator) {
+                Operator op = (Operator) token;
                 switch (op.op) {
                     case BEGIN_CODESPACE_RANGE: {
                         Number cosCount = (Number) previousToken;
@@ -111,7 +113,9 @@ public CMap parse( InputStream input ) throws IOException
                             } else if (nextToken instanceof LiteralName) {
                                 result.addMapping(inputCode, ((LiteralName) nextToken).name);
                             } else {
-                                throw new IOException(MessageLocalization.getComposedMessage("error.parsing.cmap.beginbfchar.expected.cosstring.or.cosname.and.not.1", nextToken));
+                                throw new IOException(MessageLocalization.getComposedMessage(
+                                        "error.parsing.cmap.beginbfchar.expected.cosstring.or.cosname.and.not.1",
+                                        nextToken));
                             }
                         }
                         break;
@@ -162,154 +166,122 @@ public CMap parse( InputStream input ) throws IOException
         }
         return result;
     }
-    
-    private Object parseNextToken( PushbackInputStream is ) throws IOException
-    {
+
+    private Object parseNextToken(PushbackInputStream is) throws IOException {
         Object retval = null;
         int nextByte = is.read();
         //skip whitespace
-        while( nextByte == 0x09 || nextByte == 0x20 || nextByte == 0x0D || nextByte == 0x0A )
-        {
+        while (nextByte == 0x09 || nextByte == 0x20 || nextByte == 0x0D || nextByte == 0x0A) {
             nextByte = is.read();
         }
-        switch( nextByte )
-        {
-            case '%':
-            {
-                //header operations, for now return the entire line 
+        switch (nextByte) {
+            case '%': {
+                //header operations, for now return the entire line
                 //may need to smarter in the future
                 StringBuffer buffer = new StringBuffer();
-                buffer.append( (char)nextByte );
-                readUntilEndOfLine( is, buffer );
+                buffer.append((char) nextByte);
+                readUntilEndOfLine(is, buffer);
                 retval = buffer.toString();
                 break;
             }
-            case '(':
-            {
+            case '(': {
                 StringBuilder buffer = new StringBuilder();
                 int stringByte = is.read();
-                
-                while( stringByte != -1 && stringByte != ')' )
-                {
-                    buffer.append( (char)stringByte );
+
+                while (stringByte != -1 && stringByte != ')') {
+                    buffer.append((char) stringByte);
                     stringByte = is.read();
                 }
                 retval = buffer.toString();
                 break;
             }
-            case '>':
-            {
+            case '>': {
                 int secondCloseBrace = is.read();
-                if( secondCloseBrace == '>' )
-                {
+                if (secondCloseBrace == '>') {
                     retval = MARK_END_OF_DICTIONARY;
-                }
-                else
-                {
-                    throw new IOException(MessageLocalization.getComposedMessage("error.expected.the.end.of.a.dictionary"));
+                } else {
+                    throw new IOException(
+                            MessageLocalization.getComposedMessage("error.expected.the.end.of.a.dictionary"));
                 }
                 break;
             }
-            case ']':
-            {
+            case ']': {
                 retval = MARK_END_OF_ARRAY;
                 break;
             }
-            case '[':
-            {
+            case '[': {
                 List list = new ArrayList<>();
-                
-                Object nextToken = parseNextToken( is ); 
-                while( nextToken != MARK_END_OF_ARRAY )
-                {
-                    list.add( nextToken );
-                    nextToken = parseNextToken( is );
+
+                Object nextToken = parseNextToken(is);
+                while (nextToken != MARK_END_OF_ARRAY) {
+                    list.add(nextToken);
+                    nextToken = parseNextToken(is);
                 }
                 retval = list;
                 break;
             }
-            case '<':
-            {
+            case '<': {
                 int theNextByte = is.read();
-                if( theNextByte == '<' )
-                {
+                if (theNextByte == '<') {
                     Map result = new HashMap<>();
                     //we are reading a dictionary
-                    Object key = parseNextToken( is ); 
-                    while( key instanceof LiteralName && key != MARK_END_OF_DICTIONARY )
-                    {
-                        Object value = parseNextToken( is );
-                        result.put( ((LiteralName)key).name, value );
-                        key = parseNextToken( is );
+                    Object key = parseNextToken(is);
+                    while (key instanceof LiteralName && key != MARK_END_OF_DICTIONARY) {
+                        Object value = parseNextToken(is);
+                        result.put(((LiteralName) key).name, value);
+                        key = parseNextToken(is);
                     }
                     retval = result;
-                }
-                else
-                {
+                } else {
                     //won't read more than 512 bytes
-                    
+
                     int multiplyer = 16;
                     int bufferIndex = -1;
-                    while( theNextByte != -1 && theNextByte != '>' )
-                    {
+                    while (theNextByte != -1 && theNextByte != '>') {
                         int intValue = 0;
                         if (theNextByte == ' ' || theNextByte == '\t' || theNextByte == '\n' || theNextByte == '\r'
-                            || theNextByte == '\f')
-                        {
+                                || theNextByte == '\f') {
                             theNextByte = is.read();
                             continue;
-                        }
-                        else if (theNextByte >= '0' && theNextByte <= '9')
-                        {
+                        } else if (theNextByte >= '0' && theNextByte <= '9') {
                             intValue = theNextByte - '0';
-                        }
-                        else if( theNextByte >= 'A' && theNextByte <= 'F' )
-                        {
+                        } else if (theNextByte >= 'A' && theNextByte <= 'F') {
                             intValue = 10 + theNextByte - 'A';
-                        }
-                        else if( theNextByte >= 'a' && theNextByte <= 'f' )
-                        {
+                        } else if (theNextByte >= 'a' && theNextByte <= 'f') {
                             intValue = 10 + theNextByte - 'a';
-                        }
-                        else
-                        {
-                            throw new IOException(MessageLocalization.getComposedMessage("error.expected.hex.character.and.not.char.thenextbyte.1", theNextByte));
+                        } else {
+                            throw new IOException(MessageLocalization.getComposedMessage(
+                                    "error.expected.hex.character.and.not.char.thenextbyte.1", theNextByte));
                         }
                         intValue *= multiplyer;
-                        if( multiplyer == 16 )
-                        {
+                        if (multiplyer == 16) {
                             bufferIndex++;
                             tokenParserByteBuffer[bufferIndex] = 0;
                             multiplyer = 1;
-                        }
-                        else
-                        {
+                        } else {
                             multiplyer = 16;
                         }
-                        tokenParserByteBuffer[bufferIndex]+= (byte) intValue;
+                        tokenParserByteBuffer[bufferIndex] += (byte) intValue;
                         theNextByte = is.read();
                     }
-                    byte[] finalResult = new byte[bufferIndex+1];
-                    System.arraycopy(tokenParserByteBuffer,0,finalResult, 0, bufferIndex+1);
+                    byte[] finalResult = new byte[bufferIndex + 1];
+                    System.arraycopy(tokenParserByteBuffer, 0, finalResult, 0, bufferIndex + 1);
                     retval = finalResult;
                 }
                 break;
             }
-            case '/':
-            {
+            case '/': {
                 StringBuilder buffer = new StringBuilder();
                 int stringByte = is.read();
-                
-                while( !isWhitespaceOrEOF( stringByte ) )
-                {
-                    buffer.append( (char)stringByte );
+
+                while (!isWhitespaceOrEOF(stringByte)) {
+                    buffer.append((char) stringByte);
                     stringByte = is.read();
                 }
-                retval = new LiteralName( buffer.toString() );
+                retval = new LiteralName(buffer.toString());
                 break;
             }
-            case -1:
-            {
+            case -1: {
                 //EOF return null;
                 break;
             }
@@ -322,162 +294,116 @@ else if( theNextByte >= 'a' && theNextByte <= 'f' )
             case '6':
             case '7':
             case '8':
-            case '9':
-            {
+            case '9': {
                 StringBuilder buffer = new StringBuilder();
-                buffer.append( (char)nextByte );
+                buffer.append((char) nextByte);
                 nextByte = is.read();
-                
-                while( !isWhitespaceOrEOF( nextByte ) &&
-                        (Character.isDigit( (char)nextByte )||
-                         nextByte == '.' ) )
-                {
-                    buffer.append( (char)nextByte );
+
+                while (!isWhitespaceOrEOF(nextByte) &&
+                        (Character.isDigit((char) nextByte) ||
+                                nextByte == '.')) {
+                    buffer.append((char) nextByte);
                     nextByte = is.read();
                 }
-                is.unread( nextByte );
+                is.unread(nextByte);
                 String value = buffer.toString();
-                if( value.indexOf( '.' ) >=0 )
-                {
-                    retval = Double.valueOf( value );
-                }
-                else
-                {
+                if (value.indexOf('.') >= 0) {
+                    retval = Double.valueOf(value);
+                } else {
                     retval = Integer.valueOf(buffer.toString());
                 }
                 break;
             }
-            default:
-            {
+            default: {
                 StringBuilder buffer = new StringBuilder();
-                buffer.append( (char)nextByte );
+                buffer.append((char) nextByte);
                 nextByte = is.read();
-                
-                while( !isWhitespaceOrEOF( nextByte ) )
-                {
-                    buffer.append( (char)nextByte );
+
+                while (!isWhitespaceOrEOF(nextByte)) {
+                    buffer.append((char) nextByte);
                     nextByte = is.read();
                 }
-                retval = new Operator( buffer.toString() );                        
-                
+                retval = new Operator(buffer.toString());
+
                 break;
             }
         }
         return retval;
     }
-    
-    private void readUntilEndOfLine( InputStream is, StringBuffer buf ) throws IOException
-    {
+
+    private void readUntilEndOfLine(InputStream is, StringBuffer buf) throws IOException {
         int nextByte = is.read();
-        while( nextByte != -1 && nextByte != 0x0D && nextByte != 0x0A )
-        {
-            buf.append( (char)nextByte );
+        while (nextByte != -1 && nextByte != 0x0D && nextByte != 0x0A) {
+            buf.append((char) nextByte);
             nextByte = is.read();
         }
     }
-    
-    private boolean isWhitespaceOrEOF( int aByte )
-    {
-        return aByte == -1 || aByte == 0x20 || aByte == 0x0D || aByte == 0x0A; 
+
+    private boolean isWhitespaceOrEOF(int aByte) {
+        return aByte == -1 || aByte == 0x20 || aByte == 0x0D || aByte == 0x0A;
     }
-    
 
-    private void increment( byte[] data )
-    {
-        increment( data, data.length-1 );
+    private void increment(byte[] data) {
+        increment(data, data.length - 1);
     }
 
-    private void increment( byte[] data, int position )
-    {
-        if( position > 0 && (data[position]+256)%256 == 255 )
-        {
-            data[position]=0;
-            increment( data, position-1);
-        }
-        else
-        {
-            data[position] = (byte)(data[position]+1);
+    private void increment(byte[] data, int position) {
+        if (position > 0 && (data[position] + 256) % 256 == 255) {
+            data[position] = 0;
+            increment(data, position - 1);
+        } else {
+            data[position] = (byte) (data[position] + 1);
         }
     }
-    
-    private String createStringFromBytes( byte[] bytes ) throws IOException
-    {
+
+    private String createStringFromBytes(byte[] bytes) throws IOException {
         String retval = null;
-        if( bytes.length == 1 )
-        {
-            retval = new String( bytes );
-        }
-        else
-        {
-            retval = new String( bytes, StandardCharsets.UTF_16BE);
+        if (bytes.length == 1) {
+            retval = new String(bytes);
+        } else {
+            retval = new String(bytes, StandardCharsets.UTF_16BE);
         }
         return retval;
     }
 
-    private int compare( byte[] first, byte[] second )
-    {
+    private int compare(byte[] first, byte[] second) {
         int retval = 1;
         boolean done = false;
-        for( int i=0; i" );
-            System.exit( -1 );
-        }
-        CMapParser parser = new CMapParser(  );
-        CMap result = parser.parse( new FileInputStream( args[0] ) );
-        System.out.println( "Result:" + result );
-    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CodespaceRange.java b/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CodespaceRange.java
index 627d700d2..bb1ee4145 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CodespaceRange.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/fonts/cmaps/CodespaceRange.java
@@ -1,32 +1,24 @@
 /**
- * Copyright (c) 2005, www.fontbox.org
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of fontbox; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * Copyright (c) 2005, www.fontbox.org All rights reserved.
+ * 
              
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+ * following conditions are met:
+ * 
              
+ * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+ * disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+ * the following disclaimer in the documentation and/or other materials provided with the distribution. 3. Neither the
+ * name of fontbox; nor the names of its contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * 
              
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ * 
              
  * http://www.fontbox.org
- *
  */
 package com.lowagie.text.pdf.fonts.cmaps;
 
@@ -35,10 +27,9 @@
  *
  * @author Ben Litchfield (ben@benlitchfield.com)
  * @version $Revision: 3646 $
- * @since    2.1.4
+ * @since 2.1.4
  */
-public class CodespaceRange
-{
+public class CodespaceRange {
 
     private byte[] start;
     private byte[] end;
@@ -46,43 +37,42 @@ public class CodespaceRange
     /**
      * Creates a new instance of CodespaceRange.
      */
-    public CodespaceRange()
-    {
+    public CodespaceRange() {
     }
 
-    /** Getter for property end.
-     * @return Value of property end.
+    /**
+     * Getter for property end.
      *
+     * @return Value of property end.
      */
-    public byte[] getEnd()
-    {
+    public byte[] getEnd() {
         return this.end;
     }
 
-    /** Setter for property end.
-     * @param endBytes New value of property end.
+    /**
+     * Setter for property end.
      *
+     * @param endBytes New value of property end.
      */
-    public void setEnd(byte[] endBytes)
-    {
+    public void setEnd(byte[] endBytes) {
         end = endBytes;
     }
 
-    /** Getter for property start.
-     * @return Value of property start.
+    /**
+     * Getter for property start.
      *
+     * @return Value of property start.
      */
-    public byte[] getStart()
-    {
+    public byte[] getStart() {
         return this.start;
     }
 
-    /** Setter for property start.
-     * @param startBytes New value of property start.
+    /**
+     * Setter for property start.
      *
+     * @param startBytes New value of property start.
      */
-    public void setStart(byte[] startBytes)
-    {
+    public void setStart(byte[] startBytes) {
         start = startBytes;
     }
 
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/ByteVector.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/ByteVector.java
index 4a142c028..3ec51ae6c 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/ByteVector.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/ByteVector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,8 +19,7 @@
 import java.io.Serializable;
 
 /**
- * This class implements a simple byte vector with access to the
- * underlying array.
+ * This class implements a simple byte vector with access to the underlying array.
  *
  * @author Carlos Villegas
  */
@@ -101,8 +100,9 @@ public byte get(int index) {
 
     /**
      * This is to implement memory allocation in the array. Like malloc().
-     * @param size  The size to add
-     * @return  The index of the size of the old array
+     *
+     * @param size The size to add
+     * @return The index of the size of the old array
      */
     public int alloc(int size) {
         int index = n;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/CharVector.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/CharVector.java
index 5fe1cfa1e..cafd63266 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/CharVector.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/CharVector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,8 +19,7 @@
 import java.io.Serializable;
 
 /**
- * This class implements a simple char vector with access to the
- * underlying array.
+ * This class implements a simple char vector with access to the underlying array.
  *
  * @author Carlos Villegas
  */
@@ -99,6 +98,7 @@ public int length() {
 
     /**
      * returns current capacity of array
+     *
      * @return the current capacity of array
      */
     public int capacity() {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphen.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphen.java
index f270392a3..cc4cf902d 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphen.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphen.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,19 +19,17 @@
 import java.io.Serializable;
 
 /**
- * This class represents a hyphen. A 'full' hyphen is made of 3 parts:
- * the pre-break text, post-break text and no-break. If no line-break
- * is generated at this position, the no-break text is used, otherwise,
- * pre-break and post-break are used. Typically, pre-break is equal to
- * the hyphen character and the others are empty. However, this general
- * scheme allows support for cases in some languages where words change
- * spelling if they're split across lines, like german's 'backen' which
- * hyphenates 'bak-ken'. BTW, this comes from TeX.
+ * This class represents a hyphen. A 'full' hyphen is made of 3 parts: the pre-break text, post-break text and no-break.
+ * If no line-break is generated at this position, the no-break text is used, otherwise, pre-break and post-break are
+ * used. Typically, pre-break is equal to the hyphen character and the others are empty. However, this general scheme
+ * allows support for cases in some languages where words change spelling if they're split across lines, like german's
+ * 'backen' which hyphenates 'bak-ken'. BTW, this comes from TeX.
  *
  * @author Carlos Villegas
  */
 
 public class Hyphen implements Serializable {
+
     private static final long serialVersionUID = -7666138517324763063L;
     public String preBreak;
     public String noBreak;
@@ -50,12 +48,12 @@ public class Hyphen implements Serializable {
     }
 
     public String toString() {
-        if (noBreak == null 
-                && postBreak == null 
+        if (noBreak == null
+                && postBreak == null
                 && preBreak != null
                 && preBreak.equals("-")) {
             return "-";
-                }
+        }
         StringBuilder res = new StringBuilder("{");
         res.append(preBreak);
         res.append("}{");
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenation.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenation.java
index 4700ee649..5583c0eaf 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenation.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenation.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,7 @@
  * @author Carlos Villegas
  */
 public class Hyphenation {
-    
+
     private int[] hyphenPoints;
     private String word;
 
@@ -32,8 +32,7 @@ public class Hyphenation {
     private int len;
 
     /**
-     * rawWord as made of alternating strings and {@link Hyphen Hyphen}
-     * instances
+     * rawWord as made of alternating strings and {@link Hyphen Hyphen} instances
      */
     Hyphenation(String word, int[] points) {
         this.word = word;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/HyphenationException.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/HyphenationException.java
index 6a7d0dd0c..fee801a3e 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/HyphenationException.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/HyphenationException.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/HyphenationTree.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/HyphenationTree.java
index 36decd462..eeca8ee8c 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/HyphenationTree.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/HyphenationTree.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,7 +15,7 @@
  */
 
 /* $Id: HyphenationTree.java 3117 2008-01-31 05:53:22Z xlv $ */
- 
+
 package com.lowagie.text.pdf.hyphenation;
 
 import java.io.InputStream;
@@ -25,14 +25,13 @@
 import java.util.Map;
 
 /**
- * This tree structure stores the hyphenation patterns in an efficient
- * way for fast lookup. It provides the provides the method to
- * hyphenate a word.
+ * This tree structure stores the hyphenation patterns in an efficient way for fast lookup. It provides the provides the
+ * method to hyphenate a word.
  *
  * @author Carlos Villegas
  */
-public class HyphenationTree extends TernaryTree 
-            implements PatternConsumer {
+public class HyphenationTree extends TernaryTree
+        implements PatternConsumer {
 
     private static final long serialVersionUID = -7763254239309429432L;
 
@@ -64,13 +63,11 @@ public HyphenationTree() {
     }
 
     /**
-     * Packs the values by storing them in 4 bits, two values into a byte
-     * Values range is from 0 to 9. We use zero as terminator,
-     * so we'll add 1 to the value.
-     * @param values a string of digits from '0' to '9' representing the
-     * interletter values.
-     * @return the index into the vspace array where the packed values
-     * are stored.
+     * Packs the values by storing them in 4 bits, two values into a byte Values range is from 0 to 9. We use zero as
+     * terminator, so we'll add 1 to the value.
+     *
+     * @param values a string of digits from '0' to '9' representing the interletter values.
+     * @return the index into the vspace array where the packed values are stored.
      */
     protected int packValues(String values) {
         int i, n = values.length();
@@ -79,11 +76,11 @@ protected int packValues(String values) {
         byte[] va = vspace.getArray();
         for (i = 0; i < n; i++) {
             int j = i >> 1;
-            byte v = (byte)((values.charAt(i) - '0' + 1) & 0x0f);
+            byte v = (byte) ((values.charAt(i) - '0' + 1) & 0x0f);
             if ((i & 1) == 1) {
-                va[j + offset] = (byte)(va[j + offset] | v);
+                va[j + offset] = (byte) (va[j + offset] | v);
             } else {
-                va[j + offset] = (byte)(v << 4);    // big endian
+                va[j + offset] = (byte) (v << 4);    // big endian
             }
         }
         va[m - 1 + offset] = 0;    // terminator
@@ -94,13 +91,13 @@ protected String unpackValues(int k) {
         StringBuilder buf = new StringBuilder();
         byte v = vspace.get(k++);
         while (v != 0) {
-            char c = (char)((v >>> 4) - 1 + '0');
+            char c = (char) ((v >>> 4) - 1 + '0');
             buf.append(c);
-            c = (char)(v & 0x0f);
+            c = (char) (v & 0x0f);
             if (c == 0) {
                 break;
             }
-            c = (char)(c - 1 + '0');
+            c = (char) (c - 1 + '0');
             buf.append(c);
             v = vspace.get(k++);
         }
@@ -133,12 +130,12 @@ public String findPattern(String pat) {
     }
 
     /**
-     * String compare, returns 0 if equal or
-     * t is a substring of s
-     * @param s     The first String to compare
-     * @param si    The index to start at on String s
-     * @param t     The second String to compare
-     * @param ti    The index to start at on String t
+     * String compare, returns 0 if equal or t is a substring of s
+     *
+     * @param s  The first String to compare
+     * @param si The index to start at on String s
+     * @param t  The second String to compare
+     * @param ti The index to start at on String t
      * @return 0 if equal or
      */
     protected int hstrcmp(char[] s, int si, char[] t, int ti) {
@@ -157,27 +154,26 @@ protected byte[] getValues(int k) {
         StringBuilder buf = new StringBuilder();
         byte v = vspace.get(k++);
         while (v != 0) {
-            char c = (char)((v >>> 4) - 1);
+            char c = (char) ((v >>> 4) - 1);
             buf.append(c);
-            c = (char)(v & 0x0f);
+            c = (char) (v & 0x0f);
             if (c == 0) {
                 break;
             }
-            c = (char)(c - 1);
+            c = (char) (c - 1);
             buf.append(c);
             v = vspace.get(k++);
         }
         byte[] res = new byte[buf.length()];
         for (int i = 0; i < res.length; i++) {
-            res[i] = (byte)buf.charAt(i);
+            res[i] = (byte) buf.charAt(i);
         }
         return res;
     }
 
     /**
      * 
              Search for all possible partial matches of word starting
-     * at index an update interletter values. In other words, it
-     * does something like:
              
+     * at index an update interletter values. In other words, it does something like:
              
      * 
                    * {@code
      *  for(i=0; i
      * 
              But it is done in an efficient way since the patterns are
-     * stored in a ternary tree. In fact, this is the whole purpose
-     * of having the tree: doing this search without having to test
-     * every single pattern. The number of patterns for languages
-     * such as English range from 4000 to 10000. Thus, doing thousands
-     * of string comparisons for each word to hyphenate would be
-     * really slow without the tree. The tradeoff is memory, but
-     * using a ternary tree instead of a trie, almost halves the
-     * the memory used by Lout or TeX. It's also faster than using
-     * a hash table
              
-     * @param word null terminated word to match
+     * stored in a ternary tree. In fact, this is the whole purpose of having the tree: doing this search without having
+     * to test every single pattern. The number of patterns for languages such as English range from 4000 to 10000.
+     * Thus, doing thousands of string comparisons for each word to hyphenate would be really slow without the tree. The
+     * tradeoff is memory, but using a ternary tree instead of a trie, almost halves the the memory used by Lout or TeX.
+     * It's also faster than using a hash table
              
+     *
+     * @param word  null terminated word to match
      * @param index start index from word
-     * @param il interletter values array to update
+     * @param il    interletter values array to update
      */
     protected void searchPatterns(char[] word, int index, byte[] il) {
         byte[] values;
@@ -264,16 +257,15 @@ protected void searchPatterns(char[] word, int index, byte[] il) {
 
     /**
      * Hyphenate word and return a Hyphenation object.
-     * @param word the word to be hyphenated
-     * @param remainCharCount Minimum number of characters allowed
-     * before the hyphenation point.
-     * @param pushCharCount Minimum number of characters allowed after
-     * the hyphenation point.
-     * @return a {@link Hyphenation Hyphenation} object representing
-     * the hyphenated word or null if word is not hyphenated.
+     *
+     * @param word            the word to be hyphenated
+     * @param remainCharCount Minimum number of characters allowed before the hyphenation point.
+     * @param pushCharCount   Minimum number of characters allowed after the hyphenation point.
+     * @return a {@link Hyphenation Hyphenation} object representing the hyphenated word or null if word is not
+     * hyphenated.
      */
     public Hyphenation hyphenate(String word, int remainCharCount,
-                                 int pushCharCount) {
+            int pushCharCount) {
         char[] w = word.toCharArray();
         return hyphenate(w, 0, w.length, remainCharCount, pushCharCount);
     }
@@ -303,18 +295,17 @@ public Hyphenation hyphenate(String word, int remainCharCount,
 
     /**
      * Hyphenate word and return an array of hyphenation points.
-     * @param w char array that contains the word
-     * @param offset Offset to first character in word
-     * @param len Length of word
-     * @param remainCharCount Minimum number of characters allowed
-     * before the hyphenation point.
-     * @param pushCharCount Minimum number of characters allowed after
-     * the hyphenation point.
-     * @return a {@link Hyphenation Hyphenation} object representing
-     * the hyphenated word or null if word is not hyphenated.
+     *
+     * @param w               char array that contains the word
+     * @param offset          Offset to first character in word
+     * @param len             Length of word
+     * @param remainCharCount Minimum number of characters allowed before the hyphenation point.
+     * @param pushCharCount   Minimum number of characters allowed after the hyphenation point.
+     * @return a {@link Hyphenation Hyphenation} object representing the hyphenated word or null if word is not
+     * hyphenated.
      */
     public Hyphenation hyphenate(char[] w, int offset, int len,
-                                 int remainCharCount, int pushCharCount) {
+            int remainCharCount, int pushCharCount) {
         int i;
         char[] word = new char[len + 3];
 
@@ -329,15 +320,15 @@ public Hyphenation hyphenate(char[] w, int offset, int len,
             if (nc < 0) {    // found a non-letter character ...
                 if (i == (1 + iIgnoreAtBeginning)) {
                     // ... before any letter character
-                    iIgnoreAtBeginning ++;
+                    iIgnoreAtBeginning++;
                 } else {
                     // ... after a letter character
                     bEndOfLetters = true;
                 }
-                iLength --;
+                iLength--;
             } else {
                 if (!bEndOfLetters) {
-                    word[i - iIgnoreAtBeginning] = (char)nc;
+                    word[i - iIgnoreAtBeginning] = (char) nc;
                 } else {
                     return null;
                 }
@@ -362,7 +353,7 @@ public Hyphenation hyphenate(char[] w, int offset, int len,
                 // j = index(sw) = letterindex(word)?
                 // result[k] = corresponding index(w)
                 if (o instanceof String) {
-                    j += ((String)o).length();
+                    j += ((String) o).length();
                     if (j >= remainCharCount && j < (len - pushCharCount)) {
                         result[k++] = j + iIgnoreAtBeginning;
                     }
@@ -390,7 +381,6 @@ public Hyphenation hyphenate(char[] w, int offset, int len,
             }
         }
 
-
         if (k > 0) {
             // trim result array
             int[] res = new int[k];
@@ -402,16 +392,12 @@ public Hyphenation hyphenate(char[] w, int offset, int len,
     }
 
     /**
-     * Add a character class to the tree. It is used by
-     * {@link SimplePatternParser SimplePatternParser} as callback to
-     * add character classes. Character classes define the
-     * valid word characters for hyphenation. If a word contains
-     * a character not defined in any of the classes, it is not hyphenated.
-     * It also defines a way to normalize the characters in order
-     * to compare them with the stored patterns. Usually pattern
-     * files use only lower case characters, in this case a class
-     * for letter 'a', for example, should be defined as "aA", the first
-     * character being the normalization char.
+     * Add a character class to the tree. It is used by {@link SimplePatternParser SimplePatternParser} as callback to
+     * add character classes. Character classes define the valid word characters for hyphenation. If a word contains a
+     * character not defined in any of the classes, it is not hyphenated. It also defines a way to normalize the
+     * characters in order to compare them with the stored patterns. Usually pattern files use only lower case
+     * characters, in this case a class for letter 'a', for example, should be defined as "aA", the first character
+     * being the normalization char.
      */
     public void addClass(String chargroup) {
         if (chargroup.length() > 0) {
@@ -426,39 +412,36 @@ public void addClass(String chargroup) {
     }
 
     /**
-     * Add an exception to the tree. It is used by
-     * {@link SimplePatternParser SimplePatternParser} class as callback to
+     * Add an exception to the tree. It is used by {@link SimplePatternParser SimplePatternParser} class as callback to
      * store the hyphenation exceptions.
-     * @param word normalized word
-     * @param hyphenatedword a vector of alternating strings and
-     * {@link Hyphen hyphen} objects.
+     *
+     * @param word           normalized word
+     * @param hyphenatedword a vector of alternating strings and {@link Hyphen hyphen} objects.
      */
     public void addException(String word, ArrayList hyphenatedword) {
         stoplist.put(word, hyphenatedword);
     }
 
     /**
-     * Add a pattern to the tree. Mainly, to be used by
-     * {@link SimplePatternParser SimplePatternParser} class as callback to
-     * add a pattern to the tree.
+     * Add a pattern to the tree. Mainly, to be used by {@link SimplePatternParser SimplePatternParser} class as
+     * callback to add a pattern to the tree.
+     *
      * @param pattern the hyphenation pattern
-     * @param ivalue interletter weight values indicating the
-     * desirability and priority of hyphenating at a given point
-     * within the pattern. It should contain only digit characters.
-     * (i.e. '0' to '9').
+     * @param ivalue  interletter weight values indicating the desirability and priority of hyphenating at a given point
+     *                within the pattern. It should contain only digit characters. (i.e. '0' to '9').
      */
     public void addPattern(String pattern, String ivalue) {
         int k = ivalues.find(ivalue);
         if (k <= 0) {
             k = packValues(ivalue);
-            ivalues.insert(ivalue, (char)k);
+            ivalues.insert(ivalue, (char) k);
         }
-        insert(pattern, (char)k);
+        insert(pattern, (char) k);
     }
 
     public void printStats() {
         System.out.println("Value space size = "
-                           + vspace.length());
+                + vspace.length());
         super.printStats();
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenator.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenator.java
index 6c207cb65..accafa976 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenator.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,49 +16,50 @@
 
 package com.lowagie.text.pdf.hyphenation;
 
+import com.lowagie.text.pdf.BaseFont;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.Hashtable;
 import java.util.Map;
 
-import com.lowagie.text.pdf.BaseFont;
-
 /**
- * This class is the main entry point to the hyphenation package.
- * You can use only the static methods or create an instance.
+ * This class is the main entry point to the hyphenation package. You can use only the static methods or create an
+ * instance.
  *
  * @author Carlos Villegas
  */
 public class Hyphenator {
-    
-    /** TODO: Don't use statics */
-    private static Map hyphenTrees = new Hashtable<>();
 
+    private static final String defaultHyphLocation = "com/lowagie/text/pdf/hyphenation/hyph/";
+    /**
+     * TODO: Don't use statics
+     */
+    private static Map hyphenTrees = new Hashtable<>();
+    /**
+     * Holds value of property hyphenDir.
+     */
+    private static String hyphenDir = "";
     private HyphenationTree hyphenTree = null;
     private int remainCharCount = 2;
     private int pushCharCount = 2;
-    private static final String defaultHyphLocation = "com/lowagie/text/pdf/hyphenation/hyph/";
-   
-    /** Holds value of property hyphenDir. */
-    private static String hyphenDir = "";    
 
     /**
-     * @param lang      The language
-     * @param country   the Country
-     * @param leftMin   The minimum letters on the left
-     * @param rightMin  The minimum letters on the right
+     * @param lang     The language
+     * @param country  the Country
+     * @param leftMin  The minimum letters on the left
+     * @param rightMin The minimum letters on the right
      */
     public Hyphenator(String lang, String country, int leftMin,
-                      int rightMin) {
+            int rightMin) {
         hyphenTree = getHyphenationTree(lang, country);
         remainCharCount = leftMin;
         pushCharCount = rightMin;
     }
 
     /**
-     * @param lang      The language
-     * @param country   The country
+     * @param lang    The language
+     * @param country The country
      * @return the hyphenation tree
      */
     public static HyphenationTree getHyphenationTree(String lang,
@@ -68,7 +69,7 @@ public static HyphenationTree getHyphenationTree(String lang,
         if (country != null && !country.equals("none")) {
             key += "_" + country;
         }
-            // first try to find it in the cache
+        // first try to find it in the cache
         if (hyphenTrees.containsKey(key)) {
             return hyphenTrees.get(key);
         }
@@ -77,8 +78,9 @@ public static HyphenationTree getHyphenationTree(String lang,
         }
 
         HyphenationTree hTree = getResourceHyphenationTree(key);
-        if (hTree == null)
+        if (hTree == null) {
             hTree = getFileHyphenationTree(key);
+        }
         // put it into the pattern cache
         if (hTree != null) {
             hyphenTrees.put(key, hTree);
@@ -87,64 +89,68 @@ public static HyphenationTree getHyphenationTree(String lang,
     }
 
     /**
-     * @param key   A String of the key of the hyphenation tree
+     * @param key A String of the key of the hyphenation tree
      * @return a hyphenation tree
      */
     public static HyphenationTree getResourceHyphenationTree(String key) {
         try {
             InputStream stream = BaseFont.getResourceStream(defaultHyphLocation + key + ".xml");
-            if (stream == null && key.length() > 2)
+            if (stream == null && key.length() > 2) {
                 stream = BaseFont.getResourceStream(defaultHyphLocation + key.substring(0, 2) + ".xml");
-            if (stream == null)
+            }
+            if (stream == null) {
                 return null;
+            }
             HyphenationTree hTree = new HyphenationTree();
             hTree.loadSimplePatterns(stream);
             return hTree;
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             return null;
         }
     }
 
     /**
-     * @param key   The language to get the tree from
+     * @param key The language to get the tree from
      * @return a hyphenation tree
      */
     public static HyphenationTree getFileHyphenationTree(String key) {
         try {
-            if (hyphenDir == null)
+            if (hyphenDir == null) {
                 return null;
+            }
             InputStream stream = null;
             File hyphenFile = new File(hyphenDir, key + ".xml");
-            if (hyphenFile.canRead())
+            if (hyphenFile.canRead()) {
                 stream = new FileInputStream(hyphenFile);
+            }
             if (stream == null && key.length() > 2) {
                 hyphenFile = new File(hyphenDir, key.substring(0, 2) + ".xml");
-                if (hyphenFile.canRead())
+                if (hyphenFile.canRead()) {
                     stream = new FileInputStream(hyphenFile);
+                }
             }
-            if (stream == null)
+            if (stream == null) {
                 return null;
+            }
             HyphenationTree hTree = new HyphenationTree();
             hTree.loadSimplePatterns(stream);
             return hTree;
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             return null;
         }
     }
 
     /**
-     * @param lang      The language
-     * @param country   The country
-     * @param word      char array containing the word
-     * @param leftMin   Minimum number of characters allowed before the hyphenation point
-     * @param rightMin  Minimum number of characters allowed after the hyphenation point
+     * @param lang     The language
+     * @param country  The country
+     * @param word     char array containing the word
+     * @param leftMin  Minimum number of characters allowed before the hyphenation point
+     * @param rightMin Minimum number of characters allowed after the hyphenation point
      * @return a hyphenation object
      */
     public static Hyphenation hyphenate(String lang, String country,
-                                        String word, int leftMin,
-                                        int rightMin) {
+            String word, int leftMin,
+            int rightMin) {
         HyphenationTree hTree = getHyphenationTree(lang, country);
         if (hTree == null) {
             //log.error("Error building hyphenation tree for language "
@@ -155,18 +161,18 @@ public static Hyphenation hyphenate(String lang, String country,
     }
 
     /**
-     * @param lang      The language
-     * @param country   The country
-     * @param word      char array that contains the word to hyphenate
-     * @param offset    Offset to the first character in word
-     * @param len       The length of the word
-     * @param leftMin   Minimum number of characters allowed before the hyphenation point
-     * @param rightMin  Minimum number of characters allowed after the hyphenation point
+     * @param lang     The language
+     * @param country  The country
+     * @param word     char array that contains the word to hyphenate
+     * @param offset   Offset to the first character in word
+     * @param len      The length of the word
+     * @param leftMin  Minimum number of characters allowed before the hyphenation point
+     * @param rightMin Minimum number of characters allowed after the hyphenation point
      * @return a hyphenation object
      */
     public static Hyphenation hyphenate(String lang, String country,
-                                        char[] word, int offset, int len,
-                                        int leftMin, int rightMin) {
+            char[] word, int offset, int len,
+            int leftMin, int rightMin) {
         HyphenationTree hTree = getHyphenationTree(lang, country);
         if (hTree == null) {
             //log.error("Error building hyphenation tree for language "
@@ -177,31 +183,49 @@ public static Hyphenation hyphenate(String lang, String country,
     }
 
     /**
-     * @param min   Minimum number of characters allowed before the hyphenation point
+     * Getter for property hyphenDir.
+     *
+     * @return Value of property hyphenDir.
+     */
+    public static String getHyphenDir() {
+        return hyphenDir;
+    }
+
+    /**
+     * Setter for property hyphenDir.
+     *
+     * @param _hyphenDir New value of property hyphenDir.
+     */
+    public static void setHyphenDir(String _hyphenDir) {
+        hyphenDir = _hyphenDir;
+    }
+
+    /**
+     * @param min Minimum number of characters allowed before the hyphenation point
      */
     public void setMinRemainCharCount(int min) {
         remainCharCount = min;
     }
 
     /**
-     * @param min   Minimum number of characters allowed after the hyphenation point
+     * @param min Minimum number of characters allowed after the hyphenation point
      */
     public void setMinPushCharCount(int min) {
         pushCharCount = min;
     }
 
     /**
-     * @param lang      The language
-     * @param country   The country
+     * @param lang    The language
+     * @param country The country
      */
     public void setLanguage(String lang, String country) {
         hyphenTree = getHyphenationTree(lang, country);
     }
 
     /**
-     * @param word      Char array that contains the word
-     * @param offset    Offset to the first character in word
-     * @param len       Length of the word
+     * @param word   Char array that contains the word
+     * @param offset Offset to the first character in word
+     * @param len    Length of the word
      * @return a hyphenation object
      */
     public Hyphenation hyphenate(char[] word, int offset, int len) {
@@ -209,11 +233,11 @@ public Hyphenation hyphenate(char[] word, int offset, int len) {
             return null;
         }
         return hyphenTree.hyphenate(word, offset, len, remainCharCount,
-                                    pushCharCount);
+                pushCharCount);
     }
 
     /**
-     * @param word  The word to hyphenate
+     * @param word The word to hyphenate
      * @return a hyphenation object
      */
     public Hyphenation hyphenate(String word) {
@@ -223,18 +247,4 @@ public Hyphenation hyphenate(String word) {
         return hyphenTree.hyphenate(word, remainCharCount, pushCharCount);
     }
 
-    /** Getter for property hyphenDir.
-     * @return Value of property hyphenDir.
-     */
-    public static String getHyphenDir() {
-        return hyphenDir;
-    }
-    
-    /** Setter for property hyphenDir.
-     * @param _hyphenDir New value of property hyphenDir.
-     */
-    public static void setHyphenDir(String _hyphenDir) {
-        hyphenDir = _hyphenDir;
-    }
-    
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/PatternConsumer.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/PatternConsumer.java
index 4e4781a4c..d487551c6 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/PatternConsumer.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/PatternConsumer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,38 +19,35 @@
 import java.util.ArrayList;
 
 /**
- * This interface is used to connect the XML pattern file parser to
- * the hyphenation tree.
+ * This interface is used to connect the XML pattern file parser to the hyphenation tree.
  *
  * @author Carlos Villegas
  */
 public interface PatternConsumer {
 
     /**
-     * Add a character class.
-     * A character class defines characters that are considered
-     * equivalent for the purpose of hyphenation (e.g. "aA"). It
-     * usually means to ignore case.
+     * Add a character class. A character class defines characters that are considered equivalent for the purpose of
+     * hyphenation (e.g. "aA"). It usually means to ignore case.
+     *
      * @param chargroup character group
      */
     void addClass(String chargroup);
 
     /**
-     * Add a hyphenation exception. An exception replaces the
-     * result obtained by the algorithm for cases for which this
-     * fails or the user wants to provide his own hyphenation.
-     * A hyphenatedword is a vector of alternating String's and
+     * Add a hyphenation exception. An exception replaces the result obtained by the algorithm for cases for which this
+     * fails or the user wants to provide his own hyphenation. A hyphenatedword is a vector of alternating String's and
      * {@link Hyphen Hyphen} instances
-     * @param word              The word to change
-     * @param hyphenatedword    A vector of alternating String's and {@link Hyphen Hyphen} instances
+     *
+     * @param word           The word to change
+     * @param hyphenatedword A vector of alternating String's and {@link Hyphen Hyphen} instances
      */
     void addException(String word, ArrayList hyphenatedword);
 
     /**
      * Add hyphenation patterns.
+     *
      * @param pattern the pattern
-     * @param values interletter values expressed as a string of
-     * digit characters.
+     * @param values  interletter values expressed as a string of digit characters.
      */
     void addPattern(String pattern, String values);
 
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java
index 6729da6e3..4ca9ad73b 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java
@@ -39,10 +39,10 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
  * details.
- * 
+ *
  * Contributions by:
  * Lubos Strapko
- * 
+ *
  * If you didn't download this code from the following link, you should check if
  * you aren't using an obsolete version:
  * https://github.com/LibrePDF/OpenPDF
@@ -54,7 +54,6 @@
 import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
 import com.lowagie.text.xml.simpleparser.SimpleXMLParser;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -63,47 +62,33 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-/** Parses the xml hyphenation pattern.
+/**
+ * Parses the xml hyphenation pattern.
  *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class SimplePatternParser implements SimpleXMLDocHandler,
         PatternConsumer {
-    int currElement;
 
+    static final int ELEM_CLASSES = 1;
+    static final int ELEM_EXCEPTIONS = 2;
+    static final int ELEM_PATTERNS = 3;
+    static final int ELEM_HYPHEN = 4;
+    int currElement;
     PatternConsumer consumer;
-
     StringBuffer token;
-
     List exception;
-
     char hyphenChar;
-
     SimpleXMLParser parser;
 
-    static final int ELEM_CLASSES = 1;
-
-    static final int ELEM_EXCEPTIONS = 2;
-
-    static final int ELEM_PATTERNS = 3;
-
-    static final int ELEM_HYPHEN = 4;
-
-    /** Creates a new instance of PatternParser2 */
+    /**
+     * Creates a new instance of PatternParser2
+     */
     public SimplePatternParser() {
         token = new StringBuffer();
         hyphenChar = '-'; // default
     }
 
-    public void parse(InputStream stream, PatternConsumer consumer) {
-        this.consumer = consumer;
-        try (stream) {
-            SimpleXMLParser.parse(this, stream);
-        } catch (IOException e) {
-            throw new ExceptionConverter(e);
-        }
-    }
-
     protected static String getPattern(String word) {
         StringBuilder pat = new StringBuilder();
         int len = word.length();
@@ -115,6 +100,42 @@ protected static String getPattern(String word) {
         return pat.toString();
     }
 
+    protected static String getInterletterValues(String pat) {
+        StringBuilder il = new StringBuilder();
+        String word = pat + "a"; // add dummy letter to serve as sentinel
+        int len = word.length();
+        for (int i = 0; i < len; i++) {
+            char c = word.charAt(i);
+            if (Character.isDigit(c)) {
+                il.append(c);
+                i++;
+            } else {
+                il.append('0');
+            }
+        }
+        return il.toString();
+    }
+
+    public static void main(String[] args) {
+        try {
+            if (args.length > 0) {
+                SimplePatternParser pp = new SimplePatternParser();
+                pp.parse(new FileInputStream(args[0]), pp);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void parse(InputStream stream, PatternConsumer consumer) {
+        this.consumer = consumer;
+        try (stream) {
+            SimpleXMLParser.parse(this, stream);
+        } catch (IOException e) {
+            throw new ExceptionConverter(e);
+        }
+    }
+
     protected List normalizeException(List ex) {
         List res = new ArrayList<>();
         for (Object item : ex) {
@@ -159,22 +180,6 @@ protected String getExceptionWord(List ex) {
         return res.toString();
     }
 
-    protected static String getInterletterValues(String pat) {
-        StringBuilder il = new StringBuilder();
-        String word = pat + "a"; // add dummy letter to serve as sentinel
-        int len = word.length();
-        for (int i = 0; i < len; i++) {
-            char c = word.charAt(i);
-            if (Character.isDigit(c)) {
-                il.append(c);
-                i++;
-            } else {
-                il.append('0');
-            }
-        }
-        return il.toString();
-    }
-
     public void endDocument() {
     }
 
@@ -182,22 +187,22 @@ public void endElement(String tag) {
         if (token.length() > 0) {
             String word = token.toString();
             switch (currElement) {
-            case ELEM_CLASSES:
-                consumer.addClass(word);
-                break;
-            case ELEM_EXCEPTIONS:
-                exception.add(word);
-                exception = normalizeException(exception);
-                consumer.addException(getExceptionWord(exception),
-                        (ArrayList) ((ArrayList) exception).clone());
-                break;
-            case ELEM_PATTERNS:
-                consumer.addPattern(getPattern(word),
-                        getInterletterValues(word));
-                break;
-            case ELEM_HYPHEN:
-                // nothing to do
-                break;
+                case ELEM_CLASSES:
+                    consumer.addClass(word);
+                    break;
+                case ELEM_EXCEPTIONS:
+                    exception.add(word);
+                    exception = normalizeException(exception);
+                    consumer.addException(getExceptionWord(exception),
+                            (ArrayList) ((ArrayList) exception).clone());
+                    break;
+                case ELEM_PATTERNS:
+                    consumer.addPattern(getPattern(word),
+                            getInterletterValues(word));
+                    break;
+                case ELEM_HYPHEN:
+                    // nothing to do
+                    break;
             }
             if (currElement != ELEM_HYPHEN) {
                 token.setLength(0);
@@ -250,20 +255,20 @@ public void text(String str) {
             String word = tk.nextToken();
             // System.out.println("\"" + word + "\"");
             switch (currElement) {
-            case ELEM_CLASSES:
-                consumer.addClass(word);
-                break;
-            case ELEM_EXCEPTIONS:
-                exception.add(word);
-                exception = normalizeException(exception);
-                consumer.addException(getExceptionWord(exception),
-                        (ArrayList)((ArrayList) exception).clone());
-                exception.clear();
-                break;
-            case ELEM_PATTERNS:
-                consumer.addPattern(getPattern(word),
-                        getInterletterValues(word));
-                break;
+                case ELEM_CLASSES:
+                    consumer.addClass(word);
+                    break;
+                case ELEM_EXCEPTIONS:
+                    exception.add(word);
+                    exception = normalizeException(exception);
+                    consumer.addException(getExceptionWord(exception),
+                            (ArrayList) ((ArrayList) exception).clone());
+                    exception.clear();
+                    break;
+                case ELEM_PATTERNS:
+                    consumer.addPattern(getPattern(word),
+                            getInterletterValues(word));
+                    break;
             }
         }
     }
@@ -280,15 +285,4 @@ public void addException(String w, ArrayList e) {
     public void addPattern(String p, String v) {
         System.out.println("pattern: " + p + " : " + v);
     }
-
-    public static void main(String[] args) {
-        try {
-            if (args.length > 0) {
-                SimplePatternParser pp = new SimplePatternParser();
-                pp.parse(new FileInputStream(args[0]), pp);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/TernaryTree.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/TernaryTree.java
index 83383e6b6..1133e42fe 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/TernaryTree.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/TernaryTree.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,72 +24,54 @@
  * 
              Ternary Search Tree.
              
  *
  * 
              A ternary search tree is a hybrid between a binary tree and
- * a digital search tree (trie). Keys are limited to strings.
- * A data value of type char is stored in each leaf node.
- * It can be used as an index (or pointer) to the data.
- * Branches that only contain one key are compressed to one node
- * by storing a pointer to the trailer substring of the key.
- * This class is intended to serve as base class or helper class
- * to implement Dictionary collections or the like. Ternary trees
- * have some nice properties as the following: the tree can be
- * traversed in sorted order, partial matches (wildcard) can be
- * implemented, retrieval of all keys within a given distance
- * from the target, etc. The storage requirements are higher than
- * a binary tree but a lot less than a trie. Performance is
- * comparable with a hash table, sometimes it outperforms a hash
- * function (most of the time can determine a miss faster than a hash).
              
+ * a digital search tree (trie). Keys are limited to strings. A data value of type char is stored in each leaf node. It
+ * can be used as an index (or pointer) to the data. Branches that only contain one key are compressed to one node by
+ * storing a pointer to the trailer substring of the key. This class is intended to serve as base class or helper class
+ * to implement Dictionary collections or the like. Ternary trees have some nice properties as the following: the tree
+ * can be traversed in sorted order, partial matches (wildcard) can be implemented, retrieval of all keys within a given
+ * distance from the target, etc. The storage requirements are higher than a binary tree but a lot less than a trie.
+ * Performance is comparable with a hash table, sometimes it outperforms a hash function (most of the time can determine
+ * a miss faster than a hash).
              
  *
  * 
              The main purpose of this java port is to serve as a base for
- * implementing TeX's hyphenation algorithm (see The TeXBook,
- * appendix H). Each language requires from 5000 to 15000 hyphenation
- * patterns which will be keys in this tree. The strings patterns
- * are usually small (from 2 to 5 characters), but each char in the
- * tree is stored in a node. Thus memory usage is the main concern.
- * We will sacrifice 'elegance' to keep memory requirements to the
- * minimum. Using java's char type as pointer (yes, I know pointer
- * it is a forbidden word in java) we can keep the size of the node
- * to be just 8 bytes (3 pointers and the data char). This gives
- * room for about 65000 nodes. In my tests the English patterns
- * took 7694 nodes and the German patterns 10055 nodes,
- * so I think we are safe.
              
+ * implementing TeX's hyphenation algorithm (see The TeXBook, appendix H). Each language requires from 5000 to 15000
+ * hyphenation patterns which will be keys in this tree. The strings patterns are usually small (from 2 to 5
+ * characters), but each char in the tree is stored in a node. Thus memory usage is the main concern. We will sacrifice
+ * 'elegance' to keep memory requirements to the minimum. Using java's char type as pointer (yes, I know pointer it is a
+ * forbidden word in java) we can keep the size of the node to be just 8 bytes (3 pointers and the data char). This
+ * gives room for about 65000 nodes. In my tests the English patterns took 7694 nodes and the German patterns 10055
+ * nodes, so I think we are safe.
              
  *
  * 
              All said, this is a map with strings as keys and char as value.
- * Pretty limited!. It can be extended to a general map by
- * using the string representation of an object and using the
- * char value as an index to an array that contains the object
- * values.
              
+ * Pretty limited!. It can be extended to a general map by using the string representation of an object and using the
+ * char value as an index to an array that contains the object values.
              
  *
  * @author cav@uniscope.co.jp
  */
 
 public class TernaryTree implements Cloneable, Serializable {
 
+    protected static final int BLOCK_SIZE = 2048;    // allocation size for arrays
     /**
-     * We use 4 arrays to represent a node. I guess I should have created
-     * a proper node class, but somehow Knuth's pascal code made me forget
-     * we now have a portable language with virtual memory management and
-     * automatic garbage collection! And now is kind of late, furthermore,
-     * if it ain't broken, don't fix it.
+     * We use 4 arrays to represent a node. I guess I should have created a proper node class, but somehow Knuth's
+     * pascal code made me forget we now have a portable language with virtual memory management and automatic garbage
+     * collection! And now is kind of late, furthermore, if it ain't broken, don't fix it.
      */
 
     private static final long serialVersionUID = 5313366505322983510L;
-
     /**
-     * Pointer to low branch and to rest of the key when it is
-     * stored directly in this node, we don't have unions in java!
+     * Pointer to low branch and to rest of the key when it is stored directly in this node, we don't have unions in
+     * java!
      */
     protected char[] lo;
-
     /**
      * Pointer to high branch.
      */
     protected char[] hi;
-
     /**
      * Pointer to equal branch and to data when this node is a string terminator.
      */
     protected char[] eq;
-
     /**
      * 
              The character stored in this node: splitchar.
      * Two special values are reserved:
              
@@ -100,22 +82,80 @@ public class TernaryTree implements Cloneable, Serializable {
      * strings since 0xFFFF is guaranteed not to be an Unicode character.
              
      */
     protected char[] sc;
-
     /**
      * This vector holds the trailing of the keys when the branch is compressed.
      */
     protected CharVector kv;
-
     protected char root;
     protected char freenode;
     protected int length;    // number of items in tree
 
-    protected static final int BLOCK_SIZE = 2048;    // allocation size for arrays
-
     TernaryTree() {
         init();
     }
 
+    /**
+     * Compares 2 null terminated char arrays
+     *
+     * @param a      The first char array to compare - must end by null
+     * @param startA The index to start comparing for a
+     * @param b      The second char array to compare - must end by null
+     * @param startB The index to start comparing for b
+     * @return 0 if equals, otherwise the difference of the first different characters
+     */
+    public static int strcmp(char[] a, int startA, char[] b, int startB) {
+        for (; a[startA] == b[startB]; startA++, startB++) {
+            if (a[startA] == 0) {
+                return 0;
+            }
+        }
+        return a[startA] - b[startB];
+    }
+
+    /**
+     * Compares a string with null terminated char array
+     *
+     * @param a     The char array to compare - last index has null
+     * @param start The index to start comparing from
+     * @param str   The String to compare
+     * @return 0 if equals, otherwise the difference of the first different characters
+     */
+    public static int strcmp(String str, char[] a, int start) {
+        int i, d, len = str.length();
+        for (i = 0; i < len; i++) {
+            d = str.charAt(i) - a[start + i];
+            if (d != 0) {
+                return d;
+            }
+            if (a[start + i] == 0) {
+                return d;
+            }
+        }
+        if (a[start + i] != 0) {
+            return -a[start + i];
+        }
+        return 0;
+    }
+
+    public static void strcpy(char[] dst, int di, char[] src, int si) {
+        while (src[si] != 0) {
+            dst[di++] = src[si++];
+        }
+        dst[di] = 0;
+    }
+
+    public static int strlen(char[] a, int start) {
+        int len = 0;
+        for (int i = start; i < a.length && a[i] != 0; i++) {
+            len++;
+        }
+        return len;
+    }
+
+    public static int strlen(char[] a) {
+        return strlen(a, 0);
+    }
+
     protected void init() {
         root = 0;
         freenode = 1;
@@ -128,19 +168,17 @@ protected void init() {
     }
 
     /**
-     * Branches are initially compressed, needing
-     * one node per key plus the size of the string
-     * key. They are decompressed as needed when
-     * another key with same prefix
-     * is inserted. This saves a lot of space,
-     * specially for long keys.
+     * Branches are initially compressed, needing one node per key plus the size of the string key. They are
+     * decompressed as needed when another key with same prefix is inserted. This saves a lot of space, specially for
+     * long keys.
+     *
      * @param key The key to insert
      * @param val The char to insert
      */
     public void insert(String key, char val) {
         // make sure we have enough room in the arrays
         int len = key.length()
-                  + 1;    // maximum number of nodes that may be generated
+                + 1;    // maximum number of nodes that may be generated
         if (freenode + len > eq.length) {
             redimNodeArrays(eq.length + BLOCK_SIZE);
         }
@@ -173,8 +211,8 @@ private char insert(char p, char[] key, int start, char val) {
             hi[p] = 0;
             if (len > 0) {
                 sc[p] = 0xFFFF;    // indicates branch is compressed
-                lo[p] = (char)kv.alloc(len
-                                       + 1);    // use 'lo' to hold pointer to key
+                lo[p] = (char) kv.alloc(len
+                        + 1);    // use 'lo' to hold pointer to key
                 strcpy(kv.getArray(), lo[p], key, start);
             } else {
                 sc[p] = 0;
@@ -231,66 +269,6 @@ private char insert(char p, char[] key, int start, char val) {
         return p;
     }
 
-    /**
-     * Compares 2 null terminated char arrays
-     * @param a         The first char array to compare - must end by null
-     * @param startA    The index to start comparing for a
-     * @param b         The second char array to compare - must end by null
-     * @param startB    The index to start comparing for b
-     * @return 0 if equals, otherwise the difference of the first different characters
-     */
-    public static int strcmp(char[] a, int startA, char[] b, int startB) {
-        for (; a[startA] == b[startB]; startA++, startB++) {
-            if (a[startA] == 0) {
-                return 0;
-            }
-        }
-        return a[startA] - b[startB];
-    }
-
-    /**
-     * Compares a string with null terminated char array
-     * @param a     The char array to compare - last index has null
-     * @param start The index to start comparing from
-     * @param str   The String to compare
-     * @return 0 if equals, otherwise the difference of the first different characters
-     */
-    public static int strcmp(String str, char[] a, int start) {
-        int i, d, len = str.length();
-        for (i = 0; i < len; i++) {
-            d = str.charAt(i) - a[start + i];
-            if (d != 0) {
-                return d;
-            }
-            if (a[start + i] == 0) {
-                return d;
-        }
-        }
-        if (a[start + i] != 0) {
-            return -a[start + i];
-        }
-        return 0;
-    }
-
-    public static void strcpy(char[] dst, int di, char[] src, int si) {
-        while (src[si] != 0) {
-            dst[di++] = src[si++];
-        }
-        dst[di] = 0;
-    }
-
-    public static int strlen(char[] a, int start) {
-        int len = 0;
-        for (int i = start; i < a.length && a[i] != 0; i++) {
-            len++;
-        }
-        return len;
-    }
-
-    public static int strlen(char[] a) {
-        return strlen(a, 0);
-    }
-
     public int find(String key) {
         int len = key.length();
         char[] strkey = new char[len + 1];
@@ -312,7 +290,7 @@ public int find(char[] key, int start) {
                     return eq[p];
                 } else {
                     return -1;
-            }
+                }
             }
             c = key[i];
             d = c - sc[p];
@@ -326,7 +304,7 @@ public int find(char[] key, int start) {
                 p = lo[p];
             } else {
                 p = hi[p];
-        }
+            }
         }
         return -1;
     }
@@ -362,7 +340,7 @@ public Object clone() {
         t.hi = this.hi.clone();
         t.eq = this.eq.clone();
         t.sc = this.sc.clone();
-        t.kv = (CharVector)this.kv.clone();
+        t.kv = (CharVector) this.kv.clone();
         t.root = this.root;
         t.freenode = this.freenode;
         t.length = this.length;
@@ -371,14 +349,13 @@ public Object clone() {
     }
 
     /**
-     * Recursively insert the median first and then the median of the
-     * lower and upper halves, and so on in order to get a balanced
-     * tree. The array of keys is assumed to be sorted in ascending
-     * order.
-     * @param k         The array of keya - assumed to be sorted in ascending order
-     * @param n         n
-     * @param offset    The offset
-     * @param v         The character to insert first
+     * Recursively insert the median first and then the median of the lower and upper halves, and so on in order to get
+     * a balanced tree. The array of keys is assumed to be sorted in ascending order.
+     *
+     * @param k      The array of keya - assumed to be sorted in ascending order
+     * @param n      n
+     * @param offset The offset
+     * @param v      The character to insert first
      */
     protected void insertBalanced(String[] k, char[] v, int offset, int n) {
         int m;
@@ -406,7 +383,7 @@ public void balance() {
         Iterator iter = new Iterator();
         while (iter.hasMoreElements()) {
             v[i] = iter.getValue();
-            k[i++] = (String)iter.nextElement();
+            k[i++] = (String) iter.nextElement();
         }
         init();
         insertBalanced(k, v, 0, n);
@@ -416,17 +393,11 @@ public void balance() {
     }
 
     /**
-     * Each node stores a character (splitchar) which is part of
-     * some key(s). In a compressed branch (one that only contain
-     * a single string key) the trailer of the key which is not
-     * already in nodes is stored  externally in the kv array.
-     * As items are inserted, key substrings decrease.
-     * Some substrings may completely  disappear when the whole
-     * branch is totally decompressed.
-     * The tree is traversed to find the key substrings actually
-     * used. In addition, duplicate substrings are removed using
-     * a map (implemented with a TernaryTree!).
-     *
+     * Each node stores a character (splitchar) which is part of some key(s). In a compressed branch (one that only
+     * contain a single string key) the trailer of the key which is not already in nodes is stored  externally in the kv
+     * array. As items are inserted, key substrings decrease. Some substrings may completely  disappear when the whole
+     * branch is totally decompressed. The tree is traversed to find the key substrings actually used. In addition,
+     * duplicate substrings are removed using a map (implemented with a TernaryTree!).
      */
     public void trimToSize() {
         // first balance the tree for best performance
@@ -454,9 +425,9 @@ private void compact(CharVector kx, TernaryTree map, char p) {
             if (k < 0) {
                 k = kx.alloc(strlen(kv.getArray(), lo[p]) + 1);
                 strcpy(kx.getArray(), k, kv.getArray(), lo[p]);
-                map.insert(kx.getArray(), k, (char)k);
+                map.insert(kx.getArray(), k, (char) k);
             }
-            lo[p] = (char)k;
+            lo[p] = (char) k;
         } else {
             compact(kx, map, lo[p]);
             if (sc[p] != 0) {
@@ -471,6 +442,26 @@ public Enumeration keys() {
         return new Iterator();
     }
 
+    public void printStats() {
+        System.out.println("Number of keys = " + length);
+        System.out.println("Node count = " + freenode);
+        // System.out.println("Array length = " + Integer.toString(eq.length));
+        System.out.println("Key Array length = "
+                + kv.length());
+
+        /*
+         * for(int i=0; i ns;
-
         /**
          * key stack implemented with a StringBuffer
          */
@@ -566,34 +535,34 @@ private int up() {
                 i = ns.pop();
                 i.child++;
                 switch (i.child) {
-                case 1:
-                    if (sc[i.parent] != 0) {
-                        res = eq[i.parent];
-                        ns.push((Item)i.clone());
-                        ks.append(sc[i.parent]);
-                    } else {
-                        i.child++;
-                        ns.push((Item)i.clone());
-                        res = hi[i.parent];
-                    }
-                    climb = false;
-                    break;
+                    case 1:
+                        if (sc[i.parent] != 0) {
+                            res = eq[i.parent];
+                            ns.push((Item) i.clone());
+                            ks.append(sc[i.parent]);
+                        } else {
+                            i.child++;
+                            ns.push((Item) i.clone());
+                            res = hi[i.parent];
+                        }
+                        climb = false;
+                        break;
 
-                case 2:
-                    res = hi[i.parent];
-                    ns.push((Item)i.clone());
-                    if (ks.length() > 0) {
-                        ks.setLength(ks.length() - 1);    // pop
-                    }
-                    climb = false;
-                    break;
+                    case 2:
+                        res = hi[i.parent];
+                        ns.push((Item) i.clone());
+                        if (ks.length() > 0) {
+                            ks.setLength(ks.length() - 1);    // pop
+                        }
+                        climb = false;
+                        break;
 
-                default:
-                    if (ns.empty()) {
-                        return -1;
-                    }
-                    climb = true;
-                    break;
+                    default:
+                        if (ns.empty()) {
+                            return -1;
+                        }
+                        climb = true;
+                        break;
                 }
             }
             return res;
@@ -615,7 +584,7 @@ private int run() {
                         leaf = true;
                         break;
                     }
-                    ns.push(new Item((char)cur, '\u0000'));
+                    ns.push(new Item((char) cur, '\u0000'));
                     if (sc[cur] == 0) {
                         leaf = true;
                         break;
@@ -625,7 +594,7 @@ private int run() {
                 if (leaf) {
                     break;
                 }
-                    // nothing found, go up one node and try again
+                // nothing found, go up one node and try again
                 cur = up();
                 if (cur == -1) {
                     return -1;
@@ -638,31 +607,32 @@ private int run() {
                 int p = lo[cur];
                 while (kv.get(p) != 0) {
                     buf.append(kv.get(p++));
-            }
+                }
             }
             curkey = buf.toString();
             return 0;
         }
 
-    }
+        private class Item implements Cloneable {
 
-    public void printStats() {
-        System.out.println("Number of keys = " + length);
-        System.out.println("Node count = " + freenode);
-        // System.out.println("Array length = " + Integer.toString(eq.length));
-        System.out.println("Key Array length = "
-                           + kv.length());
+            char parent;
+            char child;
 
-        /*
-         * for(int i=0; iPdfAnnotation or a PdfFormField
-     * to the document. Only the top parent of a PdfFormField
-     * needs to be added.
+     * Use this methods to add a PdfAnnotation or a PdfFormField to the document. Only the top
+     * parent of a PdfFormField needs to be added.
+     *
      * @param annot the PdfAnnotation or the PdfFormField to add
      */
     void addAnnotation(PdfAnnotation annot);
+
     /**
-     * Use this method to adds the PdfAnnotation
-     * to the calculation order array.
+     * Use this method to adds the PdfAnnotation to the calculation order array.
+     *
      * @param annot the PdfAnnotation to be added
      */
     void addCalculationOrder(PdfFormField annot);
-    
+
     /**
      * Use this method to set the signature flags.
+     *
      * @param f the flags. This flags are ORed with current ones
      */
     void setSigFlags(int f);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfDocumentActions.java b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfDocumentActions.java
index 38f37f989..574997161 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfDocumentActions.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfDocumentActions.java
@@ -60,28 +60,27 @@
 public interface PdfDocumentActions {
 
     /**
-     * When the document opens it will jump to the destination with
-     * this name.
+     * When the document opens it will jump to the destination with this name.
+     *
      * @param name the name of the destination to jump to
      */
     void setOpenAction(String name);
-    
+
     /**
-     * When the document opens this action will be
-     * invoked.
+     * When the document opens this action will be invoked.
+     *
      * @param action the action to be invoked
      */
     void setOpenAction(PdfAction action);
-    
+
     /**
-     * Additional-actions defining the actions to be taken in
-     * response to various trigger events affecting the document
+     * Additional-actions defining the actions to be taken in response to various trigger events affecting the document
      * as a whole. The actions types allowed are: DOCUMENT_CLOSE,
      * WILL_SAVE, DID_SAVE, WILL_PRINT
      * and DID_PRINT.
      *
      * @param actionType the action type
-     * @param action the action to execute in response to the trigger
+     * @param action     the action to execute in response to the trigger
      * @throws DocumentException on invalid action type
      */
     void setAdditionalAction(PdfName actionType, PdfAction action) throws DocumentException;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfEncryptionSettings.java b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfEncryptionSettings.java
index 29d4a9af1..b91357700 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfEncryptionSettings.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfEncryptionSettings.java
@@ -49,49 +49,46 @@
 
 package com.lowagie.text.pdf.interfaces;
 
-import java.security.cert.Certificate;
-
 import com.lowagie.text.DocumentException;
+import java.security.cert.Certificate;
 
 /**
- * Encryption settings are described in section 3.5 (more specifically
- * section 3.5.2) of the PDF Reference 1.7.
- * They are explained in section 3.3.3 of the book 'iText in Action'.
- * The values of the different  preferences were originally stored
- * in class PdfWriter, but they have been moved to this separate interface
- * for reasons of convenience.
+ * Encryption settings are described in section 3.5 (more specifically section 3.5.2) of the PDF Reference 1.7. They are
+ * explained in section 3.3.3 of the book 'iText in Action'. The values of the different  preferences were originally
+ * stored in class PdfWriter, but they have been moved to this separate interface for reasons of convenience.
  */
 
 public interface PdfEncryptionSettings {
 
-    
+
     /**
-     * Sets the encryption options for this document. The userPassword and the
-     * ownerPassword can be null or have zero length. In this case the ownerPassword
-     * is replaced by a random string. The open permissions for the document can be
-     * AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations,
-     * AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting.
-     * The permissions can be combined by ORing them.
-     * @param userPassword the user password. Can be null or empty
-     * @param ownerPassword the owner password. Can be null or empty
-     * @param permissions the user permissions
-     * @param encryptionType the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or ENCRYPTION_AES128.
-     * Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in cleartext
+     * Sets the encryption options for this document. The userPassword and the ownerPassword can be null or have zero
+     * length. In this case the ownerPassword is replaced by a random string. The open permissions for the document can
+     * be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn, AllowScreenReaders,
+     * AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them.
+     *
+     * @param userPassword   the user password. Can be null or empty
+     * @param ownerPassword  the owner password. Can be null or empty
+     * @param permissions    the user permissions
+     * @param encryptionType the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or
+     *                       ENCRYPTION_AES128. Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in
+     *                       cleartext
      * @throws DocumentException if the document is already open
      */
-    void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType) throws DocumentException;
+    void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType)
+            throws DocumentException;
 
     /**
-     * Sets the certificate encryption options for this document. An array of one or more public certificates
-     * must be provided together with an array of the same size for the permissions for each certificate.
-     *  The open permissions for the document can be
-     *  AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations,
-     *  AllowFillIn, AllowScreenReaders, AllowAssembly and AllowDegradedPrinting.
-     *  The permissions can be combined by ORing them.
+     * Sets the certificate encryption options for this document. An array of one or more public certificates must be
+     * provided together with an array of the same size for the permissions for each certificate. The open permissions
+     * for the document can be AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn,
+     * AllowScreenReaders, AllowAssembly and AllowDegradedPrinting. The permissions can be combined by ORing them.
      * Optionally DO_NOT_ENCRYPT_METADATA can be ored to output the metadata in cleartext
-     * @param certs the public certificates to be used for the encryption
-     * @param permissions the user permissions for each of the certificates
-     * @param encryptionType the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or ENCRYPTION_AES128.
+     *
+     * @param certs          the public certificates to be used for the encryption
+     * @param permissions    the user permissions for each of the certificates
+     * @param encryptionType the type of encryption. It can be one of STANDARD_ENCRYPTION_40, STANDARD_ENCRYPTION_128 or
+     *                       ENCRYPTION_AES128.
      * @throws DocumentException if the document is already open
      */
     void setEncryption(Certificate[] certs, int[] permissions, int encryptionType) throws DocumentException;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfPageActions.java b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfPageActions.java
index dd21c85df..89afd6dda 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfPageActions.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfPageActions.java
@@ -59,25 +59,28 @@
  */
 
 public interface PdfPageActions {
-    
+
     /**
      * Sets the open and close page additional action.
-     * @param actionType the action type. It can be PdfWriter.PAGE_OPEN
-     * or PdfWriter.PAGE_CLOSE
-     * @param action the action to perform
+     *
+     * @param actionType the action type. It can be PdfWriter.PAGE_OPEN or
+     *                   PdfWriter.PAGE_CLOSE
+     * @param action     the action to perform
      * @throws DocumentException if the action type is invalid
      */
     void setPageAction(PdfName actionType, PdfAction action) throws DocumentException;
 
     /**
      * Sets the display duration for the page (for presentations)
-     * @param seconds   the number of seconds to display the page
+     *
+     * @param seconds the number of seconds to display the page
      */
     void setDuration(int seconds);
-    
+
     /**
      * Sets the transition for the page
-     * @param transition   the Transition object
+     *
+     * @param transition the Transition object
      */
     void setTransition(PdfTransition transition);
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfRunDirection.java b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfRunDirection.java
index 2751311f0..0d53dc1ae 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfRunDirection.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfRunDirection.java
@@ -50,15 +50,18 @@
 package com.lowagie.text.pdf.interfaces;
 
 public interface PdfRunDirection {
-    
-    /** Sets the run direction. This is only used as a placeholder
-     * as it does not affect anything.
-     * @param runDirection the run direction
-     */
-    void setRunDirection(int runDirection);
-    
-    /** Gets the run direction.
+
+    /**
+     * Gets the run direction.
+     *
      * @return the run direction
      */
     int getRunDirection();
+
+    /**
+     * Sets the run direction. This is only used as a placeholder as it does not affect anything.
+     *
+     * @param runDirection the run direction
+     */
+    void setRunDirection(int runDirection);
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfVersion.java b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfVersion.java
index b1197096f..3a44cdb21 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfVersion.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfVersion.java
@@ -53,45 +53,43 @@
 import com.lowagie.text.pdf.PdfName;
 
 /**
- * The PDF version is described in the PDF Reference 1.7 p92
- * (about the PDF Header) and page 139 (the version entry in
- * the Catalog). You'll also find info about setting the version
- * in the book 'iText in Action' sections 2.1.3 (PDF Header)
- * and 3.3 (Version history).
+ * The PDF version is described in the PDF Reference 1.7 p92 (about the PDF Header) and page 139 (the version entry in
+ * the Catalog). You'll also find info about setting the version in the book 'iText in Action' sections 2.1.3 (PDF
+ * Header) and 3.3 (Version history).
  */
 
 public interface PdfVersion {
-    
+
     /**
-     * If the PDF Header hasn't been written yet,
-     * this changes the version as it will appear in the PDF Header.
-     * If the PDF header was already written to the OutputStream,
-     * this changes the version as it will appear in the Catalog.
-     * @param version    a character representing the PDF version
+     * If the PDF Header hasn't been written yet, this changes the version as it will appear in the PDF Header. If the
+     * PDF header was already written to the OutputStream, this changes the version as it will appear in the Catalog.
+     *
+     * @param version a character representing the PDF version
      */
     void setPdfVersion(char version);
+
     /**
-     * If the PDF Header hasn't been written yet,
-     * this changes the version as it will appear in the PDF Header,
-     * but only if the parameter refers to a higher version.
-     * If the PDF header was already written to the OutputStream,
-     * this changes the version as it will appear in the Catalog.
-     * @param version    a character representing the PDF version
+     * If the PDF Header hasn't been written yet, this changes the version as it will appear in the PDF Header, but only
+     * if the parameter refers to a higher version. If the PDF header was already written to the OutputStream, this
+     * changes the version as it will appear in the Catalog.
+     *
+     * @param version a character representing the PDF version
      */
     void setAtLeastPdfVersion(char version);
+
     /**
-     * Sets the PDF version as it will appear in the Catalog.
-     * Note that this only has effect if you use a later version
-     * than the one that appears in the header; this method
-     * ignores the parameter if you try to set a lower version.
-     * @param version    the PDF name that will be used for the Version key in the catalog
+     * Sets the PDF version as it will appear in the Catalog. Note that this only has effect if you use a later version
+     * than the one that appears in the header; this method ignores the parameter if you try to set a lower version.
+     *
+     * @param version the PDF name that will be used for the Version key in the catalog
      */
     void setPdfVersion(PdfName version);
+
     /**
-     * Adds a developer extension to the Extensions dictionary
-     * in the Catalog.
-     * @param de    an object that contains the extensions prefix and dictionary
-     * @since    2.1.6
+     * Adds a developer extension to the Extensions dictionary in the Catalog.
+     *
+     * @param de an object that contains the extensions prefix and dictionary
+     * @since 2.1.6
      */
     void addDeveloperExtension(PdfDeveloperExtension de);
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfViewerPreferences.java b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfViewerPreferences.java
index 6a36cbb21..14ad63f7d 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfViewerPreferences.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfViewerPreferences.java
@@ -53,12 +53,10 @@
 import com.lowagie.text.pdf.PdfObject;
 
 /**
- * Viewer preferences are described in section 3.6.1 and 8.1 of the
- * PDF Reference 1.7 (Table 3.25 on p139-142 and Table 8.1 on p579-581).
- * They are explained in section 13.1 of the book 'iText in Action'.
- * The values of the different  preferences were originally stored
- * in class PdfWriter, but they have been moved to this separate interface
- * for reasons of convenience.
+ * Viewer preferences are described in section 3.6.1 and 8.1 of the PDF Reference 1.7 (Table 3.25 on p139-142 and Table
+ * 8.1 on p579-581). They are explained in section 13.1 of the book 'iText in Action'. The values of the different
+ * preferences were originally stored in class PdfWriter, but they have been moved to this separate interface for
+ * reasons of convenience.
  */
 
 public interface PdfViewerPreferences {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfXConformance.java b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfXConformance.java
index 8cb123a42..2e37e07f7 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfXConformance.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/interfaces/PdfXConformance.java
@@ -50,23 +50,25 @@
 package com.lowagie.text.pdf.interfaces;
 
 public interface PdfXConformance {
-    
-    /**
-     * Sets the PDF/X conformance level.
-     * Allowed values are PDFX1A2001, PDFX32002, PDFA1A and PDFA1B.
-     * It must be called before opening the document.
-     * @param pdfxConformance the conformance level
-     */
-    void setPDFXConformance(int pdfxConformance);
 
     /**
      * Getter for the PDF/X Conformance value.
+     *
      * @return the pdfxConformance
      */
     int getPDFXConformance();
-    
+
+    /**
+     * Sets the PDF/X conformance level. Allowed values are PDFX1A2001, PDFX32002, PDFA1A and PDFA1B. It must be called
+     * before opening the document.
+     *
+     * @param pdfxConformance the conformance level
+     */
+    void setPDFXConformance(int pdfxConformance);
+
     /**
      * Checks if the PDF/X Conformance is necessary.
+     *
      * @return true if the PDF has to be in conformance with any of the PDF/X specifications
      */
     boolean isPdfX();
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfAnnotationsImp.java b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfAnnotationsImp.java
index 396785a9f..72baea50e 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfAnnotationsImp.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfAnnotationsImp.java
@@ -78,22 +78,67 @@ public class PdfAnnotationsImp {
     protected PdfAcroForm acroForm;
 
     /**
-     * This is the array containing the references to annotations
-     * that were added to the document.
+     * This is the array containing the references to annotations that were added to the document.
      */
     protected List annotations;
-    
+
     /**
-     * This is an array containing references to some delayed annotations
-     * (that were added for a page that doesn't exist yet).
+     * This is an array containing references to some delayed annotations (that were added for a page that doesn't exist
+     * yet).
      */
     protected List delayedAnnotations = new ArrayList<>();
-    
-    
+
+
     public PdfAnnotationsImp(PdfWriter writer) {
         acroForm = new PdfAcroForm(writer);
     }
-    
+
+    public static PdfAnnotation convertAnnotation(PdfWriter writer, Annotation annot, Rectangle defaultRect)
+            throws IOException {
+        switch (annot.annotationType()) {
+            case Annotation.URL_NET:
+                return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(),
+                        new PdfAction((URL) annot.getAttributes().get(Annotation.URL)));
+            case Annotation.URL_AS_STRING:
+                return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(),
+                        new PdfAction((String) annot.getAttributes().get(Annotation.FILE)));
+            case Annotation.FILE_DEST:
+                return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(),
+                        new PdfAction((String) annot.getAttributes().get(Annotation.FILE),
+                                (String) annot.getAttributes().get(Annotation.DESTINATION)));
+            case Annotation.SCREEN:
+                boolean[] sparams = (boolean[]) annot.getAttributes().get(Annotation.PARAMETERS);
+                String fname = (String) annot.getAttributes().get(Annotation.FILE);
+                String mimetype = (String) annot.getAttributes().get(Annotation.MIMETYPE);
+                PdfFileSpecification fs;
+                if (sparams[0]) {
+                    fs = PdfFileSpecification.fileEmbedded(writer, fname, fname, null);
+                } else {
+                    fs = PdfFileSpecification.fileExtern(writer, fname);
+                }
+                return PdfAnnotation
+                        .createScreen(writer, new Rectangle(annot.llx(), annot.lly(), annot.urx(), annot.ury()),
+                                fname, fs, mimetype, sparams[1]);
+            case Annotation.FILE_PAGE:
+                return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(),
+                        new PdfAction((String) annot.getAttributes().get(Annotation.FILE),
+                                (Integer) annot.getAttributes().get(Annotation.PAGE)));
+            case Annotation.NAMED_DEST:
+                return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(),
+                        new PdfAction((Integer) annot.getAttributes().get(Annotation.NAMED)));
+            case Annotation.LAUNCH:
+                return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(),
+                        new PdfAction((String) annot.getAttributes().get(Annotation.APPLICATION),
+                                (String) annot.getAttributes().get(Annotation.PARAMETERS),
+                                (String) annot.getAttributes().get(Annotation.OPERATION),
+                                (String) annot.getAttributes().get(Annotation.DEFAULTDIR)));
+            default:
+                return new PdfAnnotation(writer, defaultRect.getLeft(), defaultRect.getBottom(), defaultRect.getRight(),
+                        defaultRect.getTop(), new PdfString(annot.title(), PdfObject.TEXT_UNICODE),
+                        new PdfString(annot.content(), PdfObject.TEXT_UNICODE));
+        }
+    }
+
     /**
      * Checks if the AcroForm is valid.
      *
@@ -102,37 +147,39 @@ public PdfAnnotationsImp(PdfWriter writer) {
     public boolean hasValidAcroForm() {
         return acroForm.isValid();
     }
-    
+
     /**
      * Gets the AcroForm object.
+     *
      * @return the PdfAcroform object of the PdfDocument
      */
     public PdfAcroForm getAcroForm() {
         return acroForm;
     }
-    
+
     public void setSigFlags(int f) {
         acroForm.setSigFlags(f);
     }
-    
+
     public void addCalculationOrder(PdfFormField formField) {
         acroForm.addCalculationOrder(formField);
     }
-    
+
     public void addAnnotation(PdfAnnotation annot) {
         if (annot.isForm()) {
-            PdfFormField field = (PdfFormField)annot;
-            if (field.getParent() == null)
+            PdfFormField field = (PdfFormField) annot;
+            if (field.getParent() == null) {
                 addFormFieldRaw(field);
-        }
-        else
+            }
+        } else {
             annotations.add(annot);
+        }
     }
-    
+
     public void addPlainAnnotation(PdfAnnotation annot) {
         annotations.add(annot);
     }
-    
+
     void addFormFieldRaw(PdfFormField field) {
         annotations.add(field);
         List kids = field.getKidFields();
@@ -142,7 +189,7 @@ void addFormFieldRaw(PdfFormField field) {
             }
         }
     }
-    
+
     public boolean hasUnusedAnnotations() {
         return !annotations.isEmpty();
     }
@@ -151,7 +198,7 @@ public void resetAnnotations() {
         annotations = delayedAnnotations;
         delayedAnnotations = new ArrayList<>();
     }
-    
+
     public PdfArray rotateAnnotations(PdfWriter writer, Rectangle pageSize) {
         PdfArray array = new PdfArray();
         int rotation = pageSize.getRotation() % 360;
@@ -166,12 +213,14 @@ public PdfArray rotateAnnotations(PdfWriter writer, Rectangle pageSize) {
             if (dic.isForm()) {
                 if (!dic.isUsed()) {
                     Map templates = dic.getTemplates();
-                    if (templates != null)
+                    if (templates != null) {
                         acroForm.addFieldTemplates(templates);
+                    }
                 }
                 PdfFormField field = (PdfFormField) dic;
-                if (field.getParent() == null)
+                if (field.getParent() == null) {
                     acroForm.addDocumentField(field.getIndirectReference());
+                }
             }
             if (dic.isAnnotation()) {
                 array.add(dic.getIndirectReference());
@@ -215,47 +264,4 @@ public PdfArray rotateAnnotations(PdfWriter writer, Rectangle pageSize) {
         }
         return array;
     }
-    
-    public static PdfAnnotation convertAnnotation(PdfWriter writer, Annotation annot, Rectangle defaultRect) throws IOException {
-        switch(annot.annotationType()) {
-           case Annotation.URL_NET:
-               return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(), new PdfAction((URL) annot.getAttributes().get(Annotation.URL)));
-           case Annotation.URL_AS_STRING:
-               return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(), new PdfAction((String) annot.getAttributes().get(Annotation.FILE)));
-           case Annotation.FILE_DEST:
-               return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(),
-                       new PdfAction((String) annot.getAttributes().get(Annotation.FILE),
-                               (String) annot.getAttributes().get(Annotation.DESTINATION)));
-            case Annotation.SCREEN:
-                boolean[] sparams = (boolean[]) annot.getAttributes().get(Annotation.PARAMETERS);
-                String fname = (String) annot.getAttributes().get(Annotation.FILE);
-                String mimetype = (String) annot.getAttributes().get(Annotation.MIMETYPE);
-                PdfFileSpecification fs;
-                if (sparams[0]) {
-                    fs = PdfFileSpecification.fileEmbedded(writer, fname, fname, null);
-                } else {
-                    fs = PdfFileSpecification.fileExtern(writer, fname);
-                }
-                return PdfAnnotation
-                        .createScreen(writer, new Rectangle(annot.llx(), annot.lly(), annot.urx(), annot.ury()),
-                                fname, fs, mimetype, sparams[1]);
-            case Annotation.FILE_PAGE:
-                return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(),
-                        new PdfAction((String) annot.getAttributes().get(Annotation.FILE),
-                                (Integer) annot.getAttributes().get(Annotation.PAGE)));
-            case Annotation.NAMED_DEST:
-                return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(),
-                        new PdfAction((Integer) annot.getAttributes().get(Annotation.NAMED)));
-            case Annotation.LAUNCH:
-                return new PdfAnnotation(writer, annot.llx(), annot.lly(), annot.urx(), annot.ury(),
-                        new PdfAction((String) annot.getAttributes().get(Annotation.APPLICATION),
-                                (String) annot.getAttributes().get(Annotation.PARAMETERS),
-                                (String) annot.getAttributes().get(Annotation.OPERATION),
-                                (String) annot.getAttributes().get(Annotation.DEFAULTDIR)));
-            default:
-                return new PdfAnnotation(writer, defaultRect.getLeft(), defaultRect.getBottom(), defaultRect.getRight(),
-                        defaultRect.getTop(), new PdfString(annot.title(), PdfObject.TEXT_UNICODE),
-                        new PdfString(annot.content(), PdfObject.TEXT_UNICODE));
-        }
-   }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfVersionImp.java b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfVersionImp.java
index 12b85036f..571d239c6 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfVersionImp.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfVersionImp.java
@@ -49,8 +49,6 @@
 
 package com.lowagie.text.pdf.internal;
 
-import java.io.IOException;
-
 import com.lowagie.text.DocWriter;
 import com.lowagie.text.pdf.OutputStreamCounter;
 import com.lowagie.text.pdf.PdfDeveloperExtension;
@@ -58,48 +56,58 @@
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.interfaces.PdfVersion;
+import java.io.IOException;
 
 /**
- * Stores the PDF version information,
- * knows how to write a PDF Header,
- * and how to add the version to the catalog (if necessary).
+ * Stores the PDF version information, knows how to write a PDF Header, and how to add the version to the catalog (if
+ * necessary).
  */
 
 public class PdfVersionImp implements PdfVersion {
-    
-    /** Contains different strings that are part of the header. */
+
+    /**
+     * Contains different strings that are part of the header.
+     */
     public static final byte[][] HEADER = {
-        DocWriter.getISOBytes("\n"),
-        DocWriter.getISOBytes("%PDF-"),
-        DocWriter.getISOBytes("\n%\u00e2\u00e3\u00cf\u00d3\n")
+            DocWriter.getISOBytes("\n"),
+            DocWriter.getISOBytes("%PDF-"),
+            DocWriter.getISOBytes("\n%\u00e2\u00e3\u00cf\u00d3\n")
     };
-    
-    /** Indicates if the header was already written. */
+
+    /**
+     * Indicates if the header was already written.
+     */
     protected boolean headerWasWritten = false;
-    /** Indicates if we are working in append mode. */
+    /**
+     * Indicates if we are working in append mode.
+     */
     protected boolean appendmode = false;
-    /** The version that was or will be written to the header. */
+    /**
+     * The version that was or will be written to the header.
+     */
     protected char header_version = PdfWriter.VERSION_1_5;
-    /** The version that will be written to the catalog. */
+    /**
+     * The version that will be written to the catalog.
+     */
     protected PdfName catalog_version = null;
     /**
      * The extensions dictionary.
-     * @since    2.1.6
+     *
+     * @since 2.1.6
      */
     protected PdfDictionary extensions = null;
-    
+
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(char)
      */
     public void setPdfVersion(char version) {
         if (headerWasWritten || appendmode) {
             setPdfVersion(getVersionAsName(version));
-        }
-        else {
+        } else {
             this.header_version = version;
         }
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfVersion#setAtLeastPdfVersion(char)
      */
@@ -108,7 +116,7 @@ public void setAtLeastPdfVersion(char version) {
             setPdfVersion(version);
         }
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(com.lowagie.text.pdf.PdfName)
      */
@@ -117,58 +125,61 @@ public void setPdfVersion(PdfName version) {
             this.catalog_version = version;
         }
     }
-    
+
     /**
      * Sets the append mode.
-     * @param appendmode    Boolean that indicates if we are working in append mode.
+     *
+     * @param appendmode Boolean that indicates if we are working in append mode.
      */
     public void setAppendmode(boolean appendmode) {
         this.appendmode = appendmode;
     }
-    
+
     /**
      * Writes the header to the OutputStreamCounter.
+     *
      * @param os the OutputStreamCounter
      * @throws IOException thrown when an I/O operation goes wrong
      */
     public void writeHeader(OutputStreamCounter os) throws IOException {
         if (appendmode) {
             os.write(HEADER[0]);
-        }
-        else {
+        } else {
             os.write(HEADER[1]);
             os.write(getVersionAsByteArray(header_version));
             os.write(HEADER[2]);
             headerWasWritten = true;
         }
     }
-    
+
     /**
      * Returns the PDF version as a name.
-     * @param version    the version character.
+     *
+     * @param version the version character.
      * @return a PdfName that contains the version
      */
     public PdfName getVersionAsName(char version) {
-        switch(version) {
-        case PdfWriter.VERSION_1_2:
-            return PdfWriter.PDF_VERSION_1_2;
-        case PdfWriter.VERSION_1_3:
-            return PdfWriter.PDF_VERSION_1_3;
-        case PdfWriter.VERSION_1_4:
-            return PdfWriter.PDF_VERSION_1_4;
-        case PdfWriter.VERSION_1_5:
-            return PdfWriter.PDF_VERSION_1_5;
-        case PdfWriter.VERSION_1_6:
-            return PdfWriter.PDF_VERSION_1_6;
-        case PdfWriter.VERSION_1_7:
-            return PdfWriter.PDF_VERSION_1_7;
-        default:
-            return PdfWriter.PDF_VERSION_1_4;
+        switch (version) {
+            case PdfWriter.VERSION_1_2:
+                return PdfWriter.PDF_VERSION_1_2;
+            case PdfWriter.VERSION_1_3:
+                return PdfWriter.PDF_VERSION_1_3;
+            case PdfWriter.VERSION_1_4:
+                return PdfWriter.PDF_VERSION_1_4;
+            case PdfWriter.VERSION_1_5:
+                return PdfWriter.PDF_VERSION_1_5;
+            case PdfWriter.VERSION_1_6:
+                return PdfWriter.PDF_VERSION_1_6;
+            case PdfWriter.VERSION_1_7:
+                return PdfWriter.PDF_VERSION_1_7;
+            default:
+                return PdfWriter.PDF_VERSION_1_4;
         }
     }
-    
+
     /**
      * Returns the version as a byte[].
+     *
      * @param version the version character
      * @return a byte array containing the version according to the ISO-8859-1 codepage.
      */
@@ -176,10 +187,13 @@ public byte[] getVersionAsByteArray(char version) {
         return DocWriter.getISOBytes(getVersionAsName(version).toString().substring(1));
     }
 
-    /** Adds the version to the Catalog dictionary.
-     * @param catalog   The PdfDictionary to add the version to*/
+    /**
+     * Adds the version to the Catalog dictionary.
+     *
+     * @param catalog The PdfDictionary to add the version to
+     */
     public void addToCatalog(PdfDictionary catalog) {
-        if(catalog_version != null) {
+        if (catalog_version != null) {
             catalog.put(PdfName.VERSION, catalog_version);
         }
         if (extensions != null) {
@@ -189,21 +203,22 @@ public void addToCatalog(PdfDictionary catalog) {
 
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfVersion#addDeveloperExtension(com.lowagie.text.pdf.PdfDeveloperExtension)
-     * @since    2.1.6
+     * @since 2.1.6
      */
     public void addDeveloperExtension(PdfDeveloperExtension de) {
         if (extensions == null) {
             extensions = new PdfDictionary();
-        }
-        else {
+        } else {
             PdfDictionary extension = extensions.getAsDict(de.getPrefix());
             if (extension != null) {
                 int diff = de.getBaseversion().compareTo(extension.getAsName(PdfName.BASEVERSION));
-                if (diff < 0)
+                if (diff < 0) {
                     return;
+                }
                 diff = de.getExtensionLevel() - extension.getAsNumber(PdfName.EXTENSIONLEVEL).intValue();
-                if (diff <= 0)
+                if (diff <= 0) {
                     return;
+                }
             }
         }
         extensions.put(de.getPrefix(), de.getDeveloperExtensions());
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java
index aa7c3317a..9cc5fa90a 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java
@@ -60,11 +60,12 @@
 import com.lowagie.text.pdf.interfaces.PdfViewerPreferences;
 
 /**
- * Stores the information concerning viewer preferences,
- * and contains the business logic that allows you to set viewer preferences.
+ * Stores the information concerning viewer preferences, and contains the business logic that allows you to set viewer
+ * preferences.
  */
 
 public class PdfViewerPreferencesImp implements PdfViewerPreferences {
+
     public static final PdfName[] VIEWER_PREFERENCES = {
             PdfName.HIDETOOLBAR,            // 0
             PdfName.HIDEMENUBAR,            // 1
@@ -83,7 +84,7 @@ public class PdfViewerPreferencesImp implements PdfViewerPreferences {
             PdfName.PICKTRAYBYPDFSIZE,        // 14
             PdfName.PRINTPAGERANGE,            // 15
             PdfName.NUMCOPIES                // 16
-        };
+    };
 
 
     /**
@@ -116,18 +117,77 @@ public class PdfViewerPreferencesImp implements PdfViewerPreferences {
     public static final PdfName[] DUPLEX_PREFERENCES = {
             PdfName.SIMPLEX, PdfName.DUPLEXFLIPSHORTEDGE, PdfName.DUPLEXFLIPLONGEDGE
     };
-    
-    /** This value will hold the viewer preferences for the page layout and page mode. */
+    /**
+     * The mask to decide if a ViewerPreferences dictionary is needed
+     */
+    private static final int viewerPreferencesMask = 0xfff000;
+    /**
+     * This value will hold the viewer preferences for the page layout and page mode.
+     */
     private int pageLayoutAndMode = 0;
-    
-    /** This dictionary holds the viewer preferences (other than page layout and page mode). */
+    /**
+     * This dictionary holds the viewer preferences (other than page layout and page mode).
+     */
     private PdfDictionary viewerPreferences = new PdfDictionary();
-    
-    /** The mask to decide if a ViewerPreferences dictionary is needed */
-    private static final int viewerPreferencesMask = 0xfff000;
+
+    public static PdfViewerPreferencesImp getViewerPreferences(PdfDictionary catalog) {
+        PdfViewerPreferencesImp preferences = new PdfViewerPreferencesImp();
+        int prefs = 0;
+        PdfName name = null;
+        // page layout
+        PdfObject obj = PdfReader.getPdfObjectRelease(catalog.get(PdfName.PAGELAYOUT));
+        if (obj != null && obj.isName()) {
+            name = (PdfName) obj;
+            if (name.equals(PdfName.SINGLEPAGE)) {
+                prefs |= PdfWriter.PageLayoutSinglePage;
+            } else if (name.equals(PdfName.ONECOLUMN)) {
+                prefs |= PdfWriter.PageLayoutOneColumn;
+            } else if (name.equals(PdfName.TWOCOLUMNLEFT)) {
+                prefs |= PdfWriter.PageLayoutTwoColumnLeft;
+            } else if (name.equals(PdfName.TWOCOLUMNRIGHT)) {
+                prefs |= PdfWriter.PageLayoutTwoColumnRight;
+            } else if (name.equals(PdfName.TWOPAGELEFT)) {
+                prefs |= PdfWriter.PageLayoutTwoPageLeft;
+            } else if (name.equals(PdfName.TWOPAGERIGHT)) {
+                prefs |= PdfWriter.PageLayoutTwoPageRight;
+            }
+        }
+        // page mode
+        obj = PdfReader.getPdfObjectRelease(catalog.get(PdfName.PAGEMODE));
+        if (obj != null && obj.isName()) {
+            name = (PdfName) obj;
+            if (name.equals(PdfName.USENONE)) {
+                prefs |= PdfWriter.PageModeUseNone;
+            } else if (name.equals(PdfName.USEOUTLINES)) {
+                prefs |= PdfWriter.PageModeUseOutlines;
+            } else if (name.equals(PdfName.USETHUMBS)) {
+                prefs |= PdfWriter.PageModeUseThumbs;
+            } else if (name.equals(PdfName.FULLSCREEN)) {
+                prefs |= PdfWriter.PageModeFullScreen;
+            } else if (name.equals(PdfName.USEOC)) {
+                prefs |= PdfWriter.PageModeUseOC;
+            } else if (name.equals(PdfName.USEATTACHMENTS)) {
+                prefs |= PdfWriter.PageModeUseAttachments;
+            }
+        }
+        // set page layout and page mode preferences
+        preferences.setViewerPreferences(prefs);
+        // other preferences
+        obj = PdfReader.getPdfObjectRelease(catalog
+                .get(PdfName.VIEWERPREFERENCES));
+        if (obj != null && obj.isDictionary()) {
+            PdfDictionary vp = (PdfDictionary) obj;
+            for (PdfName viewerPreference : VIEWER_PREFERENCES) {
+                obj = PdfReader.getPdfObjectRelease(vp.get(viewerPreference));
+                preferences.addViewerPreference(viewerPreference, obj);
+            }
+        }
+        return preferences;
+    }
 
     /**
      * Returns the page layout and page mode value.
+     *
      * @return an int that hold the viewer preferences for the page layout and page mode.
      */
     public int getPageLayoutAndMode() {
@@ -136,17 +196,17 @@ public int getPageLayoutAndMode() {
 
     /**
      * Returns the viewer preferences.
+     *
      * @return a PdfDictionary containing the viewer's preferences.
      */
     public PdfDictionary getViewerPreferences() {
         return viewerPreferences;
     }
-    
+
     /**
      * Sets the viewer preferences as the sum of several constants.
-     * 
-     * @param preferences
-     *            the viewer preferences
+     *
+     * @param preferences the viewer preferences
      * @see PdfViewerPreferences#setViewerPreferences
      */
     public void setViewerPreferences(int preferences) {
@@ -155,52 +215,63 @@ public void setViewerPreferences(int preferences) {
         // to set the following viewer preferences with this method:
         if ((preferences & viewerPreferencesMask) != 0) {
             pageLayoutAndMode = ~viewerPreferencesMask & pageLayoutAndMode;
-            if ((preferences & PdfWriter.HideToolbar) != 0)
+            if ((preferences & PdfWriter.HideToolbar) != 0) {
                 viewerPreferences.put(PdfName.HIDETOOLBAR, PdfBoolean.PDFTRUE);
-            if ((preferences & PdfWriter.HideMenubar) != 0)
+            }
+            if ((preferences & PdfWriter.HideMenubar) != 0) {
                 viewerPreferences.put(PdfName.HIDEMENUBAR, PdfBoolean.PDFTRUE);
-            if ((preferences & PdfWriter.HideWindowUI) != 0)
+            }
+            if ((preferences & PdfWriter.HideWindowUI) != 0) {
                 viewerPreferences.put(PdfName.HIDEWINDOWUI, PdfBoolean.PDFTRUE);
-            if ((preferences & PdfWriter.FitWindow) != 0)
+            }
+            if ((preferences & PdfWriter.FitWindow) != 0) {
                 viewerPreferences.put(PdfName.FITWINDOW, PdfBoolean.PDFTRUE);
-            if ((preferences & PdfWriter.CenterWindow) != 0)
+            }
+            if ((preferences & PdfWriter.CenterWindow) != 0) {
                 viewerPreferences.put(PdfName.CENTERWINDOW, PdfBoolean.PDFTRUE);
-            if ((preferences & PdfWriter.DisplayDocTitle) != 0)
+            }
+            if ((preferences & PdfWriter.DisplayDocTitle) != 0) {
                 viewerPreferences.put(PdfName.DISPLAYDOCTITLE, PdfBoolean.PDFTRUE);
-            
-            if ((preferences & PdfWriter.NonFullScreenPageModeUseNone) != 0)
+            }
+
+            if ((preferences & PdfWriter.NonFullScreenPageModeUseNone) != 0) {
                 viewerPreferences.put(PdfName.NONFULLSCREENPAGEMODE, PdfName.USENONE);
-            else if ((preferences & PdfWriter.NonFullScreenPageModeUseOutlines) != 0)
+            } else if ((preferences & PdfWriter.NonFullScreenPageModeUseOutlines) != 0) {
                 viewerPreferences.put(PdfName.NONFULLSCREENPAGEMODE, PdfName.USEOUTLINES);
-            else if ((preferences & PdfWriter.NonFullScreenPageModeUseThumbs) != 0)
+            } else if ((preferences & PdfWriter.NonFullScreenPageModeUseThumbs) != 0) {
                 viewerPreferences.put(PdfName.NONFULLSCREENPAGEMODE, PdfName.USETHUMBS);
-            else if ((preferences & PdfWriter.NonFullScreenPageModeUseOC) != 0)
+            } else if ((preferences & PdfWriter.NonFullScreenPageModeUseOC) != 0) {
                 viewerPreferences.put(PdfName.NONFULLSCREENPAGEMODE, PdfName.USEOC);
+            }
 
-            if ((preferences & PdfWriter.DirectionL2R) != 0)
+            if ((preferences & PdfWriter.DirectionL2R) != 0) {
                 viewerPreferences.put(PdfName.DIRECTION, PdfName.L2R);
-            else if ((preferences & PdfWriter.DirectionR2L) != 0)
+            } else if ((preferences & PdfWriter.DirectionR2L) != 0) {
                 viewerPreferences.put(PdfName.DIRECTION, PdfName.R2L);
+            }
 
-            if ((preferences & PdfWriter.PrintScalingNone) != 0)
-                viewerPreferences.put(PdfName.PRINTSCALING, PdfName.NONE);            
+            if ((preferences & PdfWriter.PrintScalingNone) != 0) {
+                viewerPreferences.put(PdfName.PRINTSCALING, PdfName.NONE);
+            }
         }
     }
-    
+
     /**
-     * Given a key for a viewer preference (a PdfName object),
-     * this method returns the index in the VIEWER_PREFERENCES array.
-     * @param key    a PdfName referring to a viewer preference
-     * @return    an index in the VIEWER_PREFERENCES array
+     * Given a key for a viewer preference (a PdfName object), this method returns the index in the VIEWER_PREFERENCES
+     * array.
+     *
+     * @param key a PdfName referring to a viewer preference
+     * @return an index in the VIEWER_PREFERENCES array
      */
     private int getIndex(PdfName key) {
         for (int i = 0; i < VIEWER_PREFERENCES.length; i++) {
-            if (VIEWER_PREFERENCES[i].equals(key))
+            if (VIEWER_PREFERENCES[i].equals(key)) {
                 return i;
+            }
         }
         return -1;
     }
-    
+
     /**
      * Checks if some value is valid for a certain key.
      */
@@ -212,105 +283,107 @@ private boolean isPossibleValue(PdfName value, PdfName[] accepted) {
         }
         return false;
     }
-    
+
     /**
      * Sets the viewer preferences for printing.
      */
     public void addViewerPreference(PdfName key, PdfObject value) {
-        switch(getIndex(key)) {
-        case 0: // HIDETOOLBAR
-        case 1: // HIDEMENUBAR
-        case 2: // HIDEWINDOWUI
-        case 3: // FITWINDOW
-        case 4: // CENTERWINDOW
-        case 5: // DISPLAYDOCTITLE
-        case 14: // PICKTRAYBYPDFSIZE
-            if (value instanceof PdfBoolean) {
-                viewerPreferences.put(key, value);
-            }
-            break;
-        case 6: // NONFULLSCREENPAGEMODE
-            if (value instanceof PdfName
-                    && isPossibleValue((PdfName)value, NONFULLSCREENPAGEMODE_PREFERENCES)) {
-                viewerPreferences.put(key, value);
-            }
-            break;
-        case 7: // DIRECTION
-            if (value instanceof PdfName
-                    && isPossibleValue((PdfName)value, DIRECTION_PREFERENCES)) {
-                viewerPreferences.put(key, value);
-            }
-            break;
-        case 8:  // VIEWAREA
-        case 9:  // VIEWCLIP
-        case 10: // PRINTAREA
-        case 11: // PRINTCLIP
-            if (value instanceof PdfName
-                    && isPossibleValue((PdfName)value, PAGE_BOUNDARIES)) {
-                viewerPreferences.put(key, value);
-            }
-            break;
-        case 12: // PRINTSCALING
-            if (value instanceof PdfName
-                    && isPossibleValue((PdfName)value, PRINTSCALING_PREFERENCES)) {
-                viewerPreferences.put(key, value);
-            }
-            break;
-        case 13: // DUPLEX
-            if (value instanceof PdfName
-                    && isPossibleValue((PdfName)value, DUPLEX_PREFERENCES)) {
-                viewerPreferences.put(key, value);
-            }
-            break;
-        case 15: // PRINTPAGERANGE
-            if (value instanceof PdfArray) {
-                viewerPreferences.put(key, value);
-            }
-            break;
-        case 16: // NUMCOPIES
-            if (value instanceof PdfNumber)  {
-                viewerPreferences.put(key, value);
-            }
-            break;
+        switch (getIndex(key)) {
+            case 0: // HIDETOOLBAR
+            case 1: // HIDEMENUBAR
+            case 2: // HIDEWINDOWUI
+            case 3: // FITWINDOW
+            case 4: // CENTERWINDOW
+            case 5: // DISPLAYDOCTITLE
+            case 14: // PICKTRAYBYPDFSIZE
+                if (value instanceof PdfBoolean) {
+                    viewerPreferences.put(key, value);
+                }
+                break;
+            case 6: // NONFULLSCREENPAGEMODE
+                if (value instanceof PdfName
+                        && isPossibleValue((PdfName) value, NONFULLSCREENPAGEMODE_PREFERENCES)) {
+                    viewerPreferences.put(key, value);
+                }
+                break;
+            case 7: // DIRECTION
+                if (value instanceof PdfName
+                        && isPossibleValue((PdfName) value, DIRECTION_PREFERENCES)) {
+                    viewerPreferences.put(key, value);
+                }
+                break;
+            case 8:  // VIEWAREA
+            case 9:  // VIEWCLIP
+            case 10: // PRINTAREA
+            case 11: // PRINTCLIP
+                if (value instanceof PdfName
+                        && isPossibleValue((PdfName) value, PAGE_BOUNDARIES)) {
+                    viewerPreferences.put(key, value);
+                }
+                break;
+            case 12: // PRINTSCALING
+                if (value instanceof PdfName
+                        && isPossibleValue((PdfName) value, PRINTSCALING_PREFERENCES)) {
+                    viewerPreferences.put(key, value);
+                }
+                break;
+            case 13: // DUPLEX
+                if (value instanceof PdfName
+                        && isPossibleValue((PdfName) value, DUPLEX_PREFERENCES)) {
+                    viewerPreferences.put(key, value);
+                }
+                break;
+            case 15: // PRINTPAGERANGE
+                if (value instanceof PdfArray) {
+                    viewerPreferences.put(key, value);
+                }
+                break;
+            case 16: // NUMCOPIES
+                if (value instanceof PdfNumber) {
+                    viewerPreferences.put(key, value);
+                }
+                break;
         }
     }
 
     /**
-     * Adds the viewer preferences defined in the preferences parameter to a
-     * PdfDictionary (more specifically the root or catalog of a PDF file).
-     * 
-     * @param catalog   The PdfDictionary to add the viewer preferences to
+     * Adds the viewer preferences defined in the preferences parameter to a PdfDictionary (more specifically the root
+     * or catalog of a PDF file).
+     *
+     * @param catalog The PdfDictionary to add the viewer preferences to
      */
     public void addToCatalog(PdfDictionary catalog) {
         // Page Layout
         catalog.remove(PdfName.PAGELAYOUT);
-        if ((pageLayoutAndMode & PdfWriter.PageLayoutSinglePage) != 0)
+        if ((pageLayoutAndMode & PdfWriter.PageLayoutSinglePage) != 0) {
             catalog.put(PdfName.PAGELAYOUT, PdfName.SINGLEPAGE);
-        else if ((pageLayoutAndMode & PdfWriter.PageLayoutOneColumn) != 0)
+        } else if ((pageLayoutAndMode & PdfWriter.PageLayoutOneColumn) != 0) {
             catalog.put(PdfName.PAGELAYOUT, PdfName.ONECOLUMN);
-        else if ((pageLayoutAndMode & PdfWriter.PageLayoutTwoColumnLeft) != 0)
+        } else if ((pageLayoutAndMode & PdfWriter.PageLayoutTwoColumnLeft) != 0) {
             catalog.put(PdfName.PAGELAYOUT, PdfName.TWOCOLUMNLEFT);
-        else if ((pageLayoutAndMode & PdfWriter.PageLayoutTwoColumnRight) != 0)
+        } else if ((pageLayoutAndMode & PdfWriter.PageLayoutTwoColumnRight) != 0) {
             catalog.put(PdfName.PAGELAYOUT, PdfName.TWOCOLUMNRIGHT);
-        else if ((pageLayoutAndMode & PdfWriter.PageLayoutTwoPageLeft) != 0)
+        } else if ((pageLayoutAndMode & PdfWriter.PageLayoutTwoPageLeft) != 0) {
             catalog.put(PdfName.PAGELAYOUT, PdfName.TWOPAGELEFT);
-        else if ((pageLayoutAndMode & PdfWriter.PageLayoutTwoPageRight) != 0)
+        } else if ((pageLayoutAndMode & PdfWriter.PageLayoutTwoPageRight) != 0) {
             catalog.put(PdfName.PAGELAYOUT, PdfName.TWOPAGERIGHT);
+        }
 
         // Page Mode
         catalog.remove(PdfName.PAGEMODE);
-        if ((pageLayoutAndMode & PdfWriter.PageModeUseNone) != 0)
+        if ((pageLayoutAndMode & PdfWriter.PageModeUseNone) != 0) {
             catalog.put(PdfName.PAGEMODE, PdfName.USENONE);
-        else if ((pageLayoutAndMode & PdfWriter.PageModeUseOutlines) != 0)
+        } else if ((pageLayoutAndMode & PdfWriter.PageModeUseOutlines) != 0) {
             catalog.put(PdfName.PAGEMODE, PdfName.USEOUTLINES);
-        else if ((pageLayoutAndMode & PdfWriter.PageModeUseThumbs) != 0)
+        } else if ((pageLayoutAndMode & PdfWriter.PageModeUseThumbs) != 0) {
             catalog.put(PdfName.PAGEMODE, PdfName.USETHUMBS);
-        else if ((pageLayoutAndMode & PdfWriter.PageModeFullScreen) != 0)
+        } else if ((pageLayoutAndMode & PdfWriter.PageModeFullScreen) != 0) {
             catalog.put(PdfName.PAGEMODE, PdfName.FULLSCREEN);
-        else if ((pageLayoutAndMode & PdfWriter.PageModeUseOC) != 0)
+        } else if ((pageLayoutAndMode & PdfWriter.PageModeUseOC) != 0) {
             catalog.put(PdfName.PAGEMODE, PdfName.USEOC);
-        else if ((pageLayoutAndMode & PdfWriter.PageModeUseAttachments) != 0)
+        } else if ((pageLayoutAndMode & PdfWriter.PageModeUseAttachments) != 0) {
             catalog.put(PdfName.PAGEMODE, PdfName.USEATTACHMENTS);
+        }
 
         // viewer preferences (Table 8.1 of the PDF Reference)
         catalog.remove(PdfName.VIEWERPREFERENCES);
@@ -318,57 +391,4 @@ else if ((pageLayoutAndMode & PdfWriter.PageModeUseAttachments) != 0)
             catalog.put(PdfName.VIEWERPREFERENCES, viewerPreferences);
         }
     }
-
-    public static PdfViewerPreferencesImp getViewerPreferences(PdfDictionary catalog) {
-        PdfViewerPreferencesImp preferences = new PdfViewerPreferencesImp();
-        int prefs = 0;
-        PdfName name = null;
-        // page layout
-        PdfObject obj = PdfReader.getPdfObjectRelease(catalog.get(PdfName.PAGELAYOUT));
-        if (obj != null && obj.isName()) {
-            name = (PdfName) obj;
-            if (name.equals(PdfName.SINGLEPAGE))
-                prefs |= PdfWriter.PageLayoutSinglePage;
-            else if (name.equals(PdfName.ONECOLUMN))
-                prefs |= PdfWriter.PageLayoutOneColumn;
-            else if (name.equals(PdfName.TWOCOLUMNLEFT))
-                prefs |= PdfWriter.PageLayoutTwoColumnLeft;
-            else if (name.equals(PdfName.TWOCOLUMNRIGHT))
-                prefs |= PdfWriter.PageLayoutTwoColumnRight;
-            else if (name.equals(PdfName.TWOPAGELEFT))
-                prefs |= PdfWriter.PageLayoutTwoPageLeft;
-            else if (name.equals(PdfName.TWOPAGERIGHT))
-                prefs |= PdfWriter.PageLayoutTwoPageRight;
-        }
-        // page mode
-        obj = PdfReader.getPdfObjectRelease(catalog.get(PdfName.PAGEMODE));
-        if (obj != null && obj.isName()) {
-            name = (PdfName) obj;
-            if (name.equals(PdfName.USENONE))
-                prefs |= PdfWriter.PageModeUseNone;
-            else if (name.equals(PdfName.USEOUTLINES))
-                prefs |= PdfWriter.PageModeUseOutlines;
-            else if (name.equals(PdfName.USETHUMBS))
-                prefs |= PdfWriter.PageModeUseThumbs;
-            else if (name.equals(PdfName.FULLSCREEN))
-                prefs |= PdfWriter.PageModeFullScreen;
-            else if (name.equals(PdfName.USEOC))
-                prefs |= PdfWriter.PageModeUseOC;
-            else if (name.equals(PdfName.USEATTACHMENTS))
-                prefs |= PdfWriter.PageModeUseAttachments;
-        }
-        // set page layout and page mode preferences
-        preferences.setViewerPreferences(prefs);
-        // other preferences
-        obj = PdfReader.getPdfObjectRelease(catalog
-                .get(PdfName.VIEWERPREFERENCES));
-        if (obj != null && obj.isDictionary()) {
-            PdfDictionary vp = (PdfDictionary) obj;
-            for (PdfName viewerPreference : VIEWER_PREFERENCES) {
-                obj = PdfReader.getPdfObjectRelease(vp.get(viewerPreference));
-                preferences.addViewerPreference(viewerPreference, obj);
-            }
-        }
-        return preferences;
-    }
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfXConformanceImp.java b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfXConformanceImp.java
index ac9523736..53130fde2 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfXConformanceImp.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PdfXConformanceImp.java
@@ -49,9 +49,7 @@
 
 package com.lowagie.text.pdf.internal;
 
-import java.awt.Color;
 import com.lowagie.text.error_messages.MessageLocalization;
-
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.ExtendedColor;
 import com.lowagie.text.pdf.PatternColor;
@@ -68,34 +66,157 @@
 import com.lowagie.text.pdf.ShadingColor;
 import com.lowagie.text.pdf.SpotColor;
 import com.lowagie.text.pdf.interfaces.PdfXConformance;
+import java.awt.Color;
 
 public class PdfXConformanceImp implements PdfXConformance {
 
-    /** A key for an aspect that can be checked for PDF/X Conformance. */
+    /**
+     * A key for an aspect that can be checked for PDF/X Conformance.
+     */
     public static final int PDFXKEY_COLOR = 1;
-    /** A key for an aspect that can be checked for PDF/X Conformance. */
+    /**
+     * A key for an aspect that can be checked for PDF/X Conformance.
+     */
     public static final int PDFXKEY_CMYK = 2;
-    /** A key for an aspect that can be checked for PDF/X Conformance. */
+    /**
+     * A key for an aspect that can be checked for PDF/X Conformance.
+     */
     public static final int PDFXKEY_RGB = 3;
-    /** A key for an aspect that can be checked for PDF/X Conformance. */
+    /**
+     * A key for an aspect that can be checked for PDF/X Conformance.
+     */
     public static final int PDFXKEY_FONT = 4;
-    /** A key for an aspect that can be checked for PDF/X Conformance. */
+    /**
+     * A key for an aspect that can be checked for PDF/X Conformance.
+     */
     public static final int PDFXKEY_IMAGE = 5;
-    /** A key for an aspect that can be checked for PDF/X Conformance. */
+    /**
+     * A key for an aspect that can be checked for PDF/X Conformance.
+     */
     public static final int PDFXKEY_GSTATE = 6;
-    /** A key for an aspect that can be checked for PDF/X Conformance. */
+    /**
+     * A key for an aspect that can be checked for PDF/X Conformance.
+     */
     public static final int PDFXKEY_LAYER = 7;
-    
+
     /**
      * The value indicating if the PDF has to be in conformance with PDF/X.
      */
     protected int pdfxConformance = PdfWriter.PDFXNONE;
-    
+
     /**
-     * @see com.lowagie.text.pdf.interfaces.PdfXConformance#setPDFXConformance(int)
+     * Business logic that checks if a certain object is in conformance with PDF/X.
+     *
+     * @param writer the writer that is supposed to write the PDF/X file
+     * @param key    the type of PDF/X conformance that has to be checked
+     * @param obj1   the object that is checked for conformance
      */
-    public void setPDFXConformance(int pdfxConformance) {
-        this.pdfxConformance = pdfxConformance;
+    public static void checkPDFXConformance(PdfWriter writer, int key, Object obj1) {
+        if (writer == null || !writer.isPdfX()) {
+            return;
+        }
+        int conf = writer.getPDFXConformance();
+        switch (key) {
+            case PDFXKEY_COLOR:
+                switch (conf) {
+                    case PdfWriter.PDFX1A2001:
+                        if (obj1 instanceof ExtendedColor) {
+                            ExtendedColor ec = (ExtendedColor) obj1;
+                            switch (ec.getType()) {
+                                case ExtendedColor.TYPE_CMYK:
+                                case ExtendedColor.TYPE_GRAY:
+                                    return;
+                                case ExtendedColor.TYPE_RGB:
+                                    throw new PdfXConformanceException(
+                                            MessageLocalization.getComposedMessage("colorspace.rgb.is.not.allowed"));
+                                case ExtendedColor.TYPE_SEPARATION:
+                                    SpotColor sc = (SpotColor) ec;
+                                    checkPDFXConformance(writer, PDFXKEY_COLOR,
+                                            sc.getPdfSpotColor().getAlternativeCS());
+                                    break;
+                                case ExtendedColor.TYPE_SHADING:
+                                    ShadingColor xc = (ShadingColor) ec;
+                                    checkPDFXConformance(writer, PDFXKEY_COLOR,
+                                            xc.getPdfShadingPattern().getShading().getColorSpace());
+                                    break;
+                                case ExtendedColor.TYPE_PATTERN:
+                                    PatternColor pc = (PatternColor) ec;
+                                    checkPDFXConformance(writer, PDFXKEY_COLOR, pc.getPainter().getDefaultColor());
+                                    break;
+                            }
+                        } else if (obj1 instanceof Color) {
+                            throw new PdfXConformanceException(
+                                    MessageLocalization.getComposedMessage("colorspace.rgb.is.not.allowed"));
+                        }
+                        break;
+                }
+                break;
+            case PDFXKEY_CMYK:
+                break;
+            case PDFXKEY_RGB:
+                if (conf == PdfWriter.PDFX1A2001) {
+                    throw new PdfXConformanceException(
+                            MessageLocalization.getComposedMessage("colorspace.rgb.is.not.allowed"));
+                }
+                break;
+            case PDFXKEY_FONT:
+                if (!((BaseFont) obj1).isEmbedded()) {
+                    throw new PdfXConformanceException(
+                            MessageLocalization.getComposedMessage("all.the.fonts.must.be.embedded.this.one.isn.t.1",
+                                    ((BaseFont) obj1).getPostscriptFontName()));
+                }
+                break;
+            case PDFXKEY_IMAGE:
+                PdfImage image = (PdfImage) obj1;
+                if (image.get(PdfName.SMASK) != null) {
+                    throw new PdfXConformanceException(
+                            MessageLocalization.getComposedMessage("the.smask.key.is.not.allowed.in.images"));
+                }
+                switch (conf) {
+                    case PdfWriter.PDFX1A2001:
+                        PdfObject cs = image.get(PdfName.COLORSPACE);
+                        if (cs == null) {
+                            return;
+                        }
+                        if (cs.isName()) {
+                            if (PdfName.DEVICERGB.equals(cs)) {
+                                throw new PdfXConformanceException(
+                                        MessageLocalization.getComposedMessage("colorspace.rgb.is.not.allowed"));
+                            }
+                        } else if (cs.isArray()) {
+                            if (PdfName.CALRGB.equals(((PdfArray) cs).getPdfObject(0))) {
+                                throw new PdfXConformanceException(
+                                        MessageLocalization.getComposedMessage("colorspace.calrgb.is.not.allowed"));
+                            }
+                        }
+                        break;
+                }
+                break;
+            case PDFXKEY_GSTATE:
+                PdfDictionary gs = (PdfDictionary) obj1;
+                PdfObject obj = gs.get(PdfName.BM);
+                if (obj != null && !PdfGState.BM_NORMAL.equals(obj) && !PdfGState.BM_COMPATIBLE.equals(obj)) {
+                    throw new PdfXConformanceException(
+                            MessageLocalization.getComposedMessage("blend.mode.1.not.allowed", obj.toString()));
+                }
+                obj = gs.get(PdfName.CA);
+                double v = 0.0;
+                if (obj != null && (v = ((PdfNumber) obj).doubleValue()) != 1.0) {
+                    throw new PdfXConformanceException(
+                            MessageLocalization.getComposedMessage("transparency.is.not.allowed.ca.eq.1",
+                                    String.valueOf(v)));
+                }
+                obj = gs.get(PdfName.ca);
+                v = 0.0;
+                if (obj != null && (v = ((PdfNumber) obj).doubleValue()) != 1.0) {
+                    throw new PdfXConformanceException(
+                            MessageLocalization.getComposedMessage("transparency.is.not.allowed.ca.eq.1",
+                                    String.valueOf(v)));
+                }
+                break;
+            case PDFXKEY_LAYER:
+                throw new PdfXConformanceException(MessageLocalization.getComposedMessage("layers.are.not.allowed"));
+        }
     }
 
     /**
@@ -104,54 +225,68 @@ public void setPDFXConformance(int pdfxConformance) {
     public int getPDFXConformance() {
         return pdfxConformance;
     }
-    
+
+    /**
+     * @see com.lowagie.text.pdf.interfaces.PdfXConformance#setPDFXConformance(int)
+     */
+    public void setPDFXConformance(int pdfxConformance) {
+        this.pdfxConformance = pdfxConformance;
+    }
+
     /**
      * Checks if the PDF/X Conformance is necessary.
+     *
      * @return true if the PDF has to be in conformance with any of the PDF/X specifications
      */
     public boolean isPdfX() {
         return pdfxConformance != PdfWriter.PDFXNONE;
     }
+
     /**
      * Checks if the PDF has to be in conformance with PDF/X-1a:2001
+     *
      * @return true of the PDF has to be in conformance with PDF/X-1a:2001
      */
     public boolean isPdfX1A2001() {
         return pdfxConformance == PdfWriter.PDFX1A2001;
     }
+
     /**
      * Checks if the PDF has to be in conformance with PDF/X-3:2002
+     *
      * @return true of the PDF has to be in conformance with PDF/X-3:2002
      */
     public boolean isPdfX32002() {
         return pdfxConformance == PdfWriter.PDFX32002;
     }
-    
+
     /**
      * Checks if the PDF has to be in conformance with PDFA1
+     *
      * @return true of the PDF has to be in conformance with PDFA1
      */
     public boolean isPdfA1() {
         return pdfxConformance == PdfWriter.PDFA1A || pdfxConformance == PdfWriter.PDFA1B;
     }
-    
+
     /**
      * Checks if the PDF has to be in conformance with PDFA1A
+     *
      * @return true of the PDF has to be in conformance with PDFA1A
      */
     public boolean isPdfA1A() {
         return pdfxConformance == PdfWriter.PDFA1A;
     }
-    
+
     public void completeInfoDictionary(PdfDictionary info) {
         if (isPdfX() && !isPdfA1()) {
             if (info.get(PdfName.GTS_PDFXVERSION) == null) {
                 if (isPdfX1A2001()) {
                     info.put(PdfName.GTS_PDFXVERSION, new PdfString("PDF/X-1:2001"));
                     info.put(new PdfName("GTS_PDFXConformance"), new PdfString("PDF/X-1a:2001"));
-                }
-                else if (isPdfX32002())
+                } else if (isPdfX32002()) {
                     info.put(PdfName.GTS_PDFXVERSION, new PdfString("PDF/X-3:2002"));
+                }
             }
             if (info.get(PdfName.TITLE) == null) {
                 info.put(PdfName.TITLE, new PdfString("Pdf document"));
@@ -164,7 +299,7 @@ else if (isPdfX32002())
             }
         }
     }
-    
+
     public void completeExtraCatalog(PdfDictionary extraCatalog) {
         if (isPdfX() && !isPdfA1()) {
             if (extraCatalog.get(PdfName.OUTPUTINTENTS) == null) {
@@ -178,94 +313,4 @@ public void completeExtraCatalog(PdfDictionary extraCatalog) {
             }
         }
     }
-    
-    /**
-     * Business logic that checks if a certain object is in conformance with PDF/X.
-     * @param writer    the writer that is supposed to write the PDF/X file
-     * @param key        the type of PDF/X conformance that has to be checked
-     * @param obj1        the object that is checked for conformance
-     */
-    public static void checkPDFXConformance(PdfWriter writer, int key, Object obj1) {
-        if (writer == null || !writer.isPdfX())
-            return;
-        int conf = writer.getPDFXConformance();
-        switch (key) {
-            case PDFXKEY_COLOR:
-                switch (conf) {
-                    case PdfWriter.PDFX1A2001:
-                        if (obj1 instanceof ExtendedColor) {
-                            ExtendedColor ec = (ExtendedColor)obj1;
-                            switch (ec.getType()) {
-                                case ExtendedColor.TYPE_CMYK:
-                                case ExtendedColor.TYPE_GRAY:
-                                    return;
-                                case ExtendedColor.TYPE_RGB:
-                                    throw new PdfXConformanceException(MessageLocalization.getComposedMessage("colorspace.rgb.is.not.allowed"));
-                                case ExtendedColor.TYPE_SEPARATION:
-                                    SpotColor sc = (SpotColor)ec;
-                                    checkPDFXConformance(writer, PDFXKEY_COLOR, sc.getPdfSpotColor().getAlternativeCS());
-                                    break;
-                                case ExtendedColor.TYPE_SHADING:
-                                    ShadingColor xc = (ShadingColor)ec;
-                                    checkPDFXConformance(writer, PDFXKEY_COLOR, xc.getPdfShadingPattern().getShading().getColorSpace());
-                                    break;
-                                case ExtendedColor.TYPE_PATTERN:
-                                    PatternColor pc = (PatternColor)ec;
-                                    checkPDFXConformance(writer, PDFXKEY_COLOR, pc.getPainter().getDefaultColor());
-                                    break;
-                            }
-                        }
-                        else if (obj1 instanceof Color)
-                            throw new PdfXConformanceException(MessageLocalization.getComposedMessage("colorspace.rgb.is.not.allowed"));
-                        break;
-                }
-                break;
-            case PDFXKEY_CMYK:
-                break;
-            case PDFXKEY_RGB:
-                if (conf == PdfWriter.PDFX1A2001)
-                    throw new PdfXConformanceException(MessageLocalization.getComposedMessage("colorspace.rgb.is.not.allowed"));
-                break;
-            case PDFXKEY_FONT:
-                if (!((BaseFont)obj1).isEmbedded())
-                    throw new PdfXConformanceException(MessageLocalization.getComposedMessage("all.the.fonts.must.be.embedded.this.one.isn.t.1", ((BaseFont)obj1).getPostscriptFontName()));
-                break;
-            case PDFXKEY_IMAGE:
-                PdfImage image = (PdfImage)obj1;
-                if (image.get(PdfName.SMASK) != null)
-                    throw new PdfXConformanceException(MessageLocalization.getComposedMessage("the.smask.key.is.not.allowed.in.images"));
-                switch (conf) {
-                    case PdfWriter.PDFX1A2001:
-                        PdfObject cs = image.get(PdfName.COLORSPACE);
-                        if (cs == null)
-                            return;
-                        if (cs.isName()) {
-                            if (PdfName.DEVICERGB.equals(cs))
-                                throw new PdfXConformanceException(MessageLocalization.getComposedMessage("colorspace.rgb.is.not.allowed"));
-                        }
-                        else if (cs.isArray()) {
-                            if (PdfName.CALRGB.equals(((PdfArray)cs).getPdfObject(0)))
-                                throw new PdfXConformanceException(MessageLocalization.getComposedMessage("colorspace.calrgb.is.not.allowed"));
-                        }
-                        break;
-                }
-                break;
-            case PDFXKEY_GSTATE:
-                PdfDictionary gs = (PdfDictionary)obj1;
-                PdfObject obj = gs.get(PdfName.BM);
-                if (obj != null && !PdfGState.BM_NORMAL.equals(obj) && !PdfGState.BM_COMPATIBLE.equals(obj))
-                    throw new PdfXConformanceException(MessageLocalization.getComposedMessage("blend.mode.1.not.allowed", obj.toString()));
-                obj = gs.get(PdfName.CA);
-                double v = 0.0;
-                if (obj != null && (v = ((PdfNumber)obj).doubleValue()) != 1.0)
-                    throw new PdfXConformanceException(MessageLocalization.getComposedMessage("transparency.is.not.allowed.ca.eq.1", String.valueOf(v)));
-                obj = gs.get(PdfName.ca);
-                v = 0.0;
-                if (obj != null && (v = ((PdfNumber)obj).doubleValue()) != 1.0)
-                    throw new PdfXConformanceException(MessageLocalization.getComposedMessage("transparency.is.not.allowed.ca.eq.1", String.valueOf(v)));
-                break;
-            case PDFXKEY_LAYER:
-                throw new PdfXConformanceException(MessageLocalization.getComposedMessage("layers.are.not.allowed"));
-        }
-    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PolylineShape.java b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PolylineShape.java
index 46e29cdf0..c70253eae 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PolylineShape.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PolylineShape.java
@@ -49,32 +49,40 @@
 
 package com.lowagie.text.pdf.internal;
 
-import java.awt.Shape;
 import java.awt.Rectangle;
+import java.awt.Shape;
 import java.awt.geom.AffineTransform;
-import java.awt.geom.PathIterator;
 import java.awt.geom.Line2D;
+import java.awt.geom.PathIterator;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
 /**
- * Class that defines a Polyline shape.
- * This class was originally written by wil - amristar.com.au
- * and integrated into iText by Bruno.
+ * Class that defines a Polyline shape. This class was originally written by wil - amristar.com.au and integrated into
+ * iText by Bruno.
  */
 public class PolylineShape implements Shape {
-    /** All the X-values of the coordinates in the polyline. */
+
+    /**
+     * All the X-values of the coordinates in the polyline.
+     */
     protected int[] x;
-    /** All the Y-values of the coordinates in the polyline. */
+    /**
+     * All the Y-values of the coordinates in the polyline.
+     */
     protected int[] y;
-    /** The total number of points. */
+    /**
+     * The total number of points.
+     */
     protected int np;
 
-    /** Creates a PolylineShape.
-     * @param nPoints   The total number of points
-     * @param x         An int array containing all the X-values of the coordinates in the polyline
-     * @param y         An int array containing all the Y-values of the coordinates in the polyline
-     * */
+    /**
+     * Creates a PolylineShape.
+     *
+     * @param nPoints The total number of points
+     * @param x       An int array containing all the X-values of the coordinates in the polyline
+     * @param y       An int array containing all the Y-values of the coordinates in the polyline
+     */
     public PolylineShape(int[] x, int[] y, int nPoints) {
         // Should copy array (as done in Polygon)
         this.np = nPoints;
@@ -88,17 +96,17 @@ public PolylineShape(int[] x, int[] y, int nPoints) {
     /**
      * Returns the bounding box of this polyline.
      *
-     * @return a {@link Rectangle2D} that is the high-precision
-     *     bounding box of this line.
+     * @return a {@link Rectangle2D} that is the high-precision bounding box of this line.
      * @see java.awt.Shape#getBounds2D()
      */
     public Rectangle2D getBounds2D() {
         int[] r = rect();
-        return r==null?null:new Rectangle2D.Double(r[0], r[1], r[2], r[3]);
+        return r == null ? null : new Rectangle2D.Double(r[0], r[1], r[2], r[3]);
     }
-    
+
     /**
      * Returns the bounding box of this polyline.
+     *
      * @see java.awt.Shape#getBounds()
      */
     public Rectangle getBounds() {
@@ -106,51 +114,70 @@ public Rectangle getBounds() {
     }
 
     /**
-     * Calculates the origin (X, Y) and the width and height
-     * of a rectangle that contains all the segments of the
+     * Calculates the origin (X, Y) and the width and height of a rectangle that contains all the segments of the
      * polyline.
      */
     private int[] rect() {
-         if(np==0)return null;
-        int xMin = x[0], yMin=y[0], xMax=x[0],yMax=y[0];
+        if (np == 0) {
+            return null;
+        }
+        int xMin = x[0], yMin = y[0], xMax = x[0], yMax = y[0];
 
-         for(int i=1;ixMax)xMax=x[i];
-             if(y[i]yMax)yMax=y[i];
-         }
+        for (int i = 1; i < np; i++) {
+            if (x[i] < xMin) {
+                xMin = x[i];
+            } else if (x[i] > xMax) {
+                xMax = x[i];
+            }
+            if (y[i] < yMin) {
+                yMin = y[i];
+            } else if (y[i] > yMax) {
+                yMax = y[i];
+            }
+        }
 
-         return new int[] { xMin, yMin, xMax-xMin, yMax-yMin };
+        return new int[]{xMin, yMin, xMax - xMin, yMax - yMin};
     }
 
     /**
      * A polyline can't contain a point.
+     *
      * @see java.awt.Shape#contains(double, double)
      */
-    public boolean contains(double x, double y) { return false; }
-    
+    public boolean contains(double x, double y) {
+        return false;
+    }
+
     /**
      * A polyline can't contain a point.
+     *
      * @see java.awt.Shape#contains(java.awt.geom.Point2D)
      */
-    public boolean contains(Point2D p) { return false; }
-    
+    public boolean contains(Point2D p) {
+        return false;
+    }
+
     /**
      * A polyline can't contain a point.
+     *
      * @see java.awt.Shape#contains(double, double, double, double)
      */
-    public boolean contains(double x, double y, double w, double h) { return false; }
-    
+    public boolean contains(double x, double y, double w, double h) {
+        return false;
+    }
+
     /**
      * A polyline can't contain a point.
+     *
      * @see java.awt.Shape#contains(java.awt.geom.Rectangle2D)
      */
-    public boolean contains(Rectangle2D r) { return false; }
+    public boolean contains(Rectangle2D r) {
+        return false;
+    }
 
     /**
-     * Checks if one of the lines in the polyline intersects
-     * with a given rectangle.
+     * Checks if one of the lines in the polyline intersects with a given rectangle.
+     *
      * @see java.awt.Shape#intersects(double, double, double, double)
      */
     public boolean intersects(double x, double y, double w, double h) {
@@ -158,22 +185,27 @@ public boolean intersects(double x, double y, double w, double h) {
     }
 
     /**
-     * Checks if one of the lines in the polyline intersects
-     * with a given rectangle.
+     * Checks if one of the lines in the polyline intersects with a given rectangle.
+     *
      * @see java.awt.Shape#intersects(java.awt.geom.Rectangle2D)
      */
     public boolean intersects(Rectangle2D r) {
-        if(np==0)return false;
-        Line2D line = new Line2D.Double(x[0],y[0],x[0],y[0]);
+        if (np == 0) {
+            return false;
+        }
+        Line2D line = new Line2D.Double(x[0], y[0], x[0], y[0]);
         for (int i = 1; i < np; i++) {
-            line.setLine(x[i-1], y[i-1], x[i], y[i]);
-            if(line.intersects(r))return true;
+            line.setLine(x[i - 1], y[i - 1], x[i], y[i]);
+            if (line.intersects(r)) {
+                return true;
+            }
         }
         return false;
     }
 
     /**
      * Returns an iteration object that defines the boundary of the polyline.
+     *
      * @param at the specified {@link AffineTransform}
      * @return a {@link PathIterator} that defines the boundary of this polyline.
      * @see java.awt.Shape#intersects(java.awt.geom.Rectangle2D)
@@ -183,8 +215,8 @@ public PathIterator getPathIterator(AffineTransform at) {
     }
 
     /**
-     * There's no difference with getPathIterator(AffineTransform at);
-     * we just need this method to implement the Shape interface.
+     * There's no difference with getPathIterator(AffineTransform at); we just need this method to implement the Shape
+     * interface.
      */
     public PathIterator getPathIterator(AffineTransform at, double flatness) {
         return new PolylineShapeIterator(this, at);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PolylineShapeIterator.java b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PolylineShapeIterator.java
index 6ed7b8750..9a53b59b0 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/internal/PolylineShapeIterator.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/internal/PolylineShapeIterator.java
@@ -49,40 +49,45 @@
 
 package com.lowagie.text.pdf.internal;
 
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.PathIterator;
 import java.util.NoSuchElementException;
-import com.lowagie.text.error_messages.MessageLocalization;
+
 /**
- * PathIterator for PolylineShape.
- * This class was originally written by wil - amristar.com.au
- * and integrated into iText by Bruno.
+ * PathIterator for PolylineShape. This class was originally written by wil - amristar.com.au and integrated into iText
+ * by Bruno.
  */
 public class PolylineShapeIterator implements PathIterator {
-    /** The polyline over which we are going to iterate. */
+
+    /**
+     * The polyline over which we are going to iterate.
+     */
     protected PolylineShape poly;
-    /** an affine transformation to be performed on the polyline. */
+    /**
+     * an affine transformation to be performed on the polyline.
+     */
     protected AffineTransform affine;
-    /** the index of the current segment in the iterator. */
+    /**
+     * the index of the current segment in the iterator.
+     */
     protected int index;
-    
-    /** Creates a PolylineShapeIterator. */
+
+    /**
+     * Creates a PolylineShapeIterator.
+     */
     PolylineShapeIterator(PolylineShape l, AffineTransform at) {
         this.poly = l;
         this.affine = at;
     }
-    
+
     /**
-     * Returns the coordinates and type of the current path segment in
-     * the iteration. The return value is the path segment type:
-     * SEG_MOVETO, SEG_LINETO, SEG_QUADTO, SEG_CUBICTO, or SEG_CLOSE.
-     * A double array of length 6 must be passed in and may be used to
-     * store the coordinates of the point(s).
-     * Each point is stored as a pair of double x,y coordinates.
-     * SEG_MOVETO and SEG_LINETO types will return one point,
-     * SEG_QUADTO will return two points,
-     * SEG_CUBICTO will return 3 points
-     * and SEG_CLOSE will not return any points.
+     * Returns the coordinates and type of the current path segment in the iteration. The return value is the path
+     * segment type: SEG_MOVETO, SEG_LINETO, SEG_QUADTO, SEG_CUBICTO, or SEG_CLOSE. A double array of length 6 must be
+     * passed in and may be used to store the coordinates of the point(s). Each point is stored as a pair of double x,y
+     * coordinates. SEG_MOVETO and SEG_LINETO types will return one point, SEG_QUADTO will return two points,
+     * SEG_CUBICTO will return 3 points and SEG_CLOSE will not return any points.
+     *
      * @see #SEG_MOVETO
      * @see #SEG_LINETO
      * @see #SEG_QUADTO
@@ -94,7 +99,7 @@ public int currentSegment(double[] coords) {
         if (isDone()) {
             throw new NoSuchElementException(MessageLocalization.getComposedMessage("line.iterator.out.of.bounds"));
         }
-        int type = (index==0)?SEG_MOVETO:SEG_LINETO;
+        int type = (index == 0) ? SEG_MOVETO : SEG_LINETO;
         coords[0] = poly.x[index];
         coords[1] = poly.y[index];
         if (affine != null) {
@@ -102,18 +107,14 @@ public int currentSegment(double[] coords) {
         }
         return type;
     }
-    
+
     /**
-     * Returns the coordinates and type of the current path segment in
-     * the iteration. The return value is the path segment type:
-     * SEG_MOVETO, SEG_LINETO, SEG_QUADTO, SEG_CUBICTO, or SEG_CLOSE.
-     * A double array of length 6 must be passed in and may be used to
-     * store the coordinates of the point(s).
-     * Each point is stored as a pair of double x,y coordinates.
-     * SEG_MOVETO and SEG_LINETO types will return one point,
-     * SEG_QUADTO will return two points,
-     * SEG_CUBICTO will return 3 points
-     * and SEG_CLOSE will not return any points.
+     * Returns the coordinates and type of the current path segment in the iteration. The return value is the path
+     * segment type: SEG_MOVETO, SEG_LINETO, SEG_QUADTO, SEG_CUBICTO, or SEG_CLOSE. A double array of length 6 must be
+     * passed in and may be used to store the coordinates of the point(s). Each point is stored as a pair of double x,y
+     * coordinates. SEG_MOVETO and SEG_LINETO types will return one point, SEG_QUADTO will return two points,
+     * SEG_CUBICTO will return 3 points and SEG_CLOSE will not return any points.
+     *
      * @see #SEG_MOVETO
      * @see #SEG_LINETO
      * @see #SEG_QUADTO
@@ -125,7 +126,7 @@ public int currentSegment(float[] coords) {
         if (isDone()) {
             throw new NoSuchElementException(MessageLocalization.getComposedMessage("line.iterator.out.of.bounds"));
         }
-        int type = (index==0)?SEG_MOVETO:SEG_LINETO;
+        int type = (index == 0) ? SEG_MOVETO : SEG_LINETO;
         coords[0] = poly.x[index];
         coords[1] = poly.y[index];
         if (affine != null) {
@@ -135,8 +136,8 @@ public int currentSegment(float[] coords) {
     }
 
     /**
-     * Return the winding rule for determining the insideness of the
-     * path.
+     * Return the winding rule for determining the insideness of the path.
+     *
      * @see #WIND_EVEN_ODD
      * @see #WIND_NON_ZERO
      * @see java.awt.geom.PathIterator#getWindingRule()
@@ -147,6 +148,7 @@ public int getWindingRule() {
 
     /**
      * Tests if there are more points to read.
+     *
      * @return true if there are more points to read
      * @see java.awt.geom.PathIterator#isDone()
      */
@@ -155,9 +157,9 @@ public boolean isDone() {
     }
 
     /**
-     * Moves the iterator to the next segment of the path forwards
-     * along the primary direction of traversal as long as there are
-     * more points in that direction.
+     * Moves the iterator to the next segment of the path forwards along the primary direction of traversal as long as
+     * there are more points in that direction.
+     *
      * @see java.awt.geom.PathIterator#next()
      */
     public void next() {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/ContentOperator.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/ContentOperator.java
index 73b574b42..f70b0cc16 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/ContentOperator.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/ContentOperator.java
@@ -48,7 +48,6 @@
 
 import com.lowagie.text.pdf.PdfDictionary;
 import com.lowagie.text.pdf.PdfObject;
-
 import java.util.List;
 
 /**
@@ -57,6 +56,7 @@
  * @since 2.1.4
  */
 public interface ContentOperator {
+
     /**
      * Invokes a content operator.
      *
@@ -67,8 +67,7 @@ public interface ContentOperator {
     void invoke(List operands, PdfContentStreamHandler handler, PdfDictionary resources);
 
     /**
-     * @return the name of the operator as it will be recognized in the pdf
-     * stream
+     * @return the name of the operator as it will be recognized in the pdf stream
      */
     String getOperatorName();
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/FinalText.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/FinalText.java
index 61ed6a01f..481861832 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/FinalText.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/FinalText.java
@@ -50,8 +50,7 @@ public void assemble(TextAssembler p) {
     /**
      * {@inheritDoc}
      *
-     * @see com.lowagie.text.pdf.parser.TextAssemblyBuffer#getFinalText(PdfReader,
-     * int, TextAssembler, boolean)
+     * @see com.lowagie.text.pdf.parser.TextAssemblyBuffer#getFinalText(PdfReader, int, TextAssembler, boolean)
      */
     @Override
     public FinalText getFinalText(PdfReader reader, int page, TextAssembler assembler, boolean useMarkup) {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/GraphicsState.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/GraphicsState.java
index e817876cb..e39915251 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/GraphicsState.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/GraphicsState.java
@@ -56,6 +56,7 @@
  */
 @SuppressWarnings("WeakerAccess")
 public class GraphicsState {
+
     /**
      * The current transformation matrix.
      */
@@ -175,8 +176,8 @@ public void setLeading(float leading) {
     }
 
     /**
-     * Get maximum height above the baseline reached by glyphs in this font,
-     * excluding the height of glyphs for accented characters.
+     * Get maximum height above the baseline reached by glyphs in this font, excluding the height of glyphs for accented
+     * characters.
      *
      * @return ascent descriptor value
      */
@@ -185,8 +186,7 @@ public float getFontAscentDescriptor() {
     }
 
     /**
-     * Get maximum depth below the baseline reached by glyphs in this font. The
-     * value is a negative number
+     * Get maximum depth below the baseline reached by glyphs in this font. The value is a negative number
      *
      * @return descent descriptor value
      */
@@ -239,7 +239,8 @@ public boolean isKnockout() {
     }
 
     /**
-     * Multiply transformation matrix and get result. Result would be also stored in this {@link GraphicsState} instance
+     * Multiply transformation matrix and get result. Result would be also stored in this {@link GraphicsState}
+     * instance
      *
      * @param matrix multiply by matrix
      * @return result matrix
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/MarkedUpTextAssembler.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/MarkedUpTextAssembler.java
index 445a9df08..b4f54ec21 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/MarkedUpTextAssembler.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/MarkedUpTextAssembler.java
@@ -1,63 +1,50 @@
 /**
- * Copyright 2014 by Tizra Inc.
- * The contents of this file are subject to the Mozilla Public License Version 1.1
- * (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.mozilla.org/MPL/
+ * Copyright 2014 by Tizra Inc. The contents of this file are subject to the Mozilla Public License Version 1.1 (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.mozilla.org/MPL/
  * 
              
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the License.
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the License for the specific language governing rights and limitations under the License.
  * 
              
  * The Original Code is 'iText, a free JAVA-PDF library'.
  * 
              
- * The Initial Developer of the Original Code is Bruno Lowagie. Portions created by
- * the Initial Developer are Copyright (C) 1999-2008 by Bruno Lowagie.
- * All Rights Reserved.
- * Co-Developer of the code is Paulo Soares. Portions created by the Co-Developer
- * are Copyright (C) 2000-2008 by Paulo Soares. All Rights Reserved.
+ * The Initial Developer of the Original Code is Bruno Lowagie. Portions created by the Initial Developer are Copyright
+ * (C) 1999-2008 by Bruno Lowagie. All Rights Reserved. Co-Developer of the code is Paulo Soares. Portions created by
+ * the Co-Developer are Copyright (C) 2000-2008 by Paulo Soares. All Rights Reserved.
  * 
              
- * Contributor(s): all the names of the contributors are added in the source code
- * where applicable.
+ * Contributor(s): all the names of the contributors are added in the source code where applicable.
  * 
              
- * Alternatively, the contents of this file may be used under the terms of the
- * LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
- * provisions of LGPL are applicable instead of those above.  If you wish to
- * allow use of your version of this file only under the terms of the LGPL
- * License and not to allow others to use your version of this file under
- * the MPL, indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by the LGPL.
- * If you do not delete the provisions above, a recipient may use your version
- * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE.
+ * Alternatively, the contents of this file may be used under the terms of the LGPL license (the "GNU LIBRARY GENERAL
+ * PUBLIC LICENSE"), in which case the provisions of LGPL are applicable instead of those above.  If you wish to allow
+ * use of your version of this file only under the terms of the LGPL License and not to allow others to use your version
+ * of this file under the MPL, indicate your decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the LGPL. If you do not delete the provisions above, a recipient may use your
+ * version of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE.
  * 
              
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the MPL as stated above or under the terms of the GNU
- * Library General Public License as published by the Free Software Foundation;
- * either version 2 of the License, or any later version.
+ * This library is free software; you can redistribute it and/or modify it under the terms of the MPL as stated above or
+ * under the terms of the GNU Library General Public License as published by the Free Software Foundation; either
+ * version 2 of the License, or any later version.
  * 
              
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
  * details.
  */
 package com.lowagie.text.pdf.parser;
 
 import com.lowagie.text.pdf.PdfReader;
-
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * We'll get called on a variety of marked section content (perhaps including
- * the results of nested sections), and will assemble it into an order as we
- * can.
+ * We'll get called on a variety of marked section content (perhaps including the results of nested sections), and will
+ * assemble it into an order as we can.
  *
  * @author dgd
- *
  */
 public class MarkedUpTextAssembler implements TextAssembler {
+
     /**
-     * our result may be partially processed already, in which case we'll just
-     * add things to it, once ready.
+     * our result may be partially processed already, in which case we'll just add things to it, once ready.
      */
     List result = new ArrayList<>();
     private PdfReader reader;
@@ -66,9 +53,8 @@ public class MarkedUpTextAssembler implements TextAssembler {
     private int wordIdCounter = 1;
     private boolean usePdfMarkupElements = false;
     /**
-     * as we get new content (final or not), we accumulate it until we reach the
-     * end of a parsing unit
-     *
+     * as we get new content (final or not), we accumulate it until we reach the end of a parsing unit
+     * 
              
      * Each parsing unit may have a tag name that should wrap its content
      */
     private List partialWords = new ArrayList<>();
@@ -83,12 +69,10 @@ public class MarkedUpTextAssembler implements TextAssembler {
     }
 
     /**
-     * Remember an unassembled chunk until we hit the end of this element, or we
-     * hit an assembled chunk, and need to pull things together.
+     * Remember an unassembled chunk until we hit the end of this element, or we hit an assembled chunk, and need to
+     * pull things together.
      *
-     * @param unassembled
-     *            chunk of text rendering instruction to contribute to final
-     *            text
+     * @param unassembled chunk of text rendering instruction to contribute to final text
      */
     @Override
     public void process(ParsedText unassembled, String contextName) {
@@ -96,11 +80,10 @@ public void process(ParsedText unassembled, String contextName) {
     }
 
     /**
-     * Slot fully-assembled chunk into our result at the current location. If
-     * there are unassembled chunks waiting, assemble them first.
+     * Slot fully-assembled chunk into our result at the current location. If there are unassembled chunks waiting,
+     * assemble them first.
      *
-     * @param completed
-     *            This is a chunk from a nested element
+     * @param completed This is a chunk from a nested element
      */
     @Override
     public void process(FinalText completed, String contextName) {
@@ -111,6 +94,7 @@ public void process(FinalText completed, String contextName) {
 
     /**
      * {@inheritDoc}
+     *
      * @see com.lowagie.text.pdf.parser.TextAssembler#process(Word, String)
      */
     @Override
@@ -162,6 +146,7 @@ private FinalText concatenateResult(String containingElementName) {
 
     /**
      * {@inheritDoc}
+     *
      * @see com.lowagie.text.pdf.parser.TextAssembler#endParsingContext(String)
      */
     @Override
@@ -171,7 +156,6 @@ public FinalText endParsingContext(String containingElementName) {
     }
 
     /**
-     *
      * @see com.lowagie.text.pdf.parser.TextAssembler#reset()
      */
     @Override
@@ -187,8 +171,7 @@ public void renderText(FinalText finalText) {
     }
 
     /**
-     * Captures text using a simplified algorithm for inserting hard returns and
-     * spaces
+     * Captures text using a simplified algorithm for inserting hard returns and spaces
      *
      * @see com.lowagie.text.pdf.parser.GraphicsState
      * @see com.lowagie.text.pdf.parser.Matrix
@@ -261,6 +244,7 @@ protected PdfReader getReader() {
 
     /**
      * {@inheritDoc}
+     *
      * @see com.lowagie.text.pdf.parser.TextAssembler#setPage(int)
      */
     @Override
@@ -270,6 +254,7 @@ public void setPage(int page) {
 
     /**
      * {@inheritDoc}
+     *
      * @see com.lowagie.text.pdf.parser.TextAssembler#getWordId()
      */
     @Override
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/Matrix.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/Matrix.java
index 9a3395cf7..e033ff21f 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/Matrix.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/Matrix.java
@@ -49,12 +49,12 @@
 import java.util.Arrays;
 
 /**
- * Keeps all the values of a 3 by 3 matrix
- * and allows you to do some math with matrices.
+ * Keeps all the values of a 3 by 3 matrix and allows you to do some math with matrices.
  *
  * @since 2.1.4
  */
 public class Matrix {
+
     /**
      * the row=1, col=1 position ('a') in the matrix.
      */
@@ -151,8 +151,7 @@ public float get(int index) {
     }
 
     /**
-     * multiplies this matrix by 'b' and returns the result
-     * See http://en.wikipedia.org/wiki/Matrix_multiplication
+     * multiplies this matrix by 'b' and returns the result See http://en.wikipedia.org/wiki/Matrix_multiplication
      *
      * @param by The matrix to multiply by
      * @return the resulting matrix
@@ -213,8 +212,9 @@ public Matrix subtract(Matrix arg) {
      */
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof Matrix))
+        if (!(obj instanceof Matrix)) {
             return false;
+        }
 
         return Arrays.equals(vals, ((Matrix) obj).vals);
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/ParsedText.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/ParsedText.java
index d59f272b3..3cd1c1c57 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/ParsedText.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/ParsedText.java
@@ -62,15 +62,15 @@ public class ParsedText extends ParsedTextImpl {
     private final GraphicsState graphicsState;
 
     /**
-     * retain original PdfString as we need to distinguish between the code points contained there,
-     * and the standard Java (Unicode strings) that actually represent the content of this text.
+     * retain original PdfString as we need to distinguish between the code points contained there, and the standard
+     * Java (Unicode strings) that actually represent the content of this text.
      */
     private PdfString pdfText = null;
 
 
     /**
-     * This constructor should only be called when the origin for text display is at (0,0) and the
-     * graphical state reflects all transformations of the baseline. This is in text space units.
+     * This constructor should only be called when the origin for text display is at (0,0) and the graphical state
+     * reflects all transformations of the baseline. This is in text space units.
      *
      * @param text          string
      * @param graphicsState graphical state
@@ -82,11 +82,11 @@ public class ParsedText extends ParsedTextImpl {
     }
 
     /**
-     * Internal constructor for a parsed text item. The constructors that call it
-     * gather some information from the graphical state first.
+     * Internal constructor for a parsed text item. The constructors that call it gather some information from the
+     * graphical state first.
      *
-     * @param text          This is a PdfString containing code points for the current font, not actually characters.
-     *                      If the font has multiByte glyphs, (Identity-H encoding) we reparse the string so that the code
+     * @param text          This is a PdfString containing code points for the current font, not actually characters. If
+     *                      the font has multiByte glyphs, (Identity-H encoding) we reparse the string so that the code
      *                      points don't get split into multiple characters.
      * @param graphicsState graphical state
      * @param textMatrix    transform from text space to graphics (drawing space)
@@ -100,13 +100,15 @@ private ParsedText(PdfString text, GraphicsState graphicsState, Matrix textMatri
                 convertHeightToUser(graphicsState.getFontDescentDescriptor(), textMatrix),
                 convertWidthToUser(unscaledWidth, textMatrix));
         if (BaseFont.IDENTITY_H.equals(graphicsState.getFont().getEncoding())) {
-            if(graphicsState.getFont().hasUnicodeCMAP()) {
-                if(graphicsState.getFont().hasTwoByteUnicodeCMAP())
+            if (graphicsState.getFont().hasUnicodeCMAP()) {
+                if (graphicsState.getFont().hasTwoByteUnicodeCMAP()) {
                     pdfText = new PdfString(text.toString(), "IDENTITY_H2");
-                else
+                } else {
                     pdfText = new PdfString(text.toString(), "IDENTITY_H1");
-            } else
+                }
+            } else {
                 pdfText = new PdfString(new String(text.getBytes(), StandardCharsets.UTF_16));
+            }
         } else {
             pdfText = text;
         }
@@ -116,24 +118,22 @@ private ParsedText(PdfString text, GraphicsState graphicsState, Matrix textMatri
 
 
     /**
-     * @param xOffset offset in x direction
-     * @param yOffset offset in y direction
+     * @param xOffset                        offset in x direction
+     * @param yOffset                        offset in y direction
      * @param textToUserSpaceTransformMatrix transform from text space to graphics (drawing space)
      * @return the cross product of the offset and the textToUserSpaceTransformMatrix
      */
     private static Vector pointToUserSpace(float xOffset, float yOffset,
-                                           Matrix textToUserSpaceTransformMatrix) {
+            Matrix textToUserSpaceTransformMatrix) {
         return new Vector(xOffset, yOffset, 1f)
                 .cross(textToUserSpaceTransformMatrix);
     }
 
     /**
-     * Calculates the width of a space character. If the font does not define a
-     * width for a standard space character , we also attempt to use the width
-     * of \u00A0 (a non-breaking space in many fonts)
+     * Calculates the width of a space character. If the font does not define a width for a standard space character ,
+     * we also attempt to use the width of \u00A0 (a non-breaking space in many fonts)
      *
-     * @param graphicsState graphic state including current transformation to page coordinates from
-     *                      text measurement
+     * @param graphicsState graphic state including current transformation to page coordinates from text measurement
      * @return the width of a single space character in text space units
      */
     private static float getUnscaledFontSpaceWidth(GraphicsState graphicsState) {
@@ -148,8 +148,7 @@ private static float getUnscaledFontSpaceWidth(GraphicsState graphicsState) {
      * Gets the width of a String in text space units
      *
      * @param string        the string that needs measuring
-     * @param graphicsState graphic state including current transformation to page coordinates from
-     *                      text measurement
+     * @param graphicsState graphic state including current transformation to page coordinates from text measurement
      * @return the width of a String in text space units
      */
     private static float getStringWidth(String string, GraphicsState graphicsState) {
@@ -166,12 +165,12 @@ private static float getStringWidth(String string, GraphicsState graphicsState)
     }
 
     /**
-     * @param width which should be converted to user space
+     * @param width                          which should be converted to user space
      * @param textToUserSpaceTransformMatrix transform from text space to graphics (drawing space)
      * @return distance between start and end position
      */
     private static float convertWidthToUser(float width,
-                                            Matrix textToUserSpaceTransformMatrix) {
+            Matrix textToUserSpaceTransformMatrix) {
         Vector startPos = pointToUserSpace(0, 0, textToUserSpaceTransformMatrix);
         Vector endPos = pointToUserSpace(width, 0,
                 textToUserSpaceTransformMatrix);
@@ -180,20 +179,20 @@ private static float convertWidthToUser(float width,
 
     /**
      * @param startPos of the vector
-     * @param endPos of the vector
-     * @return (endPos-startPos).length 
+     * @param endPos   of the vector
+     * @return (endPos - startPos).length
      */
     private static float distance(Vector startPos, Vector endPos) {
         return endPos.subtract(startPos).length();
     }
 
     /**
-     * @param height which should be converted to user space
+     * @param height                         which should be converted to user space
      * @param textToUserSpaceTransformMatrix transform from text space to graphics (drawing space)
      * @return distance between start and end position
      */
     private static float convertHeightToUser(float height,
-                                             Matrix textToUserSpaceTransformMatrix) {
+            Matrix textToUserSpaceTransformMatrix) {
         Vector startPos = pointToUserSpace(0, 0, textToUserSpaceTransformMatrix);
         Vector endPos = pointToUserSpace(0, height,
                 textToUserSpaceTransformMatrix);
@@ -201,8 +200,7 @@ private static float convertHeightToUser(float height,
     }
 
     /**
-     * Decodes a Java String containing glyph ids encoded in the font's encoding, and determine the
-     * unicode equivalent
+     * Decodes a Java String containing glyph ids encoded in the font's encoding, and determine the unicode equivalent
      *
      * @param in the String that needs to be decoded
      * @return the decoded String
@@ -218,11 +216,11 @@ protected String decode(String in) {
     }
 
     /**
-     * This constructor should only be called when the origin for text display is at (0,0) and the
-     * graphical state reflects all transformations of the baseline. This is in text space units.
+     * This constructor should only be called when the origin for text display is at (0,0) and the graphical state
+     * reflects all transformations of the baseline. This is in text space units.
      * 
              
-     * Decodes a PdfString (which will contain glyph ids encoded in the font's encoding) based on
-     * the active font, and determine the unicode equivalent
+     * Decodes a PdfString (which will contain glyph ids encoded in the font's encoding) based on the active font, and
+     * determine the unicode equivalent
      *
      * @param pdfString the String that needs to be encoded
      * @return the encoded String
@@ -234,15 +232,14 @@ protected String decode(PdfString pdfString) {
     }
 
     /**
-     * Break this string if there are spaces within it. If so, we mark the new Words appropriately
-     * for later assembly.
+     * Break this string if there are spaces within it. If so, we mark the new Words appropriately for later assembly.
      * 
              
-     * We are guaranteed that every space (internal word break) in this parsed text object will
-     * create a new word in the result of this method. We are not guaranteed that these Word objects
-     * are actually words until they have been assembled.
+     * We are guaranteed that every space (internal word break) in this parsed text object will create a new word in the
+     * result of this method. We are not guaranteed that these Word objects are actually words until they have been
+     * assembled.
      * 
              
-     * The word following any space preserves that space in its string value, so that the assembler
-     * will not erroneously merge words that should be separate, regardless of the spacing.
+     * The word following any space preserves that space in its string value, so that the assembler will not erroneously
+     * merge words that should be separate, regardless of the spacing.
      *
      * @return list of Word objects.
      */
@@ -290,9 +287,8 @@ public List getAsPartialWords() {
     }
 
     /**
-     * Calculate whether individual character positions (after font decoding from code to a
-     * character), contain spaces and break words, and whether the resulting words should be treated
-     * as complete (i.e. if any spaces were found.
+     * Calculate whether individual character positions (after font decoding from code to a character), contain spaces
+     * and break words, and whether the resulting words should be treated as complete (i.e. if any spaces were found.
      *
      * @param chars    to check
      * @param hasSpace array same length as chars, each position representing whether it breaks a word
@@ -305,20 +301,21 @@ private boolean preprocessString(char[] chars, boolean[] hasSpace) {
             hasSpace[i] = false;
             String charValue = graphicsState.getFont().decode(c);
 
-            if (charValue != null)
+            if (charValue != null) {
                 for (char cFinal : charValue.toCharArray()) {
                     if (Character.isSpaceChar(cFinal)) {
                         wordsAreComplete = true;
                         hasSpace[i] = true;
                     }
                 }
+            }
         }
         return wordsAreComplete;
     }
 
     /**
-     * Create a word to represent a broken substring at a space. As spaces have zero "word length"
-     * make sure that they also have a baseline to check
+     * Create a word to represent a broken substring at a space. As spaces have zero "word length" make sure that they
+     * also have a baseline to check
      *
      * @param wordAccum          buffer of characters
      * @param wordStartOffset    intial x-offset
@@ -326,16 +323,16 @@ private boolean preprocessString(char[] chars, boolean[] hasSpace) {
      * @param baseline           baseline of this word, so direction of progress can be measured in line ending
      *                           determination.
      * @param wordsAreComplete   true means characters in this word won't be split apart graphically
-     * @param currentBreakBefore true if this word fragment represents a word boundary, and any preceding fragment
-     *                           is complete.
+     * @param currentBreakBefore true if this word fragment represents a word boundary, and any preceding fragment is
+     *                           complete.
      * @return the new word
      */
     private Word createWord(StringBuffer wordAccum,
-                            float wordStartOffset,
-                            float wordEndOffset,
-                            Vector baseline,
-                            boolean wordsAreComplete,
-                            boolean currentBreakBefore) {
+            float wordStartOffset,
+            float wordEndOffset,
+            Vector baseline,
+            boolean wordsAreComplete,
+            boolean currentBreakBefore) {
         return new Word(graphicsState.getFont().decode(wordAccum.toString()), getAscent(), getDescent(),
                 pointToUserSpace(wordStartOffset, 0f, textToUserSpaceTransformMatrix),
                 pointToUserSpace(wordEndOffset, 0f, textToUserSpaceTransformMatrix), baseline,
@@ -343,8 +340,7 @@ private Word createWord(StringBuffer wordAccum,
     }
 
     /**
-     * @param gs graphic state including current transformation to page coordinates from text
-     *           measurement
+     * @param gs graphic state including current transformation to page coordinates from text measurement
      * @return the unscaled (i.e. in Text space) width of our text
      */
     public float getUnscaledTextWidth(GraphicsState gs) {
@@ -395,8 +391,8 @@ public String getFontCodes() {
     }
 
     /**
-     * @see com.lowagie.text.pdf.parser.TextAssemblyBuffer#getFinalText(com.lowagie.text.pdf.PdfReader,
-     * int, com.lowagie.text.pdf.parser.TextAssembler, boolean)
+     * @see com.lowagie.text.pdf.parser.TextAssemblyBuffer#getFinalText(com.lowagie.text.pdf.PdfReader, int,
+     * com.lowagie.text.pdf.parser.TextAssembler, boolean)
      */
     @Override
     public FinalText getFinalText(PdfReader reader, int page, TextAssembler assembler, boolean useMarkup) {
@@ -421,7 +417,6 @@ public boolean shouldNotSplit() {
 
     /**
      * @return a boolean value
-     *
      * @see com.lowagie.text.pdf.parser.ParsedTextImpl#breakBefore()
      */
     @Override
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/ParsedTextImpl.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/ParsedTextImpl.java
index 7f174ba70..40bdbd043 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/ParsedTextImpl.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/ParsedTextImpl.java
@@ -1,42 +1,32 @@
 /**
- * Copyright 2014 by Tizra Inc.
- * The contents of this file are subject to the Mozilla Public License Version 1.1
- * (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.mozilla.org/MPL/
+ * Copyright 2014 by Tizra Inc. The contents of this file are subject to the Mozilla Public License Version 1.1 (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.mozilla.org/MPL/
  * 
              
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the License.
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the License for the specific language governing rights and limitations under the License.
  * 
              
  * The Original Code is 'iText, a free JAVA-PDF library'.
  * 
              
- * The Initial Developer of the Original Code is Bruno Lowagie. Portions created by
- * the Initial Developer are Copyright (C) 1999-2008 by Bruno Lowagie.
- * All Rights Reserved.
- * Co-Developer of the code is Paulo Soares. Portions created by the Co-Developer
- * are Copyright (C) 2000-2008 by Paulo Soares. All Rights Reserved.
+ * The Initial Developer of the Original Code is Bruno Lowagie. Portions created by the Initial Developer are Copyright
+ * (C) 1999-2008 by Bruno Lowagie. All Rights Reserved. Co-Developer of the code is Paulo Soares. Portions created by
+ * the Co-Developer are Copyright (C) 2000-2008 by Paulo Soares. All Rights Reserved.
  * 
              
- * Contributor(s): all the names of the contributors are added in the source code
- * where applicable.
+ * Contributor(s): all the names of the contributors are added in the source code where applicable.
  * 
              
- * Alternatively, the contents of this file may be used under the terms of the
- * LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
- * provisions of LGPL are applicable instead of those above.  If you wish to
- * allow use of your version of this file only under the terms of the LGPL
- * License and not to allow others to use your version of this file under
- * the MPL, indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by the LGPL.
- * If you do not delete the provisions above, a recipient may use your version
- * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE.
+ * Alternatively, the contents of this file may be used under the terms of the LGPL license (the "GNU LIBRARY GENERAL
+ * PUBLIC LICENSE"), in which case the provisions of LGPL are applicable instead of those above.  If you wish to allow
+ * use of your version of this file only under the terms of the LGPL License and not to allow others to use your version
+ * of this file under the MPL, indicate your decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the LGPL. If you do not delete the provisions above, a recipient may use your
+ * version of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE.
  * 
              
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the MPL as stated above or under the terms of the GNU
- * Library General Public License as published by the Free Software Foundation;
- * either version 2 of the License, or any later version.
+ * This library is free software; you can redistribute it and/or modify it under the terms of the MPL as stated above or
+ * under the terms of the GNU Library General Public License as published by the Free Software Foundation; either
+ * version 2 of the License, or any later version.
  * 
              
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
  * details.
  */
 package com.lowagie.text.pdf.parser;
@@ -46,6 +36,7 @@
  * @author dgd
  */
 public abstract class ParsedTextImpl implements TextAssemblyBuffer {
+
     private final String text;
     private float ascent;
     private float descent;
@@ -53,35 +44,27 @@ public abstract class ParsedTextImpl implements TextAssemblyBuffer {
     private Vector endPoint;
     private float spaceWidth;
     /**
-     * We track a vector representing our baseline, left->right, so that calculations of line-
-     * change can be accurate, even with 0-length words (representing lone spaces, when
-     * those are rendered by the PDF).
+     * We track a vector representing our baseline, left->right, so that calculations of line- change can be accurate,
+     * even with 0-length words (representing lone spaces, when those are rendered by the PDF).
      */
     private Vector baseline;
 
     /**
-     * @param text
-     *            characters to be rendered for this string
-     * @param startPoint
-     *            Initial rendering spot on baseline
-     * @param endPoint
-     *            ending render position on baseline
-     * @param baseline
-     *            vector representing baseline (needed for 0-length strings)
-     * @param ascent
-     *            font ascent above baseline
-     * @param descent
-     *            font descent below the baseling
-     * @param spaceWidth
-     *            What is the width of the space in this font....
+     * @param text       characters to be rendered for this string
+     * @param startPoint Initial rendering spot on baseline
+     * @param endPoint   ending render position on baseline
+     * @param baseline   vector representing baseline (needed for 0-length strings)
+     * @param ascent     font ascent above baseline
+     * @param descent    font descent below the baseling
+     * @param spaceWidth What is the width of the space in this font....
      */
     ParsedTextImpl(String text,
-                   Vector startPoint,
-                   Vector endPoint,
-                   Vector baseline,
-                   float ascent,
-                   float descent,
-                   float spaceWidth) {
+            Vector startPoint,
+            Vector endPoint,
+            Vector baseline,
+            float ascent,
+            float descent,
+            float spaceWidth) {
         this.baseline = baseline;
         this.text = text;
         this.startPoint = startPoint;
@@ -93,6 +76,7 @@ public abstract class ParsedTextImpl implements TextAssemblyBuffer {
 
     /**
      * {@inheritDoc}
+     *
      * @see com.lowagie.text.pdf.parser.ParsedText#getText()
      */
     @Override
@@ -101,8 +85,7 @@ public String getText() {
     }
 
     /**
-     * @return The width, in user space units, of a single space character in
-     *         the current font
+     * @return The width, in user space units, of a single space character in the current font
      */
     public float getSingleSpaceWidth() {
         return spaceWidth;
@@ -128,28 +111,26 @@ public Vector getStartPoint() {
     }
 
     /**
-     * @return a vector in User space representing the end point of the text
-     *         (i.e. the starting point of the text plus the width of the text,
-     *         transformed by the applicable transformation matrices)
+     * @return a vector in User space representing the end point of the text (i.e. the starting point of the text plus
+     * the width of the text, transformed by the applicable transformation matrices)
      */
     public Vector getEndPoint() {
         return endPoint;
     }
 
     /**
-     * Return the vector representing the baseline of this text chunk, even if the length
-     * of the text is zero.
+     * Return the vector representing the baseline of this text chunk, even if the length of the text is zero.
      *
-     * @see ParsedTextImpl#baseline
      * @return baseline
+     * @see ParsedTextImpl#baseline
      */
     public Vector getBaseline() {
         return baseline;
     }
 
     /**
-     * @return true if this was extracted from a string containing spaces, in which case,
-     * we assume further splitting is not needed.
+     * @return true if this was extracted from a string containing spaces, in which case, we assume further splitting is
+     * not needed.
      */
     public abstract boolean shouldNotSplit();
 
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfContentReaderTool.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfContentReaderTool.java
index c99f5dd29..8a63060e7 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfContentReaderTool.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfContentReaderTool.java
@@ -51,7 +51,6 @@
 import com.lowagie.text.pdf.PdfObject;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.RandomAccessFileOrArray;
-
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -63,18 +62,16 @@
 
 /**
  * Tool that parses the content of a PDF document.
- * 
+ *
  * @since 2.1.4
  */
 @SuppressWarnings("WeakerAccess")
 public class PdfContentReaderTool {
 
     /**
-     * Shows the detail of a dictionary. This is similar to the PdfLister
-     * functionality.
-     * 
-     * @param dic
-     *            the dictionary of which you want the detail
+     * Shows the detail of a dictionary. This is similar to the PdfLister functionality.
+     *
+     * @param dic the dictionary of which you want the detail
      * @return a String representation of the dictionary
      */
     public static String getDictionaryDetail(PdfDictionary dic) {
@@ -83,11 +80,9 @@ public static String getDictionaryDetail(PdfDictionary dic) {
 
     /**
      * Shows the detail of a dictionary.
-     * 
-     * @param dic
-     *            the dictionary of which you want the detail
-     * @param depth
-     *            the depth of the current dictionary (for nested dictionaries)
+     *
+     * @param dic   the dictionary of which you want the detail
+     * @param depth the depth of the current dictionary (for nested dictionaries)
      * @return a String representation of the dictionary
      */
     public static String getDictionaryDetail(PdfDictionary dic, int depth) {
@@ -123,17 +118,13 @@ public static String getDictionaryDetail(PdfDictionary dic, int depth) {
     }
 
     /**
-     * Writes information about a specific page from PdfReader to the specified
-     * output stream.
-     * 
+     * Writes information about a specific page from PdfReader to the specified output stream.
+     *
+     * @param reader  the PdfReader to read the page content from
+     * @param pageNum the page number to read
+     * @param out     the output stream to send the content to
+     * @throws IOException thrown when an I/O operation goes wrong
      * @since 2.1.5
-     * @param reader
-     *            the PdfReader to read the page content from
-     * @param pageNum
-     *            the page number to read
-     * @param out
-     *            the output stream to send the content to
-     * @throws IOException  thrown when an I/O operation goes wrong
      */
     public static void listContentStreamForPage(PdfReader reader, int pageNum, PrintWriter out)
             throws IOException {
@@ -168,15 +159,12 @@ public static void listContentStreamForPage(PdfReader reader, int pageNum, Print
     }
 
     /**
-     * Writes information about each page in a PDF file to the specified output
-     * stream.
-     * 
+     * Writes information about each page in a PDF file to the specified output stream.
+     *
+     * @param pdfFile a File instance referring to a PDF file
+     * @param out     the output stream to send the content to
+     * @throws IOException thrown when an I/O operation goes wrong
      * @since 2.1.5
-     * @param pdfFile
-     *            a File instance referring to a PDF file
-     * @param out
-     *            the output stream to send the content to
-     * @throws IOException  thrown when an I/O operation goes wrong
      */
     public static void listContentStream(File pdfFile, PrintWriter out)
             throws IOException {
@@ -191,17 +179,13 @@ public static void listContentStream(File pdfFile, PrintWriter out)
     }
 
     /**
-     * Writes information about the specified page in a PDF file to the
-     * specified output stream.
-     * 
+     * Writes information about the specified page in a PDF file to the specified output stream.
+     *
+     * @param pdfFile a File instance referring to a PDF file
+     * @param pageNum the page number to read
+     * @param out     the output stream to send the content to
+     * @throws IOException thrown when an I/O operation goes wrong
      * @since 2.1.5
-     * @param pdfFile
-     *            a File instance referring to a PDF file
-     * @param pageNum
-     *            the page number to read
-     * @param out
-     *            the output stream to send the content to
-     * @throws IOException  thrown when an I/O operation goes wrong
      */
     public static void listContentStream(File pdfFile, int pageNum,
             PrintWriter out) throws IOException {
@@ -211,9 +195,8 @@ public static void listContentStream(File pdfFile, int pageNum,
     }
 
     /**
-     * Writes information about each page in a PDF file to the specified file,
-     * or System.out.
-     * 
+     * Writes information about each page in a PDF file to the specified file, or System.out.
+     *
      * @param args the arguments passed to the command line
      */
     public static void main(String[] args) {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfContentStreamHandler.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfContentStreamHandler.java
index ea3d503e4..1f05cfa9b 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfContentStreamHandler.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfContentStreamHandler.java
@@ -41,16 +41,6 @@ LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
  */
 package com.lowagie.text.pdf.parser;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Stack;
-
 import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.error_messages.MessageLocalization;
 import com.lowagie.text.pdf.CMapAwareDocumentFont;
@@ -68,12 +58,28 @@ LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStream;
 import com.lowagie.text.pdf.PdfString;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Stack;
 
 /**
  * @author dgd
  */
 @SuppressWarnings({"WeakerAccess", "unused"})
 public class PdfContentStreamHandler {
+
+    private final Stack> textFragmentStreams = new Stack<>();
+    private final Stack contextNames = new Stack<>();
+    /**
+     * detail parser for text within a marked section. used by TextAssembler
+     */
+    private final TextAssembler renderListener;
     /**
      * A map with all supported operators operators (PDF syntax).
      */
@@ -90,13 +96,7 @@ public class PdfContentStreamHandler {
      * Text line matrix.
      */
     private Matrix textLineMatrix;
-    private final Stack> textFragmentStreams = new Stack<>();
-    private final Stack contextNames = new Stack<>();
     private List textFragments = new ArrayList<>();
-    /**
-     * detail parser for text within a marked section. used by TextAssembler
-     */
-    private final TextAssembler renderListener;
 
 
     public PdfContentStreamHandler(TextAssembler renderListener) {
@@ -116,13 +116,11 @@ private static Matrix getMatrix(List operands) {
     }
 
     /**
-     * Registers a content operator that will be called when the specified
-     * operator string is encountered during content processing. Each operator
-     * may be registered only once (it is not legal to have multiple operators
-     * with the same operatorString)
+     * Registers a content operator that will be called when the specified operator string is encountered during content
+     * processing. Each operator may be registered only once (it is not legal to have multiple operators with the same
+     * operatorString)
      *
-     * @param operator the operator that will receive notification when the operator
-     *                 is encountered
+     * @param operator the operator that will receive notification when the operator is encountered
      * @since 2.1.7
      */
     public void registerContentOperator(ContentOperator operator) {
@@ -268,8 +266,7 @@ protected Matrix getCurrentTextLineMatrix() {
     }
 
     /**
-     * Adjusts the text matrix for the specified adjustment value (see TJ
-     * operator in the PDF spec for information)
+     * Adjusts the text matrix for the specified adjustment value (see TJ operator in the PDF spec for information)
      *
      * @param tj the text adjustment
      */
@@ -317,6 +314,7 @@ public String getResultantText() {
      * A content operator implementation (TJ).
      */
     static class ShowTextArray implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -344,6 +342,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (BT).
      */
     static class BeginText implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -363,6 +362,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (ET).
      */
     static class EndText implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -382,6 +382,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (cm).
      */
     static class ModifyCurrentTransformationMatrix implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -402,6 +403,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (').
      */
     static class MoveNextLineAndShowText implements ContentOperator {
+
         private final PdfContentStreamHandler.TextMoveNextLine textMoveNextLine;
         private final PdfContentStreamHandler.ShowText showText;
 
@@ -431,6 +433,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (").
      */
     static class MoveNextLineAndShowTextWithSpacing implements ContentOperator {
+
         private final PdfContentStreamHandler.SetTextWordSpacing setTextWordSpacing;
         private final PdfContentStreamHandler.SetTextCharacterSpacing setTextCharacterSpacing;
         private final MoveNextLineAndShowText moveNextLineAndShowText;
@@ -476,6 +479,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (Q).
      */
     static class PopGraphicsState implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -494,6 +498,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (gs).
      */
     static class ProcessGraphicsStateResource implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -536,6 +541,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (q).
      */
     static class PushGraphicsState implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -556,6 +562,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (Tc).
      */
     static class SetTextCharacterSpacing implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -575,6 +582,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (Tf).
      */
     static class SetTextFont implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -601,6 +609,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (Tm).
      */
     static class TextSetTextMatrix implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -620,6 +629,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (TD).
      */
     static class TextMoveStartNextLineWithLeading implements ContentOperator {
+
         private final PdfContentStreamHandler.TextMoveStartNextLine moveStartNextLine;
 
         private final PdfContentStreamHandler.SetTextLeading setTextLeading;
@@ -654,6 +664,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (Tj).
      */
     static class ShowText implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -673,6 +684,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (T*).
      */
     static class TextMoveNextLine implements ContentOperator {
+
         private final TextMoveStartNextLine moveStartNextLine;
 
         public TextMoveNextLine(TextMoveStartNextLine moveStartNextLine) {
@@ -700,6 +712,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (Td).
      */
     static class TextMoveStartNextLine implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -723,6 +736,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (Tr).
      */
     static class SetTextRenderMode implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -742,6 +756,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (Ts).
      */
     static class SetTextRise implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -761,6 +776,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (TL).
      */
     static class SetTextLeading implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -780,6 +796,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (Tz).
      */
     static class SetTextHorizontalScaling implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -799,6 +816,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (Tw).
      */
     static class SetTextWordSpacing implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -818,6 +836,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (BMC).
      */
     private static class BeginMarked implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -843,6 +862,29 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
      * A content operator implementation (BDC).
      */
     private static class BeginMarkedDict implements ContentOperator {
+
+        /**
+         * The BDC marked-content operator which brackets a marked-content sequence of objects within the content
+         * stream.
+         *
+         * @param operands  list of operands
+         * @param resources dictionary
+         * @return PdfDictionary of type BDC marked-content
+         */
+        private static PdfDictionary getBDCDictionary(List operands, PdfDictionary resources) {
+            PdfObject pdfObject = operands.get(1);
+            if (pdfObject.isName()) {
+                PdfDictionary properties = resources.getAsDict(PdfName.PROPERTIES);
+                PdfIndirectReference ir = properties.getAsIndirectObject((PdfName) pdfObject);
+                if (ir != null) {
+                    pdfObject = ir.getIndRef();
+                } else {
+                    pdfObject = properties.getAsDict((PdfName) pdfObject);
+                }
+            }
+            return (PdfDictionary) pdfObject;
+        }
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -880,32 +922,13 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
             }
             handler.pushContext(tagName);
         }
-
-        /**
-         * The BDC marked-content operator which brackets a marked-content sequence of objects within the content stream. 
-         * @param operands list of operands
-         * @param resources dictionary
-         * @return PdfDictionary of type BDC marked-content
-         */
-        private static PdfDictionary getBDCDictionary(List operands, PdfDictionary resources) {
-            PdfObject pdfObject = operands.get(1);
-            if (pdfObject.isName()) {
-                PdfDictionary properties = resources.getAsDict(PdfName.PROPERTIES);
-                PdfIndirectReference ir = properties.getAsIndirectObject((PdfName) pdfObject);
-                if (ir != null) {
-                    pdfObject = ir.getIndRef();
-                } else {
-                    pdfObject = properties.getAsDict((PdfName) pdfObject);
-                }
-            }
-            return (PdfDictionary) pdfObject;
-        }
     }
 
     /**
      * A content operator implementation (EMC).
      */
     private static class EndMarked implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
@@ -921,6 +944,7 @@ public void invoke(List operands, PdfContentStreamHandler handler, Pd
     }
 
     private class Do implements ContentOperator {
+
         /**
          * @see com.lowagie.text.pdf.parser.ContentOperator#getOperatorName()
          */
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfTextExtractor.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfTextExtractor.java
index 20786ab7f..756ddc064 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfTextExtractor.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/PdfTextExtractor.java
@@ -61,7 +61,6 @@
 import com.lowagie.text.pdf.PdfObject;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.RandomAccessFileOrArray;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -81,14 +80,12 @@ public class PdfTextExtractor {
     private final PdfReader reader;
 
     /**
-     * The {@link TextAssembler} that will receive render notifications and
-     * provide resultant text
+     * The {@link TextAssembler} that will receive render notifications and provide resultant text
      */
     private final TextAssembler renderListener;
 
     /**
-     * Creates a new Text Extractor object, using a {@link TextAssembler} as the
-     * render listener
+     * Creates a new Text Extractor object, using a {@link TextAssembler} as the render listener
      *
      * @param reader the reader with the PDF
      */
@@ -97,8 +94,7 @@ public PdfTextExtractor(PdfReader reader) {
     }
 
     /**
-     * Creates a new Text Extractor object, using a {@link TextAssembler} as the
-     * render listener
+     * Creates a new Text Extractor object, using a {@link TextAssembler} as the render listener
      *
      * @param reader               the reader with the PDF
      * @param usePdfMarkupElements should we use higher level tags for PDF markup entities?
@@ -111,8 +107,8 @@ public PdfTextExtractor(PdfReader reader, boolean usePdfMarkupElements) {
      * Creates a new Text Extractor object.
      *
      * @param reader         the reader with the PDF
-     * @param renderListener the render listener that will be used to analyze renderText
-     *                       operations and provide resultant text
+     * @param renderListener the render listener that will be used to analyze renderText operations and provide
+     *                       resultant text
      */
     public PdfTextExtractor(PdfReader reader, TextAssembler renderListener) {
         this.reader = reader;
@@ -122,8 +118,7 @@ public PdfTextExtractor(PdfReader reader, TextAssembler renderListener) {
     /**
      * Gets the content bytes of a page.
      *
-     * @param pageNum the 1-based page number of page you want get the content
-     *                stream from
+     * @param pageNum the 1-based page number of page you want get the content stream from
      * @return a byte array with the effective content stream of a page
      * @throws IOException
      */
@@ -136,8 +131,7 @@ private byte[] getContentBytesForPage(int pageNum) throws IOException {
     }
 
     /**
-     * Gets the content bytes from a content object, which may be a reference a
-     * stream or an array.
+     * Gets the content bytes from a content object, which may be a reference a stream or an array.
      *
      * @param contentObject the object to read bytes from
      * @return the content bytes
@@ -187,8 +181,8 @@ public String getTextFromPage(int page) throws IOException {
      * get the text from the page
      *
      * @param page               page number we are interested in
-     * @param useContainerMarkup should we put tags in for PDf markup container elements (not
-     *                           really HTML at the moment).
+     * @param useContainerMarkup should we put tags in for PDf markup container elements (not really HTML at the
+     *                           moment).
      * @return result of extracting the text, with tags as requested.
      * @throws IOException on error
      */
@@ -211,11 +205,10 @@ public String getTextFromPage(int page, boolean useContainerMarkup) throws IOExc
      *
      * @param contentBytes the bytes of a content stream
      * @param resources    the resources that come with the content stream
-     * @param handler      interprets events caused by recognition of operations in a
-     *                     content stream.
+     * @param handler      interprets events caused by recognition of operations in a content stream.
      */
     public void processContent(byte[] contentBytes, PdfDictionary resources,
-                               PdfContentStreamHandler handler) {
+            PdfContentStreamHandler handler) {
         handler.pushContext("div class='t-extracted-page'");
         try {
             PdfContentParser ps = new PdfContentParser(new PRTokeniser(contentBytes));
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/TextAssembler.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/TextAssembler.java
index 465e957d2..e789ee54a 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/TextAssembler.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/TextAssembler.java
@@ -42,69 +42,49 @@ LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
 package com.lowagie.text.pdf.parser;
 
 /**
- *
- * process a series of objects and text fragments, assembling them into a one
- * final text object representing the whole content.
+ * process a series of objects and text fragments, assembling them into a one final text object representing the whole
+ * content.
  *
  * @author dgd
  */
 public interface TextAssembler {
 
     /**
-     * @param completed
-     *            process a complete chunk -- just add this subsection into the
-     *            proper place.
-     * @param contextName
-     *            Name of the element context we are in. Null value if it's an
-     *            Artifact.
+     * @param completed   process a complete chunk -- just add this subsection into the proper place.
+     * @param contextName Name of the element context we are in. Null value if it's an Artifact.
      */
     void process(FinalText completed, String contextName);
 
     /**
-     * @param completed
-     *            process a complete chunk -- just add this subsection into the
-     *            proper place.
-     * @param contextName
-     *            Name of the element context we are in. Null value if it's an
-     *            Artifact.
+     * @param completed   process a complete chunk -- just add this subsection into the proper place.
+     * @param contextName Name of the element context we are in. Null value if it's an Artifact.
      */
     void process(Word completed, String contextName);
 
     /**
-     * @param parsed
-     *            process one of a number of raw pdf text chunks, with
-     *            placement, font, etc.
-     * @param contextName
-     *            Name of the element context we are in. Null value if it's an
-     *            Artifact.
+     * @param parsed      process one of a number of raw pdf text chunks, with placement, font, etc.
+     * @param contextName Name of the element context we are in. Null value if it's an Artifact.
      */
     void process(ParsedText parsed, String contextName);
 
     /**
-     * @param completed
-     *            process a complete chunk -- just add this subsection into the
-     *            proper place.
+     * @param completed process a complete chunk -- just add this subsection into the proper place.
      */
     void renderText(FinalText completed);
 
     /**
-     * @param parsed
-     *            process one of a number of raw pdf text chunks, with
-     *            placement, font, etc.
+     * @param parsed process one of a number of raw pdf text chunks, with placement, font, etc.
      */
     void renderText(ParsedTextImpl parsed);
 
     /**
-     * @param containingElementName
-     *            This is an element name to surround the extracted text
-     * @return the final text for the set of fragments and fully parsed items we
-     *         were passed during processing.
+     * @param containingElementName This is an element name to surround the extracted text
+     * @return the final text for the set of fragments and fully parsed items we were passed during processing.
      */
     FinalText endParsingContext(String containingElementName);
 
     /**
-     * assembler can calculate an identifier for each word on a page, for use in
-     * markup.
+     * assembler can calculate an identifier for each word on a page, for use in markup.
      *
      * @return the new unique id.
      */
@@ -112,7 +92,6 @@ public interface TextAssembler {
 
     /**
      * @param page number of the page we are assembling
-     *
      */
     void setPage(int page);
 
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/TextAssemblyBuffer.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/TextAssemblyBuffer.java
index f5eaeaee7..19ed9081f 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/TextAssemblyBuffer.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/TextAssemblyBuffer.java
@@ -8,7 +8,6 @@
 
 /**
  * @author dgd
- * 
  */
 public interface TextAssemblyBuffer {
 
@@ -18,39 +17,28 @@ public interface TextAssemblyBuffer {
     String getText();
 
     /**
-     * @param reader
-     *            pdfReader that knows about our document. (size, etc. available
-     *            here).
-     * @param page
-     *            which page are we extracting text from.
-     * @param assembler
-     *            Builds result by accepting content from text components of
-     *            various sorts.
+     * @param reader    pdfReader that knows about our document. (size, etc. available here).
+     * @param page      which page are we extracting text from.
+     * @param assembler Builds result by accepting content from text components of various sorts.
      * @param useMarkup Should we generate tagged text, or just plain text.
      * @return the final text ready to concatenate into result string.
      */
     FinalText getFinalText(PdfReader reader, int page,
-                           TextAssembler assembler, boolean useMarkup);
+            TextAssembler assembler, boolean useMarkup);
 
     /**
-     * We pass ourselves to the assembler, which is a visitor, so that it can
-     * accumulate information on this text depending on its type. The result is
-     * calculated by a final "assembly" phase, after accumulation is done. This
-     * is because we may have non-contiguous items in a PDF text stream.
-     * 
-     * @param p
-     *            the assembler that is visiting us.
-     * @param contextName Name of the surrounding markup element/"context" if
-     * we're generating tagged output.
-     * 
+     * We pass ourselves to the assembler, which is a visitor, so that it can accumulate information on this text
+     * depending on its type. The result is calculated by a final "assembly" phase, after accumulation is done. This is
+     * because we may have non-contiguous items in a PDF text stream.
+     *
+     * @param p           the assembler that is visiting us.
+     * @param contextName Name of the surrounding markup element/"context" if we're generating tagged output.
      * @see com.lowagie.text.pdf.parser.TextAssemblyBuffer#accumulate(com.lowagie.text.pdf.parser.TextAssembler, String)
      */
     void accumulate(TextAssembler p, String contextName);
 
     /**
-     * @param p
-     *            we may pass ourselves to this assembler again during the final
-     *            assembly process.
+     * @param p we may pass ourselves to this assembler again during the final assembly process.
      */
     void assemble(TextAssembler p);
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/Vector.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/Vector.java
index ee0e2fb61..9f81710bc 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/Vector.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/Vector.java
@@ -47,16 +47,15 @@
 package com.lowagie.text.pdf.parser;
 
 /**
- * Represents a vector (i.e. a point in space).  This class is completely
- * unrelated to the {@link java.util.Vector} class in the standard JRE.
+ * Represents a vector (i.e. a point in space).  This class is completely unrelated to the {@link java.util.Vector}
+ * class in the standard JRE.
  * 

              
- * For many PDF related operations, the z coordinate is specified as 1
- * This is to support the coordinate transformation calculations.  If it
- * helps, just think of all PDF drawing operations as occurring in a single plane
- * with z=1.
+ * For many PDF related operations, the z coordinate is specified as 1 This is to support the coordinate transformation
+ * calculations.  If it helps, just think of all PDF drawing operations as occurring in a single plane with z=1.
  */
 @SuppressWarnings("WeakerAccess")
 public class Vector {
+
     /**
      * index of the X coordinate
      */
@@ -170,9 +169,8 @@ public float dot(Vector with) {
      * Computes the length of this vector
      *
      * Note: If you are working with raw vectors from PDF, be careful -
-     * the Z axis will generally be set to 1.  If you want to compute the
-     * length of a vector, subtract it from the origin first (this will set
-     * the Z axis to 0).
+     * the Z axis will generally be set to 1.  If you want to compute the length of a vector, subtract it from the
+     * origin first (this will set the Z axis to 0).
      * 
              
      * For example:
      * aVector.subtract(originVector).length();
@@ -186,8 +184,7 @@ public float length() {
     /**
      * Computes the length squared of this vector.
      * 
              
-     * The square of the length is less expensive to compute, and is often
-     * useful without taking the square root.
+     * The square of the length is less expensive to compute, and is often useful without taking the square root.
      * 

              
      * Note: See the important note under {@link Vector#length()}
      *
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/parser/Word.java b/openpdf/src/main/java/com/lowagie/text/pdf/parser/Word.java
index 9d351121e..0593f6096 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/parser/Word.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/parser/Word.java
@@ -50,28 +50,28 @@ LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
  * @author dgd
  */
 public class Word extends ParsedTextImpl {
-    
+
     /**
-     * Is this an indivisible fragment, because it contained a space or was split from a space-
-     * containing string. Non-splittable words can be merged (into new non-splittable words).
+     * Is this an indivisible fragment, because it contained a space or was split from a space- containing string.
+     * Non-splittable words can be merged (into new non-splittable words).
      */
     private final boolean shouldNotSplit;
     /**
-     * If this word or fragment was preceded by a space, or a line break, it should never be merged
-     * into a preceding word.
+     * If this word or fragment was preceded by a space, or a line break, it should never be merged into a preceding
+     * word.
      */
     private final boolean breakBefore;
 
     /**
-     * @param text text content
-     * @param ascent font ascent (e.g. height)
-     * @param descent How far below the baseline letters go
-     * @param startPoint first point of the text
-     * @param endPoint ending offset of text
-     * @param baseline line along which text is set.
-     * @param spaceWidth how much space is a space supposed to take.
+     * @param text           text content
+     * @param ascent         font ascent (e.g. height)
+     * @param descent        How far below the baseline letters go
+     * @param startPoint     first point of the text
+     * @param endPoint       ending offset of text
+     * @param baseline       line along which text is set.
+     * @param spaceWidth     how much space is a space supposed to take.
      * @param isCompleteWord word should never be split
-     * @param breakBefore word starts here, should never combine to the left.
+     * @param breakBefore    word starts here, should never combine to the left.
      */
     Word(String text, float ascent, float descent, Vector startPoint,
             Vector endPoint, Vector baseline, float spaceWidth, boolean isCompleteWord, boolean breakBefore) {
@@ -80,10 +80,19 @@ public class Word extends ParsedTextImpl {
         this.breakBefore = breakBefore;
     }
 
+    private static String formatPercent(float f) {
+        return String.format("%.2f%%", f);
+    }
+
+    private static String escapeHTML(String s) {
+        return s.replaceAll("&", "&").replaceAll("<", "<")
+                .replaceAll(">", ">");
+    }
+
     /**
      * accept a visitor that is assembling text
-     * 
-     * @param p the assembler that is visiting us.
+     *
+     * @param p           the assembler that is visiting us.
      * @param contextName What is the wrapping markup element name if any
      * @see com.lowagie.text.pdf.parser.ParsedTextImpl#accumulate(com.lowagie.text.pdf.parser.TextAssembler, String)
      * @see com.lowagie.text.pdf.parser.TextAssemblyBuffer#accumulate(com.lowagie.text.pdf.parser.TextAssembler, String)
@@ -95,6 +104,7 @@ public void accumulate(TextAssembler p, String contextName) {
 
     /**
      * Accept a visitor that is assembling text
+     *
      * @param p the assembler that is visiting us.
      * @see com.lowagie.text.pdf.parser.TextAssemblyBuffer#assemble(com.lowagie.text.pdf.parser.TextAssembler)
      * @see com.lowagie.text.pdf.parser.ParsedTextImpl#assemble(com.lowagie.text.pdf.parser.TextAssembler)
@@ -104,24 +114,14 @@ public void assemble(TextAssembler p) {
         p.renderText(this);
     }
 
-    private static String formatPercent(float f) {
-        return String.format("%.2f%%", f);
-    }
-
     /**
-     * Generate markup for this word. send the assembler a strings representing
-     * a CSS style that will format us nicely.
+     * Generate markup for this word. send the assembler a strings representing a CSS style that will format us nicely.
      *
-     * @param text
-     *            passed in because we may have wanted to alter it, e.g. by
-     *            trimming white space, or filtering characters or something.
-     * @param reader
-     *            the file reader from which we are extracting
-     * @param page
-     *            number of the page we are reading text from
-     * @param assembler
-     *            object to assemble text from fragments and larger strings on a
-     *            page.
+     * @param text      passed in because we may have wanted to alter it, e.g. by trimming white space, or filtering
+     *                  characters or something.
+     * @param reader    the file reader from which we are extracting
+     * @param page      number of the page we are reading text from
+     * @param assembler object to assemble text from fragments and larger strings on a page.
      * @return markup to represent this one word.
      */
     private String wordMarkup(String text, PdfReader reader, int page, TextAssembler assembler) {
@@ -136,7 +136,7 @@ private String wordMarkup(String text, PdfReader reader, int page, TextAssembler
         }
         mediaBox.normalize();
         if (cropBox != null) {
-            cropBox.normalize(); 
+            cropBox.normalize();
         } else {
             cropBox = reader.getBoxSize(page, "trim");
             if (cropBox != null) {
@@ -151,9 +151,9 @@ private String wordMarkup(String text, PdfReader reader, int page, TextAssembler
         Vector endPoint = getEndPoint();
         float pageWidth = cropBox.getWidth();
         float pageHeight = cropBox.getHeight();
-        float leftPercent = (float) ((startPoint.get(0) - xOffset  - mediaBox.getLeft()) / pageWidth * 100.0);
+        float leftPercent = (float) ((startPoint.get(0) - xOffset - mediaBox.getLeft()) / pageWidth * 100.0);
         float bottom = endPoint.get(1) + yOffset - getDescent() - mediaBox.getBottom();
-        float bottomPercent =  bottom / pageHeight * 100f;
+        float bottomPercent = bottom / pageHeight * 100f;
         StringBuilder result = new StringBuilder();
         float width = getWidth();
         float widthPercent = width / pageWidth * 100.0f;
@@ -161,7 +161,8 @@ private String wordMarkup(String text, PdfReader reader, int page, TextAssembler
         float height = getAscent();
         float heightPercent = height / pageHeight * 100.0f;
         String myId = assembler.getWordId();
-        Rectangle resultRect = new Rectangle(leftPercent, bottomPercent, leftPercent+widthPercent, bottomPercent+heightPercent);
+        Rectangle resultRect = new Rectangle(leftPercent, bottomPercent, leftPercent + widthPercent,
+                bottomPercent + heightPercent);
         result.append("", ">");
-    }
-
     /**
-     * @see com.lowagie.text.pdf.parser.TextAssemblyBuffer#getFinalText(PdfReader,
-     *      int, TextAssembler, boolean)
+     * @see com.lowagie.text.pdf.parser.TextAssemblyBuffer#getFinalText(PdfReader, int, TextAssembler, boolean)
      */
     @Override
     public FinalText getFinalText(PdfReader reader, int page,
diff --git a/openpdf/src/main/java/com/lowagie/text/utils/SystemPropertyUtil.java b/openpdf/src/main/java/com/lowagie/text/utils/SystemPropertyUtil.java
index c7b6b97f9..22a525d6f 100644
--- a/openpdf/src/main/java/com/lowagie/text/utils/SystemPropertyUtil.java
+++ b/openpdf/src/main/java/com/lowagie/text/utils/SystemPropertyUtil.java
@@ -1,18 +1,21 @@
 package com.lowagie.text.utils;
 
 public class SystemPropertyUtil {
-	/**
-	 * Similar to {@link Boolean#getBoolean(String)} but uses the given default value if property were not set.
-	 * @param propertyKey the system property key
-	 * @param defaultValue the default value to use if property is not defined.
-	 * @return true if the property is defined and contains "true" (ignoring case), else if system property is not set then the provided defaultValue, else false.
-	 */
-	public static boolean getBoolean(String propertyKey, boolean defaultValue) {
-		String propertyValue = System.getProperty(propertyKey);
-		if(propertyValue == null) {
-			return defaultValue;
-		}
-		
-		return Boolean.parseBoolean(propertyValue);
-	}
+
+    /**
+     * Similar to {@link Boolean#getBoolean(String)} but uses the given default value if property were not set.
+     *
+     * @param propertyKey  the system property key
+     * @param defaultValue the default value to use if property is not defined.
+     * @return true if the property is defined and contains "true" (ignoring case), else if system property is not set
+     * then the provided defaultValue, else false.
+     */
+    public static boolean getBoolean(String propertyKey, boolean defaultValue) {
+        String propertyValue = System.getProperty(propertyKey);
+        if (propertyValue == null) {
+            return defaultValue;
+        }
+
+        return Boolean.parseBoolean(propertyValue);
+    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/SAXiTextHandler.java b/openpdf/src/main/java/com/lowagie/text/xml/SAXiTextHandler.java
index b3a9d2757..4a76c7b2b 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/SAXiTextHandler.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/SAXiTextHandler.java
@@ -49,14 +49,6 @@
 
 package com.lowagie.text.xml;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EmptyStackException;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Stack;
-
 import com.lowagie.text.Anchor;
 import com.lowagie.text.Annotation;
 import com.lowagie.text.BadElementException;
@@ -83,12 +75,19 @@
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.draw.LineSeparator;
 import com.lowagie.text.xml.simpleparser.EntitiesToSymbol;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EmptyStackException;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Stack;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
- * This class is a Handler that controls the iText XML to PDF conversion.
- * Subclass it, if you want to change the way iText translates XML to PDF.
+ * This class is a Handler that controls the iText XML to PDF conversion. Subclass it, if you want to change the way
+ * iText translates XML to PDF.
  */
 
 public class SAXiTextHandler extends DefaultHandler {
@@ -99,8 +98,7 @@ public class SAXiTextHandler extends DefaultHandler {
     protected DocListener document;
 
     /**
-     * This is a Stack of objects, waiting to be added to the
-     * document.
+     * This is a Stack of objects, waiting to be added to the document.
      */
     protected Stack stack;
 
@@ -118,16 +116,14 @@ public class SAXiTextHandler extends DefaultHandler {
      * This is the current chunk to which characters can be added.
      */
     protected boolean ignore = false;
-
-    /**
-     * This is a flag that can be set, if you want to open and close the
-     * Document-object yourself.
-     */
-    private boolean controlOpenClose = true;
     /**
      * This hashmap contains all the custom keys and peers.
      */
     protected Map myTags;
+    /**
+     * This is a flag that can be set, if you want to open and close the Document-object yourself.
+     */
+    private boolean controlOpenClose = true;
     /**
      * current margin of a page.
      */
@@ -156,8 +152,8 @@ public SAXiTextHandler(DocListener document) {
 
     /**
      * @param document the DocListener
-     * @param myTags a Map of the tags
-     * @param bf the base class for the supported fonts
+     * @param myTags   a Map of the tags
+     * @param bf       the base class for the supported fonts
      */
     public SAXiTextHandler(DocListener document, Map myTags, BaseFont bf) {
         this(document, myTags);
@@ -166,7 +162,7 @@ public SAXiTextHandler(DocListener document, Map myTags, BaseFont bf)
 
     /**
      * @param document the DocListener
-     * @param myTags a Map of the tags
+     * @param myTags   a Map of the tags
      */
     public SAXiTextHandler(DocListener document, Map myTags) {
         this(document);
@@ -174,16 +170,14 @@ public SAXiTextHandler(DocListener document, Map myTags) {
     }
 
     /**
-     * Sets the parameter that allows you to enable/disable the control over the
-     * Document.open() and Document.close() method.
+     * Sets the parameter that allows you to enable/disable the control over the Document.open() and Document.close()
+     * method.
      * 
              
-     * If you set this parameter to true (= default), the parser will open the
-     * Document object when the start-root-tag is encountered and close it when
-     * the end-root-tag is met. If you set it to false, you have to open and
-     * close the Document object yourself.
+     * If you set this parameter to true (= default), the parser will open the Document object when the start-root-tag
+     * is encountered and close it when the end-root-tag is met. If you set it to false, you have to open and close the
+     * Document object yourself.
      *
-     * @param controlOpenClose set this to false if you plan to open/close the Document
-     *                         yourself
+     * @param controlOpenClose set this to false if you plan to open/close the Document yourself
      */
 
     public void setControlOpenClose(boolean controlOpenClose) {
@@ -194,8 +188,8 @@ public void setControlOpenClose(boolean controlOpenClose) {
      * This method gets called when a start tag is encountered.
      *
      * @param uri        the Uniform Resource Identifier
-     * @param localName  the local name (without prefix), or the empty string if
-     *                   Namespace processing is not being performed.
+     * @param localName  the local name (without prefix), or the empty string if Namespace processing is not being
+     *                   performed.
      * @param name       the name of the tag that is encountered
      * @param attributes the list of attributes
      */
@@ -451,14 +445,18 @@ public void handleStartingTags(String name, Properties attributes) {
                 value = attributes.getProperty(key);
                 try {
                     // margin specific code suggested by Reza Nasiri
-                    if (ElementTags.LEFT.equalsIgnoreCase(key))
+                    if (ElementTags.LEFT.equalsIgnoreCase(key)) {
                         leftMargin = Float.parseFloat(value + "f");
-                    if (ElementTags.RIGHT.equalsIgnoreCase(key))
+                    }
+                    if (ElementTags.RIGHT.equalsIgnoreCase(key)) {
                         rightMargin = Float.parseFloat(value + "f");
-                    if (ElementTags.TOP.equalsIgnoreCase(key))
+                    }
+                    if (ElementTags.TOP.equalsIgnoreCase(key)) {
                         topMargin = Float.parseFloat(value + "f");
-                    if (ElementTags.BOTTOM.equalsIgnoreCase(key))
+                    }
+                    if (ElementTags.BOTTOM.equalsIgnoreCase(key)) {
                         bottomMargin = Float.parseFloat(value + "f");
+                    }
                 } catch (Exception ex) {
                     throw new ExceptionConverter(ex);
                 }
@@ -493,8 +491,9 @@ public void handleStartingTags(String name, Properties attributes) {
             }
             document.setMargins(leftMargin, rightMargin, topMargin, bottomMargin);
 
-            if (controlOpenClose)
+            if (controlOpenClose) {
                 document.open();
+            }
         }
 
     }
@@ -579,8 +578,8 @@ public void setBaseFont(BaseFont bf) {
      * This method gets called when an end tag is encountered.
      *
      * @param uri   the Uniform Resource Identifier
-     * @param lname the local name (without prefix), or the empty string if
-     *              Namespace processing is not being performed.
+     * @param lname the local name (without prefix), or the empty string if Namespace processing is not being
+     *              performed.
      * @param name  the name of the tag that ends
      */
 
@@ -602,8 +601,9 @@ public void handleEndingTags(String name) {
             ignore = false;
             return;
         }
-        if (ignore)
+        if (ignore) {
             return;
+        }
         // tags that don't have any content
         if (isNewpage(name) || ElementTags.ANNOTATION.equals(name) || ElementTags.IMAGE.equals(name)
                 || isNewline(name)) {
@@ -811,12 +811,11 @@ protected void addImage(Image img) throws EmptyStackException {
         }
 
         // ... if it is a Phrase, we have to wrap the Image in a new Chunk
-        else if (current instanceof Phrase){
-            ((TextElementArray)current).add(new Chunk(img,0,0));
+        else if (current instanceof Phrase) {
+            ((TextElementArray) current).add(new Chunk(img, 0, 0));
             stack.push(current);
         }
 
-
         // ...if not, we need to to a lot of stuff
         else {
             Stack newStack = new Stack<>();
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/SAXmyHandler.java b/openpdf/src/main/java/com/lowagie/text/xml/SAXmyHandler.java
index 41fd979a2..ab9eeb175 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/SAXmyHandler.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/SAXmyHandler.java
@@ -49,10 +49,9 @@
 
 package com.lowagie.text.xml;
 
+import com.lowagie.text.DocListener;
 import java.util.Map;
 import java.util.Properties;
-
-import com.lowagie.text.DocListener;
 import org.xml.sax.Attributes;
 
 /**
@@ -62,8 +61,8 @@
 public class SAXmyHandler extends SAXiTextHandler {
 
     /**
-     * Constructs a new SAXiTextHandler that will translate all the events
-     * triggered by the parser to actions on the Document-object.
+     * Constructs a new SAXiTextHandler that will translate all the events triggered by the parser to actions on the
+     * Document-object.
      *
      * @param document this is the document on which events must be triggered
      * @param myTags   a user defined tagmap
@@ -72,22 +71,22 @@ public class SAXmyHandler extends SAXiTextHandler {
     public SAXmyHandler(DocListener document, Map myTags) {
         super(document, myTags);
     }
-    
-/**
- * This method gets called when a start tag is encountered.
- * 
-     * @param   uri         the Uniform Resource Identifier
-     * @param   localName         the local name (without prefix), or the empty string if Namespace processing is not being performed.
- * @param    name        the name of the tag that is encountered
- * @param    attrs        the list of attributes
- */
-    
+
+    /**
+     * This method gets called when a start tag is encountered.
+     *
+     * @param uri       the Uniform Resource Identifier
+     * @param localName the local name (without prefix), or the empty string if Namespace processing is not being
+     *                  performed.
+     * @param name      the name of the tag that is encountered
+     * @param attrs     the list of attributes
+     */
+
     public void startElement(String uri, String localName, String name, Attributes attrs) {
         if (myTags.containsKey(name)) {
             XmlPeer peer = myTags.get(name);
             handleStartingTags(peer.getTag(), peer.getAttributes(attrs));
-        }
-        else {
+        } else {
             Properties attributes = new Properties();
             if (attrs != null) {
                 for (int i = 0; i < attrs.getLength(); i++) {
@@ -98,21 +97,21 @@ public void startElement(String uri, String localName, String name, Attributes a
             handleStartingTags(name, attributes);
         }
     }
-    
+
     /**
-      * This method gets called when an end tag is encountered.
-      *
-     * @param   uri         the Uniform Resource Identifier
-     * @param   lname         the local name (without prefix), or the empty string if Namespace processing is not being performed.
-     * @param    name        the name of the tag that ends
+     * This method gets called when an end tag is encountered.
+     *
+     * @param uri   the Uniform Resource Identifier
+     * @param lname the local name (without prefix), or the empty string if Namespace processing is not being
+     *              performed.
+     * @param name  the name of the tag that ends
      */
-    
+
     public void endElement(String uri, String lname, String name) {
         if (myTags.containsKey(name)) {
             XmlPeer peer = myTags.get(name);
             handleEndingTags(peer.getTag());
-        }
-        else {
+        } else {
             handleEndingTags(name);
         }
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/TagMap.java b/openpdf/src/main/java/com/lowagie/text/xml/TagMap.java
index eef5df800..719647204 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/TagMap.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/TagMap.java
@@ -50,6 +50,7 @@
 package com.lowagie.text.xml;
 
 
+import com.lowagie.text.ExceptionConverter;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -57,8 +58,6 @@
 import java.util.Map;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
-import com.lowagie.text.ExceptionConverter;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/XMLUtil.java b/openpdf/src/main/java/com/lowagie/text/xml/XMLUtil.java
index 957a3ad27..d11ca002f 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/XMLUtil.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/XMLUtil.java
@@ -44,12 +44,14 @@
 package com.lowagie.text.xml;
 
 public class XMLUtil {
+
     /**
      * Escapes a string with the appropriated XML codes.
-     * @param s the string to be escaped
+     *
+     * @param s         the string to be escaped
      * @param onlyASCII codes above 127 will always be escaped with &#nn; if true
      * @return the escaped string
-     */    
+     */
     public static String escapeXML(String s, boolean onlyASCII) {
         char[] cc = s.toCharArray();
         int len = cc.length;
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/XmlDomWriter.java b/openpdf/src/main/java/com/lowagie/text/xml/XmlDomWriter.java
index 3a115309f..27580139a 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/XmlDomWriter.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/XmlDomWriter.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2005 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,82 +27,99 @@
 import org.w3c.dom.Node;
 
 /**
- *
  * @author psoares
  */
 public class XmlDomWriter {
-    
-    /** Print writer. */
+
+    /**
+     * Print writer.
+     */
     protected PrintWriter fOut;
-    
-    /** Canonical output. */
+
+    /**
+     * Canonical output.
+     */
     protected boolean fCanonical;
-    
-    /** Processing XML 1.1 document. */
+
+    /**
+     * Processing XML 1.1 document.
+     */
     protected boolean fXML11;
-    
+
     //
     // Constructors
     //
-    
-    /** Default constructor. */
+
+    /**
+     * Default constructor.
+     */
     public XmlDomWriter() {
     } // ()
-    
+
     public XmlDomWriter(boolean canonical) {
         fCanonical = canonical;
     } // (boolean)
-    
+
     //
     // Public methods
     //
-    
-    /** Sets whether output is canonical.
-     * @param canonical true if canonical, false otherwise*/
+
+    /**
+     * Sets whether output is canonical.
+     *
+     * @param canonical true if canonical, false otherwise
+     */
     public void setCanonical(boolean canonical) {
         fCanonical = canonical;
     } // setCanonical(boolean)
 
     /**
      * Sets the output stream for printing.
-     * @param stream the OutputString
+     *
+     * @param stream   the OutputString
      * @param encoding the encoding
      * @throws UnsupportedEncodingException on error of encoding
      */
     public void setOutput(OutputStream stream, String encoding)
-    throws UnsupportedEncodingException {
-        
+            throws UnsupportedEncodingException {
+
         if (encoding == null) {
             encoding = "UTF8";
         }
-        
+
         java.io.Writer writer = new OutputStreamWriter(stream, encoding);
         fOut = new PrintWriter(writer);
-        
+
     } // setOutput(OutputStream,String)
-    
-    /** Sets the output writer.
-     * @param writer the writer to set */
+
+    /**
+     * Sets the output writer.
+     *
+     * @param writer the writer to set
+     */
     public void setOutput(java.io.Writer writer) {
-        
+
         fOut = writer instanceof PrintWriter
-                ? (PrintWriter)writer : new PrintWriter(writer);
-        
+                ? (PrintWriter) writer : new PrintWriter(writer);
+
     } // setOutput(java.io.Writer)
-    
-    /** Writes the specified node, recursively.
-     * @param node  the Node to write */
+
+    /**
+     * Writes the specified node, recursively.
+     *
+     * @param node the Node to write
+     */
     public void write(Node node) {
-        
+
         // is there anything to do?
         if (node == null) {
             return;
         }
-        
+
         short type = node.getNodeType();
         switch (type) {
             case Node.DOCUMENT_NODE: {
-                Document document = (Document)node;
+                Document document = (Document) node;
                 fXML11 = false; //"1.1".equals(getVersion(document));
                 if (!fCanonical) {
                     if (fXML11) {
@@ -116,9 +133,9 @@ public void write(Node node) {
                 write(document.getDocumentElement());
                 break;
             }
-            
+
             case Node.DOCUMENT_TYPE_NODE: {
-                DocumentType doctype = (DocumentType)node;
+                DocumentType doctype = (DocumentType) node;
                 fOut.print("');
                 break;
             }
-            
+
             case Node.ELEMENT_NODE: {
                 fOut.print('<');
                 fOut.print(node.getNodeName());
@@ -157,7 +174,7 @@ public void write(Node node) {
                 }
                 fOut.print('>');
                 fOut.flush();
-                
+
                 Node child = node.getFirstChild();
                 while (child != null) {
                     write(child);
@@ -165,7 +182,7 @@ public void write(Node node) {
                 }
                 break;
             }
-            
+
             case Node.ENTITY_REFERENCE_NODE: {
                 if (fCanonical) {
                     Node child = node.getFirstChild();
@@ -181,7 +198,7 @@ public void write(Node node) {
                 }
                 break;
             }
-            
+
             case Node.CDATA_SECTION_NODE: {
                 if (fCanonical) {
                     normalizeAndPrint(node.getNodeValue(), false);
@@ -193,13 +210,13 @@ public void write(Node node) {
                 fOut.flush();
                 break;
             }
-            
+
             case Node.TEXT_NODE: {
                 normalizeAndPrint(node.getNodeValue(), false);
                 fOut.flush();
                 break;
             }
-            
+
             case Node.PROCESSING_INSTRUCTION_NODE: {
                 fOut.print("');
             fOut.flush();
         }
-        
+
     } // write(Node)
 
     /**
      * Returns a sorted list of attributes.
+     *
      * @param attrs the NameNomeMap of attributes
      * @return a Attr array of sorted attributes
      */
     protected Attr[] sortAttributes(NamedNodeMap attrs) {
-        
+
         int len = (attrs != null) ? attrs.getLength() : 0;
         Attr[] array = new Attr[len];
         for (int i = 0; i < len; i++) {
-            array[i] = (Attr)attrs.item(i);
+            array[i] = (Attr) attrs.item(i);
         }
         for (int i = 0; i < len - 1; i++) {
             String name = array[i].getNodeName();
@@ -263,35 +281,39 @@ protected Attr[] sortAttributes(NamedNodeMap attrs) {
                 array[index] = temp;
             }
         }
-        
+
         return array;
-        
+
     } // sortAttributes(NamedNodeMap):Attr[]
-    
+
     //
     // Protected methods
     //
-    
-    /** Normalizes and prints the given string.
+
+    /**
+     * Normalizes and prints the given string.
+     *
      * @param isAttValue boolean
-     * @param s the String to normalize and print */
+     * @param s          the String to normalize and print
+     */
     protected void normalizeAndPrint(String s, boolean isAttValue) {
-        
+
         int len = (s != null) ? s.length() : 0;
         for (int i = 0; i < len; i++) {
             char c = s.charAt(i);
             normalizeAndPrint(c, isAttValue);
         }
-        
+
     } // normalizeAndPrint(String,boolean)
 
     /**
      * Normalizes and print the given character.
-     * @param c the character
+     *
+     * @param c          the character
      * @param isAttValue boolean
      */
     protected void normalizeAndPrint(char c, boolean isAttValue) {
-        
+
         switch (c) {
             case '<': {
                 fOut.print("<");
@@ -339,8 +361,8 @@ protected void normalizeAndPrint(char c, boolean isAttValue) {
                 // if the document is XML 1.1, since they would be normalized to LF
                 // when the document is reparsed.
                 if (fXML11 && ((c >= 0x01 && c <= 0x1F && c != 0x09 && c != 0x0A)
-                || (c >= 0x7F && c <= 0x9F) || c == 0x2028)
-                || isAttValue && (c == 0x09 || c == 0x0A)) {
+                        || (c >= 0x7F && c <= 0x9F) || c == 0x2028)
+                        || isAttValue && (c == 0x09 || c == 0x0A)) {
                     fOut.print("&#x");
                     fOut.print(Integer.toHexString(c).toUpperCase());
                     fOut.print(";");
@@ -350,7 +372,7 @@ protected void normalizeAndPrint(char c, boolean isAttValue) {
             }
         }
     } // normalizeAndPrint(char,boolean)
-    
+
     /** Extracts the XML version from the Document. */
 //    protected String getVersion(Document document) {
 //        if (document == null) {
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/XmlParser.java b/openpdf/src/main/java/com/lowagie/text/xml/XmlParser.java
index b865e7b10..5401ef868 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/XmlParser.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/XmlParser.java
@@ -49,6 +49,8 @@
 
 package com.lowagie.text.xml;
 
+import com.lowagie.text.DocListener;
+import com.lowagie.text.ExceptionConverter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -56,9 +58,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
-import com.lowagie.text.DocListener;
-import com.lowagie.text.ExceptionConverter;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -88,116 +87,6 @@ public XmlParser() {
         }
     }
 
-    /**
-     * Parses a given file.
-     *
-     * @param document The document that will listen to the parser
-     * @param is       The InputStream with the contents
-     */
-
-    public void go(DocListener document, InputSource is) {
-        try {
-            parser.parse(is, new SAXiTextHandler<>(document));
-        } catch (SAXException | IOException se) {
-            throw new ExceptionConverter(se);
-        }
-    }
-
-    /**
-     * Parses a given file.
-     *
-     * @param document The document that will listen to the parser
-     * @param is       The input source with the content
-     * @param tagmap   A user defined tagmap
-     */
-
-    public void go(DocListener document, InputSource is, String tagmap) {
-        try {
-            parser.parse(is, new SAXmyHandler(document, new TagMap(tagmap)));
-        } catch (SAXException | IOException se) {
-            throw new ExceptionConverter(se);
-        }
-    }
-
-    /**
-     * Parses a given file.
-     *
-     * @param document The document that will listen to the parser
-     * @param is       the input source with the content
-     * @param tagmap   an inputstream to a user defined tagmap
-     */
-
-    public void go(DocListener document, InputSource is, InputStream tagmap) {
-        try {
-            parser.parse(is, new SAXmyHandler(document, new TagMap(tagmap)));
-        } catch (SAXException | IOException se) {
-            throw new ExceptionConverter(se);
-        }
-    }
-
-    /**
-     * Parses a given file.
-     *
-     * @param document The document that will listen to the parser
-     * @param is       the input source with the content
-     * @param tagmap   a user defined tagmap
-     */
-
-    public void go(DocListener document, InputSource is, Map tagmap) {
-        try {
-            parser.parse(is, new SAXmyHandler(document, tagmap));
-        } catch (SAXException | IOException se) {
-            throw new ExceptionConverter(se);
-        }
-    }
-
-    /**
-     * Parses a given file.
-     *
-     * @param document The document that will listen to the parser
-     * @param file     The path to a file with the content
-     */
-
-    public void go(DocListener document, String file) {
-        try {
-            parser.parse(file, new SAXiTextHandler<>(document));
-        } catch (SAXException | IOException se) {
-            throw new ExceptionConverter(se);
-        }
-    }
-
-    /**
-     * Parses a given file.
-     *
-     * @param document the document that will listen to the parser
-     * @param file     the path to a file with the content
-     * @param tagmap   a user defined tagmap
-     */
-
-    public void go(DocListener document, String file, String tagmap) {
-        try {
-            parser.parse(file, new SAXmyHandler(document, new TagMap(tagmap)));
-        } catch (SAXException | IOException se) {
-            throw new ExceptionConverter(se);
-        }
-    }
-
-    /**
-     * Parses a given file.
-     *
-     * @param document The document that will listen to the parser
-     * @param file     the path to a file with the content
-     * @param tagmap   a user defined tagmap
-     */
-
-    public void go(DocListener document, String file, Map tagmap) {
-        try {
-            parser.parse(file, new SAXmyHandler(document, tagmap));
-        } catch (SAXException | IOException se) {
-            throw new ExceptionConverter(se);
-        }
-    }
-
     /**
      * Parses a given file that validates with the iText DTD and writes the content to a document.
      *
@@ -349,4 +238,114 @@ public static void parse(DocListener document, Reader is, Map t
         XmlParser xmlParser = new XmlParser();
         xmlParser.go(document, new InputSource(is), tagmap);
     }
+
+    /**
+     * Parses a given file.
+     *
+     * @param document The document that will listen to the parser
+     * @param is       The InputStream with the contents
+     */
+
+    public void go(DocListener document, InputSource is) {
+        try {
+            parser.parse(is, new SAXiTextHandler<>(document));
+        } catch (SAXException | IOException se) {
+            throw new ExceptionConverter(se);
+        }
+    }
+
+    /**
+     * Parses a given file.
+     *
+     * @param document The document that will listen to the parser
+     * @param is       The input source with the content
+     * @param tagmap   A user defined tagmap
+     */
+
+    public void go(DocListener document, InputSource is, String tagmap) {
+        try {
+            parser.parse(is, new SAXmyHandler(document, new TagMap(tagmap)));
+        } catch (SAXException | IOException se) {
+            throw new ExceptionConverter(se);
+        }
+    }
+
+    /**
+     * Parses a given file.
+     *
+     * @param document The document that will listen to the parser
+     * @param is       the input source with the content
+     * @param tagmap   an inputstream to a user defined tagmap
+     */
+
+    public void go(DocListener document, InputSource is, InputStream tagmap) {
+        try {
+            parser.parse(is, new SAXmyHandler(document, new TagMap(tagmap)));
+        } catch (SAXException | IOException se) {
+            throw new ExceptionConverter(se);
+        }
+    }
+
+    /**
+     * Parses a given file.
+     *
+     * @param document The document that will listen to the parser
+     * @param is       the input source with the content
+     * @param tagmap   a user defined tagmap
+     */
+
+    public void go(DocListener document, InputSource is, Map tagmap) {
+        try {
+            parser.parse(is, new SAXmyHandler(document, tagmap));
+        } catch (SAXException | IOException se) {
+            throw new ExceptionConverter(se);
+        }
+    }
+
+    /**
+     * Parses a given file.
+     *
+     * @param document The document that will listen to the parser
+     * @param file     The path to a file with the content
+     */
+
+    public void go(DocListener document, String file) {
+        try {
+            parser.parse(file, new SAXiTextHandler<>(document));
+        } catch (SAXException | IOException se) {
+            throw new ExceptionConverter(se);
+        }
+    }
+
+    /**
+     * Parses a given file.
+     *
+     * @param document the document that will listen to the parser
+     * @param file     the path to a file with the content
+     * @param tagmap   a user defined tagmap
+     */
+
+    public void go(DocListener document, String file, String tagmap) {
+        try {
+            parser.parse(file, new SAXmyHandler(document, new TagMap(tagmap)));
+        } catch (SAXException | IOException se) {
+            throw new ExceptionConverter(se);
+        }
+    }
+
+    /**
+     * Parses a given file.
+     *
+     * @param document The document that will listen to the parser
+     * @param file     the path to a file with the content
+     * @param tagmap   a user defined tagmap
+     */
+
+    public void go(DocListener document, String file, Map tagmap) {
+        try {
+            parser.parse(file, new SAXmyHandler(document, tagmap));
+        } catch (SAXException | IOException se) {
+            throw new ExceptionConverter(se);
+        }
+    }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/XmlPeer.java b/openpdf/src/main/java/com/lowagie/text/xml/XmlPeer.java
index a33938d0f..d50af7191 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/XmlPeer.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/XmlPeer.java
@@ -50,9 +50,8 @@
 package com.lowagie.text.xml;
 
 import com.lowagie.text.ElementTags;
-import org.xml.sax.Attributes;
-
 import java.util.Properties;
+import org.xml.sax.Attributes;
 
 /**
  * This interface is implemented by the peer of all the iText objects.
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/EntitiesToSymbol.java b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/EntitiesToSymbol.java
index 6e787344a..9b139b05a 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/EntitiesToSymbol.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/EntitiesToSymbol.java
@@ -51,7 +51,6 @@
 
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Font;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -62,13 +61,9 @@
 @SuppressWarnings("deprecated")
 public class EntitiesToSymbol {
 
-    public static Map getMap() {
-        return map;
-    }
-
     /**
-     * This is a map that contains all possible id values of the entity tag
-     * that can be translated to a character in font Symbol.
+     * This is a map that contains all possible id values of the entity tag that can be translated to a character in
+     * font Symbol.
      */
     static final HashMap map;
 
@@ -350,19 +345,23 @@ public static Map getMap() {
         map.put("zeta", (char) 122);
     }
 
+    public static Map getMap() {
+        return map;
+    }
+
     /**
      * Gets a chunk with a symbol character.
-     * @param e a symbol value (see Entities class: alfa is greek alfa,...)
+     *
+     * @param e    a symbol value (see Entities class: alfa is greek alfa,...)
      * @param font the font if the symbol isn't found (otherwise Font.SYMBOL)
      * @return a Chunk
      */
     public static Chunk get(String e, Font font) {
         char s = getCorrespondingSymbol(e);
-        if (s == (char)0) {
+        if (s == (char) 0) {
             try {
-                return new Chunk(String.valueOf((char)Integer.parseInt(e)), font);
-            }
-            catch(Exception exception) {
+                return new Chunk(String.valueOf((char) Integer.parseInt(e)), font);
+            } catch (Exception exception) {
                 return new Chunk(e, font);
             }
         }
@@ -373,13 +372,13 @@ public static Chunk get(String e, Font font) {
     /**
      * Looks for the corresponding symbol in the font Symbol.
      *
-     * @param    name    the name of the entity
-     * @return    the corresponding character in font Symbol
+     * @param name the name of the entity
+     * @return the corresponding character in font Symbol
      */
     public static char getCorrespondingSymbol(String name) {
         Character symbol = map.get(name);
         if (symbol == null) {
-            return (char)0;
+            return (char) 0;
         }
         return symbol;
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/EntitiesToUnicode.java b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/EntitiesToUnicode.java
index c2f45e82d..b0b508d13 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/EntitiesToUnicode.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/EntitiesToUnicode.java
@@ -59,14 +59,10 @@
 @SuppressWarnings("deprecated")
 public class EntitiesToUnicode {
 
-    public static Map getMap() {
-        return map;
-    }
-
     /**
      * This is a map that contains the names of entities and their unicode value.
      */
-     static final HashMap map = new HashMap<>();
+    static final HashMap map = new HashMap<>();
 
     static {
         map.put("nbsp", '\u00a0'); // no-break space = non-breaking space, U+00A0 ISOnum
@@ -80,7 +76,8 @@ public static Map getMap() {
         map.put("uml", '\u00a8'); // diaeresis = spacing diaeresis, U+00A8 ISOdia
         map.put("copy", '\u00a9'); // copyright sign, U+00A9 ISOnum
         map.put("ordf", '\u00aa'); // feminine ordinal indicator, U+00AA ISOnum
-        map.put("laquo", '\u00ab'); // left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum
+        map.put("laquo",
+                '\u00ab'); // left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum
         map.put("not", '\u00ac'); // not sign, U+00AC ISOnum
         map.put("shy", '\u00ad'); // soft hyphen = discretionary hyphen, U+00AD ISOnum
         map.put("reg", '\u00ae'); // registered sign = registered trade mark sign, U+00AE ISOnum
@@ -96,7 +93,8 @@ public static Map getMap() {
         map.put("cedil", '\u00b8'); // cedilla = spacing cedilla, U+00B8 ISOdia
         map.put("sup1", '\u00b9'); // superscript one = superscript digit one, U+00B9 ISOnum
         map.put("ordm", '\u00ba'); // masculine ordinal indicator, U+00BA ISOnum
-        map.put("raquo", '\u00bb'); // right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum
+        map.put("raquo",
+                '\u00bb'); // right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum
         map.put("frac14", '\u00bc'); // vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum
         map.put("frac12", '\u00bd'); // vulgar fraction one half = fraction one half, U+00BD ISOnum
         map.put("frac34", '\u00be'); // vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum
@@ -106,7 +104,8 @@ public static Map getMap() {
         map.put("Acirc", '\u00c2'); // latin capital letter A with circumflex, U+00C2 ISOlat1
         map.put("Atilde", '\u00c3'); // latin capital letter A with tilde, U+00C3 ISOlat1
         map.put("Auml", '\u00c4'); // latin capital letter A with diaeresis, U+00C4 ISOlat1
-        map.put("Aring", '\u00c5'); // latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1
+        map.put("Aring",
+                '\u00c5'); // latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1
         map.put("AElig", '\u00c6'); // latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1
         map.put("Ccedil", '\u00c7'); // latin capital letter C with cedilla, U+00C7 ISOlat1
         map.put("Egrave", '\u00c8'); // latin capital letter E with grave, U+00C8 ISOlat1
@@ -125,7 +124,8 @@ public static Map getMap() {
         map.put("Otilde", '\u00d5'); // latin capital letter O with tilde, U+00D5 ISOlat1
         map.put("Ouml", '\u00d6'); // latin capital letter O with diaeresis, U+00D6 ISOlat1
         map.put("times", '\u00d7'); // multiplication sign, U+00D7 ISOnum
-        map.put("Oslash", '\u00d8'); // latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1
+        map.put("Oslash",
+                '\u00d8'); // latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1
         map.put("Ugrave", '\u00d9'); // latin capital letter U with grave, U+00D9 ISOlat1
         map.put("Uacute", '\u00da'); // latin capital letter U with acute, U+00DA ISOlat1
         map.put("Ucirc", '\u00db'); // latin capital letter U with circumflex, U+00DB ISOlat1
@@ -250,7 +250,7 @@ public static Map getMap() {
         // be used for 'is implied by' as ISOtech suggests
         map.put("uArr", '\u21d1'); // upwards double arrow, U+21D1 ISOamsa
         map.put("rArr", '\u21d2'); // rightwards double arrow, U+21D2 ISOtech
-        // ISO 10646 does not say this is the 'implies' character but does not have 
+        // ISO 10646 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
         map.put("dArr", '\u21d3'); // downwards double arrow, U+21D3 ISOamsa
@@ -294,7 +294,7 @@ public static Map getMap() {
         map.put("ge", '\u2265'); // greater-than or equal to, U+2265 ISOtech
         map.put("sub", '\u2282'); // subset of, U+2282 ISOtech
         map.put("sup", '\u2283'); // superset of, U+2283 ISOtech
-        // note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
+        // note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
         // font encoding and is not included. Should it be, for symmetry?
         // It is in ISOamsn
         map.put("nsub", '\u2284'); // not a subset of, U+2284 ISOamsn
@@ -311,10 +311,10 @@ public static Map getMap() {
         map.put("lfloor", '\u230a'); // left floor = apl downstile, U+230A ISOamsc
         map.put("rfloor", '\u230b'); // right floor, U+230B ISOamsc
         map.put("lang", '\u2329'); // left-pointing angle bracket = bra, U+2329 ISOtech
-        // lang is NOT the same character as U+003C 'less than' 
+        // lang is NOT the same character as U+003C 'less than'
         // or U+2039 'single left-pointing angle quotation mark'
         map.put("rang", '\u232a'); // right-pointing angle bracket = ket, U+232A ISOtech
-        // rang is NOT the same character as U+003E 'greater than' 
+        // rang is NOT the same character as U+003E 'greater than'
         // or U+203A 'single right-pointing angle quotation mark'
         // Geometric Shapes
         map.put("loz", '\u25ca'); // lozenge, U+25CA ISOpub
@@ -365,49 +365,53 @@ public static Map getMap() {
         // rsaquo is proposed but not yet ISO standardized
         map.put("euro", '\u20ac'); // euro sign, U+20AC NEW
     }
-    
+
+    public static Map getMap() {
+        return map;
+    }
 
     /**
      * Translates an entity to a unicode character.
      *
-     * @param    name    the name of the entity
-     * @return    the corresponding unicode character
+     * @param name the name of the entity
+     * @return the corresponding unicode character
      */
     public static char decodeEntity(String name) {
         if (name.startsWith("#x")) {
             try {
-                return (char)Integer.parseInt(name.substring(2),16);
-            }
-            catch(NumberFormatException nfe) {
+                return (char) Integer.parseInt(name.substring(2), 16);
+            } catch (NumberFormatException nfe) {
                 return '\0';
             }
         }
         if (name.startsWith("#")) {
             try {
-                return (char)Integer.parseInt(name.substring(1));
-            }
-            catch(NumberFormatException nfe) {
+                return (char) Integer.parseInt(name.substring(1));
+            } catch (NumberFormatException nfe) {
                 return '\0';
             }
         }
         Character c = map.get(name);
-        if (c == null)
+        if (c == null) {
             return '\0';
-        else
+        } else {
             return c;
+        }
     }
-    
+
     /**
-     * Translates a String with entities {@literal (&...;)} to a String without entities,
-     * replacing the entity with the right (unicode) character.
+     * Translates a String with entities {@literal (&...;)} to a String without entities, replacing the entity with the
+     * right (unicode) character.
      *
      * @param s string to be decoded
      * @return a ddecoded string
      */
     public static String decodeString(String s) {
         int pos_amp = s.indexOf('&');
-        if (pos_amp == -1) return s;
-        
+        if (pos_amp == -1) {
+            return s;
+        }
+
         int pos_sc;
         int pos_a;
         StringBuilder buf = new StringBuilder(s.substring(0, pos_amp));
@@ -430,16 +434,14 @@ public static String decodeString(String s) {
             }
             if (replace == '\0') {
                 buf.append(s, pos_amp, pos_sc + 1);
-            }
-            else {
+            } else {
                 buf.append(replace);
             }
             pos_amp = s.indexOf('&', pos_sc);
             if (pos_amp == -1) {
                 buf.append(s.substring(pos_sc + 1));
                 return buf.toString();
-            }
-            else {
+            } else {
                 buf.append(s, pos_sc + 1, pos_amp);
             }
         }
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/IanaEncodings.java b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/IanaEncodings.java
index c3c69939e..5b19a61e0 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/IanaEncodings.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/IanaEncodings.java
@@ -56,9 +56,9 @@
  * The ASF licenses this file to You 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.
@@ -76,10 +76,12 @@
 
 public class IanaEncodings {
 
-    /** The object that maps IANA to Java encodings. */
+    /**
+     * The object that maps IANA to Java encodings.
+     */
     private static final Map map = new HashMap<>();
 
-    static {        
+    static {
         // add IANA to Java encoding mappings.
         map.put("BIG5", "Big5");
         map.put("CSBIG5", "Big5");
@@ -161,7 +163,7 @@ public class IanaEncodings {
         map.put("ISO-2022-KR", "ISO2022KR");
         map.put("CSISO2022KR", "ISO2022KR");
         map.put("ISO-2022-CN", "ISO2022CN");
-        
+
         map.put("X0201", "JIS0201");
         map.put("CSISO13JISC6220JP", "JIS0201");
         map.put("X0208", "JIS0208");
@@ -174,7 +176,7 @@ public class IanaEncodings {
         map.put("SHIFT_JIS", "SJIS");
         map.put("CSSHIFT_JIS", "SJIS");
         map.put("MS_Kanji", "SJIS");
-        
+
         // Add support for Cp1252 and its friends
         map.put("WINDOWS-1250", "Cp1250");
         map.put("WINDOWS-1251", "Cp1251");
@@ -186,7 +188,7 @@ public class IanaEncodings {
         map.put("WINDOWS-1257", "Cp1257");
         map.put("WINDOWS-1258", "Cp1258");
         map.put("TIS-620", "TIS620");
-        
+
         map.put("ISO-8859-1", "ISO8859_1");
         map.put("ISO-IR-100", "ISO8859_1");
         map.put("ISO_8859-1", "ISO8859_1");
@@ -195,34 +197,34 @@ public class IanaEncodings {
         map.put("L1", "ISO8859_1");
         map.put("IBM819", "ISO8859_1");
         map.put("CP819", "ISO8859_1");
-        
+
         map.put("ISO-8859-2", "ISO8859_2");
         map.put("ISO-IR-101", "ISO8859_2");
         map.put("ISO_8859-2", "ISO8859_2");
         map.put("LATIN2", "ISO8859_2");
         map.put("CSISOLATIN2", "ISO8859_2");
         map.put("L2", "ISO8859_2");
-        
+
         map.put("ISO-8859-3", "ISO8859_3");
         map.put("ISO-IR-109", "ISO8859_3");
         map.put("ISO_8859-3", "ISO8859_3");
         map.put("LATIN3", "ISO8859_3");
         map.put("CSISOLATIN3", "ISO8859_3");
         map.put("L3", "ISO8859_3");
-        
+
         map.put("ISO-8859-4", "ISO8859_4");
         map.put("ISO-IR-110", "ISO8859_4");
         map.put("ISO_8859-4", "ISO8859_4");
         map.put("LATIN4", "ISO8859_4");
         map.put("CSISOLATIN4", "ISO8859_4");
         map.put("L4", "ISO8859_4");
-        
+
         map.put("ISO-8859-5", "ISO8859_5");
         map.put("ISO-IR-144", "ISO8859_5");
         map.put("ISO_8859-5", "ISO8859_5");
         map.put("CYRILLIC", "ISO8859_5");
         map.put("CSISOLATINCYRILLIC", "ISO8859_5");
-        
+
         map.put("ISO-8859-6", "ISO8859_6");
         map.put("ISO-IR-127", "ISO8859_6");
         map.put("ISO_8859-6", "ISO8859_6");
@@ -230,7 +232,7 @@ public class IanaEncodings {
         map.put("ASMO-708", "ISO8859_6");
         map.put("ARABIC", "ISO8859_6");
         map.put("CSISOLATINARABIC", "ISO8859_6");
-        
+
         map.put("ISO-8859-7", "ISO8859_7");
         map.put("ISO-IR-126", "ISO8859_7");
         map.put("ISO_8859-7", "ISO8859_7");
@@ -239,21 +241,21 @@ public class IanaEncodings {
         map.put("GREEK", "ISO8859_7");
         map.put("CSISOLATINGREEK", "ISO8859_7");
         map.put("GREEK8", "ISO8859_7");
-        
+
         map.put("ISO-8859-8", "ISO8859_8");
         map.put("ISO-8859-8-I", "ISO8859_8"); // added since this encoding only differs w.r.t. presentation
         map.put("ISO-IR-138", "ISO8859_8");
         map.put("ISO_8859-8", "ISO8859_8");
         map.put("HEBREW", "ISO8859_8");
         map.put("CSISOLATINHEBREW", "ISO8859_8");
-        
+
         map.put("ISO-8859-9", "ISO8859_9");
         map.put("ISO-IR-148", "ISO8859_9");
         map.put("ISO_8859-9", "ISO8859_9");
         map.put("LATIN5", "ISO8859_9");
         map.put("CSISOLATIN5", "ISO8859_9");
         map.put("L5", "ISO8859_9");
-        
+
         map.put("KOI8-R", "KOI8_R");
         map.put("CSKOI8-R", "KOI8_R");
         map.put("US-ASCII", "ASCII");
@@ -271,18 +273,19 @@ public class IanaEncodings {
         map.put("UTF-16BE", "UnicodeBig");
         map.put("UTF-16LE", "UnicodeLittle");
     }
-    
+
     /**
-     * Gets the java encoding from the IANA encoding. If the encoding cannot be found
-     * it returns the input.
+     * Gets the java encoding from the IANA encoding. If the encoding cannot be found it returns the input.
+     *
      * @param iana the IANA encoding
      * @return the java encoding
-     */    
+     */
     public static String getJavaEncoding(String iana) {
         String IANA = iana.toUpperCase();
         String jdec = map.get(IANA);
-        if (jdec == null)
+        if (jdec == null) {
             jdec = iana;
+        }
         return jdec;
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java
index 0f00c813b..679a2f17f 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java
@@ -50,30 +50,39 @@
 
 /**
  * The handler for the events fired by SimpleXMLParser.
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public interface SimpleXMLDocHandler {
+
     /**
      * Called when a start tag is found.
+     *
      * @param tag the tag name
-     * @param h the tag's attributes
+     * @param h   the tag's attributes
      */
     void startElement(String tag, Map h);
+
     /**
      * Called when an end tag is found.
+     *
      * @param tag the tag name
      */
     void endElement(String tag);
+
     /**
      * Called when the document starts to be parsed.
      */
     void startDocument();
+
     /**
      * Called after the document is parsed.
      */
     void endDocument();
+
     /**
      * Called when a text element is found.
+     *
      * @param str the text element, probably a fragment.
      */
     void text(String str);
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandlerComment.java b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandlerComment.java
index 1d94b2809..8f5484c3a 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandlerComment.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandlerComment.java
@@ -48,11 +48,14 @@
 
 /**
  * The handler for the events fired by SimpleXMLParser.
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public interface SimpleXMLDocHandlerComment {
+
     /**
      * Called when a comment is found.
+     *
      * @param text the comment text
      */
     void comment(String text);
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java
index df276f900..170466d30 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java
@@ -58,8 +58,8 @@
 import java.util.Stack;
 
 /**
- * A simple XML and HTML parser.  This parser is, like the SAX parser,
- * an event based parser, but with much less functionality.
+ * A simple XML and HTML parser.  This parser is, like the SAX parser, an event based parser, but with much less
+ * functionality.
  * 
              
  * The parser can:
  * 
              
@@ -73,7 +73,10 @@
  * 
  */
 public final class SimpleXMLParser {
-    /** possible states */
+
+    /**
+     * possible states
+     */
     private final static int UNKNOWN = 0;
     private final static int TEXT = 1;
     private final static int TAG_ENCOUNTERED = 2;
@@ -89,54 +92,89 @@ public final class SimpleXMLParser {
     private final static int ATTRIBUTE_KEY = 12;
     private final static int ATTRIBUTE_EQUAL = 13;
     private final static int ATTRIBUTE_VALUE = 14;
-    
-    /** the state stack */
+
+    /**
+     * the state stack
+     */
     Stack stack;
-    /** The current character. */
+    /**
+     * The current character.
+     */
     int character = 0;
-    /** The previous character. */
+    /**
+     * The previous character.
+     */
     int previousCharacter = -1;
-    /** the line we are currently reading */
+    /**
+     * the line we are currently reading
+     */
     int lines = 1;
-    /** the column where the current character occurs */
+    /**
+     * the column where the current character occurs
+     */
     int columns = 0;
-    /** was the last character equivalent to a newline? */
+    /**
+     * was the last character equivalent to a newline?
+     */
     boolean eol = false;
     /**
-     * A boolean indicating if the next character should be taken into account
-     * if it's a space character. When nospace is false, the previous character
-     * wasn't whitespace.
+     * A boolean indicating if the next character should be taken into account if it's a space character. When nospace
+     * is false, the previous character wasn't whitespace.
+     *
      * @since 2.1.5
      */
     boolean nowhite = false;
-    /** the current state */
+    /**
+     * the current state
+     */
     int state;
-    /** Are we parsing HTML? */
+    /**
+     * Are we parsing HTML?
+     */
     boolean html;
-    /** current text (whatever is encountered between tags) */
+    /**
+     * current text (whatever is encountered between tags)
+     */
     StringBuffer text = new StringBuffer();
-    /** current entity (whatever is encountered between & and ;) */
+    /**
+     * current entity (whatever is encountered between & and ;)
+     */
     StringBuffer entity = new StringBuffer();
-    /** current tagname */
+    /**
+     * current tagname
+     */
     String tag = null;
-    /** current attributes */
+    /**
+     * current attributes
+     */
     Map attributes = null;
-    /** The handler to which we are going to forward document content */
+    /**
+     * The handler to which we are going to forward document content
+     */
     SimpleXMLDocHandler doc;
-    /** The handler to which we are going to forward comments. */
+    /**
+     * The handler to which we are going to forward comments.
+     */
     SimpleXMLDocHandlerComment comment;
-    /** Keeps track of the number of tags that are open. */
+    /**
+     * Keeps track of the number of tags that are open.
+     */
     int nested = 0;
-    /** the quote character that was used to open the quote. */
+    /**
+     * the quote character that was used to open the quote.
+     */
     int quoteCharacter = '"';
-    /** the attribute key. */
+    /**
+     * the attribute key.
+     */
     String attributekey = null;
-    /** the attribute value. */
+    /**
+     * the attribute value.
+     */
     String attributevalue = null;
-    
+
     /**
-     * Creates a Simple XML parser object.
-     * Call go(BufferedReader) immediately after creation.
+     * Creates a Simple XML parser object. Call go(BufferedReader) immediately after creation.
      */
     private SimpleXMLParser(SimpleXMLDocHandler doc, SimpleXMLDocHandlerComment comment, boolean html) {
         this.doc = doc;
@@ -145,19 +183,143 @@ private SimpleXMLParser(SimpleXMLDocHandler doc, SimpleXMLDocHandlerComment comm
         stack = new Stack<>();
         state = html ? TEXT : UNKNOWN;
     }
-    
+
+    /**
+     * Parses the XML document firing the events to the handler.
+     *
+     * @param doc     the document handler
+     * @param comment {@link SimpleXMLParser#comment}
+     * @param r       the document. The encoding is already resolved. The reader is not closed
+     * @param html    {@link SimpleXMLParser#html}
+     * @throws IOException on error
+     */
+    public static void parse(SimpleXMLDocHandler doc, SimpleXMLDocHandlerComment comment, Reader r, boolean html)
+            throws IOException {
+        SimpleXMLParser parser = new SimpleXMLParser(doc, comment, html);
+        parser.go(r);
+    }
+
+    /**
+     * Detect charset from BOM, as per Unicode FAQ.
+     */
+    private static Optional detectCharsetFromBOM(byte[] bom) {
+        // 00 00 FE FF  UTF-32BE
+        // EF BB BF ..  UTF-8
+        // FE FF .. ..  UTF-16BE
+        // FF FE 00 00  UTF-32LE
+        // FF FE .. ..  UTF-16LE
+        switch (bom[0]) {
+            case (byte) 0x00:
+                if (bom[1] == (byte) 0x00 && bom[2] == (byte) 0xFE && bom[3] == (byte) 0xFF) {
+                    return Optional.of(Charset.forName("UTF-32BE"));
+                }
+                break;
+            case (byte) 0xEF:
+                if (bom[1] == (byte) 0xBB && bom[2] == (byte) 0xBF) {
+                    return Optional.of(StandardCharsets.UTF_8);
+                }
+                break;
+            case (byte) 0xFE:
+                if (bom[1] == (byte) 0xFF) {
+                    return Optional.of(StandardCharsets.UTF_16BE);
+                }
+                break;
+            case (byte) 0xFF:
+                if (bom[1] == (byte) 0xFE) {
+                    if (bom[2] == (byte) 0x00 && bom[3] == (byte) 0x00) {
+                        return Optional.of(Charset.forName("UTF-32LE"));
+                    } else {
+                        return Optional.of(StandardCharsets.UTF_16LE);
+                    }
+                }
+                break;
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Parses the XML document firing the events to the handler.
+     *
+     * @param doc the document handler
+     * @param in  the document. The encoding is deduced from the stream. The stream is not closed
+     * @throws IOException on error
+     */
+    public static void parse(SimpleXMLDocHandler doc, InputStream in) throws IOException {
+        byte[] b4 = new byte[4];
+        int count = in.read(b4);
+        if (count != 4) {
+            throw new IOException(MessageLocalization.getComposedMessage("insufficient.length"));
+        }
+        Charset encoding = detectCharsetFromBOM(b4).orElse(null);
+        if (encoding == null) {
+            StringBuilder sb = new StringBuilder();
+            int c;
+            while ((c = in.read()) != -1) {
+                if (c == '>') {
+                    break;
+                }
+                sb.append((char) c);
+            }
+            String decl = getDeclaredEncoding(sb.toString());
+            if (decl == null) {
+                encoding = StandardCharsets.UTF_8;
+            } else {
+                try {
+                    encoding = Charset.forName(decl);
+                } catch (UnsupportedCharsetException e) {
+                    encoding = Charset.forName(IanaEncodings.getJavaEncoding(decl));
+                }
+            }
+        }
+        parse(doc, new InputStreamReader(in, encoding));
+    }
+
+    private static String getDeclaredEncoding(String decl) {
+        if (decl == null) {
+            return null;
+        }
+        int idx = decl.indexOf("encoding");
+        if (idx < 0) {
+            return null;
+        }
+        int idx1 = decl.indexOf('"', idx);
+        int idx2 = decl.indexOf('\'', idx);
+        if (idx1 == idx2) {
+            return null;
+        }
+        if ((idx1 < 0 && idx2 > 0) || (idx2 > 0 && idx2 < idx1)) {
+            int idx3 = decl.indexOf('\'', idx2 + 1);
+            if (idx3 < 0) {
+                return null;
+            }
+            return decl.substring(idx2 + 1, idx3);
+        }
+        if ((idx2 < 0 && idx1 > 0) || (idx1 > 0 && idx1 < idx2)) {
+            int idx3 = decl.indexOf('"', idx1 + 1);
+            if (idx3 < 0) {
+                return null;
+            }
+            return decl.substring(idx1 + 1, idx3);
+        }
+        return null;
+    }
+
+    public static void parse(SimpleXMLDocHandler doc, Reader r) throws IOException {
+        parse(doc, null, r, false);
+    }
+
     /**
-     * Does the actual parsing. Perform this immediately
-     * after creating the parser object.
+     * Does the actual parsing. Perform this immediately after creating the parser object.
      */
     private void go(Reader r) throws IOException {
         BufferedReader reader;
-        if (r instanceof BufferedReader)
-            reader = (BufferedReader)r;
-        else
+        if (r instanceof BufferedReader) {
+            reader = (BufferedReader) r;
+        } else {
             reader = new BufferedReader(r);
+        }
         doc.startDocument();
-        while(true) {
+        while (true) {
             // read a new character
             if (previousCharacter == -1) {
                 character = reader.read();
@@ -167,19 +329,20 @@ private void go(Reader r) throws IOException {
                 character = previousCharacter;
                 previousCharacter = -1;
             }
-            
+
             // the end of the file was reached
             if (character == -1) {
                 if (html) {
-                    if (html && state == TEXT)
+                    if (html && state == TEXT) {
                         flush();
+                    }
                     doc.endDocument();
                 } else {
                     throwException(MessageLocalization.getComposedMessage("missing.end.tag"));
                 }
                 return;
             }
-            
+
             // dealing with  \n and \r
             if (character == '\n' && eol) {
                 eol = false;
@@ -197,313 +360,327 @@ private void go(Reader r) throws IOException {
             } else {
                 columns++;
             }
-            
-            switch(state) {
-            // we are in an unknown state before there's actual content
-            case UNKNOWN:
-                if(character == '<') {
-                    saveState(TEXT);
-                    state = TAG_ENCOUNTERED;
-                }
-                break;
-            // we can encounter any content
-            case TEXT:
-                if(character == '<') {
-                    flush();
-                    saveState(state);
-                    state = TAG_ENCOUNTERED;
-                } else if(character == '&') {
-                    saveState(state);
-                    entity.setLength(0);
-                    state = ENTITY;
-                    nowhite = true;
-                } else if (Character.isWhitespace((char)character)) {
-                    if (nowhite)
-                        text.append((char)character);
-                    nowhite = false;
-                } else {
-                    text.append((char)character);
-                    nowhite = true;
-                }
-                break;
-            // we have just seen a < and are wondering what we are looking at
-            // , , , etc.
-            case TAG_ENCOUNTERED:
-                initTag();
-                if(character == '/') {
-                    state = IN_CLOSETAG;
-                } else if (character == '?') {
-                    restoreState();
-                    state = PI;
-                } else {
-                    text.append((char)character);
-                    state = EXAMIN_TAG;
-                }
-                break;
-            // we are processing something like this .
-            // It could still be a  or something.
-            case EXAMIN_TAG:
-                if(character == '>') {
-                    doTag();
-                    processTag(true);
-                    initTag();
-                    state = restoreState();
-                } else if(character == '/') {
-                    state = SINGLE_TAG;
-                } else if(character == '-' && text.toString().equals("!-")) {
-                    flush();
-                    state = COMMENT;
-                } else if(character == '[' && text.toString().equals("![CDATA")) {
-                    flush();
-                    state = CDATA;
-                } else if(character == 'E' && text.toString().equals("!DOCTYP")) {
-                    flush();
-                    state = PI;
-                } else if(Character.isWhitespace((char)character)) {
-                    doTag();
-                    state = TAG_EXAMINED;
-                } else {
-                    text.append((char)character);
-                }
-                break;
-            // we know the name of the tag now.
-            case TAG_EXAMINED:
-                if(character == '>') {
-                    processTag(true);
+
+            switch (state) {
+                // we are in an unknown state before there's actual content
+                case UNKNOWN:
+                    if (character == '<') {
+                        saveState(TEXT);
+                        state = TAG_ENCOUNTERED;
+                    }
+                    break;
+                // we can encounter any content
+                case TEXT:
+                    if (character == '<') {
+                        flush();
+                        saveState(state);
+                        state = TAG_ENCOUNTERED;
+                    } else if (character == '&') {
+                        saveState(state);
+                        entity.setLength(0);
+                        state = ENTITY;
+                        nowhite = true;
+                    } else if (Character.isWhitespace((char) character)) {
+                        if (nowhite) {
+                            text.append((char) character);
+                        }
+                        nowhite = false;
+                    } else {
+                        text.append((char) character);
+                        nowhite = true;
+                    }
+                    break;
+                // we have just seen a < and are wondering what we are looking at
+                // , , , etc.
+                case TAG_ENCOUNTERED:
                     initTag();
-                    state = restoreState();
-                } else if(character == '/') {
-                    state = SINGLE_TAG;
-                } else if(Character.isWhitespace((char)character)) {
-                    // empty
-                } else {
-                    text.append((char)character);
-                    state = ATTRIBUTE_KEY;
-                }
-                break;
-                
+                    if (character == '/') {
+                        state = IN_CLOSETAG;
+                    } else if (character == '?') {
+                        restoreState();
+                        state = PI;
+                    } else {
+                        text.append((char) character);
+                        state = EXAMIN_TAG;
+                    }
+                    break;
+                // we are processing something like this .
+                // It could still be a  or something.
+                case EXAMIN_TAG:
+                    if (character == '>') {
+                        doTag();
+                        processTag(true);
+                        initTag();
+                        state = restoreState();
+                    } else if (character == '/') {
+                        state = SINGLE_TAG;
+                    } else if (character == '-' && text.toString().equals("!-")) {
+                        flush();
+                        state = COMMENT;
+                    } else if (character == '[' && text.toString().equals("![CDATA")) {
+                        flush();
+                        state = CDATA;
+                    } else if (character == 'E' && text.toString().equals("!DOCTYP")) {
+                        flush();
+                        state = PI;
+                    } else if (Character.isWhitespace((char) character)) {
+                        doTag();
+                        state = TAG_EXAMINED;
+                    } else {
+                        text.append((char) character);
+                    }
+                    break;
+                // we know the name of the tag now.
+                case TAG_EXAMINED:
+                    if (character == '>') {
+                        processTag(true);
+                        initTag();
+                        state = restoreState();
+                    } else if (character == '/') {
+                        state = SINGLE_TAG;
+                    } else if (Character.isWhitespace((char) character)) {
+                        // empty
+                    } else {
+                        text.append((char) character);
+                        state = ATTRIBUTE_KEY;
+                    }
+                    break;
+
                 // we are processing a closing tag: e.g. 
-            case IN_CLOSETAG:
-                if(character == '>') {
+                case IN_CLOSETAG:
+                    if (character == '>') {
+                        doTag();
+                        processTag(false);
+                        if (!html && nested == 0) {
+                            return;
+                        }
+                        state = restoreState();
+                    } else {
+                        if (!Character.isWhitespace((char) character)) {
+                            text.append((char) character);
+                        }
+                    }
+                    break;
+
+                // we have just seen something like this: .
+                case SINGLE_TAG:
+                    if (character != '>') {
+                        throwException(MessageLocalization.getComposedMessage("expected.gt.for.tag.lt.1.gt", tag));
+                    }
                     doTag();
-                    processTag(false);
-                    if(!html && nested==0) return;
-                    state = restoreState();
-                } else {
-                    if (!Character.isWhitespace((char)character))
-                        text.append((char)character);
-                }
-                break;
-                
-            // we have just seen something like this: .
-            case SINGLE_TAG:
-                if(character != '>')
-                    throwException(MessageLocalization.getComposedMessage("expected.gt.for.tag.lt.1.gt", tag));
-                doTag();
-                processTag(true);
-                processTag(false);
-                initTag();
-                if(!html && nested==0) {
-                    doc.endDocument();
-                    return;
-                }
-                state = restoreState();
-                break;
-                
-            // we are processing CDATA
-            case CDATA:
-                if(character == '>'
-                && text.toString().endsWith("]]")) {
-                    text.setLength(text.length()-2);
-                    flush();
-                    state = restoreState();
-                } else
-                    text.append((char)character);
-                break;
-                
-            // we are processing a comment.  We are inside
-            // the  looking for the -->.
-            case COMMENT:
-                if(character == '>'
-                && text.toString().endsWith("--")) {
-                    text.setLength(text.length() - 2);
-                    flush();
-                    state = restoreState();
-                } else
-                    text.append((char)character);
-                break;
-                
-            // We are inside one of these  or one of these 
-            case PI:
-                if(character == '>') {
-                    state = restoreState();
-                    if(state == TEXT) state = UNKNOWN;
-                }
-                break;
-                
-            // we are processing an entity, e.g. <, », etc.
-            case ENTITY:
-                if(character == ';') {
-                    state = restoreState();
-                    String cent = entity.toString();
-                    entity.setLength(0);
-                    char ce = EntitiesToUnicode.decodeEntity(cent);
-                    if (ce == '\0')
-                        text.append('&').append(cent).append(';');
-                    else
-                        text.append(ce);
-                } else if ((character != '#' && (character < '0' || character > '9') && (character < 'a' || character > 'z')
-                    && (character < 'A' || character > 'Z')) || entity.length() >= 7) {
-                    state = restoreState();
-                    previousCharacter = character;
-                    text.append('&').append(entity.toString());
-                    entity.setLength(0);
-                }
-                else {
-                    entity.append((char)character);
-                }
-                break;
-            // We are processing the quoted right-hand side of an element's attribute.
-            case QUOTE:
-                if (html && quoteCharacter == ' ' && character == '>') {
-                    flush();
-                    processTag(true);
-                    initTag();
-                    state = restoreState();
-                }
-                else if (html && quoteCharacter == ' ' && Character.isWhitespace((char)character)) {
-                    flush();
-                    state = TAG_EXAMINED;
-                }
-                else if (html && quoteCharacter == ' ') {
-                    text.append((char) character);
-                } else if (character == quoteCharacter) {
-                    flush();
-                    state = TAG_EXAMINED;
-                } else if (" \r\n\t".indexOf(character) >= 0) {
-                    text.append(' ');
-                } else if (character == '&') {
-                    saveState(state);
-                    state = ENTITY;
-                    entity.setLength(0);
-                } else {
-                    text.append((char) character);
-                }
-                break;
-                
-            case ATTRIBUTE_KEY:
-                if(Character.isWhitespace((char)character)) {
-                    flush();
-                    state = ATTRIBUTE_EQUAL;
-                } else if(character == '=') {
-                    flush();
-                    state = ATTRIBUTE_VALUE;
-                } else if (html && character == '>') {
-                    text.setLength(0);
-                    processTag(true);
-                    initTag();
-                    state = restoreState();
-                } else {
-                    text.append((char)character);
-                }
-                break;
-                
-            case ATTRIBUTE_EQUAL:
-                if(character == '=') {
-                    state = ATTRIBUTE_VALUE;
-                } else if(Character.isWhitespace((char)character)) {
-                    // empty
-                } else if (html && character == '>') {
-                    text.setLength(0);
-                    processTag(true);
-                    initTag();
-                    state = restoreState();
-                } else if (html && character == '/') {
-                    flush();
-                    state = SINGLE_TAG;
-                } else if (html) {
-                    flush();
-                    text.append((char)character);
-                    state = ATTRIBUTE_KEY;
-                } else {
-                    throwException(MessageLocalization.getComposedMessage("error.in.attribute.processing"));
-                }
-                break;
-                
-            case ATTRIBUTE_VALUE:
-                if(character == '"' || character == '\'') {
-                    quoteCharacter = character;
-                    state = QUOTE;
-                } else if(Character.isWhitespace((char)character)) {
-                    // empty
-                } else if (html && character == '>') {
-                    flush();
                     processTag(true);
+                    processTag(false);
                     initTag();
+                    if (!html && nested == 0) {
+                        doc.endDocument();
+                        return;
+                    }
                     state = restoreState();
-                } else if (html) {
-                    text.append((char)character);
-                    quoteCharacter = ' ';
-                    state = QUOTE;
-                } else {
-                    throwException(MessageLocalization.getComposedMessage("error.in.attribute.processing"));
-                }
-                break;
+                    break;
+
+                // we are processing CDATA
+                case CDATA:
+                    if (character == '>'
+                            && text.toString().endsWith("]]")) {
+                        text.setLength(text.length() - 2);
+                        flush();
+                        state = restoreState();
+                    } else {
+                        text.append((char) character);
+                    }
+                    break;
+
+                // we are processing a comment.  We are inside
+                // the  looking for the -->.
+                case COMMENT:
+                    if (character == '>'
+                            && text.toString().endsWith("--")) {
+                        text.setLength(text.length() - 2);
+                        flush();
+                        state = restoreState();
+                    } else {
+                        text.append((char) character);
+                    }
+                    break;
+
+                // We are inside one of these  or one of these 
+                case PI:
+                    if (character == '>') {
+                        state = restoreState();
+                        if (state == TEXT) {
+                            state = UNKNOWN;
+                        }
+                    }
+                    break;
+
+                // we are processing an entity, e.g. <, », etc.
+                case ENTITY:
+                    if (character == ';') {
+                        state = restoreState();
+                        String cent = entity.toString();
+                        entity.setLength(0);
+                        char ce = EntitiesToUnicode.decodeEntity(cent);
+                        if (ce == '\0') {
+                            text.append('&').append(cent).append(';');
+                        } else {
+                            text.append(ce);
+                        }
+                    } else if ((character != '#' && (character < '0' || character > '9') && (character < 'a'
+                            || character > 'z')
+                            && (character < 'A' || character > 'Z')) || entity.length() >= 7) {
+                        state = restoreState();
+                        previousCharacter = character;
+                        text.append('&').append(entity.toString());
+                        entity.setLength(0);
+                    } else {
+                        entity.append((char) character);
+                    }
+                    break;
+                // We are processing the quoted right-hand side of an element's attribute.
+                case QUOTE:
+                    if (html && quoteCharacter == ' ' && character == '>') {
+                        flush();
+                        processTag(true);
+                        initTag();
+                        state = restoreState();
+                    } else if (html && quoteCharacter == ' ' && Character.isWhitespace((char) character)) {
+                        flush();
+                        state = TAG_EXAMINED;
+                    } else if (html && quoteCharacter == ' ') {
+                        text.append((char) character);
+                    } else if (character == quoteCharacter) {
+                        flush();
+                        state = TAG_EXAMINED;
+                    } else if (" \r\n\t".indexOf(character) >= 0) {
+                        text.append(' ');
+                    } else if (character == '&') {
+                        saveState(state);
+                        state = ENTITY;
+                        entity.setLength(0);
+                    } else {
+                        text.append((char) character);
+                    }
+                    break;
+
+                case ATTRIBUTE_KEY:
+                    if (Character.isWhitespace((char) character)) {
+                        flush();
+                        state = ATTRIBUTE_EQUAL;
+                    } else if (character == '=') {
+                        flush();
+                        state = ATTRIBUTE_VALUE;
+                    } else if (html && character == '>') {
+                        text.setLength(0);
+                        processTag(true);
+                        initTag();
+                        state = restoreState();
+                    } else {
+                        text.append((char) character);
+                    }
+                    break;
+
+                case ATTRIBUTE_EQUAL:
+                    if (character == '=') {
+                        state = ATTRIBUTE_VALUE;
+                    } else if (Character.isWhitespace((char) character)) {
+                        // empty
+                    } else if (html && character == '>') {
+                        text.setLength(0);
+                        processTag(true);
+                        initTag();
+                        state = restoreState();
+                    } else if (html && character == '/') {
+                        flush();
+                        state = SINGLE_TAG;
+                    } else if (html) {
+                        flush();
+                        text.append((char) character);
+                        state = ATTRIBUTE_KEY;
+                    } else {
+                        throwException(MessageLocalization.getComposedMessage("error.in.attribute.processing"));
+                    }
+                    break;
+
+                case ATTRIBUTE_VALUE:
+                    if (character == '"' || character == '\'') {
+                        quoteCharacter = character;
+                        state = QUOTE;
+                    } else if (Character.isWhitespace((char) character)) {
+                        // empty
+                    } else if (html && character == '>') {
+                        flush();
+                        processTag(true);
+                        initTag();
+                        state = restoreState();
+                    } else if (html) {
+                        text.append((char) character);
+                        quoteCharacter = ' ';
+                        state = QUOTE;
+                    } else {
+                        throwException(MessageLocalization.getComposedMessage("error.in.attribute.processing"));
+                    }
+                    break;
             }
         }
     }
 
     /**
      * Gets a state from the stack
+     *
      * @return the previous state
      */
     private int restoreState() {
-        if(!stack.empty())
+        if (!stack.empty()) {
             return stack.pop();
-        else
+        } else {
             return UNKNOWN;
+        }
     }
+
     /**
      * Adds a state to the stack.
-     * @param    s    a state to add to the stack
+     *
+     * @param s a state to add to the stack
      */
     private void saveState(int s) {
         stack.push(s);
     }
+
     /**
-     * Flushes the text that is currently in the buffer.
-     * The text can be ignored, added to the document
-     * as content or as comment,... depending on the current state.
+     * Flushes the text that is currently in the buffer. The text can be ignored, added to the document as content or as
+     * comment,... depending on the current state.
      */
     private void flush() {
-        switch(state){
-        case TEXT:
-        case CDATA:
-            if(text.length() > 0) {
-                doc.text(text.toString());
-            }
-            break;
-        case COMMENT:
-            if (comment != null) {
-                comment.comment(text.toString());
-            }
-            break;
-        case ATTRIBUTE_KEY:
-            attributekey = text.toString();
-            if (html)
-                attributekey = attributekey.toLowerCase();
-            break;
-        case QUOTE:
-        case ATTRIBUTE_VALUE:
-            attributevalue = text.toString();
-            attributes.put(attributekey, attributevalue);
-            break;
-        default:
-            // do nothing
+        switch (state) {
+            case TEXT:
+            case CDATA:
+                if (text.length() > 0) {
+                    doc.text(text.toString());
+                }
+                break;
+            case COMMENT:
+                if (comment != null) {
+                    comment.comment(text.toString());
+                }
+                break;
+            case ATTRIBUTE_KEY:
+                attributekey = text.toString();
+                if (html) {
+                    attributekey = attributekey.toLowerCase();
+                }
+                break;
+            case QUOTE:
+            case ATTRIBUTE_VALUE:
+                attributevalue = text.toString();
+                attributes.put(attributekey, attributevalue);
+                break;
+            default:
+                // do nothing
         }
         text.setLength(0);
     }
+
     /**
      * Initialized the tag name and attributes.
      */
@@ -511,138 +688,41 @@ private void initTag() {
         tag = null;
         attributes = new HashMap<>();
     }
-    /** Sets the name of the tag. */
+
+    /**
+     * Sets the name of the tag.
+     */
     private void doTag() {
-        if(tag == null)
+        if (tag == null) {
             tag = text.toString();
-        if (html)
+        }
+        if (html) {
             tag = tag.toLowerCase();
+        }
         text.setLength(0);
     }
+
     /**
      * processes the tag.
-     * @param start    if true we are dealing with a tag that has just been opened; if false we are closing a tag.
+     *
+     * @param start if true we are dealing with a tag that has just been opened; if false we are closing a tag.
      */
     private void processTag(boolean start) {
         if (start) {
             nested++;
             doc.startElement(tag, attributes);
-        }
-        else {
+        } else {
             nested--;
             doc.endElement(tag);
         }
     }
-    /** Throws an exception */
-    private void throwException(String s) throws IOException {
-        throw new IOException(MessageLocalization.getComposedMessage("1.near.line.2.column.3", s, String.valueOf(lines), String.valueOf(columns)));
-    }
-    
-    /**
-     * Parses the XML document firing the events to the handler.
-     * @param doc the document handler
-     * @param comment {@link SimpleXMLParser#comment}
-     * @param r the document. The encoding is already resolved. The reader is not closed
-     * @param html {@link SimpleXMLParser#html}
-     * @throws IOException on error
-     */
-    public static void parse(SimpleXMLDocHandler doc, SimpleXMLDocHandlerComment comment, Reader r, boolean html) throws IOException {
-        SimpleXMLParser parser = new SimpleXMLParser(doc, comment, html);
-        parser.go(r);
-    }
-
-    /** Detect charset from BOM, as per Unicode FAQ. */
-    private static Optional detectCharsetFromBOM(byte[] bom) {
-        // 00 00 FE FF  UTF-32BE
-        // EF BB BF ..  UTF-8
-        // FE FF .. ..  UTF-16BE
-        // FF FE 00 00  UTF-32LE
-        // FF FE .. ..  UTF-16LE
-        switch (bom[0]) {
-            case (byte) 0x00:
-                if (bom[1] == (byte) 0x00 && bom[2] == (byte) 0xFE && bom[3] == (byte) 0xFF)
-                    return Optional.of(Charset.forName("UTF-32BE"));
-                break;
-            case (byte) 0xEF:
-                if (bom[1] == (byte) 0xBB && bom[2] == (byte) 0xBF)
-                    return Optional.of(StandardCharsets.UTF_8);
-                break;
-            case (byte) 0xFE:
-                if (bom[1] == (byte) 0xFF)
-                    return Optional.of(StandardCharsets.UTF_16BE);
-                break;
-            case (byte) 0xFF:
-                if (bom[1] == (byte) 0xFE) {
-                    if (bom[2] == (byte) 0x00 && bom[3] == (byte) 0x00)
-                        return Optional.of(Charset.forName("UTF-32LE"));
-                    else
-                        return Optional.of(StandardCharsets.UTF_16LE);
-                }
-                break;
-        }
-        return Optional.empty();
-    }
 
     /**
-     * Parses the XML document firing the events to the handler.
-     * @param doc the document handler
-     * @param in the document. The encoding is deduced from the stream. The stream is not closed
-     * @throws IOException on error
-     */    
-    public static void parse(SimpleXMLDocHandler doc, InputStream in) throws IOException {
-        byte[] b4 = new byte[4];
-        int count = in.read(b4);
-        if (count != 4)
-            throw new IOException(MessageLocalization.getComposedMessage("insufficient.length"));
-        Charset encoding = detectCharsetFromBOM(b4).orElse(null);
-        if (encoding == null) {
-            StringBuilder sb = new StringBuilder();
-            int c;
-            while ((c = in.read()) != -1) {
-                if (c == '>')
-                    break;
-                sb.append((char)c);
-            }
-            String decl = getDeclaredEncoding(sb.toString());
-            if (decl == null)
-                encoding = StandardCharsets.UTF_8;
-            else
-                try {
-                    encoding = Charset.forName(decl);
-                } catch (UnsupportedCharsetException e) {
-                    encoding = Charset.forName(IanaEncodings.getJavaEncoding(decl));
-                }
-        }
-        parse(doc, new InputStreamReader(in, encoding));
-    }
-    
-    private static String getDeclaredEncoding(String decl) {
-        if (decl == null)
-            return null;
-        int idx = decl.indexOf("encoding");
-        if (idx < 0)
-            return null;
-        int idx1 = decl.indexOf('"', idx);
-        int idx2 = decl.indexOf('\'', idx);
-        if (idx1 == idx2)
-            return null;
-        if ((idx1 < 0 && idx2 > 0) || (idx2 > 0 && idx2 < idx1)) {
-            int idx3 = decl.indexOf('\'', idx2 + 1);
-            if (idx3 < 0)
-                return null;
-            return decl.substring(idx2 + 1, idx3);
-        }
-        if ((idx2 < 0 && idx1 > 0) || (idx1 > 0 && idx1 < idx2)) {
-            int idx3 = decl.indexOf('"', idx1 + 1);
-            if (idx3 < 0)
-                return null;
-            return decl.substring(idx1 + 1, idx3);
-        }
-        return null;
-    }
-    
-    public static void parse(SimpleXMLDocHandler doc,Reader r) throws IOException {
-        parse(doc, null, r, false);
+     * Throws an exception
+     */
+    private void throwException(String s) throws IOException {
+        throw new IOException(MessageLocalization.getComposedMessage("1.near.line.2.column.3", s, String.valueOf(lines),
+                String.valueOf(columns)));
     }
 
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/DublinCoreSchema.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/DublinCoreSchema.java
index 3988925ad..be9ac932e 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/DublinCoreSchema.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/DublinCoreSchema.java
@@ -30,7 +30,7 @@
  * the MPL, indicate your decision by deleting the provisions above and
  * replace them with the notice and other provisions required by the LGPL.
  * If you do not delete the provisions above, a recipient may use your version
- * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE 
+ * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the MPL as stated above or under the terms of the GNU
@@ -57,51 +57,87 @@
  */
 public class DublinCoreSchema extends XmpSchema {
 
-    private static final long serialVersionUID = -4551741356374797330L;
-    /** default namespace identifier*/
+    /**
+     * default namespace identifier
+     */
     public static final String DEFAULT_XPATH_ID = "dc";
-    /** default namespace uri*/
+    /**
+     * default namespace uri
+     */
     public static final String DEFAULT_XPATH_URI = "http://purl.org/dc/elements/1.1/";
-    
-    /** External Contributors to the resource (other than the authors). */
+    /**
+     * External Contributors to the resource (other than the authors).
+     */
     public static final String CONTRIBUTOR = "dc:contributor";
-    /** The extent or scope of the resource. */
+    /**
+     * The extent or scope of the resource.
+     */
     public static final String COVERAGE = "dc:coverage";
-    /** The authors of the resource (listed in order of precedence, if significant). */
+    /**
+     * The authors of the resource (listed in order of precedence, if significant).
+     */
     public static final String CREATOR = "dc:creator";
-    /** Date(s) that something interesting happened to the resource. */
+    /**
+     * Date(s) that something interesting happened to the resource.
+     */
     public static final String DATE = "dc:date";
-    /** A textual description of the content of the resource. Multiple values may be present for different languages. */
+    /**
+     * A textual description of the content of the resource. Multiple values may be present for different languages.
+     */
     public static final String DESCRIPTION = "dc:description";
-    /** The file format used when saving the resource. Tools and applications should set this property to the save format of the data. It may include appropriate qualifiers. */
+    /**
+     * The file format used when saving the resource. Tools and applications should set this property to the save format
+     * of the data. It may include appropriate qualifiers.
+     */
     public static final String FORMAT = "dc:format";
-    /** Unique identifier of the resource. */
+    /**
+     * Unique identifier of the resource.
+     */
     public static final String IDENTIFIER = "dc:identifier";
-    /** An unordered array specifying the languages used in the    resource. */
+    /**
+     * An unordered array specifying the languages used in the    resource.
+     */
     public static final String LANGUAGE = "dc:language";
-    /** Publishers. */
+    /**
+     * Publishers.
+     */
     public static final String PUBLISHER = "dc:publisher";
-    /** Relationships to other documents. */
+    /**
+     * Relationships to other documents.
+     */
     public static final String RELATION = "dc:relation";
-    /** Informal rights statement, selected by language. */
+    /**
+     * Informal rights statement, selected by language.
+     */
     public static final String RIGHTS = "dc:rights";
-    /** Unique identifier of the work from which this resource was derived. */
+    /**
+     * Unique identifier of the work from which this resource was derived.
+     */
     public static final String SOURCE = "dc:source";
-    /** An unordered array of descriptive phrases or keywords that specify the topic of the content of the resource. */
+    /**
+     * An unordered array of descriptive phrases or keywords that specify the topic of the content of the resource.
+     */
     public static final String SUBJECT = "dc:subject";
-    /** The title of the document, or the name given to the resource. Typically, it will be a name by which the resource is formally known. */
+    /**
+     * The title of the document, or the name given to the resource. Typically, it will be a name by which the resource
+     * is formally known.
+     */
     public static final String TITLE = "dc:title";
-    /** A document type; for example, novel, poem, or working paper. */
+    /**
+     * A document type; for example, novel, poem, or working paper.
+     */
     public static final String TYPE = "dc:type";
+    private static final long serialVersionUID = -4551741356374797330L;
+
 
-    
     public DublinCoreSchema() {
         super("xmlns:" + DEFAULT_XPATH_ID + "=\"" + DEFAULT_XPATH_URI + "\"");
         setProperty(FORMAT, "application/pdf");
     }
-    
+
     /**
      * Adds a title.
+     *
      * @param title title
      */
     public void addTitle(String title) {
@@ -112,6 +148,7 @@ public void addTitle(String title) {
 
     /**
      * Adds a description.
+     *
      * @param desc description
      */
     public void addDescription(String desc) {
@@ -122,6 +159,7 @@ public void addDescription(String desc) {
 
     /**
      * Adds a subject.
+     *
      * @param subject subject
      */
     public void addSubject(String subject) {
@@ -130,9 +168,10 @@ public void addSubject(String subject) {
         setProperty(SUBJECT, array);
     }
 
-    
+
     /**
      * Adds a subject.
+     *
      * @param subject array of subjects
      */
     public void addSubject(String[] subject) {
@@ -140,9 +179,10 @@ public void addSubject(String[] subject) {
         array.addAll(Arrays.asList(subject));
         setProperty(SUBJECT, array);
     }
-    
+
     /**
      * Adds a single author.
+     *
      * @param author author name
      */
     public void addAuthor(String author) {
@@ -153,6 +193,7 @@ public void addAuthor(String author) {
 
     /**
      * Adds an array of authors.
+     *
      * @param author author names arrays
      */
     public void addAuthor(String[] author) {
@@ -163,6 +204,7 @@ public void addAuthor(String[] author) {
 
     /**
      * Adds a single publisher.
+     *
      * @param publisher publisher name
      */
     public void addPublisher(String publisher) {
@@ -173,6 +215,7 @@ public void addPublisher(String publisher) {
 
     /**
      * Adds an array of publishers.
+     *
      * @param publisher publishers array
      */
     public void addPublisher(String[] publisher) {
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/LangAlt.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/LangAlt.java
index 3650959c4..f73dd59c8 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/LangAlt.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/LangAlt.java
@@ -30,7 +30,7 @@
  * the MPL, indicate your decision by deleting the provisions above and
  * replace them with the notice and other provisions required by the LGPL.
  * If you do not delete the provisions above, a recipient may use your version
- * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE 
+ * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the MPL as stated above or under the terms of the GNU
@@ -54,23 +54,28 @@
 
 public class LangAlt extends Properties {
 
-    /** A serial version id. */
-    private static final long serialVersionUID = 4396971487200843099L;
-    
-    /** Key for the default language. */
+    /**
+     * Key for the default language.
+     */
     public static final String DEFAULT = "x-default";
+    /**
+     * A serial version id.
+     */
+    private static final long serialVersionUID = 4396971487200843099L;
 
     /**
      * Creates a Properties object that stores languages for use in an XmpSchema
      *
-     * @param defaultValue  default value
+     * @param defaultValue default value
      */
     public LangAlt(String defaultValue) {
         super();
         addLanguage(DEFAULT, defaultValue);
     }
 
-    /** Creates a Properties object that stores languages for use in an XmpSchema */
+    /**
+     * Creates a Properties object that stores languages for use in an XmpSchema
+     */
     public LangAlt() {
         super();
     }
@@ -79,7 +84,7 @@ public LangAlt() {
      * Add a language.
      *
      * @param language language
-     * @param value value
+     * @param value    value
      */
     public void addLanguage(String language, String value) {
         setProperty(language, XmpSchema.escape(value));
@@ -88,7 +93,7 @@ public void addLanguage(String language, String value) {
     /**
      * Process a property.
      *
-     * @param buf buffer
+     * @param buf  buffer
      * @param lang object
      */
     protected void process(StringBuffer buf, Object lang) {
@@ -105,7 +110,7 @@ protected void process(StringBuffer buf, Object lang) {
     public synchronized String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("");
-        for (Enumeration e = this.propertyNames(); e.hasMoreElements();) {
+        for (Enumeration e = this.propertyNames(); e.hasMoreElements(); ) {
             process(sb, e.nextElement());
         }
         sb.append("");
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/PdfA1Schema.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/PdfA1Schema.java
index 7ce6de6db..746c1e873 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/PdfA1Schema.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/PdfA1Schema.java
@@ -53,33 +53,42 @@
  * An implementation of an XmpSchema.
  */
 public class PdfA1Schema extends XmpSchema {
-    
-    private static final long serialVersionUID = 5300646133692948168L;
-    /** default namespace identifier*/
+
+    /**
+     * default namespace identifier
+     */
     public static final String DEFAULT_XPATH_ID = "pdfaid";
-    /** default namespace uri*/
+    /**
+     * default namespace uri
+     */
     public static final String DEFAULT_XPATH_URI = "http://www.aiim.org/pdfa/ns/id/";
-    
-    /** Part, always 1. */
+    /**
+     * Part, always 1.
+     */
     public static final String PART = "pdfaid:part";
-    /** Conformance, A or B. */
+    /**
+     * Conformance, A or B.
+     */
     public static final String CONFORMANCE = "pdfaid:conformance";
-    
+    private static final long serialVersionUID = 5300646133692948168L;
+
     public PdfA1Schema() {
         super("xmlns:" + DEFAULT_XPATH_ID + "=\"" + DEFAULT_XPATH_URI + "\"");
         addPart("1");
     }
-    
+
     /**
      * Adds part.
+     *
      * @param part part
      */
     public void addPart(String part) {
         setProperty(PART, part);
     }
-    
+
     /**
      * Adds the conformance.
+     *
      * @param conformance conformance
      */
     public void addConformance(String conformance) {
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/PdfSchema.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/PdfSchema.java
index bf7ad2f90..455c4b603 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/PdfSchema.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/PdfSchema.java
@@ -30,7 +30,7 @@
  * the MPL, indicate your decision by deleting the provisions above and
  * replace them with the notice and other provisions required by the LGPL.
  * If you do not delete the provisions above, a recipient may use your version
- * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE 
+ * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the MPL as stated above or under the terms of the GNU
@@ -56,35 +56,46 @@
  */
 public class PdfSchema extends XmpSchema {
 
-    private static final long serialVersionUID = -1541148669123992185L;
-    /** default namespace identifier*/
+    /**
+     * default namespace identifier
+     */
     public static final String DEFAULT_XPATH_ID = "pdf";
-    /** default namespace uri*/
+    /**
+     * default namespace uri
+     */
     public static final String DEFAULT_XPATH_URI = "http://ns.adobe.com/pdf/1.3/";
-    
-    /** Keywords. */
+    /**
+     * Keywords.
+     */
     public static final String KEYWORDS = "pdf:keywords";
-    /** The PDF file version (for example: 1.0, 1.3, and so on). */
+    /**
+     * The PDF file version (for example: 1.0, 1.3, and so on).
+     */
     public static final String VERSION = "pdf:PDFVersion";
-    /** The Producer. */
+    /**
+     * The Producer.
+     */
     public static final String PRODUCER = "pdf:Producer";
+    private static final long serialVersionUID = -1541148669123992185L;
 
 
     public PdfSchema() {
         super("xmlns:" + DEFAULT_XPATH_ID + "=\"" + DEFAULT_XPATH_URI + "\"");
         addProducer(Document.getVersion());
     }
-    
+
     /**
      * Adds keywords.
+     *
      * @param keywords the keywords
      */
     public void addKeywords(String keywords) {
         setProperty(KEYWORDS, keywords);
     }
-    
+
     /**
      * Adds the producer.
+     *
      * @param producer the producer
      */
     public void addProducer(String producer) {
@@ -93,6 +104,7 @@ public void addProducer(String producer) {
 
     /**
      * Adds the version.
+     *
      * @param version the version
      */
     public void addVersion(String version) {
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpArray.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpArray.java
index f2ece5998..bbd57acae 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpArray.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpArray.java
@@ -30,7 +30,7 @@
  * the MPL, indicate your decision by deleting the provisions above and
  * replace them with the notice and other provisions required by the LGPL.
  * If you do not delete the provisions above, a recipient may use your version
- * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE 
+ * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the MPL as stated above or under the terms of the GNU
@@ -56,27 +56,36 @@
  */
 public class XmpArray extends ArrayList {
 
-    private static final long serialVersionUID = 5722854116328732742L;
-    /** An array that is unordered. */
+    /**
+     * An array that is unordered.
+     */
     public static final String UNORDERED = "rdf:Bag";
-    /** An array that is ordered. */
+    /**
+     * An array that is ordered.
+     */
     public static final String ORDERED = "rdf:Seq";
-    /** An array with alternatives. */
+    /**
+     * An array with alternatives.
+     */
     public static final String ALTERNATIVE = "rdf:Alt";
-    
-    /** the type of array. */
+    private static final long serialVersionUID = 5722854116328732742L;
+    /**
+     * the type of array.
+     */
     protected String type;
-    
+
     /**
      * Creates an XmpArray.
+     *
      * @param type the type of array: UNORDERED, ORDERED or ALTERNATIVE.
      */
     public XmpArray(String type) {
         this.type = type;
     }
-    
+
     /**
      * Returns the String representation of the XmpArray.
+     *
      * @return a String representation
      */
     public String toString() {
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpBasicSchema.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpBasicSchema.java
index f62c111ac..1791043d9 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpBasicSchema.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpBasicSchema.java
@@ -30,7 +30,7 @@
  * the MPL, indicate your decision by deleting the provisions above and
  * replace them with the notice and other provisions required by the LGPL.
  * If you do not delete the provisions above, a recipient may use your version
- * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE 
+ * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the MPL as stated above or under the terms of the GNU
@@ -57,7 +57,6 @@
  */
 public class XmpBasicSchema extends XmpSchema {
 
-    private static final long serialVersionUID = -2416613941622479298L;
     /**
      * default namespace identifier
      */
@@ -66,7 +65,6 @@ public class XmpBasicSchema extends XmpSchema {
      * default namespace uri
      */
     public static final String DEFAULT_XPATH_URI = "http://ns.adobe.com/xap/1.0/";
-
     /**
      * An unordered array specifying properties that were edited outside the authoring application. Each item should
      * contain a single namespace and XPath separated by one ASCII space (U+0020).
@@ -109,30 +107,34 @@ public class XmpBasicSchema extends XmpSchema {
      * encoding.
      */
     public static final String THUMBNAILS = "xmp:Thumbnails";
+    private static final long serialVersionUID = -2416613941622479298L;
 
 
     public XmpBasicSchema() {
         super("xmlns:" + DEFAULT_XPATH_ID + "=\"" + DEFAULT_XPATH_URI + "\"");
     }
-    
+
     /**
      * Adds the creatortool.
+     *
      * @param creator creator tool
      */
     public void addCreatorTool(String creator) {
         setProperty(CREATORTOOL, creator);
     }
-    
+
     /**
      * Adds the creation date.
+     *
      * @param date creation date
      */
     public void addCreateDate(String date) {
         setProperty(CREATEDATE, date);
     }
-    
+
     /**
      * Adds the modification date.
+     *
      * @param date modification date
      */
     public void addModDate(String date) {
@@ -141,13 +143,16 @@ public void addModDate(String date) {
 
     /**
      * Adds the meta data date.
+     *
      * @param date metadata date
      */
     public void addMetaDataDate(String date) {
         setProperty(METADATADATE, date);
     }
 
-    /** Adds the identifier.
+    /**
+     * Adds the identifier.
+     *
      * @param id identifier
      */
     public void addIdentifiers(String[] id) {
@@ -156,7 +161,9 @@ public void addIdentifiers(String[] id) {
         setProperty(IDENTIFIER, array);
     }
 
-    /** Adds the nickname.
+    /**
+     * Adds the nickname.
+     *
      * @param name nick name
      */
     public void addNickname(String name) {
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpMMSchema.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpMMSchema.java
index 52fad8128..8e453fb07 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpMMSchema.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpMMSchema.java
@@ -30,7 +30,7 @@
  * the MPL, indicate your decision by deleting the provisions above and
  * replace them with the notice and other provisions required by the LGPL.
  * If you do not delete the provisions above, a recipient may use your version
- * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE 
+ * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the MPL as stated above or under the terms of the GNU
@@ -54,7 +54,6 @@
  */
 public class XmpMMSchema extends XmpSchema {
 
-    private static final long serialVersionUID = 1408509596611634862L;
     /**
      * default namespace identifier
      */
@@ -63,8 +62,6 @@ public class XmpMMSchema extends XmpSchema {
      * default namespace uri
      */
     public static final String DEFAULT_XPATH_URI = "http://ns.adobe.com/xap/1.0/mm/";
-
-
     /**
      * A reference to the original document from which this one is derived. It is a minimal reference; missing
      * components can be assumed to be unchanged. For example, a new version might only need to specify the instance ID
@@ -125,6 +122,7 @@ public class XmpMMSchema extends XmpSchema {
      * The version history associated with this resource.
      */
     public static final String VERSIONS = "xmpMM:Versions";
+    private static final long serialVersionUID = 1408509596611634862L;
 
     public XmpMMSchema() {
         super("xmlns:" + DEFAULT_XPATH_ID + "=\"" + DEFAULT_XPATH_URI + "\"");
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpReader.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpReader.java
index 593f7c522..a7e024d52 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpReader.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpReader.java
@@ -64,8 +64,8 @@
 import org.xml.sax.SAXException;
 
 /**
- * Reads an XMP stream into an org.w3c.dom.Document objects.
- * Allows you to replace the contents of a specific tag.
+ * Reads an XMP stream into an org.w3c.dom.Document objects. Allows you to replace the contents of a specific tag.
+ *
  * @since 2.1.3
  */
 
@@ -106,28 +106,31 @@ public XmpReader(byte[] bytes) throws SAXException, IOException {
     public boolean replace(String namespaceURI, String localName, String value) {
         NodeList nodes = domDocument.getElementsByTagNameNS(namespaceURI, localName);
         Node node;
-        if (nodes.getLength() == 0)
+        if (nodes.getLength() == 0) {
             return false;
+        }
         for (int i = 0; i < nodes.getLength(); i++) {
             node = nodes.item(i);
             setNodeText(domDocument, node, value);
         }
         return true;
-    }    
-    
+    }
+
     /**
      * Adds a tag.
-     * @param    namespaceURI    the URI of the namespace
-     * @param    parent            the tag name of the parent
-     * @param    localName        the name of the tag to add
-     * @param    value            the new content for the tag
-     * @return    true if the content was successfully added
-     * @since    2.1.6
+     *
+     * @param namespaceURI the URI of the namespace
+     * @param parent       the tag name of the parent
+     * @param localName    the name of the tag to add
+     * @param value        the new content for the tag
+     * @return true if the content was successfully added
+     * @since 2.1.6
      */
     public boolean add(String parent, String namespaceURI, String localName, String value) {
         NodeList nodes = domDocument.getElementsByTagName(parent);
-        if (nodes.getLength() == 0)
+        if (nodes.getLength() == 0) {
             return false;
+        }
         Node pNode;
         Node node;
         for (int i = 0; i < nodes.getLength(); i++) {
@@ -145,18 +148,19 @@ public boolean add(String parent, String namespaceURI, String localName, String
         }
         return false;
     }
-    
+
     /**
-     * Sets the text of this node. All the child's node are deleted and a new
-     * child text node is created.
+     * Sets the text of this node. All the child's node are deleted and a new child text node is created.
+     *
      * @param domDocument the Document that contains the node
-     * @param n the Node to add the text to
-     * @param value the text to add
+     * @param n           the Node to add the text to
+     * @param value       the text to add
      * @return true if added successfully, else false
      */
     public boolean setNodeText(Document domDocument, Node n, String value) {
-        if (n == null)
+        if (n == null) {
             return false;
+        }
         Node nc = null;
         while ((nc = n.getFirstChild()) != null) {
             n.removeChild(nc);
@@ -164,7 +168,7 @@ public boolean setNodeText(Document domDocument, Node n, String value) {
         n.appendChild(domDocument.createTextNode(value));
         return true;
     }
-    
+
     /**
      * Writes the document to a byte array.
      *
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpSchema.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpSchema.java
index 4da9608c7..66a7da65f 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpSchema.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpSchema.java
@@ -30,7 +30,7 @@
  * the MPL, indicate your decision by deleting the provisions above and
  * replace them with the notice and other provisions required by the LGPL.
  * If you do not delete the provisions above, a recipient may use your version
- * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE 
+ * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the MPL as stated above or under the terms of the GNU
@@ -59,9 +59,11 @@ public abstract class XmpSchema extends Properties {
 
     private static final long serialVersionUID = -176374295948945272L;
 
-    /** the namesspace */
+    /**
+     * the namesspace
+     */
     protected String xmlns;
-    
+
     /**
      * Constructs an XMP schema.
      *
@@ -71,8 +73,40 @@ public XmpSchema(String xmlns) {
         super();
         this.xmlns = xmlns;
     }
+
+    /**
+     * @param content content
+     * @return an escaped string
+     */
+    public static String escape(String content) {
+        StringBuilder buf = new StringBuilder();
+        for (int i = 0; i < content.length(); i++) {
+            switch (content.charAt(i)) {
+                case '<':
+                    buf.append("<");
+                    break;
+                case '>':
+                    buf.append(">");
+                    break;
+                case '\'':
+                    buf.append("'");
+                    break;
+                case '\"':
+                    buf.append(""");
+                    break;
+                case '&':
+                    buf.append("&");
+                    break;
+                default:
+                    buf.append(content.charAt(i));
+            }
+        }
+        return buf.toString();
+    }
+
     /**
      * The String representation of the contents.
+     *
      * @return a String representation.
      */
     @Override
@@ -83,10 +117,12 @@ public synchronized String toString() {
         }
         return buf.toString();
     }
+
     /**
      * Processes a property
+     *
      * @param buf buffer
-     * @param p object
+     * @param p   object
      */
     protected void process(StringBuffer buf, Object p) {
         buf.append('<');
@@ -97,22 +133,23 @@ protected void process(StringBuffer buf, Object p) {
         buf.append(p);
         buf.append('>');
     }
+
     /**
      * @return Returns the xmlns.
      */
     public String getXmlns() {
         return xmlns;
-    }    
-    
+    }
+
     /**
-     * @param key property key
+     * @param key   property key
      * @param value value
      * @return the previous property (null if there wasn't one)
      */
     public Object addProperty(String key, String value) {
         return this.setProperty(key, value);
     }
-    
+
     /**
      * @see java.util.Properties#setProperty(java.lang.String, java.lang.String)
      */
@@ -120,56 +157,24 @@ public Object addProperty(String key, String value) {
     public synchronized Object setProperty(String key, String value) {
         return super.setProperty(key, escape(value));
     }
-    
+
     /**
-     * @see java.util.Properties#setProperty(java.lang.String, java.lang.String)
-     * 
-     * @param key used as key
+     * @param key   used as key
      * @param value toString called on this value
      * @return the previous property (null if there wasn't one)
+     * @see java.util.Properties#setProperty(java.lang.String, java.lang.String)
      */
     public Object setProperty(String key, XmpArray value) {
         return super.setProperty(key, value.toString());
     }
-    
+
     /**
-     * @see java.util.Properties#setProperty(java.lang.String, java.lang.String)
-     *
-     * @param key used as key
+     * @param key   used as key
      * @param value toString called on this value
      * @return the previous property (null if there wasn't one)
+     * @see java.util.Properties#setProperty(java.lang.String, java.lang.String)
      */
     public Object setProperty(String key, LangAlt value) {
         return super.setProperty(key, value.toString());
-     }
-    
-    /**
-     * @param content content
-     * @return an escaped string
-     */
-    public static String escape(String content) {
-        StringBuilder buf = new StringBuilder();
-        for (int i = 0; i < content.length(); i++) {
-            switch(content.charAt(i)) {
-            case '<':
-                buf.append("<");
-                break;
-            case '>':
-                buf.append(">");
-                break;
-            case '\'':
-                buf.append("'");
-                break;
-            case '\"':
-                buf.append(""");
-                break;
-            case '&':
-                buf.append("&");
-                break;
-            default:
-                buf.append(content.charAt(i));
-            }
-        }
-        return buf.toString();
     }
 }
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpWriter.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpWriter.java
index 9923ac007..6434fe96a 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpWriter.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpWriter.java
@@ -30,7 +30,7 @@
  * the MPL, indicate your decision by deleting the provisions above and
  * replace them with the notice and other provisions required by the LGPL.
  * If you do not delete the provisions above, a recipient may use your version
- * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE 
+ * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the MPL as stated above or under the terms of the GNU
@@ -55,66 +55,79 @@
 import com.lowagie.text.pdf.PdfObject;
 import com.lowagie.text.pdf.PdfString;
 import com.lowagie.text.pdf.PdfWriter;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.util.Map;
 
 /**
- * With this class you can create an Xmp Stream that can be used for adding
- * Metadata to a PDF Dictionary. Remark that this class doesn't cover the
- * complete XMP specification. 
+ * With this class you can create an Xmp Stream that can be used for adding Metadata to a PDF Dictionary. Remark that
+ * this class doesn't cover the complete XMP specification.
  */
 public class XmpWriter implements AutoCloseable {
 
-    /** A possible charset for the XMP. */
+    /**
+     * A possible charset for the XMP.
+     */
     public static final String UTF8 = "UTF-8";
-    /** A possible charset for the XMP. */
+    /**
+     * A possible charset for the XMP.
+     */
     public static final String UTF16 = "UTF-16";
-    /** A possible charset for the XMP. */
+    /**
+     * A possible charset for the XMP.
+     */
     public static final String UTF16BE = "UTF-16BE";
-    /** A possible charset for the XMP. */
+    /**
+     * A possible charset for the XMP.
+     */
     public static final String UTF16LE = "UTF-16LE";
-    
-    /** String used to fill the extra space. */
-    public static final String EXTRASPACE = "                                                                                                   \n";
-    
-    /** You can add some extra space in the XMP packet; 1 unit in this variable represents 100 spaces and a newline. */
-    protected int extraSpace;
-    
-    /** The writer to which you can write bytes for the XMP stream. */
-    protected OutputStreamWriter writer;
-    
-    /** The about string that goes into the rdf:Description tags. */
-    protected String about;
 
+    /**
+     * String used to fill the extra space.
+     */
+    public static final String EXTRASPACE = "                                                                                                   \n";
     /**
      * Processing Instruction required at the start of an XMP stream
+     *
      * @since iText 2.1.6
      */
     public static final String XPACKET_PI_BEGIN = "\n";
-    
     /**
      * Processing Instruction required at the end of an XMP stream for XMP streams that can be updated
+     *
      * @since iText 2.1.6
      */
     public static final String XPACKET_PI_END_W = "";
-    
     /**
      * Processing Instruction required at the end of an XMP stream for XMP streams that are read only
+     *
      * @since iText 2.1.6
      */
     public static final String XPACKET_PI_END_R = "";
-    
-    /** The end attribute. */
+    /**
+     * You can add some extra space in the XMP packet; 1 unit in this variable represents 100 spaces and a newline.
+     */
+    protected int extraSpace;
+    /**
+     * The writer to which you can write bytes for the XMP stream.
+     */
+    protected OutputStreamWriter writer;
+    /**
+     * The about string that goes into the rdf:Description tags.
+     */
+    protected String about;
+    /**
+     * The end attribute.
+     */
     protected char end = 'w';
-    
+
     /**
-     * Creates an XmpWriter. 
-     * @param os output stream
+     * Creates an XmpWriter.
+     *
+     * @param os          output stream
      * @param utfEncoding utf encoding to be used
-     * @param extraSpace extra space
+     * @param extraSpace  extra space
      * @throws IOException on error
      */
     public XmpWriter(OutputStream os, String utfEncoding, int extraSpace) throws IOException {
@@ -125,9 +138,10 @@ public XmpWriter(OutputStream os, String utfEncoding, int extraSpace) throws IOE
         writer.write("\n");
         about = "";
     }
-    
+
     /**
      * Creates an XmpWriter.
+     *
      * @param os output stream
      * @throws IOException on error
      */
@@ -137,10 +151,9 @@ public XmpWriter(OutputStream os) throws IOException {
 
 
     /**
-     * @param os output stream
-     * @param info {@link PdfDictionary}
-     * @param PdfXConformance pdf conformance
-     *                        eg. values {@link PdfWriter#PDFA1A}, {@link PdfWriter#PDFA1B}
+     * @param os              output stream
+     * @param info            {@link PdfDictionary}
+     * @param PdfXConformance pdf conformance eg. values {@link PdfWriter#PDFA1A}, {@link PdfWriter#PDFA1B}
      * @throws IOException on error
      */
     public XmpWriter(OutputStream os, PdfDictionary info, int PdfXConformance) throws IOException {
@@ -154,8 +167,9 @@ public XmpWriter(OutputStream os, PdfDictionary info, int PdfXConformance) throw
             for (PdfName pdfName : info.getKeys()) {
                 key = pdfName;
                 obj = info.get(key);
-                if (obj == null)
+                if (obj == null) {
                     continue;
+                }
                 if (PdfName.TITLE.equals(key)) {
                     dc.addTitle(((PdfString) obj).toUnicodeString());
                 }
@@ -182,22 +196,29 @@ public XmpWriter(OutputStream os, PdfDictionary info, int PdfXConformance) throw
                     basic.addModDate(((PdfDate) obj).getW3CDate());
                 }
             }
-            if (dc.size() > 0) addRdfDescription(dc);
-            if (p.size() > 0) addRdfDescription(p);
-            if (basic.size() > 0) addRdfDescription(basic);
+            if (dc.size() > 0) {
+                addRdfDescription(dc);
+            }
+            if (p.size() > 0) {
+                addRdfDescription(p);
+            }
+            if (basic.size() > 0) {
+                addRdfDescription(basic);
+            }
             if (PdfXConformance == PdfWriter.PDFA1A || PdfXConformance == PdfWriter.PDFA1B) {
                 PdfA1Schema a1 = new PdfA1Schema();
-                if (PdfXConformance == PdfWriter.PDFA1A)
+                if (PdfXConformance == PdfWriter.PDFA1A) {
                     a1.addConformance("A");
-                else
+                } else {
                     a1.addConformance("B");
+                }
                 addRdfDescription(a1);
             }
         }
     }
 
     /**
-     * @param os output stream
+     * @param os   output stream
      * @param info map of info
      * @throws IOException on error
      */
@@ -213,8 +234,9 @@ public XmpWriter(OutputStream os, Map info) throws IOException {
                 Map.Entry entry = (Map.Entry) o;
                 key = (String) entry.getKey();
                 value = (String) entry.getValue();
-                if (value == null)
+                if (value == null) {
                     continue;
+                }
                 if ("Title".equals(key)) {
                     dc.addTitle(value);
                 }
@@ -241,27 +263,36 @@ public XmpWriter(OutputStream os, Map info) throws IOException {
                     basic.addModDate(PdfDate.getW3CDate(value));
                 }
             }
-            if (dc.size() > 0) addRdfDescription(dc);
-            if (p.size() > 0) addRdfDescription(p);
-            if (basic.size() > 0) addRdfDescription(basic);
+            if (dc.size() > 0) {
+                addRdfDescription(dc);
+            }
+            if (p.size() > 0) {
+                addRdfDescription(p);
+            }
+            if (basic.size() > 0) {
+                addRdfDescription(basic);
+            }
         }
     }
-    
-    /** Sets the XMP to read-only */
+
+    /**
+     * Sets the XMP to read-only
+     */
     public void setReadOnly() {
         end = 'r';
     }
-    
+
     /**
      * @param about The about to set.
      */
     public void setAbout(String about) {
         this.about = about;
     }
-    
+
     /**
      * Adds an rdf:Description.
-     * @param xmlns xml namespace
+     *
+     * @param xmlns   xml namespace
      * @param content content
      * @throws IOException on error
      */
@@ -274,9 +305,10 @@ public void addRdfDescription(String xmlns, String content) throws IOException {
         writer.write(content);
         writer.write("\n");
     }
-    
+
     /**
      * Adds an rdf:Description.
+     *
      * @param s xmp schema
      * @throws IOException on error
      */
@@ -289,9 +321,10 @@ public void addRdfDescription(XmpSchema s) throws IOException {
         writer.write(s.toString());
         writer.write("\n");
     }
-    
+
     /**
      * Flushes and closes the XmpWriter.
+     *
      * @throws IOException on error
      */
     public void close() throws IOException {
diff --git a/openpdf/src/main/resources/com/lowagie/text/pdf/fonts/cjkencodings.properties b/openpdf/src/main/resources/com/lowagie/text/pdf/fonts/cjkencodings.properties
index b98b41777..0b8a16100 100644
--- a/openpdf/src/main/resources/com/lowagie/text/pdf/fonts/cjkencodings.properties
+++ b/openpdf/src/main/resources/com/lowagie/text/pdf/fonts/cjkencodings.properties
@@ -3,13 +3,10 @@ UniJIS-UCS2-H=UniJIS-UCS2-H
 UniJIS-UCS2-V=UniJIS-UCS2-H UniJIS-UCS2-V
 UniJIS-UCS2-HW-H=UniJIS-UCS2-H UniJIS-UCS2-HW-H
 UniJIS-UCS2-HW-V=UniJIS-UCS2-H UniJIS-UCS2-HW-V
-
 UniGB-UCS2-H=UniGB-UCS2-H
 UniGB-UCS2-V=UniGB-UCS2-H UniGB-UCS2-V
-
 UniCNS-UCS2-H=UniCNS-UCS2-H
 UniCNS-UCS2-V=UniCNS-UCS2-H UniCNS-UCS2-V
-
 UniKS-UCS2-H=UniKS-UCS2-H
 UniKS-UCS2-V=UniKS-UCS2-H UniKS-UCS2-V
 
diff --git a/openpdf/src/main/resources/com/lowagie/text/pdf/fonts/cjkfonts.properties b/openpdf/src/main/resources/com/lowagie/text/pdf/fonts/cjkfonts.properties
index 0542d8f57..78d95b5ff 100644
--- a/openpdf/src/main/resources/com/lowagie/text/pdf/fonts/cjkfonts.properties
+++ b/openpdf/src/main/resources/com/lowagie/text/pdf/fonts/cjkfonts.properties
@@ -2,14 +2,11 @@
 HeiseiMin-W3=Adobe-Japan1-UCS2_UniJIS-UCS2-H_UniJIS-UCS2-V_UniJIS-UCS2-HW-H_UniJIS-UCS2-HW-V_
 HeiseiKakuGo-W5=Adobe-Japan1-UCS2_UniJIS-UCS2-H_UniJIS-UCS2-V_UniJIS-UCS2-HW-H_UniJIS-UCS2-HW-V_
 KozMinPro-Regular=Adobe-Japan1-UCS2_UniJIS-UCS2-H_UniJIS-UCS2-V_UniJIS-UCS2-HW-H_UniJIS-UCS2-HW-V_
-
 STSong-Light=Adobe-GB1-UCS2_UniGB-UCS2-H_UniGB-UCS2-V_
 STSongStd-Light=Adobe-GB1-UCS2_UniGB-UCS2-H_UniGB-UCS2-V_
-
 MHei-Medium=Adobe-CNS1-UCS2_UniCNS-UCS2-H_UniCNS-UCS2-V_
 MSung-Light=Adobe-CNS1-UCS2_UniCNS-UCS2-H_UniCNS-UCS2-V_
 MSungStd-Light=Adobe-CNS1-UCS2_UniCNS-UCS2-H_UniCNS-UCS2-V_
-
 HYGoThic-Medium=Adobe-Korea1-UCS2_UniKS-UCS2-H_UniKS-UCS2-V_
 HYSMyeongJo-Medium=Adobe-Korea1-UCS2_UniKS-UCS2-H_UniKS-UCS2-V_
 HYSMyeongJoStd-Medium=Adobe-Korea1-UCS2_UniKS-UCS2-H_UniKS-UCS2-V_
diff --git a/openpdf/src/main/resources/font-fallback/README.md b/openpdf/src/main/resources/font-fallback/README.md
index 9da74ac0b..338a71e94 100644
--- a/openpdf/src/main/resources/font-fallback/README.md
+++ b/openpdf/src/main/resources/font-fallback/README.md
@@ -1,4 +1,5 @@
 # Notice
-This is only a fallback font for existing OpenPDF code. For using the full set of Liberation Fonts, 
-please add the openpdf-fonts-extra dependency to you project and use the class 
+
+This is only a fallback font for existing OpenPDF code. For using the full set of Liberation Fonts,
+please add the openpdf-fonts-extra dependency to you project and use the class
 `org.librepdf.openpdf.fonts.Liberation`.
\ No newline at end of file
diff --git a/openpdf/src/test/java/com/lowagie/text/DocumentTest.java b/openpdf/src/test/java/com/lowagie/text/DocumentTest.java
index bee726817..c70423429 100644
--- a/openpdf/src/test/java/com/lowagie/text/DocumentTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/DocumentTest.java
@@ -13,8 +13,8 @@ void testThatVersionIsCorrect() {
 
         // Then
         assertThat(versionInCode)
-            .as("Version number in code %s is not correct.", versionInCode)
-            .matches("^OpenPDF \\d+\\.\\d+\\.\\d+(-SNAPSHOT)?$");
+                .as("Version number in code %s is not correct.", versionInCode)
+                .matches("^OpenPDF \\d+\\.\\d+\\.\\d+(-SNAPSHOT)?$");
     }
 
     @Test
diff --git a/openpdf/src/test/java/com/lowagie/text/FooterImageTest.java b/openpdf/src/test/java/com/lowagie/text/FooterImageTest.java
index 1a9765847..1717bcf87 100644
--- a/openpdf/src/test/java/com/lowagie/text/FooterImageTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/FooterImageTest.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 
 public class FooterImageTest {
+
     @Test
     public void onlyTextFooterUpperBoundTest() {
         Document document = new Document(PageSize.A4);
@@ -29,7 +30,8 @@ public void onlyTextFooterUpperBoundTest() {
     @Test
     public void imageLeftAlignmentPositionTest() throws IOException {
         Document document = new Document(PageSize.A4);
-        Image jpg = Image.getInstance(Objects.requireNonNull(getClass().getClassLoader().getResource("GitHub-Mark-32px.png")));
+        Image jpg = Image.getInstance(
+                Objects.requireNonNull(getClass().getClassLoader().getResource("GitHub-Mark-32px.png")));
         PdfWriter.getInstance(document, new ByteArrayOutputStream());
 
         Paragraph footerParagraph = new Paragraph();
@@ -55,7 +57,8 @@ public void imageLeftAlignmentPositionTest() throws IOException {
     @Test
     public void imageRightAlignmentPositionTest() throws IOException {
         Document document = new Document(PageSize.A4);
-        Image jpg = Image.getInstance(Objects.requireNonNull(getClass().getClassLoader().getResource("GitHub-Mark-32px.png")));
+        Image jpg = Image.getInstance(
+                Objects.requireNonNull(getClass().getClassLoader().getResource("GitHub-Mark-32px.png")));
         PdfWriter.getInstance(document, new ByteArrayOutputStream());
         jpg.setAlignment(Element.ALIGN_RIGHT);
 
@@ -81,7 +84,8 @@ public void imageRightAlignmentPositionTest() throws IOException {
     @Test
     public void centerUnderlyingPositionTest() throws IOException {
         Document document = new Document(PageSize.A4);
-        Image jpg = Image.getInstance(Objects.requireNonNull(getClass().getClassLoader().getResource("GitHub-Mark-32px.png")));
+        Image jpg = Image.getInstance(
+                Objects.requireNonNull(getClass().getClassLoader().getResource("GitHub-Mark-32px.png")));
         jpg.setAlignment(Image.UNDERLYING);
 
         PdfWriter.getInstance(document, new ByteArrayOutputStream());
diff --git a/openpdf/src/test/java/com/lowagie/text/FooterTableTest.java b/openpdf/src/test/java/com/lowagie/text/FooterTableTest.java
index 1694d7af4..1129b6343 100644
--- a/openpdf/src/test/java/com/lowagie/text/FooterTableTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/FooterTableTest.java
@@ -1,22 +1,22 @@
 package com.lowagie.text;
 
+import com.lowagie.text.pdf.PdfPTable;
+import com.lowagie.text.pdf.PdfWriter;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Objects;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import com.lowagie.text.pdf.PdfPTable;
-import com.lowagie.text.pdf.PdfWriter;
-
 public class FooterTableTest {
+
     @Test
     public void imageLeftAlignmentPositionTest() throws IOException {
         Document document = new Document(PageSize.A4);
         PdfWriter.getInstance(document, new ByteArrayOutputStream());
 
-        Image jpg = Image.getInstance(Objects.requireNonNull(getClass().getClassLoader().getResource("GitHub-Mark-32px.png")));
+        Image jpg = Image.getInstance(
+                Objects.requireNonNull(getClass().getClassLoader().getResource("GitHub-Mark-32px.png")));
         jpg.setAlignment(Image.RIGHT);
 
         PdfPTable table = new PdfPTable(3);
diff --git a/openpdf/src/test/java/com/lowagie/text/HeaderFooterTest.java b/openpdf/src/test/java/com/lowagie/text/HeaderFooterTest.java
index 4b52bf63d..64e9b0762 100644
--- a/openpdf/src/test/java/com/lowagie/text/HeaderFooterTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/HeaderFooterTest.java
@@ -1,16 +1,15 @@
 package com.lowagie.text;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import java.util.stream.Stream;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
 class HeaderFooterTest {
 
     public static Stream createTestDataBeforeAndAfter() {
diff --git a/openpdf/src/test/java/com/lowagie/text/StandardFontsTest.java b/openpdf/src/test/java/com/lowagie/text/StandardFontsTest.java
index e5161c737..a706aaea9 100644
--- a/openpdf/src/test/java/com/lowagie/text/StandardFontsTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/StandardFontsTest.java
@@ -1,15 +1,5 @@
 package com.lowagie.text;
 
-import com.lowagie.text.pdf.PdfWriter;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.Test;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import static com.lowagie.text.StandardFonts.COURIER;
 import static com.lowagie.text.StandardFonts.COURIER_BOLD;
 import static com.lowagie.text.StandardFonts.COURIER_BOLDITALIC;
@@ -28,14 +18,23 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.Test;
+
 class StandardFontsTest {
 
     @Test
     void createDocumentAllFonts() {
         try (// step 1: we create a writer that listens to the document
-             FileOutputStream outputStream = new FileOutputStream("target/StandardFonts.pdf");
-             // step 2: creation of a document-object
-             Document document = new Document()) {
+                FileOutputStream outputStream = new FileOutputStream("target/StandardFonts.pdf");
+                // step 2: creation of a document-object
+                Document document = new Document()) {
             PdfWriter.getInstance(document, outputStream);
             // step 3: we open the document
             document.open();
diff --git a/openpdf/src/test/java/com/lowagie/text/factories/GreekAlphabetFactoryTest.java b/openpdf/src/test/java/com/lowagie/text/factories/GreekAlphabetFactoryTest.java
index b08709451..ac4dfc749 100644
--- a/openpdf/src/test/java/com/lowagie/text/factories/GreekAlphabetFactoryTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/factories/GreekAlphabetFactoryTest.java
@@ -7,11 +7,11 @@
 
 class GreekAlphabetFactoryTest {
 
-  @Test
-  void shouldGetGreekString() {
-    for (int i = 1; i < 1000; i++) {
-      assertNotNull(getString(i));
+    @Test
+    void shouldGetGreekString() {
+        for (int i = 1; i < 1000; i++) {
+            assertNotNull(getString(i));
+        }
     }
-  }
 
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/factories/RomanAlphabetFactoryTest.java b/openpdf/src/test/java/com/lowagie/text/factories/RomanAlphabetFactoryTest.java
index 45abc0caf..949b69b6a 100644
--- a/openpdf/src/test/java/com/lowagie/text/factories/RomanAlphabetFactoryTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/factories/RomanAlphabetFactoryTest.java
@@ -7,11 +7,11 @@
 
 class RomanAlphabetFactoryTest {
 
-  @Test
-  void shouldGetRomanString() {
-    for (int i = 1; i < 32000; i++) {
-      assertNotNull(getString(i));
+    @Test
+    void shouldGetRomanString() {
+        for (int i = 1; i < 32000; i++) {
+            assertNotNull(getString(i));
+        }
     }
-  }
 
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/factories/RomanNumberFactoryTest.java b/openpdf/src/test/java/com/lowagie/text/factories/RomanNumberFactoryTest.java
index 7e1580311..e75625e3c 100644
--- a/openpdf/src/test/java/com/lowagie/text/factories/RomanNumberFactoryTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/factories/RomanNumberFactoryTest.java
@@ -16,23 +16,6 @@
 
 class RomanNumberFactoryTest {
 
-    @Test
-    void shouldGetRomanNumberString() {
-        for (int i = 1; i < 2000; i++) {
-            assertNotNull(getString(i));
-        }
-    }
-
-    /**
-     * Tests a few random roman numerals
-     */
-    @Test
-    void shouldGetRomanNumeralRepresentation() {
-        assertEquals("lvi", getString(56));
-        assertEquals("mmcmxcix", getString(2999));
-        assertEquals("mmm", getString(3000));
-    }
-
     static Stream numeralTestProvider() {
         return Stream.of(
                 arguments(0, ""),
@@ -59,6 +42,23 @@ static Stream numeralTestProvider() {
         );
     }
 
+    @Test
+    void shouldGetRomanNumberString() {
+        for (int i = 1; i < 2000; i++) {
+            assertNotNull(getString(i));
+        }
+    }
+
+    /**
+     * Tests a few random roman numerals
+     */
+    @Test
+    void shouldGetRomanNumeralRepresentation() {
+        assertEquals("lvi", getString(56));
+        assertEquals("mmcmxcix", getString(2999));
+        assertEquals("mmm", getString(3000));
+    }
+
     @ParameterizedTest
     @MethodSource("numeralTestProvider")
     void shouldConvertRomanNumeralRepresentation(int input, String expected) {
diff --git a/openpdf/src/test/java/com/lowagie/text/html/EmbeddedImageTest.java b/openpdf/src/test/java/com/lowagie/text/html/EmbeddedImageTest.java
index 166392331..75230487b 100644
--- a/openpdf/src/test/java/com/lowagie/text/html/EmbeddedImageTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/html/EmbeddedImageTest.java
@@ -1,11 +1,11 @@
 package com.lowagie.text.html;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Element;
 import com.lowagie.text.html.simpleparser.HTMLWorker;
 import com.lowagie.text.html.simpleparser.StyleSheet;
-import org.junit.jupiter.api.Test;
-
 import java.io.StringReader;
 import java.net.URI;
 import java.nio.file.Files;
@@ -15,19 +15,16 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-class EmbeddedImageTest
-{
+class EmbeddedImageTest {
 
     @Test
-    void processHtmlWithEmbeddedImage() throws Exception
-    {
+    void processHtmlWithEmbeddedImage() throws Exception {
         URI resourceUri = ClassLoader.getSystemResource("base64-image.html").toURI();
         Path resourcePath = Paths.get(resourceUri);
         String html = Files.readAllLines(resourcePath).stream().collect(Collectors.joining());
-        
+
         final StringReader reader = new StringReader(html);
         final Map interfaceProps = new HashMap<>();
         final List elements = HTMLWorker.parseToList(reader, new StyleSheet(), interfaceProps);
diff --git a/openpdf/src/test/java/com/lowagie/text/html/HTMLTableTest.java b/openpdf/src/test/java/com/lowagie/text/html/HTMLTableTest.java
index 5590b2683..8f9b09692 100644
--- a/openpdf/src/test/java/com/lowagie/text/html/HTMLTableTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/html/HTMLTableTest.java
@@ -1,14 +1,15 @@
 package com.lowagie.text.html;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import com.lowagie.text.Document;
 import com.lowagie.text.html.simpleparser.HTMLWorker;
-import org.junit.jupiter.api.Test;
 import java.io.StringReader;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 public class HTMLTableTest {
+
     /**
      * Bug fix scenario: a table with rowspan doesn't work
      */
diff --git a/openpdf/src/test/java/com/lowagie/text/html/HtmlParserTest.java b/openpdf/src/test/java/com/lowagie/text/html/HtmlParserTest.java
index b85cb973c..da94d5f9d 100644
--- a/openpdf/src/test/java/com/lowagie/text/html/HtmlParserTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/html/HtmlParserTest.java
@@ -1,31 +1,73 @@
 package com.lowagie.text.html;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import com.lowagie.text.Document;
+import com.lowagie.text.TextElementArray;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EmptyStackException;
 import java.util.stream.Stream;
-
-import com.lowagie.text.Document;
-import com.lowagie.text.TextElementArray;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
-
 /**
- * This test class contains a series of smoke tests. The goal of these tests is not validate the generated document,
- * but to ensure no exception is thrown.
+ * This test class contains a series of smoke tests. The goal of these tests is not validate the generated document, but
+ * to ensure no exception is thrown.
  */
 class HtmlParserTest {
 
 
     /**
-     * Bug fix scenario: a table with a space throws a {@link TextElementArray}
-     * class cast Exception. A table without spaces is parsed correctly.
+     * This method generates a lot of common und less common combination of html tags. Each string is guaranteed to have
+     * exactly one placeholder {@code %s}, so that test worthy inner tags can be inserted using
+     * {@link String#format(String, Object...) String.format}.
               One of the generates values will be {@code %s}, so
+     * every test using this generator will test the markup fragment in question without any surrounding tags as well
+     *
+     * @return A stream of of html tags, each containing one {@code %s}.
+     */
+    private static Stream surroundingTags() {
+
+        String span = "%s";
+        String ol = "
              1. %s
              ";
+        String ul = "
              • %s
              ";
+        String div = "
              %s
              ";
+        String em = "%s";
+        String strong = "%s";
+        String table = "
              %s
              ";
+        String brAfter = "%s
              ";
+        String brBefore = "
              %s";
+        String empty = "%s";
+
+        String[] outerElements = new String[]{span, ol, ul, div, em, strong, table};
+        //brAfter and brBefore must not be at top level, because it would lead to a SAXParseException (root element
+        // must have an opening and a closing tag)
+        String[] innerElements = new String[]{span, ol, ul, div, em, strong, table, brAfter, brBefore, empty};
+
+        Collection combinations = new ArrayList<>();
+
+        //The "naked value" should be tested first, so we begin with a simple '%s'
+        combinations.add(Arguments.of(empty));
+
+        //Combine every outer with every inner element
+        //Although not every combination is common, it cannot be excluded that they may occur. In any case, no
+        //exception should be thrown when parsing shitty html (for example putting a table inside a span)
+        for (String outer : outerElements) {
+            for (String inner : innerElements) {
+                final String htmlToTest = String.format(outer, inner);
+                combinations.add(Arguments.of(htmlToTest));
+            }
+        }
+
+        return combinations.stream();
+    }
+
+    /**
+     * Bug fix scenario: a table with a space throws a {@link TextElementArray} class cast Exception. A table without
+     * spaces is parsed correctly.
      */
     @ParameterizedTest(name = "table with no space within {arguments}")
     @MethodSource("surroundingTags")
@@ -38,8 +80,7 @@ void testParse_tableWithNoSpaces(String surroundingTags) {
     }
 
     /**
-     * Bug fix scenario: a table with a space throws a {@link TextElementArray}
-     * class cast Exception.
+     * Bug fix scenario: a table with a space throws a {@link TextElementArray} class cast Exception.
      */
     @ParameterizedTest(name = "table with space within {arguments}")
     @MethodSource("surroundingTags")
@@ -116,50 +157,4 @@ void testParse(String html) {
         }
     }
 
-    /**
-     * This method generates a lot of common und less common combination of html tags. Each string is guaranteed to
-     * have exactly one placeholder {@code %s}, so that test worthy inner tags can be inserted using
-     * {@link String#format(String, Object...) String.format}.
              
-     * One of the generates values will be {@code %s}, so every test using this generator will test the markup fragment
-     * in question without any surrounding tags as well
-     *
-     * @return A stream of of html tags, each containing one {@code %s}.
-     */
-    private static Stream surroundingTags() {
-
-        String span = "%s";
-        String ol = "
              1. %s
              ";
-        String ul = "
              • %s
              ";
-        String div = "
              %s
              ";
-        String em = "%s";
-        String strong = "%s";
-        String table = "
              %s
              ";
-        String brAfter = "%s
              ";
-        String brBefore = "
              %s";
-        String empty = "%s";
-
-
-        String[] outerElements = new String[]{span, ol, ul, div, em, strong, table};
-        //brAfter and brBefore must not be at top level, because it would lead to a SAXParseException (root element
-        // must have an opening and a closing tag)
-        String[] innerElements = new String[]{span, ol, ul, div, em, strong, table, brAfter, brBefore, empty};
-
-        Collection combinations = new ArrayList<>();
-
-        //The "naked value" should be tested first, so we begin with a simple '%s'
-        combinations.add(Arguments.of(empty));
-
-        //Combine every outer with every inner element
-        //Although not every combination is common, it cannot be excluded that they may occur. In any case, no
-        //exception should be thrown when parsing shitty html (for example putting a table inside a span)
-        for (String outer : outerElements) {
-            for (String inner : innerElements) {
-                final String htmlToTest = String.format(outer, inner);
-                combinations.add(Arguments.of(htmlToTest));
-            }
-        }
-
-        return combinations.stream();
-    }
-
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/html/SAXmyHtmlHandlerTest.java b/openpdf/src/test/java/com/lowagie/text/html/SAXmyHtmlHandlerTest.java
index ad9ff00d4..4e90a21ca 100644
--- a/openpdf/src/test/java/com/lowagie/text/html/SAXmyHtmlHandlerTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/html/SAXmyHtmlHandlerTest.java
@@ -1,16 +1,15 @@
 package com.lowagie.text.html;
-import java.io.InputStream;
-
-import com.lowagie.text.Document;
-import org.junit.jupiter.api.Test;
-
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import com.lowagie.text.Document;
+import java.io.InputStream;
+import org.junit.jupiter.api.Test;
+
 /**
- * This test class contains a series of smoke tests. The goal of these tests is not validate the generated document,
- * but to ensure no exception is thrown.
+ * This test class contains a series of smoke tests. The goal of these tests is not validate the generated document, but
+ * to ensure no exception is thrown.
  */
 public class SAXmyHtmlHandlerTest {
 
@@ -35,13 +34,14 @@ void testTable_generate() {
 
     /**
      * Parse the input HTML file to PDF file.
+     *
      * @param is The input stream of the HTML file.
      */
     void parseHtml(InputStream is) {
         try {
             Document doc1 = new Document();
             doc1.open();
-            HtmlParser.parse(doc1,is);
+            HtmlParser.parse(doc1, is);
             assertNotNull(doc1, () -> is + " was not parsed successfully");
         } catch (Exception e) {
             fail(() -> is + " resulted in " + e);
diff --git a/openpdf/src/test/java/com/lowagie/text/html/StylesTest.java b/openpdf/src/test/java/com/lowagie/text/html/StylesTest.java
index 202e6d5f8..9ed68fff6 100644
--- a/openpdf/src/test/java/com/lowagie/text/html/StylesTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/html/StylesTest.java
@@ -23,7 +23,8 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * Tests generating PDF from HTML with selected CCS style attributes (such as 'font-size', 'background', 'background-color', 'color').
+ * Tests generating PDF from HTML with selected CCS style attributes (such as 'font-size', 'background',
+ * 'background-color', 'color').
  */
 class StylesTest {
 
@@ -43,8 +44,9 @@ void testBackgroundColor() throws Exception {
 
     private Color getBackgroundColor(Chunk chunk) {
         Object[] backgroundAttributes = (Object[]) chunk.getChunkAttributes().get(Chunk.BACKGROUND);
-        if (backgroundAttributes != null && backgroundAttributes.length > 0 && backgroundAttributes[0] instanceof Color ) {
-            return (Color)backgroundAttributes[0];
+        if (backgroundAttributes != null && backgroundAttributes.length > 0
+                && backgroundAttributes[0] instanceof Color) {
+            return (Color) backgroundAttributes[0];
         }
         return null;
     }
@@ -62,12 +64,13 @@ void testFontColor() throws Exception {
     private List htmlToPdf(String htmlFileName, String pdfFileName) throws IOException {
         StyleSheet styleSheet = new StyleSheet();
         Map interfaceProps = new HashMap<>();
-        try(InputStream inputStream = StylesTest.class.getClassLoader().getResourceAsStream(htmlFileName);
-            OutputStream outputStream = Files.newOutputStream(Paths.get(pdfFileName))) {
+        try (InputStream inputStream = StylesTest.class.getClassLoader().getResourceAsStream(htmlFileName);
+                OutputStream outputStream = Files.newOutputStream(Paths.get(pdfFileName))) {
             if (inputStream == null) {
                 throw new IOException("InputStream could not be created");
             }
-            List elements = HTMLWorker.parseToList(new InputStreamReader(inputStream), styleSheet, interfaceProps);
+            List elements = HTMLWorker.parseToList(new InputStreamReader(inputStream), styleSheet,
+                    interfaceProps);
 
             Document document = new Document();
             PdfWriter instance = PdfWriter.getInstance(document, outputStream);
diff --git a/openpdf/src/test/java/com/lowagie/text/html/WebColorsTest.java b/openpdf/src/test/java/com/lowagie/text/html/WebColorsTest.java
index bee2cf803..f104b0db3 100644
--- a/openpdf/src/test/java/com/lowagie/text/html/WebColorsTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/html/WebColorsTest.java
@@ -23,7 +23,7 @@ public void testEmptyName() {
             WebColors.getRGBColor("");
         });
     }
-    
+
     @Test
     public void testBlankName() {
         Assertions.assertThrows(IllegalArgumentException.class, () -> {
@@ -38,8 +38,8 @@ public void testTransparency() {
         Color expected = new Color(0, 0, 0, 255);
         Assertions.assertEquals(expected, color);
     }
-    
-    
+
+
     @Test
     public void testHexadecimalSintax() {
         Color expected = new Color(0xff, 0x00, 0x99, 0xff);
@@ -48,7 +48,7 @@ public void testHexadecimalSintax() {
         Assertions.assertEquals(expected, WebColors.getRGBColor("#ff0099"));
         Assertions.assertEquals(expected, WebColors.getRGBColor("#FF0099"));
     }
-    
+
     @Test
     public void testHexadecimalSintaxWithAlpha() {
         Color expected = new Color(0xff, 0x00, 0x99, 0xaa);
@@ -58,7 +58,7 @@ public void testHexadecimalSintaxWithAlpha() {
         Assertions.assertEquals(expected, WebColors.getRGBColor("#ff0099aa"));
         Assertions.assertEquals(expected, WebColors.getRGBColor("#FF0099aa"));
     }
-    
+
     @Test
     public void testHexadecimalBadFormats() {
         Assertions.assertThrows(IllegalArgumentException.class, () -> {
@@ -71,26 +71,27 @@ public void testHexadecimalBadFormats() {
             WebColors.getRGBColor("#zzz");
         });
     }
-   
+
     @Test
     public void testRGB() {
         Color expected = new Color(0xff, 0x00, 0x99, 0xff);
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgb(255,0,153)"));
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgb(255, 0, 153)"));
     }
+
     @Test
     public void testRGBPercentage() {
         Color expected = new Color(0xff, 0x00, 0x99, 0xff);
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgb(100%,0%,60%)"));
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgb(100%, 0%, 60%)"));
     }
-    
+
     @Test
     public void testRGBSpaces() {
-        Color expected = new Color(0xff, 0x00, 0x99, 0xff); 
+        Color expected = new Color(0xff, 0x00, 0x99, 0xff);
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgb(255 0 153)"));
     }
-    
+
     @Test
     public void testRGBAlpha() {
         Color expected = new Color(0xff, 0x00, 0x99, 0xff);
@@ -98,13 +99,14 @@ public void testRGBAlpha() {
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgb(255, 0, 153, 100%)"));
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgb(255 0 153 / 1)"));
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgb(255 0 153 / 100%)"));
-        
+
         Color expected2 = new Color(0xff, 0x00, 0x99, 0x99);
         Assertions.assertEquals(expected2, WebColors.getRGBColor("rgb(255, 0, 153, 0.6)"));
         Assertions.assertEquals(expected2, WebColors.getRGBColor("rgb(255, 0, 153, 60%)"));
         Assertions.assertEquals(expected2, WebColors.getRGBColor("rgb(255 0 153 / 0.6)"));
         Assertions.assertEquals(expected2, WebColors.getRGBColor("rgb(255 0 153 / 60%)"));
     }
+
     @Test
     public void testRGBAAlias() {
         Color expected = new Color(0xff, 0x00, 0x99, 0xff);
@@ -112,14 +114,14 @@ public void testRGBAAlias() {
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgba(255, 0, 153, 100%)"));
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgba(255 0 153 / 1)"));
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgba(255 0 153 / 100%)"));
-        
+
         Color expected2 = new Color(0xff, 0x00, 0x99, 0x99);
         Assertions.assertEquals(expected2, WebColors.getRGBColor("rgba(255, 0, 153, 0.6)"));
         Assertions.assertEquals(expected2, WebColors.getRGBColor("rgba(255, 0, 153, 60%)"));
         Assertions.assertEquals(expected2, WebColors.getRGBColor("rgba(255 0 153 / 0.6)"));
         Assertions.assertEquals(expected2, WebColors.getRGBColor("rgba(255 0 153 / 60%)"));
     }
-    
+
     @Test
     public void testRGBFloatValues() {
         Color expected = new Color(0xff, 0x00, 0x99, 0xff);
@@ -127,7 +129,7 @@ public void testRGBFloatValues() {
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgb(255, 0, 153.6, 1)"));
         Assertions.assertEquals(expected, WebColors.getRGBColor("rgb(2.55e2, .1e0, 1.53e2, +.1e3%)"));
     }
-    
+
     @Test
     public void testHSL() {
         Color expected = new Color(0xb3, 0x85, 0xe1, 0xff);
@@ -162,6 +164,6 @@ public void testHSLAAlias() {
 
 
     }
-    
-        
+
+
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/html/simpleparser/FactoryPropertiesTest.java b/openpdf/src/test/java/com/lowagie/text/html/simpleparser/FactoryPropertiesTest.java
index c0e1ba493..92d195d34 100644
--- a/openpdf/src/test/java/com/lowagie/text/html/simpleparser/FactoryPropertiesTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/html/simpleparser/FactoryPropertiesTest.java
@@ -1,10 +1,9 @@
 package com.lowagie.text.html.simpleparser;
 
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Serhiy Yakovyn
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/AcroFieldsTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/AcroFieldsTest.java
index 7c60f5bcb..462634113 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/AcroFieldsTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/AcroFieldsTest.java
@@ -3,23 +3,21 @@
 import static java.time.Duration.ofMillis;
 import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
 
+import com.lowagie.text.Document;
+import com.lowagie.text.PageSize;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.security.Security;
 import java.util.List;
-
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import com.lowagie.text.Document;
-import com.lowagie.text.PageSize;
-
 public class AcroFieldsTest {
 
     /**
-     * This test fails, because signatureCoversWholeDocument does only check the
-     * last signed block.
+     * This test fails, because signatureCoversWholeDocument does only check the last signed block.
+     *
      * @throws Exception a ClassCastException
      */
     @Test
@@ -46,16 +44,16 @@ public void testGetSignatures() throws Exception {
         }
 
     }
-    
+
     @Test
     public void infiniteLoopTest() throws Exception {
-    	try (InputStream is = AcroFieldsTest.class.getResourceAsStream("/pades_infinite_loop.pdf");
-    			PdfReader reader = new PdfReader(is)) {
-    		assertTimeoutPreemptively(ofMillis(500), () -> {
-	    		reader.getAcroFields();
-    		});
-    	}
-    	
+        try (InputStream is = AcroFieldsTest.class.getResourceAsStream("/pades_infinite_loop.pdf");
+                PdfReader reader = new PdfReader(is)) {
+            assertTimeoutPreemptively(ofMillis(500), () -> {
+                reader.getAcroFields();
+            });
+        }
+
     }
 
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/BarcodeMacroPDF417Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/BarcodeMacroPDF417Test.java
index a025c7465..bc3f84a83 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/BarcodeMacroPDF417Test.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/BarcodeMacroPDF417Test.java
@@ -3,17 +3,17 @@
 import com.lowagie.text.Document;
 import com.lowagie.text.Image;
 import com.lowagie.text.Paragraph;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class BarcodeMacroPDF417Test {
+
     private static final Path OUTPUT_DIR = Paths.get(".", "target", "test-classes");
     private static final Path COMP_DIR = Paths.get(".", "src", "test", "resources");
     private static final String FILENAME = "barcode_macro_pdf_417.pdf";
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/BaseFontTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/BaseFontTest.java
index 8d9f10f13..faeff5b09 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/BaseFontTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/BaseFontTest.java
@@ -28,7 +28,7 @@ void testGetFullFontName() throws IOException {
         String[][] fullFontName = BaseFont.getFullFontName("ViaodaLibre-Regular.ttf", "UTF-8", bytes);
         // then
         assertThat(fullFontName).hasDimensions(1, 4)
-            .contains(new String[]{"3", "1", "1033", "Viaoda Libre Regular"}, atIndex(0));
+                .contains(new String[]{"3", "1", "1033", "Viaoda Libre Regular"}, atIndex(0));
     }
 
     // test getDescent()
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/ColumnTextSeparator.java b/openpdf/src/test/java/com/lowagie/text/pdf/ColumnTextSeparator.java
index 9d14178d4..e5b4ff335 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/ColumnTextSeparator.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/ColumnTextSeparator.java
@@ -4,33 +4,27 @@
 
 package com.lowagie.text.pdf;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-
-import org.junit.jupiter.api.Test;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Phrase;
-import com.lowagie.text.pdf.ColumnText;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.draw.LineSeparator;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import org.junit.jupiter.api.Test;
 
 public class ColumnTextSeparator {
 
+    public static final float[][] COLUMNS = {{36, 36, 296, 806}, {299, 36, 559, 806}};
     private String filePath;
 
-    public static final float[][] COLUMNS = {{ 36, 36, 296, 806 } , { 299, 36, 559, 806 }};
-
     @Test
-    public void test_columnTextSeparator() throws Exception{
-        filePath = System.getProperty("user.dir")+"/src/test/resources";
+    public void test_columnTextSeparator() throws Exception {
+        filePath = System.getProperty("user.dir") + "/src/test/resources";
 
-        File RESULT = new File(filePath+"/columnTextSeparator.pdf");
+        File RESULT = new File(filePath + "/columnTextSeparator.pdf");
         // step 1
         Document document = new Document(PageSize.A4);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -58,13 +52,14 @@ public void test_columnTextSeparator() throws Exception{
         int column = 0;
         int status = ColumnText.START_COLUMN;
         while (ColumnText.hasMoreText(status)) {
-            ct.setSimpleColumn(COLUMNS[column][0], COLUMNS[column][1],COLUMNS[column][2], COLUMNS[column][3]);
+            ct.setSimpleColumn(COLUMNS[column][0], COLUMNS[column][1], COLUMNS[column][2], COLUMNS[column][3]);
             ct.setYLine(COLUMNS[column][3]);
             status = ct.go();
             linesWritten += ct.getLinesWritten();
             column = Math.abs(column - 1);
-            if (column == 0)
+            if (column == 0) {
                 document.newPage();
+            }
         }
 
         document.close();
@@ -75,8 +70,4 @@ public void test_columnTextSeparator() throws Exception{
     }
 
 
-
-
-
-
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/ColumnTextTableTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/ColumnTextTableTest.java
index 4b09192f2..70c71d8a7 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/ColumnTextTableTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/ColumnTextTableTest.java
@@ -21,17 +21,15 @@ public class ColumnTextTableTest {
     public static float A4_MARGIN_RIGHT = 40;
     public static float A4_MARGIN_TOP = 100;
     public static float A4_MARGIN_BOTTOM = A4_MARGIN_TOP;
-    public static float A4_WIDTH_BODY = PageSize.A4.getWidth()-A4_MARGIN_LEFT-A4_MARGIN_RIGHT;
-    public static float A4_HEIGHT_BODY = PageSize.A4.getHeight()-A4_MARGIN_TOP-A4_MARGIN_BOTTOM;
-
+    public static float A4_HEIGHT_BODY = PageSize.A4.getHeight() - A4_MARGIN_TOP - A4_MARGIN_BOTTOM;
+    public static float A4_WIDTH_BODY = PageSize.A4.getWidth() - A4_MARGIN_LEFT - A4_MARGIN_RIGHT;
     protected PdfWriter pdfWriter;
 
     /**
-     * Test scenario: Generate a pdf file with a table, and this table is generated
-     * by the ColumnText class.
+     * Test scenario: Generate a pdf file with a table, and this table is generated by the ColumnText class.
      */
     @Test
-    public void testGenerateTableByColumnText() throws Exception{
+    public void testGenerateTableByColumnText() throws Exception {
 
         File outputPDF = new File("target/columnTextTableTest.pdf");
 
@@ -48,8 +46,8 @@ public void testGenerateTableByColumnText() throws Exception{
         PdfPTable table = getPdfPTable();
 
         ColumnText ct = new ColumnText(pdfWriter.getDirectContent());
-        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY+A4_MARGIN_LEFT, A4_HEIGHT_BODY+A4_MARGIN_BOTTOM);
-
+        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY + A4_MARGIN_LEFT,
+                A4_HEIGHT_BODY + A4_MARGIN_BOTTOM);
 
         ct.addElement(table);
 
@@ -65,11 +63,10 @@ public void testGenerateTableByColumnText() throws Exception{
     }
 
     /**
-     * Test scenario: Generate a pdf file with multi tables, and this tables is generated
-     * by the ColumnText class.
+     * Test scenario: Generate a pdf file with multi tables, and this tables is generated by the ColumnText class.
      */
     @Test
-    public void testGenerateMultiTablesByColumnText() throws Exception{
+    public void testGenerateMultiTablesByColumnText() throws Exception {
 
         File outputPDF = new File("target/columnTextMultiTableTest.pdf");
 
@@ -86,15 +83,16 @@ public void testGenerateMultiTablesByColumnText() throws Exception{
         PdfPTable table = getPdfPTable();
 
         ColumnText ct = new ColumnText(pdfWriter.getDirectContent());
-        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY+A4_MARGIN_LEFT, A4_HEIGHT_BODY+A4_MARGIN_BOTTOM);
+        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY + A4_MARGIN_LEFT,
+                A4_HEIGHT_BODY + A4_MARGIN_BOTTOM);
 
         ct.addElement(table);
 
-        ct.setYLine(ct.getYLine()-10);
+        ct.setYLine(ct.getYLine() - 10);
 
         ct.go(false);
 
-        ct.setYLine(ct.getYLine()-10);
+        ct.setYLine(ct.getYLine() - 10);
 
         ct.addElement(table);
 
@@ -109,20 +107,21 @@ public void testGenerateMultiTablesByColumnText() throws Exception{
 
     /**
      * Get the PdfPTable which will be written into the PDF file.
+     *
      * @return PdfPTable
      */
-    PdfPTable getPdfPTable(){
-        Paragraph f1,f2;
+    PdfPTable getPdfPTable() {
+        Paragraph f1, f2;
         PdfPTable table;
         table = new PdfPTable(1);
         table.setTotalWidth(A4_WIDTH_BODY);
         table.setLockedWidth(true);
         table.setSplitRows(false);
         PdfPCell cell;
-        f1 = new Paragraph( new Chunk("cell1 example content"));
+        f1 = new Paragraph(new Chunk("cell1 example content"));
         f1.add(Chunk.NEWLINE);
         f1.setAlignment(Element.ALIGN_CENTER);
-        f2 = new Paragraph( new Chunk("cell2 example content"));
+        f2 = new Paragraph(new Chunk("cell2 example content"));
         f2.add(Chunk.NEWLINE);
         f2.setAlignment(Element.ALIGN_CENTER);
         cell = new PdfPCell();
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/CrossReferenceTableEncodingTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/CrossReferenceTableEncodingTest.java
index 71bc8aa1e..c37b9dad8 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/CrossReferenceTableEncodingTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/CrossReferenceTableEncodingTest.java
@@ -18,9 +18,9 @@ public class CrossReferenceTableEncodingTest {
 
     private static String filterPdf(final String pdf) {
         return pdf.replaceAll("<>", "")
-            .replaceAll("<>", "")
-            .replaceAll("<>", "<>")
-            .replaceAll("startxref\\n(\\d+)\\n%%EOF", "startxref\nXXXXX\n%%EOF");
+                .replaceAll("<>", "")
+                .replaceAll("<>", "<>")
+                .replaceAll("startxref\\n(\\d+)\\n%%EOF", "startxref\nXXXXX\n%%EOF");
     }
 
     // This test was once red, even it was not easy to accomplish this. The test must be run with
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/DocumentProducerHelper.java b/openpdf/src/test/java/com/lowagie/text/pdf/DocumentProducerHelper.java
index fec61b650..b8459e62e 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/DocumentProducerHelper.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/DocumentProducerHelper.java
@@ -1,10 +1,9 @@
 package com.lowagie.text.pdf;
 
-import java.io.ByteArrayOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
+import java.io.ByteArrayOutputStream;
 
 public class DocumentProducerHelper {
 
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/FontSubsetTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/FontSubsetTest.java
index 5700e1c6d..b56cab283 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/FontSubsetTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/FontSubsetTest.java
@@ -1,20 +1,19 @@
 package com.lowagie.text.pdf;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
-import org.apache.commons.io.IOUtils;
-import org.bouncycastle.crypto.prng.FixedSecureRandom;
-import org.junit.jupiter.api.Test;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.SecureRandom;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.commons.io.IOUtils;
+import org.bouncycastle.crypto.prng.FixedSecureRandom;
+import org.junit.jupiter.api.Test;
 
 public class FontSubsetTest {
 
@@ -24,14 +23,15 @@ public class FontSubsetTest {
     @Test
     public void createSubsetPrefixTest() throws Exception {
         BaseFont font = BaseFont.createFont("LiberationSerif-Regular.ttf", BaseFont.IDENTITY_H,
-                BaseFont.EMBEDDED,true, getFontByte("fonts/liberation-serif/LiberationSerif-Regular.ttf"), null);
+                BaseFont.EMBEDDED, true, getFontByte("fonts/liberation-serif/LiberationSerif-Regular.ttf"), null);
         assertNotEquals(font.createSubsetPrefix(), font.createSubsetPrefix());
 
         byte[] baseSeed = new SecureRandom().generateSeed(512);
         // init deterministic SecureRandom with a custom base seed
         SecureRandom secureRandom = new FixedSecureRandom(baseSeed);
         font.setSecureRandom(secureRandom);
-        assertNotEquals(font.createSubsetPrefix(), font.createSubsetPrefix()); // still different, as FixedSecureRandom generates a new random on each step
+        assertNotEquals(font.createSubsetPrefix(),
+                font.createSubsetPrefix()); // still different, as FixedSecureRandom generates a new random on each step
 
         SecureRandom secureRandomOne = new FixedSecureRandom(baseSeed);
         font.setSecureRandom(secureRandomOne);
@@ -69,7 +69,7 @@ private void checkCidSetPresence(boolean includeCidSet) throws Exception {
             document.open();
 
             BaseFont font = BaseFont.createFont("LiberationSerif-Regular.ttf", BaseFont.IDENTITY_H,
-                    BaseFont.EMBEDDED,true, getFontByte("fonts/liberation-serif/LiberationSerif-Regular.ttf"), null);
+                    BaseFont.EMBEDDED, true, getFontByte("fonts/liberation-serif/LiberationSerif-Regular.ttf"), null);
             font.setIncludeCidSet(includeCidSet);
             String text = "This is the test string.";
             document.add(new Paragraph(text, new Font(font, 12)));
@@ -82,12 +82,14 @@ private void checkCidSetPresence(boolean includeCidSet) throws Exception {
         try (PdfReader reader = new PdfReader(documentBytes)) {
             for (int k = 1; k < reader.getXrefSize(); ++k) {
                 PdfObject obj = reader.getPdfObjectRelease(k);
-                if (obj == null || !obj.isDictionary())
+                if (obj == null || !obj.isDictionary()) {
                     continue;
+                }
                 PdfDictionary dic = (PdfDictionary) obj;
                 PdfObject type = PdfReader.getPdfObjectRelease(dic.get(PdfName.TYPE));
-                if (type == null || !type.isName())
+                if (type == null || !type.isName()) {
                     continue;
+                }
                 PdfDictionary fd = dic.getAsDict(PdfName.FONTDESCRIPTOR);
                 if (PdfName.FONT.equals(type) && fd != null) {
                     PdfIndirectReference cidset = fd.getAsIndirectObject(PdfName.CIDSET);
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/GlyphListTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/GlyphListTest.java
index 440f74bba..41a8f78af 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/GlyphListTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/GlyphListTest.java
@@ -6,21 +6,28 @@
 
 class GlyphListTest {
 
-  @Test
-  void shouldContainGlyphList() {
+    @Test
+    void shouldContainGlyphList() {
 
-    // test some of the unicode codes in the glyph list
-    int[] glyphs = new int[]{65, 198, 508, 482, 63462, 193, 63457, 258, 7854, 1232, 7862, 7856, 7858, 7860, 461, 9398, 194, 7844, 7852,
-        7846, 7848, 63458, 7850, 63177, 63412, 1040, 512, 196, 1234, 478, 63460, 7840, 480, 192, 63456, 7842, 1236, 514, 913, 902, 256,
-        65313, 260, 197, 506, 7680, 63461, 63329, 195, 63459, 1329, 66, 9399, 7682, 7684, 1041, 1330, 914, 385, 7686, 65314, 63220, 63330,
-        386, 67, 1342, 262, 63178, 63221, 268, 199, 7688, 63463, 9400, 264, 266, 266, 63416, 1353, 1212, 1063, 1214, 1206, 1268, 1347, 1227,
-        1208, 935, 391, 63222, 65315, 1361, 63331, 68, 497, 452, 1332, 393, 270, 7696, 9401, 7698, 272, 7690, 7692, 1044, 1006, 8710, 916,
-        394, 63179, 63180, 63181, 63400, 988, 1026, 7694, 65316, 63223, 272, 63332, 395, 498, 453, 1248, 1029, 1039, 69, 201, 63465, 276,
-        282, 7708, 1333, 9402, 202, 7870, 7704, 7878, 7872, 7874, 63466, 7876, 1028, 516, 203, 63467, 278, 278, 7864, 1060, 200, 63464,
-        1335, 7866, 8551, 518, 1124, 1051, 8554, 274, 7702, 7700, 1052};
-    for (int glyph : glyphs) {
-      assertEquals(glyph, GlyphList.nameToUnicode(GlyphList.unicodeToName(glyph))[0]);
-    }
+        // test some of the unicode codes in the glyph list
+        int[] glyphs = new int[]{65, 198, 508, 482, 63462, 193, 63457, 258, 7854, 1232, 7862, 7856, 7858, 7860, 461,
+                9398, 194, 7844, 7852,
+                7846, 7848, 63458, 7850, 63177, 63412, 1040, 512, 196, 1234, 478, 63460, 7840, 480, 192, 63456, 7842,
+                1236, 514, 913, 902, 256,
+                65313, 260, 197, 506, 7680, 63461, 63329, 195, 63459, 1329, 66, 9399, 7682, 7684, 1041, 1330, 914, 385,
+                7686, 65314, 63220, 63330,
+                386, 67, 1342, 262, 63178, 63221, 268, 199, 7688, 63463, 9400, 264, 266, 266, 63416, 1353, 1212, 1063,
+                1214, 1206, 1268, 1347, 1227,
+                1208, 935, 391, 63222, 65315, 1361, 63331, 68, 497, 452, 1332, 393, 270, 7696, 9401, 7698, 272, 7690,
+                7692, 1044, 1006, 8710, 916,
+                394, 63179, 63180, 63181, 63400, 988, 1026, 7694, 65316, 63223, 272, 63332, 395, 498, 453, 1248, 1029,
+                1039, 69, 201, 63465, 276,
+                282, 7708, 1333, 9402, 202, 7870, 7704, 7878, 7872, 7874, 63466, 7876, 1028, 516, 203, 63467, 278, 278,
+                7864, 1060, 200, 63464,
+                1335, 7866, 8551, 518, 1124, 1051, 8554, 274, 7702, 7700, 1052};
+        for (int glyph : glyphs) {
+            assertEquals(glyph, GlyphList.nameToUnicode(GlyphList.unicodeToName(glyph))[0]);
+        }
 
-  }
+    }
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/LargePdfTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/LargePdfTest.java
index 7a0d66fc6..fcb975112 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/LargePdfTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/LargePdfTest.java
@@ -3,18 +3,15 @@
 import com.lowagie.text.Document;
 import com.lowagie.text.Image;
 import com.lowagie.text.Paragraph;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.nio.file.Files;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
- * This will create a file which is ~14GB, then attempt to read it.
- * This will crash, because OpenPDF doesn't support reading PDF files
- * larger than 2GB now.
- *
+ * This will create a file which is ~14GB, then attempt to read it. This will crash, because OpenPDF doesn't support
+ * reading PDF files larger than 2GB now.
  */
 public class LargePdfTest {
 
@@ -33,7 +30,8 @@ void writeLargePdf() throws Exception {
         }
 
         for (long i = 0; i < 120000; i++) {
-            Image jpg = Image.getInstance("../pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/sunflower-back.jpg");
+            Image jpg = Image.getInstance(
+                    "../pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/sunflower-back.jpg");
             document.add(jpg);
             document.add(new Paragraph(longString));
         }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java
index fc5097d5a..18a4e8893 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/LayoutProcessor534Test.java
@@ -44,8 +44,8 @@ void whenLayoutRightToLeftLatinThenRevertCharOrder() throws IOException {
         document.open();
         // when
         String text = "one two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen "
-            + "sixteen seventeen eighteen nineteen twenty twentyεOne twentyTwo twentyThree twentyFour twentyFive "
-            + "twentySix twentySeven twentyEight twentyNine thirty ";
+                + "sixteen seventeen eighteen nineteen twenty twentyεOne twentyTwo twentyThree twentyFour twentyFive "
+                + "twentySix twentySeven twentyEight twentyNine thirty ";
         text = text + text;
 
         Paragraph paragraph = new Paragraph(new Chunk(text));
@@ -57,13 +57,13 @@ void whenLayoutRightToLeftLatinThenRevertCharOrder() throws IOException {
         PdfTextExtractor extractor = new PdfTextExtractor(new PdfReader(pdfOut.toByteArray()));
         String textFromPage = extractor.getTextFromPage(1);
         assertThat(textFromPage)
-            .isEqualTo("owTytnewt enOεytnewt ytnewt neetenin neethgie neetneves neetxis neetfif neetruof neetriht "
-                + "evlewt nevele net enin thgie neves xis evif ruof eerht owt eno\n"
-                + " evlewt nevele net enin thgie neves xis evif ruof eerht owt eno ytriht eniNytnewt thgiEytnewt "
-                + "neveSytnewt xiSytnewt eviFytnewt ruoFytnewt eerhTytnewt\n"
-                + " neveSytnewt xiSytnewt eviFytnewt ruoFytnewt eerhTytnewt owTytnewt enOεytnewt ytnewt neetenin n"
-                + "eethgie neetneves neetxis neetfif neetruof neetriht\n"
-                + " ytriht eniNytnewt thgiEytnewt");
+                .isEqualTo("owTytnewt enOεytnewt ytnewt neetenin neethgie neetneves neetxis neetfif neetruof neetriht "
+                        + "evlewt nevele net enin thgie neves xis evif ruof eerht owt eno\n"
+                        + " evlewt nevele net enin thgie neves xis evif ruof eerht owt eno ytriht eniNytnewt thgiEytnewt "
+                        + "neveSytnewt xiSytnewt eviFytnewt ruoFytnewt eerhTytnewt\n"
+                        + " neveSytnewt xiSytnewt eviFytnewt ruoFytnewt eerhTytnewt owTytnewt enOεytnewt ytnewt neetenin n"
+                        + "eethgie neetneves neetxis neetfif neetruof neetriht\n"
+                        + " ytriht eniNytnewt thgiEytnewt");
     }
 
     @Test
@@ -75,12 +75,12 @@ void whenLayoutRightToLeftHebrewThenRevertCharOrder() throws IOException {
         document.open();
         // when
         String text = "שוב היתה זו שעת לילה. דממה שררה בפונדק ×בן־הדרך, והיתה זו דממה בת שלושה חלקי×." +
-            "החלק המתבקש מ×ליו ×”×™×” שקט חלול, מהדהד, עשוי מן ×”×“×‘×¨×™× ×©×œ× ×”×™×•. ×ילו היתה רוח, ×›×™" +
-            "××– היתה × ×נחת בעוברה בין העצי×, מטלטלת ×ת שלט הפונדק בחריקה על ציריו וסוחפת ×ת" +
-            "הדממה במורד הדרך, כפי ×©×”×™× ×’×•×¨×¤×ª עלי סתיו. ×ילו ×”×™×” קהל בפונדק, ×פילו קומץ ×נשי×, ×›×™" +
-            "××– היו ממל××™× ×ת הדממה בשיחה ובצחוק, בהמולה ובש×ון שהיה ×ž×§×•× ×œ×¦Ö·×¤×•×ª ×œ×”× ×‘×ž×¡×‘××”," +
-            "בשעות הלילה החשוכות. ×ילו היתה מוסיקה... ×בל ×œ× , וד××™ ×©×œ× ×”×™×ª×” מוסיקה. למען ×”×מת, ××£" +
-            "×œ× ×חד ×ž×”×“×‘×¨×™× ×”×לה ×”×™×” ש×, ולכן נותרה הדממה בעינה.";
+                "החלק המתבקש מ×ליו ×”×™×” שקט חלול, מהדהד, עשוי מן ×”×“×‘×¨×™× ×©×œ× ×”×™×•. ×ילו היתה רוח, ×›×™" +
+                "××– היתה × ×נחת בעוברה בין העצי×, מטלטלת ×ת שלט הפונדק בחריקה על ציריו וסוחפת ×ת" +
+                "הדממה במורד הדרך, כפי ×©×”×™× ×’×•×¨×¤×ª עלי סתיו. ×ילו ×”×™×” קהל בפונדק, ×פילו קומץ ×נשי×, ×›×™" +
+                "××– היו ממל××™× ×ת הדממה בשיחה ובצחוק, בהמולה ובש×ון שהיה ×ž×§×•× ×œ×¦Ö·×¤×•×ª ×œ×”× ×‘×ž×¡×‘××”," +
+                "בשעות הלילה החשוכות. ×ילו היתה מוסיקה... ×בל ×œ× , וד××™ ×©×œ× ×”×™×ª×” מוסיקה. למען ×”×מת, ××£" +
+                "×œ× ×חד ×ž×”×“×‘×¨×™× ×”×לה ×”×™×” ש×, ולכן נותרה הדממה בעינה.";
 
         Paragraph paragraph = new Paragraph(new Chunk(text));
         paragraph.setAlignment(Element.ALIGN_JUSTIFIED);
@@ -91,15 +91,15 @@ void whenLayoutRightToLeftHebrewThenRevertCharOrder() throws IOException {
         byte[] pdfBytes = pdfOut.toByteArray();
         PdfTextExtractor extractor = new PdfTextExtractor(new PdfReader(pdfBytes));
         String expected = ".ויה ×לש ×ירבדה ןמ יושע ,דהדהמ ,לולח טקש ×”×™×” ויל×מ"
-            + " שקבתמה קלחה.×יקלח השולש תב הממד וז התיהו ,×š×¨×“×”Ö¾×Ÿ×‘× ×§×“× ×•×¤×‘ הררש הממד .הליל תעש וז התיה בוש\n"
-            + " ×•×œ×™× .ויתס ילע תפרוג ×יהש יפכ ,ךרדה דרומב הממדהת×"
-            + " תפחוסו ויריצ לע הקירחב קדנופה טלש ×ª× ×ª×œ×˜×œ×˜×ž ,×יצעה ןיב הרבועב תחנ××  התיה ×–××™×› ,חור התיה ולי×\n"
-            + " ×•×œ×™× .תוכושחה הלילה תועשב,×”×בסמב ×הל תופַצל"
-            + " ×וקמ היהש ןו×שבו הלומהב ,קוחצבו החישב הממדה ×ª× ××™×לממ ויה ×–××™×› ,××™×©× × ×¥×ž×•×§ ×•×œ×™×¤× ,קדנופב להק ×”×™×”\n"
-            + " .הניעב הממדה"
-            + " הרתונ ןכלו ,×ש ×”×™×” הל××” ×ירבדהמ ×“×—× ××œ×£× ,תמ××” ןעמל .הקיסומ התיה ×לש ×™×דו , ×ל ×œ×‘× ...הקיסומ התיה";
+                + " שקבתמה קלחה.×יקלח השולש תב הממד וז התיהו ,×š×¨×“×”Ö¾×Ÿ×‘× ×§×“× ×•×¤×‘ הררש הממד .הליל תעש וז התיה בוש\n"
+                + " ×•×œ×™× .ויתס ילע תפרוג ×יהש יפכ ,ךרדה דרומב הממדהת×"
+                + " תפחוסו ויריצ לע הקירחב קדנופה טלש ×ª× ×ª×œ×˜×œ×˜×ž ,×יצעה ןיב הרבועב תחנ××  התיה ×–××™×› ,חור התיה ולי×\n"
+                + " ×•×œ×™× .תוכושחה הלילה תועשב,×”×בסמב ×הל תופַצל"
+                + " ×וקמ היהש ןו×שבו הלומהב ,קוחצבו החישב הממדה ×ª× ××™×לממ ויה ×–××™×› ,××™×©× × ×¥×ž×•×§ ×•×œ×™×¤× ,קדנופב להק ×”×™×”\n"
+                + " .הניעב הממדה"
+                + " הרתונ ןכלו ,×ש ×”×™×” הל××” ×ירבדהמ ×“×—× ××œ×£× ,תמ××” ןעמל .הקיסומ התיה ×לש ×™×דו , ×ל ×œ×‘× ...הקיסומ התיה";
         assertThat(extractor.getTextFromPage(1))
-            .isEqualTo(expected);
+                .isEqualTo(expected);
     }
 
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PRAcroFormTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PRAcroFormTest.java
index 265ac0616..d52af2af4 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PRAcroFormTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PRAcroFormTest.java
@@ -4,20 +4,19 @@
 import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
 
 import java.io.InputStream;
-
 import org.junit.jupiter.api.Test;
 
 public class PRAcroFormTest {
-	
+
     @Test
     public void infiniteLoopTest() throws Exception {
         try (InputStream is = PRAcroFormTest.class.getResourceAsStream("/pades_opposite_infinite_loop.pdf");
                 PdfReader reader = new PdfReader(is)) {
             assertTimeoutPreemptively(ofMillis(500), () -> {
-    			reader.getAcroForm();
+                reader.getAcroForm();
             });
         }
-        
+
     }
 
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfCopyTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfCopyTest.java
index 3b7c47fbc..e88be6d71 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfCopyTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfCopyTest.java
@@ -1,16 +1,16 @@
 package com.lowagie.text.pdf;
 
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.FileOutputStream;
-import java.io.File;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class PdfCopyTest {
+
     @Test
     void nullpointerExceptionTest() {
         //given when
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocument536Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocument536Test.java
index a84341df1..7024efcbf 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocument536Test.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocument536Test.java
@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.Test;
 
 public class PdfDocument536Test {
+
     @Test
     public void whenSkipFirstHeader_thenHeaderIsNotPresentOnFirstPage() throws IOException {
         // given
@@ -40,9 +41,9 @@ public void whenSkipFirstHeader_thenHeaderIsNotPresentOnFirstPage() throws IOExc
         PdfTextExtractor extractor = new PdfTextExtractor(reader);
         // then
         assertThat(extractor.getTextFromPage(1)).as("First Page")
-            .doesNotContain("HEADER 1", "HEADER 2", "HEADER 3");
+                .doesNotContain("HEADER 1", "HEADER 2", "HEADER 3");
         assertThat(extractor.getTextFromPage(2)).as("SecondPage")
-            .contains("HEADER 1", "HEADER 2", "HEADER 3");
+                .contains("HEADER 1", "HEADER 2", "HEADER 3");
     }
 
     private void addCell(PdfPTable table, String cellText) {
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocument620Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocument620Test.java
index 2bccaf34c..b3a95ef76 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocument620Test.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocument620Test.java
@@ -4,13 +4,12 @@
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.FontFactory;
 import com.lowagie.text.Paragraph;
+import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
 /**
  * @author SE_SUSTech, group: Lanrand test issue #620
  * 
              This file is to test the code for fix the bugs in the issue #620
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocumentTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocumentTest.java
index fcb394689..f118b1b8b 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocumentTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfDocumentTest.java
@@ -39,12 +39,16 @@ List testCreateWithAllElementsInOneCell() {
                     final PdfPCell[] cells = result.getRows().get(0).getCells();
                     assertThat(cells.length, equalTo(1));
                 }),
-                DynamicTest.dynamicTest("elements in cell should be 5", () -> assertThat(getCellElements(result).size(), equalTo(5))),
+                DynamicTest.dynamicTest("elements in cell should be 5",
+                        () -> assertThat(getCellElements(result).size(), equalTo(5))),
                 DynamicTest.dynamicTest("element text should be '" + PARAGRAPH_TEXT_1 + "'",
-                        () -> assertThat(getCellElements(result).get(0).getChunks().toString(), equalTo(paragraph1.toString()))),
-                DynamicTest.dynamicTest("element should be table", () -> assertThat(getCellElements(result).get(2), equalTo(table))),
+                        () -> assertThat(getCellElements(result).get(0).getChunks().toString(),
+                                equalTo(paragraph1.toString()))),
+                DynamicTest.dynamicTest("element should be table",
+                        () -> assertThat(getCellElements(result).get(2), equalTo(table))),
                 DynamicTest.dynamicTest("element text should be '" + PARAGRAPH_TEXT_2 + "'",
-                        () -> assertThat(getCellElements(result).get(3).getChunks().toString(), equalTo(paragraph2.toString()))));
+                        () -> assertThat(getCellElements(result).get(3).getChunks().toString(),
+                                equalTo(paragraph2.toString()))));
     }
 
     private List getCellElements(PdfPTable result) {
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfFormFlatteningTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfFormFlatteningTest.java
index d28b6bf71..7b222f509 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfFormFlatteningTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfFormFlatteningTest.java
@@ -5,106 +5,125 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 
 public class PdfFormFlatteningTest {
 
-    
+
     /**
      * Flattens a problematic document. Issue described here: https://stackoverflow.com/questions/47797647
+     *
      * @throws IOException
      */
     @Test
     void testFlattenSignatureDocument() throws IOException {
-        try (   InputStream resource = getClass().getResourceAsStream("/flattening/20231027-DistortedFlatteningInternetExample.pdf")  ) {
-            
-            Assertions.assertNotNull(resource,"File could not be found!");
-            
-            FileOutputStream fos = new FileOutputStream(new File("target/20231027-DistortedFlatteningInternetExample-flattened.pdf"));
-            
+        try (InputStream resource = getClass().getResourceAsStream(
+                "/flattening/20231027-DistortedFlatteningInternetExample.pdf")) {
+
+            Assertions.assertNotNull(resource, "File could not be found!");
+
+            FileOutputStream fos = new FileOutputStream(
+                    new File("target/20231027-DistortedFlatteningInternetExample-flattened.pdf"));
+
             PdfReader pdfReader = new PdfReader(resource);
-            PdfStamper stamper = new PdfStamper(pdfReader,fos);
-            
+            PdfStamper stamper = new PdfStamper(pdfReader, fos);
+
             stamper.setFormFlattening(true);
-                       
+
             pdfReader.close();
             stamper.close();
         }
         //Verify no form fields left (the correct shape is difficult to verify...)
-        try (   InputStream resource = new FileInputStream(new File("target/20231027-DistortedFlatteningInternetExample-flattened.pdf"))) {
-            
-            Assertions.assertNotNull(resource,"File could not be found!");
+        try (InputStream resource = new FileInputStream(
+                new File("target/20231027-DistortedFlatteningInternetExample-flattened.pdf"))) {
+
+            Assertions.assertNotNull(resource, "File could not be found!");
             PdfReader pdfReader = new PdfReader(resource);
-            
-            PdfDictionary acroForm = (PdfDictionary)PdfReader.getPdfObjectRelease(pdfReader.getCatalog().get(PdfName.ACROFORM));
-            Assertions.assertTrue(acroForm==null || acroForm.getAsArray(PdfName.FIELDS)==null || acroForm.getAsArray(PdfName.FIELDS).isEmpty());
-            
+
+            PdfDictionary acroForm = (PdfDictionary) PdfReader.getPdfObjectRelease(
+                    pdfReader.getCatalog().get(PdfName.ACROFORM));
+            Assertions.assertTrue(
+                    acroForm == null || acroForm.getAsArray(PdfName.FIELDS) == null || acroForm.getAsArray(
+                            PdfName.FIELDS).isEmpty());
+
             pdfReader.close();
         }
     }
-    
+
     /**
      * Flattens a problematic document. Issue described here: https://stackoverflow.com/questions/47755629
+     *
      * @throws IOException
      */
     @Test
     void testFlattenCheckboxDocument() throws IOException {
-        try (   InputStream resource = getClass().getResourceAsStream("/flattening/20180301-CheckboxFlatteningBug.pdf")  ) {
-            
-            Assertions.assertNotNull(resource,"File could not be found!");
-            FileOutputStream fos = new FileOutputStream(new File("target/20180301-CheckboxFlatteningBug-flattened.pdf"));
-            
+        try (InputStream resource = getClass().getResourceAsStream("/flattening/20180301-CheckboxFlatteningBug.pdf")) {
+
+            Assertions.assertNotNull(resource, "File could not be found!");
+            FileOutputStream fos = new FileOutputStream(
+                    new File("target/20180301-CheckboxFlatteningBug-flattened.pdf"));
+
             PdfReader pdfReader = new PdfReader(resource);
-            PdfStamper stamper = new PdfStamper(pdfReader,fos);
-            
+            PdfStamper stamper = new PdfStamper(pdfReader, fos);
+
             stamper.setFormFlattening(true);
-                       
+
             pdfReader.close();
             stamper.close();
         }
         //Verify no form fields left (the correct shape is difficult to verify...)
-        try (   InputStream resource = new FileInputStream(new File("target/20180301-CheckboxFlatteningBug-flattened.pdf"))) {
-            
-            Assertions.assertNotNull(resource,"File could not be found!");
+        try (InputStream resource = new FileInputStream(
+                new File("target/20180301-CheckboxFlatteningBug-flattened.pdf"))) {
+
+            Assertions.assertNotNull(resource, "File could not be found!");
             PdfReader pdfReader = new PdfReader(resource);
-            
-            PdfDictionary acroForm = (PdfDictionary)PdfReader.getPdfObjectRelease(pdfReader.getCatalog().get(PdfName.ACROFORM));
-            Assertions.assertTrue(acroForm==null || acroForm.getAsArray(PdfName.FIELDS)==null || acroForm.getAsArray(PdfName.FIELDS).isEmpty());
-            
+
+            PdfDictionary acroForm = (PdfDictionary) PdfReader.getPdfObjectRelease(
+                    pdfReader.getCatalog().get(PdfName.ACROFORM));
+            Assertions.assertTrue(
+                    acroForm == null || acroForm.getAsArray(PdfName.FIELDS) == null || acroForm.getAsArray(
+                            PdfName.FIELDS).isEmpty());
+
             pdfReader.close();
         }
     }
-    
+
     /**
      * Flattens a problematic document. Issue described here: https://stackoverflow.com/questions/47755629
+     *
      * @throws IOException
      */
     @Test
     void testFlattenTextfieldsWithRotationAndMatrix() throws IOException {
-        try (   InputStream resource = getClass().getResourceAsStream("/flattening/20231027-DistortedFlatteningSmall.pdf")  ) {
-            Assertions.assertNotNull(resource,"File could not be found!");
-            FileOutputStream fos = new FileOutputStream(new File("target/20231027-DistortedFlatteningSmall-flattened.pdf"));
-            
+        try (InputStream resource = getClass().getResourceAsStream(
+                "/flattening/20231027-DistortedFlatteningSmall.pdf")) {
+            Assertions.assertNotNull(resource, "File could not be found!");
+            FileOutputStream fos = new FileOutputStream(
+                    new File("target/20231027-DistortedFlatteningSmall-flattened.pdf"));
+
             PdfReader pdfReader = new PdfReader(resource);
-            PdfStamper stamper = new PdfStamper(pdfReader,fos);
-            
+            PdfStamper stamper = new PdfStamper(pdfReader, fos);
+
             stamper.setFormFlattening(true);
-                       
+
             pdfReader.close();
             stamper.close();
         }
         //Verify no form fields left (the correct shape is difficult to verify...)
-        try (   InputStream resource = new FileInputStream(new File("target/20231027-DistortedFlatteningSmall-flattened.pdf"))) {
-            
-            Assertions.assertNotNull(resource,"File could not be found!");
+        try (InputStream resource = new FileInputStream(
+                new File("target/20231027-DistortedFlatteningSmall-flattened.pdf"))) {
+
+            Assertions.assertNotNull(resource, "File could not be found!");
             PdfReader pdfReader = new PdfReader(resource);
-            
-            PdfDictionary acroForm = (PdfDictionary)PdfReader.getPdfObjectRelease(pdfReader.getCatalog().get(PdfName.ACROFORM));
-            Assertions.assertTrue(acroForm==null || acroForm.getAsArray(PdfName.FIELDS)==null || acroForm.getAsArray(PdfName.FIELDS).isEmpty());
-            
+
+            PdfDictionary acroForm = (PdfDictionary) PdfReader.getPdfObjectRelease(
+                    pdfReader.getCatalog().get(PdfName.ACROFORM));
+            Assertions.assertTrue(
+                    acroForm == null || acroForm.getAsArray(PdfName.FIELDS) == null || acroForm.getAsArray(
+                            PdfName.FIELDS).isEmpty());
+
             pdfReader.close();
         }
     }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfNameTreeTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfNameTreeTest.java
index 3e6bdf27c..207687942 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfNameTreeTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfNameTreeTest.java
@@ -8,17 +8,17 @@
 
 class PdfNameTreeTest {
 
-  @Test
-  void shouldReadTree() {
+    @Test
+    void shouldReadTree() {
 
-    PdfDictionary pdfDictionary = new PdfDictionary(PdfName.PDF);
-    final PdfBoolean pdfBoolean = new PdfBoolean(true);
-    final String keyName = "test";
-    pdfDictionary.put(PdfName.NAMES, new PdfArray(Arrays.asList(new PdfString(keyName), pdfBoolean)));
+        PdfDictionary pdfDictionary = new PdfDictionary(PdfName.PDF);
+        final PdfBoolean pdfBoolean = new PdfBoolean(true);
+        final String keyName = "test";
+        pdfDictionary.put(PdfName.NAMES, new PdfArray(Arrays.asList(new PdfString(keyName), pdfBoolean)));
 
-    final HashMap tree = PdfNameTree.readTree(pdfDictionary);
-    assertEquals(1, tree.size());
-    assertEquals(pdfBoolean, tree.get(keyName));
+        final HashMap tree = PdfNameTree.readTree(pdfDictionary);
+        assertEquals(1, tree.size());
+        assertEquals(pdfBoolean, tree.get(keyName));
 
-  }
+    }
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfProtectedDocumentTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfProtectedDocumentTest.java
index 502f8b5c1..051fcf292 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfProtectedDocumentTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfProtectedDocumentTest.java
@@ -1,9 +1,12 @@
 package com.lowagie.text.pdf;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import com.lowagie.text.DocWriter;
 import com.lowagie.text.Utilities;
-import org.junit.jupiter.api.Test;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -13,11 +16,7 @@
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.junit.jupiter.api.Test;
 
 public class PdfProtectedDocumentTest {
 
@@ -35,8 +34,8 @@ void signPasswordProtected() throws Exception {
         // Sign and compare the generated range
         for (int i = 0; i < 10; i++) {
             try (InputStream is = getClass().getResourceAsStream("/open_protected.pdf");
-                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                 PdfReader reader = new PdfReader(is, new byte[]{' '})) {
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    PdfReader reader = new PdfReader(is, new byte[]{' '})) {
                 originalDocId = reader.getDocumentId();
 
                 PdfStamper stp = PdfStamper.createSignature(reader, baos, '\0', null, true);
@@ -84,7 +83,7 @@ void signPasswordProtected() throws Exception {
 
             // Ensure document is readable
             try (InputStream is = new ByteArrayInputStream(documentBytes);
-                 PdfReader reader = new PdfReader(is, new byte[]{' '})) {
+                    PdfReader reader = new PdfReader(is, new byte[]{' '})) {
                 assertNotNull(reader);
 
                 byte[] documentId = reader.getDocumentId();
@@ -93,7 +92,8 @@ void signPasswordProtected() throws Exception {
 
                 PdfArray idArray = reader.getTrailer().getAsArray(PdfName.ID);
                 assertEquals(2, idArray.size());
-                assertArrayEquals(documentId, com.lowagie.text.DocWriter.getISOBytes(idArray.getPdfObject(0).toString()));
+                assertArrayEquals(documentId,
+                        com.lowagie.text.DocWriter.getISOBytes(idArray.getPdfObject(0).toString()));
 
                 byte[] currentChangingId = DocWriter.getISOBytes(idArray.getPdfObject(1).toString());
                 if (changingId != null) {
@@ -120,8 +120,8 @@ void signPasswordProtectedOverrideFileId() throws Exception {
         // Sign and compare the generated range
         for (int i = 0; i < 10; i++) {
             try (InputStream is = getClass().getResourceAsStream("/open_protected.pdf");
-                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                 PdfReader reader = new PdfReader(is, new byte[]{' '})) {
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    PdfReader reader = new PdfReader(is, new byte[]{' '})) {
                 originalDocId = reader.getDocumentId();
 
                 PdfStamper stp = PdfStamper.createSignature(reader, baos, '\0', null, true);
@@ -170,7 +170,7 @@ void signPasswordProtectedOverrideFileId() throws Exception {
 
             // Ensure document is readable
             try (InputStream is = new ByteArrayInputStream(documentBytes);
-                 PdfReader reader = new PdfReader(is, new byte[]{' '})) {
+                    PdfReader reader = new PdfReader(is, new byte[]{' '})) {
                 assertNotNull(reader);
 
                 byte[] documentId = reader.getDocumentId();
@@ -179,7 +179,8 @@ void signPasswordProtectedOverrideFileId() throws Exception {
 
                 PdfArray idArray = reader.getTrailer().getAsArray(PdfName.ID);
                 assertEquals(2, idArray.size());
-                assertArrayEquals(documentId, com.lowagie.text.DocWriter.getISOBytes(idArray.getPdfObject(0).toString()));
+                assertArrayEquals(documentId,
+                        com.lowagie.text.DocWriter.getISOBytes(idArray.getPdfObject(0).toString()));
                 assertEquals("123", idArray.getPdfObject(1).toString());
             }
         }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfSignatureAppearanceTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfSignatureAppearanceTest.java
index 806dee626..c513a6867 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfSignatureAppearanceTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfSignatureAppearanceTest.java
@@ -1,10 +1,12 @@
 package com.lowagie.text.pdf;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.Utilities;
-import org.junit.jupiter.api.Test;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -14,10 +16,7 @@
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.junit.jupiter.api.Test;
 
 public class PdfSignatureAppearanceTest {
 
@@ -37,8 +36,8 @@ void invisibleExternalSignature() throws DocumentException, IOException, NoSuchA
 
         for (int i = 0; i < 10; i++) {
             try (InputStream is = getClass().getResourceAsStream("/EmptyPage.pdf");
-                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                 PdfReader reader = new PdfReader(is)) {
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    PdfReader reader = new PdfReader(is)) {
                 originalDocId = reader.getDocumentId();
 
                 PdfStamper stp = PdfStamper.createSignature(reader, baos, '\0', null, true);
@@ -83,14 +82,16 @@ void invisibleExternalSignature() throws DocumentException, IOException, NoSuchA
                 resultDocument = baos.toByteArray();
             }
 
-            try (InputStream resultIS = new ByteArrayInputStream(resultDocument); PdfReader resultReader = new PdfReader(resultIS)) {
+            try (InputStream resultIS = new ByteArrayInputStream(
+                    resultDocument); PdfReader resultReader = new PdfReader(resultIS)) {
                 byte[] documentId = resultReader.getDocumentId();
                 assertNotNull(documentId);
                 assertArrayEquals(originalDocId, documentId);
 
                 PdfArray idArray = resultReader.getTrailer().getAsArray(PdfName.ID);
                 assertEquals(2, idArray.size());
-                assertArrayEquals(documentId, com.lowagie.text.DocWriter.getISOBytes(idArray.getPdfObject(0).toString()));
+                assertArrayEquals(documentId,
+                        com.lowagie.text.DocWriter.getISOBytes(idArray.getPdfObject(0).toString()));
                 assertEquals("123", idArray.getPdfObject(1).toString());
             }
         }
@@ -110,8 +111,8 @@ void visibleExternalSignature() throws DocumentException, IOException, NoSuchAlg
 
         for (int i = 0; i < 10; i++) {
             try (InputStream is = getClass().getResourceAsStream("/EmptyPage.pdf");
-                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                 PdfReader reader = new PdfReader(is)) {
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    PdfReader reader = new PdfReader(is)) {
                 originalDocId = reader.getDocumentId();
 
                 PdfStamper stp = PdfStamper.createSignature(reader, baos, '\0', null, true);
@@ -156,14 +157,16 @@ void visibleExternalSignature() throws DocumentException, IOException, NoSuchAlg
                 resultDocument = baos.toByteArray();
             }
 
-            try (InputStream resultIS = new ByteArrayInputStream(resultDocument); PdfReader resultReader = new PdfReader(resultIS)) {
+            try (InputStream resultIS = new ByteArrayInputStream(
+                    resultDocument); PdfReader resultReader = new PdfReader(resultIS)) {
                 byte[] documentId = resultReader.getDocumentId();
                 assertNotNull(documentId);
                 assertArrayEquals(originalDocId, documentId);
 
                 PdfArray idArray = resultReader.getTrailer().getAsArray(PdfName.ID);
                 assertEquals(2, idArray.size());
-                assertArrayEquals(documentId, com.lowagie.text.DocWriter.getISOBytes(idArray.getPdfObject(0).toString()));
+                assertArrayEquals(documentId,
+                        com.lowagie.text.DocWriter.getISOBytes(idArray.getPdfObject(0).toString()));
                 assertEquals("123", idArray.getPdfObject(1).toString());
             }
         }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfSignatureRangeTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfSignatureRangeTest.java
index b89c88c06..4bf5ad94f 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfSignatureRangeTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfSignatureRangeTest.java
@@ -1,36 +1,18 @@
 package com.lowagie.text.pdf;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.Utilities;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.junit.jupiter.api.Test;
 
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.Utilities;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class PdfSignatureRangeTest {
 
-    @Test
-    void bigFileSignature() throws DocumentException, IOException {
-        byte[] pdf = Utilities.toByteArray(getClass().getResourceAsStream("/EmptyPage.pdf"));
-        checkSignature(pdf);
-        checkSignature(enlarge(pdf, 100001));
-        checkSignature(enlarge(pdf, 16777217)); // must be odd, as only the last bit is lost
-    }
-
-    @Test
-    void objectXrefDocumentSignature() throws DocumentException, IOException {
-        byte[] pdf = Utilities.toByteArray(getClass().getResourceAsStream("/objectXref.pdf"));
-        checkSignature(pdf);
-        checkSignature(enlarge(pdf, 100001));
-        checkSignature(enlarge(pdf, 16777217)); // must be odd, as only the last bit is lost
-    }
-
     private static void checkSignature(byte[] pdf) throws IOException {
         byte[] produced = fakeSignature(pdf);
         try (PdfReader r = new PdfReader(produced)) {
@@ -72,4 +54,20 @@ private static byte[] enlarge(byte[] pdf, int size) {
         return out;
     }
 
+    @Test
+    void bigFileSignature() throws DocumentException, IOException {
+        byte[] pdf = Utilities.toByteArray(getClass().getResourceAsStream("/EmptyPage.pdf"));
+        checkSignature(pdf);
+        checkSignature(enlarge(pdf, 100001));
+        checkSignature(enlarge(pdf, 16777217)); // must be odd, as only the last bit is lost
+    }
+
+    @Test
+    void objectXrefDocumentSignature() throws DocumentException, IOException {
+        byte[] pdf = Utilities.toByteArray(getClass().getResourceAsStream("/objectXref.pdf"));
+        checkSignature(pdf);
+        checkSignature(enlarge(pdf, 100001));
+        checkSignature(enlarge(pdf, 16777217)); // must be odd, as only the last bit is lost
+    }
+
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfSmartCopyTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfSmartCopyTest.java
index 5851faccc..1895b9f98 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfSmartCopyTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfSmartCopyTest.java
@@ -1,29 +1,26 @@
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.Document;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.time.Duration;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import com.lowagie.text.Document;
-
 public class PdfSmartCopyTest {
-    
+
     public PdfSmartCopyTest() {
         super();
     }
-    
+
     @Test
     public void test1() throws IOException {
         File orig = new File("src/test/resources/pdfsmartcopy_bec.pdf");
         check(orig, 1);
     }
-    
 
-    
+
     private void check(File orig, int count) throws IOException {
         Assertions.assertTimeout(Duration.ofSeconds(10), () -> {
             File out = new File("target/test-classes/pdfsmartocy-" + count + ".pdf");
@@ -31,9 +28,9 @@ private void check(File orig, int count) throws IOException {
             Document document = new Document();
             FileOutputStream outputStream = new FileOutputStream(out);
             PdfCopy copy = new PdfSmartCopy(document, outputStream);
-    //        PdfCopy copy = new PdfCopy(document, outputStream);
+            //        PdfCopy copy = new PdfCopy(document, outputStream);
             document.open();
-            
+
             PdfReader reader = new PdfReader(orig.getAbsolutePath());
             int n = reader.getNumberOfPages();
             for (int currentPage = 1; currentPage <= n; currentPage++) {
@@ -46,8 +43,6 @@ private void check(File orig, int count) throws IOException {
             copy.close();
         });
     }
-    
-    
-    
+
 
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfTestBase.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfTestBase.java
index 5a1033d8f..759d3e6b9 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfTestBase.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfTestBase.java
@@ -1,15 +1,14 @@
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.PageSize;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.PageSize;
-
 class PdfTestBase {
 
     static Document createTempPdf(String filename) throws DocumentException, IOException {
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfTestBaseTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfTestBaseTest.java
index b35b5eef5..cc97b4ca4 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfTestBaseTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfTestBaseTest.java
@@ -1,10 +1,9 @@
 package com.lowagie.text.pdf;
 
-import java.io.ByteArrayOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
+import java.io.ByteArrayOutputStream;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -21,8 +20,9 @@ void testCreatePdfStream() throws DocumentException {
             pdf.add(new Paragraph("Hello World!"));
         } finally {
             // close document
-            if (pdf != null)
+            if (pdf != null) {
                 pdf.close();
+            }
         }
         final byte[] bytes = stream.toByteArray();
         Assertions.assertNotNull(bytes, "There should be some PDF-bytes there.");
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfWriterTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfWriterTest.java
index 8c4a09b21..ca5ec19ee 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfWriterTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfWriterTest.java
@@ -21,7 +21,8 @@ void testCloseBeforeDocumentClose() {
             document.add(new Phrase("Hello World"));
             // then
             assertThatIllegalStateException().isThrownBy(writer::close)
-                .withMessage("Please call Document.close() instead. The PdfWriter will then be closed automatically.");
+                    .withMessage(
+                            "Please call Document.close() instead. The PdfWriter will then be closed automatically.");
         }
     }
 
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/ProcSetTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/ProcSetTest.java
index 10224d088..e8761cd50 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/ProcSetTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/ProcSetTest.java
@@ -2,16 +2,13 @@
 
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
-import com.lowagie.text.pdf.PdfName;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.PdfWriter;
+import java.io.IOException;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
 public class ProcSetTest {
+
     @Test
     public void procSetTest1() throws IOException {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/SimplePdfTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/SimplePdfTest.java
index 61cee1160..043a4cb5a 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/SimplePdfTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/SimplePdfTest.java
@@ -1,27 +1,21 @@
 package com.lowagie.text.pdf;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.nio.file.Files;
-
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.lowagie.text.Annotation;
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Rectangle;
-import org.junit.jupiter.api.Test;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
-
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.nio.file.Files;
+import org.junit.jupiter.api.Test;
 
 public class SimplePdfTest {
 
@@ -39,8 +33,9 @@ void testSimplePdf() throws Exception {
             document.add(rect);
         } finally {
             // close document
-            if (document != null)
+            if (document != null) {
                 document.close();
+            }
         }
 
     }
@@ -48,8 +43,8 @@ void testSimplePdf() throws Exception {
     @Test
     void testTryWithResources_with_os_before_doc() throws Exception {
         try (PdfReader reader = new PdfReader("./src/test/resources/HelloWorldMeta.pdf");
-            FileOutputStream os = new FileOutputStream(Files.createTempFile("temp-file-name", ".pdf").toFile());
-             Document document = new Document()
+                FileOutputStream os = new FileOutputStream(Files.createTempFile("temp-file-name", ".pdf").toFile());
+                Document document = new Document()
         ) {
             PdfWriter writer = PdfWriter.getInstance(document, os);
             document.open();
@@ -64,9 +59,10 @@ void testTryWithResources_with_os_before_doc() throws Exception {
     @Test
     void testTryWithResources_with_unknown_os() throws Exception {
         try (PdfReader reader = new PdfReader("./src/test/resources/HelloWorldMeta.pdf");
-             Document document = new Document()
+                Document document = new Document()
         ) {
-            PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(File.createTempFile("temp-file-name", ".pdf")));
+            PdfWriter writer = PdfWriter.getInstance(document,
+                    new FileOutputStream(File.createTempFile("temp-file-name", ".pdf")));
             document.open();
             final PdfContentByte cb = writer.getDirectContent();
 
@@ -75,11 +71,12 @@ void testTryWithResources_with_unknown_os() throws Exception {
             cb.addTemplate(page, 1, 0, 0, 1, 0, 0);
         }
     }
+
     @Test
     void testDocumentId() throws Exception {
         byte[] docBytes = null;
         try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-             Document document = new Document(PageSize.A4)) {
+                Document document = new Document(PageSize.A4)) {
             PdfWriter pdfWriter = PdfWriter.getInstance(document, baos);
             document.open();
             document.add(new Paragraph("This is a simple PDF"));
@@ -89,7 +86,7 @@ void testDocumentId() throws Exception {
         }
 
         try (InputStream is = new ByteArrayInputStream(docBytes);
-             PdfReader reader = new PdfReader(is)) {
+                PdfReader reader = new PdfReader(is)) {
             byte[] documentId = reader.getDocumentId();
             assertNotNull(documentId);
 
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/TTFCacheTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/TTFCacheTest.java
index 22c9d4a90..feff755ce 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/TTFCacheTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/TTFCacheTest.java
@@ -19,7 +19,7 @@ void whenGetTTFFileWithNullTtuShouldThrowNpe() {
     @Test
     void whenGetTTFFileWithNullFileNameShouldThrowNpe() throws IOException {
         TrueTypeFontUnicode font = (TrueTypeFontUnicode) BaseFont
-            .createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false);
+                .createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false);
         assertThatNullPointerException().isThrownBy(() -> TTFCache.getTTFFile(null, font));
     }
 
@@ -27,7 +27,7 @@ void whenGetTTFFileWithNullFileNameShouldThrowNpe() throws IOException {
     void whenGetTTFFileShouldThrowNpe() throws IOException {
         // given
         TrueTypeFontUnicode font = (TrueTypeFontUnicode) BaseFont
-            .createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false);
+                .createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false);
 
         // when
         TTFFile ttfFile = TTFCache.getTTFFile("ViaodaLibre-Regular.ttf", font);
@@ -43,11 +43,11 @@ void whenGetTTFFileShouldThrowNpe() throws IOException {
     void whenLoadTTFShouldThrowNpe() throws IOException {
         // given
         TrueTypeFontUnicode font = (TrueTypeFontUnicode) BaseFont
-            .createFont("fonts/jaldi/Jaldi-Regular.otf", BaseFont.IDENTITY_H, false);
+                .createFont("fonts/jaldi/Jaldi-Regular.otf", BaseFont.IDENTITY_H, false);
         font.cff = true;
         // when then
         Assertions.assertThatThrownBy(() -> TTFCache.getTTFFile("Jaldi-Regular.otf", font))
-            .isInstanceOf(ExceptionConverter.class);
+                .isInstanceOf(ExceptionConverter.class);
     }
 
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/TabTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/TabTest.java
index d311aeb52..fc181f921 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/TabTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/TabTest.java
@@ -4,13 +4,13 @@
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.parser.PdfTextExtractor;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class TabTest {
+
     @Test
     public void TabTest1() throws IOException {
         Document document = new Document(PageSize.A4.rotate(), 10, 10, 10, 10);
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/TablePdfTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/TablePdfTest.java
index ebf73a7f2..af32a309e 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/TablePdfTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/TablePdfTest.java
@@ -104,8 +104,9 @@ void testCreateTable() throws Exception {
 
         } finally {
             // close document
-            if (document != null)
+            if (document != null) {
                 document.close();
+            }
         }
 
     }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/TableRowSpanEvenSplitTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/TableRowSpanEvenSplitTest.java
index 7bf50f557..fa6accdc8 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/TableRowSpanEvenSplitTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/TableRowSpanEvenSplitTest.java
@@ -4,11 +4,12 @@
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Phrase;
+import java.io.ByteArrayOutputStream;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import java.io.ByteArrayOutputStream;
 
 public class TableRowSpanEvenSplitTest {
+
     @Test
     public void threeRowSpanTest() {
         Document document = new Document(PageSize.A4);
@@ -225,9 +226,9 @@ public void threeRowsLockedWidth() {
         document.add(table);
         document.close();
 
-        for(int i=1;i<6;i++) {
+        for (int i = 1; i < 6; i++) {
             System.out.println(table.rows.get(i).getMaxHeights() + ", " + i);
-            Assertions.assertTrue(table.rows.get(i).getMaxHeights()> 5f, "Row " + i + " is too small");
+            Assertions.assertTrue(table.rows.get(i).getMaxHeights() > 5f, "Row " + i + " is too small");
             Assertions.assertEquals(table.rows.get(i).getMaxHeights(), table.rows.get(i + 1).getMaxHeights(), 0.01);
         }
     }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/TextExtractTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/TextExtractTest.java
index 1d6758d73..b6bd493a9 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/TextExtractTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/TextExtractTest.java
@@ -1,12 +1,12 @@
 package com.lowagie.text.pdf;
 
 import com.lowagie.text.pdf.parser.PdfTextExtractor;
+import java.io.IOException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
 public class TextExtractTest {
+
     @Test
     public void textExtractTest1() throws IOException {
         PdfReader reader = new PdfReader(TextExtractTest.class.getResourceAsStream("/identity-h.pdf"));
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/core/document/PdfCrossReferenceTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/core/document/PdfCrossReferenceTest.java
index e65f44d7c..17ee6354f 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/core/document/PdfCrossReferenceTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/core/document/PdfCrossReferenceTest.java
@@ -68,91 +68,89 @@
  */
 class PdfCrossReferenceTest {
 
-  private static final Predicate CROSS_REFERENCE_FORMAT = Pattern
-          .compile("^\\d{10} \\d{5} [fn] \n$")
-          .asPredicate();
+    private static final Predicate CROSS_REFERENCE_FORMAT = Pattern
+            .compile("^\\d{10} \\d{5} [fn] \n$")
+            .asPredicate();
+    /**
+     * Each cross-reference entry shall always be exactly 20 bytes (according to PDF specification version 1.7, 7.5.4,
+     * "Cross-Reference Table").
+     */
+    private static final int CROSS_REFERENCE_ENTRY_LENGTH = 20;
+    private static final PdfCrossReference[] REFERENCES = new PdfCrossReference[]{
+            new PdfCrossReference(1, 0, 0),
+            new PdfCrossReference(1, 1, 1),
+            new PdfCrossReference(1, 1_000_000_000, 65_535)
+    };
 
-  /**
-   * Tests comparison between different {@link PdfCrossReference cross-reference entries},
-   * because such entries are ordered through according PDF object numbers.
-   */
-  @TestFactory
-  Iterable testComparison() {
-    return Arrays.asList(
-        // Testing {@link Comparable#compareTo(Object)} implementation
-        dynamicTest("Test lesser", () -> {
-          final PdfCrossReference entry1 = new PdfCrossReference(1, 0);
-          final PdfCrossReference entry2 = new PdfCrossReference(2, 0);
-          assertTrue(entry1.compareTo(entry2) < 0);
-        }),
-        dynamicTest("Test greater", () -> {
-          final PdfCrossReference entry1 = new PdfCrossReference(2, 0);
-          final PdfCrossReference entry2 = new PdfCrossReference(1, 0);
-          assertTrue(entry1.compareTo(entry2) > 0);
-        }),
-        dynamicTest("Test equals", () -> {
-          final PdfCrossReference entry1 = new PdfCrossReference(2, 0);
-          final PdfCrossReference entry2 = new PdfCrossReference(2, 0);
-          assertEquals(entry1.compareTo(entry2), 0);
-        }),
+    /**
+     * Tests comparison between different {@link PdfCrossReference cross-reference entries}, because such entries are
+     * ordered through according PDF object numbers.
+     */
+    @TestFactory
+    Iterable testComparison() {
+        return Arrays.asList(
+                // Testing {@link Comparable#compareTo(Object)} implementation
+                dynamicTest("Test lesser", () -> {
+                    final PdfCrossReference entry1 = new PdfCrossReference(1, 0);
+                    final PdfCrossReference entry2 = new PdfCrossReference(2, 0);
+                    assertTrue(entry1.compareTo(entry2) < 0);
+                }),
+                dynamicTest("Test greater", () -> {
+                    final PdfCrossReference entry1 = new PdfCrossReference(2, 0);
+                    final PdfCrossReference entry2 = new PdfCrossReference(1, 0);
+                    assertTrue(entry1.compareTo(entry2) > 0);
+                }),
+                dynamicTest("Test equals", () -> {
+                    final PdfCrossReference entry1 = new PdfCrossReference(2, 0);
+                    final PdfCrossReference entry2 = new PdfCrossReference(2, 0);
+                    assertEquals(entry1.compareTo(entry2), 0);
+                }),
 
-        // Testing {@link Object#equals(Object)} implementation
-        dynamicTest("Test lesser", () -> {
-          final PdfCrossReference entry1 = new PdfCrossReference(1, 0);
-          final PdfCrossReference entry2 = new PdfCrossReference(2, 0);
-          assertNotEquals(entry1, entry2);
-        }),
-        dynamicTest("Test greater", () -> {
-          final PdfCrossReference entry1 = new PdfCrossReference(2, 0);
-          final PdfCrossReference entry2 = new PdfCrossReference(1, 0);
-          assertNotEquals(entry1, entry2);
-        }),
-        dynamicTest("Test equals", () -> {
-          final PdfCrossReference entry1 = new PdfCrossReference(2, 0);
-          final PdfCrossReference entry2 = new PdfCrossReference(2, 0);
-          assertEquals(entry1, entry2);
-        }),
+                // Testing {@link Object#equals(Object)} implementation
+                dynamicTest("Test lesser", () -> {
+                    final PdfCrossReference entry1 = new PdfCrossReference(1, 0);
+                    final PdfCrossReference entry2 = new PdfCrossReference(2, 0);
+                    assertNotEquals(entry1, entry2);
+                }),
+                dynamicTest("Test greater", () -> {
+                    final PdfCrossReference entry1 = new PdfCrossReference(2, 0);
+                    final PdfCrossReference entry2 = new PdfCrossReference(1, 0);
+                    assertNotEquals(entry1, entry2);
+                }),
+                dynamicTest("Test equals", () -> {
+                    final PdfCrossReference entry1 = new PdfCrossReference(2, 0);
+                    final PdfCrossReference entry2 = new PdfCrossReference(2, 0);
+                    assertEquals(entry1, entry2);
+                }),
 
-        // Testing {@link Object#hashCode()} implementation
-        dynamicTest("Test hashcode", () -> {
-          final int offset = 1000;
-          assertEquals(new PdfCrossReference(offset, 0).hashCode(), offset);
-        })
-    );
-  }
-
-  /**
-   * Each cross-reference entry shall always be exactly 20 bytes (according to PDF specification
-   * version 1.7, 7.5.4, "Cross-Reference Table").
-   */
-  private static final int CROSS_REFERENCE_ENTRY_LENGTH = 20;
+                // Testing {@link Object#hashCode()} implementation
+                dynamicTest("Test hashcode", () -> {
+                    final int offset = 1000;
+                    assertEquals(new PdfCrossReference(offset, 0).hashCode(), offset);
+                })
+        );
+    }
 
-  private static final PdfCrossReference[] REFERENCES = new PdfCrossReference[] {
-      new PdfCrossReference(1, 0, 0),
-      new PdfCrossReference(1, 1, 1),
-      new PdfCrossReference(1, 1_000_000_000, 65_535)
-  };
+    /**
+     * Checks generated PDF representation of cross-reference entries.
+     */
+    @TestFactory
+    Iterable testPdfRepresentation() throws IOException {
+        final List tests = new ArrayList<>();
+        final OutputStream os = mock(OutputStream.class);
+        doAnswer(invocation -> {
+            final byte[] bytes = invocation.getArgument(0);
+            tests.add(dynamicTest("Test not null", () -> assertNotNull(bytes)));
+            tests.add(dynamicTest("Test size", () -> assertEquals(bytes.length, CROSS_REFERENCE_ENTRY_LENGTH)));
+            final String stringRepresentation = new String(bytes);
+            tests.add(dynamicTest("Test format", () -> assertTrue(CROSS_REFERENCE_FORMAT.test(stringRepresentation))));
+            return invocation;
+        }).when(os).write(any());
 
-  /**
-   * Checks generated PDF representation of cross-reference entries.
-   */
-  @TestFactory
-  Iterable testPdfRepresentation() throws IOException {
-    final List tests = new ArrayList<>();
-    final OutputStream os = mock(OutputStream.class);
-    doAnswer(invocation -> {
-      final byte[] bytes = invocation.getArgument(0);
-      tests.add(dynamicTest("Test not null", () -> assertNotNull(bytes)));
-      tests.add(dynamicTest("Test size", () -> assertEquals(bytes.length, CROSS_REFERENCE_ENTRY_LENGTH)));
-      final String stringRepresentation = new String(bytes);
-      tests.add(dynamicTest("Test format", () -> assertTrue(CROSS_REFERENCE_FORMAT.test(stringRepresentation))));
-      return invocation;
-    }).when(os).write(any());
+        for (final PdfCrossReference ref : REFERENCES) {
+            ref.toPdf(os);
+        }
 
-    for (final PdfCrossReference ref: REFERENCES) {
-      ref.toPdf(os);
+        return tests;
     }
-
-    return tests;
-  }
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java
index f0f973b85..22c108927 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/DecryptAES256R6Test.java
@@ -60,9 +60,9 @@ void testReadPwProtectedAES256_openPDFiss375() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -86,11 +86,11 @@ void testReadDemo1Encrypted() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals(
-                "Demo   Name   Signature   Date  Elizabeth Schultz (Apr 24, 2018) Elizabeth Schultz Apr 24, 2018 "
-                    + "Elizabeth Schultz Sue Northrop (Apr 24, 2018) Apr 24, 2018 Sue Northrop",
-                new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
+                    "Demo   Name   Signature   Date  Elizabeth Schultz (Apr 24, 2018) Elizabeth Schultz Apr 24, 2018 "
+                            + "Elizabeth Schultz Sue Northrop (Apr 24, 2018) Apr 24, 2018 Sue Northrop",
+                    new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -114,9 +114,9 @@ void testReadCopiedPositiveP() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Potato", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -140,9 +140,9 @@ void testReadCR6InPwOwner4() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(30, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -166,9 +166,9 @@ void testReadEncryptedHelloWorldR6PwHotelUtf8() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Hello, world!\n Goodbye, world!",
-                new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
+                    new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -192,9 +192,9 @@ void testReadEncryptedPositiveP() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Potato", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -215,20 +215,20 @@ void testReadEncryptedPositiveP() throws IOException {
     @Test
     void testReadEncXiLongPassword() throws IOException {
         try (
-            InputStream resource = getClass().getResourceAsStream(
-                "/issue375/enc-XI-long-password"
-                    +
-                    "=qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf")
+                InputStream resource = getClass().getResourceAsStream(
+                        "/issue375/enc-XI-long-password"
+                                +
+                                "=qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv.pdf")
         ) {
             PdfReader pdfReader = new PdfReader(resource,
-                "qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv".getBytes(
-                    UTF_8));
+                    "qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcv".getBytes(
+                            UTF_8));
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(30, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -252,9 +252,9 @@ void testReadEncXiR6V5OMaster_User() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions.");
             Assertions.assertEquals(30, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -278,9 +278,9 @@ void testReadEncXiR6V5OMaster_Owner() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(30, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -303,13 +303,13 @@ void testReadEncXiR6V5OMaster_Owner() throws IOException {
     void testReadEncXiR6V5UAttachmentEncryptedAttachments() {
         Assertions.assertThrows(InvalidPdfException.class, () -> {
             try (InputStream resource = getClass().getResourceAsStream(
-                "/issue375/enc-XI-R6,V5,U=attachment,encrypted-attachments.pdf")) {
+                    "/issue375/enc-XI-R6,V5,U=attachment,encrypted-attachments.pdf")) {
                 PdfReader pdfReader = new PdfReader(resource, "attachment".getBytes(UTF_8));
                 Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
                 Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                    "PdfReader fails to report the correct number of pages");
+                        "PdfReader fails to report the correct number of pages");
                 Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                    "Wrong text extracted from page 1");
+                        "Wrong text extracted from page 1");
                 pdfReader.close();
             }
         });
@@ -330,14 +330,14 @@ void testReadEncXiR6V5UAttachmentEncryptedAttachments() {
     @Test
     void testReadEncXiR6V5UViewAttachmentsCleartextMetadata() throws IOException {
         try (InputStream resource = getClass().getResourceAsStream(
-            "/issue375/enc-XI-R6,V5,U=view,attachments,cleartext-metadata.pdf")) {
+                "/issue375/enc-XI-R6,V5,U=view,attachments,cleartext-metadata.pdf")) {
             PdfReader pdfReader = new PdfReader(resource, "view".getBytes(UTF_8));
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(30, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -361,9 +361,9 @@ void testReadEncXiR6V5UViewOMaster_User() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions.");
             Assertions.assertEquals(30, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -387,9 +387,9 @@ void testReadEncXiR6V5UViewOMaster_Owner() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(30, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -413,9 +413,9 @@ void testReadEncXiR6V5UWwwwwOWwwww() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(30, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Potato 0", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -439,9 +439,9 @@ void testReadGraphEncryptedPwUser() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -465,9 +465,9 @@ void testReadIssue60101PwOwner() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Issue 6010", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -491,12 +491,12 @@ void testReadIssue60102PaeoeaaUtf8() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(10, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Sample PDF Document\n"
-                    + " Robert Maron\n"
-                    + " Grzegorz Grudzi´ nski\n"
-                    + " February 20, 1999", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                            + " Robert Maron\n"
+                            + " Grzegorz Grudzi´ nski\n"
+                            + " February 20, 1999", new PdfTextExtractor(pdfReader).getTextFromPage(1),
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -520,9 +520,9 @@ void testReadMuPDFAes256R6UUserOOwner_User() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Mu PD F  a lightweight PDF and XPS viewer",
-                new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
+                    new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -546,9 +546,9 @@ void testReadMuPDFAes256R6UUserOOwner_Owner() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("Mu PD F  a lightweight PDF and XPS viewer",
-                new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
+                    new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -574,9 +574,9 @@ void testReadNonTrivialCryptFilter() {
                 PdfReader pdfReader = new PdfReader(resource);
                 Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
                 Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                    "PdfReader fails to report the correct number of pages");
+                        "PdfReader fails to report the correct number of pages");
                 Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                    "Wrong text extracted from page 1");
+                        "Wrong text extracted from page 1");
                 pdfReader.close();
             }
         });
@@ -601,9 +601,9 @@ void testReadPr65311PwAsdfasdf() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertEquals("", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
@@ -627,7 +627,7 @@ void testReadPr65312PwAsdfasdf() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertFalse(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report limited permissions.");
             Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             // Page has no static content, so no text extraction test
             pdfReader.close();
         }
@@ -654,9 +654,9 @@ void testReadUnfilterableWithCrypt() {
                 PdfReader pdfReader = new PdfReader(resource);
                 Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
                 Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
-                    "PdfReader fails to report the correct number of pages");
+                        "PdfReader fails to report the correct number of pages");
                 Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1),
-                    "Wrong text extracted from page 1");
+                        "Wrong text extracted from page 1");
                 pdfReader.close();
             }
         });
@@ -684,9 +684,9 @@ void testReadTHISISATEST_PWP() throws IOException {
             Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
             Assertions.assertTrue(isOwnerPasswordUsed(pdfReader), "PdfReader fails to report full permissions.");
             Assertions.assertEquals(2, pdfReader.getNumberOfPages(),
-                "PdfReader fails to report the correct number of pages");
+                    "PdfReader fails to report the correct number of pages");
             Assertions.assertTrue(new PdfTextExtractor(pdfReader).getTextFromPage(1).startsWith("THIS IS A TEST"),
-                "Wrong text extracted from page 1");
+                    "Wrong text extracted from page 1");
             pdfReader.close();
         }
     }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/EncryptAES256R6Test.java b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/EncryptAES256R6Test.java
index b8a9cb118..a815e5ecc 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/EncryptAES256R6Test.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/EncryptAES256R6Test.java
@@ -1,15 +1,5 @@
 package com.lowagie.text.pdf.encryption;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Rectangle;
@@ -18,11 +8,20 @@
 import com.lowagie.text.pdf.PdfStamper;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.parser.PdfTextExtractor;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author mkl
  */
 class EncryptAES256R6Test {
+
     final static File RESULT_FOLDER = new File("target/test-outputs", "issue375");
 
     @BeforeAll
@@ -35,7 +34,7 @@ void testCreateSimplePdf() throws IOException {
         File result = new File(RESULT_FOLDER, "CreateSimplePdf.pdf");
 
         Document document = new Document();
-        try (   OutputStream os = new FileOutputStream(result)) {
+        try (OutputStream os = new FileOutputStream(result)) {
             PdfWriter pdfWriter = PdfWriter.getInstance(document, os);
             pdfWriter.setEncryption("user".getBytes(), "owner".getBytes(), 0, PdfWriter.ENCRYPTION_AES_256_V3);
 
@@ -47,17 +46,23 @@ void testCreateSimplePdf() throws IOException {
         PdfReader pdfReader = new PdfReader(result.getAbsolutePath(), "owner".getBytes());
         pdfReader.setModificationAllowedWithoutOwnerPassword(false);
         Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
-        Assertions.assertTrue(pdfReader.isOpenedWithFullPermissions(), "PdfReader fails to recognize password as owner password.");
-        Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages");
-        Assertions.assertEquals("Some test content", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
+        Assertions.assertTrue(pdfReader.isOpenedWithFullPermissions(),
+                "PdfReader fails to recognize password as owner password.");
+        Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
+                "PdfReader fails to report the correct number of pages");
+        Assertions.assertEquals("Some test content", new PdfTextExtractor(pdfReader).getTextFromPage(1),
+                "Wrong text extracted from page 1");
         pdfReader.close();
 
         pdfReader = new PdfReader(result.getAbsolutePath(), "user".getBytes());
         pdfReader.setModificationAllowedWithoutOwnerPassword(false);
         Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
-        Assertions.assertFalse(pdfReader.isOpenedWithFullPermissions(), "PdfReader fails to recognize password as user password.");
-        Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages");
-        Assertions.assertEquals("Some test content", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
+        Assertions.assertFalse(pdfReader.isOpenedWithFullPermissions(),
+                "PdfReader fails to recognize password as user password.");
+        Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
+                "PdfReader fails to report the correct number of pages");
+        Assertions.assertEquals("Some test content", new PdfTextExtractor(pdfReader).getTextFromPage(1),
+                "Wrong text extracted from page 1");
         pdfReader.close();
     }
 
@@ -65,10 +70,10 @@ void testCreateSimplePdf() throws IOException {
     void testStampPwProtectedAES256_openPDFiss375() throws IOException {
         File result = new File(RESULT_FOLDER, "pwProtectedAES256_openPDFiss375-Stamped.pdf");
 
-        try (   InputStream resource = getClass().getResourceAsStream("/issue375/pwProtectedAES256_openPDFiss375.pdf");
-                OutputStream os = new FileOutputStream(result)  ) {
+        try (InputStream resource = getClass().getResourceAsStream("/issue375/pwProtectedAES256_openPDFiss375.pdf");
+                OutputStream os = new FileOutputStream(result)) {
             PdfReader pdfReader = new PdfReader(resource);
-            PdfStamper pdfStamper = new PdfStamper(pdfReader, os, (char)0, true);
+            PdfStamper pdfStamper = new PdfStamper(pdfReader, os, (char) 0, true);
 
             Rectangle box = pdfReader.getPageSize(1);
             PdfContentByte canvas = pdfStamper.getOverContent(1);
@@ -85,8 +90,10 @@ void testStampPwProtectedAES256_openPDFiss375() throws IOException {
 
         PdfReader pdfReader = new PdfReader(result.getAbsolutePath());
         Assertions.assertTrue(pdfReader.isEncrypted(), "PdfReader fails to report test file to be encrypted.");
-        Assertions.assertEquals(1, pdfReader.getNumberOfPages(), "PdfReader fails to report the correct number of pages");
-        Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1), "Wrong text extracted from page 1");
+        Assertions.assertEquals(1, pdfReader.getNumberOfPages(),
+                "PdfReader fails to report the correct number of pages");
+        Assertions.assertEquals("TEST", new PdfTextExtractor(pdfReader).getTextFromPage(1),
+                "Wrong text extracted from page 1");
         pdfReader.close();
     }
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/PdfEncryptionTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/PdfEncryptionTest.java
index 615f11fbd..6c44a3754 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/PdfEncryptionTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/PdfEncryptionTest.java
@@ -1,12 +1,11 @@
 package com.lowagie.text.pdf.encryption;
 
-import org.bouncycastle.util.encoders.Hex;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 import com.lowagie.text.pdf.PdfEncryption;
 import com.lowagie.text.pdf.PdfLiteral;
-
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.bouncycastle.util.encoders.Hex;
+import org.junit.jupiter.api.Test;
 
 public class PdfEncryptionTest {
 
@@ -14,13 +13,17 @@ public class PdfEncryptionTest {
     public void getFileIdChangingPartTest() {
         // HEX encoded, valid format
         assertArrayEquals(Hex.decode("c547234acb212b7cd65ba961f9e9acae"),
-                PdfEncryption.getFileIdChangingPart(new PdfLiteral("")));
+                PdfEncryption.getFileIdChangingPart(
+                        new PdfLiteral("")));
         assertArrayEquals(Hex.decode("1527b6788ff5fb71d8c0bd6642fcbe47"),
-                PdfEncryption.getFileIdChangingPart(new PdfLiteral("<1527b6788ff5fb71d8c0bd6642fcbe47>")));
+                PdfEncryption.getFileIdChangingPart(
+                        new PdfLiteral("<1527b6788ff5fb71d8c0bd6642fcbe47>")));
         assertArrayEquals(Hex.decode("c547234acb212b7cd65ba961f9e9acae"),
-                PdfEncryption.getFileIdChangingPart(new PdfLiteral("[]")));
+                PdfEncryption.getFileIdChangingPart(
+                        new PdfLiteral("[]")));
         assertArrayEquals(Hex.decode("1527b6788ff5fb71d8c0bd6642fcbe47"),
-                PdfEncryption.getFileIdChangingPart(new PdfLiteral("[<1527b6788ff5fb71d8c0bd6642fcbe47>]")));
+                PdfEncryption.getFileIdChangingPart(
+                        new PdfLiteral("[<1527b6788ff5fb71d8c0bd6642fcbe47>]")));
 
         // not-HEX encoded, valid format
         assertArrayEquals("abc".getBytes(),
@@ -32,7 +35,8 @@ public void getFileIdChangingPartTest() {
         assertArrayEquals("c547234acb212b7cd65ba961f9e9acae".getBytes(),
                 PdfEncryption.getFileIdChangingPart(new PdfLiteral("c547234acb212b7cd65ba961f9e9acae")));
         assertArrayEquals("1527b6788ff5fb71d8c0bd6642fcbe47".getBytes(),
-                PdfEncryption.getFileIdChangingPart(new PdfLiteral("1527b6788ff5fb71d8c0bd6642fcbe47")));
+                PdfEncryption.getFileIdChangingPart(
+                        new PdfLiteral("1527b6788ff5fb71d8c0bd6642fcbe47")));
         assertArrayEquals("c547234acb212b7cd65ba961f9e9acae".getBytes(),
                 PdfEncryption.getFileIdChangingPart(new PdfLiteral("c547234acb212b7cd65ba961f9e9acae")));
     }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/StandardDecryptionTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/StandardDecryptionTest.java
index d2edd1c1b..d0a341785 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/encryption/StandardDecryptionTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/encryption/StandardDecryptionTest.java
@@ -1,10 +1,9 @@
 package com.lowagie.text.pdf.encryption;
 
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import com.lowagie.text.pdf.PdfEncryption;
 import com.lowagie.text.pdf.PdfWriter;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class StandardDecryptionTest {
 
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java
index 9afcfa0b4..d6983ea7b 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/AdvanceTypographyTest.java
@@ -28,8 +28,8 @@ class AdvanceTypographyTest {
     void testTypographySubstitution() throws Exception {
         char[] expectedOutput = {660, 666, 911, 656, 1130};
         byte[] processedContent = FopGlyphProcessor.convertToBytesWithGlyphs(
-            BaseFont.createFont("fonts/jaldi/Jaldi-Regular.ttf", BaseFont.IDENTITY_H, false),
-            "नमसà¥à¤¤à¥‡", "fonts/jaldi/Jaldi-Regular.ttf", new HashMap<>(), "dflt");
+                BaseFont.createFont("fonts/jaldi/Jaldi-Regular.ttf", BaseFont.IDENTITY_H, false),
+                "नमसà¥à¤¤à¥‡", "fonts/jaldi/Jaldi-Regular.ttf", new HashMap<>(), "dflt");
         String str = new String(processedContent, "UnicodeBigUnmarked");
 
         assertArrayEquals(expectedOutput, str.toCharArray());
@@ -44,8 +44,8 @@ void testTypographySubstitution() throws Exception {
     void testSubstitutionWithMerge() throws Exception {
         char[] expectedOutput = {254, 278, 390, 314, 331, 376, 254, 285, 278};
         byte[] processedContent = FopGlyphProcessor.convertToBytesWithGlyphs(
-            BaseFont.createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false),
-            "instruction", "fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", new HashMap<>(), "dflt");
+                BaseFont.createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, false),
+                "instruction", "fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", new HashMap<>(), "dflt");
         String str = new String(processedContent, "UnicodeBigUnmarked");
         assertArrayEquals(expectedOutput, str.toCharArray());
     }
@@ -55,9 +55,10 @@ void testSubstitutionWithMergeWithLayoutProcessorEnabled() throws Exception {
         LayoutProcessor.enable();
         char[] expectedOutput = {254, 278, 390, 314, 331, 376, 254, 285, 278};
         byte[] processedContent = FopGlyphProcessor.convertToBytesWithGlyphs(
-            BaseFont.createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, true, false, null,
-                null),
-            "instruction", "fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", new HashMap<>(), "dflt");
+                BaseFont.createFont("fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H, true, false,
+                        null,
+                        null),
+                "instruction", "fonts/Viaoda_Libre/ViaodaLibre-Regular.ttf", new HashMap<>(), "dflt");
         String str = new String(processedContent, "UnicodeBigUnmarked");
         assertArrayEquals(expectedOutput, str.toCharArray());
         LayoutProcessor.disable();
@@ -72,16 +73,16 @@ void testSubstitutionWithMergeWithLayoutProcessorEnabled() throws Exception {
     void testInMemoryFonts() throws Exception {
         char[] expectedOutput = {254, 278, 390, 314, 331, 376, 254, 285, 278};
         BaseFont font = BaseFont.createFont("ViaodaLibre-Regular.ttf", BaseFont.IDENTITY_H,
-            BaseFont.EMBEDDED, true,
-            getTestFontByte(), null, false, false);
+                BaseFont.EMBEDDED, true,
+                getTestFontByte(), null, false, false);
         byte[] processedContent = FopGlyphProcessor.convertToBytesWithGlyphs(
-            font, "instruction", "Viaoda Libre", new HashMap<>(), "dflt");
+                font, "instruction", "Viaoda Libre", new HashMap<>(), "dflt");
         String str = new String(processedContent, "UnicodeBigUnmarked");
         assertArrayEquals(expectedOutput, str.toCharArray());
     }
 
     @Disabled("This test is failing, need to investigate. @YOSHIDA may know the reason."
-        + "Should work, when GH-591 #592 is fixed.")
+            + "Should work, when GH-591 #592 is fixed.")
     @Test
     void testSurrogatePair() throws Exception {
 
@@ -91,7 +92,7 @@ void testSurrogatePair() throws Exception {
         // http://en.glyphwiki.org/wiki/u20bb7
         String text = "\uD842\uDFB7";
         byte[] processedContent = FopGlyphProcessor.convertToBytesWithGlyphs(
-            baseFont, text, "fonts/jp/GenShinGothic-Normal.ttf", new HashMap<>(), "dflt");
+                baseFont, text, "fonts/jp/GenShinGothic-Normal.ttf", new HashMap<>(), "dflt");
         String str = new String(processedContent, "UnicodeBigUnmarked");
         char[] actual = str.toCharArray();
         assertArrayEquals(expectedOutput, actual);
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/FontTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/FontTest.java
index f87be19e3..1c4c28bd7 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/FontTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/FontTest.java
@@ -52,9 +52,13 @@ class FontTest {
 
     private static final float DEFAULT_FONT_SIZE = 16.0f;
 
+    private static Set getStyles() {
+        return STYLES_TO_TEST_METHOD.keySet();
+    }
+
     /**
-     * Checks if style property value is preserved during font construction through {@link FontFactory#getFont(String,
-     * float, int)} method by getting raw property value.
+     * Checks if style property value is preserved during font construction through
+     * {@link FontFactory#getFont(String, float, int)} method by getting raw property value.
      *
      * @see Font#getStyle()
      */
@@ -67,13 +71,9 @@ void testStyleSettingByValue(int style) {
         assertEquals(font.getStyle(), style);
     }
 
-    private static Set getStyles() {
-        return STYLES_TO_TEST_METHOD.keySet();
-    }
-
     /**
-     * Checks if style property value is preserved during font construction through {@link FontFactory#getFont(String,
-     * float, int)} method by testing appropriate predicate.
+     * Checks if style property value is preserved during font construction through
+     * {@link FontFactory#getFont(String, float, int)} method by testing appropriate predicate.
      *
      * @see Font#isBold()
      * @see Font#isItalic()
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/metadata/CleanMetaDataTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/metadata/CleanMetaDataTest.java
index afcccc73b..7dc23abfb 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/metadata/CleanMetaDataTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/metadata/CleanMetaDataTest.java
@@ -9,287 +9,285 @@
 import com.lowagie.text.pdf.PdfStamper;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.xml.xmp.XmpWriter;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class CleanMetaDataTest {
-  
-  public CleanMetaDataTest() {
-    super();
-  }
-  
-  private HashMap createCleanerMoreInfo() {
-    HashMap moreInfo = new HashMap();
-    moreInfo.put("Title", null);
-    moreInfo.put("Author", null);
-    moreInfo.put("Subject", null);
-    moreInfo.put("Producer", null);
-    moreInfo.put("Keywords", null);
-    moreInfo.put("Creator", null);
-    moreInfo.put("ModDate",null);
-    return moreInfo;
-  }
-
-	@Test
-	public void testProducer() throws Exception {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		Document document = new Document();
-
-		PdfWriter.getInstance(document, baos);
-		document.open();
-		document.add(new Paragraph("Hello World"));
-		document.close();
-
-		try (PdfReader r = new PdfReader(baos.toByteArray())) {
-			final String producer = r.getInfo().get("Producer");
-			org.assertj.core.api.Assertions.assertThat(producer).startsWith("OpenPDF ");
-		}
-		
-	}
-
-	@Test
-	public void testAddedMetadata() throws Exception {
-		String AUTHOR_NAME = "Mr Bean";
-		String TITLE = "The title";
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		Document document = new Document();
-
-		PdfWriter.getInstance(document, baos);
-
-		document.open();
-		document.addProducer();
-		document.addAuthor(AUTHOR_NAME);
-		document.addTitle(TITLE);
-		document.add(new Paragraph("Hello World"));
-		document.close();
-
-		PdfReader r = new PdfReader(baos.toByteArray());
-
-		// Metadata generated only on demand
-		Assertions.assertEquals(Document.getVersion(), r.getInfo().get("Producer"));
-
-		Assertions.assertEquals(AUTHOR_NAME, r.getInfo().get("Author"));
-		Assertions.assertEquals(TITLE, r.getInfo().get("Title"));
-
-		r.close();
-	}
-	
-
-	@Test
-	public void testStamperMetadata() throws Exception {
-		byte[] data = addWatermark(new File("src/test/resources/HelloWorldMeta.pdf"), false, createCleanerMoreInfo());
-		PdfReader r = new PdfReader(data);
-		Assertions.assertNull(r.getInfo().get("Producer"));
-		Assertions.assertNull(r.getInfo().get("Author"));
-		Assertions.assertNull(r.getInfo().get("Title"));
-		Assertions.assertNull(r.getInfo().get("Subject"));	
-		r.close();
-		String dataString = new String(data);
-		Assertions.assertFalse(dataString.contains("This example explains how to add metadata."));
-	}
-	
-	@Test
-	public void testStamperEncryptMetadata() throws Exception {
-		byte[] data = addWatermark(new File("src/test/resources/HelloWorldMeta.pdf"), true, createCleanerMoreInfo());
-		PdfReader r = new PdfReader(data);
-		Assertions.assertNull(r.getInfo().get("Producer"));
-		Assertions.assertNull(r.getInfo().get("Author"));
-		Assertions.assertNull(r.getInfo().get("Title"));
-		Assertions.assertNull(r.getInfo().get("Subject"));		
-		r.close();
-	}
-	
-	
-	@Test
-	public void testStamperExtraMetadata() throws Exception {
-		HashMap moreInfo = createCleanerMoreInfo();
-		moreInfo.put("Producer", Document.getVersion());
-		moreInfo.put("Author", "Author1");
-		moreInfo.put("Title", "Title2");
-		moreInfo.put("Subject", "Subject3");
-		byte[] data = addWatermark(new File("src/test/resources/HelloWorldMeta.pdf"), false, moreInfo);
-		PdfReader r = new PdfReader(data);
-		Assertions.assertEquals(Document.getVersion(), r.getInfo().get("Producer"));
-		Assertions.assertEquals("Author1", r.getInfo().get("Author"));
-		Assertions.assertEquals("Title2", r.getInfo().get("Title"));
-		Assertions.assertEquals("Subject3", r.getInfo().get("Subject"));	
-		r.close();
-	}
-	
-	@Test
-	public void testCleanMetadataMethodInStamper() throws Exception {
-	  byte[] data = cleanMetadata(new File("src/test/resources/HelloWorldMeta.pdf"));
-	  PdfReader r = new PdfReader(data);
-    Assertions.assertNull(r.getInfo().get("Producer"));
-    Assertions.assertNull(r.getInfo().get("Author"));
-    Assertions.assertNull(r.getInfo().get("Title"));
-    Assertions.assertNull(r.getInfo().get("Subject"));  
-    r.close();
-    String dataString = new String(data);
-    Assertions.assertFalse(dataString.contains("This example explains how to add metadata."));
-	}
-
-	@Test
-	public void skipMetaDataUpdateTest() throws Exception {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PdfReader reader = new PdfReader(new File("src/test/resources/HelloWorldMeta.pdf").getAbsolutePath());
-		PdfStamper stamp = new PdfStamper(reader, baos, '\0', true);
-		stamp.setUpdateMetadata(false);
-		stamp.cleanMetadata();
-		stamp.close();
-
-		String dataString = baos.toString();
-		Assertions.assertTrue(dataString.contains("This example explains how to add metadata."));
-	}
-
-	@Test
-	public void skipMetaDataUpdateFirstRevisionTest() throws Exception {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PdfReader reader = new PdfReader(new File("src/test/resources/HelloWorldMeta.pdf").getAbsolutePath());
-		PdfStamper stamp = new PdfStamper(reader, baos, '\0', false);
-		stamp.setUpdateMetadata(false);
-		stamp.cleanMetadata();
-		stamp.close();
-
-		String dataString = baos.toString();
-		Assertions.assertFalse(dataString.contains("This example explains how to add metadata."));
-	}
-
-	@Test
-	public void skipInfoUpdateTest() throws Exception {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PdfReader reader = new PdfReader(new File("src/test/resources/HelloWorldMeta.pdf").getAbsolutePath());
-		PdfStamper stamp = new PdfStamper(reader, baos, '\0', true);
-
-		HashMap moreInfo = createCleanerMoreInfo();
-		moreInfo.put("Producer", Document.getVersion());
-		moreInfo.put("Author", "Author1");
-		moreInfo.put("Title", "Title2");
-		moreInfo.put("Subject", "Subject3");
-		stamp.setInfoDictionary(moreInfo);
-
-		stamp.setUpdateDocInfo(false);
-		stamp.close();
-
-		PdfReader r = new PdfReader(baos.toByteArray());
-		Assertions.assertNull(r.getInfo().get("Producer"));
-		Assertions.assertNull(r.getInfo().get("Author"));
-		Assertions.assertNull(r.getInfo().get("Title"));
-		Assertions.assertNull(r.getInfo().get("Subject"));
-		r.close();
-	}
-
-	@Test
-	public void skipInfoUpdateFirstRevisionTest() throws Exception {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PdfReader reader = new PdfReader(new File("src/test/resources/HelloWorldMeta.pdf").getAbsolutePath());
-		PdfStamper stamp = new PdfStamper(reader, baos, '\0', false);
-
-		HashMap moreInfo = createCleanerMoreInfo();
-		moreInfo.put("Producer", Document.getVersion());
-		moreInfo.put("Author", "Author1");
-		moreInfo.put("Title", "Title2");
-		moreInfo.put("Subject", "Subject3");
-		stamp.setInfoDictionary(moreInfo);
-
-		stamp.setUpdateDocInfo(false);
-		stamp.close();
-
-		PdfReader r = new PdfReader(baos.toByteArray());
-		Assertions.assertNotNull(r.getInfo().get("Producer"));
-		Assertions.assertNotNull(r.getInfo().get("Author"));
-		Assertions.assertNotNull(r.getInfo().get("Title"));
-		Assertions.assertNotNull(r.getInfo().get("Subject"));
-		r.close();
-	}
-	
-	@Test
-  public void testXMPMetadata() throws Exception {
-    File file = new File("src/test/resources/HelloWorldMeta.pdf");
-    PdfReader reader = new PdfReader(file.getAbsolutePath());
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    PdfStamper stamp = new PdfStamper(reader, baos);
-    Map moreInfo = createCleanerMoreInfo();
-    ByteArrayOutputStream meta = new ByteArrayOutputStream();
-    XmpWriter writer = new XmpWriter(meta, moreInfo);
-    writer.close();
-    // Manually set clean metadata
-    stamp.setInfoDictionary(moreInfo);
-    stamp.setXmpMetadata(meta.toByteArray());
-        
-    stamp.close();
-    
-    
-    byte[] data = baos.toByteArray();
-    PdfReader r = new PdfReader(data);
-    Assertions.assertNull(r.getInfo().get("Producer"));
-    Assertions.assertNull(r.getInfo().get("Author"));
-    Assertions.assertNull(r.getInfo().get("Title"));
-    Assertions.assertNull(r.getInfo().get("Subject"));  
-    byte[] metadata = r.getMetadata();
-    r.close();
-    String dataString = new String(data);
-
-    Assertions.assertFalse(dataString.contains("Bruno Lowagie"));
-    Assertions.assertFalse(dataString.contains(" 1.2.12.SNAPSHOT"));
-    if (metadata != null) {
-      String metadataString = new String(metadata);
-      Assertions.assertFalse(metadataString.contains("Bruno Lowagie"));
-      Assertions.assertFalse(metadataString.contains(" 1.2.12.SNAPSHOT"));
-      Assertions.assertTrue(metadataString.contains(""));
-    }  
-  }
-	
-	private byte[] cleanMetadata(File origin) throws Exception {
-	  ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    PdfReader reader = new PdfReader(origin.getAbsolutePath());
-    PdfStamper stamp = new PdfStamper(reader, baos);
-    stamp.cleanMetadata();
-    stamp.close();
-    return baos.toByteArray();
-	}
-
-	private byte[] addWatermark(File origin, boolean encrypt, HashMap moreInfo) throws Exception {
-		int text_angle = 45;
-		int text1_pos_x = 300;
-		int text_1_pos_y = 430;
-		int text_2_pos_x = 330;
-		int text_2_pos_y = 410;
-		String text1 = "NOT VALID";
-		String text2 = "DRAFT";
-		int font_size = 32;
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PdfReader reader = new PdfReader(origin.getAbsolutePath());
-		int n = reader.getNumberOfPages();
-		PdfStamper stamp = new PdfStamper(reader, baos);
-		stamp.setInfoDictionary(moreInfo);
-		if (encrypt) {
-			stamp.setEncryption(null, null, 0, PdfWriter.ENCRYPTION_AES_128);
-		}
-		int i = 0;
-		PdfContentByte over;
-		BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.EMBEDDED);
-
-		while (i < n) {
-			i++;
-			over = stamp.getOverContent(i);
-			over.beginText();
-			over.setRGBColorFill(255, 0, 0);
-			over.setFontAndSize(bf, font_size);
-			over.showTextAligned(Element.ALIGN_CENTER, text1, text1_pos_x, text_1_pos_y, text_angle);
-			over.showTextAligned(Element.ALIGN_CENTER, text2, text_2_pos_x, text_2_pos_y, text_angle);
-			over.endText();
-		}
-		
-		stamp.close();
-
-		return baos.toByteArray();
-	}
+
+    public CleanMetaDataTest() {
+        super();
+    }
+
+    private HashMap createCleanerMoreInfo() {
+        HashMap moreInfo = new HashMap();
+        moreInfo.put("Title", null);
+        moreInfo.put("Author", null);
+        moreInfo.put("Subject", null);
+        moreInfo.put("Producer", null);
+        moreInfo.put("Keywords", null);
+        moreInfo.put("Creator", null);
+        moreInfo.put("ModDate", null);
+        return moreInfo;
+    }
+
+    @Test
+    public void testProducer() throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        Document document = new Document();
+
+        PdfWriter.getInstance(document, baos);
+        document.open();
+        document.add(new Paragraph("Hello World"));
+        document.close();
+
+        try (PdfReader r = new PdfReader(baos.toByteArray())) {
+            final String producer = r.getInfo().get("Producer");
+            org.assertj.core.api.Assertions.assertThat(producer).startsWith("OpenPDF ");
+        }
+
+    }
+
+    @Test
+    public void testAddedMetadata() throws Exception {
+        String AUTHOR_NAME = "Mr Bean";
+        String TITLE = "The title";
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        Document document = new Document();
+
+        PdfWriter.getInstance(document, baos);
+
+        document.open();
+        document.addProducer();
+        document.addAuthor(AUTHOR_NAME);
+        document.addTitle(TITLE);
+        document.add(new Paragraph("Hello World"));
+        document.close();
+
+        PdfReader r = new PdfReader(baos.toByteArray());
+
+        // Metadata generated only on demand
+        Assertions.assertEquals(Document.getVersion(), r.getInfo().get("Producer"));
+
+        Assertions.assertEquals(AUTHOR_NAME, r.getInfo().get("Author"));
+        Assertions.assertEquals(TITLE, r.getInfo().get("Title"));
+
+        r.close();
+    }
+
+
+    @Test
+    public void testStamperMetadata() throws Exception {
+        byte[] data = addWatermark(new File("src/test/resources/HelloWorldMeta.pdf"), false, createCleanerMoreInfo());
+        PdfReader r = new PdfReader(data);
+        Assertions.assertNull(r.getInfo().get("Producer"));
+        Assertions.assertNull(r.getInfo().get("Author"));
+        Assertions.assertNull(r.getInfo().get("Title"));
+        Assertions.assertNull(r.getInfo().get("Subject"));
+        r.close();
+        String dataString = new String(data);
+        Assertions.assertFalse(dataString.contains("This example explains how to add metadata."));
+    }
+
+    @Test
+    public void testStamperEncryptMetadata() throws Exception {
+        byte[] data = addWatermark(new File("src/test/resources/HelloWorldMeta.pdf"), true, createCleanerMoreInfo());
+        PdfReader r = new PdfReader(data);
+        Assertions.assertNull(r.getInfo().get("Producer"));
+        Assertions.assertNull(r.getInfo().get("Author"));
+        Assertions.assertNull(r.getInfo().get("Title"));
+        Assertions.assertNull(r.getInfo().get("Subject"));
+        r.close();
+    }
+
+
+    @Test
+    public void testStamperExtraMetadata() throws Exception {
+        HashMap moreInfo = createCleanerMoreInfo();
+        moreInfo.put("Producer", Document.getVersion());
+        moreInfo.put("Author", "Author1");
+        moreInfo.put("Title", "Title2");
+        moreInfo.put("Subject", "Subject3");
+        byte[] data = addWatermark(new File("src/test/resources/HelloWorldMeta.pdf"), false, moreInfo);
+        PdfReader r = new PdfReader(data);
+        Assertions.assertEquals(Document.getVersion(), r.getInfo().get("Producer"));
+        Assertions.assertEquals("Author1", r.getInfo().get("Author"));
+        Assertions.assertEquals("Title2", r.getInfo().get("Title"));
+        Assertions.assertEquals("Subject3", r.getInfo().get("Subject"));
+        r.close();
+    }
+
+    @Test
+    public void testCleanMetadataMethodInStamper() throws Exception {
+        byte[] data = cleanMetadata(new File("src/test/resources/HelloWorldMeta.pdf"));
+        PdfReader r = new PdfReader(data);
+        Assertions.assertNull(r.getInfo().get("Producer"));
+        Assertions.assertNull(r.getInfo().get("Author"));
+        Assertions.assertNull(r.getInfo().get("Title"));
+        Assertions.assertNull(r.getInfo().get("Subject"));
+        r.close();
+        String dataString = new String(data);
+        Assertions.assertFalse(dataString.contains("This example explains how to add metadata."));
+    }
+
+    @Test
+    public void skipMetaDataUpdateTest() throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PdfReader reader = new PdfReader(new File("src/test/resources/HelloWorldMeta.pdf").getAbsolutePath());
+        PdfStamper stamp = new PdfStamper(reader, baos, '\0', true);
+        stamp.setUpdateMetadata(false);
+        stamp.cleanMetadata();
+        stamp.close();
+
+        String dataString = baos.toString();
+        Assertions.assertTrue(dataString.contains("This example explains how to add metadata."));
+    }
+
+    @Test
+    public void skipMetaDataUpdateFirstRevisionTest() throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PdfReader reader = new PdfReader(new File("src/test/resources/HelloWorldMeta.pdf").getAbsolutePath());
+        PdfStamper stamp = new PdfStamper(reader, baos, '\0', false);
+        stamp.setUpdateMetadata(false);
+        stamp.cleanMetadata();
+        stamp.close();
+
+        String dataString = baos.toString();
+        Assertions.assertFalse(dataString.contains("This example explains how to add metadata."));
+    }
+
+    @Test
+    public void skipInfoUpdateTest() throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PdfReader reader = new PdfReader(new File("src/test/resources/HelloWorldMeta.pdf").getAbsolutePath());
+        PdfStamper stamp = new PdfStamper(reader, baos, '\0', true);
+
+        HashMap moreInfo = createCleanerMoreInfo();
+        moreInfo.put("Producer", Document.getVersion());
+        moreInfo.put("Author", "Author1");
+        moreInfo.put("Title", "Title2");
+        moreInfo.put("Subject", "Subject3");
+        stamp.setInfoDictionary(moreInfo);
+
+        stamp.setUpdateDocInfo(false);
+        stamp.close();
+
+        PdfReader r = new PdfReader(baos.toByteArray());
+        Assertions.assertNull(r.getInfo().get("Producer"));
+        Assertions.assertNull(r.getInfo().get("Author"));
+        Assertions.assertNull(r.getInfo().get("Title"));
+        Assertions.assertNull(r.getInfo().get("Subject"));
+        r.close();
+    }
+
+    @Test
+    public void skipInfoUpdateFirstRevisionTest() throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PdfReader reader = new PdfReader(new File("src/test/resources/HelloWorldMeta.pdf").getAbsolutePath());
+        PdfStamper stamp = new PdfStamper(reader, baos, '\0', false);
+
+        HashMap moreInfo = createCleanerMoreInfo();
+        moreInfo.put("Producer", Document.getVersion());
+        moreInfo.put("Author", "Author1");
+        moreInfo.put("Title", "Title2");
+        moreInfo.put("Subject", "Subject3");
+        stamp.setInfoDictionary(moreInfo);
+
+        stamp.setUpdateDocInfo(false);
+        stamp.close();
+
+        PdfReader r = new PdfReader(baos.toByteArray());
+        Assertions.assertNotNull(r.getInfo().get("Producer"));
+        Assertions.assertNotNull(r.getInfo().get("Author"));
+        Assertions.assertNotNull(r.getInfo().get("Title"));
+        Assertions.assertNotNull(r.getInfo().get("Subject"));
+        r.close();
+    }
+
+    @Test
+    public void testXMPMetadata() throws Exception {
+        File file = new File("src/test/resources/HelloWorldMeta.pdf");
+        PdfReader reader = new PdfReader(file.getAbsolutePath());
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PdfStamper stamp = new PdfStamper(reader, baos);
+        Map moreInfo = createCleanerMoreInfo();
+        ByteArrayOutputStream meta = new ByteArrayOutputStream();
+        XmpWriter writer = new XmpWriter(meta, moreInfo);
+        writer.close();
+        // Manually set clean metadata
+        stamp.setInfoDictionary(moreInfo);
+        stamp.setXmpMetadata(meta.toByteArray());
+
+        stamp.close();
+
+        byte[] data = baos.toByteArray();
+        PdfReader r = new PdfReader(data);
+        Assertions.assertNull(r.getInfo().get("Producer"));
+        Assertions.assertNull(r.getInfo().get("Author"));
+        Assertions.assertNull(r.getInfo().get("Title"));
+        Assertions.assertNull(r.getInfo().get("Subject"));
+        byte[] metadata = r.getMetadata();
+        r.close();
+        String dataString = new String(data);
+
+        Assertions.assertFalse(dataString.contains("Bruno Lowagie"));
+        Assertions.assertFalse(dataString.contains(" 1.2.12.SNAPSHOT"));
+        if (metadata != null) {
+            String metadataString = new String(metadata);
+            Assertions.assertFalse(metadataString.contains("Bruno Lowagie"));
+            Assertions.assertFalse(metadataString.contains(" 1.2.12.SNAPSHOT"));
+            Assertions.assertTrue(metadataString.contains(""));
+        }
+    }
+
+    private byte[] cleanMetadata(File origin) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PdfReader reader = new PdfReader(origin.getAbsolutePath());
+        PdfStamper stamp = new PdfStamper(reader, baos);
+        stamp.cleanMetadata();
+        stamp.close();
+        return baos.toByteArray();
+    }
+
+    private byte[] addWatermark(File origin, boolean encrypt, HashMap moreInfo) throws Exception {
+        int text_angle = 45;
+        int text1_pos_x = 300;
+        int text_1_pos_y = 430;
+        int text_2_pos_x = 330;
+        int text_2_pos_y = 410;
+        String text1 = "NOT VALID";
+        String text2 = "DRAFT";
+        int font_size = 32;
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PdfReader reader = new PdfReader(origin.getAbsolutePath());
+        int n = reader.getNumberOfPages();
+        PdfStamper stamp = new PdfStamper(reader, baos);
+        stamp.setInfoDictionary(moreInfo);
+        if (encrypt) {
+            stamp.setEncryption(null, null, 0, PdfWriter.ENCRYPTION_AES_128);
+        }
+        int i = 0;
+        PdfContentByte over;
+        BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.EMBEDDED);
+
+        while (i < n) {
+            i++;
+            over = stamp.getOverContent(i);
+            over.beginText();
+            over.setRGBColorFill(255, 0, 0);
+            over.setFontAndSize(bf, font_size);
+            over.showTextAligned(Element.ALIGN_CENTER, text1, text1_pos_x, text_1_pos_y, text_angle);
+            over.showTextAligned(Element.ALIGN_CENTER, text2, text_2_pos_x, text_2_pos_y, text_angle);
+            over.endText();
+        }
+
+        stamp.close();
+
+        return baos.toByteArray();
+    }
 
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/parser/PdfTextExtractorTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/parser/PdfTextExtractorTest.java
index f9ab21dba..4fe602ab9 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/parser/PdfTextExtractorTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/parser/PdfTextExtractorTest.java
@@ -9,26 +9,25 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import com.lowagie.text.pdf.FontSelector;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import com.lowagie.text.Font;
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
+import com.lowagie.text.Font;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Phrase;
+import com.lowagie.text.pdf.FontSelector;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 
 class PdfTextExtractorTest {
@@ -38,6 +37,35 @@ class PdfTextExtractorTest {
                     + "eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed "
                     + "diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.";
 
+    static byte[] createSimpleDocumentWithElements(Element... elements) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        Document document = new Document(PageSize.A4);
+        PdfWriter.getInstance(document, baos);
+
+        document.open();
+        for (Element element : elements) {
+            document.add(element);
+        }
+        document.close();
+
+        return baos.toByteArray();
+    }
+
+    protected static byte[] readDocument(final File file) throws IOException {
+        try (ByteArrayOutputStream fileBytes = new ByteArrayOutputStream();
+                InputStream inputStream = new FileInputStream(file)) {
+            final byte[] buffer = new byte[8192];
+            while (true) {
+                final int bytesRead = inputStream.read(buffer);
+                if (bytesRead == -1) {
+                    break;
+                }
+                fileBytes.write(buffer, 0, bytesRead);
+            }
+            return fileBytes.toByteArray();
+        }
+    }
+
     @Test
     void testPageExceeded() throws Exception {
         assertThat(getString("HelloWorldMeta.pdf", 5), is(emptyString()));
@@ -115,7 +143,6 @@ void getTextFromPageWithPhrases_expectsNoAddedSpace() throws IOException {
         assertThat(extracted, is("Phrase begin. Phrase End."));
     }
 
-
     @Test
     void getTextFromPageWithParagraphs_expectsTextHasNoMultipleSpaces() throws IOException {
         // given
@@ -149,20 +176,6 @@ void getTextFromPageInTablesWithSingleWords_expectsWordsAreSeparatedBySpaces()
         assertThat(extracted, is("One Two Three"));
     }
 
-    static byte[] createSimpleDocumentWithElements(Element... elements) {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        Document document = new Document(PageSize.A4);
-        PdfWriter.getInstance(document, baos);
-
-        document.open();
-        for (Element element : elements) {
-            document.add(element);
-        }
-        document.close();
-
-        return baos.toByteArray();
-    }
-
     private String getString(String fileName, int pageNumber) throws Exception {
         URL resource = getClass().getResource("/" + fileName);
         return getString(new File(resource.toURI()), pageNumber);
@@ -174,19 +187,4 @@ private String getString(File file, int pageNumber) throws Exception {
 
         return new PdfTextExtractor(pdfReader).getTextFromPage(pageNumber);
     }
-
-    protected static byte[] readDocument(final File file) throws IOException {
-        try (ByteArrayOutputStream fileBytes = new ByteArrayOutputStream();
-                InputStream inputStream = new FileInputStream(file)) {
-            final byte[] buffer = new byte[8192];
-            while (true) {
-                final int bytesRead = inputStream.read(buffer);
-                if (bytesRead == -1) {
-                    break;
-                }
-                fileBytes.write(buffer, 0, bytesRead);
-            }
-            return fileBytes.toByteArray();
-        }
-    }
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/sign/ExtractCertificatesTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/sign/ExtractCertificatesTest.java
index 21a7fbfbb..4beedb76b 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/sign/ExtractCertificatesTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/sign/ExtractCertificatesTest.java
@@ -67,7 +67,7 @@ private void extract(String pdf, boolean isExpectedValidTimeStamp) throws Except
                 X509Name subjectFields = PdfPKCS7.getSubjectFields(certificate);
                 assertThat(subjectFields).isNotNull();
                 assertThat(subjectFields.getAllFields()).isNotEmpty()
-                    .containsKey("C");
+                        .containsKey("C");
                 assertThat(pk.verify()).isTrue();
                 assertThat(pk.verifyTimestampImprint()).isEqualTo(isExpectedValidTimeStamp);
 
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/table/TableElementsAlignmentTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/table/TableElementsAlignmentTest.java
index 79080da4f..0fe610378 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/table/TableElementsAlignmentTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/table/TableElementsAlignmentTest.java
@@ -30,18 +30,18 @@ public class TableElementsAlignmentTest {
     Iterable testSettingTableAlignment() {
         final Table table = new Table(1);
         return Arrays.stream(HorizontalAlignment.values())
-            .map(alignment -> dynamicTest(TEST_TITLE + alignment, () -> {
-                table.setHorizontalAlignment(alignment);
-                final int alignmentId = table.getAlignment();
-                assertEquals(alignmentId, alignment.getId());
-            }))
-            .collect(Collectors.toList());
+                .map(alignment -> dynamicTest(TEST_TITLE + alignment, () -> {
+                    table.setHorizontalAlignment(alignment);
+                    final int alignmentId = table.getAlignment();
+                    assertEquals(alignmentId, alignment.getId());
+                }))
+                .collect(Collectors.toList());
     }
 
     @Test
     void testSettingCellHorizontalAlignment() {
         final Cell cell = new Cell();
-        for (final HorizontalAlignment alignment: HorizontalAlignment.values()) {
+        for (final HorizontalAlignment alignment : HorizontalAlignment.values()) {
             cell.setHorizontalAlignment(alignment);
             final int alignmentId = cell.getHorizontalAlignment();
             assertEquals(alignmentId, alignment.getId());
@@ -51,7 +51,7 @@ void testSettingCellHorizontalAlignment() {
     @Test
     void testSettingCellVerticalAlignment() {
         final Cell cell = new Cell();
-        for (final VerticalAlignment alignment: VerticalAlignment.values()) {
+        for (final VerticalAlignment alignment : VerticalAlignment.values()) {
             cell.setVerticalAlignment(alignment);
             final int alignmentId = cell.getVerticalAlignment();
             assertEquals(alignmentId, alignment.getId());
diff --git a/openpdf/src/test/java/com/lowagie/text/validation/PDFValidationTest.java b/openpdf/src/test/java/com/lowagie/text/validation/PDFValidationTest.java
index 046242edc..0e2aa1e8c 100644
--- a/openpdf/src/test/java/com/lowagie/text/validation/PDFValidationTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/validation/PDFValidationTest.java
@@ -5,6 +5,9 @@
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.verapdf.core.ModelParsingException;
@@ -15,10 +18,6 @@
 import org.verapdf.pdfa.results.ValidationResult;
 import org.verapdf.pdfa.validation.validators.ValidatorFactory;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
 /**
  * Validate PDF files created by OpenPDF using Vera.
  */
@@ -44,7 +43,7 @@ public void testValidatePDFWithVera() throws Exception {
             // Create a veraPDF validator
             PDFAFlavour flavour = PDFAFlavour.PDFA_1_B;
             try (InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-                 GFModelParser parser = GFModelParser.createModelWithFlavour(inputStream, flavour)) {
+                    GFModelParser parser = GFModelParser.createModelWithFlavour(inputStream, flavour)) {
                 PDFAValidator validator = ValidatorFactory.createValidator(flavour, false, 10);
                 ValidationResult result = validator.validate(parser);
 
diff --git a/openpdf/src/test/java/com/lowagie/text/xml/simpleparser/SimpleXMLParserTest.java b/openpdf/src/test/java/com/lowagie/text/xml/simpleparser/SimpleXMLParserTest.java
index d0c9638a7..3f91e512b 100755
--- a/openpdf/src/test/java/com/lowagie/text/xml/simpleparser/SimpleXMLParserTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/xml/simpleparser/SimpleXMLParserTest.java
@@ -5,7 +5,6 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -17,6 +16,15 @@ public class SimpleXMLParserTest {
     static final String xmlBOM = bom + xmlRaw;
     static final String xmlI15 = "" + euro + "";
 
+    static void testCharset(String xml, Charset charset) throws IOException {
+        try (
+                TestHandler h = new TestHandler(charset);
+                ByteArrayInputStream is = new ByteArrayInputStream(xml.getBytes(charset))
+        ) {
+            SimpleXMLParser.parse(h, is);
+        }
+    }
+
     @Test
     void testDetectUnicode() throws IOException {
         testCharset(xmlRaw, StandardCharsets.UTF_8);
@@ -39,35 +47,30 @@ void testDetectedOverDeclared() throws IOException {
         testCharset(xml, Charset.forName("ISO-8859-15"));
     }
 
-    static void testCharset(String xml, Charset charset) throws IOException {
-        try (
-                TestHandler h = new TestHandler(charset);
-                ByteArrayInputStream is = new ByteArrayInputStream(xml.getBytes(charset))
-        ) {
-            SimpleXMLParser.parse(h, is);
-        }
-    }
-
     static class TestHandler implements SimpleXMLDocHandler, AutoCloseable {
 
-        volatile boolean called = false;
         final String charset;
+        volatile boolean called = false;
 
         TestHandler(Charset charset) {
             this.charset = charset.displayName();
         }
 
         @Override
-        public void startElement(String tag, Map h) {}
+        public void startElement(String tag, Map h) {
+        }
 
         @Override
-        public void endElement(String tag) {}
+        public void endElement(String tag) {
+        }
 
         @Override
-        public void startDocument() {}
+        public void startDocument() {
+        }
 
         @Override
-        public void endDocument() {}
+        public void endDocument() {
+        }
 
         @Override
         public void text(String str) {
diff --git a/openpdf/src/test/resources/base64-image.html b/openpdf/src/test/resources/base64-image.html
index 9a5450eda..24e68b6c9 100644
--- a/openpdf/src/test/resources/base64-image.html
+++ b/openpdf/src/test/resources/base64-image.html
@@ -1 +1,8 @@
-
              image

              Some test  also in bold

              Simple list
              - Item 1
              - Item 2
              - Item 3
              - Item 4
              - Item 5


              That's it
              
+
              image
+

              Some test  also in bold
              
+  
              Simple list
              - Item 1
              - Item 2
              - Item 3
              - Item 4
              - Item 5


              
+
              That's it
              
diff --git a/openpdf/src/test/resources/parseTitle.html b/openpdf/src/test/resources/parseTitle.html
index 72b74b208..ad8b06145 100644
--- a/openpdf/src/test/resources/parseTitle.html
+++ b/openpdf/src/test/resources/parseTitle.html
@@ -1,11 +1,11 @@
 
 
 
-    
-    Title
+  
+  Title
 
 
-    
              This is a test
              
-    
              This is a test2
              
+
              This is a test
              
+
              This is a test2
              
 
 
\ No newline at end of file
diff --git a/openpdf/src/test/resources/stylesTest/backgroundColor.html b/openpdf/src/test/resources/stylesTest/backgroundColor.html
index ab323c069..11b05a1cd 100644
--- a/openpdf/src/test/resources/stylesTest/backgroundColor.html
+++ b/openpdf/src/test/resources/stylesTest/backgroundColor.html
@@ -1,12 +1,12 @@
 
 
 
-    
+  
 
 
-    Blue background
              
-    Blue background
              
-    Blue background
              
-    Blue background
              
+Blue background
              
+Blue background
              
+Blue background
              
+Blue background
              
 
 
diff --git a/openpdf/src/test/resources/stylesTest/fontColor.html b/openpdf/src/test/resources/stylesTest/fontColor.html
index 254633401..2b2df8a8c 100644
--- a/openpdf/src/test/resources/stylesTest/fontColor.html
+++ b/openpdf/src/test/resources/stylesTest/fontColor.html
@@ -1,10 +1,10 @@
 
 
 
-    
+  
 
 
-    Blue text
              
-    Blue text
              
+Blue text
              
+Blue text
              
 
 
diff --git a/openpdf/src/test/resources/stylesTest/fontSize.html b/openpdf/src/test/resources/stylesTest/fontSize.html
index b74062940..d6e460e47 100644
--- a/openpdf/src/test/resources/stylesTest/fontSize.html
+++ b/openpdf/src/test/resources/stylesTest/fontSize.html
@@ -1,7 +1,7 @@
 
 
 
-    
+  
 
 
 Text
              
diff --git a/openpdf/src/test/resources/stylesTest/fontSizeNamed.html b/openpdf/src/test/resources/stylesTest/fontSizeNamed.html
index b52f4ef5a..0853f1451 100644
--- a/openpdf/src/test/resources/stylesTest/fontSizeNamed.html
+++ b/openpdf/src/test/resources/stylesTest/fontSizeNamed.html
@@ -1,7 +1,7 @@
 
 
 
-    
+  
 
 
 
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/Rups.java b/pdf-swing/src/main/java/com/lowagie/rups/Rups.java
index a98901984..aeeb47fe8 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/Rups.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/Rups.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,30 +20,36 @@
 
 package com.lowagie.rups;
 
+import com.lowagie.rups.controller.RupsController;
 import java.awt.Dimension;
 import java.awt.Toolkit;
-
 import javax.swing.JFrame;
 
-import com.lowagie.rups.controller.RupsController;
-
 /**
- * iText RUPS is a tool that allows you to inspect the internal structure
- * of a PDF file.
+ * iText RUPS is a tool that allows you to inspect the internal structure of a PDF file.
  */
 public class Rups {
-    
+
     // main method
+
+    /**
+     * Serial Version UID.
+     */
+    private static final long serialVersionUID = 4386633640535735848L;
+
+    // methods
+
     /**
      * Main method. Starts the RUPS application.
-     * @param    args    no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
         startApplication();
     }
-    
-    // methods
-    
+
+    // other member variables
+
     /**
      * Initializes the main components of the Rups application.
      */
@@ -52,8 +58,8 @@ public static void startApplication() {
         JFrame frame = new JFrame();
         // defines the size and location
         Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
-        frame.setSize((int)(screen.getWidth() * .90), (int)(screen.getHeight() * .90));
-        frame.setLocation((int)(screen.getWidth() * .05), (int)(screen.getHeight() * .05));
+        frame.setSize((int) (screen.getWidth() * .90), (int) (screen.getHeight() * .90));
+        frame.setLocation((int) (screen.getWidth() * .05), (int) (screen.getHeight() * .05));
         frame.setResizable(true);
         // title bar
         frame.setTitle("iText RUPS");
@@ -64,10 +70,5 @@ public static void startApplication() {
         frame.getContentPane().add(controller.getMasterComponent(), java.awt.BorderLayout.CENTER);
         frame.setVisible(true);
     }
-    
-    // other member variables
-    
-    /** Serial Version UID. */
-    private static final long serialVersionUID = 4386633640535735848L;
 
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/controller/PdfReaderController.java b/pdf-swing/src/main/java/com/lowagie/rups/controller/PdfReaderController.java
index 89fe92a1e..55e2bb45f 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/controller/PdfReaderController.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/controller/PdfReaderController.java
@@ -20,13 +20,6 @@
 
 package com.lowagie.rups.controller;
 
-import java.util.Observable;
-import java.util.Observer;
-
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.event.TreeSelectionListener;
-
 import com.lowagie.rups.model.ObjectLoader;
 import com.lowagie.rups.model.PdfFile;
 import com.lowagie.rups.model.TreeNodeFactory;
@@ -43,40 +36,65 @@
 import com.lowagie.rups.view.itext.treenodes.PdfTrailerTreeNode;
 import com.lowagie.text.pdf.PRStream;
 import com.lowagie.text.pdf.PdfObject;
+import java.util.Observable;
+import java.util.Observer;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.event.TreeSelectionListener;
 
 /**
  * Controls the GUI components that get their content from iText's PdfReader.
  */
 public class PdfReaderController extends Observable implements Observer {
 
-    /** Treeview of the PDF file. */
+    /**
+     * Treeview of the PDF file.
+     */
     protected PdfTree pdfTree;
-    /** Tabbed Pane containing other components. */
+    /**
+     * Tabbed Pane containing other components.
+     */
     protected JTabbedPane navigationTabs;
-    /** JTable with all the pages and their labels. */
+    /**
+     * JTable with all the pages and their labels.
+     */
     protected PagesTable pages;
-    /** Treeview of the outlines. */
+    /**
+     * Treeview of the outlines.
+     */
     protected OutlineTree outlines;
-    /** Treeview of the form. */
+    /**
+     * Treeview of the form.
+     */
     protected FormTree form;
-    /** JTable corresponding with the CrossReference table. */
+    /**
+     * JTable corresponding with the CrossReference table.
+     */
     protected XRefTable xref;
-    /** A panel that will show PdfObjects. */
+    /**
+     * A panel that will show PdfObjects.
+     */
     protected PdfObjectPanel objectPanel;
-    /** Tabbed Pane containing other components. */
+    /**
+     * Tabbed Pane containing other components.
+     */
     protected JTabbedPane editorTabs;
-    /** A panel that will show a stream. */
+    /**
+     * A panel that will show a stream.
+     */
     protected StreamTextArea streamArea;
 
-    /** The factory producing tree nodes. */
+    /**
+     * The factory producing tree nodes.
+     */
     protected TreeNodeFactory nodes;
 
     /**
-     * Constructs the PdfReaderController.
-     * This is an Observable object to which all iText related GUI components
-     * are added as Observers.
-     * @param treeSelectionListener    when somebody selects a tree node, this listener listens to the event
-     * @param pageSelectionListener    when somebody changes a page, this listener changes accordingly
+     * Constructs the PdfReaderController. This is an Observable object to which all iText related GUI components are
+     * added as Observers.
+     *
+     * @param treeSelectionListener when somebody selects a tree node, this listener listens to the event
+     * @param pageSelectionListener when somebody changes a page, this listener changes accordingly
      */
     public PdfReaderController(TreeSelectionListener treeSelectionListener,
             PageSelectionListener pageSelectionListener) {
@@ -108,6 +126,7 @@ public PdfReaderController(TreeSelectionListener treeSelectionListener,
 
     /**
      * Getter for the PDF Tree.
+     *
      * @return the PdfTree object
      */
     public PdfTree getPdfTree() {
@@ -115,28 +134,27 @@ public PdfTree getPdfTree() {
     }
 
     /**
-     * Getter for the tabs that allow you to navigate through
-     * the PdfTree quickly (pages, form, outlines, xref table).
-     * @return    a JTabbedPane
+     * Getter for the tabs that allow you to navigate through the PdfTree quickly (pages, form, outlines, xref table).
+     *
+     * @return a JTabbedPane
      */
     public JTabbedPane getNavigationTabs() {
         return navigationTabs;
     }
 
     /**
-     * Getter for the panel that will show the contents
-     * of a PDF Object (except for PdfStreams: only the
-     * Stream Dictionary will be shown; the content stream
-     * is shown in a StreamTextArea object).
-     * @return    the PdfObjectPanel
+     * Getter for the panel that will show the contents of a PDF Object (except for PdfStreams: only the Stream
+     * Dictionary will be shown; the content stream is shown in a StreamTextArea object).
+     *
+     * @return the PdfObjectPanel
      */
     public PdfObjectPanel getObjectPanel() {
         return objectPanel;
     }
 
     /**
-     * Getter for the tabs with the editor windows
-     * (to which the Console window will be added).
+     * Getter for the tabs with the editor windows (to which the Console window will be added).
+     *
      * @return the tabs with the editor windows
      */
     public JTabbedPane getEditorTabs() {
@@ -144,9 +162,9 @@ public JTabbedPane getEditorTabs() {
     }
 
     /**
-     * Getter for the object that holds the TextArea
-     * with the content stream of a PdfStream object.
-     * @return    a StreamTextArea
+     * Getter for the object that holds the TextArea with the content stream of a PdfStream object.
+     *
+     * @return a StreamTextArea
      */
     public StreamTextArea getStreamArea() {
         return streamArea;
@@ -154,7 +172,8 @@ public StreamTextArea getStreamArea() {
 
     /**
      * Starts loading the PDF Objects in background.
-     * @param file    the wrapper object that holds the PdfReader as member variable
+     *
+     * @param file the wrapper object that holds the PdfReader as member variable
      */
     public void startObjectLoader(PdfFile file) {
         setChanged();
@@ -164,17 +183,16 @@ public void startObjectLoader(PdfFile file) {
     }
 
     /**
-     * The GUI components that show the internals of a PDF file,
-     * can only be shown if all objects are loaded into the
-     * IndirectObjectFactory using the ObjectLoader.
-     * As soon as this is done, the GUI components are notified.
-     * @param    obj    in this case the Object should be an ObjectLoader
+     * The GUI components that show the internals of a PDF file, can only be shown if all objects are loaded into the
+     * IndirectObjectFactory using the ObjectLoader. As soon as this is done, the GUI components are notified.
+     *
+     * @param obj in this case the Object should be an ObjectLoader
      * @see java.util.Observable#notifyObservers(java.lang.Object)
      */
     @Override
     public void notifyObservers(Object obj) {
         if (obj instanceof ObjectLoader) {
-            ObjectLoader loader = (ObjectLoader)obj;
+            ObjectLoader loader = (ObjectLoader) obj;
             nodes = loader.getNodes();
             PdfTrailerTreeNode root = pdfTree.getRoot();
             root.setTrailer(loader.getReader().getTrailer());
@@ -186,6 +204,7 @@ public void notifyObservers(Object obj) {
 
     /**
      * Selects a node in the PdfTree.
+     *
      * @param node a node in the PdfTree
      */
     public void selectNode(PdfObjectTreeNode node) {
@@ -194,6 +213,7 @@ public void selectNode(PdfObjectTreeNode node) {
 
     /**
      * Selects a node in the PdfTree.
+     *
      * @param objectNumber a number of a node in the PdfTree
      */
     public void selectNode(int objectNumber) {
@@ -201,9 +221,9 @@ public void selectNode(int objectNumber) {
     }
 
     /**
-     * Renders the syntax of a PdfObject in the objectPanel.
-     * If the object is a PDF Stream, then the stream is shown
-     * in the streamArea too.
+     * Renders the syntax of a PdfObject in the objectPanel. If the object is a PDF Stream, then the stream is shown in
+     * the streamArea too.
+     *
      * @param object the object to render
      */
     public void render(PdfObject object) {
@@ -211,29 +231,31 @@ public void render(PdfObject object) {
         streamArea.render(object);
         if (object instanceof PRStream) {
             editorTabs.setSelectedComponent(streamArea);
-        }
-        else {
+        } else {
             editorTabs.setSelectedIndex(editorTabs.getComponentCount() - 1);
         }
     }
 
     /**
-     * Selects the row in the pageTable that corresponds with
-     * a certain page number.
+     * Selects the row in the pageTable that corresponds with a certain page number.
+     *
      * @param pageNumber the page number that needs to be selected
      */
     public void gotoPage(int pageNumber) {
         pageNumber--;
-        if (pages == null || pages.getSelectedRow() == pageNumber)
+        if (pages == null || pages.getSelectedRow() == pageNumber) {
             return;
-        if (pageNumber < pages.getRowCount())
+        }
+        if (pageNumber < pages.getRowCount()) {
             pages.setRowSelectionInterval(pageNumber, pageNumber);
+        }
     }
 
     /**
      * Forwards updates from the RupsController to the Observers of this class.
-     * @param    observable    this should be the RupsController
-     * @param    obj    the object that has to be forwarded to the observers of PdfReaderController
+     *
+     * @param observable this should be the RupsController
+     * @param obj        the object that has to be forwarded to the observers of PdfReaderController
      * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
      */
     public void update(Observable observable, Object obj) {
@@ -243,7 +265,7 @@ public void update(Observable observable, Object obj) {
             nodes = null;
         }
         if (obj instanceof PdfObjectTreeNode) {
-            PdfObjectTreeNode node = (PdfObjectTreeNode)obj;
+            PdfObjectTreeNode node = (PdfObjectTreeNode) obj;
             nodes.expandNode(node);
             if (node.isRecursive()) {
                 pdfTree.selectNode(node.getAncestor());
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/controller/RupsController.java b/pdf-swing/src/main/java/com/lowagie/rups/controller/RupsController.java
index 83794c311..bcb2e7e57 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/controller/RupsController.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/controller/RupsController.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,12 +20,20 @@
 
 package com.lowagie.rups.controller;
 
+import com.lowagie.rups.io.FileChooserAction;
+import com.lowagie.rups.io.FileCloseAction;
+import com.lowagie.rups.model.PdfFile;
+import com.lowagie.rups.view.Console;
+import com.lowagie.rups.view.PageSelectionListener;
+import com.lowagie.rups.view.RupsMenuBar;
+import com.lowagie.rups.view.itext.treenodes.PdfObjectTreeNode;
+import com.lowagie.rups.view.itext.treenodes.PdfTrailerTreeNode;
+import com.lowagie.text.DocumentException;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.io.File;
 import java.io.IOException;
 import java.util.Observable;
-
 import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
@@ -33,44 +41,42 @@
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 
-import com.lowagie.rups.io.FileChooserAction;
-import com.lowagie.rups.io.FileCloseAction;
-import com.lowagie.rups.model.PdfFile;
-import com.lowagie.rups.view.Console;
-import com.lowagie.rups.view.PageSelectionListener;
-import com.lowagie.rups.view.RupsMenuBar;
-import com.lowagie.rups.view.itext.treenodes.PdfObjectTreeNode;
-import com.lowagie.rups.view.itext.treenodes.PdfTrailerTreeNode;
-import com.lowagie.text.DocumentException;
-
 /**
- * This class controls all the GUI components that are shown in
- * the RUPS application: the menu bar, the panels,...
+ * This class controls all the GUI components that are shown in the RUPS application: the menu bar, the panels,...
  */
 public class RupsController extends Observable
-    implements TreeSelectionListener, PageSelectionListener {
-    
+        implements TreeSelectionListener, PageSelectionListener {
+
     // member variables
-    
+
     /* file and controller */
-    /** The Pdf file that is currently open in the application. */
+    /**
+     * The Pdf file that is currently open in the application.
+     */
     protected PdfFile pdfFile;
     /**
      * Object with the GUI components for iText.
-     * @since    iText 5.0.0 (renamed from reader which was confusing because reader is normally used for a PdfReader instance)
+     *
+     * @since iText 5.0.0 (renamed from reader which was confusing because reader is normally used for a PdfReader
+     * instance)
      */
     protected PdfReaderController readerController;
 
     /* main components */
-    /** The JMenuBar for the RUPS application. */
+    /**
+     * The JMenuBar for the RUPS application.
+     */
     protected RupsMenuBar menuBar;
-    /** Contains all other components: the page panel, the outline tree, etc. */
+    /**
+     * Contains all other components: the page panel, the outline tree, etc.
+     */
     protected JSplitPane masterComponent;
-    
-    
+
     // constructor
+
     /**
      * Constructs the GUI components of the RUPS application.
+     *
      * @param dimension the Dimension of the GUi components
      */
     public RupsController(Dimension dimension) {
@@ -85,20 +91,20 @@ public RupsController(Dimension dimension) {
         // creating the master component
         masterComponent = new JSplitPane();
         masterComponent.setOrientation(JSplitPane.VERTICAL_SPLIT);
-        masterComponent.setDividerLocation((int)(dimension.getHeight() * .70));
+        masterComponent.setDividerLocation((int) (dimension.getHeight() * .70));
         masterComponent.setDividerSize(2);
-        
+
         JSplitPane content = new JSplitPane();
         masterComponent.add(content, JSplitPane.TOP);
         JSplitPane info = new JSplitPane();
         masterComponent.add(info, JSplitPane.BOTTOM);
-        
+
         content.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
-        content.setDividerLocation((int)(dimension.getWidth() * .6));
+        content.setDividerLocation((int) (dimension.getWidth() * .6));
         content.setDividerSize(1);
         content.add(new JScrollPane(readerController.getPdfTree()), JSplitPane.LEFT);
         content.add(readerController.getNavigationTabs(), JSplitPane.RIGHT);
-        
+
         info.setDividerLocation((int) (dimension.getWidth() * .3));
         info.setDividerSize(1);
         info.add(readerController.getObjectPanel(), JSplitPane.LEFT);
@@ -107,37 +113,42 @@ public RupsController(Dimension dimension) {
         editorPane.addTab("Console", null, cons, "Console window (System.out/System.err)");
         editorPane.setSelectedComponent(cons);
         info.add(editorPane, JSplitPane.RIGHT);
-        
+
     }
 
-    /** Getter for the menubar.
-     * @return the menubar */
+    /**
+     * Getter for the menubar.
+     *
+     * @return the menubar
+     */
     public RupsMenuBar getMenuBar() {
         return menuBar;
     }
-    
-    /** Getter for the master component.
-     * @return the master component */
+
+    /**
+     * Getter for the master component.
+     *
+     * @return the master component
+     */
     public Component getMasterComponent() {
         return masterComponent;
     }
 
     // Observable
-    
+
     /**
      * @see java.util.Observable#notifyObservers(java.lang.Object)
      */
     @Override
     public void notifyObservers(Object obj) {
         if (obj instanceof FileChooserAction) {
-            File file = ((FileChooserAction)obj).getFile();
+            File file = ((FileChooserAction) obj).getFile();
             try {
                 pdfFile = new PdfFile(file);
                 setChanged();
                 super.notifyObservers(RupsMenuBar.OPEN);
                 readerController.startObjectLoader(pdfFile);
-            }
-            catch(IOException | DocumentException ioe) {
+            } catch (IOException | DocumentException ioe) {
                 JOptionPane.showMessageDialog(masterComponent, ioe.getMessage(), "Dialog", JOptionPane.ERROR_MESSAGE);
             }
             return;
@@ -151,7 +162,7 @@ public void notifyObservers(Object obj) {
     }
 
     // tree selection
-    
+
     /**
      * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent)
      */
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/io/FileChooserAction.java b/pdf-swing/src/main/java/com/lowagie/rups/io/FileChooserAction.java
index 8b935daf3..09063475f 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/io/FileChooserAction.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/io/FileChooserAction.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -23,31 +23,42 @@
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.util.Observable;
-
 import javax.swing.AbstractAction;
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 
 /**
- * Allows you to browse the file system and forwards the file
- * to the object that is waiting for you to choose a file.
+ * Allows you to browse the file system and forwards the file to the object that is waiting for you to choose a file.
  */
 public class FileChooserAction extends AbstractAction {
-    
-    /** An object that is expecting the result of the file chooser action. */
+
+    /**
+     * A serial version UID.
+     */
+    private static final long serialVersionUID = 2225830878098387118L;
+    /**
+     * An object that is expecting the result of the file chooser action.
+     */
     protected Observable observable;
-    /** A file filter to apply when browsing for a file. */
+    /**
+     * A file filter to apply when browsing for a file.
+     */
     protected FileFilter filter;
-    /** Indicates if you're browsing to create a new or an existing file. */
+    /**
+     * Indicates if you're browsing to create a new or an existing file.
+     */
     protected boolean newFile;
-    /** The file that was chosen. */
+    /**
+     * The file that was chosen.
+     */
     protected File file;
-    
+
     /**
      * Creates a new file chooser action.
-     * @param observable    the object waiting for you to select file
+     *
+     * @param observable the object waiting for you to select file
      * @param caption    a description for the action
-     * @param filter    a filter to apply when browsing
+     * @param filter     a filter to apply when browsing
      * @param newFile    indicates if you should browse for a new or existing file
      */
     public FileChooserAction(Observable observable, String caption, FileFilter filter, boolean newFile) {
@@ -56,7 +67,7 @@ public FileChooserAction(Observable observable, String caption, FileFilter filte
         this.filter = filter;
         this.newFile = newFile;
     }
-    
+
     /**
      * Getter for the file.
      *
@@ -77,8 +88,7 @@ public void actionPerformed(ActionEvent evt) {
         int okCancel;
         if (newFile) {
             okCancel = fc.showSaveDialog(null);
-        }
-        else {
+        } else {
             okCancel = fc.showOpenDialog(null);
         }
         if (okCancel == JFileChooser.APPROVE_OPTION) {
@@ -87,7 +97,4 @@ public void actionPerformed(ActionEvent evt) {
         }
     }
 
-    /** A serial version UID. */
-    private static final long serialVersionUID = 2225830878098387118L;
-
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/io/FileCloseAction.java b/pdf-swing/src/main/java/com/lowagie/rups/io/FileCloseAction.java
index bdb1a8dbb..a8c4dd9a1 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/io/FileCloseAction.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/io/FileCloseAction.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -25,22 +25,25 @@
 import java.util.Observable;
 
 /**
- * Action that tells an observable to close a file and/or releases
- * resources relevant for the file that is being closed.
+ * Action that tells an observable to close a file and/or releases resources relevant for the file that is being
+ * closed.
  */
 public class FileCloseAction implements ActionListener {
-    
-    /** An object that allows you to close a file. */
+
+    /**
+     * An object that allows you to close a file.
+     */
     protected Observable observable;
-    
+
     /**
      * Creates the close action.
-     * @param    observable    the object that expects you to close a file.
+     *
+     * @param observable the object that expects you to close a file.
      */
     public FileCloseAction(Observable observable) {
         this.observable = observable;
     }
-    
+
     /**
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/io/OutputStreamResource.java b/pdf-swing/src/main/java/com/lowagie/rups/io/OutputStreamResource.java
index 48137958e..8e03d3b8f 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/io/OutputStreamResource.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/io/OutputStreamResource.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -24,14 +24,15 @@
 import java.io.OutputStream;
 
 /**
- * An object that implements this interface is a resource that
- * can be written to an OutputStream.
+ * An object that implements this interface is a resource that can be written to an OutputStream.
  */
 public interface OutputStreamResource {
+
     /**
      * Writes a resource to an OutputStream.
-     * @param os    the OutputStream to which the XML is written.
-     * @throws IOException    usual exception when there's a problem writing to an OutputStream
+     *
+     * @param os the OutputStream to which the XML is written.
+     * @throws IOException usual exception when there's a problem writing to an OutputStream
      */
     void writeTo(OutputStream os) throws IOException;
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/io/TextAreaOutputStream.java b/pdf-swing/src/main/java/com/lowagie/rups/io/TextAreaOutputStream.java
index 949fefa60..0374582ca 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/io/TextAreaOutputStream.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/io/TextAreaOutputStream.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -23,21 +23,26 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-
 import javax.swing.JTextArea;
 
 /**
  * Everything writing to this OutputStream will be shown in a JTextArea.
  */
 public class TextAreaOutputStream extends OutputStream {
-    /** The text area to which we want to write. */
+
+    /**
+     * The text area to which we want to write.
+     */
     protected JTextArea text;
-    /** Keeps track of the offset of the text in the text area. */
+    /**
+     * Keeps track of the offset of the text in the text area.
+     */
     protected int offset;
-    
+
     /**
      * Constructs a TextAreaOutputStream.
-     * @param text    the text area to which we want to write.
+     *
+     * @param text the text area to which we want to write.
      */
     public TextAreaOutputStream(JTextArea text) {
         this.text = text;
@@ -51,13 +56,13 @@ public void clear() {
         text.setText(null);
         offset = 0;
     }
-    
+
     /**
      * @see java.io.OutputStream#write(int)
      */
     @Override
     public void write(int i) throws IOException {
-        byte[] b = { (byte)i };
+        byte[] b = {(byte) i};
         write(b, 0, 1);
     }
 
@@ -83,5 +88,5 @@ public void write(byte[] b) throws IOException {
             write(snippet, 0, bytesread);
         }
     }
-    
+
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/io/filters/PdfFilter.java b/pdf-swing/src/main/java/com/lowagie/rups/io/filters/PdfFilter.java
index 5bac20400..bddb05f52 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/io/filters/PdfFilter.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/io/filters/PdfFilter.java
@@ -1,7 +1,6 @@
 package com.lowagie.rups.io.filters;
 
 import java.io.File;
-
 import javax.swing.filechooser.FileFilter;
 
 
@@ -10,24 +9,26 @@
  */
 public class PdfFilter extends FileFilter {
 
-    /** A public instance of the PdfFilter. */
+    /**
+     * A public instance of the PdfFilter.
+     */
     public static final PdfFilter INSTANCE = new PdfFilter();
-    
+
     /**
-     *
-     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
      * @param f File
      * @return boolean
+     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
      */
     public boolean accept(File f) {
-        if (f.isDirectory()) return true;
+        if (f.isDirectory()) {
+            return true;
+        }
         return f.getName().toLowerCase().endsWith(".pdf");
     }
 
     /**
-     *
-     * @see javax.swing.filechooser.FileFilter#getDescription()
      * @return String
+     * @see javax.swing.filechooser.FileFilter#getDescription()
      */
     public String getDescription() {
         return "*.pdf PDF files";
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/model/BackgroundTask.java b/pdf-swing/src/main/java/com/lowagie/rups/model/BackgroundTask.java
index 3ff41f4ac..3fce722a7 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/model/BackgroundTask.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/model/BackgroundTask.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -23,31 +23,19 @@
 import javax.swing.SwingUtilities;
 
 /**
- * Allows you to perform long lasting tasks in background.
- * If we ever move to Java 6, we should use the SwingWorker class
- * (included in the JDK) instead of this custom Event Dispatching
- * code.
+ * Allows you to perform long lasting tasks in background. If we ever move to Java 6, we should use the SwingWorker
+ * class (included in the JDK) instead of this custom Event Dispatching code.
  */
 
 public abstract class BackgroundTask {
 
     /**
-     * Inner class that holds the reference to the thread.
+     * A wrapper for the tread that executes a time-consuming task.
      */
-    private static class ThreadWrapper {
-        private Thread thread;
-        ThreadWrapper(Thread t) { thread = t; }
-        synchronized Thread get() { return thread; }
-        synchronized void clear() { thread = null; }
-    }
-
-    /** A wrapper for the tread that executes a time-consuming task. */
     private ThreadWrapper thread;
 
     /**
-     * Starts a thread.
-     * Executes the time-consuming task in the construct method;
-     * finally calls the finish().
+     * Starts a thread. Executes the time-consuming task in the construct method; finally calls the finish().
      */
     public BackgroundTask() {
         final Runnable doFinished = this::finished;
@@ -55,8 +43,7 @@ public BackgroundTask() {
         Runnable doConstruct = () -> {
             try {
                 doTask();
-            }
-            finally {
+            } finally {
                 thread.clear();
             }
             SwingUtilities.invokeLater(doFinished);
@@ -92,9 +79,28 @@ public void interrupt() {
     }
 
     /**
-     * Called on the event dispatching thread once the
-     * construct method has finished its task.
+     * Called on the event dispatching thread once the construct method has finished its task.
      */
     public void finished() {
     }
+
+    /**
+     * Inner class that holds the reference to the thread.
+     */
+    private static class ThreadWrapper {
+
+        private Thread thread;
+
+        ThreadWrapper(Thread t) {
+            thread = t;
+        }
+
+        synchronized Thread get() {
+            return thread;
+        }
+
+        synchronized void clear() {
+            thread = null;
+        }
+    }
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/model/IndirectObjectFactory.java b/pdf-swing/src/main/java/com/lowagie/rups/model/IndirectObjectFactory.java
index 1c919bbcc..a7a6f22f7 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/model/IndirectObjectFactory.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/model/IndirectObjectFactory.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,37 +20,48 @@
 
 package com.lowagie.rups.model;
 
-import java.util.ArrayList;
-
 import com.lowagie.text.pdf.IntHashtable;
 import com.lowagie.text.pdf.PdfDictionary;
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfNull;
 import com.lowagie.text.pdf.PdfObject;
 import com.lowagie.text.pdf.PdfReader;
+import java.util.ArrayList;
 
 /**
  * A factory that can produce all the indirect objects in a PDF file.
  */
 public class IndirectObjectFactory {
 
-    /** The reader object. */
+    /**
+     * The reader object.
+     */
     protected PdfReader reader;
-    /** The current xref number. */
+    /**
+     * The current xref number.
+     */
     protected int current;
-    /** The highest xref number. */
+    /**
+     * The highest xref number.
+     */
     protected int n;
-    /** A list of all the indirect objects in a PDF file. */
+    /**
+     * A list of all the indirect objects in a PDF file.
+     */
     protected ArrayList objects = new ArrayList<>();
-    /** Mapping between the index in the objects list and the reference number in the xref table.  */
+    /**
+     * Mapping between the index in the objects list and the reference number in the xref table.
+     */
     protected IntHashtable idxToRef = new IntHashtable();
-    /** Mapping between the reference number in the xref table and the index in the objects list .  */
+    /**
+     * Mapping between the reference number in the xref table and the index in the objects list .
+     */
     protected IntHashtable refToIdx = new IntHashtable();
-    
+
     /**
-     * Creates a list that will contain all the indirect objects
-     * in a PDF document. 
-     * @param reader    the reader that will read the PDF document
+     * Creates a list that will contain all the indirect objects in a PDF document.
+     *
+     * @param reader the reader that will read the PDF document
      */
     public IndirectObjectFactory(PdfReader reader) {
         this.reader = reader;
@@ -59,10 +70,10 @@ public IndirectObjectFactory(PdfReader reader) {
     }
 
     /**
-     * Gets the last object that has been registered.
-     * This method only makes sense while loading the factory.
-     * with loadNextObject().
-     * @return    the number of the last object that was stored
+     * Gets the last object that has been registered. This method only makes sense while loading the factory. with
+     * loadNextObject().
+     *
+     * @return the number of the last object that was stored
      */
     public int getCurrent() {
         return current;
@@ -70,17 +81,18 @@ public int getCurrent() {
 
     /**
      * Gets the highest possible object number in the XRef table.
-     * @return    an object number
+     *
+     * @return an object number
      */
     public int getXRefMaximum() {
         return n;
     }
 
     /**
-     * Stores the next object of the XRef table.
-     * As soon as this method returns false, it makes no longer
-     * sense calling it as all the objects have been stored.
-     * @return    false if there are no objects left to check.
+     * Stores the next object of the XRef table. As soon as this method returns false, it makes no longer sense calling
+     * it as all the objects have been stored.
+     *
+     * @return false if there are no objects left to check.
      */
     public boolean storeNextObject() {
         while (current < n) {
@@ -96,16 +108,16 @@ public boolean storeNextObject() {
         }
         return false;
     }
-    
+
     /**
-     * If we store all the objects, we might run out of memory;
-     * that's why we'll only store the objects that are necessary
-     * to construct other objects (for instance the page table).
-     * @param    object    an object we might want to store 
+     * If we store all the objects, we might run out of memory; that's why we'll only store the objects that are
+     * necessary to construct other objects (for instance the page table).
+     *
+     * @param object an object we might want to store
      */
     private void store(PdfObject object) {
-        if (object.isDictionary()){
-            PdfDictionary dict = (PdfDictionary)object;
+        if (object.isDictionary()) {
+            PdfDictionary dict = (PdfDictionary) object;
             if (PdfName.PAGE.equals(dict.get(PdfName.TYPE))) {
                 objects.add(dict);
                 return;
@@ -113,40 +125,42 @@ private void store(PdfObject object) {
         }
         objects.add(PdfNull.PDFNULL);
     }
-    
+
     /**
-     * Gets the total number of indirect objects in the PDF file.
-     * This isn't necessarily the same number as returned by getXRefMaximum().
-     * The PDF specification allows gaps between object numbers.
+     * Gets the total number of indirect objects in the PDF file. This isn't necessarily the same number as returned by
+     * getXRefMaximum(). The PDF specification allows gaps between object numbers.
+     *
      * @return the total number of indirect objects in the PDF.
      */
     public int size() {
         return objects.size();
     }
-    
+
     /**
      * Gets the index of an object based on its number in the xref table.
-     * @param ref    a number in the xref table
-     * @return    the index in the list of indirect objects
+     *
+     * @param ref a number in the xref table
+     * @return the index in the list of indirect objects
      */
     public int getIndexByRef(int ref) {
         return refToIdx.get(ref);
     }
-    
+
     /**
-     * Gets the reference number in the xref table based on the index in the
-     * indirect object list.
-     * @param i        the index of an object in the indirect object list
-     * @return    the corresponding reference number in the xref table
+     * Gets the reference number in the xref table based on the index in the indirect object list.
+     *
+     * @param i the index of an object in the indirect object list
+     * @return the corresponding reference number in the xref table
      */
     public int getRefByIndex(int i) {
         return idxToRef.get(i);
     }
-    
+
     /**
      * Gets an object based on its index in the indirect object list.
-     * @param i        an index in the indirect object list    
-     * @return    a PDF object
+     *
+     * @param i an index in the indirect object list
+     * @return a PDF object
      */
     public PdfObject getObjectByIndex(int i) {
         return getObjectByReference(getRefByIndex(i));
@@ -154,17 +168,19 @@ public PdfObject getObjectByIndex(int i) {
 
     /**
      * Gets an object based on its reference number in the xref table.
-     * @param ref    a number in the xref table
-     * @return    a PDF object
+     *
+     * @param ref a number in the xref table
+     * @return a PDF object
      */
     public PdfObject getObjectByReference(int ref) {
         return objects.get(getIndexByRef(ref));
     }
-    
+
     /**
      * Loads an object based on its reference number in the xref table.
-     * @param ref    a reference number in the xref table.
-     * @return    a PDF object
+     *
+     * @param ref a reference number in the xref table.
+     * @return a PDF object
      */
     public PdfObject loadObjectByReference(int ref) {
         PdfObject object = getObjectByReference(ref);
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/model/ObjectLoader.java b/pdf-swing/src/main/java/com/lowagie/rups/model/ObjectLoader.java
index 64f771c67..b670f9c98 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/model/ObjectLoader.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/model/ObjectLoader.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,37 +20,47 @@
 
 package com.lowagie.rups.model;
 
-import java.util.Observable;
-
 import com.lowagie.text.pdf.PdfReader;
+import java.util.Observable;
 
 /**
  * Loads the necessary iText PDF objects in Background.
  */
 public class ObjectLoader extends BackgroundTask {
-    /** This is the object that will forward the updates to the observers. */
+
+    /**
+     * This is the object that will forward the updates to the observers.
+     */
     protected Observable observable;
-    /** iText's PdfReader object. */
+    /**
+     * iText's PdfReader object.
+     */
     protected PdfReader reader;
-    /** The factory that can provide PDF objects. */
+    /**
+     * The factory that can provide PDF objects.
+     */
     protected IndirectObjectFactory objects;
-    /** The factory that can provide tree nodes. */
+    /**
+     * The factory that can provide tree nodes.
+     */
     protected TreeNodeFactory nodes;
-    
+
     /**
      * Creates a new ObjectLoader.
-     * @param    observable    the object that will forward the changes.
-     * @param    reader        the PdfReader from which the objects will be read.
+     *
+     * @param observable the object that will forward the changes.
+     * @param reader     the PdfReader from which the objects will be read.
      */
     public ObjectLoader(Observable observable, PdfReader reader) {
         this.observable = observable;
         this.reader = reader;
         start();
     }
-    
+
     /**
      * Getter for the PdfReader object.
-     * @return    a reader object
+     *
+     * @return a reader object
      */
     public PdfReader getReader() {
         return reader;
@@ -58,7 +68,8 @@ public PdfReader getReader() {
 
     /**
      * Getter for the object factory.
-     * @return    an indirect object factory
+     *
+     * @return an indirect object factory
      */
     public IndirectObjectFactory getObjects() {
         return objects;
@@ -66,12 +77,13 @@ public IndirectObjectFactory getObjects() {
 
     /**
      * Getter for the tree node factory.
-     * @return    a tree node factory
+     *
+     * @return a tree node factory
      */
     public TreeNodeFactory getNodes() {
         return nodes;
     }
-    
+
     /**
      * @see com.lowagie.rups.model.BackgroundTask#doTask()
      */
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/model/PageLoader.java b/pdf-swing/src/main/java/com/lowagie/rups/model/PageLoader.java
index 7c10ace04..ed12c5499 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/model/PageLoader.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/model/PageLoader.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -24,23 +24,31 @@
 import com.sun.pdfview.PDFPage;
 
 /**
- * Loads all the PDFPage objects for SUN's PDF Renderer
- * in Background.
+ * Loads all the PDFPage objects for SUN's PDF Renderer in Background.
  */
 public class PageLoader extends BackgroundTask {
 
-    /** The PDFFile (SUN's PDF Renderer class) */
+    /**
+     * The PDFFile (SUN's PDF Renderer class)
+     */
     protected PDFFile file;
-    /** The total number of pages. */
+    /**
+     * The total number of pages.
+     */
     protected int numberOfPages;
-    /** True for pages with page number equal to index + 1 that are being loaded. */
+    /**
+     * True for pages with page number equal to index + 1 that are being loaded.
+     */
     protected boolean[] busy;
-    /** True for pages with page number equal to index + 1 that have already been loaded.  */
+    /**
+     * True for pages with page number equal to index + 1 that have already been loaded.
+     */
     protected boolean[] done;
-    
+
     /**
      * Creates a new page loader.
-     * @param    file    the PDFFile (SUN's PDF Renderer)
+     *
+     * @param file the PDFFile (SUN's PDF Renderer)
      */
     public PageLoader(PDFFile file) {
         super();
@@ -53,7 +61,8 @@ public PageLoader(PDFFile file) {
 
     /**
      * Getter for the number of pages.
-     * @return    the number of pages in the PDF file.
+     *
+     * @return the number of pages in the PDF file.
      */
     public int getNumberOfPages() {
         return numberOfPages;
@@ -61,12 +70,15 @@ public int getNumberOfPages() {
 
     /**
      * Loads a page.
-     * @param    pageNumber    the number of the page that has to be loaded.
-     * @return    the PDFPage that has been loaded.
+     *
+     * @param pageNumber the number of the page that has to be loaded.
+     * @return the PDFPage that has been loaded.
      */
     public synchronized PDFPage loadPage(int pageNumber) {
         pageNumber--;
-        if (busy[pageNumber]) return null;
+        if (busy[pageNumber]) {
+            return null;
+        }
         busy[pageNumber] = true;
         PDFPage page = file.getPage(pageNumber + 1, true);
         if (!done[pageNumber]) {
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/model/PdfFile.java b/pdf-swing/src/main/java/com/lowagie/rups/model/PdfFile.java
index e269810e2..bb835ab6b 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/model/PdfFile.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/model/PdfFile.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,69 +20,80 @@
 
 package com.lowagie.rups.model;
 
-import java.io.File;
-import java.io.IOException;
-
-import javax.swing.JOptionPane;
-import javax.swing.JPasswordField;
-
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.exceptions.BadPasswordException;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.RandomAccessFileOrArray;
+import java.io.File;
+import java.io.IOException;
+import javax.swing.JOptionPane;
+import javax.swing.JPasswordField;
 
 /**
- * Wrapper for both iText's PdfReader (referring to a PDF file to read)
- * and SUN's PDFFile (referring to the same PDF file to render).
+ * Wrapper for both iText's PdfReader (referring to a PDF file to read) and SUN's PDFFile (referring to the same PDF
+ * file to render).
  */
 public class PdfFile {
 
     // member variables
-    
-    /** The directory where the file can be found (if the PDF was passed as a file). */
+
+    /**
+     * The directory where the file can be found (if the PDF was passed as a file).
+     */
     protected File directory = null;
-    
-    /** The original filename. */
+
+    /**
+     * The original filename.
+     */
     protected String filename = null;
-    
-    /** The PdfReader object. */
+
+    /**
+     * The PdfReader object.
+     */
     protected PdfReader reader = null;
-    
-    /** The file permissions */
+
+    /**
+     * The file permissions
+     */
     protected Permissions permissions = null;
-    
+
     // constructors
+
     /**
      * Constructs a PdfFile object.
-     * @param    file    the File to read
-     * @throws IOException  thrown when an I/O operation fails
-     * @throws DocumentException    thrown when an error occurs with the Document
+     *
+     * @param file the File to read
+     * @throws IOException       thrown when an I/O operation fails
+     * @throws DocumentException thrown when an error occurs with the Document
      */
     public PdfFile(File file) throws IOException, DocumentException {
-        if (file == null)
+        if (file == null) {
             throw new IOException("No file selected.");
+        }
         RandomAccessFileOrArray pdf = new RandomAccessFileOrArray(file.getAbsolutePath());
         directory = file.getParentFile();
         filename = file.getName();
         readFile(pdf);
     }
-    
+
     /**
      * Constructs a PdfFile object.
-     * @param    file    the byte[] to read
-     * @throws IOException  thrown when an I/O operation fails
-     * @throws DocumentException    thrown when an error occurs with the Document
+     *
+     * @param file the byte[] to read
+     * @throws IOException       thrown when an I/O operation fails
+     * @throws DocumentException thrown when an error occurs with the Document
      */
     public PdfFile(byte[] file) throws IOException, DocumentException {
         RandomAccessFileOrArray pdf = new RandomAccessFileOrArray(file);
         readFile(pdf);
     }
-    
+
     /**
      * Does the actual reading of the file into PdfReader and PDFFile.
-     * @param pdf    a Random Access File or Array
-     * @throws IOException  thrown when an I/O operation goes wrong
-     * @throws DocumentException    thrown when something goes wrong with a Document
+     *
+     * @param pdf a Random Access File or Array
+     * @throws IOException       thrown when an I/O operation goes wrong
+     * @throws DocumentException thrown when something goes wrong with a Document
      */
     protected void readFile(RandomAccessFileOrArray pdf) throws IOException, DocumentException {
         // reading the file into PdfReader
@@ -90,9 +101,10 @@ protected void readFile(RandomAccessFileOrArray pdf) throws IOException, Documen
         try {
             reader = new PdfReader(pdf, null);
             permissions.setEncrypted(false);
-        } catch(BadPasswordException bpe) {
+        } catch (BadPasswordException bpe) {
             JPasswordField passwordField = new JPasswordField(32);
-            JOptionPane.showConfirmDialog(null, passwordField, "Enter the User or Owner Password of this PDF file", JOptionPane.OK_CANCEL_OPTION);
+            JOptionPane.showConfirmDialog(null, passwordField, "Enter the User or Owner Password of this PDF file",
+                    JOptionPane.OK_CANCEL_OPTION);
             byte[] password = new String(passwordField.getPassword()).getBytes();
             reader = new PdfReader(pdf, password);
             permissions.setEncrypted(true);
@@ -101,8 +113,7 @@ protected void readFile(RandomAccessFileOrArray pdf) throws IOException, Documen
             if (reader.isOpenedWithFullPermissions()) {
                 permissions.setOwnerPassword(password);
                 permissions.setUserPassword(reader.computeUserPassword());
-            }
-            else {
+            } else {
                 throw new IOException("You need the owner password of this file to open it in iText Trapeze.");
             }
         }
@@ -110,7 +121,8 @@ protected void readFile(RandomAccessFileOrArray pdf) throws IOException, Documen
 
     /**
      * Getter for iText's PdfReader object.
-     * @return    a PdfReader object
+     *
+     * @return a PdfReader object
      */
     public PdfReader getPdfReader() {
         return reader;
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/model/Permissions.java b/pdf-swing/src/main/java/com/lowagie/rups/model/Permissions.java
index d247b86f5..63a7b4c83 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/model/Permissions.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/model/Permissions.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -23,165 +23,208 @@
 import com.lowagie.text.pdf.PdfWriter;
 
 /**
- * This class can tell you more about the permissions that are allowed
- * on the PDF file.
+ * This class can tell you more about the permissions that are allowed on the PDF file.
  */
 public class Permissions {
 
-    /** Was the file encrypted? */
+    /**
+     * Was the file encrypted?
+     */
     protected boolean encrypted = true;
-    /** Which owner password was provided to open the file? */
+    /**
+     * Which owner password was provided to open the file?
+     */
     protected byte[] ownerPassword = null;
-    /** What is the user password? */
+    /**
+     * What is the user password?
+     */
     protected byte[] userPassword = null;
-    /** What are the document permissions? */
+    /**
+     * What are the document permissions?
+     */
     protected int permissions = 0;
-    /** How was the document encrypted? */
+    /**
+     * How was the document encrypted?
+     */
     protected int cryptoMode = 0;
-    
+
     /**
      * Tells you if the document was encrypted.
+     *
      * @return true is the document was encrypted
      */
     public boolean isEncrypted() {
         return encrypted;
     }
+
     /**
      * Setter for the encrypted variable.
-     * @param encrypted    set this to true if the document was encrypted
+     *
+     * @param encrypted set this to true if the document was encrypted
      */
     public void setEncrypted(boolean encrypted) {
         this.encrypted = encrypted;
     }
+
     /**
      * Returns the owner password of the PDF file (if any).
-     * @return    the owner password that was provided upon opening the document
+     *
+     * @return the owner password that was provided upon opening the document
      */
     public byte[] getOwnerPassword() {
         return ownerPassword;
     }
+
     /**
      * Setter for the owner password.
-     * @param ownerPassword    the owner password
+     *
+     * @param ownerPassword the owner password
      */
     public void setOwnerPassword(byte[] ownerPassword) {
         this.ownerPassword = ownerPassword;
     }
+
     /**
      * Returns the user password (if any).
-     * @return    the user password
+     *
+     * @return the user password
      */
     public byte[] getUserPassword() {
         return userPassword;
     }
+
     /**
      * Setter for the user password.
+     *
      * @param userPassword the user password of a PDF file
      */
     public void setUserPassword(byte[] userPassword) {
         this.userPassword = userPassword;
     }
+
     /**
      * Returns the permissions in the form of an int (each bit is a specific permission)
+     *
      * @return the value for the permissions
      */
     public int getPermissions() {
         return permissions;
     }
+
     /**
      * Setter for the permissions.
-     * @param permissions    the permissions in the form of an int
+     *
+     * @param permissions the permissions in the form of an int
      */
     public void setPermissions(int permissions) {
         this.permissions = permissions;
     }
+
     /**
      * Returns the crypto mode.
-     * @return    the crypto mode
+     *
+     * @return the crypto mode
      */
     public int getCryptoMode() {
         return cryptoMode;
     }
+
     /**
      * Setter for the crypto mode
-     * @param cryptoMode    the crypto mode
+     *
+     * @param cryptoMode the crypto mode
      */
     public void setCryptoMode(int cryptoMode) {
         this.cryptoMode = cryptoMode;
     }
-    
+
     /**
      * Tells you if printing is allowed.
-     * @return    true if printing is allowed
+     *
+     * @return true if printing is allowed
      */
     public boolean isAllowPrinting() {
         return
-            !encrypted
-            || (PdfWriter.ALLOW_PRINTING & permissions) == PdfWriter.ALLOW_PRINTING;
+                !encrypted
+                        || (PdfWriter.ALLOW_PRINTING & permissions) == PdfWriter.ALLOW_PRINTING;
     }
+
     /**
      * Tells you if modifying the contents is allowed.
-     * @param decrypted     Not used, boolean that specifies is the file is decrypted
+     *
+     * @param decrypted Not used, boolean that specifies is the file is decrypted
      * @return true if modifying contents is allowed
      */
     public boolean isAllowModifyContents(boolean decrypted) {
         return
-            !encrypted
-            || (PdfWriter.ALLOW_MODIFY_CONTENTS & permissions) == PdfWriter.ALLOW_MODIFY_CONTENTS;
+                !encrypted
+                        || (PdfWriter.ALLOW_MODIFY_CONTENTS & permissions) == PdfWriter.ALLOW_MODIFY_CONTENTS;
     }
+
     /**
      * Tells you if copying is allowed.
-     * @param decrypted     Not used, boolean that specifies is the file is decrypted
+     *
+     * @param decrypted Not used, boolean that specifies is the file is decrypted
      * @return true if copying is allowed
      */
     public boolean isAllowCopy(boolean decrypted) {
         return
-            !encrypted
-            || (PdfWriter.ALLOW_COPY & permissions) == PdfWriter.ALLOW_COPY;
+                !encrypted
+                        || (PdfWriter.ALLOW_COPY & permissions) == PdfWriter.ALLOW_COPY;
     }
+
     /**
      * Tells you if modifying annotations is allowed
+     *
      * @return true if modifying annotations is allowed
      */
     public boolean isAllowModifyAnnotations() {
         return
-            !encrypted
-            || (PdfWriter.ALLOW_MODIFY_ANNOTATIONS & permissions) == PdfWriter.ALLOW_MODIFY_ANNOTATIONS;
+                !encrypted
+                        || (PdfWriter.ALLOW_MODIFY_ANNOTATIONS & permissions) == PdfWriter.ALLOW_MODIFY_ANNOTATIONS;
     }
+
     /**
      * Tells you if filling in forms is allowed.
+     *
      * @return true if filling in forms is allowed
      */
     public boolean isAllowFillIn() {
         return
-            !encrypted
-            || (PdfWriter.ALLOW_FILL_IN & permissions) == PdfWriter.ALLOW_FILL_IN;
+                !encrypted
+                        || (PdfWriter.ALLOW_FILL_IN & permissions) == PdfWriter.ALLOW_FILL_IN;
     }
+
     /**
      * Tells you if modifying the layout for screenreaders is allowed.
+     *
      * @return true if modifying the layout for screenreaders is allowed
      */
     public boolean isAllowScreenReaders() {
         return
-            !encrypted
-            || (PdfWriter.ALLOW_SCREENREADERS & permissions) == PdfWriter.ALLOW_SCREENREADERS;
+                !encrypted
+                        || (PdfWriter.ALLOW_SCREENREADERS & permissions) == PdfWriter.ALLOW_SCREENREADERS;
     }
+
     /**
      * Tells you if document assembly is allowed.
+     *
      * @return true if document assembly is allowed
      */
     public boolean isAllowAssembly() {
         return
-            !encrypted
-            || (PdfWriter.ALLOW_ASSEMBLY & permissions) == PdfWriter.ALLOW_ASSEMBLY;
+                !encrypted
+                        || (PdfWriter.ALLOW_ASSEMBLY & permissions) == PdfWriter.ALLOW_ASSEMBLY;
     }
+
     /**
      * Tells you if degraded printing is allowed.
+     *
      * @return true if degraded printing is allowed
      */
     public boolean isAllowDegradedPrinting() {
         return
-            !encrypted
-            || (PdfWriter.ALLOW_DEGRADED_PRINTING & permissions) == PdfWriter.ALLOW_DEGRADED_PRINTING;
+                !encrypted
+                        || (PdfWriter.ALLOW_DEGRADED_PRINTING & permissions) == PdfWriter.ALLOW_DEGRADED_PRINTING;
     }
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/model/ProgressDialog.java b/pdf-swing/src/main/java/com/lowagie/rups/model/ProgressDialog.java
index 56d8c7e52..2a96359e4 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/model/ProgressDialog.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/model/ProgressDialog.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -23,7 +23,6 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-
 import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -35,20 +34,28 @@
  */
 public class ProgressDialog extends JDialog {
 
-    /** a serial version uid. */
+    /**
+     * the icon used for this dialog box.
+     */
+    public static final JLabel INFO = new JLabel(UIManager.getIcon("OptionPane.informationIcon"));
+    /**
+     * a serial version uid.
+     */
     private static final long serialVersionUID = -8286949678008659120L;
-    /** label showing the message describing what's in progress. */
+    /**
+     * label showing the message describing what's in progress.
+     */
     protected JLabel message;
-    /** the progress bar */
+    /**
+     * the progress bar
+     */
     protected JProgressBar progress;
-    /** the icon used for this dialog box. */
-    public static final JLabel INFO = new JLabel(UIManager.getIcon("OptionPane.informationIcon"));
-    
+
     /**
-     * Creates a Progress frame displaying a certain message
-     * and a progress bar in indeterminate mode.
-     * @param    parent the parent frame of this dialog (used to position the dialog)
-     * @param    msg    the message that will be displayed.
+     * Creates a Progress frame displaying a certain message and a progress bar in indeterminate mode.
+     *
+     * @param parent the parent frame of this dialog (used to position the dialog)
+     * @param msg    the message that will be displayed.
      */
     public ProgressDialog(JFrame parent, String msg) {
         super();
@@ -56,7 +63,7 @@ public ProgressDialog(JFrame parent, String msg) {
         setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
         setSize(300, 100);
         this.setLocationRelativeTo(parent);
-        
+
         setLayout(new GridBagLayout());
         GridBagConstraints constraints = new GridBagConstraints();
         constraints.gridx = 0;
@@ -72,13 +79,14 @@ public ProgressDialog(JFrame parent, String msg) {
         progress = new JProgressBar();
         progress.setIndeterminate(true);
         getContentPane().add(progress, constraints);
-        
+
         setVisible(true);
     }
-    
+
     /**
      * Changes the message describing what's in progress
-     * @param msg    the message describing what's in progress
+     *
+     * @param msg the message describing what's in progress
      */
     public void setMessage(String msg) {
         message.setText(msg);
@@ -86,24 +94,24 @@ public void setMessage(String msg) {
 
     /**
      * Changes the value of the progress bar.
-     * @param value    the current value
+     *
+     * @param value the current value
      */
     public void setValue(int value) {
         progress.setValue(value);
     }
-    
+
     /**
-     * Sets the maximum value for the progress bar.
-     * If 0 or less, sets the progress bar to indeterminate mode.
-     * @param n    the maximum value for the progress bar
+     * Sets the maximum value for the progress bar. If 0 or less, sets the progress bar to indeterminate mode.
+     *
+     * @param n the maximum value for the progress bar
      */
     public void setTotal(int n) {
         if (n > 0) {
             progress.setMaximum(n);
             progress.setIndeterminate(false);
             progress.setStringPainted(true);
-        }
-        else {
+        } else {
             progress.setIndeterminate(true);
             progress.setStringPainted(false);
         }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/model/TreeNodeFactory.java b/pdf-swing/src/main/java/com/lowagie/rups/model/TreeNodeFactory.java
index 644c91326..08d02ac58 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/model/TreeNodeFactory.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/model/TreeNodeFactory.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,9 +20,6 @@
 
 package com.lowagie.rups.model;
 
-import java.util.ArrayList;
-import java.util.Enumeration;
-
 import com.lowagie.rups.view.itext.treenodes.PdfObjectTreeNode;
 import com.lowagie.rups.view.itext.treenodes.PdfPagesTreeNode;
 import com.lowagie.text.pdf.PdfArray;
@@ -31,21 +28,27 @@
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfNull;
 import com.lowagie.text.pdf.PdfObject;
+import java.util.ArrayList;
+import java.util.Enumeration;
 
 /**
  * A factory that creates TreeNode objects corresponding with PDF objects.
  */
 public class TreeNodeFactory {
 
-    /** The factory that can produce all indirect objects. */
+    /**
+     * The factory that can produce all indirect objects.
+     */
     protected IndirectObjectFactory objects;
-    /** An list containing the nodes of every indirect object. */
+    /**
+     * An list containing the nodes of every indirect object.
+     */
     protected ArrayList nodes = new ArrayList<>();
-    
+
     /**
-     * Creates a factory that can produce TreeNode objects
-     * corresponding with PDF objects.
-     * @param objects    a factory that can produce all the indirect objects of a PDF file.
+     * Creates a factory that can produce TreeNode objects corresponding with PDF objects.
+     *
+     * @param objects a factory that can produce all the indirect objects of a PDF file.
      */
     public TreeNodeFactory(IndirectObjectFactory objects) {
         this.objects = objects;
@@ -54,11 +57,12 @@ public TreeNodeFactory(IndirectObjectFactory objects) {
             nodes.add(PdfObjectTreeNode.getInstance(PdfNull.PDFNULL, ref));
         }
     }
-    
+
     /**
      * Gets a TreeNode for an indirect objects.
-     * @param ref    the reference number of the indirect object.
-     * @return    the TreeNode representing the PDF object
+     *
+     * @param ref the reference number of the indirect object.
+     * @return the TreeNode representing the PDF object
      */
     public PdfObjectTreeNode getNode(int ref) {
         int idx = objects.getIndexByRef(ref);
@@ -69,10 +73,11 @@ public PdfObjectTreeNode getNode(int ref) {
         }
         return node;
     }
-    
+
     /**
      * Creates the Child TreeNode objects for a PDF object TreeNode.
-     * @param node    the parent node
+     *
+     * @param node the parent node
      */
     public void expandNode(PdfObjectTreeNode node) {
         if (node.getChildCount() > 0) {
@@ -81,48 +86,50 @@ public void expandNode(PdfObjectTreeNode node) {
         PdfObject object = node.getPdfObject();
         PdfObjectTreeNode leaf;
         switch (object.type()) {
-        case PdfObject.INDIRECT:
-            PdfIndirectReference ref = (PdfIndirectReference)object;
-            leaf = getNode(ref.getNumber());
-            addNodes(node, leaf);
-            if (leaf instanceof PdfPagesTreeNode)
-                expandNode(leaf);
-            return;
-        case PdfObject.ARRAY:
-            PdfArray array = (PdfArray)object;
-            for (PdfObject pdfObject : array.getElements()) {
-                leaf = PdfObjectTreeNode.getInstance(pdfObject);
+            case PdfObject.INDIRECT:
+                PdfIndirectReference ref = (PdfIndirectReference) object;
+                leaf = getNode(ref.getNumber());
                 addNodes(node, leaf);
-                expandNode(leaf);
-            }
-            return;
-        case PdfObject.DICTIONARY:
-        case PdfObject.STREAM:
-            PdfDictionary dict = (PdfDictionary)object;
-            for (PdfName pdfName : dict.getKeys()) {
-                leaf = PdfObjectTreeNode.getInstance(dict, pdfName);
-                addNodes(node, leaf);
-                expandNode(leaf);
-            }
-            return;
+                if (leaf instanceof PdfPagesTreeNode) {
+                    expandNode(leaf);
+                }
+                return;
+            case PdfObject.ARRAY:
+                PdfArray array = (PdfArray) object;
+                for (PdfObject pdfObject : array.getElements()) {
+                    leaf = PdfObjectTreeNode.getInstance(pdfObject);
+                    addNodes(node, leaf);
+                    expandNode(leaf);
+                }
+                return;
+            case PdfObject.DICTIONARY:
+            case PdfObject.STREAM:
+                PdfDictionary dict = (PdfDictionary) object;
+                for (PdfName pdfName : dict.getKeys()) {
+                    leaf = PdfObjectTreeNode.getInstance(dict, pdfName);
+                    addNodes(node, leaf);
+                    expandNode(leaf);
+                }
+                return;
         }
     }
-    
+
     /**
      * Finds a specific child of dictionary node.
-     * @param    node    the node with a dictionary among its children
-     * @param    key     the key of the item corresponding with the node we need
+     *
+     * @param node the node with a dictionary among its children
+     * @param key  the key of the item corresponding with the node we need
      * @return the PdfObjectTreeNode that is the child of the dictionary node
      */
     public PdfObjectTreeNode getChildNode(PdfObjectTreeNode node, PdfName key) {
         Enumeration children = node.breadthFirstEnumeration();
         PdfObjectTreeNode child;
         while (children.hasMoreElements()) {
-            child = (PdfObjectTreeNode)children.nextElement();
+            child = (PdfObjectTreeNode) children.nextElement();
             if (child.isDictionaryNode(key)) {
                 if (child.isIndirectReference()) {
                     expandNode(child);
-                    child = (PdfObjectTreeNode)child.getFirstChild();
+                    child = (PdfObjectTreeNode) child.getFirstChild();
                 }
                 expandNode(child);
                 return child;
@@ -130,21 +137,19 @@ public PdfObjectTreeNode getChildNode(PdfObjectTreeNode node, PdfName key) {
         }
         return null;
     }
-    
+
     /**
-     * Tries adding a child node to a parent node without
-     * throwing an exception. Normally, if the child node is already
-     * added as one of the ancestors, an IllegalArgumentException is
-     * thrown (to avoid an endless loop). Loops like this are allowed
-     * in PDF, not in a JTree.
-     * @param parent    the parent node
-     * @param child        a child node
+     * Tries adding a child node to a parent node without throwing an exception. Normally, if the child node is already
+     * added as one of the ancestors, an IllegalArgumentException is thrown (to avoid an endless loop). Loops like this
+     * are allowed in PDF, not in a JTree.
+     *
+     * @param parent the parent node
+     * @param child  a child node
      */
     private void addNodes(PdfObjectTreeNode parent, PdfObjectTreeNode child) {
         try {
             parent.add(child);
-        }
-        catch(IllegalArgumentException iae) {
+        } catch (IllegalArgumentException iae) {
             parent.setRecursive(true);
         }
     }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/model/XfaFile.java b/pdf-swing/src/main/java/com/lowagie/rups/model/XfaFile.java
index e2a4960f6..40dcdc930 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/model/XfaFile.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/model/XfaFile.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,31 +20,34 @@
 
 package com.lowagie.rups.model;
 
+import com.lowagie.rups.io.OutputStreamResource;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.SAXReader;
 import org.dom4j.io.XMLWriter;
 
-import com.lowagie.rups.io.OutputStreamResource;
-
-/** Class that deals with the XFA file that can be inside a PDF file. */
+/**
+ * Class that deals with the XFA file that can be inside a PDF file.
+ */
 public class XfaFile implements OutputStreamResource {
 
-    /** The X4J Document object (XML). */
+    /**
+     * The X4J Document object (XML).
+     */
     protected Document xfaDocument;
-    
+
     /**
-     * Constructs an XFA file from an OutputStreamResource.
-     * This resource can be an XML file or a node in a RUPS application.
-     * @param    resource    the XFA resource
-     * @throws IOException  thrown when an I/O operation goes wrong
-     * @throws DocumentException    thrown when something goes wrong with a Document
+     * Constructs an XFA file from an OutputStreamResource. This resource can be an XML file or a node in a RUPS
+     * application.
+     *
+     * @param resource the XFA resource
+     * @throws IOException       thrown when an I/O operation goes wrong
+     * @throws DocumentException thrown when something goes wrong with a Document
      */
     public XfaFile(OutputStreamResource resource) throws IOException, DocumentException {
         // Is there a way to avoid loading everything in memory?
@@ -58,7 +61,8 @@ public XfaFile(OutputStreamResource resource) throws IOException, DocumentExcept
 
     /**
      * Getter for the XFA Document object.
-     * @return    a Document object (X4J)
+     *
+     * @return a Document object (X4J)
      */
     public Document getXfaDocument() {
         return xfaDocument;
@@ -66,11 +70,13 @@ public Document getXfaDocument() {
 
     /**
      * Writes a formatted XML file to the OutputStream.
+     *
      * @see com.lowagie.rups.io.OutputStreamResource#writeTo(java.io.OutputStream)
      */
     public void writeTo(OutputStream os) throws IOException {
-        if (xfaDocument == null)
+        if (xfaDocument == null) {
             return;
+        }
         OutputFormat format = new OutputFormat("   ", true);
         XMLWriter writer = new XMLWriter(os, format);
         writer.write(xfaDocument);
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/Console.java b/pdf-swing/src/main/java/com/lowagie/rups/view/Console.java
index 3932b8bd9..278dc1e2e 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/Console.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/Console.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -37,39 +37,59 @@
 import javax.swing.text.StyleContext;
 
 /**
- * A Class that redirects everything written to System.out and System.err
- * to a JTextPane.
+ * A Class that redirects everything written to System.out and System.err to a JTextPane.
  */
 public class Console implements Observer {
 
-    /** Single Console instance. */
+    /**
+     * Single Console instance.
+     */
     private static Console console = null;
-    
-    /** Custom PrintStream. */
+
+    /**
+     * Custom PrintStream.
+     */
     PrintStream printStream;
-    /** Custom OutputStream. */
+    /**
+     * Custom OutputStream.
+     */
     PipedOutputStream poCustom;
-    /** Custom InputStream. */
+    /**
+     * Custom InputStream.
+     */
     PipedInputStream piCustom;
-    
-    /** OutputStream for System.out. */
+
+    /**
+     * OutputStream for System.out.
+     */
     PipedOutputStream poOut;
-    /** InputStream for System.out. */
+    /**
+     * InputStream for System.out.
+     */
     PipedInputStream piOut;
 
-    /** OutputStream for System.err. */
+    /**
+     * OutputStream for System.err.
+     */
     PipedOutputStream poErr;
-    /** InputStream for System.err. */
+    /**
+     * InputStream for System.err.
+     */
     PipedInputStream piErr;
-    
-    /** The StyleContext for the Console. */
+
+    /**
+     * The StyleContext for the Console.
+     */
     ConsoleStyleContext styleContext = new ConsoleStyleContext();
-    
-    /** The text area to which everything is written. */
+
+    /**
+     * The text area to which everything is written.
+     */
     JTextPane textArea = new JTextPane(new DefaultStyledDocument(styleContext));
 
     /**
      * Creates a new Console object.
+     *
      * @throws IOException
      */
     private Console() throws IOException {
@@ -77,7 +97,7 @@ private Console() throws IOException {
         piCustom = new PipedInputStream();
         poCustom = new PipedOutputStream();
         printStream = new PrintStream(poCustom);
-        
+
         // Set up System.out
         piOut = new PipedInputStream();
         poOut = new PipedOutputStream(piOut);
@@ -99,6 +119,7 @@ private Console() throws IOException {
 
     /**
      * Console is a Singleton class: you can only get one Console.
+     *
      * @return the Console
      */
     public static synchronized Console getInstance() {
@@ -112,35 +133,36 @@ public static synchronized Console getInstance() {
         return console;
     }
 
-    /**
-     * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
-     */
-    public void update(Observable observable, Object obj) {
-        if (RupsMenuBar.CLOSE.equals(obj)) {
-            textArea.setText("");
-        }
-        if (RupsMenuBar.OPEN.equals(obj)) {
-            textArea.setText("");
-        }
-    }
-    
     /**
      * Allows you to print something to the custom PrintStream.
-     * @param    s    the message you want to send to the Console
+     *
+     * @param s the message you want to send to the Console
      */
     public static void println(String s) {
         PrintStream ps = getInstance().getPrintStream();
         if (ps == null) {
             System.out.println(s);
-        }
-        else {
+        } else {
             ps.println(s);
             ps.flush();
         }
     }
 
+    /**
+     * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
+     */
+    public void update(Observable observable, Object obj) {
+        if (RupsMenuBar.CLOSE.equals(obj)) {
+            textArea.setText("");
+        }
+        if (RupsMenuBar.OPEN.equals(obj)) {
+            textArea.setText("");
+        }
+    }
+
     /**
      * Get the custom PrintStream of the console.
+     *
      * @return the PrintStream
      */
     public PrintStream getPrintStream() {
@@ -149,22 +171,30 @@ public PrintStream getPrintStream() {
 
     /**
      * Get the JTextArea to which everything is written.
+     *
      * @return the JTextArea
      */
     public JTextPane getTextArea() {
         return textArea;
     }
-    
+
     /**
      * The thread that will write everything to the text area.
      */
     class ReadWriteThread extends Thread {
-        /** The InputStream of this Thread */
+
+        /**
+         * The InputStream of this Thread
+         */
         PipedInputStream pi;
-        /** The type (CUSTOM, SYSTEMOUT, SYSTEMERR) of this Thread */
+        /**
+         * The type (CUSTOM, SYSTEMOUT, SYSTEMERR) of this Thread
+         */
         String type;
 
-        /** Create the ReaderThread. */
+        /**
+         * Create the ReaderThread.
+         */
         ReadWriteThread(PipedInputStream pi, String type) {
             super();
             this.pi = pi;
@@ -187,7 +217,7 @@ public void run() {
                     AttributeSet attset = styleContext.getStyle(type);
                     String snippet = new String(buf, 0, len);
                     doc.insertString(doc.getLength(),
-                                     snippet, attset);
+                            snippet, attset);
                     printStream.print(snippet);
                     textArea.setCaretPosition(textArea.getDocument().getLength());
                 } catch (BadLocationException | IOException ignored) {
@@ -195,23 +225,33 @@ public void run() {
                 }
             }
         }
-    }    
-    
+    }
+
     /**
      * The style context defining the styles of each type of PrintStream.
      */
     class ConsoleStyleContext extends StyleContext {
 
-        /** A Serial Version UID. */
-        private static final long serialVersionUID = 7253870053566811171L;
-        /** The name of the Style used for Custom messages */
+        /**
+         * The name of the Style used for Custom messages
+         */
         public static final String CUSTOM = "Custom";
-        /** The name of the Style used for System.out */
+        /**
+         * The name of the Style used for System.out
+         */
         public static final String SYSTEMOUT = "SystemOut";
-        /** The name of the Style used for System.err */
+        /**
+         * The name of the Style used for System.err
+         */
         public static final String SYSTEMERR = "SystemErr";
+        /**
+         * A Serial Version UID.
+         */
+        private static final long serialVersionUID = 7253870053566811171L;
 
-        /** Creates the style context for the Console. */
+        /**
+         * Creates the style context for the Console.
+         */
         public ConsoleStyleContext() {
             super();
             Style root = getStyle(DEFAULT_STYLE);
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/MessageAction.java b/pdf-swing/src/main/java/com/lowagie/rups/view/MessageAction.java
index eae44d576..e80c1b9dc 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/MessageAction.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/MessageAction.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,21 +20,18 @@
 
 package com.lowagie.rups.view;
 
+import com.lowagie.text.Document;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import javax.swing.JOptionPane;
 
-import com.lowagie.text.Document;
-
 public class MessageAction implements ActionListener {
-    
+
     public void actionPerformed(ActionEvent evt) {
         String message = "Unspecified message";
         if (RupsMenuBar.ABOUT.equals(evt.getActionCommand())) {
             message = "RUPS is a tool by 1T3XT BVBA.\nIt uses iText, a Free Java-PDF Library.\nVisit http://www.1t3xt.com/ for more info.";
-        }
-        else if (RupsMenuBar.VERSION.equals(evt.getActionCommand())) {
+        } else if (RupsMenuBar.VERSION.equals(evt.getActionCommand())) {
             message = "iText version: " + Document.getVersion();
         }
         JOptionPane.showMessageDialog(null, message);
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/PageSelectionListener.java b/pdf-swing/src/main/java/com/lowagie/rups/view/PageSelectionListener.java
index c586d1895..419d60e7d 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/PageSelectionListener.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/PageSelectionListener.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -21,18 +21,18 @@
 package com.lowagie.rups.view;
 
 /**
- * Interface that has to be implemented by every class that listens
- * to page navigation features; keys that are pressed, buttons that
- * are pushed,...
- * @since    iText 5.0.0 (renamed from PageNavigationListener)
+ * Interface that has to be implemented by every class that listens to page navigation features; keys that are pressed,
+ * buttons that are pushed,...
+ *
+ * @since iText 5.0.0 (renamed from PageNavigationListener)
  */
 public interface PageSelectionListener {
 
     /**
      * Goes to a specific page number in a document.
-     * @param    pageNumber the page number to go to
-     * @return    the resulting page number.
-     *         Can be different from pageNumber if pageNumber doesn't exist.
+     *
+     * @param pageNumber the page number to go to
+     * @return the resulting page number. Can be different from pageNumber if pageNumber doesn't exist.
      */
     int gotoPage(int pageNumber);
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/RupsMenuBar.java b/pdf-swing/src/main/java/com/lowagie/rups/view/RupsMenuBar.java
index a2655af57..a2d2dcd12 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/RupsMenuBar.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/RupsMenuBar.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,48 +20,67 @@
 
 package com.lowagie.rups.view;
 
+import com.lowagie.rups.io.FileChooserAction;
+import com.lowagie.rups.io.FileCloseAction;
+import com.lowagie.rups.io.filters.PdfFilter;
 import java.awt.event.ActionListener;
 import java.util.HashMap;
 import java.util.Observable;
 import java.util.Observer;
-
 import javax.swing.Box;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 
-import com.lowagie.rups.io.FileChooserAction;
-import com.lowagie.rups.io.FileCloseAction;
-import com.lowagie.rups.io.filters.PdfFilter;
-
 public class RupsMenuBar extends JMenuBar implements Observer {
 
-    /** Caption for the file menu. */
+    /**
+     * Caption for the file menu.
+     */
     public static final String FILE_MENU = "File";
-    /** Caption for "Open file". */
+    /**
+     * Caption for "Open file".
+     */
     public static final String OPEN = "Open";
-    /** Caption for "Close file". */
+    /**
+     * Caption for "Close file".
+     */
     public static final String CLOSE = "Close";
-    /** Caption for the help menu. */
+    /**
+     * Caption for the help menu.
+     */
     public static final String HELP_MENU = "Help";
-    /** Caption for "Help about". */
+    /**
+     * Caption for "Help about".
+     */
     public static final String ABOUT = "About";
     /**
      * Caption for "Help versions".
+     *
      * @since iText 5.0.0 (renamed from VERSIONS)
      */
     public static final String VERSION = "Version";
-    
-    /** The Observable object. */
+    /**
+     * A Serial Version UID.
+     */
+    private static final long serialVersionUID = 6403040037592308742L;
+    /**
+     * The Observable object.
+     */
     protected Observable observable;
-    /** The action needed to open a file. */
+    /**
+     * The action needed to open a file.
+     */
     protected FileChooserAction fileChooserAction;
-    /** The HashMap with all the actions. */
+    /**
+     * The HashMap with all the actions.
+     */
     protected HashMap items;
-    
+
     /**
      * Creates a JMenuBar.
-     * @param observable    the controller to which this menu bar is added
+     *
+     * @param observable the controller to which this menu bar is added
      */
     public RupsMenuBar(Observable observable) {
         this.observable = observable;
@@ -79,7 +98,7 @@ public RupsMenuBar(Observable observable) {
         add(help);
         enableItems(false);
     }
-    
+
     /**
      * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
      */
@@ -96,13 +115,13 @@ public void update(Observable observable, Object obj) {
             fileChooserAction.actionPerformed(null);
         }
     }
-    
+
     /**
-     * Create an item with a certain caption and a certain action,
-     * then add the item to a menu.
+     * Create an item with a certain caption and a certain action, then add the item to a menu.
+     *
      * @param menu    the menu to which the item has to be added
-     * @param caption    the caption of the item
-     * @param action    the action corresponding with the caption
+     * @param caption the caption of the item
+     * @param action  the action corresponding with the caption
      */
     protected void addItem(JMenu menu, String caption, ActionListener action) {
         JMenuItem item = new JMenuItem(caption);
@@ -110,24 +129,23 @@ protected void addItem(JMenu menu, String caption, ActionListener action) {
         menu.add(item);
         items.put(caption, item);
     }
-    
+
     /**
      * Enables/Disables a series of menu items.
-     * @param enabled    true for enabling; false for disabling
+     *
+     * @param enabled true for enabling; false for disabling
      */
     protected void enableItems(boolean enabled) {
         enableItem(CLOSE, enabled);
     }
-    
+
     /**
      * Enables/disables a specific menu item
-     * @param caption    the caption of the item that needs to be enabled/disabled
-     * @param enabled    true for enabling; false for disabling
+     *
+     * @param caption the caption of the item that needs to be enabled/disabled
+     * @param enabled true for enabling; false for disabling
      */
     protected void enableItem(String caption, boolean enabled) {
         items.get(caption).setEnabled(enabled);
     }
-    
-    /** A Serial Version UID. */
-    private static final long serialVersionUID = 6403040037592308742L;
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconActionListener.java b/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconActionListener.java
index daba4820c..3f76613df 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconActionListener.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconActionListener.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -21,13 +21,13 @@
 package com.lowagie.rups.view.icons;
 
 import java.awt.event.ActionListener;
-
 import javax.swing.Icon;
 
 /**
  * Special ActionListener to be implemented by Buttons that need an Icon.
  */
 public interface IconActionListener extends ActionListener {
+
     /**
      * Returns an Icon.
      *
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconButton.java b/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconButton.java
index 44dde435a..2171cbabf 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconButton.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconButton.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -28,15 +28,17 @@
 public class IconButton extends JButton {
 
     /**
-     * Creates a button with an Icon that performs an
-     * action when you push it.
-     * @param listener  The listener to add to the Icon
+     * A Serial Version UID.
+     */
+    private static final long serialVersionUID = 3523016393512117003L;
+
+    /**
+     * Creates a button with an Icon that performs an action when you push it.
+     *
+     * @param listener The listener to add to the Icon
      */
     public IconButton(IconActionListener listener) {
         super(listener.getIcon());
         addActionListener(listener);
     }
-    
-    /** A Serial Version UID. */
-    private static final long serialVersionUID = 3523016393512117003L;
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconFetcher.java b/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconFetcher.java
index f254df412..e1e380496 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconFetcher.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconFetcher.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -21,7 +21,6 @@
 package com.lowagie.rups.view.icons;
 
 import java.util.HashMap;
-
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 
@@ -29,14 +28,17 @@
  * Class that fetches the icons in com.lowagie.trapeze.icons.
  */
 public class IconFetcher {
-    
-    /** Cache with icons. */
+
+    /**
+     * Cache with icons.
+     */
     protected static HashMap cache = new HashMap<>();
-    
+
     /**
      * Gets an Icon with a specific name.
-     * @param    filename    the filename of the Icon.
-     * @return    an Icon
+     *
+     * @param filename the filename of the Icon.
+     * @return an Icon
      */
     public static Icon getIcon(String filename) {
         if (filename == null) {
@@ -47,8 +49,7 @@ public static Icon getIcon(String filename) {
             try {
                 icon = new ImageIcon(IconFetcher.class.getResource(filename));
                 cache.put(filename, icon);
-            }
-            catch(Exception e) {
+            } catch (Exception e) {
                 System.err.println("Can't find file: " + filename);
                 return null;
             }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconTreeCellRenderer.java b/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconTreeCellRenderer.java
index 8a2a129b3..fe1d39bf7 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconTreeCellRenderer.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconTreeCellRenderer.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -21,7 +21,6 @@
 package com.lowagie.rups.view.icons;
 
 import java.awt.Component;
-
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
@@ -31,11 +30,14 @@
  */
 public class IconTreeCellRenderer extends DefaultTreeCellRenderer {
 
-    /** a serial version UID. */
+    /**
+     * a serial version UID.
+     */
     private static final long serialVersionUID = 6513462839504342074L;
 
     /**
-     * @see javax.swing.tree.DefaultTreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree, java.lang.Object, boolean, boolean, boolean, int, boolean)
+     * @see javax.swing.tree.DefaultTreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree, java.lang.Object,
+     * boolean, boolean, boolean, int, boolean)
      */
     public Component getTreeCellRendererComponent(JTree tree, Object value,
             boolean selected, boolean expanded, boolean leaf, int row,
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconTreeNode.java b/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconTreeNode.java
index c2b4837f8..c826cdf1f 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconTreeNode.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/icons/IconTreeNode.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -28,34 +28,42 @@
  */
 public class IconTreeNode extends DefaultMutableTreeNode {
 
-    /** The icon that has to be used for this TreeNode. */
+    /**
+     * A Serial Version UID.
+     */
+    private static final long serialVersionUID = -5900308991182960842L;
+    /**
+     * The icon that has to be used for this TreeNode.
+     */
     protected Icon icon;
-    
+
     /**
      * Constructs an IconTreeNode.
-     * @param    icon    the filename of the icon to use for this node.
+     *
+     * @param icon the filename of the icon to use for this node.
      */
     public IconTreeNode(String icon) {
         super();
         this.icon = IconFetcher.getIcon(icon);
     }
-    
+
     /**
      * Constructs an IconTreeNode.
-     * @param    icon    the filename of the icon to use for this node.
-     * @param    userobject    the userobject for this node
+     *
+     * @param icon       the filename of the icon to use for this node.
+     * @param userobject the userobject for this node
      */
     public IconTreeNode(String icon, Object userobject) {
         super(userobject);
         this.icon = IconFetcher.getIcon(icon);
     }
-    
-    /** Getter for the icon.
-     * @return  the icon*/
+
+    /**
+     * Getter for the icon.
+     *
+     * @return the icon
+     */
     public Icon getIcon() {
         return icon;
     }
-
-    /** A Serial Version UID. */
-    private static final long serialVersionUID = -5900308991182960842L;
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/FormTree.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/FormTree.java
index c7751d559..24b57f18b 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/FormTree.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/FormTree.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,18 +20,6 @@
 
 package com.lowagie.rups.view.itext;
 
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Observable;
-import java.util.Observer;
-
-import javax.swing.JTree;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.DefaultTreeModel;
-
-import org.dom4j.DocumentException;
-
 import com.lowagie.rups.controller.PdfReaderController;
 import com.lowagie.rups.model.ObjectLoader;
 import com.lowagie.rups.model.TreeNodeFactory;
@@ -42,27 +30,47 @@
 import com.lowagie.rups.view.itext.treenodes.PdfTrailerTreeNode;
 import com.lowagie.rups.view.itext.treenodes.XfaTreeNode;
 import com.lowagie.text.pdf.PdfName;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Observable;
+import java.util.Observer;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultTreeModel;
+import org.dom4j.DocumentException;
 
 /**
- * A JTree visualizing information about the Interactive Form of the
- * PDF file (if any). Normally shows a tree view of the field hierarchy
- * and individual XDP packets. 
+ * A JTree visualizing information about the Interactive Form of the PDF file (if any). Normally shows a tree view of
+ * the field hierarchy and individual XDP packets.
  */
 public class FormTree extends JTree implements TreeSelectionListener, Observer {
 
-    /** Nodes in the FormTree correspond with nodes in the main PdfTree. */
+    /**
+     * A serial version UID.
+     */
+    private static final long serialVersionUID = -3584003547303700407L;
+    /**
+     * Nodes in the FormTree correspond with nodes in the main PdfTree.
+     */
     protected PdfReaderController controller;
-    
-    /** If the form is an XFA form, the XML file is stored in this object. */
+    /**
+     * If the form is an XFA form, the XML file is stored in this object.
+     */
     protected XfaFile xfaFile;
-    /** Treeview of the XFA file. */
+    /**
+     * Treeview of the XFA file.
+     */
     protected XfaTree xfaTree;
-    /** Textview of the XFA file. */
+    /**
+     * Textview of the XFA file.
+     */
     protected XfaTextArea xfaTextArea;
-    
+
     /**
      * Creates a new FormTree.
-     * @param controller    The renderer that will render an object when selected in the table.
+     *
+     * @param controller The renderer that will render an object when selected in the table.
      */
     public FormTree(PdfReaderController controller) {
         super();
@@ -76,8 +84,9 @@ public FormTree(PdfReaderController controller) {
 
     /**
      * Loads the fields of a PDF document into the FormTree.
-     * @param    observable    the observable object
-     * @param    obj            the object
+     *
+     * @param observable the observable object
+     * @param obj        the object
      */
     public void update(Observable observable, Object obj) {
         if (obj == null) {
@@ -89,7 +98,7 @@ public void update(Observable observable, Object obj) {
             return;
         }
         if (obj instanceof ObjectLoader) {
-            ObjectLoader loader = (ObjectLoader)obj;
+            ObjectLoader loader = (ObjectLoader) obj;
             TreeNodeFactory factory = loader.getNodes();
             PdfTrailerTreeNode trailer = controller.getPdfTree().getRoot();
             PdfObjectTreeNode catalog = factory.getChildNode(trailer, PdfName.ROOT);
@@ -125,24 +134,24 @@ public void update(Observable observable, Object obj) {
 
     /**
      * Method that can be used recursively to load the fields hierarchy into the tree.
-     * @param    factory        a factory that can produce new PDF object nodes
-     * @param    form_node    the parent node in the form tree
-     * @param    object_node    the object node that will be used to create a child node
+     *
+     * @param factory     a factory that can produce new PDF object nodes
+     * @param form_node   the parent node in the form tree
+     * @param object_node the object node that will be used to create a child node
      */
     private void loadFields(TreeNodeFactory factory, FormTreeNode form_node, PdfObjectTreeNode object_node) {
-        if (object_node == null)
+        if (object_node == null) {
             return;
+        }
         factory.expandNode(object_node);
         if (object_node.isIndirectReference()) {
-            loadFields(factory, form_node, (PdfObjectTreeNode)object_node.getFirstChild());
-        }
-        else if (object_node.isArray()) {
+            loadFields(factory, form_node, (PdfObjectTreeNode) object_node.getFirstChild());
+        } else if (object_node.isArray()) {
             Enumeration children = object_node.children();
             while (children.hasMoreElements()) {
-                loadFields(factory, form_node, (PdfObjectTreeNode)children.nextElement());
+                loadFields(factory, form_node, (PdfObjectTreeNode) children.nextElement());
             }
-        }
-        else if (object_node.isDictionary()) {
+        } else if (object_node.isDictionary()) {
             FormTreeNode leaf = new FormTreeNode(object_node);
             form_node.add(leaf);
             PdfObjectTreeNode kids = factory.getChildNode(object_node, PdfName.KIDS);
@@ -152,31 +161,31 @@ else if (object_node.isDictionary()) {
 
     /**
      * Method that will load the nodes that refer to XFA streams.
-     * @param    form_node    the parent node in the form tree
-     * @param    object_node    the object node that will be used to create a child node
+     *
+     * @param form_node   the parent node in the form tree
+     * @param object_node the object node that will be used to create a child node
      */
     private void loadXfa(TreeNodeFactory factory, XfaTreeNode form_node, PdfObjectTreeNode object_node) {
-        if (object_node == null)
+        if (object_node == null) {
             return;
+        }
         factory.expandNode(object_node);
         if (object_node.isIndirectReference()) {
-            loadXfa(factory, form_node, (PdfObjectTreeNode)object_node.getFirstChild());
-        }
-        else if (object_node.isArray()) {
+            loadXfa(factory, form_node, (PdfObjectTreeNode) object_node.getFirstChild());
+        } else if (object_node.isArray()) {
             Enumeration children = object_node.children();
             PdfObjectTreeNode key;
             PdfObjectTreeNode value;
             while (children.hasMoreElements()) {
-                key = (PdfObjectTreeNode)children.nextElement();
-                value = (PdfObjectTreeNode)children.nextElement();
+                key = (PdfObjectTreeNode) children.nextElement();
+                value = (PdfObjectTreeNode) children.nextElement();
                 if (value.isIndirectReference()) {
                     factory.expandNode(value);
-                    value = (PdfObjectTreeNode)value.getFirstChild();
+                    value = (PdfObjectTreeNode) value.getFirstChild();
                 }
                 form_node.addPacket(key.getPdfObject().toString(), value);
             }
-        }
-        else if (object_node.isStream()) {
+        } else if (object_node.isStream()) {
             form_node.addPacket("xdp", object_node);
         }
     }
@@ -185,25 +194,25 @@ else if (object_node.isStream()) {
      * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent)
      */
     public void valueChanged(TreeSelectionEvent evt) {
-        if (controller == null)
+        if (controller == null) {
             return;
-        FormTreeNode selectednode = (FormTreeNode)this.getLastSelectedPathComponent();
-        if (selectednode == null)
+        }
+        FormTreeNode selectednode = (FormTreeNode) this.getLastSelectedPathComponent();
+        if (selectednode == null) {
             return;
+        }
         PdfObjectTreeNode node = selectednode.getCorrespondingPdfObjectNode();
-        if (node != null)
+        if (node != null) {
             controller.selectNode(node);
+        }
     }
 
     public XfaTree getXfaTree() {
         return xfaTree;
     }
-    
+
     public XfaTextArea getXfaTextArea() {
         return xfaTextArea;
     }
-    
-    /** A serial version UID. */
-    private static final long serialVersionUID = -3584003547303700407L;
 
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/OutlineTree.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/OutlineTree.java
index 044fd7da7..6517314f8 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/OutlineTree.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/OutlineTree.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,14 +20,6 @@
 
 package com.lowagie.rups.view.itext;
 
-import java.util.Observable;
-import java.util.Observer;
-
-import javax.swing.JTree;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.DefaultTreeModel;
-
 import com.lowagie.rups.controller.PdfReaderController;
 import com.lowagie.rups.model.ObjectLoader;
 import com.lowagie.rups.model.TreeNodeFactory;
@@ -36,18 +28,32 @@
 import com.lowagie.rups.view.itext.treenodes.PdfObjectTreeNode;
 import com.lowagie.rups.view.itext.treenodes.PdfTrailerTreeNode;
 import com.lowagie.text.pdf.PdfName;
+import java.util.Observable;
+import java.util.Observer;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultTreeModel;
 
 /**
- * A JTree visualizing information about the outlines (aka bookmarks) of
- * the PDF file (if any).
+ * A JTree visualizing information about the outlines (aka bookmarks) of the PDF file (if any).
  */
 public class OutlineTree extends JTree implements TreeSelectionListener, Observer {
 
-    /** Nodes in the FormTree correspond with nodes in the main PdfTree. */
+    /**
+     * A serial version uid.
+     */
+    private static final long serialVersionUID = 5646572654823301007L;
+    /**
+     * Nodes in the FormTree correspond with nodes in the main PdfTree.
+     */
     protected PdfReaderController controller;
-    
-    /** Creates a new outline tree.
-     *  @param controller   The renderer that will render an object when selected in the table.*/
+
+    /**
+     * Creates a new outline tree.
+     *
+     * @param controller The renderer that will render an object when selected in the table.
+     */
     public OutlineTree(PdfReaderController controller) {
         super();
         this.controller = controller;
@@ -66,7 +72,7 @@ public void update(Observable observable, Object obj) {
             return;
         }
         if (obj instanceof ObjectLoader) {
-            ObjectLoader loader = (ObjectLoader)obj;
+            ObjectLoader loader = (ObjectLoader) obj;
             TreeNodeFactory factory = loader.getNodes();
             PdfTrailerTreeNode trailer = controller.getPdfTree().getRoot();
             PdfObjectTreeNode catalog = factory.getChildNode(trailer, PdfName.ROOT);
@@ -79,7 +85,7 @@ public void update(Observable observable, Object obj) {
             setModel(new DefaultTreeModel(root));
         }
     }
-    
+
     /**
      * Method that can be used recursively to load the outline hierarchy into the tree.
      */
@@ -100,15 +106,14 @@ private void loadOutline(TreeNodeFactory factory, OutlineTreeNode parent, PdfObj
      * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent)
      */
     public void valueChanged(TreeSelectionEvent evt) {
-        if (controller == null)
+        if (controller == null) {
             return;
-        OutlineTreeNode selectednode = (OutlineTreeNode)this.getLastSelectedPathComponent();
+        }
+        OutlineTreeNode selectednode = (OutlineTreeNode) this.getLastSelectedPathComponent();
         PdfObjectTreeNode node = selectednode.getCorrespondingPdfObjectNode();
-        if (node != null)
+        if (node != null) {
             controller.selectNode(node);
+        }
     }
 
-    /** A serial version uid. */
-    private static final long serialVersionUID = 5646572654823301007L;
-
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PagesTable.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PagesTable.java
index 25038e5ff..73bbc4ff0 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PagesTable.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PagesTable.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,14 +20,6 @@
 
 package com.lowagie.rups.view.itext;
 
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Observable;
-import java.util.Observer;
-
-import javax.swing.JTable;
-import javax.swing.event.ListSelectionEvent;
-
 import com.lowagie.rups.controller.PdfReaderController;
 import com.lowagie.rups.model.ObjectLoader;
 import com.lowagie.rups.model.TreeNodeFactory;
@@ -40,30 +32,45 @@
 import com.lowagie.rups.view.models.JTableAutoModelInterface;
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfPageLabels;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Observable;
+import java.util.Observer;
+import javax.swing.JTable;
+import javax.swing.event.ListSelectionEvent;
 
 /**
- * A JTable listing all the pages in a PDF file: the object number of each
- * page dictionary and the page numbers (with label information if present).
+ * A JTable listing all the pages in a PDF file: the object number of each page dictionary and the page numbers (with
+ * label information if present).
  */
 public class PagesTable extends JTable implements JTableAutoModelInterface, Observer {
 
-    /** A list with page nodes. */
+    /**
+     * A serial version UID.
+     */
+    private static final long serialVersionUID = -6523261089453886508L;
+    /**
+     * A list with page nodes.
+     */
     protected ArrayList list = new ArrayList<>();
-    /** Nodes in the FormTree correspond with nodes in the main PdfTree. */
+    /**
+     * Nodes in the FormTree correspond with nodes in the main PdfTree.
+     */
     protected PdfReaderController controller;
     /***/
     protected PageSelectionListener listener;
 
     /**
      * Constructs a PagesTable.
-     * @param    listener    the page navigation listener.
-     * @param controller     The renderer that will render an object when selected in the table.
+     *
+     * @param listener   the page navigation listener.
+     * @param controller The renderer that will render an object when selected in the table.
      */
     public PagesTable(PdfReaderController controller, PageSelectionListener listener) {
         this.controller = controller;
         this.listener = listener;
     }
-    
+
     /**
      * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
      */
@@ -74,21 +81,21 @@ public void update(Observable observable, Object obj) {
             return;
         }
         if (obj instanceof ObjectLoader) {
-            ObjectLoader loader = (ObjectLoader)obj;
+            ObjectLoader loader = (ObjectLoader) obj;
             String[] pagelabels = PdfPageLabels.getPageLabels(loader.getReader());
             int i = 0;
             TreeNodeFactory factory = loader.getNodes();
             PdfTrailerTreeNode trailer = controller.getPdfTree().getRoot();
             PdfObjectTreeNode catalog = factory.getChildNode(trailer, PdfName.ROOT);
-            PdfPagesTreeNode pages = (PdfPagesTreeNode)factory.getChildNode(catalog, PdfName.PAGES);
+            PdfPagesTreeNode pages = (PdfPagesTreeNode) factory.getChildNode(catalog, PdfName.PAGES);
             if (pages == null) {
                 return;
             }
             Enumeration p = pages.depthFirstEnumeration();
-            PdfObjectTreeNode  child;
+            PdfObjectTreeNode child;
             StringBuffer buf;
             while (p.hasMoreElements()) {
-                child = (PdfObjectTreeNode)p.nextElement();
+                child = (PdfObjectTreeNode) p.nextElement();
                 if (child instanceof PdfPageTreeNode) {
                     buf = new StringBuffer("Page ");
                     buf.append(++i);
@@ -98,20 +105,20 @@ public void update(Observable observable, Object obj) {
                         buf.append(" )");
                     }
                     child.setUserObject(buf.toString());
-                    list.add((PdfPageTreeNode)child);
+                    list.add((PdfPageTreeNode) child);
                 }
             }
         }
         setModel(new JTableAutoModel(this));
     }
-    
+
     /**
      * @see javax.swing.JTable#getColumnCount()
      */
     public int getColumnCount() {
         return 2;
     }
-    
+
     /**
      * @see javax.swing.JTable#getRowCount()
      */
@@ -123,26 +130,29 @@ public int getRowCount() {
      * @see javax.swing.JTable#getValueAt(int, int)
      */
     public Object getValueAt(int rowIndex, int columnIndex) {
-        if (getRowCount() == 0) return null;
+        if (getRowCount() == 0) {
+            return null;
+        }
         switch (columnIndex) {
-        case 0:
-            return "Object " + list.get(rowIndex).getNumber();
-        case 1:
-            return list.get(rowIndex);
+            case 0:
+                return "Object " + list.get(rowIndex).getNumber();
+            case 1:
+                return list.get(rowIndex);
         }
         return null;
     }
+
     /**
      * @see javax.swing.JTable#getColumnName(int)
      */
     public String getColumnName(int columnIndex) {
         switch (columnIndex) {
-        case 0:
-            return "Object";
-        case 1:
-            return "Page";
-        default:
-            return null;
+            case 0:
+                return "Object";
+            case 1:
+                return "Page";
+            default:
+                return null;
         }
     }
 
@@ -151,18 +161,18 @@ public String getColumnName(int columnIndex) {
      */
     @Override
     public void valueChanged(ListSelectionEvent evt) {
-        if (evt != null)
+        if (evt != null) {
             super.valueChanged(evt);
-        if (controller == null)
+        }
+        if (controller == null) {
             return;
+        }
         if (getRowCount() > 0) {
             controller.selectNode(list.get(getSelectedRow()));
-            if (listener != null)
+            if (listener != null) {
                 listener.gotoPage(getSelectedRow() + 1);
+            }
         }
     }
 
-    /** A serial version UID. */
-    private static final long serialVersionUID = -6523261089453886508L;
-
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PdfObjectPanel.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PdfObjectPanel.java
index d608cca6a..7762511ef 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PdfObjectPanel.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PdfObjectPanel.java
@@ -7,49 +7,62 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 package com.lowagie.rups.view.itext;
+
+import com.lowagie.rups.view.models.DictionaryTableModel;
+import com.lowagie.rups.view.models.PdfArrayTableModel;
+import com.lowagie.text.pdf.PdfArray;
+import com.lowagie.text.pdf.PdfDictionary;
+import com.lowagie.text.pdf.PdfObject;
 import java.awt.CardLayout;
 import java.util.Observable;
 import java.util.Observer;
-
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.JTextArea;
 
-import com.lowagie.rups.view.models.DictionaryTableModel;
-import com.lowagie.rups.view.models.PdfArrayTableModel;
-import com.lowagie.text.pdf.PdfArray;
-import com.lowagie.text.pdf.PdfDictionary;
-import com.lowagie.text.pdf.PdfObject;
-
 public class PdfObjectPanel extends JPanel implements Observer {
 
-    /** Name of a panel in the CardLayout. */
+    /**
+     * Name of a panel in the CardLayout.
+     */
     private static final String TEXT = "text";
-    /** Name of a panel in the CardLayout. */
+    /**
+     * Name of a panel in the CardLayout.
+     */
     private static final String TABLE = "table";
-    
-    /** The layout that will show the info about the PDF object that is being analyzed. */
+    /**
+     * a serial version id.
+     */
+    private static final long serialVersionUID = 1302283071087762494L;
+    /**
+     * The layout that will show the info about the PDF object that is being analyzed.
+     */
     protected CardLayout layout = new CardLayout();
-
-    /** Table with dictionary entries. */
+    /**
+     * Table with dictionary entries.
+     */
     JTable table = new JTable();
-    /** The text pane with the info about a PDF object in the bottom panel. */
+    /**
+     * The text pane with the info about a PDF object in the bottom panel.
+     */
     JTextArea text = new JTextArea();
-    
-    /** Creates a PDF object panel. */
+
+    /**
+     * Creates a PDF object panel.
+     */
     public PdfObjectPanel() {
         // layout
         setLayout(layout);
@@ -58,13 +71,13 @@ public PdfObjectPanel() {
         JScrollPane dict_scrollpane = new JScrollPane();
         dict_scrollpane.setViewportView(table);
         add(dict_scrollpane, TABLE);
-        
+
         // number / string / ...
         JScrollPane text_scrollpane = new JScrollPane();
         text_scrollpane.setViewportView(text);
         add(text_scrollpane, TEXT);
     }
-    
+
     /**
      * Clear the object panel.
      */
@@ -79,10 +92,11 @@ public void clear() {
     public void update(Observable observable, Object obj) {
         clear();
     }
-    
+
     /**
      * Shows a PdfObject as text or in a table.
-     * @param object    the object that needs to be shown.
+     *
+     * @param object the object that needs to be shown.
      */
     public void render(PdfObject object) {
         if (object == null) {
@@ -92,26 +106,23 @@ public void render(PdfObject object) {
             text.repaint();
             return;
         }
-        switch(object.type()) {
-        case PdfObject.DICTIONARY:
-        case PdfObject.STREAM:
-            table.setModel(new DictionaryTableModel((PdfDictionary)object));
-            layout.show(this, TABLE);
-            this.repaint();
-            break;
-        case PdfObject.ARRAY:
-            table.setModel(new PdfArrayTableModel((PdfArray)object));
-            layout.show(this, TABLE);
-            this.repaint();
-            break;
-        default:
-            text.setText(object.toString());
-            layout.show(this, TEXT);
-            break;
+        switch (object.type()) {
+            case PdfObject.DICTIONARY:
+            case PdfObject.STREAM:
+                table.setModel(new DictionaryTableModel((PdfDictionary) object));
+                layout.show(this, TABLE);
+                this.repaint();
+                break;
+            case PdfObject.ARRAY:
+                table.setModel(new PdfArrayTableModel((PdfArray) object));
+                layout.show(this, TABLE);
+                this.repaint();
+                break;
+            default:
+                text.setText(object.toString());
+                layout.show(this, TEXT);
+                break;
         }
     }
-    
-    /** a serial version id. */
-    private static final long serialVersionUID = 1302283071087762494L;
 
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PdfTree.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PdfTree.java
index 58e0046d5..ebfcd514a 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PdfTree.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/PdfTree.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,25 +20,29 @@
 
 package com.lowagie.rups.view.itext;
 
+import com.lowagie.rups.view.icons.IconTreeCellRenderer;
+import com.lowagie.rups.view.itext.treenodes.PdfObjectTreeNode;
+import com.lowagie.rups.view.itext.treenodes.PdfTrailerTreeNode;
 import java.util.Observable;
 import java.util.Observer;
-
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 
-import com.lowagie.rups.view.icons.IconTreeCellRenderer;
-import com.lowagie.rups.view.itext.treenodes.PdfObjectTreeNode;
-import com.lowagie.rups.view.itext.treenodes.PdfTrailerTreeNode;
-
 /**
  * A JTree that shows the object hierarchy of a PDF document.
  */
 public class PdfTree extends JTree implements Observer {
 
-    /** The root of the PDF tree. */
+    /**
+     * a serial version UID
+     */
+    private static final long serialVersionUID = 7545804447512085734L;
+    /**
+     * The root of the PDF tree.
+     */
     protected PdfTrailerTreeNode root;
-    
+
     /**
      * Constructs a PDF tree.
      */
@@ -48,20 +52,21 @@ public PdfTree() {
         setCellRenderer(new IconTreeCellRenderer());
         update(null, null);
     }
-    
+
     /**
      * Getter for the root node
-     * @return    the PDF Trailer node
+     *
+     * @return the PDF Trailer node
      */
     public PdfTrailerTreeNode getRoot() {
         return root;
     }
 
     /**
-     * Updates the PdfTree when a file is closed or when a ObjectLoader
-     * has finished loading objects.
-     * @param observable    the Observable class that started the update
-     * @param obj            the object that has all the updates
+     * Updates the PdfTree when a file is closed or when a ObjectLoader has finished loading objects.
+     *
+     * @param observable the Observable class that started the update
+     * @param obj        the object that has all the updates
      * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
      */
     public void update(Observable observable, Object obj) {
@@ -73,10 +78,10 @@ public void update(Observable observable, Object obj) {
     }
 
     /**
-     * Select a specific node in the tree.
-     * Typically this method will be called from a different tree,
-     * such as the pages, outlines or form tree.
-     * @param    node    the node that has to be selected
+     * Select a specific node in the tree. Typically this method will be called from a different tree, such as the
+     * pages, outlines or form tree.
+     *
+     * @param node the node that has to be selected
      */
     public void selectNode(PdfObjectTreeNode node) {
         TreePath path = new TreePath(node.getPath());
@@ -84,7 +89,4 @@ public void selectNode(PdfObjectTreeNode node) {
         scrollPathToVisible(path);
     }
 
-    /** a serial version UID */
-    private static final long serialVersionUID = 7545804447512085734L;
-    
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/StreamTextArea.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/StreamTextArea.java
index 9184ab566..0c04614fd 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/StreamTextArea.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/StreamTextArea.java
@@ -7,35 +7,40 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 package com.lowagie.rups.view.itext;
-import java.io.IOException;
-import java.util.Observable;
-import java.util.Observer;
-
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
 
 import com.lowagie.rups.io.TextAreaOutputStream;
 import com.lowagie.text.pdf.PRStream;
 import com.lowagie.text.pdf.PdfObject;
 import com.lowagie.text.pdf.PdfReader;
+import java.io.IOException;
+import java.util.Observable;
+import java.util.Observer;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
 
 public class StreamTextArea extends JScrollPane implements Observer {
-    
-    /** The text area with the content stream. */
+
+    /**
+     * a serial version id.
+     */
+    private static final long serialVersionUID = 1302283071087762494L;
+    /**
+     * The text area with the content stream.
+     */
     protected JTextArea text;
-    
+
     /**
      * Constructs a StreamTextArea.
      */
@@ -44,31 +49,30 @@ public StreamTextArea() {
         text = new JTextArea();
         setViewportView(text);
     }
-    
+
     /**
      * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
      */
     public void update(Observable observable, Object obj) {
         text.setText(null);
     }
-    
+
     /**
      * Renders the content stream of a PdfObject or empties the text area.
-     * @param object    the object of which the content stream needs to be rendered
+     *
+     * @param object the object of which the content stream needs to be rendered
      */
     public void render(PdfObject object) {
         if (object instanceof PRStream) {
-            PRStream stream = (PRStream)object;
+            PRStream stream = (PRStream) object;
             try {
                 TextAreaOutputStream taos = new TextAreaOutputStream(text);
                 taos.write(PdfReader.getStreamBytes(stream));
                 //text.addMouseListener(new StreamEditorAction(stream));
-            }
-            catch(IOException e) {
+            } catch (IOException e) {
                 text.setText("The stream could not be read: " + e.getMessage());
             }
-        }
-        else {
+        } else {
             update(null, null);
             return;
         }
@@ -76,7 +80,4 @@ public void render(PdfObject object) {
         repaint();
     }
 
-    /** a serial version id. */
-    private static final long serialVersionUID = 1302283071087762494L;
-
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XRefTable.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XRefTable.java
index 64790a0a3..2a1eb13e2 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XRefTable.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XRefTable.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,13 +20,6 @@
 
 package com.lowagie.rups.view.itext;
 
-import java.util.Observable;
-import java.util.Observer;
-
-import javax.swing.JTable;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.table.TableColumn;
-
 import com.lowagie.rups.controller.PdfReaderController;
 import com.lowagie.rups.model.IndirectObjectFactory;
 import com.lowagie.rups.model.ObjectLoader;
@@ -34,24 +27,40 @@
 import com.lowagie.rups.view.models.JTableAutoModelInterface;
 import com.lowagie.text.pdf.PdfNull;
 import com.lowagie.text.pdf.PdfObject;
+import java.util.Observable;
+import java.util.Observer;
+import javax.swing.JTable;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.table.TableColumn;
 
 /**
  * A JTable that shows the indirect objects of a PDF xref table.
  */
 public class XRefTable extends JTable implements JTableAutoModelInterface, Observer {
 
-    /** The factory that can produce all the indirect objects. */
+    /**
+     * A serial version UID.
+     */
+    private static final long serialVersionUID = -382184619041375537L;
+    /**
+     * The factory that can produce all the indirect objects.
+     */
     protected IndirectObjectFactory objects;
-    /** The renderer that will render an object when selected in the table. */
+    /**
+     * The renderer that will render an object when selected in the table.
+     */
     protected PdfReaderController controller;
-    
-    /** Creates a JTable visualizing xref table.
-     * @param controller The renderer that will render an object when selected in the table.*/
+
+    /**
+     * Creates a JTable visualizing xref table.
+     *
+     * @param controller The renderer that will render an object when selected in the table.
+     */
     public XRefTable(PdfReaderController controller) {
         super();
         this.controller = controller;
     }
-    
+
     /**
      * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
      */
@@ -63,26 +72,28 @@ public void update(Observable observable, Object obj) {
         }
         if (observable instanceof PdfReaderController
                 && obj instanceof ObjectLoader) {
-            ObjectLoader loader = (ObjectLoader)obj;
+            ObjectLoader loader = (ObjectLoader) obj;
             objects = loader.getObjects();
             setModel(new JTableAutoModel(this));
-            TableColumn col= getColumnModel().getColumn(0);
+            TableColumn col = getColumnModel().getColumn(0);
             col.setPreferredWidth(5);
         }
     }
-    
+
     /**
      * @see javax.swing.JTable#getColumnCount()
      */
     public int getColumnCount() {
         return 2;
     }
-    
+
     /**
      * @see javax.swing.JTable#getRowCount()
      */
     public int getRowCount() {
-        if (objects == null) return 0;
+        if (objects == null) {
+            return 0;
+        }
         return objects.size();
     }
 
@@ -91,63 +102,67 @@ public int getRowCount() {
      */
     public Object getValueAt(int rowIndex, int columnIndex) {
         switch (columnIndex) {
-        case 0:
-            return getObjectReferenceByRow(rowIndex);
-        case 1:
-            return getObjectDescriptionByRow(rowIndex);
-        default:
-            return null;
+            case 0:
+                return getObjectReferenceByRow(rowIndex);
+            case 1:
+                return getObjectDescriptionByRow(rowIndex);
+            default:
+                return null;
         }
     }
-    
+
     /**
-     * Gets the reference number of an indirect object
-     * based on the row index.
-     * @param rowIndex    a row number
-     * @return    a reference number
+     * Gets the reference number of an indirect object based on the row index.
+     *
+     * @param rowIndex a row number
+     * @return a reference number
      */
     protected int getObjectReferenceByRow(int rowIndex) {
         return objects.getRefByIndex(rowIndex);
     }
-    
+
     /**
      * Gets the object that is shown in a row.
-     * @param rowIndex    the row number containing the object
-     * @return    a PDF object
+     *
+     * @param rowIndex the row number containing the object
+     * @return a PDF object
      */
     protected String getObjectDescriptionByRow(int rowIndex) {
         PdfObject object = objects.getObjectByIndex(rowIndex);
-        if (object instanceof PdfNull)
+        if (object instanceof PdfNull) {
             return "Indirect object";
+        }
         return object.toString();
     }
-    
+
     /**
      * @see javax.swing.JTable#getColumnName(int)
      */
     public String getColumnName(int columnIndex) {
         switch (columnIndex) {
-        case 0:
-            return "Number";
-        case 1:
-            return "Object";
-        default:
-            return null;
+            case 0:
+                return "Number";
+            case 1:
+                return "Object";
+            default:
+                return null;
         }
     }
-    
+
     /**
      * Gets the object that is shown in a row.
-     * @param rowIndex    the row number containing the object
-     * @return    a PDF object
+     *
+     * @param rowIndex the row number containing the object
+     * @return a PDF object
      */
     protected PdfObject getObjectByRow(int rowIndex) {
         return objects.loadObjectByReference(getObjectReferenceByRow(rowIndex));
     }
-    
+
     /**
      * Selects a row containing information about an indirect object.
-     * @param ref    the reference number of the indirect object
+     *
+     * @param ref the reference number of the indirect object
      */
     public void selectRowByReference(int ref) {
         int row = objects.getIndexByRef(ref);
@@ -161,15 +176,13 @@ public void selectRowByReference(int ref) {
      */
     @Override
     public void valueChanged(ListSelectionEvent evt) {
-        if (evt != null)
+        if (evt != null) {
             super.valueChanged(evt);
+        }
         if (controller != null && objects != null) {
             controller.render(getObjectByRow(this.getSelectedRow()));
             controller.selectNode(getObjectReferenceByRow(getSelectedRow()));
         }
     }
-    
-    /** A serial version UID. */
-    private static final long serialVersionUID = -382184619041375537L;
 
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XfaTextArea.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XfaTextArea.java
index 0b2fe36bb..f47cf72bf 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XfaTextArea.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XfaTextArea.java
@@ -1,21 +1,25 @@
 package com.lowagie.rups.view.itext;
 
+import com.lowagie.rups.io.OutputStreamResource;
+import com.lowagie.rups.io.TextAreaOutputStream;
 import java.io.IOException;
-
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 
-import com.lowagie.rups.io.OutputStreamResource;
-import com.lowagie.rups.io.TextAreaOutputStream;
-
 /**
  * TextArea that visualizes the XFA XML file.
  */
 public class XfaTextArea extends JScrollPane {
-    
-    /** The text area with the content stream. */
+
+    /**
+     * A Serial Version UID.
+     */
+    private static final long serialVersionUID = -8275229961781669457L;
+    /**
+     * The text area with the content stream.
+     */
     protected JTextArea text;
-    
+
     /**
      * Constructs a StreamTextArea.
      */
@@ -24,16 +28,13 @@ public XfaTextArea() {
         text = new JTextArea();
         setViewportView(text);
     }
-    
+
     public void clear() {
         text.setText("");
     }
-    
+
     public void load(OutputStreamResource xml) throws IOException {
         TextAreaOutputStream stream = new TextAreaOutputStream(text);
         xml.writeTo(stream);
     }
-
-    /** A Serial Version UID. */
-    private static final long serialVersionUID = -8275229961781669457L;
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XfaTree.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XfaTree.java
index 0ff2a8f67..b04757b35 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XfaTree.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/XfaTree.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,36 +20,38 @@
 
 package com.lowagie.rups.view.itext;
 
-import javax.swing.JTree;
-import javax.swing.tree.DefaultTreeModel;
-
 import com.lowagie.rups.model.XfaFile;
 import com.lowagie.rups.view.icons.IconTreeCellRenderer;
 import com.lowagie.rups.view.icons.IconTreeNode;
 import com.lowagie.rups.view.itext.treenodes.XdpTreeNode;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultTreeModel;
 
 /**
  * Tree that visualizes the XFA information.
  */
 public class XfaTree extends JTree {
 
+    /**
+     * A Serial Version UID.
+     */
+    private static final long serialVersionUID = -5072971223015095193L;
+
     /**
      * Constructs an XfaTree.
      */
     public XfaTree() {
         super();
     }
-    
+
     public void clear() {
         setCellRenderer(new IconTreeCellRenderer());
         setModel(new DefaultTreeModel(new IconTreeNode("xfa.png")));
     }
+
     public void load(XfaFile file) {
         setCellRenderer(new IconTreeCellRenderer());
         setModel(new DefaultTreeModel(new XdpTreeNode(file.getXfaDocument())));
     }
 
-    /** A Serial Version UID. */
-    private static final long serialVersionUID = -5072971223015095193L;
-
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/FormTreeNode.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/FormTreeNode.java
index b69fe4e5e..d4d69d90c 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/FormTreeNode.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/FormTreeNode.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -29,45 +29,48 @@
  * A FormTreeNode is a standard node in a FormTree.
  */
 public class FormTreeNode extends IconTreeNode {
-    
-    /** The corresponding tree node in the PdfTree. */
+
+    /**
+     * A serial version UID.
+     */
+    private static final long serialVersionUID = 7800080437550790989L;
+    /**
+     * The corresponding tree node in the PdfTree.
+     */
     protected PdfObjectTreeNode object_node;
-    
+
     /**
      * Creates the root node of the FormTree.
      */
     public FormTreeNode() {
         super("form.png", "Form");
     }
-    
+
     /**
      * Creates a node corresponding with a node in the PdfTree.
-     * @param    node    a corresponding node
+     *
+     * @param node a corresponding node
      */
     public FormTreeNode(PdfObjectTreeNode node) {
         super("form.png");
         this.object_node = node;
         if (node.isDictionary()) {
-            PdfDictionary dict = (PdfDictionary)node.getPdfObject();
+            PdfDictionary dict = (PdfDictionary) node.getPdfObject();
             PdfObject fieldname = dict.get(PdfName.T);
             if (fieldname != null) {
                 this.setUserObject(fieldname);
-            }
-            else {
+            } else {
                 this.setUserObject("unnamed field");
             }
         }
     }
 
     /**
-     * Gets the node in the PdfTree that corresponds with this
-     * FormTreeNode.
-     * @return    a PdfObjectTreeNode in the PdfTree
+     * Gets the node in the PdfTree that corresponds with this FormTreeNode.
+     *
+     * @return a PdfObjectTreeNode in the PdfTree
      */
     public PdfObjectTreeNode getCorrespondingPdfObjectNode() {
         return object_node;
     }
-
-    /** A serial version UID. */
-    private static final long serialVersionUID = 7800080437550790989L;
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/OutlineTreeNode.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/OutlineTreeNode.java
index 99d03459b..2207a5b03 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/OutlineTreeNode.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/OutlineTreeNode.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -29,34 +29,40 @@
  */
 public class OutlineTreeNode extends IconTreeNode {
 
-    /** The corresponding tree node in the PdfTree. */
+    /**
+     * A serial version uid
+     */
+    private static final long serialVersionUID = 5437651809665762952L;
+    /**
+     * The corresponding tree node in the PdfTree.
+     */
     protected PdfObjectTreeNode object_node;
-    
-    /** Creates the root node for the OutlineTree. */
+
+    /**
+     * Creates the root node for the OutlineTree.
+     */
     public OutlineTreeNode() {
         super("outline.png", "Bookmarks");
     }
 
     /**
      * Creates a node corresponding with a node in the PdfTree.
-     * @param    node    a corresponding node
+     *
+     * @param node a corresponding node
      */
     public OutlineTreeNode(PdfObjectTreeNode node) {
         super("outline.png");
         this.object_node = node;
-        PdfDictionary dict = (PdfDictionary)node.getPdfObject();
+        PdfDictionary dict = (PdfDictionary) node.getPdfObject();
         this.setUserObject(dict.get(PdfName.TITLE));
     }
 
     /**
-     * Gets the node in the PdfTree that corresponds with this
-     * OutlineTreeNode.
-     * @return    a PdfObjectTreeNode in the PdfTree
+     * Gets the node in the PdfTree that corresponds with this OutlineTreeNode.
+     *
+     * @return a PdfObjectTreeNode in the PdfTree
      */
     public PdfObjectTreeNode getCorrespondingPdfObjectNode() {
         return object_node;
     }
-
-    /** A serial version uid */
-    private static final long serialVersionUID = 5437651809665762952L;
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfObjectTreeNode.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfObjectTreeNode.java
index 6daf27844..89f2d0624 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfObjectTreeNode.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfObjectTreeNode.java
@@ -30,84 +30,98 @@
 import com.lowagie.text.pdf.PdfString;
 
 /**
- * Every node in our tree corresponds with a PDF object.
- * This class is the superclass of all tree nodes used.
+ * Every node in our tree corresponds with a PDF object. This class is the superclass of all tree nodes used.
  */
 public class PdfObjectTreeNode extends IconTreeNode {
 
-    /** the PDF object corresponding with this node. */
+    /**
+     * a serial version UID.
+     */
+    private static final long serialVersionUID = -5617844659397445879L;
+    /**
+     * the PDF object corresponding with this node.
+     */
     protected PdfObject object;
-    /** the key if the parent of this node is a dictionary. */
+    /**
+     * the key if the parent of this node is a dictionary.
+     */
     protected PdfName key = null;
-    /** if the object is indirect, the number of the PDF object. */
+    /**
+     * if the object is indirect, the number of the PDF object.
+     */
     protected int number = -1;
-    /** indicates if the object is indirect and recursive. */
+    /**
+     * indicates if the object is indirect and recursive.
+     */
     protected boolean recursive = false;
 
     /**
      * Creates a tree node for a PDF object.
-     * @param object    the PDF object represented by this tree node.
+     *
+     * @param object the PDF object represented by this tree node.
      */
     protected PdfObjectTreeNode(PdfObject object) {
         super(null, getCaption(object));
         this.object = object;
-        switch(object.type()) {
-        case PdfObject.INDIRECT:
-            if (isRecursive())
-                icon = IconFetcher.getIcon("ref_recursive.png");
-            else
-                icon = IconFetcher.getIcon("ref.png");
-            return;
-        case PdfObject.ARRAY:
-            icon = IconFetcher.getIcon("array.png");
-            return;
-        case PdfObject.DICTIONARY:
-            icon = IconFetcher.getIcon("dictionary.png");
-            return;
-        case PdfObject.STREAM:
-            icon = IconFetcher.getIcon("stream.png");
-            return;
-        case PdfObject.BOOLEAN:
-            icon = IconFetcher.getIcon("boolean.png");
-            return;
-        case PdfObject.NAME:
-            icon = IconFetcher.getIcon("name.png");
-            return;
-        case PdfObject.NULL:
-            icon = IconFetcher.getIcon("null.png");
-            return;
-        case PdfObject.NUMBER:
-            icon = IconFetcher.getIcon("number.png");
-            return;
-        case PdfObject.STRING:
-            icon = IconFetcher.getIcon("string.png");
-            return;
+        switch (object.type()) {
+            case PdfObject.INDIRECT:
+                if (isRecursive()) {
+                    icon = IconFetcher.getIcon("ref_recursive.png");
+                } else {
+                    icon = IconFetcher.getIcon("ref.png");
+                }
+                return;
+            case PdfObject.ARRAY:
+                icon = IconFetcher.getIcon("array.png");
+                return;
+            case PdfObject.DICTIONARY:
+                icon = IconFetcher.getIcon("dictionary.png");
+                return;
+            case PdfObject.STREAM:
+                icon = IconFetcher.getIcon("stream.png");
+                return;
+            case PdfObject.BOOLEAN:
+                icon = IconFetcher.getIcon("boolean.png");
+                return;
+            case PdfObject.NAME:
+                icon = IconFetcher.getIcon("name.png");
+                return;
+            case PdfObject.NULL:
+                icon = IconFetcher.getIcon("null.png");
+                return;
+            case PdfObject.NUMBER:
+                icon = IconFetcher.getIcon("number.png");
+                return;
+            case PdfObject.STRING:
+                icon = IconFetcher.getIcon("string.png");
+                return;
         }
     }
 
+
     /**
      * Creates a tree node for a PDF object.
-     * @param icon        the file with the icon
-     * @param object    the PDF object represented by this tree node.
+     *
+     * @param icon   the file with the icon
+     * @param object the PDF object represented by this tree node.
      */
     protected PdfObjectTreeNode(String icon, PdfObject object) {
         super(icon, getCaption(object));
         this.object = object;
-        }
-
+    }
 
     /**
      * Creates an instance of a tree node for a PDF object.
-     * @param object    the PDF object represented by this tree node.
-     * @return    a PdfObjectTreeNode
+     *
+     * @param object the PDF object represented by this tree node.
+     * @return a PdfObjectTreeNode
      */
     public static PdfObjectTreeNode getInstance(PdfObject object) {
         if (object.isDictionary()) {
-            if (PdfName.PAGE.equals(((PdfDictionary)object).get(PdfName.TYPE))) {
-                return new PdfPageTreeNode((PdfDictionary)object);
-            }
-            else if (PdfName.PAGES.equals(((PdfDictionary)object).get(PdfName.TYPE))) {
-                return new PdfPagesTreeNode((PdfDictionary)object);
+            if (PdfName.PAGE.equals(((PdfDictionary) object).get(PdfName.TYPE))) {
+                return new PdfPageTreeNode((PdfDictionary) object);
+            } else if (PdfName.PAGES.equals(((PdfDictionary) object).get(PdfName.TYPE))) {
+                return new PdfPagesTreeNode((PdfDictionary) object);
             }
         }
         return new PdfObjectTreeNode(object);
@@ -115,9 +129,10 @@ else if (PdfName.PAGES.equals(((PdfDictionary)object).get(PdfName.TYPE))) {
 
     /**
      * Creates an instance of a tree node for an indirect object.
-     * @param object    the PDF object represented by this tree node.
-     * @param number    the xref number of the indirect object
-     * @return    a PdfObjectTreeNode
+     *
+     * @param object the PDF object represented by this tree node.
+     * @param number the xref number of the indirect object
+     * @return a PdfObjectTreeNode
      */
     public static PdfObjectTreeNode getInstance(PdfObject object, int number) {
         PdfObjectTreeNode node = getInstance(object);
@@ -127,9 +142,10 @@ public static PdfObjectTreeNode getInstance(PdfObject object, int number) {
 
     /**
      * Creates an instance of a tree node for the object corresponding with a key in a dictionary.
-     * @param dict    the dictionary that is the parent of this tree node.
-     * @param key    the dictionary key corresponding with the PDF object in this tree node.
-     * @return    a PdfObjectTreeNode
+     *
+     * @param dict the dictionary that is the parent of this tree node.
+     * @param key  the dictionary key corresponding with the PDF object in this tree node.
+     * @return a PdfObjectTreeNode
      */
     public static PdfObjectTreeNode getInstance(PdfDictionary dict, PdfName key) {
         PdfObjectTreeNode node = getInstance(dict.get(key));
@@ -138,9 +154,54 @@ public static PdfObjectTreeNode getInstance(PdfDictionary dict, PdfName key) {
         return node;
     }
 
+    /**
+     * Creates the caption for a PDF object.
+     *
+     * @param object the object for which a caption has to be created.
+     * @return a caption for a PDF object
+     */
+    public static String getCaption(PdfObject object) {
+        if (object == null) {
+            return "null";
+        }
+        switch (object.type()) {
+            case PdfObject.INDIRECT: {
+                String reffedCaption = getCaption(PdfReader.getPdfObject(object));
+                return object.toString() + " -> " + reffedCaption;
+            }
+            case PdfObject.ARRAY:
+                return "Array";
+            case PdfObject.STREAM:
+                return "Stream";
+            case PdfObject.STRING:
+                return ((PdfString) object).toUnicodeString();
+        }
+        return object.toString();
+    }
+
+    /**
+     * Creates the caption for an object that is a dictionary entry.
+     *
+     * @param dict a dictionary
+     * @param key  a key in the dictionary
+     * @return a caption for the object corresponding with the key in the dictionary.
+     */
+    public static String getDictionaryEntryCaption(PdfDictionary dict, PdfName key) {
+        StringBuilder buf = new StringBuilder(key.toString());
+        buf.append(": ");
+        PdfObject valObj = dict.get(key);
+        if (valObj.isIndirect()) {
+            buf.append(getCaption(valObj));
+        } else {
+            buf.append(dict.get(key).toString());
+        }
+        return buf.toString();
+    }
+
     /**
      * Getter for the PDF Object.
-     * @return    the PDF object represented by this tree node.
+     *
+     * @return the PDF object represented by this tree node.
      */
     public PdfObject getPdfObject() {
         return object;
@@ -148,18 +209,20 @@ public PdfObject getPdfObject() {
 
     /**
      * Getter for the object number in case the object is indirect.
-     * @return    -1 for direct objects; the object number for indirect objects
+     *
+     * @return -1 for direct objects; the object number for indirect objects
      */
     public int getNumber() {
         if (isIndirectReference()) {
-            return ((PdfIndirectReference)object).getNumber();
+            return ((PdfIndirectReference) object).getNumber();
         }
         return number;
     }
 
     /**
      * Tells you if the node contains an indirect reference.
-     * @return    true if the object is an indirect reference
+     *
+     * @return true if the object is an indirect reference
      */
     public boolean isIndirectReference() {
         return object.type() == PdfObject.INDIRECT;
@@ -167,7 +230,8 @@ public boolean isIndirectReference() {
 
     /**
      * Tells you if the object is indirect.
-     * @return    true for indirect objects; false for direct objects.
+     *
+     * @return true for indirect objects; false for direct objects.
      */
     public boolean isIndirect() {
         return isIndirectReference() || number > -1;
@@ -175,7 +239,8 @@ public boolean isIndirect() {
 
     /**
      * Tells you if the node contains an array.
-     * @return    true if the object is a PdfArray
+     *
+     * @return true if the object is a PdfArray
      */
     public boolean isArray() {
         return object.isArray();
@@ -183,17 +248,21 @@ public boolean isArray() {
 
     /**
      * Checks if this node is a dictionary item with a specific key.
-     * @param    key    the key of the node we're looking for
+     *
+     * @param key the key of the node we're looking for
      * @return true if the node is a dictionary item with the specified key, false otherwise
      */
     public boolean isDictionaryNode(PdfName key) {
-        if (key == null) return false;
+        if (key == null) {
+            return false;
+        }
         return key.equals(this.key);
     }
 
     /**
      * Tells you if the node contains a dictionary.
-     * @return    true if the object is a PdfDictionary
+     *
+     * @return true if the object is a PdfDictionary
      */
     public boolean isDictionary() {
         return object.isDictionary();
@@ -201,80 +270,41 @@ public boolean isDictionary() {
 
     /**
      * Tells you if the node contains a stream.
-     * @return    true if the object is a PRStream
+     *
+     * @return true if the object is a PRStream
      */
     public boolean isStream() {
         return object.isStream();
     }
 
-    /**
-     * Set this to true if the object is a reference to a node higher up in the tree.
-     * @param    recursive    true if the object is indirect and recursive
-     */
-    public void setRecursive(boolean recursive) {
-        this.recursive = recursive;
-    }
-
     /**
      * Tells you if the object is a reference to a node higher up in the tree.
-     * @return    true if the node is used recursively.
+     *
+     * @return true if the node is used recursively.
      */
     public boolean isRecursive() {
         return recursive;
     }
 
     /**
-     * Creates the caption for a PDF object.
-     * @param object    the object for which a caption has to be created.
-     * @return    a caption for a PDF object
-     */
-    public static String getCaption(PdfObject object) {
-        if (object == null)
-            return "null";
-        switch (object.type()) {
-        case PdfObject.INDIRECT:
-            {
-                String reffedCaption = getCaption( PdfReader.getPdfObject( object ) );
-                return object.toString() + " -> " + reffedCaption;
-            }
-        case PdfObject.ARRAY:
-            return "Array";
-        case PdfObject.STREAM:
-            return "Stream";
-        case PdfObject.STRING:
-            return ((PdfString)object).toUnicodeString();
-        }
-        return object.toString();
-    }
-
-    /**
-     * Creates the caption for an object that is a dictionary entry.
-     * @param dict    a dictionary
-     * @param key    a key in the dictionary
-     * @return    a caption for the object corresponding with the key in the dictionary.
+     * Set this to true if the object is a reference to a node higher up in the tree.
+     *
+     * @param recursive true if the object is indirect and recursive
      */
-    public static String getDictionaryEntryCaption(PdfDictionary dict, PdfName key) {
-        StringBuilder buf = new StringBuilder(key.toString());
-        buf.append(": ");
-        PdfObject valObj = dict.get(key);
-        if (valObj.isIndirect()) {
-            buf.append( getCaption( valObj ) );
-        } else {
-            buf.append(dict.get(key).toString());
-        }
-        return buf.toString();
+    public void setRecursive(boolean recursive) {
+        this.recursive = recursive;
     }
 
     /**
-     * Gets the tree path of an ancestor.
-     * This only works with recursive references
-     * @return    the treepath to an ancestor
+     * Gets the tree path of an ancestor. This only works with recursive references
+     *
+     * @return the treepath to an ancestor
      */
     public PdfObjectTreeNode getAncestor() {
         if (isRecursive()) {
             PdfObjectTreeNode node = this;
-            while(true) {
-                node = (PdfObjectTreeNode)node.getParent();
+            while (true) {
+                node = (PdfObjectTreeNode) node.getParent();
                 if (node.isIndirectReference() && node.getNumber() == getNumber()) {
                     return node;
                 }
@@ -282,7 +312,4 @@ public PdfObjectTreeNode getAncestor() {
         }
         return null;
     }
-
-    /** a serial version UID. */
-    private static final long serialVersionUID = -5617844659397445879L;
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfPageTreeNode.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfPageTreeNode.java
index c37209890..b4b8097d8 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfPageTreeNode.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfPageTreeNode.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -26,14 +26,18 @@
  * A tree node corresponding with a Page dictionary in a PDF file.
  */
 public class PdfPageTreeNode extends PdfObjectTreeNode {
+
+    /**
+     * A serial version uid
+     */
+    private static final long serialVersionUID = 3747496604295843783L;
+
     /**
      * Creates a tree node for a Pages dictionary.
-     * @param    object    a PdfDictionary of type pages.
+     *
+     * @param object a PdfDictionary of type pages.
      */
     public PdfPageTreeNode(PdfDictionary object) {
         super("page.png", object);
     }
-    
-    /**    A serial version uid */
-    private static final long serialVersionUID = 3747496604295843783L;
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfPagesTreeNode.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfPagesTreeNode.java
index 35e51e123..ba07183f4 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfPagesTreeNode.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfPagesTreeNode.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -26,14 +26,18 @@
  * A tree node corresponding with a Pages dictionary in a PDF file.
  */
 public class PdfPagesTreeNode extends PdfObjectTreeNode {
+
+    /**
+     * a serial version uid
+     */
+    private static final long serialVersionUID = 4527774449030791503L;
+
     /**
      * Creates a tree node for a Pages dictionary.
-     * @param    object    a PdfDictionary of type pages.
+     *
+     * @param object a PdfDictionary of type pages.
      */
     public PdfPagesTreeNode(PdfDictionary object) {
         super("pages.png", object);
     }
-
-    /** a serial version uid */
-    private static final long serialVersionUID = 4527774449030791503L;
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfTrailerTreeNode.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfTrailerTreeNode.java
index 0669e5e27..e62b844df 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfTrailerTreeNode.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/PdfTrailerTreeNode.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -23,11 +23,15 @@
 import com.lowagie.text.pdf.PdfDictionary;
 
 /**
- * A special treenode that will be used for the trailer dictionary
- * of a PDF file.
+ * A special treenode that will be used for the trailer dictionary of a PDF file.
  */
 public class PdfTrailerTreeNode extends PdfObjectTreeNode {
 
+    /**
+     * A serial version id.
+     */
+    private static final long serialVersionUID = -3607980103983635182L;
+
     /**
      * Constructs a simple text tree node.
      */
@@ -38,13 +42,11 @@ public PdfTrailerTreeNode() {
 
     /**
      * Sets the object for this node.
-     * @param trailer    the trailer dictionary of a PDF file.
+     *
+     * @param trailer the trailer dictionary of a PDF file.
      */
     public void setTrailer(PdfDictionary trailer) {
         object = trailer;
     }
 
-    /** A serial version id. */
-    private static final long serialVersionUID = -3607980103983635182L;
-
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/XdpTreeNode.java b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/XdpTreeNode.java
index 41c9bf620..b177cf733 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/XdpTreeNode.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/itext/treenodes/XdpTreeNode.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,8 +20,9 @@
 
 package com.lowagie.rups.view.itext.treenodes;
 
+import com.lowagie.rups.view.icons.IconFetcher;
+import com.lowagie.rups.view.icons.IconTreeNode;
 import java.util.List;
-
 import org.dom4j.Attribute;
 import org.dom4j.Branch;
 import org.dom4j.Comment;
@@ -32,22 +33,22 @@
 import org.dom4j.ProcessingInstruction;
 import org.dom4j.Text;
 
-import com.lowagie.rups.view.icons.IconFetcher;
-import com.lowagie.rups.view.icons.IconTreeNode;
-
 public class XdpTreeNode extends IconTreeNode {
 
-    /** A serial version UID. */
+    /**
+     * A serial version UID.
+     */
     private static final long serialVersionUID = -6431790925424045933L;
 
     /**
      * Constructs an XdpTreeNode
-     * @param node    the XML node
+     *
+     * @param node the XML node
      */
     public XdpTreeNode(Node node) {
         super(null, node);
         if (node instanceof Element) {
-            Element element = (Element)node;
+            Element element = (Element) node;
             addChildNodes(element.attributes());
         }
         if (node instanceof Branch) {
@@ -76,24 +77,28 @@ public XdpTreeNode(Node node) {
     private void addChildNodes(List list) {
         for (Object o : list) {
             Node n = (Node) o;
-            if (n instanceof Namespace) continue;
-            if (n instanceof Comment) continue;
+            if (n instanceof Namespace) {
+                continue;
+            }
+            if (n instanceof Comment) {
+                continue;
+            }
             this.add(new XdpTreeNode(n));
         }
     }
 
     public Node getNode() {
-        return (Node)getUserObject();
+        return (Node) getUserObject();
     }
-    
+
     public String toString() {
         Node node = getNode();
         if (node instanceof Element) {
-            Element e = (Element)node;
+            Element e = (Element) node;
             return e.getName();
         }
         if (node instanceof Attribute) {
-            Attribute a = (Attribute)node;
+            Attribute a = (Attribute) node;
             StringBuilder buf = new StringBuilder();
             buf.append(a.getName());
             buf.append("=\"");
@@ -102,11 +107,11 @@ public String toString() {
             return buf.toString();
         }
         if (node instanceof Text) {
-            Text t = (Text)node;
+            Text t = (Text) node;
             return t.getText();
         }
         if (node instanceof ProcessingInstruction) {
-            ProcessingInstruction pi = (ProcessingInstruction)node;
+            ProcessingInstruction pi = (ProcessingInstruction) node;
             StringBuilder buf = new StringBuilder("".getBytes();
-    
     /**
-     * Creates the root node of the XFA tree.
-     * This will be a child of the FormTree root node.
-     * @param    xfa    the XFA node in the PdfTree (a child of the AcroForm node in the PDF catalog)
+     * A serial version UID.
+     */
+    private static final long serialVersionUID = 2463297568233643790L;
+
+    /**
+     * Creates the root node of the XFA tree. This will be a child of the FormTree root node.
+     *
+     * @param xfa the XFA node in the PdfTree (a child of the AcroForm node in the PDF catalog)
      */
     public XfaTreeNode(PdfObjectTreeNode xfa) {
         super(xfa);
     }
-    
+
     /**
-     * Writes (part of) the XFA resource to an OutputStream.
-     * If key is null, the complete resource is written;
-     * if key refers to an individual package, this package only is
-     * written to the OutputStream.
-     * @param os    the OutputStream to which the XML is written.
-     * @throws IOException    usual exception when there's a problem writing to an OutputStream
+     * Writes (part of) the XFA resource to an OutputStream. If key is null, the complete resource is
+     * written; if key refers to an individual package, this package only is written to the OutputStream.
+     *
+     * @param os the OutputStream to which the XML is written.
+     * @throws IOException usual exception when there's a problem writing to an OutputStream
      */
     public void writeTo(OutputStream os) throws IOException {
         Enumeration children = this.children();
@@ -72,12 +79,12 @@ public void writeTo(OutputStream os) throws IOException {
                 os.write(BOUNDARY_START);
                 os.write(key.getBytes());
                 os.write(BOUNDARY_MIDDLE);
-                tmp = (String)node.getUserObject();
+                tmp = (String) node.getUserObject();
                 os.write(tmp.getBytes());
                 os.write(BOUNDARY_END);
             }
             key = tmp;
-            stream = (PRStream)node.getCorrespondingPdfObjectNode().getPdfObject();
+            stream = (PRStream) node.getCorrespondingPdfObjectNode().getPdfObject();
             os.write(PdfReader.getStreamBytes(stream));
         }
         os.flush();
@@ -85,19 +92,16 @@ public void writeTo(OutputStream os) throws IOException {
     }
 
     /**
-     * Adds a child node to the XFA root.
-     * The child node either corresponds with the complete XDP stream
-     * (if the XFA root only has one child) or with individual packet. 
-     * @param key    the name of the packet
-     * @param value    the corresponding stream node in the PdfTree
+     * Adds a child node to the XFA root. The child node either corresponds with the complete XDP stream (if the XFA
+     * root only has one child) or with individual packet.
+     *
+     * @param key   the name of the packet
+     * @param value the corresponding stream node in the PdfTree
      */
     public void addPacket(String key, PdfObjectTreeNode value) {
         FormTreeNode node = new FormTreeNode(value);
         node.setUserObject(key);
         this.add(node);
     }
-    
-    /** A serial version UID. */
-    private static final long serialVersionUID = 2463297568233643790L;
 
 }
\ No newline at end of file
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/models/DictionaryTableModel.java b/pdf-swing/src/main/java/com/lowagie/rups/view/models/DictionaryTableModel.java
index 5f2423df8..7762b6738 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/models/DictionaryTableModel.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/models/DictionaryTableModel.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,34 +20,39 @@
 
 package com.lowagie.rups.view.models;
 
-import java.util.ArrayList;
-
-import javax.swing.table.AbstractTableModel;
-
 import com.lowagie.text.pdf.PdfDictionary;
 import com.lowagie.text.pdf.PdfName;
+import java.util.ArrayList;
+import javax.swing.table.AbstractTableModel;
 
 /**
  * A TableModel in case we want to show a PDF dictionary in a JTable.
  */
 public class DictionaryTableModel extends AbstractTableModel {
 
-    /** A serial version UID. */
+    /**
+     * A serial version UID.
+     */
     private static final long serialVersionUID = -8835275996639701776L;
-    /** The PDF dictionary. */
+    /**
+     * The PDF dictionary.
+     */
     protected PdfDictionary dictionary;
-    /** An ArrayList with the dictionary keys. */
+    /**
+     * An ArrayList with the dictionary keys.
+     */
     protected ArrayList keys = new ArrayList<>();
 
     /**
      * Creates the TableModel.
+     *
      * @param dictionary the dictionary we want to show
      */
     public DictionaryTableModel(PdfDictionary dictionary) {
         this.dictionary = dictionary;
         this.keys.addAll(dictionary.getKeys());
     }
-    
+
     /**
      * @see javax.swing.table.TableModel#getColumnCount()
      */
@@ -67,12 +72,12 @@ public int getRowCount() {
      */
     public Object getValueAt(int rowIndex, int columnIndex) {
         switch (columnIndex) {
-        case 0:
-            return keys.get(rowIndex);
-        case 1:
-            return dictionary.get(keys.get(rowIndex));
-        default:
-            return null;
+            case 0:
+                return keys.get(rowIndex);
+            case 1:
+                return dictionary.get(keys.get(rowIndex));
+            default:
+                return null;
         }
     }
 
@@ -81,12 +86,12 @@ public Object getValueAt(int rowIndex, int columnIndex) {
      */
     public String getColumnName(int columnIndex) {
         switch (columnIndex) {
-        case 0:
-            return "Key";
-        case 1:
-            return "Value";
-        default:
-            return null;
+            case 0:
+                return "Key";
+            case 1:
+                return "Value";
+            default:
+                return null;
         }
     }
 
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/models/JTableAutoModel.java b/pdf-swing/src/main/java/com/lowagie/rups/view/models/JTableAutoModel.java
index e08df715b..eaa43ec25 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/models/JTableAutoModel.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/models/JTableAutoModel.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -23,54 +23,58 @@
 import javax.swing.table.AbstractTableModel;
 
 /**
- * A reusable TableModel class for tables that implement the
- * JTableAutoModelInterface.
+ * A reusable TableModel class for tables that implement the JTableAutoModelInterface.
  */
 public class JTableAutoModel extends AbstractTableModel {
-    
-    /** The serial version uid. */
+
+    /**
+     * The serial version uid.
+     */
     private static final long serialVersionUID = -2229431581745521537L;
-    /** The table that knows how to model itself. */
+    /**
+     * The table that knows how to model itself.
+     */
     protected JTableAutoModelInterface table;
 
     /**
      * Constructs an auto model for a JTable.
-     * @param    table    a JTable that knows information about its model.
+     *
+     * @param table a JTable that knows information about its model.
      */
     public JTableAutoModel(JTableAutoModelInterface table) {
         this.table = table;
     }
-    
+
     /**
-     * @see javax.swing.table.TableModel#getColumnCount()
      * @return int the number of columns
+     * @see javax.swing.table.TableModel#getColumnCount()
      */
     public int getColumnCount() {
         return table.getColumnCount();
     }
 
     /**
-     * @see javax.swing.table.TableModel#getRowCount()
      * @return int the number of rows
+     * @see javax.swing.table.TableModel#getRowCount()
      */
     public int getRowCount() {
         return table.getRowCount();
     }
 
     /**
-     * @see javax.swing.table.AbstractTableModel#getColumnName(int)
      * @param columnIndex a column number.
      * @return the name of the column
+     * @see javax.swing.table.AbstractTableModel#getColumnName(int)
      */
     public String getColumnName(int columnIndex) {
         return table.getColumnName(columnIndex);
     }
 
     /**
-     * @see javax.swing.table.TableModel#getValueAt(int, int)
-     * @param rowIndex int        a row number
+     * @param rowIndex    int        a row number
      * @param columnIndex int    a column number
      * @return Object    an object corresponding with a cell in the table
+     * @see javax.swing.table.TableModel#getValueAt(int, int)
      */
     public Object getValueAt(int rowIndex, int columnIndex) {
         return table.getValueAt(rowIndex, columnIndex);
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/models/JTableAutoModelInterface.java b/pdf-swing/src/main/java/com/lowagie/rups/view/models/JTableAutoModelInterface.java
index 43fff1ddf..c56fb5884 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/models/JTableAutoModelInterface.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/models/JTableAutoModelInterface.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -21,32 +21,35 @@
 package com.lowagie.rups.view.models;
 
 /**
- * Tables that contain the information necessary for creating their model
- * should implement this interface, so that they can use the JTableAutoModel
- * class as TableModel.
+ * Tables that contain the information necessary for creating their model should implement this interface, so that they
+ * can use the JTableAutoModel class as TableModel.
  */
 public interface JTableAutoModelInterface {
+
     /**
-     * @see javax.swing.table.TableModel#getColumnCount()
      * @return int the number of columns
+     * @see javax.swing.table.TableModel#getColumnCount()
      */
     int getColumnCount();
-     /**
-     * @see javax.swing.table.TableModel#getRowCount()
+
+    /**
      * @return int the number of rows
+     * @see javax.swing.table.TableModel#getRowCount()
      */
-     int getRowCount();
+    int getRowCount();
+
     /**
-     * @see javax.swing.table.AbstractTableModel#getColumnName(int)
      * @param columnIndex a column number.
      * @return the name of the column
+     * @see javax.swing.table.AbstractTableModel#getColumnName(int)
      */
     String getColumnName(int columnIndex);
+
     /**
-     * @see javax.swing.table.TableModel#getValueAt(int, int)
-     * @param rowIndex int        a row number
+     * @param rowIndex    int        a row number
      * @param columnIndex int    a column number
      * @return Object    an object corresponding with a cell in the table
+     * @see javax.swing.table.TableModel#getValueAt(int, int)
      */
     Object getValueAt(int rowIndex, int columnIndex);
 }
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/view/models/PdfArrayTableModel.java b/pdf-swing/src/main/java/com/lowagie/rups/view/models/PdfArrayTableModel.java
index 9b232c2fe..f89e11cc7 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/view/models/PdfArrayTableModel.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/view/models/PdfArrayTableModel.java
@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,28 +20,32 @@
 
 package com.lowagie.rups.view.models;
 
-import javax.swing.table.AbstractTableModel;
-
 import com.lowagie.text.pdf.PdfArray;
+import javax.swing.table.AbstractTableModel;
 
 /**
  * A TableModel in case we want to show a PDF array in a JTable.
  */
 public class PdfArrayTableModel extends AbstractTableModel {
-    
-    /** A serial version UID. */
+
+    /**
+     * A serial version UID.
+     */
     private static final long serialVersionUID = 4665485782853993708L;
-    /** The PDF array. */
+    /**
+     * The PDF array.
+     */
     protected PdfArray array;
 
     /**
      * Creates the TableModel.
+     *
      * @param array a PDF array
      */
     public PdfArrayTableModel(PdfArray array) {
         this.array = array;
     }
-    
+
     /**
      * @see javax.swing.table.TableModel#getColumnCount()
      */
@@ -61,10 +65,10 @@ public int getRowCount() {
      */
     public Object getValueAt(int rowIndex, int columnIndex) {
         switch (columnIndex) {
-        case 0:
-            return array.getPdfObject(rowIndex);
-        default:
-            return null;
+            case 0:
+                return array.getPdfObject(rowIndex);
+            default:
+                return null;
         }
     }
 
@@ -73,10 +77,10 @@ public Object getValueAt(int rowIndex, int columnIndex) {
      */
     public String getColumnName(int columnIndex) {
         switch (columnIndex) {
-        case 0:
-            return "Array";
-        default:
-            return null;
+            case 0:
+                return "Array";
+            default:
+                return null;
         }
     }
 
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/AbstractTool.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/AbstractTool.java
index 3465675d7..9ddf85f6c 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/AbstractTool.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/AbstractTool.java
@@ -35,22 +35,20 @@
 
 package com.lowagie.toolbox;
 
+import com.lowagie.toolbox.arguments.AbstractArgument;
+import com.lowagie.tools.Executable;
 import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.io.File;
 import java.util.ArrayList;
-
 import javax.swing.JInternalFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 
-import com.lowagie.toolbox.arguments.AbstractArgument;
-import com.lowagie.tools.Executable;
-
 /**
  * Every iText tool has to extend this abstract class.
  *
@@ -60,24 +58,38 @@
  */
 public abstract class AbstractTool implements ActionListener {
 
-    /** An array with the plugin_versions of the tool. */
-    public static ArrayList versionsarray = new ArrayList<>();
-
-    /** The internal frame of the tool. */
-    protected JInternalFrame internalFrame = null;
-    /** The list of arguments needed by the tool. */
-    protected ArrayList arguments = new ArrayList<>();
-    /** Execute menu options */
-    protected int menuoptions = MENU_EXECUTE;
-    /** a menu option */
+    /**
+     * a menu option
+     */
     public static final int MENU_EXECUTE = 1;
-    /** a menu option */
+    /**
+     * a menu option
+     */
     public static final int MENU_EXECUTE_SHOW = 2;
-    /** a menu option */
+    /**
+     * a menu option
+     */
     public static final int MENU_EXECUTE_PRINT = 4;
-    /** a menu option */
+    /**
+     * a menu option
+     */
     public static final int MENU_EXECUTE_PRINT_SILENT = 8;
-
+    /**
+     * An array with the plugin_versions of the tool.
+     */
+    public static ArrayList versionsarray = new ArrayList<>();
+    /**
+     * The internal frame of the tool.
+     */
+    protected JInternalFrame internalFrame = null;
+    /**
+     * The list of arguments needed by the tool.
+     */
+    protected ArrayList arguments = new ArrayList<>();
+    /**
+     * Execute menu options
+     */
+    protected int menuoptions = MENU_EXECUTE;
     /**
      * awtdesktop
      */
@@ -94,20 +106,23 @@ public AbstractTool() {
     }
 
     /**
-     * Sets the arguments.
-     * @param arguments The arguments to set.
+     * Add the version of the plugin to the plugin_versions array.
+     *
+     * @param version the version to add.
      */
-    public void setArguments(ArrayList arguments) {
-        this.arguments = arguments;
+    protected static void addVersion(String version) {
+        version = version.substring(5, version.length() - 2);
+        versionsarray.add(version);
     }
 
     /**
      * Sets the arguments.
+     *
      * @param args the arguments as String-array.
      */
     public void setMainArguments(String[] args) {
         int counter = 0;
-        for (AbstractArgument argument: arguments) {
+        for (AbstractArgument argument : arguments) {
             if (args.length > counter) {
                 argument.setValue(args[counter]);
             } else {
@@ -119,12 +134,22 @@ public void setMainArguments(String[] args) {
 
     /**
      * Gets the arguments.
+     *
      * @return Returns the arguments.
      */
     public ArrayList getArguments() {
         return arguments;
     }
 
+    /**
+     * Sets the arguments.
+     *
+     * @param arguments The arguments to set.
+     */
+    public void setArguments(ArrayList arguments) {
+        this.arguments = arguments;
+    }
+
     /**
      * Gets the value of a given argument.
      *
@@ -133,7 +158,7 @@ public ArrayList getArguments() {
      * @throws InstantiationException on error
      */
     public Object getValue(String name) throws InstantiationException {
-        for (AbstractArgument argument: arguments) {
+        for (AbstractArgument argument : arguments) {
             if (name.equals(argument.getName())) {
                 return argument.getArgument();
             }
@@ -141,20 +166,9 @@ public Object getValue(String name) throws InstantiationException {
         return null;
     }
 
-    /**
-     * Sets the internal frame.
-     * @param internalFrame The internalFrame to set.
-     */
-    public void setInternalFrame(JInternalFrame internalFrame) {
-        this.internalFrame = internalFrame;
-    }
-
-    public void setMenubar(JMenuBar menubar) {
-        this.menubar = menubar;
-    }
-
     /**
      * Returns the internal frame. Creates one if it's null.
+     *
      * @return Returns the internalFrame.
      */
     public JInternalFrame getInternalFrame() {
@@ -164,8 +178,18 @@ public JInternalFrame getInternalFrame() {
         return internalFrame;
     }
 
+    /**
+     * Sets the internal frame.
+     *
+     * @param internalFrame The internalFrame to set.
+     */
+    public void setInternalFrame(JInternalFrame internalFrame) {
+        this.internalFrame = internalFrame;
+    }
+
     /**
      * Gets the menubar.
+     *
      * @return a menubar for this tool
      */
     public JMenuBar getMenubar() {
@@ -210,7 +234,7 @@ public JMenuBar getMenubar() {
             JMenu params = new JMenu(ToolMenuItems.ARGUMENTS);
             tool.setMnemonic(KeyEvent.VK_T);
             JMenuItem item;
-            for (AbstractArgument argument: arguments) {
+            for (AbstractArgument argument : arguments) {
                 item = new JMenuItem(argument.getName());
                 item.setToolTipText(argument.getDescription());
                 item.addActionListener(argument);
@@ -220,19 +244,25 @@ public JMenuBar getMenubar() {
         }
         return menubar;
     }
+
+    public void setMenubar(JMenuBar menubar) {
+        this.menubar = menubar;
+    }
+
     /**
      * Gets the usage of the tool.
+     *
      * @return a String describing how to use the tool.
      */
     public String getUsage() {
         StringBuilder buf = new StringBuilder("java ");
         buf.append(getClass().getName());
-        for (AbstractArgument argument: arguments) {
+        for (AbstractArgument argument : arguments) {
             buf.append(' ');
             buf.append(argument.getName());
         }
         buf.append('\n');
-        for (AbstractArgument argument: arguments) {
+        for (AbstractArgument argument : arguments) {
             buf.append(argument.getUsage());
         }
         return buf.toString();
@@ -240,11 +270,12 @@ public String getUsage() {
 
     /**
      * Gets the current arguments of the tool.
+     *
      * @return a String with the list of arguments and their values.
      */
     private String getArgs() {
         StringBuilder buf = new StringBuilder("Current arguments:\n");
-        for (AbstractArgument argument: arguments) {
+        for (AbstractArgument argument : arguments) {
             buf.append("  ");
             buf.append(argument.getName());
             if (argument.getValue() == null) {
@@ -259,14 +290,13 @@ private String getArgs() {
     }
 
     /**
-     *
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      * @param evt ActionEvent
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
     public void actionPerformed(ActionEvent evt) {
         if (ToolMenuItems.CLOSE.equals(evt.getActionCommand())) {
             System.out.println("=== " + getInternalFrame().getTitle() +
-                               " CLOSED ===");
+                    " CLOSED ===");
             internalFrame.dispose();
         }
         if (ToolMenuItems.USAGE.equals(evt.getActionCommand())) {
@@ -282,7 +312,7 @@ public void actionPerformed(ActionEvent evt) {
             this.execute();
             try {
                 if (awtdesktop != null &&
-                    awtdesktop.isSupported(Desktop.Action.OPEN)) {
+                        awtdesktop.isSupported(Desktop.Action.OPEN)) {
                     awtdesktop.open(getDestPathPDF());
                 } else {
                     Executable.openDocument(getDestPathPDF());
@@ -295,7 +325,7 @@ public void actionPerformed(ActionEvent evt) {
             this.execute();
             try {
                 if (awtdesktop != null &&
-                    awtdesktop.isSupported(Desktop.Action.PRINT)) {
+                        awtdesktop.isSupported(Desktop.Action.PRINT)) {
                     awtdesktop.print(getDestPathPDF());
                 } else {
                     Executable.printDocument(getDestPathPDF());
@@ -316,6 +346,7 @@ public void actionPerformed(ActionEvent evt) {
 
     /**
      * Gets the PDF file that should be generated (or null if the output isn't a PDF file).
+     *
      * @return the PDF file that should be generated
      * @throws InstantiationException on error
      */
@@ -333,16 +364,8 @@ public void actionPerformed(ActionEvent evt) {
 
     /**
      * Indicates that the value of an argument has changed.
+     *
      * @param arg the argument that has changed
      */
     public abstract void valueHasChanged(AbstractArgument arg);
-
-    /**
-     * Add the version of the plugin to the plugin_versions array.
-     * @param version the version to add.
-     */
-    protected static void addVersion(String version) {
-        version = version.substring(5, version.length() - 2);
-        versionsarray.add(version);
-    }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/ToolMenuItems.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/ToolMenuItems.java
index a3da7fe69..46083f920 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/ToolMenuItems.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/ToolMenuItems.java
@@ -36,38 +36,65 @@
 
 /**
  * Keeps all the possible menuitems.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class ToolMenuItems {
 
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String FILE = "File";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String CLOSE = "Close";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String TOOLS = "Tools";
     public static final String FILELIST = "Filelist";
     public static final String VIEW = "View";
     public static final String RESET = "Reset";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String HELP = "Help";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String VERSION = "Version";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String ABOUT = "About";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String TOOL = "Tool";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String USAGE = "Usage";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String ARGUMENTS = "Arguments";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String EXECUTE = "Execute";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String EXECUTESHOW = "Execute+Open";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String EXECUTEPRINT = "Execute+Printdialog";
-    /** An item in the menubar. */
+    /**
+     * An item in the menubar.
+     */
     public static final String EXECUTEPRINTSILENT = "Execute+Print";
 
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/Toolbox.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/Toolbox.java
index 133b3cafe..7208da957 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/Toolbox.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/Toolbox.java
@@ -89,32 +89,28 @@ public class Toolbox extends JFrame implements ActionListener {
      * The DesktopPane of the toolbox.
      */
     private final JDesktopPane desktop;
+    /**
+     * toolarray
+     */
+    private final ArrayList toolarray = new ArrayList<>();
+    private final Vector menulist = new Vector<>();
+    private final Vector menuitemlist = new Vector<>();
     /**
      * The ConsolePane of the toolbox.
      */
     private JScrollPane console;
-
     /**
      * The list of tools in the toolbox.
      */
     private Properties toolmap = new Properties();
-
     /**
      * x-coordinate of the location of a new internal frame.
      */
     private int locationX = 0;
-
     /**
      * y-coordinate of the location of a new internal frame.
      */
     private int locationY = 0;
-    /**
-     * toolarray
-     */
-    private final ArrayList toolarray = new ArrayList<>();
-
-    private final Vector menulist = new Vector<>();
-    private final Vector menuitemlist = new Vector<>();
 
     /**
      * Constructs the Toolbox object.
@@ -182,11 +178,30 @@ public static void main(String[] args) {
                 System.arraycopy(args, 1, nargs, 0, args.length - 1);
                 tool.setMainArguments(nargs);
                 tool.execute();
-            } catch (PropertyVetoException | InstantiationException | IllegalAccessException | ClassNotFoundException ex) {
+            } catch (PropertyVetoException | InstantiationException | IllegalAccessException |
+                     ClassNotFoundException ex) {
             }
         }
     }
 
+    /**
+     * Centers a JFrame.
+     *
+     * @param f JFrame
+     */
+    public static void centerFrame(Frame f) {
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        Dimension frameSize = f.getSize();
+        if (frameSize.height > screenSize.height) {
+            frameSize.height = screenSize.height;
+        }
+        if (frameSize.width > screenSize.width) {
+            frameSize.width = screenSize.width;
+        }
+        f.setLocation((screenSize.width - frameSize.width) / 2,
+                (screenSize.height - frameSize.height) / 2);
+    }
+
     /**
      * Gets the menubar.
      *
@@ -317,24 +332,6 @@ public AbstractTool createFrame(String name) throws InstantiationException,
         return ti;
     }
 
-    /**
-     * Centers a JFrame.
-     *
-     * @param f JFrame
-     */
-    public static void centerFrame(Frame f) {
-        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        Dimension frameSize = f.getSize();
-        if (frameSize.height > screenSize.height) {
-            frameSize.height = screenSize.height;
-        }
-        if (frameSize.width > screenSize.width) {
-            frameSize.width = screenSize.width;
-        }
-        f.setLocation((screenSize.width - frameSize.width) / 2,
-                (screenSize.height - frameSize.height) / 2);
-    }
-
     /**
      * @param evt ActionEvent
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
@@ -393,28 +390,15 @@ public void actionPerformed(ActionEvent evt) {
         }
     }
 
+    public Vector getMenulist() {
+        return menulist;
+    }
+
     /**
      * A Class that redirects output to System.out and System.err.
      */
     public class Console {
 
-        class ErrorContext extends StyleContext {
-
-            private static final long serialVersionUID = 7766294638325167438L;
-            public static final String STDERROR = "Error";
-            public static final String STDOUT = "StdOut";
-
-            public ErrorContext() {
-                super();
-                Style root = getStyle(DEFAULT_STYLE);
-                Style s = addStyle(STDERROR, root);
-                StyleConstants.setForeground(s, Color.RED);
-                s = addStyle(STDOUT, root);
-                StyleConstants.setForeground(s, Color.BLACK);
-            }
-        }
-
-
         PipedInputStream piOut;
         PipedInputStream piErr;
         PipedOutputStream poOut;
@@ -451,6 +435,22 @@ public Console() throws IOException {
             new ReaderThread(piErr, ErrorContext.STDERROR).start();
         }
 
+        class ErrorContext extends StyleContext {
+
+            public static final String STDERROR = "Error";
+            public static final String STDOUT = "StdOut";
+            private static final long serialVersionUID = 7766294638325167438L;
+
+            public ErrorContext() {
+                super();
+                Style root = getStyle(DEFAULT_STYLE);
+                Style s = addStyle(STDERROR, root);
+                StyleConstants.setForeground(s, Color.RED);
+                s = addStyle(STDOUT, root);
+                StyleConstants.setForeground(s, Color.BLACK);
+            }
+        }
+
         class ReaderThread extends Thread {
 
             PipedInputStream pi;
@@ -486,9 +486,4 @@ public void run() {
             }
         }
     }
-
-
-    public Vector getMenulist() {
-        return menulist;
-    }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/Versions.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/Versions.java
index d411cd17a..ff50f9457 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/Versions.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/Versions.java
@@ -42,54 +42,73 @@
 
 package com.lowagie.toolbox;
 
+import com.lowagie.text.Document;
 import java.awt.BorderLayout;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Properties;
-
+import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.RowSorter;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableModel;
-
-import com.lowagie.text.Document;
-import javax.swing.ImageIcon;
-import javax.swing.RowSorter;
 import javax.swing.table.TableRowSorter;
 
 /**
  * JFrame that shows the plugin_versions of all the plugins.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Versions
-    extends JFrame {
+        extends JFrame {
 
-  /** The serial version UID of this class. */
-  private static final long serialVersionUID = 2925242862240301106L;
+    /**
+     * The serial version UID of this class.
+     */
+    private static final long serialVersionUID = 2925242862240301106L;
 
-  /** A label with info about the library, JVM,... */
-  JLabel library_versions = new JLabel();
+    /**
+     * A label with info about the library, JVM,...
+     */
+    JLabel library_versions = new JLabel();
 
-  /** The table with all the plug-ins (name, version and date).  */
-  JTable plugin_versions = new JTable();
+    /**
+     * The table with all the plug-ins (name, version and date).
+     */
+    JTable plugin_versions = new JTable();
 
-  /** A scrollpane for the plugin_versions table. */
-  JScrollPane scroll_versions = new JScrollPane();
+    /**
+     * A scrollpane for the plugin_versions table.
+     */
+    JScrollPane scroll_versions = new JScrollPane();
 
-  /** Constructs a Versions object. */
-  public Versions() {
-    super("Plugins and their version");
-    try {
-      initialize();
+    /**
+     * Constructs a Versions object.
+     */
+    public Versions() {
+        super("Plugins and their version");
+        try {
+            initialize();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
     }
-    catch (Exception ex) {
-      ex.printStackTrace();
+
+    /**
+     * Main method (test purposes only)
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Versions version = new Versions();
+        version.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        version.setVisible(true);
     }
-  }
 
     /**
      * Initialization of the jFrame.
@@ -97,38 +116,39 @@ public Versions() {
      * @throws Exception
      */
     private void initialize() throws Exception {
-    this.getContentPane().setLayout(new BorderLayout());
-    scroll_versions.setViewportView(plugin_versions);
-    library_versions.setIcon(new ImageIcon(Versions.class.getResource(
-        "1t3xt.gif")));
-    this.getContentPane().add(library_versions, BorderLayout.NORTH);
-    this.getContentPane().add(scroll_versions, BorderLayout.CENTER);
-    Properties properties = System.getProperties();
-    Runtime runtime = Runtime.getRuntime();
-    StringBuilder sb = new StringBuilder();
-    sb.append("");
-    sb.append("
              iTexttoolbox version: ").append(Versions.class.getPackage().getImplementationVersion()).append("
              ");
-    sb.append("
              iText version: ").append(Document.getVersion()).append("
              ");
-    sb.append("
              java.version: ").append(properties.getProperty("java.version")).append("
              ");
-    sb.append("
              java.vendor: ").append(properties.getProperty("java.vendor")).append("
              ");
-    sb.append("
              java.home: ").append(properties.getProperty("java.home")).append("
              ");
-    sb.append("
              java.freeMemory: ").append(runtime.freeMemory()).append(" bytes").append("
              ");
-    sb.append("
              java.totalMemory: ").append(runtime.totalMemory()).append(" bytes").append("
              ");
-    sb.append("
              user.home: ").append(properties.getProperty("user.home")).append("
              ");
-    sb.append("
              os.name: ").append(properties.getProperty("os.name")).append("
              ");
-    sb.append("
              os.arch: ").append(properties.getProperty("os.arch")).append("
              ");
-    sb.append("
              os.version: ").append(properties.getProperty("os.version")).append("
              ");
-    sb.append("");
-    library_versions.setText(sb.toString());
-
-    TableModel model = getVersionTableModel(AbstractTool.versionsarray);
-    RowSorter sorter =
-            new TableRowSorter<>(model);
-    plugin_versions.setRowSorter(sorter);
-    plugin_versions.setModel(model);
-
-    pack();
-  }
+        this.getContentPane().setLayout(new BorderLayout());
+        scroll_versions.setViewportView(plugin_versions);
+        library_versions.setIcon(new ImageIcon(Versions.class.getResource(
+                "1t3xt.gif")));
+        this.getContentPane().add(library_versions, BorderLayout.NORTH);
+        this.getContentPane().add(scroll_versions, BorderLayout.CENTER);
+        Properties properties = System.getProperties();
+        Runtime runtime = Runtime.getRuntime();
+        StringBuilder sb = new StringBuilder();
+        sb.append("");
+        sb.append("
              iTexttoolbox version: ").append(Versions.class.getPackage().getImplementationVersion())
+                .append("
              ");
+        sb.append("
              iText version: ").append(Document.getVersion()).append("
              ");
+        sb.append("
              java.version: ").append(properties.getProperty("java.version")).append("
              ");
+        sb.append("
              java.vendor: ").append(properties.getProperty("java.vendor")).append("
              ");
+        sb.append("
              java.home: ").append(properties.getProperty("java.home")).append("
              ");
+        sb.append("
              java.freeMemory: ").append(runtime.freeMemory()).append(" bytes").append("
              ");
+        sb.append("
              java.totalMemory: ").append(runtime.totalMemory()).append(" bytes").append("
              ");
+        sb.append("
              user.home: ").append(properties.getProperty("user.home")).append("
              ");
+        sb.append("
              os.name: ").append(properties.getProperty("os.name")).append("
              ");
+        sb.append("
              os.arch: ").append(properties.getProperty("os.arch")).append("
              ");
+        sb.append("
              os.version: ").append(properties.getProperty("os.version")).append("
              ");
+        sb.append("");
+        library_versions.setText(sb.toString());
+
+        TableModel model = getVersionTableModel(AbstractTool.versionsarray);
+        RowSorter sorter =
+                new TableRowSorter<>(model);
+        plugin_versions.setRowSorter(sorter);
+        plugin_versions.setModel(model);
+
+        pack();
+    }
 
     /**
      * Returns the TableModel implementation that will be used to show the plugin_versions.
@@ -137,86 +157,74 @@ private void initialize() throws Exception {
      * @return TableModel
      */
     public TableModel getVersionTableModel(final ArrayList versionsarray) {
-    return new AbstractTableModel() {
-
-      private static final long serialVersionUID = 5105003782164682777L;
-
-      public int getColumnCount() {
-        return 4;
-      }
-
-      public int getRowCount() {
-        return versionsarray.size();
-      }
-
-      public Object getValueAt(int rowIndex, int columnIndex) {
-        String dummy;
-        switch (columnIndex) {
-          case 0:
-            dummy = versionsarray.get(rowIndex);
-            return dummy.split(".java")[0];
-          case 1:
-            dummy = versionsarray.get(rowIndex);
-            return dummy.split(" ")[1];
-          case 2:
-            DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            dummy = versionsarray.get(rowIndex);
-            try {
-              return df.parse(dummy.split(" ")[2] + " "
-                              + dummy.split(" ")[3]);
+        return new AbstractTableModel() {
+
+            private static final long serialVersionUID = 5105003782164682777L;
+
+            public int getColumnCount() {
+                return 4;
             }
-            catch (ParseException ex) {
-              return null;
+
+            public int getRowCount() {
+                return versionsarray.size();
             }
-            case 3:
-              dummy = versionsarray.get(rowIndex);
-              return dummy.split(" ")[4];
 
-        }
-        return versionsarray;
-      }
-
-      public String getColumnName(int column) {
-        switch (column) {
-          case 0:
-            return "Name";
-          case 1:
-            return "Version";
-          case 2:
-            return "Changed";
-          case 3:
-            return "ChangeBy";
-          default:
-            return "";
-        }
-      }
-
-      public Class getColumnClass(int column) {
-        switch (column) {
-          case 0:
-            return String.class;
-          case 1:
-            return String.class;
-          case 2:
-            return java.util.Date.class;
-          case 3:
-            return String.class;
-          default:
-            return null;
-        }
-      }
-    };
+            public Object getValueAt(int rowIndex, int columnIndex) {
+                String dummy;
+                switch (columnIndex) {
+                    case 0:
+                        dummy = versionsarray.get(rowIndex);
+                        return dummy.split(".java")[0];
+                    case 1:
+                        dummy = versionsarray.get(rowIndex);
+                        return dummy.split(" ")[1];
+                    case 2:
+                        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        dummy = versionsarray.get(rowIndex);
+                        try {
+                            return df.parse(dummy.split(" ")[2] + " "
+                                    + dummy.split(" ")[3]);
+                        } catch (ParseException ex) {
+                            return null;
+                        }
+                    case 3:
+                        dummy = versionsarray.get(rowIndex);
+                        return dummy.split(" ")[4];
+
+                }
+                return versionsarray;
+            }
 
-  }
+            public String getColumnName(int column) {
+                switch (column) {
+                    case 0:
+                        return "Name";
+                    case 1:
+                        return "Version";
+                    case 2:
+                        return "Changed";
+                    case 3:
+                        return "ChangeBy";
+                    default:
+                        return "";
+                }
+            }
 
-    /**
-     * Main method (test purposes only)
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-    Versions version = new Versions();
-    version.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-    version.setVisible(true);
-  }
+            public Class getColumnClass(int column) {
+                switch (column) {
+                    case 0:
+                        return String.class;
+                    case 1:
+                        return String.class;
+                    case 2:
+                        return java.util.Date.class;
+                    case 3:
+                        return String.class;
+                    default:
+                        return null;
+                }
+            }
+        };
+
+    }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/AbstractArgument.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/AbstractArgument.java
index a7d1cb44b..db269a429 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/AbstractArgument.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/AbstractArgument.java
@@ -1,35 +1,45 @@
 package com.lowagie.toolbox.arguments;
 
-import java.beans.PropertyChangeSupport;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
 import com.lowagie.toolbox.AbstractTool;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
 
 /**
  * @since 2.1.1 (imported from itexttoolbox project)
  */
-public abstract class AbstractArgument implements ActionListener, PropertyChangeListener{
-    public AbstractArgument() {
-    }
-    public AbstractArgument(AbstractTool tool, String name, String description, Object value) {
-            this.tool = tool;
-            this.name = name;
-            this.description = description;
-            this.value=value;
-    }
+public abstract class AbstractArgument implements ActionListener, PropertyChangeListener {
+
     protected PropertyChangeSupport pcs = new PropertyChangeSupport(this);
-    /** value of the argument. */
+    /**
+     * value of the argument.
+     */
     protected Object value = null;
-    /** short name for the argument. */
+    /**
+     * short name for the argument.
+     */
     protected String name;
-    /** reference to the internal frame */
+    /**
+     * reference to the internal frame
+     */
     protected AbstractTool tool;
-    /** describes the argument. */
+    /**
+     * describes the argument.
+     */
     protected String description;
+
+    public AbstractArgument() {
+    }
+
+    public AbstractArgument(AbstractTool tool, String name, String description, Object value) {
+        this.tool = tool;
+        this.name = name;
+        this.description = description;
+        this.value = value;
+    }
+
     protected synchronized void firePropertyChange(PropertyChangeEvent evt) {
         pcs.firePropertyChange(evt);
     }
@@ -50,7 +60,16 @@ public Object getValue() {
         return value;
     }
 
-
+    /**
+     * @param value The value to set.
+     */
+    public void setValue(Object value) {
+        Object oldvalue = this.value;
+        this.value = value;
+        tool.valueHasChanged(this);
+        this.firePropertyChange(new PropertyChangeEvent(this, name, oldvalue,
+                this.value));
+    }
 
     public void setValue(Object value, String propertyname) {
         Object oldvalue = this.value;
@@ -60,16 +79,6 @@ public void setValue(Object value, String propertyname) {
                 oldvalue, this.value));
     }
 
-
-
-    /**
-     * @param description
-     *            The description to set.
-     */
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     /**
      * @return Returns the description.
      */
@@ -78,11 +87,10 @@ public String getDescription() {
     }
 
     /**
-     * @param name
-     *            The name to set.
+     * @param description The description to set.
      */
-    public void setName(String name) {
-        this.name = name;
+    public void setDescription(String description) {
+        this.description = description;
     }
 
     /**
@@ -128,15 +136,10 @@ public String getName() {
     }
 
     /**
-     * @param value
-     *            The value to set.
+     * @param name The name to set.
      */
-    public void setValue(Object value) {
-        Object oldvalue = this.value;
-        this.value = value;
-        tool.valueHasChanged(this);
-        this.firePropertyChange(new PropertyChangeEvent(this, name, oldvalue,
-                this.value));
+    public void setName(String name) {
+        this.name = name;
     }
 
     public void propertyChange(PropertyChangeEvent evt) {
@@ -144,6 +147,7 @@ public void propertyChange(PropertyChangeEvent evt) {
     }
 
     public abstract void actionPerformed(ActionEvent e);
+
     /**
      * Returns a string representation of the object.
      *
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/BitsetArgument.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/BitsetArgument.java
index 499a9e891..0e911f7c5 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/BitsetArgument.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/BitsetArgument.java
@@ -35,30 +35,33 @@
 
 package com.lowagie.toolbox.arguments;
 
+import com.lowagie.toolbox.AbstractTool;
 import java.awt.event.ActionEvent;
-
 import javax.swing.JCheckBox;
 import javax.swing.JOptionPane;
 
-import com.lowagie.toolbox.AbstractTool;
-
 /**
  * Argument that results in a set of "1" and "0" values.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class BitsetArgument extends AbstractArgument {
-    /** These are the different options that can be true or false. */
+
+    /**
+     * These are the different options that can be true or false.
+     */
     private JCheckBox[] options;
 
     /**
      * Constructs an BitsetArgument.
-     * @param tool the tool that needs this argument
-     * @param name the name of the argument
+     *
+     * @param tool        the tool that needs this argument
+     * @param name        the name of the argument
      * @param description the description of the argument
-     * @param options the different options that can be true or false
+     * @param options     the different options that can be true or false
      */
     public BitsetArgument(AbstractTool tool, String name, String description,
-                          String[] options) {
+            String[] options) {
         super(tool, name, description, null);
         this.options = new JCheckBox[options.length];
         for (int i = 0; i < options.length; i++) {
@@ -67,9 +70,8 @@ public BitsetArgument(AbstractTool tool, String name, String description,
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.arguments.StringArgument#getUsage()
      * @return String
+     * @see com.lowagie.toolbox.arguments.StringArgument#getUsage()
      */
     public String getUsage() {
         StringBuilder buf = new StringBuilder(super.getUsage());
@@ -83,9 +85,8 @@ public String getUsage() {
     }
 
     /**
-     *
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      * @param evt ActionEvent
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
     public void actionPerformed(ActionEvent evt) {
         Object[] message = new Object[1 + options.length];
@@ -100,7 +101,7 @@ public void actionPerformed(ActionEvent evt) {
                 null,
                 null,
                 null
-                     );
+        );
         if (result == 0) {
             StringBuilder buf = new StringBuilder();
             for (JCheckBox option : options) {
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/ColorArgument.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/ColorArgument.java
index bd42f34ba..a88b18458 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/ColorArgument.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/ColorArgument.java
@@ -34,17 +34,16 @@
  */
 package com.lowagie.toolbox.arguments;
 
+import com.lowagie.toolbox.AbstractTool;
 import java.awt.Color;
 import java.awt.event.ActionEvent;
-
 import javax.swing.JColorChooser;
 
-import com.lowagie.toolbox.AbstractTool;
-
 /**
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class ColorArgument extends AbstractArgument {
+
     public ColorArgument() {
         super();
     }
@@ -70,12 +69,12 @@ public void actionPerformed(ActionEvent e) {
             initialColor = Color.decode(value.toString());
         }
         Color newColor = JColorChooser.showDialog(tool.getInternalFrame(),
-                                                  "Choose Color", initialColor);
+                "Choose Color", initialColor);
         setValue("0x"
-                 + Integer.toHexString(
-                         (newColor.getRed() << 16)
-                         | (newColor.getGreen() << 8)
-                         | (newColor.getBlue() << 0)).toUpperCase());
+                + Integer.toHexString(
+                (newColor.getRed() << 16)
+                        | (newColor.getGreen() << 8)
+                        | (newColor.getBlue() << 0)).toUpperCase());
     }
 
 
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FileArgument.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FileArgument.java
index 778cf9712..9656ecdbc 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FileArgument.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FileArgument.java
@@ -35,26 +35,32 @@
 
 package com.lowagie.toolbox.arguments;
 
+import com.lowagie.toolbox.AbstractTool;
+import com.lowagie.toolbox.arguments.filters.DirFilter;
+import com.lowagie.toolbox.swing.PdfInformationPanel;
 import java.awt.event.ActionEvent;
 import java.io.File;
-
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 
-import com.lowagie.toolbox.AbstractTool;
-import com.lowagie.toolbox.arguments.filters.DirFilter;
-import com.lowagie.toolbox.swing.PdfInformationPanel;
-
 /**
  * FileArgument class if the argument is a java.io.File.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class FileArgument extends AbstractArgument {
-    /** a filter to put on the FileChooser. */
+
+    /**
+     * a filter to put on the FileChooser.
+     */
     protected FileFilter filter;
-    /** indicates if the argument has to point to a new or an existing file. */
+    /**
+     * indicates if the argument has to point to a new or an existing file.
+     */
     protected boolean newFile;
-    /** the label */
+    /**
+     * the label
+     */
     PdfInformationPanel label = null;
 
     public FileArgument() {
@@ -64,14 +70,14 @@ public FileArgument() {
     /**
      * Constructs a FileArgument.
      *
-     * @param tool the tool that needs this argument
-     * @param name the name of the argument
+     * @param tool        the tool that needs this argument
+     * @param name        the name of the argument
      * @param description the description of the argument
-     * @param newFile makes the difference between an Open or Save dialog
-     * @param filter FileFilter
+     * @param newFile     makes the difference between an Open or Save dialog
+     * @param filter      FileFilter
      */
     public FileArgument(AbstractTool tool, String name, String description,
-                        boolean newFile, FileFilter filter) {
+            boolean newFile, FileFilter filter) {
         super(tool, name, description, null);
         this.newFile = newFile;
         this.filter = filter;
@@ -79,18 +85,20 @@ public FileArgument(AbstractTool tool, String name, String description,
 
     /**
      * Constructs a FileArgument.
-     * @param tool    the tool that needs this argument
-     * @param name    the name of the argument
-     * @param description    the description of the argument
-     * @param newFile        makes the difference between an Open or Save dialog
+     *
+     * @param tool        the tool that needs this argument
+     * @param name        the name of the argument
+     * @param description the description of the argument
+     * @param newFile     makes the difference between an Open or Save dialog
      */
     public FileArgument(AbstractTool tool, String name, String description,
-                        boolean newFile) {
+            boolean newFile) {
         this(tool, name, description, newFile, null);
     }
 
     /**
      * Gets the argument as an object.
+     *
      * @return an object
      * @throws InstantiationException if the specified key cannot be compared with the keys currently in the map
      */
@@ -106,9 +114,8 @@ public Object getArgument() throws InstantiationException {
     }
 
     /**
-     *
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      * @param e ActionEvent
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
     public void actionPerformed(ActionEvent e) {
         JFileChooser fc = new JFileChooser();
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FileArrayArgument.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FileArrayArgument.java
index a68b76dcf..b7bf405f3 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FileArrayArgument.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FileArrayArgument.java
@@ -34,19 +34,21 @@
  */
 package com.lowagie.toolbox.arguments;
 
+import com.lowagie.toolbox.AbstractTool;
+import com.lowagie.toolbox.swing.FileList;
 import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyVetoException;
 import java.io.File;
 
-import com.lowagie.toolbox.AbstractTool;
-import com.lowagie.toolbox.swing.FileList;
-
 
 /**
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class FileArrayArgument extends AbstractArgument {
+
+    FileList fileList1 = new FileList();
+
     public FileArrayArgument() {
         super();
         try {
@@ -65,6 +67,10 @@ public FileArrayArgument(AbstractTool tool, String name, String description) {
         }
     }
 
+    public static void main(String[] args) {
+        FileArrayArgument filearrayargument = new FileArrayArgument();
+    }
+
     public void actionPerformed(ActionEvent e) {
         fileList1.setLocation(10, 10);
         fileList1.setVisible(true);
@@ -81,7 +87,6 @@ public void actionPerformed(ActionEvent e) {
 //        }
     }
 
-
     public Object getArgument() throws InstantiationException {
         if (value == null) {
             return null;
@@ -93,15 +98,10 @@ public Object getArgument() throws InstantiationException {
         }
     }
 
-    public static void main(String[] args) {
-        FileArrayArgument filearrayargument = new FileArrayArgument();
-    }
-
     private void jbInit() throws Exception {
         fileList1.addPropertyChangeListener(this);
     }
 
-    FileList fileList1 = new FileList();
     public void propertyChange(PropertyChangeEvent evt) {
         String propertyname = evt.getPropertyName();
         if (propertyname.equals("filevector")) {
@@ -111,6 +111,7 @@ public void propertyChange(PropertyChangeEvent evt) {
             }
         }
     }
+
     /**
      * Returns a string representation of the object.
      *
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FloatArgument.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FloatArgument.java
index 3641b3a0b..095c25262 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FloatArgument.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/FloatArgument.java
@@ -34,15 +34,15 @@
  */
 package com.lowagie.toolbox.arguments;
 
-import java.awt.event.ActionEvent;
-
 import com.lowagie.toolbox.AbstractTool;
 import com.lowagie.toolbox.swing.CustomDialog;
+import java.awt.event.ActionEvent;
 
 /**
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class FloatArgument extends AbstractArgument {
+
     public FloatArgument() {
         super();
     }
@@ -57,8 +57,8 @@ public FloatArgument(AbstractTool tool, String name, String description) {
      * @param e ActionEvent
      */
     public void actionPerformed(ActionEvent e) {
-        CustomDialog cd=new CustomDialog("Enter a value for " + name +
-                                             ":",CustomDialog.instantiateFloatDocument());
-       setValue(cd.showInputDialog(this.getValue()==null?"0":this.getValue().toString()));
-   }
+        CustomDialog cd = new CustomDialog("Enter a value for " + name +
+                ":", CustomDialog.instantiateFloatDocument());
+        setValue(cd.showInputDialog(this.getValue() == null ? "0" : this.getValue().toString()));
+    }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/ImageArgument.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/ImageArgument.java
index 868955af2..ade9434c6 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/ImageArgument.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/ImageArgument.java
@@ -35,41 +35,45 @@
 
 package com.lowagie.toolbox.arguments;
 
-import java.awt.event.ActionEvent;
-
-import javax.swing.JFileChooser;
-import javax.swing.filechooser.FileFilter;
-
 import com.lowagie.text.Image;
 import com.lowagie.toolbox.AbstractTool;
 import com.lowagie.toolbox.arguments.filters.ImageFilter;
+import java.awt.event.ActionEvent;
+import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileFilter;
 
 /**
  * StringArgument class if the argument is a com.lowagie.text.Image.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class ImageArgument extends AbstractArgument {
-    /** a filter to put on the FileChooser. */
+
+    /**
+     * a filter to put on the FileChooser.
+     */
     private FileFilter filter;
 
     /**
      * Constructs a FileArgument.
-     * @param tool    the tool that needs this argument
-     * @param name    the name of the argument
-     * @param description    the description of the argument
-     * @param filter        a custom filter
+     *
+     * @param tool        the tool that needs this argument
+     * @param name        the name of the argument
+     * @param description the description of the argument
+     * @param filter      a custom filter
      */
     public ImageArgument(AbstractTool tool, String name, String description,
-                         FileFilter filter) {
+            FileFilter filter) {
         super(tool, name, description, null);
         this.filter = filter;
     }
 
     /**
      * Constructs a FileArgument.
-     * @param tool    the tool that needs this argument
-     * @param name    the name of the argument
-     * @param description    the description of the argument
+     *
+     * @param tool        the tool that needs this argument
+     * @param name        the name of the argument
+     * @param description the description of the argument
      */
     public ImageArgument(AbstractTool tool, String name, String description) {
         this(tool, name, description, new ImageFilter());
@@ -77,6 +81,7 @@ public ImageArgument(AbstractTool tool, String name, String description) {
 
     /**
      * Gets the argument as an object.
+     *
      * @return an object
      * @throws InstantiationException if the specified key cannot be compared with the keys currently in the map
      */
@@ -92,9 +97,8 @@ public Object getArgument() throws InstantiationException {
     }
 
     /**
-     *
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      * @param e ActionEvent
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
     public void actionPerformed(ActionEvent e) {
         JFileChooser fc = new JFileChooser();
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/IntegerArgument.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/IntegerArgument.java
index 855fb27d2..df0e16d2c 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/IntegerArgument.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/IntegerArgument.java
@@ -35,44 +35,42 @@
 
 package com.lowagie.toolbox.arguments;
 
-import java.awt.event.ActionEvent;
-
 import com.lowagie.toolbox.AbstractTool;
 import com.lowagie.toolbox.swing.CustomDialog;
+import java.awt.event.ActionEvent;
 
 /**
  * This is an argument of one of the tools in the toolbox.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class IntegerArgument extends AbstractArgument {
 
-    /** Constructs a IntegerArgument. */
+    /**
+     * Constructs a IntegerArgument.
+     */
     public IntegerArgument() {
     }
 
     /**
      * Constructs a IntegerArgument.
      *
-     * @param tool
-     *            the tool that needs this argument
-     * @param name
-     *            the name of the argument
-     * @param description
-     *            the description of the argument
+     * @param tool        the tool that needs this argument
+     * @param name        the name of the argument
+     * @param description the description of the argument
      */
     public IntegerArgument(AbstractTool tool, String name, String description) {
         super(tool, name, description, null);
     }
 
     /**
-     *
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      * @param e ActionEvent
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
     public void actionPerformed(ActionEvent e) {
         CustomDialog cd = new CustomDialog("Enter a value for " + name +
-                                           ":",
-                                           CustomDialog.instantiateIntegerDocument());
-        setValue(cd.showInputDialog(this.getValue()==null?"0":this.getValue().toString()));
+                ":",
+                CustomDialog.instantiateIntegerDocument());
+        setValue(cd.showInputDialog(this.getValue() == null ? "0" : this.getValue().toString()));
     }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/OptionArgument.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/OptionArgument.java
index 985dfdc2b..4e6764479 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/OptionArgument.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/OptionArgument.java
@@ -35,98 +35,27 @@
 
 package com.lowagie.toolbox.arguments;
 
+import com.lowagie.toolbox.AbstractTool;
 import java.awt.event.ActionEvent;
 import java.util.TreeMap;
 import javax.swing.JComboBox;
 import javax.swing.JOptionPane;
 
-import com.lowagie.toolbox.AbstractTool;
-
 /**
  * Argument that can be one of several options.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class OptionArgument extends AbstractArgument {
 
-    /**
-     * An Entry that can be chosen as option.
-     */
-    public class Entry {
-        /** Describes the option. */
-        private Object description;
-        /** Holds the actual value of the option. */
-        private Object value;
-        /**
-         * Constructs an entry.
-         * @param value the value of the entry (that will be identical to the description)
-         */
-        public Entry(Object value) {
-            this.value = value;
-            this.description = value;
-        }
-
-        /**
-         * Constructs an entry.
-         * @param description the description of the entry
-         * @param value the value of the entry
-         */
-        public Entry(Object description, Object value) {
-            this.description = description;
-            this.value = value;
-        }
-
-        /**
-         * String representation of the Entry.
-         * @return a description of the entry
-         */
-        public String toString() {
-            return description.toString();
-        }
-
-        /**
-         * Gets the value of the String.
-         * @return the toString of the value
-         */
-        public String getValueToString() {
-            return value.toString();
-        }
-
-        /**
-         * @return Returns the description.
-         */
-        public Object getDescription() {
-            return description;
-        }
-
-        /**
-         * @param description The description to set.
-         */
-        public void setDescription(Object description) {
-            this.description = description;
-        }
-
-        /**
-         * @return Returns the value.
-         */
-        public Object getValue() {
-            return value;
-        }
-
-        /**
-         * @param value The value to set.
-         */
-        public void setValue(Object value) {
-            this.value = value;
-        }
-    }
-
-
     private TreeMap options = new TreeMap<>();
 
+
     /**
      * Constructs an OptionArgument.
-     * @param tool the tool that needs this argument
-     * @param name the name of the argument
+     *
+     * @param tool        the tool that needs this argument
+     * @param name        the name of the argument
      * @param description the description of the argument
      */
     public OptionArgument(AbstractTool tool, String name, String description) {
@@ -136,8 +65,9 @@ public OptionArgument(AbstractTool tool, String name, String description) {
 
     /**
      * Adds an Option.
+     *
      * @param description the description of the option
-     * @param value the value of the option
+     * @param value       the value of the option
      */
     public void addOption(Object description, Object value) {
         options.put(value.toString(), new Entry(description, value));
@@ -145,6 +75,7 @@ public void addOption(Object description, Object value) {
 
     /**
      * Gets the argument as an object.
+     *
      * @return an object
      * @throws InstantiationException if the specified key cannot be compared with the keys currently in the map
      */
@@ -160,14 +91,13 @@ public Object getArgument() throws InstantiationException {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.arguments.StringArgument#getUsage()
      * @return String
+     * @see com.lowagie.toolbox.arguments.StringArgument#getUsage()
      */
     public String getUsage() {
         StringBuilder buf = new StringBuilder(super.getUsage());
         buf.append("    possible options:\n");
-        for (Entry entry: options.values()) {
+        for (Entry entry : options.values()) {
             buf.append("    - ");
             buf.append(entry.getValueToString());
             buf.append(": ");
@@ -178,15 +108,14 @@ public String getUsage() {
     }
 
     /**
-     *
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      * @param evt ActionEvent
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
     public void actionPerformed(ActionEvent evt) {
         Object[] message = new Object[2];
         message[0] = "Choose one of the following options:";
         JComboBox cb = new JComboBox<>();
-        for (Entry entry: options.values()) {
+        for (Entry entry : options.values()) {
             cb.addItem(entry);
         }
         message[1] = cb;
@@ -199,10 +128,92 @@ public void actionPerformed(ActionEvent evt) {
                 null,
                 null,
                 null
-                     );
+        );
         if (result == 0) {
             Entry entry = (Entry) cb.getSelectedItem();
             setValue(entry.getValueToString());
         }
     }
+
+    /**
+     * An Entry that can be chosen as option.
+     */
+    public class Entry {
+
+        /**
+         * Describes the option.
+         */
+        private Object description;
+        /**
+         * Holds the actual value of the option.
+         */
+        private Object value;
+
+        /**
+         * Constructs an entry.
+         *
+         * @param value the value of the entry (that will be identical to the description)
+         */
+        public Entry(Object value) {
+            this.value = value;
+            this.description = value;
+        }
+
+        /**
+         * Constructs an entry.
+         *
+         * @param description the description of the entry
+         * @param value       the value of the entry
+         */
+        public Entry(Object description, Object value) {
+            this.description = description;
+            this.value = value;
+        }
+
+        /**
+         * String representation of the Entry.
+         *
+         * @return a description of the entry
+         */
+        public String toString() {
+            return description.toString();
+        }
+
+        /**
+         * Gets the value of the String.
+         *
+         * @return the toString of the value
+         */
+        public String getValueToString() {
+            return value.toString();
+        }
+
+        /**
+         * @return Returns the description.
+         */
+        public Object getDescription() {
+            return description;
+        }
+
+        /**
+         * @param description The description to set.
+         */
+        public void setDescription(Object description) {
+            this.description = description;
+        }
+
+        /**
+         * @return Returns the value.
+         */
+        public Object getValue() {
+            return value;
+        }
+
+        /**
+         * @param value The value to set.
+         */
+        public void setValue(Object value) {
+            this.value = value;
+        }
+    }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/PageSizeArgument.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/PageSizeArgument.java
index f2749793c..e07688359 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/PageSizeArgument.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/PageSizeArgument.java
@@ -35,17 +35,17 @@
 
 package com.lowagie.toolbox.arguments;
 
+import com.lowagie.text.PageSize;
+import com.lowagie.toolbox.AbstractTool;
 import java.awt.event.ActionEvent;
 import java.lang.reflect.Field;
 import java.util.TreeMap;
 import javax.swing.JComboBox;
 import javax.swing.JOptionPane;
 
-import com.lowagie.text.PageSize;
-import com.lowagie.toolbox.AbstractTool;
-
 /**
  * Argument that can be one of several options.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class PageSizeArgument extends OptionArgument {
@@ -55,12 +55,9 @@ public class PageSizeArgument extends OptionArgument {
     /**
      * Constructs an OptionArgument.
      *
-     * @param tool
-     *            the tool that needs this argument
-     * @param name
-     *            the name of the argument
-     * @param description
-     *            the description of the argument
+     * @param tool        the tool that needs this argument
+     * @param name        the name of the argument
+     * @param description the description of the argument
      */
     public PageSizeArgument(AbstractTool tool, String name, String description) {
         super(tool, name, description);
@@ -77,8 +74,9 @@ public PageSizeArgument(AbstractTool tool, String name, String description) {
 
     /**
      * Adds an Option.
+     *
      * @param description the description of the option
-     * @param value the value of the option
+     * @param value       the value of the option
      */
     public void addOption(String description, String value) {
         options.put(description, value);
@@ -86,6 +84,7 @@ public void addOption(String description, String value) {
 
     /**
      * Gets the options.
+     *
      * @return Returns the options.
      */
     public TreeMap getOptions() {
@@ -94,6 +93,7 @@ public TreeMap getOptions() {
 
     /**
      * Gets the argument as an object.
+     *
      * @return an object
      * @throws InstantiationException if the key can't be compared with the other ones in the map
      */
@@ -109,9 +109,8 @@ public Object getArgument() throws InstantiationException {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.arguments.StringArgument#getUsage()
      * @return String
+     * @see com.lowagie.toolbox.arguments.StringArgument#getUsage()
      */
     public String getUsage() {
         StringBuilder buf = new StringBuilder("  ");
@@ -131,9 +130,8 @@ public String getUsage() {
     }
 
     /**
-     *
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      * @param evt ActionEvent
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
     public void actionPerformed(ActionEvent evt) {
         Object[] message = new Object[2];
@@ -152,11 +150,12 @@ public void actionPerformed(ActionEvent evt) {
                 null,
                 null,
                 null
-                     );
+        );
         if (result == 0) {
             setValue(cb.getSelectedItem());
         }
     }
+
     /**
      * Returns a string representation of the object.
      *
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/DirFilter.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/DirFilter.java
index 7f2a2cd22..13ca02d90 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/DirFilter.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/DirFilter.java
@@ -36,29 +36,27 @@
 package com.lowagie.toolbox.arguments.filters;
 
 import java.io.File;
-
 import javax.swing.filechooser.FileFilter;
 
 /**
  * Filters directories in a JFileChooser.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class DirFilter extends FileFilter {
 
     /**
-     *
-     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
      * @param f File
      * @return boolean
+     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
      */
     public boolean accept(File f) {
         return f.isDirectory();
     }
 
     /**
-     *
-     * @see javax.swing.filechooser.FileFilter#getDescription()
      * @return String
+     * @see javax.swing.filechooser.FileFilter#getDescription()
      */
     public String getDescription() {
         return "directories";
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/ImageFilter.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/ImageFilter.java
index 80e023f54..d61d189b5 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/ImageFilter.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/ImageFilter.java
@@ -35,17 +35,20 @@
 package com.lowagie.toolbox.arguments.filters;
 
 import java.io.File;
-
 import javax.swing.filechooser.FileFilter;
 
 /**
  * Filters images in a FileChooser.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class ImageFilter extends FileFilter {
 
-    /** Array with all kinds of image extensions. */
+    /**
+     * Array with all kinds of image extensions.
+     */
     public static final String[] IMAGES = new String[8];
+
     static {
         IMAGES[0] = ".jpg";
         IMAGES[1] = ".jpeg";
@@ -57,7 +60,9 @@ public class ImageFilter extends FileFilter {
         IMAGES[7] = ".tiff";
     }
 
-    /** array that enables you to filter on image types. */
+    /**
+     * array that enables you to filter on image types.
+     */
     public boolean[] filter = new boolean[8];
 
     /**
@@ -71,11 +76,12 @@ public ImageFilter() {
 
     /**
      * Constructs an ImageFilter allowing some images.
+     *
      * @param jpeg indicates if jpegs are allowed
-     * @param png indicates if pngs are allowed
-     * @param gif indicates if gifs are allowed
-     * @param bmp indicates if bmps are allowed
-     * @param wmf indicates if wmfs are allowed
+     * @param png  indicates if pngs are allowed
+     * @param gif  indicates if gifs are allowed
+     * @param bmp  indicates if bmps are allowed
+     * @param wmf  indicates if wmfs are allowed
      * @param tiff indicates if tiffs are allowed
      */
     public ImageFilter(boolean jpeg, boolean png, boolean gif, boolean bmp, boolean wmf, boolean tiff) {
@@ -102,23 +108,25 @@ public ImageFilter(boolean jpeg, boolean png, boolean gif, boolean bmp, boolean
     }
 
     /**
-     *
-     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
      * @param f File
      * @return boolean
+     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
      */
     public boolean accept(File f) {
-        if (f.isDirectory()) return true;
+        if (f.isDirectory()) {
+            return true;
+        }
         for (int i = 0; i < IMAGES.length; i++) {
-            if (filter[i] && f.getName().toLowerCase().endsWith(IMAGES[i])) return true;
+            if (filter[i] && f.getName().toLowerCase().endsWith(IMAGES[i])) {
+                return true;
+            }
         }
         return false;
     }
 
     /**
-     *
-     * @see javax.swing.filechooser.FileFilter#getDescription()
      * @return String
+     * @see javax.swing.filechooser.FileFilter#getDescription()
      */
     public String getDescription() {
         return "Image files";
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/PdfFilter.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/PdfFilter.java
index 1a7a292f0..5c7cc584d 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/PdfFilter.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/PdfFilter.java
@@ -36,30 +36,30 @@
 package com.lowagie.toolbox.arguments.filters;
 
 import java.io.File;
-
 import javax.swing.filechooser.FileFilter;
 
 /**
  * Filters PDF files in a JFileChooser.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class PdfFilter extends FileFilter {
 
     /**
-     *
-     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
      * @param f File
      * @return boolean
+     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
      */
     public boolean accept(File f) {
-        if (f.isDirectory()) return true;
+        if (f.isDirectory()) {
+            return true;
+        }
         return f.getName().toLowerCase().endsWith(".pdf");
     }
 
     /**
-     *
-     * @see javax.swing.filechooser.FileFilter#getDescription()
      * @return String
+     * @see javax.swing.filechooser.FileFilter#getDescription()
      */
     public String getDescription() {
         return "*.pdf PDF files";
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/U3DFilter.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/U3DFilter.java
index f231b931a..5c1261827 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/U3DFilter.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/filters/U3DFilter.java
@@ -36,30 +36,30 @@
 package com.lowagie.toolbox.arguments.filters;
 
 import java.io.File;
-
 import javax.swing.filechooser.FileFilter;
 
 /**
  * Filters U3D files in a JFileChooser.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class U3DFilter extends FileFilter {
 
     /**
-     *
-     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
      * @param f File
      * @return boolean
+     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
      */
     public boolean accept(File f) {
-        if (f.isDirectory()) return true;
+        if (f.isDirectory()) {
+            return true;
+        }
         return f.getName().toLowerCase().endsWith(".u3d");
     }
 
     /**
-     *
-     * @see javax.swing.filechooser.FileFilter#getDescription()
      * @return String
+     * @see javax.swing.filechooser.FileFilter#getDescription()
      */
     public String getDescription() {
         return "*.u3d U3D files";
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Add3D.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Add3D.java
index d3d8e2fec..a07c760ef 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Add3D.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Add3D.java
@@ -30,14 +30,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.Rectangle;
@@ -66,18 +58,21 @@
 import com.lowagie.toolbox.arguments.StringArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
 import com.lowagie.toolbox.arguments.filters.U3DFilter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
- * This tool lets you add a embedded u3d 3d annotation to the first page of a document. Look for
- * sample files at http://u3d.svn.sourceforge.net/viewvc/u3d/trunk/Source/Samples/Data/
+ * This tool lets you add a embedded u3d 3d annotation to the first page of a document. Look for sample files at
+ * http://u3d.svn.sourceforge.net/viewvc/u3d/trunk/Source/Samples/Data/
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Add3D extends AbstractTool {
-    static {
-        addVersion("$Id: Add3D.java 3373 2008-05-12 16:21:24Z xlv $");
-    }
 
-    FileArgument destfile = null;
     public static final String PDF_NAME_3D = "3D";
     public static final String PDF_NAME_3DD = "3DD";
     public static final String PDF_NAME_3DV = "3DV";
@@ -88,6 +83,12 @@ public class Add3D extends AbstractTool {
     public static final String PDF_NAME_U3D = "U3D";
     public static final String PDF_NAME_XN = "XN";
 
+    static {
+        addVersion("$Id: Add3D.java 3373 2008-05-12 16:21:24Z xlv $");
+    }
+
+    FileArgument destfile = null;
+
     /**
      * This tool lets you add a embedded u3d 3d annotation to the first page of a document.
      */
@@ -95,27 +96,63 @@ public Add3D() {
         super();
         menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
         FileArgument inputfile = new FileArgument(this, "srcfile",
-                                                  "The file you want to add the u3d File", false,
-                                                  new PdfFilter());
+                "The file you want to add the u3d File", false,
+                new PdfFilter());
         arguments.add(inputfile);
         FileArgument u3dinputfile = new FileArgument(this, "srcu3dfile",
                 "The u3d file you want to add", false,
                 new U3DFilter());
         arguments.add(u3dinputfile);
         StringArgument pagenumber = new StringArgument(this, "pagenumber",
-                                   "The pagenumber where to add the u3d annotation");
-                           pagenumber.setValue("1");
+                "The pagenumber where to add the u3d annotation");
+        pagenumber.setValue("1");
         arguments.add(pagenumber);
         destfile = new FileArgument(this, "destfile",
-                                    "The file that contains the u3d annotation after processing",
-                                    true, new PdfFilter());
+                "The file that contains the u3d annotation after processing",
+                true, new PdfFilter());
         arguments.add(destfile);
         inputfile.addPropertyChangeListener(destfile);
     }
 
+    public static void AddButton(float x, float y, String fname, String js,
+            String image, PdfWriter wr) {
+        try {
+//            URL url=Add3D.class.getResource(
+//                image);
+//            PdfFileSpecification fs=PdfFileSpecification.fileEmbedded(wr,image,image,null);
+//            wr.addAnnotation(PdfAnnotation.createScreen(wr,new Rectangle(x, y, x + img.plainWidth(),
+//                                  y + img.plainHeight())));
+            Image img = Image.getInstance(image);
+            PushbuttonField bt = new PushbuttonField(wr,
+                    new Rectangle(x, y, x + img.getPlainWidth(),
+                            y + img.getPlainHeight()), fname);
+            bt.setLayout(PushbuttonField.LAYOUT_ICON_ONLY);
+            bt.setImage(img);
+            PdfFormField ff = bt.getField();
+            PdfAction ac = PdfAction.javaScript(js, wr);
+            ff.setAction(ac);
+            wr.addAnnotation(ff);
+        } catch (IOException | DocumentException ignored) {
+            // ignored
+        }
+    }
+
     /**
-     * Creates the internal frame.
+     * This methods helps you running this tool as a standalone application.
      *
+     * @param args the srcfile and destfile
+     */
+    public static void main(String[] args) {
+        Add3D add3d = new Add3D();
+        if (args.length != 4) {
+            System.err.println(add3d.getUsage());
+        }
+        add3d.setMainArguments(args);
+        add3d.execute();
+    }
+
+    /**
+     * Creates the internal frame.
      */
     protected void createFrame() {
         internalFrame = new JInternalFrame("Add3D", true, true, true);
@@ -126,7 +163,6 @@ protected void createFrame() {
 
     /**
      * Executes the tool (in most cases this generates a PDF file).
-     *
      */
     public void execute() {
         try {
@@ -142,16 +178,16 @@ public void execute() {
                 throw new InstantiationException(
                         "You need to choose a destination file");
             }
-            int pagenumber = Integer.parseInt( (String) getValue("pagenumber"));
+            int pagenumber = Integer.parseInt((String) getValue("pagenumber"));
             // Create 3D annotation
             // Required definitions
             PdfIndirectReference streamRef;
             PdfIndirectObject objRef;
             PdfReader reader = new PdfReader(((File) getValue("srcfile"))
-                                             .getAbsolutePath());
+                    .getAbsolutePath());
 
             String u3dFileName = ((File) getValue("srcu3dfile"))
-                                 .getAbsolutePath();
+                    .getAbsolutePath();
             PdfStamper stamp = new PdfStamper(reader, new FileOutputStream(
                     (File) getValue("destfile")));
             PdfWriter wr = stamp.getWriter();
@@ -166,14 +202,15 @@ public void execute() {
 
 // Create stream to carry attachment
             PdfStream stream = new PdfStream(new FileInputStream(u3dFileName),
-                                             wr);
+                    wr);
             stream.put(new PdfName("OnInstantiate"),
-                       wr.addToBody(oni).getIndirectReference());
+                    wr.addToBody(oni).getIndirectReference());
             stream.put(PdfName.TYPE, new PdfName(PDF_NAME_3D)); // Mandatory keys
             stream.put(PdfName.SUBTYPE, new PdfName(PDF_NAME_U3D));
             stream.flateCompress();
 
-            streamRef = wr.addToBody(stream).getIndirectReference(); // Write stream contents, get reference to stream object, write actual stream length
+            streamRef = wr.addToBody(stream)
+                    .getIndirectReference(); // Write stream contents, get reference to stream object, write actual stream length
             stream.writeLength();
 
             // Create 3D view dictionary
@@ -184,10 +221,11 @@ public void execute() {
 
             dict.put(new PdfName(PDF_NAME_XN), new PdfString("Default"));
             dict.put(new PdfName(PDF_NAME_IN), new PdfString("Unnamed"));
-            dict.put(new PdfName(PDF_NAME_MS), PdfName.M); // States that we have to provide camera-to-world coordinate transformation
+            dict.put(new PdfName(PDF_NAME_MS),
+                    PdfName.M); // States that we have to provide camera-to-world coordinate transformation
             dict.put(new PdfName(PDF_NAME_C2W),
-                     new PdfArray(new float[] {1, 0, 0, 0, 0, -1, 0, 1, 0, 3,
-                                  -235, 28F})); // 3d transformation matrix (demo for teapot)
+                    new PdfArray(new float[]{1, 0, 0, 0, 0, -1, 0, 1, 0, 3,
+                            -235, 28F})); // 3d transformation matrix (demo for teapot)
             dict.put(PdfName.CO, new PdfNumber(235)); // Camera distance along z-axis (demo for teapot)
 
             objRef = wr.addToBody(dict); // Write view dictionary, get reference
@@ -220,48 +258,24 @@ public void execute() {
             stamp.addAnnotation(annot, pagenumber);
             AddButton(100, 100, "Rotate",
                     "im = this.getAnnots3D(0)[0].context3D;\rim.runtime.setCurrentTool(\"Rotate\");",
-                      "rotate.png", wr);
+                    "rotate.png", wr);
             AddButton(150, 100, "Pan",
                     "im = this.getAnnots3D(0)[0].context3D;\rim.runtime.setCurrentTool(\"Pan\");",
-                      "translate.png", wr);
+                    "translate.png", wr);
             AddButton(200, 100, "Zoom",
                     "im = this.getAnnots3D(0)[0].context3D;\rim.runtime.setCurrentTool(\"Zoom\");",
-                      "zoom.png", wr);
+                    "zoom.png", wr);
             stamp.close();
         } catch (Exception e) {
             JOptionPane.showMessageDialog(internalFrame, e.getMessage(), e
-                                          .getClass().getName(),
-                                          JOptionPane.ERROR_MESSAGE);
+                            .getClass().getName(),
+                    JOptionPane.ERROR_MESSAGE);
             System.err.println(e.getMessage());
         }
     }
 
-    public static void AddButton(float x, float y, String fname, String js,
-                                 String image, PdfWriter wr) {
-        try {
-//            URL url=Add3D.class.getResource(
-//                image);
-//            PdfFileSpecification fs=PdfFileSpecification.fileEmbedded(wr,image,image,null);
-//            wr.addAnnotation(PdfAnnotation.createScreen(wr,new Rectangle(x, y, x + img.plainWidth(),
-//                                  y + img.plainHeight())));
-            Image img = Image.getInstance(image);
-            PushbuttonField bt = new PushbuttonField(wr,
-                    new Rectangle(x, y, x + img.getPlainWidth(),
-                                  y + img.getPlainHeight()), fname);
-            bt.setLayout(PushbuttonField.LAYOUT_ICON_ONLY);
-            bt.setImage(img);
-            PdfFormField ff = bt.getField();
-            PdfAction ac = PdfAction.javaScript(js, wr);
-            ff.setAction(ac);
-            wr.addAnnotation(ff);
-        } catch (IOException | DocumentException ignored) {
-            // ignored
-        }
-    }
-
     /**
-     * Gets the PDF file that should be generated (or null if the output isn't a
-     * PDF file).
+     * Gets the PDF file that should be generated (or null if the output isn't a PDF file).
      *
      * @return the PDF file that should be generated
      * @throws InstantiationException on error
@@ -273,8 +287,7 @@ protected File getDestPathPDF() throws InstantiationException {
     /**
      * Indicates that the value of an argument has changed.
      *
-     * @param arg
-     *            the argument that has changed
+     * @param arg the argument that has changed
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -283,24 +296,11 @@ public void valueHasChanged(AbstractArgument arg) {
             return;
         }
         if (destfile.getValue() == null &&
-            arg.getName().equalsIgnoreCase("srcfile")) {
+                arg.getName().equalsIgnoreCase("srcfile")) {
             String filename = arg.getValue().toString();
             String filenameout = filename.substring(0, filename.indexOf(".",
                     filename.length() - 4)) + "_out.pdf";
             destfile.setValue(filenameout);
         }
     }
-
-    /**
-     * This methods helps you running this tool as a standalone application.
-     * @param args the srcfile and destfile
-     */
-    public static void main(String[] args) {
-        Add3D add3d = new Add3D();
-        if (args.length != 4) {
-            System.err.println(add3d.getUsage());
-        }
-        add3d.setMainArguments(args);
-        add3d.execute();
-    }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Bookmarks2XML.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Bookmarks2XML.java
index b104e7bd2..7c024813b 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Bookmarks2XML.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Bookmarks2XML.java
@@ -35,23 +35,22 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.SimpleBookmark;
 import com.lowagie.toolbox.AbstractTool;
 import com.lowagie.toolbox.arguments.AbstractArgument;
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.List;
+import java.util.Map;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * Allows you to add bookmarks to an existing PDF file
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Bookmarks2XML extends AbstractTool {
@@ -64,10 +63,25 @@ public class Bookmarks2XML extends AbstractTool {
      * Constructs an Bookmarks2XML object.
      */
     public Bookmarks2XML() {
-        arguments.add(new FileArgument(this, "pdffile", "the PDF from which you want to extract bookmarks", false, new PdfFilter()));
+        arguments.add(new FileArgument(this, "pdffile", "the PDF from which you want to extract bookmarks", false,
+                new PdfFilter()));
         arguments.add(new FileArgument(this, "xmlfile", "the resulting bookmarks file in XML", true));
     }
 
+    /**
+     * Allows you to generate an index file in HTML containing Bookmarks to an existing PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Bookmarks2XML tool = new Bookmarks2XML();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -83,17 +97,20 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("xmlfile") == null) throw new InstantiationException("You need to choose an xml file");
-            if (getValue("pdffile") == null) throw new InstantiationException("You need to choose a source PDF file");
-            PdfReader reader = new PdfReader(((File)getValue("pdffile")).getAbsolutePath());
+            if (getValue("xmlfile") == null) {
+                throw new InstantiationException("You need to choose an xml file");
+            }
+            if (getValue("pdffile") == null) {
+                throw new InstantiationException("You need to choose a source PDF file");
+            }
+            PdfReader reader = new PdfReader(((File) getValue("pdffile")).getAbsolutePath());
             reader.consolidateNamedDestinations();
-            List> bookmarks = SimpleBookmark.getBookmarkList( reader );
+            List> bookmarks = SimpleBookmark.getBookmarkList(reader);
             // save them in XML format
-            FileOutputStream bmWriter = new FileOutputStream( (File)getValue("xmlfile") );
+            FileOutputStream bmWriter = new FileOutputStream((File) getValue("xmlfile"));
             SimpleBookmark.exportToXML(bookmarks, bmWriter, "UTF-8", false);
             bmWriter.close();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             JOptionPane.showMessageDialog(internalFrame,
                     e.getMessage(),
@@ -104,9 +121,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -117,24 +133,9 @@ public void valueHasChanged(AbstractArgument arg) {
     }
 
     /**
-     * Allows you to generate an index file in HTML containing Bookmarks to an existing PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        Bookmarks2XML tool = new Bookmarks2XML();
-        if (args.length < 2) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
         throw new InstantiationException("There is no file to show.");
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Burst.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Burst.java
index c4cd84b19..be0da63ad 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Burst.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Burst.java
@@ -47,11 +47,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfImportedPage;
@@ -62,9 +57,13 @@
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
 import com.lowagie.toolbox.swing.PdfInformationPanel;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
 
 /**
  * This tool lets you split a PDF in several separate PDF files (1 per page).
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Burst extends AbstractTool {
@@ -82,6 +81,20 @@ public Burst() {
         arguments.add(f);
     }
 
+    /**
+     * Divide PDF file into pages.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Burst tool = new Burst();
+        if (args.length < 1) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -97,8 +110,10 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null) throw new InstantiationException("You need to choose a sourcefile");
-            File src = (File)getValue("srcfile");
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            File src = (File) getValue("srcfile");
             File directory = src.getParentFile();
             String name = src.getName();
             name = name.substring(0, name.lastIndexOf('.'));
@@ -114,12 +129,15 @@ public void execute() {
             for (int i = 0; i < n; i++) {
                 pagenumber = i + 1;
                 filename = String.valueOf(pagenumber);
-                while (filename.length() < digits) filename = "0" + filename;
+                while (filename.length() < digits) {
+                    filename = "0" + filename;
+                }
                 filename = "_" + filename + ".pdf";
                 // step 1: creation of a document-object
                 document = new Document(reader.getPageSizeWithRotation(pagenumber));
                 // step 2: we create a writer that listens to the document
-                PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(new File(directory, name + filename)));
+                PdfWriter writer = PdfWriter.getInstance(document,
+                        new FileOutputStream(new File(directory, name + filename)));
                 // step 3: we open the document
                 document.open();
                 PdfContentByte cb = writer.getDirectContent();
@@ -127,23 +145,20 @@ public void execute() {
                 int rotation = reader.getPageRotation(pagenumber);
                 if (rotation == 90 || rotation == 270) {
                     cb.addTemplate(page, 0, -1f, 1f, 0, 0, reader.getPageSizeWithRotation(pagenumber).getHeight());
-                }
-                else {
+                } else {
                     cb.addTemplate(page, 1f, 0, 0, 1f, 0, 0);
                 }
                 // step 5: we close the document
                 document.close();
             }
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -153,26 +168,10 @@ public void valueHasChanged(AbstractArgument arg) {
         // represent the changes of the argument in the internal frame
     }
 
-
     /**
-     * Divide PDF file into pages.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        Burst tool = new Burst();
-        if (args.length < 1) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
         throw new InstantiationException("There is more than one destfile.");
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/CompressDecompressPageContent.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/CompressDecompressPageContent.java
index 348a02694..9df2c7559 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/CompressDecompressPageContent.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/CompressDecompressPageContent.java
@@ -34,12 +34,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
@@ -49,6 +43,10 @@
 import com.lowagie.toolbox.arguments.OptionArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
 import com.lowagie.toolbox.swing.PdfInformationPanel;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * @since 2.1.1 (imported from itexttoolbox project)
@@ -63,16 +61,32 @@ public class CompressDecompressPageContent extends AbstractTool {
      * Constructs a Burst object.
      */
     public CompressDecompressPageContent() {
-        FileArgument f = new FileArgument(this, "srcfile", "The file you want to compress/decompress", false, new PdfFilter());
+        FileArgument f = new FileArgument(this, "srcfile", "The file you want to compress/decompress", false,
+                new PdfFilter());
         f.setLabel(new PdfInformationPanel());
         arguments.add(f);
-        arguments.add(new FileArgument(this, "destfile", "The file to which the compressed/decompressed PDF has to be written", true, new PdfFilter()));
+        arguments.add(new FileArgument(this, "destfile",
+                "The file to which the compressed/decompressed PDF has to be written", true, new PdfFilter()));
         OptionArgument oa = new OptionArgument(this, "compress", "compress");
         oa.addOption("Compress page content", "true");
         oa.addOption("Decompress page content", "false");
         arguments.add(oa);
     }
 
+    /**
+     * Compresses/decompresses the page content streams in a PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        CompressDecompressPageContent tool = new CompressDecompressPageContent();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -84,9 +98,8 @@ protected void createFrame() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -97,27 +110,12 @@ public void valueHasChanged(AbstractArgument arg) {
     }
 
     /**
-     * Compresses/decompresses the page content streams in a PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        CompressDecompressPageContent tool = new CompressDecompressPageContent();
-        if (args.length < 2) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile");
+        return (File) getValue("destfile");
     }
 
     /**
@@ -125,12 +123,16 @@ protected File getDestPathPDF() throws InstantiationException {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null) throw new InstantiationException("You need to choose a sourcefile");
-            if (getValue("destfile") == null) throw new InstantiationException("You need to choose a destination file");
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            if (getValue("destfile") == null) {
+                throw new InstantiationException("You need to choose a destination file");
+            }
             boolean compress = "true".equals(getValue("compress"));
-            PdfReader reader = new PdfReader(((File)getValue("srcfile")).getAbsolutePath());
+            PdfReader reader = new PdfReader(((File) getValue("srcfile")).getAbsolutePath());
             PdfStamper stamper = new PdfStamper(reader, new FileOutputStream(getDestPathPDF()));
-            synchronized(arguments) {
+            synchronized (arguments) {
                 Document.compress = compress;
                 int total = reader.getNumberOfPages() + 1;
                 for (int i = 1; i < total; i++) {
@@ -139,8 +141,7 @@ public void execute() {
                 stamper.close();
                 Document.compress = true;
             }
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             JOptionPane.showMessageDialog(internalFrame,
                     e.getMessage(),
                     e.getClass().getName(),
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Concat.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Concat.java
index 13301d484..d9a1c765c 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Concat.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Concat.java
@@ -35,14 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.pdf.PdfCopy;
 import com.lowagie.text.pdf.PdfImportedPage;
@@ -52,9 +44,16 @@
 import com.lowagie.toolbox.arguments.AbstractArgument;
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.swing.JInternalFrame;
 
 /**
  * Concatenates two PDF files
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Concat extends AbstractTool {
@@ -62,14 +61,31 @@ public class Concat extends AbstractTool {
     static {
         addVersion("$Id: Concat.java 3271 2008-04-18 20:39:42Z xlv $");
     }
+
     /**
      * Constructs a Concat object.
      */
     public Concat() {
         menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
-                arguments.add(new FileArgument(this, "srcfile1", "The first PDF file", false, new PdfFilter()));
+        arguments.add(new FileArgument(this, "srcfile1", "The first PDF file", false, new PdfFilter()));
         arguments.add(new FileArgument(this, "srcfile2", "The second PDF file", false, new PdfFilter()));
-        arguments.add(new FileArgument(this, "destfile", "The file to which the concatenated PDF has to be written", true, new PdfFilter()));
+        arguments.add(
+                new FileArgument(this, "destfile", "The file to which the concatenated PDF has to be written", true,
+                        new PdfFilter()));
+    }
+
+    /**
+     * Concatenates two PDF files.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Concat tool = new Concat();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
     }
 
     /**
@@ -88,16 +104,22 @@ protected void createFrame() {
     public void execute() {
         try {
             String[] files = new String[2];
-            if (getValue("srcfile1") == null) throw new InstantiationException("You need to choose a first sourcefile");
-            files[0] = ((File)getValue("srcfile1")).getAbsolutePath();
-            if (getValue("srcfile2") == null) throw new InstantiationException("You need to choose a second sourcefile");
-            files[1] = ((File)getValue("srcfile2")).getAbsolutePath();
-            if (getValue("destfile") == null) throw new InstantiationException("You need to choose a destination file");
-            File pdf_file = (File)getValue("destfile");
+            if (getValue("srcfile1") == null) {
+                throw new InstantiationException("You need to choose a first sourcefile");
+            }
+            files[0] = ((File) getValue("srcfile1")).getAbsolutePath();
+            if (getValue("srcfile2") == null) {
+                throw new InstantiationException("You need to choose a second sourcefile");
+            }
+            files[1] = ((File) getValue("srcfile2")).getAbsolutePath();
+            if (getValue("destfile") == null) {
+                throw new InstantiationException("You need to choose a destination file");
+            }
+            File pdf_file = (File) getValue("destfile");
             int pageOffset = 0;
             List> master = new ArrayList<>();
             Document document = null;
-            PdfCopy  writer = null;
+            PdfCopy writer = null;
             for (int i = 0; i < 2; i++) {
                 // we create a reader for a certain document
                 PdfReader reader = new PdfReader(files[i]);
@@ -106,8 +128,9 @@ public void execute() {
                 int n = reader.getNumberOfPages();
                 List> bookmarks = SimpleBookmark.getBookmarkList(reader);
                 if (bookmarks != null) {
-                    if (pageOffset != 0)
+                    if (pageOffset != 0) {
                         SimpleBookmark.shiftPageNumbersInRange(bookmarks, pageOffset, null);
+                    }
                     master.addAll(bookmarks);
                 }
                 pageOffset += n;
@@ -129,20 +152,19 @@ public void execute() {
                     System.out.println("Processed page " + p);
                 }
             }
-            if (!master.isEmpty())
+            if (!master.isEmpty()) {
                 writer.setOutlines(master);
+            }
             // step 5: we close the document
             document.close();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -152,29 +174,13 @@ public void valueHasChanged(AbstractArgument arg) {
         // represent the changes of the argument in the internal frame
     }
 
-
     /**
-     * Concatenates two PDF files.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        Concat tool = new Concat();
-        if (args.length < 2) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile");
+        return (File) getValue("destfile");
     }
 
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ConcatN.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ConcatN.java
index ca6431531..87281f063 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ConcatN.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ConcatN.java
@@ -35,14 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.pdf.PdfCopy;
 import com.lowagie.text.pdf.PdfImportedPage;
@@ -53,9 +45,16 @@
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.FileArrayArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.swing.JInternalFrame;
 
 /**
  * Concatenates two PDF files
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class ConcatN extends AbstractTool {
@@ -70,10 +69,24 @@ public class ConcatN extends AbstractTool {
     public ConcatN() {
         menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
         arguments.add(new FileArrayArgument(this, "srcfiles",
-                                            "The list of PDF files"));
+                "The list of PDF files"));
         arguments.add(new FileArgument(this, "destfile",
                 "The file to which the concatenated PDF has to be written", true,
-                                       new PdfFilter()));
+                new PdfFilter()));
+    }
+
+    /**
+     * Concatenates two PDF files.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        ConcatN tool = new ConcatN();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
     }
 
     /**
@@ -126,7 +139,7 @@ public void execute() {
                     document = new Document(reader.getPageSizeWithRotation(1));
                     // step 2: we create a writer that listens to the document
                     writer = new PdfCopy(document,
-                                         new FileOutputStream(pdf_file));
+                            new FileOutputStream(pdf_file));
                     // step 3: we open the document
                     document.open();
                 }
@@ -150,9 +163,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -162,26 +174,10 @@ public void valueHasChanged(AbstractArgument arg) {
         // represent the changes of the argument in the internal frame
     }
 
-
-    /**
-     * Concatenates two PDF files.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        ConcatN tool = new ConcatN();
-        if (args.length < 2) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
         return (File) getValue("destfile");
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Decrypt.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Decrypt.java
index ff10bf269..72d06dfb5 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Decrypt.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Decrypt.java
@@ -35,12 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
 import com.lowagie.toolbox.AbstractTool;
@@ -48,9 +42,14 @@
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.StringArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * Allows you to decrypt an existing PDF file.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Decrypt extends AbstractTool {
@@ -65,10 +64,25 @@ public class Decrypt extends AbstractTool {
      */
     public Decrypt() {
         arguments.add(new FileArgument(this, "srcfile", "The file you want to decrypt", false, new PdfFilter()));
-        arguments.add(new FileArgument(this, "destfile", "The file to which the decrypted PDF has to be written", true, new PdfFilter()));
+        arguments.add(new FileArgument(this, "destfile", "The file to which the decrypted PDF has to be written", true,
+                new PdfFilter()));
         arguments.add(new StringArgument(this, "ownerpassword", "The ownerpassword you want to add to the PDF file"));
     }
 
+    /**
+     * Decrypts an existing PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Decrypt tool = new Decrypt();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -84,17 +98,20 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null) throw new InstantiationException("You need to choose a sourcefile");
-            if (getValue("destfile") == null) throw new InstantiationException("You need to choose a destination file");
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            if (getValue("destfile") == null) {
+                throw new InstantiationException("You need to choose a destination file");
+            }
             byte[] ownerpassword = null;
             if (getValue("ownerpassword") != null) {
-                ownerpassword = ((String)getValue("ownerpassword")).getBytes();
+                ownerpassword = ((String) getValue("ownerpassword")).getBytes();
             }
-            PdfReader reader = new PdfReader(((File)getValue("srcfile")).getAbsolutePath(), ownerpassword);
-            PdfStamper stamper = new PdfStamper(reader, new FileOutputStream((File)getValue("destfile")));
+            PdfReader reader = new PdfReader(((File) getValue("srcfile")).getAbsolutePath(), ownerpassword);
+            PdfStamper stamper = new PdfStamper(reader, new FileOutputStream((File) getValue("destfile")));
             stamper.close();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             JOptionPane.showMessageDialog(internalFrame,
                     e.getMessage(),
                     e.getClass().getName(),
@@ -104,9 +121,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -117,27 +133,12 @@ public void valueHasChanged(AbstractArgument arg) {
     }
 
     /**
-     * Decrypts an existing PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        Decrypt tool = new Decrypt();
-        if (args.length < 2) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile");
+        return (File) getValue("destfile");
     }
 
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Divide.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Divide.java
index 22c0d90fa..6a9e22d46 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Divide.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Divide.java
@@ -34,11 +34,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfContentByte;
@@ -49,9 +44,13 @@
 import com.lowagie.toolbox.arguments.AbstractArgument;
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
 
 /**
  * This tool lets you generate a PDF that shows N pages on 1.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Divide extends AbstractTool {
@@ -71,6 +70,20 @@ public Divide() {
                 true, new PdfFilter()));
     }
 
+    /**
+     * Generates a divided version of an NUp version of an existing PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Divide tool = new Divide();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -144,9 +157,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -158,24 +170,9 @@ public void valueHasChanged(AbstractArgument arg) {
     }
 
     /**
-     * Generates a divided version of an NUp version of an existing PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        Divide tool = new Divide();
-        if (args.length < 2) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
         return (File) getValue("destfile");
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/DvdCover.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/DvdCover.java
index 6004c1c31..d88014dba 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/DvdCover.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/DvdCover.java
@@ -35,13 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.awt.Color;
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -57,9 +50,15 @@
 import com.lowagie.toolbox.arguments.ImageArgument;
 import com.lowagie.toolbox.arguments.StringArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.awt.Color;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * This is a simple tool that generates a cover for a DVD.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class DvdCover extends AbstractTool {
@@ -73,14 +72,31 @@ public class DvdCover extends AbstractTool {
      */
     public DvdCover() {
         menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW | MENU_EXECUTE_PRINT;
-        arguments.add(new FileArgument(this, "destfile", "The file to which the PDF has to be written", true, new PdfFilter()));
+        arguments.add(new FileArgument(this, "destfile", "The file to which the PDF has to be written", true,
+                new PdfFilter()));
         arguments.add(new StringArgument(this, "title", "The title of the DVD"));
-        arguments.add(new ColorArgument(this, "backgroundcolor", "The backgroundcolor of the DVD Cover (for instance 0xFFFFFF)"));
+        arguments.add(new ColorArgument(this, "backgroundcolor",
+                "The backgroundcolor of the DVD Cover (for instance 0xFFFFFF)"));
         arguments.add(new ImageArgument(this, "front", "The front image of the DVD Cover"));
         arguments.add(new ImageArgument(this, "back", "The back image of the DVD Cover"));
         arguments.add(new ImageArgument(this, "side", "The side image of the DVD Cover"));
     }
 
+    /**
+     * Generates a DVD Cover in PDF.
+     *
+     * @param args an array containing [0] a filename [1] a title [2] a backgroundcolor [3] a front image [4] a back
+     *             image [5] a side image
+     */
+    public static void main(String[] args) {
+        DvdCover tool = new DvdCover();
+        if (args.length == 0) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -98,13 +114,17 @@ public void execute() {
         try {
             // step 1: creation of a document-object
             Rectangle pageSize = new Rectangle(780, 525);
-            if (getValue("backgroundcolor") != null) pageSize.setBackgroundColor((Color)getValue("backgroundcolor"));
+            if (getValue("backgroundcolor") != null) {
+                pageSize.setBackgroundColor((Color) getValue("backgroundcolor"));
+            }
             Document document = new Document(pageSize);
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            if (getValue("destfile") == null) throw new DocumentException("You must provide a destination file!");
-            PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream((File)getValue("destfile")));
+            if (getValue("destfile") == null) {
+                throw new DocumentException("You must provide a destination file!");
+            }
+            PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream((File) getValue("destfile")));
 
             // step 3: we open the document
             document.open();
@@ -115,10 +135,10 @@ public void execute() {
                 cb.setFontAndSize(BaseFont.createFont(BaseFont.HELVETICA, BaseFont.WINANSI, false), 24);
                 cb.beginText();
                 if (getValue("front") == null) {
-                    cb.showTextAligned(Element.ALIGN_CENTER, (String)getValue("title"), 595f, 262f, 0f);
+                    cb.showTextAligned(Element.ALIGN_CENTER, (String) getValue("title"), 595f, 262f, 0f);
                 }
                 if (getValue("side") == null) {
-                    cb.showTextAligned(Element.ALIGN_CENTER, (String)getValue("title"), 385f, 262f, 270f);
+                    cb.showTextAligned(Element.ALIGN_CENTER, (String) getValue("title"), 385f, 262f, 270f);
                 }
                 cb.endText();
             }
@@ -128,28 +148,29 @@ public void execute() {
             cb.lineTo(410, 0);
             cb.stroke();
             if (getValue("front") != null) {
-                Image front = (Image)getValue("front");
+                Image front = (Image) getValue("front");
                 front.scaleToFit(370, 525);
-                front.setAbsolutePosition(410f + (370f - front.getScaledWidth()) / 2f, (525f - front.getScaledHeight()) / 2f);
+                front.setAbsolutePosition(410f + (370f - front.getScaledWidth()) / 2f,
+                        (525f - front.getScaledHeight()) / 2f);
                 document.add(front);
             }
             if (getValue("back") != null) {
-                Image back = (Image)getValue("back");
+                Image back = (Image) getValue("back");
                 back.scaleToFit(370, 525);
                 back.setAbsolutePosition((370f - back.getScaledWidth()) / 2f, (525f - back.getScaledHeight()) / 2f);
                 document.add(back);
             }
             if (getValue("side") != null) {
-                Image side = (Image)getValue("side");
+                Image side = (Image) getValue("side");
                 side.scaleToFit(40, 525);
-                side.setAbsolutePosition(370 + (40f - side.getScaledWidth()) / 2f, (525f - side.getScaledHeight()) / 2f);
+                side.setAbsolutePosition(370 + (40f - side.getScaledWidth()) / 2f,
+                        (525f - side.getScaledHeight()) / 2f);
                 document.add(side);
             }
 
             // step 5: we close the document
             document.close();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             JOptionPane.showMessageDialog(internalFrame,
                     e.getMessage(),
                     e.getClass().getName(),
@@ -159,9 +180,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -172,25 +192,11 @@ public void valueHasChanged(AbstractArgument arg) {
     }
 
     /**
-     * Generates a DVD Cover in PDF.
-     * @param args    an array containing [0] a filename [1] a title [2] a backgroundcolor [3] a front image [4] a back image [5] a side image
-     */
-    public static void main(String[] args) {
-        DvdCover tool = new DvdCover();
-        if (args.length == 0) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile");
+        return (File) getValue("destfile");
     }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Encrypt.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Encrypt.java
index 783d3f577..05589946f 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Encrypt.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Encrypt.java
@@ -35,12 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.pdf.PdfEncryptor;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfWriter;
@@ -51,17 +45,18 @@
 import com.lowagie.toolbox.arguments.OptionArgument;
 import com.lowagie.toolbox.arguments.StringArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * Allows you to encrypt an existing PDF file.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Encrypt extends AbstractTool {
 
-    static {
-        addVersion("$Id: Encrypt.java 3271 2008-04-18 20:39:42Z xlv $");
-    }
-
     private final static int[] PERMISSIONS = {
             PdfWriter.ALLOW_PRINTING,
             PdfWriter.ALLOW_MODIFY_CONTENTS,
@@ -82,12 +77,17 @@ public class Encrypt extends AbstractTool {
             "AllowDegradedPrinting (128 bit only)"
     };
 
+    static {
+        addVersion("$Id: Encrypt.java 3271 2008-04-18 20:39:42Z xlv $");
+    }
+
     /**
      * Constructs an Encrypt object.
      */
     public Encrypt() {
         arguments.add(new FileArgument(this, "srcfile", "The file you want to encrypt", false, new PdfFilter()));
-        arguments.add(new FileArgument(this, "destfile", "The file to which the encrypted PDF has to be written", true, new PdfFilter()));
+        arguments.add(new FileArgument(this, "destfile", "The file to which the encrypted PDF has to be written", true,
+                new PdfFilter()));
         arguments.add(new StringArgument(this, "ownerpassword", "The ownerpassword you want to add to the PDF file"));
         arguments.add(new StringArgument(this, "userpassword", "The userpassword you want to add to the PDF file"));
         arguments.add(new BitsetArgument(this, "permissions", "Permissions on the file", PERMISSION_OPTIONS));
@@ -97,6 +97,20 @@ public Encrypt() {
         arguments.add(oa);
     }
 
+    /**
+     * Encrypts an existing PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Encrypt tool = new Encrypt();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -112,10 +126,14 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null) throw new InstantiationException("You need to choose a sourcefile");
-            if (getValue("destfile") == null) throw new InstantiationException("You need to choose a destination file");
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            if (getValue("destfile") == null) {
+                throw new InstantiationException("You need to choose a destination file");
+            }
             int permissions = 0;
-            String p = (String)getValue("permissions");
+            String p = (String) getValue("permissions");
             if (p != null) {
                 for (int k = 0; k < p.length(); ++k) {
                     permissions |= (p.charAt(k) == '0' ? 0 : PERMISSIONS[k]);
@@ -123,23 +141,22 @@ public void execute() {
             }
             byte[] userpassword = null;
             if (getValue("userpassword") != null) {
-                userpassword = ((String)getValue("userpassword")).getBytes();
+                userpassword = ((String) getValue("userpassword")).getBytes();
             }
             byte[] ownerpassword = null;
             if (getValue("ownerpassword") != null) {
-                ownerpassword = ((String)getValue("ownerpassword")).getBytes();
+                ownerpassword = ((String) getValue("ownerpassword")).getBytes();
             }
-            PdfReader reader = new PdfReader(((File)getValue("srcfile")).getAbsolutePath());
+            PdfReader reader = new PdfReader(((File) getValue("srcfile")).getAbsolutePath());
             PdfEncryptor.encrypt(
-                reader,
-                new FileOutputStream((File)getValue("destfile")),
-                userpassword,
-                ownerpassword,
-                permissions,
-                "128".equals(getValue("strength"))
-                );
-        }
-        catch(Exception e) {
+                    reader,
+                    new FileOutputStream((File) getValue("destfile")),
+                    userpassword,
+                    ownerpassword,
+                    permissions,
+                    "128".equals(getValue("strength"))
+            );
+        } catch (Exception e) {
             JOptionPane.showMessageDialog(internalFrame,
                     e.getMessage(),
                     e.getClass().getName(),
@@ -149,9 +166,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -162,27 +178,12 @@ public void valueHasChanged(AbstractArgument arg) {
     }
 
     /**
-     * Encrypts an existing PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        Encrypt tool = new Encrypt();
-        if (args.length < 2) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile");
+        return (File) getValue("destfile");
     }
 
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ExtractAttachments.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ExtractAttachments.java
index 081efa154..b750cde83 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ExtractAttachments.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ExtractAttachments.java
@@ -35,13 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.pdf.PRStream;
 import com.lowagie.text.pdf.PdfArray;
 import com.lowagie.text.pdf.PdfDictionary;
@@ -55,9 +48,15 @@
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
 import com.lowagie.toolbox.swing.PdfInformationPanel;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import javax.swing.JInternalFrame;
 
 /**
  * This tool lets you extract the attachments of a PDF.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class ExtractAttachments extends AbstractTool {
@@ -76,6 +75,61 @@ public ExtractAttachments() {
         arguments.add(f);
     }
 
+    /**
+     * Extract the attachments of a PDF.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        ExtractAttachments tool = new ExtractAttachments();
+        if (args.length < 1) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
+    /**
+     * Unpacks a file attachment.
+     *
+     * @param reader   The object that reads the PDF document
+     * @param filespec The dictionary containing the file specifications
+     * @param outPath  The path where the attachment has to be written
+     * @throws IOException on error
+     */
+    public static void unpackFile(PdfReader reader, PdfDictionary filespec,
+            String outPath) throws IOException {
+        if (filespec == null) {
+            return;
+        }
+        PdfName type = filespec.getAsName(PdfName.TYPE);
+        if (!PdfName.F.equals(type) && !PdfName.FILESPEC.equals(type)) {
+            return;
+        }
+        PdfDictionary ef = filespec.getAsDict(PdfName.EF);
+        if (ef == null) {
+            return;
+        }
+        PdfString fn = filespec.getAsString(PdfName.F);
+        System.out.println("Unpacking file '" + fn + "' to " + outPath);
+        if (fn == null) {
+            return;
+        }
+        File fLast = new File(fn.toUnicodeString());
+        File fullPath = new File(outPath, fLast.getName());
+        if (fullPath.exists()) {
+            return;
+        }
+        PRStream prs = (PRStream) PdfReader.getPdfObject(ef.get(PdfName.F));
+        if (prs == null) {
+            return;
+        }
+        byte[] b = PdfReader.getStreamBytes(prs);
+        FileOutputStream fout = new FileOutputStream(fullPath);
+        fout.write(b);
+        fout.close();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -92,9 +146,10 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null)
+            if (getValue("srcfile") == null) {
                 throw new InstantiationException(
                         "You need to choose a sourcefile");
+            }
             File src = (File) getValue("srcfile");
 
             // we create a reader for a certain document
@@ -121,13 +176,15 @@ public void execute() {
             }
             for (int k = 1; k <= reader.getNumberOfPages(); ++k) {
                 PdfArray annots = reader.getPageN(k).getAsArray(PdfName.ANNOTS);
-                if (annots == null)
+                if (annots == null) {
                     continue;
+                }
                 for (PdfObject pdfObject : annots.getElements()) {
                     PdfDictionary annot = (PdfDictionary) PdfReader.getPdfObject(pdfObject);
                     PdfName subType = annot.getAsName(PdfName.SUBTYPE);
-                    if (!PdfName.FILEATTACHMENT.equals(subType))
+                    if (!PdfName.FILEATTACHMENT.equals(subType)) {
                         continue;
+                    }
                     PdfDictionary filespec = annot.getAsDict(PdfName.FS);
                     unpackFile(reader, filespec, outPath);
                 }
@@ -139,9 +196,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -153,65 +209,12 @@ public void valueHasChanged(AbstractArgument arg) {
     }
 
     /**
-     * Extract the attachments of a PDF.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        ExtractAttachments tool = new ExtractAttachments();
-        if (args.length < 1) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
         throw new InstantiationException("There is more than one destfile.");
     }
 
-    /**
-     * Unpacks a file attachment.
-     *
-     * @param reader
-     *            The object that reads the PDF document
-     * @param filespec
-     *            The dictionary containing the file specifications
-     * @param outPath
-     *            The path where the attachment has to be written
-     * @throws IOException on error
-     */
-    public static void unpackFile(PdfReader reader, PdfDictionary filespec,
-            String outPath) throws IOException {
-        if (filespec == null)
-            return;
-        PdfName type = filespec.getAsName(PdfName.TYPE);
-        if (!PdfName.F.equals(type) && !PdfName.FILESPEC.equals(type))
-            return;
-        PdfDictionary ef =filespec.getAsDict(PdfName.EF);
-        if (ef == null)
-            return;
-        PdfString fn = filespec.getAsString(PdfName.F);
-        System.out.println("Unpacking file '" + fn + "' to " + outPath);
-        if (fn == null)
-            return;
-        File fLast = new File(fn.toUnicodeString());
-        File fullPath = new File(outPath, fLast.getName());
-        if (fullPath.exists())
-            return;
-        PRStream prs = (PRStream) PdfReader.getPdfObject(ef.get(PdfName.F));
-        if (prs == null)
-            return;
-        byte[] b = PdfReader.getStreamBytes(prs);
-        FileOutputStream fout = new FileOutputStream(fullPath);
-        fout.write(b);
-        fout.close();
-    }
-
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Handouts.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Handouts.java
index e70dabf62..282da5139 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Handouts.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Handouts.java
@@ -35,12 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Rectangle;
@@ -53,9 +47,14 @@
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.OptionArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * Generates a PDF file that is usable as Handout.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Handouts extends AbstractTool {
@@ -69,7 +68,8 @@ public class Handouts extends AbstractTool {
      */
     public Handouts() {
         arguments.add(new FileArgument(this, "srcfile", "The file you want to convert", false, new PdfFilter()));
-        arguments.add(new FileArgument(this, "destfile", "The file to which the Handout has to be written", true, new PdfFilter()));
+        arguments.add(new FileArgument(this, "destfile", "The file to which the Handout has to be written", true,
+                new PdfFilter()));
         OptionArgument oa = new OptionArgument(this, "pages", "The number of pages you want on one handout page");
         oa.addOption("2 pages on 1", "2");
         oa.addOption("3 pages on 1", "3");
@@ -81,6 +81,20 @@ public Handouts() {
         arguments.add(oa);
     }
 
+    /**
+     * Converts a PDF file to a PDF file usable as Handout.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Handouts tool = new Handouts();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -96,15 +110,18 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null) throw new InstantiationException("You need to choose a sourcefile");
-            File src = (File)getValue("srcfile");
-            if (getValue("destfile") == null) throw new InstantiationException("You need to choose a destination file");
-            File dest = (File)getValue("destfile");
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            File src = (File) getValue("srcfile");
+            if (getValue("destfile") == null) {
+                throw new InstantiationException("You need to choose a destination file");
+            }
+            File dest = (File) getValue("destfile");
             int pages;
             try {
                 pages = Integer.parseInt((String) getValue("pages"));
-            }
-            catch(Exception e) {
+            } catch (Exception e) {
                 pages = 4;
             }
 
@@ -155,8 +172,7 @@ public void execute() {
                 rotation = reader.getPageRotation(i);
                 if (rotation == 90 || rotation == 270) {
                     cb.addTemplate(page, 0, -factor, factor, 0, x1 + dx, y2[p] + dy + rect.getHeight() * factor);
-                }
-                else {
+                } else {
                     cb.addTemplate(page, factor, 0, 0, factor, x1 + dx, y2[p] + dy);
                 }
                 cb.setRGBColorStroke(0xC0, 0xC0, 0xC0);
@@ -176,8 +192,7 @@ public void execute() {
             }
             // step 5: we close the document
             document.close();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             JOptionPane.showMessageDialog(internalFrame,
                     e.getMessage(),
                     e.getClass().getName(),
@@ -187,9 +202,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -199,28 +213,12 @@ public void valueHasChanged(AbstractArgument arg) {
         // represent the changes of the argument in the internal frame
     }
 
-
-    /**
-     * Converts a PDF file to a PDF file usable as Handout.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        Handouts tool = new Handouts();
-        if (args.length < 2) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile");
+        return (File) getValue("destfile");
     }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/HtmlBookmarks.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/HtmlBookmarks.java
index c289ee9c9..c2ac1dfb6 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/HtmlBookmarks.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/HtmlBookmarks.java
@@ -48,14 +48,6 @@
  */
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.Anchor;
 import com.lowagie.text.Chapter;
 import com.lowagie.text.Chunk;
@@ -73,9 +65,17 @@
 import com.lowagie.toolbox.arguments.StringArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
 import com.lowagie.tools.Executable;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * Allows you to generate an index file in HTML containing Bookmarks to an existing PDF file.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class HtmlBookmarks extends AbstractTool {
@@ -93,6 +93,92 @@ public HtmlBookmarks() {
         arguments.add(new StringArgument(this, "css", "The path to a CSS file"));
     }
 
+    /**
+     * Recursive method to write Bookmark titles to the System.out.
+     *
+     * @param pdf      the path to the PDF file
+     * @param section  the section to which the bookmarks should be added
+     * @param bookmark a Map containing a Bookmark (and possible kids)
+     */
+    private static void addBookmark(String pdf, Section section, Map bookmark) {
+        Section s = createBookmark(pdf, section, bookmark);
+        // As long as the Definition of mapList and kids is recursive, we have to work with unchecked casts
+        @SuppressWarnings("unchecked")
+        List> kids = (List>) bookmark.get("Kids");
+        if (kids == null) {
+            return;
+        }
+        for (Map kid : kids) {
+            addBookmark(pdf, s, kid);
+        }
+    }
+
+    /**
+     * Adds a line with the title and an anchor.
+     *
+     * @param pdf      the link to the PDF file
+     * @param section  the section that gets the line
+     * @param bookmark the bookmark that has the data for the line
+     * @return a subsection of section
+     */
+    private static Section createBookmark(String pdf, Section section, Map bookmark) {
+        Section s;
+        Paragraph title = new Paragraph((String) bookmark.get("Title"));
+        System.out.println((String) bookmark.get("Title"));
+        String action = (String) bookmark.get("Action");
+        if ("GoTo".equals(action)) {
+            if (bookmark.get("Page") != null) {
+                String page = (String) bookmark.get("Page");
+                StringTokenizer tokens = new StringTokenizer(page);
+                String token = tokens.nextToken();
+                Anchor anchor = new Anchor(" page" + token);
+                anchor.setReference(pdf + "#page=" + token);
+                title.add(anchor);
+            }
+        } else if ("URI".equals(action)) {
+            String url = (String) bookmark.get("URI");
+            Anchor anchor = new Anchor(" Goto URL");
+            anchor.setReference(url);
+            title.add(anchor);
+        } else if ("GoToR".equals(action)) {
+            String remote = (String) bookmark.get("File");
+            Anchor anchor = new Anchor(" goto " + remote);
+            if (bookmark.get("Named") != null) {
+                String named = (String) bookmark.get("Named");
+                remote = remote + "#nameddest=" + named;
+            } else if (bookmark.get("Page") != null) {
+                String page = (String) bookmark.get("Page");
+                StringTokenizer tokens = new StringTokenizer(page);
+                String token = tokens.nextToken();
+                anchor.add(new Chunk(" page " + token));
+                remote = remote + "#page=" + token;
+            }
+            anchor.setReference(remote);
+            title.add(anchor);
+        }
+        if (section == null) {
+            s = new Chapter(title, 0);
+        } else {
+            s = section.addSection(title);
+        }
+        s.setNumberDepth(0);
+        return s;
+    }
+
+    /**
+     * Allows you to generate an index file in HTML containing Bookmarks to an existing PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        HtmlBookmarks tool = new HtmlBookmarks();
+        if (args.length < 1) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -108,14 +194,15 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null) throw new InstantiationException("You need to choose a sourcefile");
-            File src = (File)getValue("srcfile");
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            File src = (File) getValue("srcfile");
             PdfReader reader;
             if (getValue("ownerpassword") == null) {
                 reader = new PdfReader(src.getAbsolutePath());
-            }
-            else {
-                reader = new PdfReader(src.getAbsolutePath(), ((String)getValue("ownerpassword")).getBytes());
+            } else {
+                reader = new PdfReader(src.getAbsolutePath(), ((String) getValue("ownerpassword")).getBytes());
             }
             File directory = src.getParentFile();
             String name = src.getName();
@@ -128,22 +215,26 @@ public void execute() {
                 document.add(new Header(HtmlTags.STYLESHEET, css.toString()));
             }
             Object title = reader.getInfo().get("Title");
-            if (title == null)
+            if (title == null) {
                 document.addTitle("Index for " + src.getName());
-            else
+            } else {
                 document.addKeywords("Index for '" + title + "'");
+            }
             String keywords = reader.getInfo().get("Keywords");
-            if (keywords != null)
+            if (keywords != null) {
                 document.addKeywords(keywords);
+            }
             String description = reader.getInfo().get("Subject");
-            if (keywords != null)
+            if (keywords != null) {
                 document.addSubject(description);
+            }
             document.open();
             Paragraph t;
-            if (title == null)
+            if (title == null) {
                 t = new Paragraph("Index for " + src.getName());
-            else
+            } else {
                 t = new Paragraph("Index for '" + title + "'");
+            }
             document.add(t);
             if (description != null) {
                 Paragraph d = new Paragraph(description);
@@ -152,8 +243,7 @@ public void execute() {
             List> mapList = SimpleBookmark.getBookmarkList(reader);
             if (mapList == null) {
                 document.add(new Paragraph("This document has no bookmarks."));
-            }
-            else {
+            } else {
                 for (Map map : mapList) {
                     Chapter chapter = (Chapter) createBookmark(src.getName(), null, map);
                     // As long as the Definition of mapList and kids is recursive, we have to work with unchecked casts
@@ -169,8 +259,7 @@ public void execute() {
             }
             document.close();
             Executable.launchBrowser(html.getAbsolutePath());
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             JOptionPane.showMessageDialog(internalFrame,
                     e.getMessage(),
@@ -181,81 +270,8 @@ public void execute() {
     }
 
     /**
-     * Recursive method to write Bookmark titles to the System.out.
-     * @param pdf the path to the PDF file
-     * @param section the section to which the bookmarks should be added
-     * @param bookmark a Map containing a Bookmark (and possible kids)
-     */
-    private static void addBookmark(String pdf, Section section, Map bookmark) {
-        Section s = createBookmark(pdf, section, bookmark);
-        // As long as the Definition of mapList and kids is recursive, we have to work with unchecked casts
-        @SuppressWarnings("unchecked")
-        List> kids = (List>) bookmark.get("Kids");
-        if (kids == null) return;
-        for (Map kid : kids) {
-            addBookmark(pdf, s, kid);
-        }
-    }
-
-    /**
-     * Adds a line with the title and an anchor.
-     * @param pdf the link to the PDF file
-     * @param section the section that gets the line
-     * @param bookmark the bookmark that has the data for the line
-     * @return a subsection of section
-     */
-    private static Section createBookmark(String pdf, Section section, Map bookmark) {
-        Section s;
-        Paragraph title = new Paragraph((String)bookmark.get("Title"));
-        System.out.println((String)bookmark.get("Title"));
-        String action = (String)bookmark.get("Action");
-        if ("GoTo".equals(action)) {
-            if (bookmark.get("Page") != null) {
-                String page = (String)bookmark.get("Page");
-                StringTokenizer tokens = new StringTokenizer(page);
-                String token = tokens.nextToken();
-                Anchor anchor = new Anchor(" page" + token);
-                anchor.setReference(pdf + "#page=" + token);
-                title.add(anchor);
-            }
-        }
-        else if ("URI".equals(action)) {
-            String url = (String)bookmark.get("URI");
-            Anchor anchor = new Anchor(" Goto URL");
-            anchor.setReference(url);
-            title.add(anchor);
-        }
-        else if ("GoToR".equals(action)) {
-            String remote = (String)bookmark.get("File");
-            Anchor anchor = new Anchor(" goto " + remote);
-            if (bookmark.get("Named") != null) {
-                String named = (String)bookmark.get("Named");
-                remote = remote + "#nameddest=" + named;
-            }
-            else if (bookmark.get("Page") != null) {
-                String page = (String)bookmark.get("Page");
-                StringTokenizer tokens = new StringTokenizer(page);
-                String token = tokens.nextToken();
-                anchor.add(new Chunk(" page " + token));
-                remote = remote + "#page=" + token;
-            }
-            anchor.setReference(remote);
-            title.add(anchor);
-        }
-        if (section == null) {
-            s = new Chapter(title, 0);
-        }
-        else {
-            s = section.addSection(title);
-        }
-        s.setNumberDepth(0);
-        return s;
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -266,24 +282,9 @@ public void valueHasChanged(AbstractArgument arg) {
     }
 
     /**
-     * Allows you to generate an index file in HTML containing Bookmarks to an existing PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        HtmlBookmarks tool = new HtmlBookmarks();
-        if (args.length < 1) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
         throw new InstantiationException("There is no file to show.");
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ImageXRefViewer.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ImageXRefViewer.java
index 3697e56f3..c32de976d 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ImageXRefViewer.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ImageXRefViewer.java
@@ -35,13 +35,22 @@
 
 package com.lowagie.toolbox.plugins;
 
+import com.lowagie.text.pdf.PRStream;
+import com.lowagie.text.pdf.PdfName;
+import com.lowagie.text.pdf.PdfObject;
+import com.lowagie.text.pdf.PdfReader;
+import com.lowagie.text.pdf.PdfStream;
+import com.lowagie.toolbox.AbstractTool;
+import com.lowagie.toolbox.arguments.AbstractArgument;
+import com.lowagie.toolbox.arguments.FileArgument;
+import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import com.lowagie.toolbox.swing.EventDispatchingThread;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Cursor;
 import java.awt.Toolkit;
 import java.io.File;
 import java.io.IOException;
-
 import javax.swing.BorderFactory;
 import javax.swing.JInternalFrame;
 import javax.swing.JLabel;
@@ -53,54 +62,32 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import com.lowagie.text.pdf.PRStream;
-import com.lowagie.text.pdf.PdfName;
-import com.lowagie.text.pdf.PdfObject;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.PdfStream;
-import com.lowagie.toolbox.AbstractTool;
-import com.lowagie.toolbox.arguments.AbstractArgument;
-import com.lowagie.toolbox.arguments.FileArgument;
-import com.lowagie.toolbox.arguments.filters.PdfFilter;
-import com.lowagie.toolbox.swing.EventDispatchingThread;
-
 /**
  * Allows you to inspect the Image XObjects inside a PDF file.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class ImageXRefViewer extends AbstractTool {
 
-    class SpinnerListener implements ChangeListener {
-        private ImageXRefViewer adaptee;
-        SpinnerListener(ImageXRefViewer adaptee) {
-            this.adaptee = adaptee;
-        }
-
-        /**
-         *
-         * @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent)
-         * @param e ChangeEvent
-         */
-        public void stateChanged(ChangeEvent e) {
-            adaptee.propertyChange(e);
-        }
-    }
-
-
     static {
         addVersion("$Id: ImageXRefViewer.java 3271 2008-04-18 20:39:42Z xlv $");
     }
 
-    /** The total number of pictures inside the PDF. */
+    /**
+     * The total number of pictures inside the PDF.
+     */
     int total_number_of_pictures = 0;
-
-    /** The spinner that will allow you to select an image. */
+    /**
+     * The spinner that will allow you to select an image.
+     */
     JSpinner jSpinner = new JSpinner();
-
-    /** The panel that will show the images. */
+    /**
+     * The panel that will show the images.
+     */
     JPanel image_panel = new JPanel();
-
-    /** The layout with the images. */
+    /**
+     * The layout with the images.
+     */
     CardLayout layout = new CardLayout();
 
     /**
@@ -112,10 +99,23 @@ public ImageXRefViewer() {
     }
 
     /**
+     * Shows the images that are in the PDF as Image XObjects.
      *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        ImageXRefViewer tool = new ImageXRefViewer();
+        if (args.length < 1) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
+    /**
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
         throw new InstantiationException("There is no file to show.");
@@ -162,9 +162,8 @@ protected void createFrame() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         // do nothing
@@ -189,29 +188,16 @@ public void propertyChange(ChangeEvent evt) {
         image_panel.repaint();
     }
 
-    /**
-     * Shows the images that are in the PDF as Image XObjects.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        ImageXRefViewer tool = new ImageXRefViewer();
-        if (args.length < 1) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
     /**
      * @see com.lowagie.toolbox.AbstractTool#execute()
      */
     public void execute() {
         total_number_of_pictures = 0;
         try {
-            if (getValue("srcfile") == null)
+            if (getValue("srcfile") == null) {
                 throw new InstantiationException(
                         "You need to choose a sourcefile");
+            }
             EventDispatchingThread task = new EventDispatchingThread() {
                 public Object construct() {
                     try {
@@ -265,4 +251,21 @@ public Object construct() {
             System.err.println(e.getMessage());
         }
     }
+
+    class SpinnerListener implements ChangeListener {
+
+        private ImageXRefViewer adaptee;
+
+        SpinnerListener(ImageXRefViewer adaptee) {
+            this.adaptee = adaptee;
+        }
+
+        /**
+         * @param e ChangeEvent
+         * @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent)
+         */
+        public void stateChanged(ChangeEvent e) {
+            adaptee.propertyChange(e);
+        }
+    }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/InspectPDF.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/InspectPDF.java
index 18090adc9..89bc5b94f 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/InspectPDF.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/InspectPDF.java
@@ -35,12 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.util.Map;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.pdf.PdfEncryptor;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.toolbox.AbstractTool;
@@ -48,12 +42,18 @@
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.StringArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.util.Map;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * Allows you to inspect an existing PDF file.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class InspectPDF extends AbstractTool {
+
     static {
         addVersion("$Id: InspectPDF.java 3826 2009-03-31 17:46:18Z blowagie $");
     }
@@ -66,6 +66,20 @@ public InspectPDF() {
         arguments.add(new StringArgument(this, "ownerpassword", "The owner password if the file is encrypt"));
     }
 
+    /**
+     * Inspects an existing PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        InspectPDF tool = new InspectPDF();
+        if (args.length < 1) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -81,13 +95,15 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null) throw new InstantiationException("You need to choose a sourcefile");
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
             PdfReader reader;
             if (getValue("ownerpassword") == null) {
-                reader = new PdfReader(((File)getValue("srcfile")).getAbsolutePath());
-            }
-            else {
-                reader = new PdfReader(((File)getValue("srcfile")).getAbsolutePath(), ((String)getValue("ownerpassword")).getBytes());
+                reader = new PdfReader(((File) getValue("srcfile")).getAbsolutePath());
+            } else {
+                reader = new PdfReader(((File) getValue("srcfile")).getAbsolutePath(),
+                        ((String) getValue("ownerpassword")).getBytes());
             }
             // Some general document information and page size
             System.out.println("=== Document Information ===");
@@ -106,19 +122,17 @@ public void execute() {
             Map info = reader.getInfo();
             String key;
             String value;
-            for (Map.Entry entry: info.entrySet()) {
+            for (Map.Entry entry : info.entrySet()) {
                 key = entry.getKey();
                 value = entry.getValue();
                 System.out.println(key + ": " + value);
             }
             if (reader.getMetadata() == null) {
                 System.out.println("There is no XML Metadata in the file");
-            }
-            else {
+            } else {
                 System.out.println("XML Metadata: " + new String(reader.getMetadata()));
             }
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             JOptionPane.showMessageDialog(internalFrame,
                     e.getMessage(),
                     e.getClass().getName(),
@@ -128,9 +142,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -141,24 +154,9 @@ public void valueHasChanged(AbstractArgument arg) {
     }
 
     /**
-     * Inspects an existing PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        InspectPDF tool = new InspectPDF();
-        if (args.length < 1) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
         throw new InstantiationException("There is no file to show.");
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/NUp.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/NUp.java
index fcaad4cd3..e810ddfde 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/NUp.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/NUp.java
@@ -35,11 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfContentByte;
@@ -51,9 +46,13 @@
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.OptionArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
 
 /**
  * This tool lets you generate a PDF that shows N pages on 1.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class NUp extends AbstractTool {
@@ -79,6 +78,20 @@ public NUp() {
         arguments.add(oa);
     }
 
+    /**
+     * Generates an NUp version of an existing PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        NUp tool = new NUp();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -94,15 +107,18 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null) throw new InstantiationException("You need to choose a sourcefile");
-            File src = (File)getValue("srcfile");
-            if (getValue("destfile") == null) throw new InstantiationException("You need to choose a destination file");
-            File dest = (File)getValue("destfile");
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            File src = (File) getValue("srcfile");
+            if (getValue("destfile") == null) {
+                throw new InstantiationException("You need to choose a destination file");
+            }
+            File dest = (File) getValue("destfile");
             int pow2;
             try {
                 pow2 = Integer.parseInt((String) getValue("pow2"));
-            }
-            catch(Exception e) {
+            } catch (Exception e) {
                 pow2 = 1;
             }
             // we create a reader for a certain document
@@ -111,14 +127,15 @@ public void execute() {
             int total = reader.getNumberOfPages();
             System.out.println("There are " + total + " pages in the original file.");
             Rectangle pageSize = reader.getPageSize(1);
-            Rectangle newSize = (pow2 % 2) == 0 ? new Rectangle(pageSize.getWidth(), pageSize.getHeight()) : new Rectangle(pageSize.getHeight(), pageSize.getWidth());
+            Rectangle newSize = (pow2 % 2) == 0 ? new Rectangle(pageSize.getWidth(), pageSize.getHeight())
+                    : new Rectangle(pageSize.getHeight(), pageSize.getWidth());
             Rectangle unitSize = new Rectangle(pageSize.getWidth(), pageSize.getHeight());
             Rectangle currentSize;
             for (int i = 0; i < pow2; i++) {
                 unitSize = new Rectangle(unitSize.getHeight() / 2, unitSize.getWidth());
             }
-            int n = (int)Math.pow(2, pow2);
-            int r = (int)Math.pow(2, pow2 / 2);
+            int n = (int) Math.pow(2, pow2);
+            int r = (int) Math.pow(2, pow2 / 2);
             int c = n / r;
             // step 1: creation of a document-object
             Document document = new Document(newSize, 0, 0, 0, 0);
@@ -139,7 +156,8 @@ public void execute() {
                 offsetX = unitSize.getWidth() * ((i % n) % c);
                 offsetY = newSize.getHeight() - (unitSize.getHeight() * (((i % n) / c) + 1));
                 currentSize = reader.getPageSize(p);
-                factor = Math.min(unitSize.getWidth() / currentSize.getWidth(), unitSize.getHeight() / currentSize.getHeight());
+                factor = Math.min(unitSize.getWidth() / currentSize.getWidth(),
+                        unitSize.getHeight() / currentSize.getHeight());
                 offsetX += (unitSize.getWidth() - (currentSize.getWidth() * factor)) / 2f;
                 offsetY += (unitSize.getHeight() - (currentSize.getHeight() * factor)) / 2f;
                 page = writer.getImportedPage(reader, p);
@@ -147,16 +165,14 @@ public void execute() {
             }
             // step 5: we close the document
             document.close();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -166,28 +182,12 @@ public void valueHasChanged(AbstractArgument arg) {
         // represent the changes of the argument in the internal frame
     }
 
-
     /**
-     * Generates an NUp version of an existing PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        NUp tool = new NUp();
-        if (args.length < 2) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile");
+        return (File) getValue("destfile");
     }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Normalize.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Normalize.java
index 6025e321d..c6965d6e9 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Normalize.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Normalize.java
@@ -26,13 +26,6 @@
  */
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfArray;
 import com.lowagie.text.pdf.PdfDictionary;
@@ -46,371 +39,369 @@
 import com.lowagie.toolbox.arguments.AbstractArgument;
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import javax.swing.JInternalFrame;
 
 /**
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Normalize
-    extends AbstractTool {
-
-  static {
-    addVersion("$Id: Normalize.java 3736 2009-02-26 08:52:21Z xlv $");
-  }
-
-  FileArgument destfile = null;
-  /**
-   * Constructs a Burst object.
-   */
-  public Normalize() {
-    menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
-    FileArgument inputfile = new FileArgument(this, "srcfile",
-                                   "The file you want to normalize", false,
-                                   new PdfFilter());
-    arguments.add(inputfile);
-    destfile = new FileArgument(this, "destfile", "The resulting PDF", true,
-                                   new PdfFilter());
-    arguments.add(destfile);
-    inputfile.addPropertyChangeListener(destfile);
-  }
+        extends AbstractTool {
 
-/**
- * @see com.lowagie.toolbox.AbstractTool#createFrame()
- */
-protected void createFrame() {
-    internalFrame = new JInternalFrame("Normalize", true, false, true);
-    internalFrame.setSize(300, 80);
-    internalFrame.setJMenuBar(getMenubar());
-    System.out.println("=== Normalize OPENED ===");
-  }
-
-  int pagecount;
-  float width;
-  float height;
-  PdfDictionary lastpage = null;
-  float tolerancex = 60;
-  float tolerancey = 60;
-  int pagecountinsertedpages;
-  int pagecountrotatedpages;
-
-  protected void iteratePages(PdfDictionary page, PdfReader pdfreader,
-                              ArrayList pageInh,
-                              int count_in_leaf, PdfWriter writer) throws
-      IOException {
-    float curwidth;
-    float curheight;
-    PdfArray kidsPR = page.getAsArray(PdfName.KIDS);
-
-    if (kidsPR == null) {
-      PdfArray arr = page.getAsArray(PdfName.MEDIABOX);
-      curwidth = Float.parseFloat(arr.getPdfObject(2).toString());
-      curheight = Float.parseFloat(arr.getPdfObject(3).toString());
-
-      PdfNumber rotation = page.getAsNumber(PdfName.ROTATE);
-
-      if (rotation == null) {
-        System.out.println("optional rotation missing");
-        rotation = new PdfNumber(0);
-      }
-
-      Ausrichtung ausr = new Ausrichtung(rotation.floatValue(),
-                                         new Rectangle(curwidth, curheight));
-
-      switch (ausr.type) {
-        case Ausrichtung.A4Landscape:
-        case Ausrichtung.A3Portrait:
-          ausr.rotate();
-          page.put(PdfName.ROTATE, new PdfNumber(ausr.getRotation()));
-          System.out.println("rotate page:" + (pagecount + 1) + " targetformat: " +
-                             ausr);
-          this.pagecountrotatedpages++;
-
-          break;
-      }
-
-      curwidth = ausr.getM5();
-      curheight = ausr.getM6();
-
-      if ( ( (pagecount + 1) % 2) == 0) {
-        if ( (Math.abs(curwidth - width) > tolerancex) ||
-            (Math.abs(curheight - height) > tolerancey)) {
-          Seitehinzufuegen(page, count_in_leaf, writer, arr);
-          this.pagecountinsertedpages++;
+    static {
+        addVersion("$Id: Normalize.java 3736 2009-02-26 08:52:21Z xlv $");
+    }
+
+    FileArgument destfile = null;
+    int pagecount;
+    float width;
+    float height;
+    PdfDictionary lastpage = null;
+    float tolerancex = 60;
+    float tolerancey = 60;
+    int pagecountinsertedpages;
+    int pagecountrotatedpages;
+
+    /**
+     * Constructs a Burst object.
+     */
+    public Normalize() {
+        menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
+        FileArgument inputfile = new FileArgument(this, "srcfile",
+                "The file you want to normalize", false,
+                new PdfFilter());
+        arguments.add(inputfile);
+        destfile = new FileArgument(this, "destfile", "The resulting PDF", true,
+                new PdfFilter());
+        arguments.add(destfile);
+        inputfile.addPropertyChangeListener(destfile);
+    }
+
+    /**
+     * Normalize PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Normalize tool = new Normalize();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
         }
-      }
-
-      /**
-       * Bei ungeraden Seiten die Seitenabmessungen speichern
-       */
-      if ( ( (pagecount + 1) % 2) == 1) {
-        width = curwidth;
-        height = curheight;
-        lastpage = page;
-      }
-
-      pageInh.add(pagecount, page);
-      pagecount++;
+        tool.setMainArguments(args);
+        tool.execute();
     }
-    else {
-      page.put(PdfName.TYPE, PdfName.PAGES);
 
-      for (int k = 0; k < kidsPR.size(); ++k) {
-        PdfDictionary kid = kidsPR.getAsDict(k);
-        iteratePages(kid, pdfreader, pageInh, k, writer);
-      }
+    /**
+     * @see com.lowagie.toolbox.AbstractTool#createFrame()
+     */
+    protected void createFrame() {
+        internalFrame = new JInternalFrame("Normalize", true, false, true);
+        internalFrame.setSize(300, 80);
+        internalFrame.setJMenuBar(getMenubar());
+        System.out.println("=== Normalize OPENED ===");
     }
-  }
 
-  private void Seitehinzufuegen(PdfDictionary page, int count_in_leaf,
-                                PdfWriter writer,
-                                PdfArray array) throws IOException {
-    System.out.print("change!");
+    protected void iteratePages(PdfDictionary page, PdfReader pdfreader,
+            ArrayList pageInh,
+            int count_in_leaf, PdfWriter writer) throws
+            IOException {
+        float curwidth;
+        float curheight;
+        PdfArray kidsPR = page.getAsArray(PdfName.KIDS);
+
+        if (kidsPR == null) {
+            PdfArray arr = page.getAsArray(PdfName.MEDIABOX);
+            curwidth = Float.parseFloat(arr.getPdfObject(2).toString());
+            curheight = Float.parseFloat(arr.getPdfObject(3).toString());
+
+            PdfNumber rotation = page.getAsNumber(PdfName.ROTATE);
+
+            if (rotation == null) {
+                System.out.println("optional rotation missing");
+                rotation = new PdfNumber(0);
+            }
+
+            Ausrichtung ausr = new Ausrichtung(rotation.floatValue(),
+                    new Rectangle(curwidth, curheight));
+
+            switch (ausr.type) {
+                case Ausrichtung.A4Landscape:
+                case Ausrichtung.A3Portrait:
+                    ausr.rotate();
+                    page.put(PdfName.ROTATE, new PdfNumber(ausr.getRotation()));
+                    System.out.println("rotate page:" + (pagecount + 1) + " targetformat: " +
+                            ausr);
+                    this.pagecountrotatedpages++;
+
+                    break;
+            }
+
+            curwidth = ausr.getM5();
+            curheight = ausr.getM6();
+
+            if (((pagecount + 1) % 2) == 0) {
+                if ((Math.abs(curwidth - width) > tolerancex) ||
+                        (Math.abs(curheight - height) > tolerancey)) {
+                    Seitehinzufuegen(page, count_in_leaf, writer, arr);
+                    this.pagecountinsertedpages++;
+                }
+            }
+
+            /**
+             * Bei ungeraden Seiten die Seitenabmessungen speichern
+             */
+            if (((pagecount + 1) % 2) == 1) {
+                width = curwidth;
+                height = curheight;
+                lastpage = page;
+            }
+
+            pageInh.add(pagecount, page);
+            pagecount++;
+        } else {
+            page.put(PdfName.TYPE, PdfName.PAGES);
+
+            for (int k = 0; k < kidsPR.size(); ++k) {
+                PdfDictionary kid = kidsPR.getAsDict(k);
+                iteratePages(kid, pdfreader, pageInh, k, writer);
+            }
+        }
+    }
 
-    PdfDictionary parent = page.getAsDict(PdfName.PARENT);
-    PdfArray kids = parent.getAsArray(PdfName.KIDS);
-    PdfIndirectReference ref = writer.getPdfIndirectReference();
-    kids.add(count_in_leaf, ref);
+    private void Seitehinzufuegen(PdfDictionary page, int count_in_leaf,
+            PdfWriter writer,
+            PdfArray array) throws IOException {
+        System.out.print("change!");
 
-    PdfDictionary newPage = new PdfDictionary(PdfName.PAGE);
-    newPage.merge(lastpage);
-    newPage.remove(PdfName.CONTENTS);
-    newPage.remove(PdfName.ANNOTS);
-    newPage.put(PdfName.RESOURCES, new PdfDictionary());
-    writer.addToBody(newPage, ref);
+        PdfDictionary parent = page.getAsDict(PdfName.PARENT);
+        PdfArray kids = parent.getAsArray(PdfName.KIDS);
+        PdfIndirectReference ref = writer.getPdfIndirectReference();
+        kids.add(count_in_leaf, ref);
 
-    PdfNumber count = null;
+        PdfDictionary newPage = new PdfDictionary(PdfName.PAGE);
+        newPage.merge(lastpage);
+        newPage.remove(PdfName.CONTENTS);
+        newPage.remove(PdfName.ANNOTS);
+        newPage.put(PdfName.RESOURCES, new PdfDictionary());
+        writer.addToBody(newPage, ref);
 
-    while (parent != null) {
-      count = parent.getAsNumber(PdfName.COUNT);
+        PdfNumber count = null;
 
-      parent.put(PdfName.COUNT, new PdfNumber(count.intValue() + 1));
-      parent = parent.getAsDict(PdfName.PARENT);
-    }
+        while (parent != null) {
+            count = parent.getAsNumber(PdfName.COUNT);
 
-    System.out.println("page:" + (pagecount + 1) + " nr in leaf:" +
-                       count_in_leaf + " arl x:" +
-                       array.getPdfObject(0) + " y:" + array.getPdfObject(1) + " width:" + array.getPdfObject(2) +
-                       " height:" + array.getPdfObject(3));
-  }
+            parent.put(PdfName.COUNT, new PdfNumber(count.intValue() + 1));
+            parent = parent.getAsDict(PdfName.PARENT);
+        }
 
-/**
- * @see com.lowagie.toolbox.AbstractTool#execute()
- */
-public void execute() {
-    try {
-      if (getValue("srcfile") == null) {
-        throw new InstantiationException("You need to choose a sourcefile");
-      }
-      File src = (File) getValue("srcfile");
-      if (getValue("destfile") == null) {
-        throw new InstantiationException(
-            "You need to choose a destination file");
-      }
-      File dest = (File) getValue("destfile");
-
-      pagecountinsertedpages = 0;
-      pagecountrotatedpages = 0;
-      pagecount = 0;
-      PdfReader reader = new PdfReader(src.getAbsolutePath());
-      PdfStamper stp = new PdfStamper(reader, new FileOutputStream(dest));
-
-      PdfWriter writer = stp.getWriter();
-
-      ArrayList pageInh = new ArrayList<>();
-      PdfDictionary catalog = reader.getCatalog();
-      PdfDictionary rootPages = catalog.getAsDict(PdfName.PAGES);
-      iteratePages(rootPages, reader, pageInh, 0, writer);
-
-      if ( ( (pagecount) % 2) == 1) {
-        appendemptypageatend(reader, writer);
-        this.pagecountinsertedpages++;
-      }
-
-      stp.close();
-      System.out.println("In " + dest.getAbsolutePath() + " pages= " +
-                         pagecount +
-                         " inserted pages=" + this.getPagecountinsertedpages() +
-                         " rotated pages=" +
-                         this.getPagecountrotatedpages());
+        System.out.println("page:" + (pagecount + 1) + " nr in leaf:" +
+                count_in_leaf + " arl x:" +
+                array.getPdfObject(0) + " y:" + array.getPdfObject(1) + " width:" + array.getPdfObject(2) +
+                " height:" + array.getPdfObject(3));
     }
-    catch (Exception e) {
-      e.printStackTrace(System.out);
+
+    /**
+     * @see com.lowagie.toolbox.AbstractTool#execute()
+     */
+    public void execute() {
+        try {
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            File src = (File) getValue("srcfile");
+            if (getValue("destfile") == null) {
+                throw new InstantiationException(
+                        "You need to choose a destination file");
+            }
+            File dest = (File) getValue("destfile");
+
+            pagecountinsertedpages = 0;
+            pagecountrotatedpages = 0;
+            pagecount = 0;
+            PdfReader reader = new PdfReader(src.getAbsolutePath());
+            PdfStamper stp = new PdfStamper(reader, new FileOutputStream(dest));
+
+            PdfWriter writer = stp.getWriter();
+
+            ArrayList pageInh = new ArrayList<>();
+            PdfDictionary catalog = reader.getCatalog();
+            PdfDictionary rootPages = catalog.getAsDict(PdfName.PAGES);
+            iteratePages(rootPages, reader, pageInh, 0, writer);
+
+            if (((pagecount) % 2) == 1) {
+                appendemptypageatend(reader, writer);
+                this.pagecountinsertedpages++;
+            }
+
+            stp.close();
+            System.out.println("In " + dest.getAbsolutePath() + " pages= " +
+                    pagecount +
+                    " inserted pages=" + this.getPagecountinsertedpages() +
+                    " rotated pages=" +
+                    this.getPagecountrotatedpages());
+        } catch (Exception e) {
+            e.printStackTrace(System.out);
+        }
     }
-  }
-
-  private void appendemptypageatend(PdfReader reader, PdfWriter writer) throws
-      IOException {
-    System.out.println("last page odd. add page!");
-
-    PdfDictionary page = reader.getPageN(reader.getNumberOfPages());
-    PdfDictionary parent = page.getAsDict(PdfName.PARENT);
-    PdfArray kids = parent.getAsArray(PdfName.KIDS);
-    PdfIndirectReference ref = writer.getPdfIndirectReference();
-    kids.add(ref);
-
-    PdfDictionary newPage = new PdfDictionary(PdfName.PAGE);
-    newPage.merge(lastpage);
-    newPage.remove(PdfName.CONTENTS);
-    newPage.remove(PdfName.ANNOTS);
-    newPage.put(PdfName.RESOURCES, new PdfDictionary());
-    writer.addToBody(newPage, ref);
-
-    PdfNumber count = null;
-
-    while (parent != null) {
-      count = parent.getAsNumber(PdfName.COUNT);
-      parent.put(PdfName.COUNT, new PdfNumber(count.intValue() + 1));
-      parent = parent.getAsDict(PdfName.PARENT);
+
+    private void appendemptypageatend(PdfReader reader, PdfWriter writer) throws
+            IOException {
+        System.out.println("last page odd. add page!");
+
+        PdfDictionary page = reader.getPageN(reader.getNumberOfPages());
+        PdfDictionary parent = page.getAsDict(PdfName.PARENT);
+        PdfArray kids = parent.getAsArray(PdfName.KIDS);
+        PdfIndirectReference ref = writer.getPdfIndirectReference();
+        kids.add(ref);
+
+        PdfDictionary newPage = new PdfDictionary(PdfName.PAGE);
+        newPage.merge(lastpage);
+        newPage.remove(PdfName.CONTENTS);
+        newPage.remove(PdfName.ANNOTS);
+        newPage.put(PdfName.RESOURCES, new PdfDictionary());
+        writer.addToBody(newPage, ref);
+
+        PdfNumber count = null;
+
+        while (parent != null) {
+            count = parent.getAsNumber(PdfName.COUNT);
+            parent.put(PdfName.COUNT, new PdfNumber(count.intValue() + 1));
+            parent = parent.getAsDict(PdfName.PARENT);
+        }
     }
-  }
 
-  public int getPagecountinsertedpages() {
-    return pagecountinsertedpages;
-  }
+    public int getPagecountinsertedpages() {
+        return pagecountinsertedpages;
+    }
 
-  public int getPagecountrotatedpages() {
-    return pagecountrotatedpages;
-  }
+    public int getPagecountrotatedpages() {
+        return pagecountrotatedpages;
+    }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
-    if (internalFrame == null) {
-      // if the internal frame is null, the tool was called from the command line
-      return;
-    }
-    // represent the changes of the argument in the internal frame
-    if (destfile.getValue() == null && arg.getName().equalsIgnoreCase("srcfile")) {
-      String filename = arg.getValue().toString();
-      String filenameout = filename.substring(0, filename.indexOf(".",
-          filename.length() - 4)) + "_out.pdf";
-      destfile.setValue(filenameout);
-    }
-  }
-
-    /**
-     * Normalize PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-    Normalize tool = new Normalize();
-    if (args.length < 2) {
-      System.err.println(tool.getUsage());
+        if (internalFrame == null) {
+            // if the internal frame is null, the tool was called from the command line
+            return;
+        }
+        // represent the changes of the argument in the internal frame
+        if (destfile.getValue() == null && arg.getName().equalsIgnoreCase("srcfile")) {
+            String filename = arg.getValue().toString();
+            String filenameout = filename.substring(0, filename.indexOf(".",
+                    filename.length() - 4)) + "_out.pdf";
+            destfile.setValue(filenameout);
+        }
     }
-    tool.setMainArguments(args);
-    tool.execute();
-  }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-    return (File) getValue("destfile");
-  }
-
-  public class Ausrichtung {
-    static final float tolerance = 60;
-    static final int UNKNOWN = 0;
-    static final int A4Portrait = 1;
-    static final int A4Landscape = 2;
-    static final int A3Portrait = 3;
-    static final int A3Landscape = 4;
-    float rotation;
-    Rectangle rect;
-    float m5;
-    float m6;
-    int type;
-    public Ausrichtung() {
-      this(0, new Rectangle(1, 1));
+        return (File) getValue("destfile");
     }
 
-    public Ausrichtung(float rotation, Rectangle unrotatedoriginalrect) {
-      this.rotation = rotation;
-      if ( (rotation == 90) || (rotation == 270)) {
-        rect = unrotatedoriginalrect.rotate();
-      }
-      else {
-        rect = unrotatedoriginalrect;
-      }
+    public class Ausrichtung {
+
+        static final float tolerance = 60;
+        static final int UNKNOWN = 0;
+        static final int A4Portrait = 1;
+        static final int A4Landscape = 2;
+        static final int A3Portrait = 3;
+        static final int A3Landscape = 4;
+        float rotation;
+        Rectangle rect;
+        float m5;
+        float m6;
+        int type;
+
+        public Ausrichtung() {
+            this(0, new Rectangle(1, 1));
+        }
 
-      m5 = rect.getWidth();
-      m6 = rect.getHeight();
-      klassifiziere();
+        public Ausrichtung(float rotation, Rectangle unrotatedoriginalrect) {
+            this.rotation = rotation;
+            if ((rotation == 90) || (rotation == 270)) {
+                rect = unrotatedoriginalrect.rotate();
+            } else {
+                rect = unrotatedoriginalrect;
+            }
 
-    }
+            m5 = rect.getWidth();
+            m6 = rect.getHeight();
+            klassifiziere();
 
-    private void klassifiziere() {
-      if (Math.abs(rect.getWidth() - 595) < tolerance &&
-          Math.abs(rect.getHeight() - 842) < tolerance) {
-        this.type = A4Portrait;
-      }
-      else if (Math.abs(rect.getWidth() - 842) < tolerance &&
-               Math.abs(rect.getHeight() - 595) < tolerance) {
-        this.type = A4Landscape;
-      }
-      else if (Math.abs(rect.getWidth() - 1190) < tolerance &&
-               Math.abs(rect.getHeight() - 842) < tolerance) {
-        this.type = A3Landscape;
-      }
-      else if (Math.abs(rect.getWidth() - 842) < tolerance &&
-               Math.abs(rect.getHeight() - 1190) < tolerance) {
-        this.type = A3Portrait;
-      }
-      else {
-        type = UNKNOWN;
-      }
-    }
+        }
 
-    public float getM5() {
-      return m5;
-    }
+        private void klassifiziere() {
+            if (Math.abs(rect.getWidth() - 595) < tolerance &&
+                    Math.abs(rect.getHeight() - 842) < tolerance) {
+                this.type = A4Portrait;
+            } else if (Math.abs(rect.getWidth() - 842) < tolerance &&
+                    Math.abs(rect.getHeight() - 595) < tolerance) {
+                this.type = A4Landscape;
+            } else if (Math.abs(rect.getWidth() - 1190) < tolerance &&
+                    Math.abs(rect.getHeight() - 842) < tolerance) {
+                this.type = A3Landscape;
+            } else if (Math.abs(rect.getWidth() - 842) < tolerance &&
+                    Math.abs(rect.getHeight() - 1190) < tolerance) {
+                this.type = A3Portrait;
+            } else {
+                type = UNKNOWN;
+            }
+        }
 
-    public float getM6() {
-      return m6;
-    }
+        public float getM5() {
+            return m5;
+        }
 
-    public String toString() {
-      String back;
-      switch (type) {
-        case UNKNOWN:
-          back = rect.getWidth() + "*" + rect.getHeight();
-          break;
-        case A3Landscape:
-          back = "A3 Landscape";
-          break;
-        case A3Portrait:
-          back = "A3 Portrait";
-          break;
-        case A4Landscape:
-          back = "A4 Landscape";
-          break;
-        case A4Portrait:
-          back = "A4 Portrait";
-          break;
-        default:
-          back = "";
-      }
-      return back;
-    }
+        public float getM6() {
+            return m6;
+        }
 
-    public void rotate() {
-      rect = rect.rotate();
-      m5 = rect.getWidth();
-      m6 = rect.getHeight();
-      rotation += 90;
-      rotation = rotation % 360;
-      klassifiziere();
-    }
+        public String toString() {
+            String back;
+            switch (type) {
+                case UNKNOWN:
+                    back = rect.getWidth() + "*" + rect.getHeight();
+                    break;
+                case A3Landscape:
+                    back = "A3 Landscape";
+                    break;
+                case A3Portrait:
+                    back = "A3 Portrait";
+                    break;
+                case A4Landscape:
+                    back = "A4 Landscape";
+                    break;
+                case A4Portrait:
+                    back = "A4 Portrait";
+                    break;
+                default:
+                    back = "";
+            }
+            return back;
+        }
+
+        public void rotate() {
+            rect = rect.rotate();
+            m5 = rect.getWidth();
+            m6 = rect.getHeight();
+            rotation += 90;
+            rotation = rotation % 360;
+            klassifiziere();
+        }
 
-    public float getRotation() {
-      return rotation;
+        public float getRotation() {
+            return rotation;
+        }
     }
-  }
 
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/PhotoAlbum.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/PhotoAlbum.java
index 1e040ee5d..0d3ff1afd 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/PhotoAlbum.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/PhotoAlbum.java
@@ -37,16 +37,12 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.TreeSet;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Image;
 import com.lowagie.text.Rectangle;
+import com.lowagie.text.pdf.BaseFont;
+import com.lowagie.text.pdf.PdfContentByte;
+import com.lowagie.text.pdf.PdfGState;
 import com.lowagie.text.pdf.PdfPageLabels;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.toolbox.AbstractTool;
@@ -54,12 +50,15 @@
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.filters.DirFilter;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
-import com.lowagie.text.pdf.PdfGState;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.BaseFont;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.TreeSet;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * Converts the image files in a directory to a PDF file that acts as a photo album.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class PhotoAlbum extends AbstractTool {
@@ -75,10 +74,24 @@ public PhotoAlbum() {
         menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
         arguments.add(new FileArgument(this, "srcdir",
                 "The directory containing the image files", false,
-                                       new DirFilter()));
+                new DirFilter()));
         arguments.add(new FileArgument(this, "destfile",
                 "The file to which the converted TIFF has to be written", true,
-                                       new PdfFilter()));
+                new PdfFilter()));
+    }
+
+    /**
+     * Converts a tiff file to PDF.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        PhotoAlbum tool = new PhotoAlbum();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
     }
 
     /**
@@ -127,7 +140,7 @@ public void execute() {
                 }
             }
             String label;
-            for (File image: images) {
+            for (File image : images) {
                 System.out.println("Testing image: " + image.getName());
                 try {
                     Image img = Image.getInstance(image.getAbsolutePath());
@@ -173,7 +186,7 @@ public void execute() {
                         label = label.substring(0, label.lastIndexOf('.'));
                     }
                     pageLabels.addPageLabel(writer.getPageNumber(),
-                                            PdfPageLabels.EMPTY, label);
+                            PdfPageLabels.EMPTY, label);
                     System.out.println("Added image: " + image.getName());
                 } catch (Exception e) {
                     System.err.println(e.getMessage());
@@ -184,21 +197,20 @@ public void execute() {
                 document.close();
             } else {
                 System.err.println("No images were found in directory " +
-                                   directory.getAbsolutePath());
+                        directory.getAbsolutePath());
             }
         } catch (Exception e) {
             JOptionPane.showMessageDialog(internalFrame,
-                                          e.getMessage(),
-                                          e.getClass().getName(),
-                                          JOptionPane.ERROR_MESSAGE);
+                    e.getMessage(),
+                    e.getClass().getName(),
+                    JOptionPane.ERROR_MESSAGE);
             System.err.println(e.getMessage());
         }
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -208,26 +220,10 @@ public void valueHasChanged(AbstractArgument arg) {
         // represent the changes of the argument in the internal frame
     }
 
-
-    /**
-     * Converts a tiff file to PDF.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        PhotoAlbum tool = new PhotoAlbum();
-        if (args.length < 2) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
         return (File) getValue("destfile");
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/RemoveLaunchApplication.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/RemoveLaunchApplication.java
index 7eff4f16c..7a3adbb97 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/RemoveLaunchApplication.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/RemoveLaunchApplication.java
@@ -34,11 +34,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.pdf.PRIndirectReference;
 import com.lowagie.text.pdf.PdfDictionary;
 import com.lowagie.text.pdf.PdfName;
@@ -50,111 +45,35 @@
 import com.lowagie.toolbox.arguments.AbstractArgument;
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
 
 /**
  * This tool copies an existing PDF and removes potentially dangerous code that launches an application.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class RemoveLaunchApplication
-    extends AbstractTool {
-
-  static {
-    addVersion(
-        "$Id: RemoveLaunchApplication.java 3271 2008-04-18 20:39:42Z xlv $");
-  }
+        extends AbstractTool {
 
-  /**
-   * Constructs a ReversePages object.
-   */
-  public RemoveLaunchApplication() {
-    menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
-    arguments.add(new FileArgument(this, "srcfile",
-                                   "The file from which you want to remove Launch Application actions", false,
-                                   new PdfFilter()));
-    arguments.add(new FileArgument(this, "destfile",
-                                   "The file to which the cleaned up version of the original PDF has to be written", true,
-                                   new PdfFilter()));
-  }
-
-  /**
-   * @see com.lowagie.toolbox.AbstractTool#createFrame()
-   */
-  protected void createFrame() {
-    internalFrame = new JInternalFrame("Remove Launch Applications", true, false, true);
-    internalFrame.setSize(300, 80);
-    internalFrame.setJMenuBar(getMenubar());
-    System.out.println("=== Remove Launch Applications OPENED ===");
-  }
-
-  /**
-   * @see com.lowagie.toolbox.AbstractTool#execute()
-   */
-  public void execute() {
-    try {
-      if (getValue("srcfile") == null) {
-        throw new InstantiationException("You need to choose a sourcefile");
-      }
-      File src = (File) getValue("srcfile");
-      if (getValue("destfile") == null) {
-        throw new InstantiationException(
-            "You need to choose a destination file");
-      }
-      File dest = (File) getValue("destfile");
-
-      // we create a reader for a certain document
-      PdfReader reader = new PdfReader(src.getAbsolutePath());
-      PdfObject o;
-      PdfDictionary d;
-      PdfDictionary l;
-      PdfName n;
-      for (int i = 1; i < reader.getXrefSize(); i++) {
-          o = reader.getPdfObject(i);
-          if (o instanceof PdfDictionary) {
-              d = (PdfDictionary)o;
-              o = d.get(PdfName.A);
-              if (o == null) continue;
-              if (o instanceof PdfDictionary) {
-                  l = (PdfDictionary)o;
-              }
-              else {
-                  PRIndirectReference r =(PRIndirectReference)o;
-                  l = (PdfDictionary)reader.getPdfObject(r.getNumber());
-              }
-              n = (PdfName)l.get(PdfName.S);
-              if (PdfName.LAUNCH.equals(n)) {
-                  if (l.get(PdfName.F) != null) {
-                      System.out.println("Removed: " + l.get(PdfName.F));
-                      l.remove(PdfName.F);
-                  }
-                  if (l.get(PdfName.WIN) != null) {
-                      System.out.println("Removed: " + l.get(PdfName.WIN));
-                      l.remove(PdfName.WIN);
-                  }
-                  l.put(PdfName.S, PdfName.JAVASCRIPT);
-                  l.put(PdfName.JS, new PdfString("app.alert('Launch Application Action removed by iText');\r"));
-              }
-          }
-      }
-      PdfStamper stamper = new PdfStamper(reader, new FileOutputStream(dest));
-      stamper.close();
+    static {
+        addVersion(
+                "$Id: RemoveLaunchApplication.java 3271 2008-04-18 20:39:42Z xlv $");
     }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
-     * @param arg StringArgument
+     * Constructs a ReversePages object.
      */
-    public void valueHasChanged(AbstractArgument arg) {
-    if (internalFrame == null) {
-      // if the internal frame is null, the tool was called from the command line
-      return;
+    public RemoveLaunchApplication() {
+        menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
+        arguments.add(new FileArgument(this, "srcfile",
+                "The file from which you want to remove Launch Application actions", false,
+                new PdfFilter()));
+        arguments.add(new FileArgument(this, "destfile",
+                "The file to which the cleaned up version of the original PDF has to be written", true,
+                new PdfFilter()));
     }
-    // represent the changes of the argument in the internal frame
-  }
 
     /**
      * Copy an existing PDF and replace the Launch Application Action with JavaScript alerts.
@@ -162,21 +81,99 @@ public void valueHasChanged(AbstractArgument arg) {
      * @param args String[]
      */
     public static void main(String[] args) {
-    RemoveLaunchApplication tool = new RemoveLaunchApplication();
-    if (args.length < 2) {
-      System.err.println(tool.getUsage());
+        RemoveLaunchApplication tool = new RemoveLaunchApplication();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
+    /**
+     * @see com.lowagie.toolbox.AbstractTool#createFrame()
+     */
+    protected void createFrame() {
+        internalFrame = new JInternalFrame("Remove Launch Applications", true, false, true);
+        internalFrame.setSize(300, 80);
+        internalFrame.setJMenuBar(getMenubar());
+        System.out.println("=== Remove Launch Applications OPENED ===");
+    }
+
+    /**
+     * @see com.lowagie.toolbox.AbstractTool#execute()
+     */
+    public void execute() {
+        try {
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            File src = (File) getValue("srcfile");
+            if (getValue("destfile") == null) {
+                throw new InstantiationException(
+                        "You need to choose a destination file");
+            }
+            File dest = (File) getValue("destfile");
+
+            // we create a reader for a certain document
+            PdfReader reader = new PdfReader(src.getAbsolutePath());
+            PdfObject o;
+            PdfDictionary d;
+            PdfDictionary l;
+            PdfName n;
+            for (int i = 1; i < reader.getXrefSize(); i++) {
+                o = reader.getPdfObject(i);
+                if (o instanceof PdfDictionary) {
+                    d = (PdfDictionary) o;
+                    o = d.get(PdfName.A);
+                    if (o == null) {
+                        continue;
+                    }
+                    if (o instanceof PdfDictionary) {
+                        l = (PdfDictionary) o;
+                    } else {
+                        PRIndirectReference r = (PRIndirectReference) o;
+                        l = (PdfDictionary) reader.getPdfObject(r.getNumber());
+                    }
+                    n = (PdfName) l.get(PdfName.S);
+                    if (PdfName.LAUNCH.equals(n)) {
+                        if (l.get(PdfName.F) != null) {
+                            System.out.println("Removed: " + l.get(PdfName.F));
+                            l.remove(PdfName.F);
+                        }
+                        if (l.get(PdfName.WIN) != null) {
+                            System.out.println("Removed: " + l.get(PdfName.WIN));
+                            l.remove(PdfName.WIN);
+                        }
+                        l.put(PdfName.S, PdfName.JAVASCRIPT);
+                        l.put(PdfName.JS, new PdfString("app.alert('Launch Application Action removed by iText');\r"));
+                    }
+                }
+            }
+            PdfStamper stamper = new PdfStamper(reader, new FileOutputStream(dest));
+            stamper.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
+     */
+    public void valueHasChanged(AbstractArgument arg) {
+        if (internalFrame == null) {
+            // if the internal frame is null, the tool was called from the command line
+            return;
+        }
+        // represent the changes of the argument in the internal frame
     }
-    tool.setMainArguments(args);
-    tool.execute();
-  }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-    return (File) getValue("destfile");
-  }
+        return (File) getValue("destfile");
+    }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ReversePages.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ReversePages.java
index e4d5d78fe..15ffd5e24 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ReversePages.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/ReversePages.java
@@ -35,11 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.pdf.PRAcroForm;
 import com.lowagie.text.pdf.PdfCopy;
@@ -49,116 +44,42 @@
 import com.lowagie.toolbox.arguments.AbstractArgument;
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import javax.swing.JInternalFrame;
 
 /**
  * This tool lets you take pages from an existing PDF and copy them in reverse order into a new PDF.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class ReversePages
-    extends AbstractTool {
-
-  static {
-    addVersion(
-        "$Id: ReversePages.java 3271 2008-04-18 20:39:42Z xlv $");
-  }
-
-  FileArgument destfile = null;
-  /**
-   * Constructs a ReversePages object.
-   */
-  public ReversePages() {
-    menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
-    FileArgument inputfile = null;
-    inputfile = new FileArgument(this, "srcfile",
-                                 "The file you want to reorder", false,
-                                 new PdfFilter());
-    arguments.add(inputfile);
-    destfile = new FileArgument(this, "destfile",
-                                "The file to which the reordered version of the original PDF has to be written", true,
-                                new PdfFilter());
-    arguments.add(destfile);
-    inputfile.addPropertyChangeListener(destfile);
-  }
-
-  /**
-   * @see com.lowagie.toolbox.AbstractTool#createFrame()
-   */
-  protected void createFrame() {
-    internalFrame = new JInternalFrame("ReversePages", true, false, true);
-    internalFrame.setSize(300, 80);
-    internalFrame.setJMenuBar(getMenubar());
-    System.out.println("=== ReversePages OPENED ===");
-  }
-
-  /**
-   * @see com.lowagie.toolbox.AbstractTool#execute()
-   */
-  public void execute() {
-    try {
-      if (getValue("srcfile") == null) {
-        throw new InstantiationException("You need to choose a sourcefile");
-      }
-      File src = (File) getValue("srcfile");
-      if (getValue("destfile") == null) {
-        throw new InstantiationException(
-            "You need to choose a destination file");
-      }
-      File dest = (File) getValue("destfile");
-
-      // we create a reader for a certain document
-      PdfReader reader = new PdfReader(src.getAbsolutePath());
-      System.out.println("The original file had " + reader.getNumberOfPages() +
-                         " pages.");
-      int pages = reader.getNumberOfPages();
-      ArrayList li = new ArrayList<>();
-      for (int i = pages; i > 0; i--) {
-        li.add(i);
-      }
-      reader.selectPages(li);
-
-      System.err.println("The new file has " + pages + " pages.");
-      Document document = new Document(reader.getPageSizeWithRotation(1));
-      PdfCopy copy = new PdfCopy(document,
-                                 new FileOutputStream(dest.getAbsolutePath()));
-      document.open();
-      PdfImportedPage page;
-      for (int i = 0; i < pages; ) {
-        ++i;
-        System.out.println("Processed page " + i);
-        page = copy.getImportedPage(reader, i);
-        copy.addPage(page);
-      }
-
-      PRAcroForm form = reader.getAcroForm();
-      if (form != null) {
-        copy.copyAcroForm(reader);
-      }
-      document.close();
+        extends AbstractTool {
 
+    static {
+        addVersion(
+                "$Id: ReversePages.java 3271 2008-04-18 20:39:42Z xlv $");
     }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
+
+    FileArgument destfile = null;
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
-     * @param arg StringArgument
+     * Constructs a ReversePages object.
      */
-    public void valueHasChanged(AbstractArgument arg) {
-    if (internalFrame == null) {
-      // if the internal frame is null, the tool was called from the command line
-      return;
-    }
-
-    if (destfile.getValue() == null && arg.getName().equalsIgnoreCase("srcfile")) {
-      String filename = arg.getValue().toString();
-      String filenameout = filename.substring(0, filename.indexOf(".",
-          filename.length() - 4)) + "_out.pdf";
-      destfile.setValue(filenameout);
+    public ReversePages() {
+        menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
+        FileArgument inputfile = null;
+        inputfile = new FileArgument(this, "srcfile",
+                "The file you want to reorder", false,
+                new PdfFilter());
+        arguments.add(inputfile);
+        destfile = new FileArgument(this, "destfile",
+                "The file to which the reordered version of the original PDF has to be written", true,
+                new PdfFilter());
+        arguments.add(destfile);
+        inputfile.addPropertyChangeListener(destfile);
     }
-  }
 
     /**
      * Take pages from an existing PDF and copy them in reverse order into a new PDF.
@@ -166,22 +87,99 @@ public void valueHasChanged(AbstractArgument arg) {
      * @param args String[]
      */
     public static void main(String[] args) {
-    ReversePages tool = new ReversePages();
-    if (args.length < 2) {
-      System.err.println(tool.getUsage());
+        ReversePages tool = new ReversePages();
+        if (args.length < 2) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
+    /**
+     * @see com.lowagie.toolbox.AbstractTool#createFrame()
+     */
+    protected void createFrame() {
+        internalFrame = new JInternalFrame("ReversePages", true, false, true);
+        internalFrame.setSize(300, 80);
+        internalFrame.setJMenuBar(getMenubar());
+        System.out.println("=== ReversePages OPENED ===");
+    }
+
+    /**
+     * @see com.lowagie.toolbox.AbstractTool#execute()
+     */
+    public void execute() {
+        try {
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            File src = (File) getValue("srcfile");
+            if (getValue("destfile") == null) {
+                throw new InstantiationException(
+                        "You need to choose a destination file");
+            }
+            File dest = (File) getValue("destfile");
+
+            // we create a reader for a certain document
+            PdfReader reader = new PdfReader(src.getAbsolutePath());
+            System.out.println("The original file had " + reader.getNumberOfPages() +
+                    " pages.");
+            int pages = reader.getNumberOfPages();
+            ArrayList li = new ArrayList<>();
+            for (int i = pages; i > 0; i--) {
+                li.add(i);
+            }
+            reader.selectPages(li);
+
+            System.err.println("The new file has " + pages + " pages.");
+            Document document = new Document(reader.getPageSizeWithRotation(1));
+            PdfCopy copy = new PdfCopy(document,
+                    new FileOutputStream(dest.getAbsolutePath()));
+            document.open();
+            PdfImportedPage page;
+            for (int i = 0; i < pages; ) {
+                ++i;
+                System.out.println("Processed page " + i);
+                page = copy.getImportedPage(reader, i);
+                copy.addPage(page);
+            }
+
+            PRAcroForm form = reader.getAcroForm();
+            if (form != null) {
+                copy.copyAcroForm(reader);
+            }
+            document.close();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
+     */
+    public void valueHasChanged(AbstractArgument arg) {
+        if (internalFrame == null) {
+            // if the internal frame is null, the tool was called from the command line
+            return;
+        }
+
+        if (destfile.getValue() == null && arg.getName().equalsIgnoreCase("srcfile")) {
+            String filename = arg.getValue().toString();
+            String filenameout = filename.substring(0, filename.indexOf(".",
+                    filename.length() - 4)) + "_out.pdf";
+            destfile.setValue(filenameout);
+        }
     }
-    tool.setMainArguments(args);
-    tool.execute();
-  }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-    return (File) getValue("destfile");
-  }
+        return (File) getValue("destfile");
+    }
 
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/SelectedPages.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/SelectedPages.java
index 39c373412..6e8bcdbef 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/SelectedPages.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/SelectedPages.java
@@ -35,11 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.pdf.PRAcroForm;
 import com.lowagie.text.pdf.PdfCopy;
@@ -50,9 +45,13 @@
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.StringArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
 
 /**
  * This tool lets you select pages from an existing PDF and copy them into a new PDF.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class SelectedPages extends AbstractTool {
@@ -60,16 +59,32 @@ public class SelectedPages extends AbstractTool {
     static {
         addVersion("$Id: SelectedPages.java 3271 2008-04-18 20:39:42Z xlv $");
     }
+
     /**
      * Constructs a SelectedPages object.
      */
     public SelectedPages() {
         menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW;
         arguments.add(new FileArgument(this, "srcfile", "The file you want to split", false, new PdfFilter()));
-        arguments.add(new FileArgument(this, "destfile", "The file to which the first part of the original PDF has to be written", true, new PdfFilter()));
+        arguments.add(new FileArgument(this, "destfile",
+                "The file to which the first part of the original PDF has to be written", true, new PdfFilter()));
         arguments.add(new StringArgument(this, "selection", "A selection of pages (see Help for more info)"));
     }
 
+    /**
+     * Generates a PDF file with selected pages from an existing PDF.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        SelectedPages tool = new SelectedPages();
+        if (args.length < 4) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -85,11 +100,15 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null) throw new InstantiationException("You need to choose a sourcefile");
-            File src = (File)getValue("srcfile");
-            if (getValue("destfile") == null) throw new InstantiationException("You need to choose a destination file for the first part of the PDF");
-            File dest = (File)getValue("destfile");
-            String selection = (String)getValue("selection");
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            File src = (File) getValue("srcfile");
+            if (getValue("destfile") == null) {
+                throw new InstantiationException("You need to choose a destination file for the first part of the PDF");
+            }
+            File dest = (File) getValue("destfile");
+            String selection = (String) getValue("selection");
 
             // we create a reader for a certain document
             PdfReader reader = new PdfReader(src.getAbsolutePath());
@@ -108,19 +127,18 @@ public void execute() {
                 copy.addPage(page);
             }
             PRAcroForm form = reader.getAcroForm();
-            if (form != null)
+            if (form != null) {
                 copy.copyAcroForm(reader);
+            }
             document.close();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -130,28 +148,12 @@ public void valueHasChanged(AbstractArgument arg) {
         // represent the changes of the argument in the internal frame
     }
 
-
     /**
-     * Generates a PDF file with selected pages from an existing PDF.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        SelectedPages tool = new SelectedPages();
-        if (args.length < 4) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile");
+        return (File) getValue("destfile");
     }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Split.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Split.java
index 0c2c31e1a..a933dc11e 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Split.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Split.java
@@ -35,11 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfContentByte;
@@ -52,9 +47,13 @@
 import com.lowagie.toolbox.arguments.IntegerArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
 import com.lowagie.toolbox.swing.PdfInformationPanel;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
 
 /**
  * This tool lets you split a PDF in two separate PDF files.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Split extends AbstractTool {
@@ -62,6 +61,7 @@ public class Split extends AbstractTool {
     static {
         addVersion("$Id: Split.java 3271 2008-04-18 20:39:42Z xlv $");
     }
+
     /**
      * Constructs an Split object.
      */
@@ -69,11 +69,27 @@ public Split() {
         FileArgument f = new FileArgument(this, "srcfile", "The file you want to split", false, new PdfFilter());
         f.setLabel(new PdfInformationPanel());
         arguments.add(f);
-        arguments.add(new FileArgument(this, "destfile1", "The file to which the first part of the original PDF has to be written", true, new PdfFilter()));
-        arguments.add(new FileArgument(this, "destfile2", "The file to which the second part of the original PDF has to be written", true, new PdfFilter()));
+        arguments.add(new FileArgument(this, "destfile1",
+                "The file to which the first part of the original PDF has to be written", true, new PdfFilter()));
+        arguments.add(new FileArgument(this, "destfile2",
+                "The file to which the second part of the original PDF has to be written", true, new PdfFilter()));
         arguments.add(new IntegerArgument(this, "pagenumber", "The pagenumber where you want to split"));
     }
 
+    /**
+     * Split a PDF in two separate PDF files.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Split tool = new Split();
+        if (args.length < 4) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -89,13 +105,20 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("srcfile") == null) throw new InstantiationException("You need to choose a sourcefile");
-            File src = (File)getValue("srcfile");
-            if (getValue("destfile1") == null) throw new InstantiationException("You need to choose a destination file for the first part of the PDF");
-            File file1 = (File)getValue("destfile1");
-            if (getValue("destfile2") == null) throw new InstantiationException("You need to choose a destination file for the second part of the PDF");
-            File file2 = (File)getValue("destfile2");
-            int pagenumber = Integer.parseInt((String)getValue("pagenumber"));
+            if (getValue("srcfile") == null) {
+                throw new InstantiationException("You need to choose a sourcefile");
+            }
+            File src = (File) getValue("srcfile");
+            if (getValue("destfile1") == null) {
+                throw new InstantiationException("You need to choose a destination file for the first part of the PDF");
+            }
+            File file1 = (File) getValue("destfile1");
+            if (getValue("destfile2") == null) {
+                throw new InstantiationException(
+                        "You need to choose a destination file for the second part of the PDF");
+            }
+            File file2 = (File) getValue("destfile2");
+            int pagenumber = Integer.parseInt((String) getValue("pagenumber"));
 
             // we create a reader for a certain document
             PdfReader reader = new PdfReader(src.getAbsolutePath());
@@ -104,7 +127,8 @@ public void execute() {
             System.out.println("There are " + n + " pages in the original file.");
 
             if (pagenumber < 2 || pagenumber > n) {
-                throw new DocumentException("You can't split this document at page " + pagenumber + "; there is no such page.");
+                throw new DocumentException(
+                        "You can't split this document at page " + pagenumber + "; there is no such page.");
             }
 
             // step 1: creation of a document-object
@@ -130,8 +154,7 @@ public void execute() {
                 rotation = reader.getPageRotation(i);
                 if (rotation == 90 || rotation == 270) {
                     cb1.addTemplate(page, 0, -1f, 1f, 0, 0, reader.getPageSizeWithRotation(i).getHeight());
-                }
-                else {
+                } else {
                     cb1.addTemplate(page, 1f, 0, 0, 1f, 0, 0);
                 }
             }
@@ -143,24 +166,21 @@ public void execute() {
                 rotation = reader.getPageRotation(i);
                 if (rotation == 90 || rotation == 270) {
                     cb2.addTemplate(page, 0, -1f, 1f, 0, 0, reader.getPageSizeWithRotation(i).getHeight());
-                }
-                else {
+                } else {
                     cb2.addTemplate(page, 1f, 0, 0, 1f, 0, 0);
                 }
             }
             // step 5: we close the document
             document1.close();
             document2.close();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -170,28 +190,12 @@ public void valueHasChanged(AbstractArgument arg) {
         // represent the changes of the argument in the internal frame
     }
 
-
-    /**
-     * Split a PDF in two separate PDF files.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        Split tool = new Split();
-        if (args.length < 4) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile1");
+        return (File) getValue("destfile1");
     }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Txt2Pdf.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Txt2Pdf.java
index 211a48d36..9ffc3920f 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Txt2Pdf.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Txt2Pdf.java
@@ -35,14 +35,6 @@
 
 package com.lowagie.toolbox.plugins;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
@@ -55,9 +47,16 @@
 import com.lowagie.toolbox.arguments.OptionArgument;
 import com.lowagie.toolbox.arguments.PageSizeArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * Converts a monospaced txt file to a PDF file.
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class Txt2Pdf extends AbstractTool {
@@ -65,13 +64,15 @@ public class Txt2Pdf extends AbstractTool {
     static {
         addVersion("$Id: Txt2Pdf.java 3271 2008-04-18 20:39:42Z xlv $");
     }
+
     /**
      * Constructs a Txt2Pdf object.
      */
     public Txt2Pdf() {
         menuoptions = MENU_EXECUTE | MENU_EXECUTE_SHOW | MENU_EXECUTE_PRINT_SILENT;
         arguments.add(new FileArgument(this, "srcfile", "The file you want to convert", false));
-        arguments.add(new FileArgument(this, "destfile", "The file to which the converted text has to be written", true, new PdfFilter()));
+        arguments.add(new FileArgument(this, "destfile", "The file to which the converted text has to be written", true,
+                new PdfFilter()));
         PageSizeArgument oa1 = new PageSizeArgument(this, "pagesize", "Pagesize");
         arguments.add(oa1);
         OptionArgument oa2 = new OptionArgument(this, "orientation", "Orientation of the page");
@@ -80,6 +81,20 @@ public Txt2Pdf() {
         arguments.add(oa2);
     }
 
+    /**
+     * Converts a monospaced txt file to a PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        Txt2Pdf tool = new Txt2Pdf();
+        if (args.length < 3) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -98,17 +113,16 @@ public void execute() {
             String line = null;
             Document document;
             Font f;
-            Rectangle pagesize = (Rectangle)getValue("pagesize");
+            Rectangle pagesize = (Rectangle) getValue("pagesize");
             if ("LANDSCAPE".equals(getValue("orientation"))) {
                 f = FontFactory.getFont(FontFactory.COURIER, 10);
                 document = new Document(pagesize.rotate(), 36, 9, 36, 36);
-            }
-            else {
+            } else {
                 f = FontFactory.getFont(FontFactory.COURIER, 11);
                 document = new Document(pagesize, 72, 36, 36, 36);
             }
-            BufferedReader in = new BufferedReader(new FileReader((File)getValue("srcfile")));
-            PdfWriter.getInstance(document, new FileOutputStream((File)getValue("destfile")));
+            BufferedReader in = new BufferedReader(new FileReader((File) getValue("srcfile")));
+            PdfWriter.getInstance(document, new FileOutputStream((File) getValue("destfile")));
             document.open();
             while ((line = in.readLine()) != null) {
                 document.add(new Paragraph(12, line, f));
@@ -124,9 +138,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -136,28 +149,12 @@ public void valueHasChanged(AbstractArgument arg) {
         // represent the changes of the argument in the internal frame
     }
 
-
     /**
-     * Converts a monospaced txt file to a PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        Txt2Pdf tool = new Txt2Pdf();
-        if (args.length < 3) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile");
+        return (File) getValue("destfile");
     }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/XML2Bookmarks.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/XML2Bookmarks.java
index ff380f347..229c5bbb0 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/XML2Bookmarks.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/XML2Bookmarks.java
@@ -48,15 +48,6 @@
  */
 package com.lowagie.toolbox.plugins;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
 import com.lowagie.text.pdf.PdfWriter;
@@ -65,9 +56,17 @@
 import com.lowagie.toolbox.arguments.AbstractArgument;
 import com.lowagie.toolbox.arguments.FileArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.List;
+import java.util.Map;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * Allows you to add bookmarks to an existing PDF file
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class XML2Bookmarks extends AbstractTool {
@@ -81,10 +80,25 @@ public class XML2Bookmarks extends AbstractTool {
      */
     public XML2Bookmarks() {
         arguments.add(new FileArgument(this, "xmlfile", "the bookmarks in XML", false));
-        arguments.add(new FileArgument(this, "pdffile", "the PDF to which you want to add bookmarks", false, new PdfFilter()));
+        arguments.add(new FileArgument(this, "pdffile", "the PDF to which you want to add bookmarks", false,
+                new PdfFilter()));
         arguments.add(new FileArgument(this, "destfile", "the resulting PDF", true, new PdfFilter()));
     }
 
+    /**
+     * Allows you to generate an index file in HTML containing Bookmarks to an existing PDF file.
+     *
+     * @param args String[]
+     */
+    public static void main(String[] args) {
+        XML2Bookmarks tool = new XML2Bookmarks();
+        if (args.length < 3) {
+            System.err.println(tool.getUsage());
+        }
+        tool.setMainArguments(args);
+        tool.execute();
+    }
+
     /**
      * @see com.lowagie.toolbox.AbstractTool#createFrame()
      */
@@ -100,20 +114,25 @@ protected void createFrame() {
      */
     public void execute() {
         try {
-            if (getValue("xmlfile") == null) throw new InstantiationException("You need to choose an xml file");
-            if (getValue("pdffile") == null) throw new InstantiationException("You need to choose a source PDF file");
-            if (getValue("destfile") == null) throw new InstantiationException("You need to choose a destination PDF file");
-            FileInputStream bmReader = new FileInputStream( (File) getValue("xmlfile") );
+            if (getValue("xmlfile") == null) {
+                throw new InstantiationException("You need to choose an xml file");
+            }
+            if (getValue("pdffile") == null) {
+                throw new InstantiationException("You need to choose a source PDF file");
+            }
+            if (getValue("destfile") == null) {
+                throw new InstantiationException("You need to choose a destination PDF file");
+            }
+            FileInputStream bmReader = new FileInputStream((File) getValue("xmlfile"));
             List> bookmarks = SimpleBookmark.importFromXML(bmReader);
             bmReader.close();
-            PdfReader reader = new PdfReader(((File)getValue("pdffile")).getAbsolutePath());
+            PdfReader reader = new PdfReader(((File) getValue("pdffile")).getAbsolutePath());
             reader.consolidateNamedDestinations();
-            PdfStamper stamper = new PdfStamper(reader, new FileOutputStream((File)getValue("destfile")));
+            PdfStamper stamper = new PdfStamper(reader, new FileOutputStream((File) getValue("destfile")));
             stamper.setOutlines(bookmarks);
             stamper.setViewerPreferences(reader.getSimpleViewerPreferences() | PdfWriter.PageModeUseOutlines);
             stamper.close();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             JOptionPane.showMessageDialog(internalFrame,
                     e.getMessage(),
@@ -124,9 +143,8 @@ public void execute() {
     }
 
     /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      * @param arg StringArgument
+     * @see com.lowagie.toolbox.AbstractTool#valueHasChanged(com.lowagie.toolbox.arguments.AbstractArgument)
      */
     public void valueHasChanged(AbstractArgument arg) {
         if (internalFrame == null) {
@@ -137,27 +155,12 @@ public void valueHasChanged(AbstractArgument arg) {
     }
 
     /**
-     * Allows you to generate an index file in HTML containing Bookmarks to an existing PDF file.
-     *
-     * @param args String[]
-     */
-    public static void main(String[] args) {
-        XML2Bookmarks tool = new XML2Bookmarks();
-        if (args.length < 3) {
-            System.err.println(tool.getUsage());
-        }
-        tool.setMainArguments(args);
-        tool.execute();
-    }
-
-    /**
-     *
-     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
-     * @throws InstantiationException on error
      * @return File
+     * @throws InstantiationException on error
+     * @see com.lowagie.toolbox.AbstractTool#getDestPathPDF()
      */
     protected File getDestPathPDF() throws InstantiationException {
-        return (File)getValue("destfile");
+        return (File) getValue("destfile");
     }
 
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/Watermarker.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/Watermarker.java
index 3bf6f3ace..abcf26481 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/Watermarker.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/Watermarker.java
@@ -2,18 +2,17 @@
 
 import static java.awt.Color.BLACK;
 
+import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.BaseFont;
+import com.lowagie.text.pdf.PdfReader;
+import com.lowagie.text.pdf.PdfStamper;
 import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.PdfStamper;
-
 /**
- * This class is the API equivalent of the WatermarkerTool.
- * It lets you add a text watermark to all pages of a document given in input.
+ * This class is the API equivalent of the WatermarkerTool. It lets you add a text watermark to all pages of a document
+ * given in input.
  */
 public class Watermarker {
 
@@ -27,13 +26,13 @@ public class Watermarker {
     private BaseFont font = null;
 
     /**
-     *  The main constructor with all mandatory arguments. By default, the color stays black.
+     * The main constructor with all mandatory arguments. By default, the color stays black.
      *
-     * @param input the pdf content as a byte[]
-     * @param text the text to write as watermark
+     * @param input    the pdf content as a byte[]
+     * @param text     the text to write as watermark
      * @param fontsize the fontsize of the watermark
-     * @param opacity the opacity of the watermark
-     * @throws IOException on error
+     * @param opacity  the opacity of the watermark
+     * @throws IOException       on error
      * @throws DocumentException on error
      */
     public Watermarker(byte[] input, String text, int fontsize, float opacity) throws IOException, DocumentException {
@@ -65,7 +64,7 @@ public Watermarker withFont(final BaseFont font) {
      * Write the watermark to the pdf given in entry.
      *
      * @return a brand new byte[] without modifying the original one.
-     * @throws IOException on error
+     * @throws IOException       on error
      * @throws DocumentException on error
      */
     public byte[] write() throws IOException, DocumentException {
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerTool.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerTool.java
index 2e014d58d..f6a3a5ad5 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerTool.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerTool.java
@@ -40,13 +40,6 @@
 import static java.lang.Float.parseFloat;
 import static java.lang.Integer.parseInt;
 
-import java.awt.Color;
-import java.io.File;
-import java.io.FileOutputStream;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
 import com.lowagie.toolbox.AbstractTool;
@@ -56,10 +49,15 @@
 import com.lowagie.toolbox.arguments.IntegerArgument;
 import com.lowagie.toolbox.arguments.StringArgument;
 import com.lowagie.toolbox.arguments.filters.PdfFilter;
+import java.awt.Color;
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 /**
  * This tool lets you add a text watermark to all pages of a document.
- * 
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class WatermarkerTool extends AbstractTool {
@@ -89,6 +87,43 @@ public WatermarkerTool() {
         inputfile.addPropertyChangeListener(destfile);
     }
 
+    /**
+     * This methods helps you running this tool as a standalone application.
+     *
+     * 
              
+     * Call it like this from command line: java com.lowagie.tools.plugins.Watermarker input.pdf Draft 230 0.2
+     * output.pdf #FF000000
+     *
+     * 
              
+     * "input.pdf" is the input file name to be processed
+     * 
              
+     * "Draft" is the text written as transparent "watermark" on top of each page
+     * 
              
+     * "230" is the font size
+     * 
              
+     * "0.2" is the opacity (1.0 completely opaque, 0.0 completely transparent)
+     * 
              
+     * "output.pdf" is the output file name
+     * 
              
+     * (Optional) "#FF0000" is the color (in hex format like #nnnnnn or 0xnnnnnn), #000000 (black) by default
+     *
+     * 
              
+     * Call it from within other Java code:
+     *
+     * 
              
+     * Watermarker.main(new String[]{"input.pdf","Draft","230","0.2","output.pdf","#FF000000"});
+     *
+     * @param args the srcfile, watermark text and destfile
+     */
+    public static void main(String[] args) {
+        WatermarkerTool watermarkerTool = new WatermarkerTool();
+        if (args.length < 5 || args.length > 6) {
+            System.err.println(watermarkerTool.getUsage());
+        }
+        watermarkerTool.setMainArguments(args);
+        watermarkerTool.execute();
+    }
+
     /**
      * Creates the internal frame.
      */
@@ -148,9 +183,8 @@ public void execute() {
     }
 
     /**
-     * Gets the PDF file that should be generated (or null if the output isn't a
-     * PDF file).
-     * 
+     * Gets the PDF file that should be generated (or null if the output isn't a PDF file).
+     *
      * @return the PDF file that should be generated
      * @throws InstantiationException on error
      */
@@ -161,9 +195,8 @@ protected File getDestPathPDF() throws InstantiationException {
 
     /**
      * Indicates that the value of an argument has changed.
-     * 
-     * @param arg
-     *            the argument that has changed
+     *
+     * @param arg the argument that has changed
      */
     @Override
     public void valueHasChanged(AbstractArgument arg) {
@@ -182,44 +215,4 @@ public void valueHasChanged(AbstractArgument arg) {
         }
     }
 
-    /**
-     * This methods helps you running this tool as a standalone application.
-     * 
-     * 
              
-     * Call it like this from command line: java
-     * com.lowagie.tools.plugins.Watermarker input.pdf Draft 230 0.2 output.pdf #FF000000
-     * 
-     * 
              
-     * "input.pdf" is the input file name to be processed
-     * 
              
-     * "Draft" is the text written as transparent "watermark" on top of each
-     * page
-     * 
              
-     * "230" is the font size
-     * 
              
-     * "0.2" is the opacity (1.0 completely opaque, 0.0 completely transparent)
-     * 
              
-     * "output.pdf" is the output file name
-     * 
              
-     * (Optional) "#FF0000" is the color (in hex format like #nnnnnn or 0xnnnnnn), #000000 (black) by default
-     * 
-     * 
              
-     * Call it from within other Java code:
-     * 
-     * 
              
-     * Watermarker.main(new
-     * String[]{"input.pdf","Draft","230","0.2","output.pdf","#FF000000"});
-     * 
-     * @param args
-     *            the srcfile, watermark text and destfile
-     */
-    public static void main(String[] args) {
-        WatermarkerTool watermarkerTool = new WatermarkerTool();
-        if (args.length < 5 || args.length > 6) {
-            System.err.println(watermarkerTool.getUsage());
-        }
-        watermarkerTool.setMainArguments(args);
-        watermarkerTool.execute();
-    }
-
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/Writer.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/Writer.java
index 3b7e01657..28bcde2a2 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/Writer.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/watermarker/Writer.java
@@ -3,9 +3,6 @@
 import static com.lowagie.text.pdf.BaseFont.WINANSI;
 import static com.lowagie.text.pdf.BaseFont.createFont;
 
-import java.awt.Color;
-import java.io.IOException;
-
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.BaseFont;
@@ -13,10 +10,12 @@
 import com.lowagie.text.pdf.PdfGState;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
+import java.awt.Color;
+import java.io.IOException;
 
 /**
- * The concrete class which will write a the watermark on the stamp.
- * It is meant to be used through WatermarkerTool or WatermarkerBuilder.
+ * The concrete class which will write a the watermark on the stamp. It is meant to be used through WatermarkerTool or
+ * WatermarkerBuilder.
  */
 class Writer {
 
@@ -43,14 +42,14 @@ Writer withFont(final BaseFont font) {
     }
 
     /**
-     * Does the magic, with all parameters already set and valid. At the end, the PDF file configured through
-     * the stamp parameter will be written.
+     * Does the magic, with all parameters already set and valid. At the end, the PDF file configured through the stamp
+     * parameter will be written.
      *
      * @throws DocumentException if the default "Helvetica" font cannot be created
-     * @throws IOException if the default "Helvetica" font cannot be created
+     * @throws IOException       if the default "Helvetica" font cannot be created
      */
     void write() throws IOException, DocumentException {
-        final BaseFont bf = (font != null) ? font : createFont("Helvetica", WINANSI,false);
+        final BaseFont bf = (font != null) ? font : createFont("Helvetica", WINANSI, false);
         int pagecount = reader.getNumberOfPages();
         PdfGState gs1 = new PdfGState();
         gs1.setFillOpacity(opacity);
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/CustomDialog.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/CustomDialog.java
index e7c1a75b0..ff45d1802 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/CustomDialog.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/CustomDialog.java
@@ -35,7 +35,6 @@
 package com.lowagie.toolbox.swing;
 
 import java.awt.Toolkit;
-
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -49,16 +48,13 @@
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class CustomDialog {
-    JDialog dialog = null;
-    private JTextField textField = new JTextField(10);
 
+    JDialog dialog = null;
     JPanel jPanel1 = new JPanel();
     PlainDocument plainDocument;
-
     String msgString1;
-
     Object[] array;
-
+    private JTextField textField = new JTextField(10);
     private JOptionPane optionPane;
 
     public CustomDialog(String msgstring, PlainDocument plainDocument) {
@@ -76,10 +72,6 @@ public CustomDialog() {
         this("Enter a value:", new PlainDocument());
     }
 
-    private void jbInit() throws Exception {
-        textField.setDocument(plainDocument);
-    }
-
     public static PlainDocument instantiateFloatDocument() {
         PlainDocument floatDocument = new PlainDocument() {
             private static final long serialVersionUID = 1874451914306029381L;
@@ -130,12 +122,15 @@ public void insertString(int offset, String str, AttributeSet a) throws
         return stringDocument;
     }
 
+    private void jbInit() throws Exception {
+        textField.setDocument(plainDocument);
+    }
 
     public void setMsgString1(String msgString1) {
         this.msgString1 = msgString1;
-        array = new Object[] {msgString1, textField};
+        array = new Object[]{msgString1, textField};
         optionPane = new JOptionPane(array, JOptionPane.QUESTION_MESSAGE,
-                                     JOptionPane.OK_CANCEL_OPTION);
+                JOptionPane.OK_CANCEL_OPTION);
         dialog = optionPane.createDialog(UIManager.getString(
                 "OptionPane.inputDialogTitle", null));
     }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/EventDispatchingThread.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/EventDispatchingThread.java
index bc8e7f420..f06902335 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/EventDispatchingThread.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/EventDispatchingThread.java
@@ -40,24 +40,16 @@
 public abstract class EventDispatchingThread {
 
     /**
-     * Inner class that holds the reference to the thread.
+     * The value of an object constructed by the construct() method.
      */
-    private static class ThreadWrapper {
-        private Thread thread;
-        ThreadWrapper(Thread t) { thread = t; }
-        synchronized Thread get() { return thread; }
-        synchronized void clear() { thread = null; }
-    }
-
-    /** The value of an object constructed by the construct() method.  */
     private Object value;
-    /** A wrapper for the tread that executes a time-consuming task. */
+    /**
+     * A wrapper for the tread that executes a time-consuming task.
+     */
     private ThreadWrapper thread;
 
     /**
-     * Starts a thread.
-     * Executes the time-consuming task in the construct method;
-     * finally calls the finish().
+     * Starts a thread. Executes the time-consuming task in the construct method; finally calls the finish().
      */
     public EventDispatchingThread() {
         final Runnable doFinished = this::finished;
@@ -65,8 +57,7 @@ public EventDispatchingThread() {
         Runnable doConstruct = () -> {
             try {
                 value = construct();
-            }
-            finally {
+            } finally {
                 thread.clear();
             }
             SwingUtilities.invokeLater(doFinished);
@@ -104,8 +95,7 @@ public void interrupt() {
     }
 
     /**
-     * Called on the event dispatching thread once the
-     * construct method has finished its task.
+     * Called on the event dispatching thread once the construct method has finished its task.
      */
     public void finished() {
     }
@@ -113,8 +103,7 @@ public void finished() {
     /**
      * Returns the value created by the construct method.
      *
-     * @return the value created by the construct method or null
-     * if the task was interrupted before it was finished.
+     * @return the value created by the construct method or null if the task was interrupted before it was finished.
      */
     public Object get() {
         while (true) {
@@ -124,11 +113,30 @@ public Object get() {
             }
             try {
                 t.join();
-            }
-            catch (InterruptedException e) {
+            } catch (InterruptedException e) {
                 Thread.currentThread().interrupt(); // propagate
                 return null;
             }
         }
     }
+
+    /**
+     * Inner class that holds the reference to the thread.
+     */
+    private static class ThreadWrapper {
+
+        private Thread thread;
+
+        ThreadWrapper(Thread t) {
+            thread = t;
+        }
+
+        synchronized Thread get() {
+            return thread;
+        }
+
+        synchronized void clear() {
+            thread = null;
+        }
+    }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/FileList.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/FileList.java
index 027e3de2b..e044860bf 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/FileList.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/FileList.java
@@ -64,6 +64,19 @@ public class FileList
     private static final long serialVersionUID = -7238230038043975672L;
 
     private final Vector filevector = new Vector<>();
+    private final JPanel jPanel1 = new JPanel();
+    private final BorderLayout borderLayout1 = new BorderLayout();
+    private final JPanel jPanel2 = new JPanel();
+    private final BorderLayout borderLayout2 = new BorderLayout();
+    private final JScrollPane jScrollPane1 = new JScrollPane();
+    private final FileTableModel model = new FileTableModel();
+    private final JTable jTable1 = new JTable(model);
+    private final RowSorter sorter = new TableRowSorter<>(model);
+    private final BorderLayout borderLayout3 = new BorderLayout();
+    private final DropTarget dt = new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE, this, true, null);
+    private final JPanel jPanel3 = new JPanel();
+    private final JLabel jLabel1 = new JLabel();
+    private final JLabel jLabel2 = new JLabel();
 
     public FileList() {
         super("FileList", true, true, true);
@@ -94,20 +107,6 @@ private void jbInit() {
         this.pack();
     }
 
-    private final JPanel jPanel1 = new JPanel();
-    private final BorderLayout borderLayout1 = new BorderLayout();
-    private final JPanel jPanel2 = new JPanel();
-    private final BorderLayout borderLayout2 = new BorderLayout();
-    private final JScrollPane jScrollPane1 = new JScrollPane();
-    private final FileTableModel model = new FileTableModel();
-    private final JTable jTable1 = new JTable(model);
-    private final RowSorter sorter = new TableRowSorter<>(model);
-    private final BorderLayout borderLayout3 = new BorderLayout();
-    private final DropTarget dt = new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE, this, true, null);
-    private final JPanel jPanel3 = new JPanel();
-    private final JLabel jLabel1 = new JLabel();
-    private final JLabel jLabel2 = new JLabel();
-
     public void dragEnter(DropTargetDragEvent dtde) {
     }
 
@@ -151,53 +150,6 @@ public void drop(DropTargetDropEvent dtde) {
     public void dragExit(DropTargetEvent dte) {
     }
 
-    class FileTableModel extends AbstractTableModel {
-
-        private static final long serialVersionUID = -8173736343997473512L;
-        private final String[] columnNames = {
-                "Filename", "Pages", "Directory"};
-
-        public int getColumnCount() {
-            return columnNames.length;
-        }
-
-        public int getRowCount() {
-            return filevector.size();
-        }
-
-        public String getColumnName(int col) {
-            return columnNames[col];
-        }
-
-        public Object getValueAt(int row, int col) {
-            switch (col) {
-                case 0:
-                    return filevector.get(row).getFile().getName();
-                case 1:
-                    return filevector.get(row).getPages();
-                case 2:
-                    return filevector.get(row).getFile().getParent();
-            }
-            return null;
-        }
-
-        public Class getColumnClass(int col) {
-            switch (col) {
-                case 0:
-                    return String.class;
-                case 1:
-                    return Integer.class;
-                case 2:
-                    return String.class;
-            }
-            return null;
-        }
-
-        public void removeRow(int row) {
-            filevector.remove(row);
-        }
-    }
-
     public void jTable1_keyPressed(KeyEvent e) {
         if (e.getKeyCode() == 127) {
             int[] selected = jTable1.getSelectedRows();
@@ -262,33 +214,80 @@ static class RowContainer {
         private File file;
         private int pages;
 
-        public File getFile() {
-            return file;
+        /**
+         * RowContainer
+         */
+        RowContainer(File file) {
+            this.file = file;
+            PdfReader reader = null;
+            try {
+                reader = new PdfReader(file.getAbsolutePath());
+            } catch (IOException ignored) {
+            }
+            this.pages = reader.getNumberOfPages();
         }
 
-        public int getPages() {
-            return pages;
+        public File getFile() {
+            return file;
         }
 
         public void setFile(File file) {
             this.file = file;
         }
 
+        public int getPages() {
+            return pages;
+        }
+
         public void setPages(int pages) {
             this.pages = pages;
         }
+    }
 
-        /**
-         * RowContainer
-         */
-        RowContainer(File file) {
-            this.file = file;
-            PdfReader reader = null;
-            try {
-                reader = new PdfReader(file.getAbsolutePath());
-            } catch (IOException ignored) {
+    class FileTableModel extends AbstractTableModel {
+
+        private static final long serialVersionUID = -8173736343997473512L;
+        private final String[] columnNames = {
+                "Filename", "Pages", "Directory"};
+
+        public int getColumnCount() {
+            return columnNames.length;
+        }
+
+        public int getRowCount() {
+            return filevector.size();
+        }
+
+        public String getColumnName(int col) {
+            return columnNames[col];
+        }
+
+        public Object getValueAt(int row, int col) {
+            switch (col) {
+                case 0:
+                    return filevector.get(row).getFile().getName();
+                case 1:
+                    return filevector.get(row).getPages();
+                case 2:
+                    return filevector.get(row).getFile().getParent();
             }
-            this.pages = reader.getNumberOfPages();
+            return null;
+        }
+
+        public Class getColumnClass(int col) {
+            switch (col) {
+                case 0:
+                    return String.class;
+                case 1:
+                    return Integer.class;
+                case 2:
+                    return String.class;
+            }
+            return null;
+        }
+
+        public void removeRow(int row) {
+            filevector.remove(row);
         }
     }
 }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/PdfInformationPanel.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/PdfInformationPanel.java
index 247aa7f34..d774c14da 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/PdfInformationPanel.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/swing/PdfInformationPanel.java
@@ -33,6 +33,9 @@
  */
 package com.lowagie.toolbox.swing;
 
+import com.lowagie.text.pdf.PdfDate;
+import com.lowagie.text.pdf.PdfReader;
+import com.lowagie.text.pdf.RandomAccessFileOrArray;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.beans.PropertyChangeEvent;
@@ -40,39 +43,47 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
-
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.SwingConstants;
 
-import com.lowagie.text.pdf.PdfDate;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.RandomAccessFileOrArray;
-
 /**
  * Label for the FileChooser
+ *
  * @since 2.1.1 (imported from itexttoolbox project)
  */
 public class PdfInformationPanel extends JPanel implements PropertyChangeListener {
 
-    /** A serial version id */
+    /**
+     * A serial version id
+     */
     private static final long serialVersionUID = -4171577284617028707L;
 
-    /** The file name of the PDF we're going to label. */
+    /**
+     * The file name of the PDF we're going to label.
+     */
     String filename = "";
 
-    /** the label containing the metadata */
+    /**
+     * the label containing the metadata
+     */
     JLabel label = new JLabel();
 
-    /** the scrollpane to scroll through the label */
+    /**
+     * the scrollpane to scroll through the label
+     */
     JScrollPane scrollpane = new JScrollPane();
 
-    /** the panel to witch the scrollpane will be added. */
+    /**
+     * the panel to witch the scrollpane will be added.
+     */
     JPanel panel = new JPanel();
 
-    /** Construct the information label (actually it's a JPanel). */
+    /**
+     * Construct the information label (actually it's a JPanel).
+     */
     public PdfInformationPanel() {
         try {
             this.setLayout(new BorderLayout());
@@ -97,13 +108,14 @@ public void createTextFromPDF(File file) {
             int page = 1;
             PdfReader reader = null;
 
-            try (RandomAccessFileOrArray raf = new RandomAccessFileOrArray(file.getAbsolutePath())){
+            try (RandomAccessFileOrArray raf = new RandomAccessFileOrArray(file.getAbsolutePath())) {
                 reader = new PdfReader(raf, null);
                 Map pdfinfo = reader.getInfo();
 
                 StringBuilder sb = new StringBuilder();
                 sb.append("=== Document Information ===
              ");
-                sb.append(reader.getCropBox(page).getHeight()).append("*").append(reader.getCropBox(page).getWidth()).append("
              ");
+                sb.append(reader.getCropBox(page).getHeight()).append("*").append(reader.getCropBox(page).getWidth())
+                        .append("
              ");
                 sb.append("PDF Version: ").append(reader.getPdfVersion()).append("
              ");
                 sb.append("Number of pages: ").append(reader.getNumberOfPages()).append("
              ");
                 sb.append("Number of PDF objects: ").append(reader.getXrefSize()).append("
              ");
@@ -127,7 +139,7 @@ public void createTextFromPDF(File file) {
                 }
                 if (pdfinfo.get("CreationDate") != null) {
                     sb.append("CreationDate= ").append(PdfDate.decode(
-                            pdfinfo.get("CreationDate"))
+                                    pdfinfo.get("CreationDate"))
                             .getTime()).append("
              ");
                 }
                 sb.append("");
@@ -139,9 +151,8 @@ public void createTextFromPDF(File file) {
     }
 
     /**
-     *
-     * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
      * @param evt PropertyChangeEvent
+     * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
      */
     public void propertyChange(PropertyChangeEvent evt) {
         filename = evt.getPropertyName();
diff --git a/pdf-toolbox/src/main/java/com/lowagie/tools/BuildTutorial.java b/pdf-toolbox/src/main/java/com/lowagie/tools/BuildTutorial.java
index dd11a1479..2c2ba02be 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/tools/BuildTutorial.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/tools/BuildTutorial.java
@@ -53,7 +53,6 @@
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
-
 import javax.xml.XMLConstants;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
@@ -65,24 +64,25 @@
 
 /**
  * This class can be used to build the iText website.
- * 
+ *
  * @author Bruno Lowagie
  */
 public class BuildTutorial {
 
     static String root;
     static FileWriter build;
-    
+
     //~ Methods
     // ----------------------------------------------------------------
 
     /**
      * Main method so you can call the convert method from the command line.
+     *
      * @param args 4 arguments are expected:
-     * 
              • a sourcedirectory (root of the tutorial xml-files),
-     * 
              • a destination directory (where the html and build.xml files will be generated),
-     * 
              • an xsl to transform the index.xml into a build.xml
-     * 
              • an xsl to transform the index.xml into am index.html
              
+     *             
              • a sourcedirectory (root of the tutorial xml-files),
+     *             
              • a destination directory (where the html and build.xml files will be generated),
+     *             
              • an xsl to transform the index.xml into a build.xml
+     *             
              • an xsl to transform the index.xml into am index.html
              
      */
 
     public static void main(String[] args) {
@@ -102,8 +102,7 @@ public static void main(String[] args) {
                 build.write("\n");
                 build.flush();
                 build.close();
-            }
-            catch(IOException ioe) {
+            } catch (IOException ioe) {
                 ioe.printStackTrace();
             }
         } else {
@@ -113,15 +112,19 @@ public static void main(String[] args) {
     }
 
     /**
-     * Inspects a file or directory that is given and performs the necessary actions on it (transformation or recursion).
-     * @param source a sourcedirectory (possibly with a tutorial xml-file)
-     * @param destination a destination directory (where the html and build.xml file will be generated, if necessary)
+     * Inspects a file or directory that is given and performs the necessary actions on it (transformation or
+     * recursion).
+     *
+     * @param source       a sourcedirectory (possibly with a tutorial xml-file)
+     * @param destination  a destination directory (where the html and build.xml file will be generated, if necessary)
      * @param xsl_examples an xsl to transform the index.xml into a build.xml
-     * @param xsl_site an xsl to transform the index.xml into am index.html
+     * @param xsl_site     an xsl to transform the index.xml into am index.html
      * @throws IOException when something goes wrong while reading or creating a file or directory
      */
     public static void action(File source, File destination, File xsl_examples, File xsl_site) throws IOException {
-        if (".svn".equals(source.getName())) return;
+        if (".svn".equals(source.getName())) {
+            return;
+        }
         System.out.print(source.getName());
         if (source.isDirectory()) {
             System.out.print(" ");
@@ -135,38 +138,34 @@ public static void action(File source, File destination, File xsl_examples, File
                     current = xmlFile;
                     action(current, dest, xsl_examples, xsl_site);
                 }
-            }
-            else {
+            } else {
                 System.out.println("... skipped");
             }
-        }
-        else if (source.getName().equals("index.xml")) {
+        } else if (source.getName().equals("index.xml")) {
             System.out.println("... transformed");
             convert(source, xsl_site, new File(destination, "index.php"));
             File buildfile = new File(destination, "build.xml");
             String path = buildfile.getCanonicalPath().substring(root.length());
             path = path.replace(File.separatorChar, '/');
-            if ("/build.xml".equals(path)) return;
+            if ("/build.xml".equals(path)) {
+                return;
+            }
             convert(source, xsl_examples, buildfile);
             build.write("\t\n");
-        }
-        else {
+        } else {
             System.out.println("... skipped");
         }
     }
-    
+
     /**
      * Converts an infile, using an xslfile to an
      * outfile.
-     * 
-     * @param infile
-     *            the path to an XML file
-     * @param xslfile
-     *            the path to the XSL file
-     * @param outfile
-     *            the path for the output file
+     *
+     * @param infile  the path to an XML file
+     * @param xslfile the path to the XSL file
+     * @param outfile the path for the output file
      */
     public static void convert(File infile, File xslfile, File outfile) {
         try {
@@ -179,15 +178,17 @@ public static void convert(File infile, File xslfile, File outfile) {
 
             // Use the template to create a transformer
             Transformer xformer = template.newTransformer();
-            
+
             // passing 2 parameters
             String branch = outfile.getParentFile().getCanonicalPath().substring(root.length());
             branch = branch.replace(File.separatorChar, '/');
             StringBuilder path = new StringBuilder();
             for (int i = 0; i < branch.length(); i++) {
-                if (branch.charAt(i) == '/') path.append("/pdf-core/src/test");
+                if (branch.charAt(i) == '/') {
+                    path.append("/pdf-core/src/test");
+                }
             }
-            
+
             xformer.setParameter("branch", branch);
             xformer.setParameter("root", path.toString());
 
diff --git a/pdf-toolbox/src/main/java/com/lowagie/tools/ConcatPdf.java b/pdf-toolbox/src/main/java/com/lowagie/tools/ConcatPdf.java
index 7399e3123..c092e8e37 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/tools/ConcatPdf.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/tools/ConcatPdf.java
@@ -49,6 +49,13 @@
 
 package com.lowagie.tools;
 
+import com.lowagie.text.Document;
+import com.lowagie.text.pdf.PdfCopy;
+import com.lowagie.text.pdf.PdfImportedPage;
+import com.lowagie.text.pdf.PdfReader;
+import com.lowagie.text.pdf.PdfStream;
+import com.lowagie.text.pdf.PdfWriter;
+import com.lowagie.text.pdf.SimpleBookmark;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -58,62 +65,53 @@
 import java.util.List;
 import java.util.Map;
 
-import com.lowagie.text.Document;
-import com.lowagie.text.pdf.PdfCopy;
-import com.lowagie.text.pdf.PdfImportedPage;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.PdfStream;
-import com.lowagie.text.pdf.PdfWriter;
-import com.lowagie.text.pdf.SimpleBookmark;
-
 /**
  * Tool that can be used to concatenate existing PDF files.
+ *
  * @since 2.1.1 (renamed to follow Java naming conventions)
  */
 public class ConcatPdf {
-    
+
     /**
-     * This class can be used to concatenate existing PDF files.
-     * (This was an example known as PdfCopy.java)
+     * This class can be used to concatenate existing PDF files. (This was an example known as PdfCopy.java)
+     *
      * @param args the command line arguments
      */
     public static void main(String[] args) {
         if (args.length < 2) {
             System.err.println("arguments: file1 [file2 ...] destfile");
-        }
-        else {
+        } else {
             try {
-                File outFile = new File(args[args.length-1]);
+                File outFile = new File(args[args.length - 1]);
                 List sources = new ArrayList<>();
-                for (int i = 0; i < args.length -1; i++) {
+                for (int i = 0; i < args.length - 1; i++) {
                     sources.add(new File(args[i]));
                 }
-                concat(sources, outFile);     
-            }
-            catch(IOException e) {
+                concat(sources, outFile);
+            } catch (IOException e) {
                 e.printStackTrace();
             }
         }
     }
-    
+
     public static void concat(List sources, File target) throws IOException {
-        
-        for (File source: sources) {
+
+        for (File source : sources) {
             if (!source.isFile() || !source.canRead()) {
                 throw new IOException("cannot read:" + source.getAbsolutePath());
             }
         }
-        
+
         int pageOffset = 0;
         List> master = new ArrayList<>();
-        
+
         Document document = new Document();
-        PdfCopy  writer = new PdfCopy(document, new BufferedOutputStream(Files.newOutputStream(target.toPath())));
+        PdfCopy writer = new PdfCopy(document, new BufferedOutputStream(Files.newOutputStream(target.toPath())));
         writer.setPdfVersion(PdfWriter.VERSION_1_7);
         writer.setFullCompression();
         writer.setCompressionLevel(PdfStream.BEST_COMPRESSION);
         document.open();
-        for (File source: sources) {
+        for (File source : sources) {
             // we create a reader for a certain document
             PdfReader reader = new PdfReader(new BufferedInputStream(Files.newInputStream(source.toPath())));
             reader.consolidateNamedDestinations();
diff --git a/pdf-toolbox/src/main/java/com/lowagie/tools/Executable.java b/pdf-toolbox/src/main/java/com/lowagie/tools/Executable.java
index ad7294b6d..5bc6d4e5c 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/tools/Executable.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/tools/Executable.java
@@ -49,25 +49,25 @@
  */
 package com.lowagie.tools;
 
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
-import com.lowagie.text.error_messages.MessageLocalization;
-
 /**
  * This class enables you to call an executable that will show a PDF file.
  */
 public class Executable {
-    
+
     /**
      * The path to Acrobat Reader.
      */
     private static String acroread = null;
 
-    
+
     /**
      * Performs an action on a PDF document.
+     *
      * @param fileName
      * @param parameters
      * @param waitForTermination
@@ -79,37 +79,33 @@ private static Process action(final String fileName,
         Process process = null;
         if (parameters.trim().length() > 0) {
             parameters = " " + parameters.trim();
-        }
-        else {
+        } else {
             parameters = "";
         }
         if (acroread != null) {
             process = Runtime.getRuntime().exec(createCommand(
-                    acroread , parameters ,  " \"" , fileName , "\""));
-        }
-        else if (isWindows()) {
+                    acroread, parameters, " \"", fileName, "\""));
+        } else if (isWindows()) {
             if (isWindows9X()) {
                 process = Runtime.getRuntime().exec(createCommand(
-                        "command.com /C start acrord32" , parameters , " \"" , fileName , "\""));
-            }
-            else {
+                        "command.com /C start acrord32", parameters, " \"", fileName, "\""));
+            } else {
                 process = Runtime.getRuntime().exec(createCommand(
-                    "cmd /c start acrord32" , parameters , " \"" , fileName , "\""));
+                        "cmd /c start acrord32", parameters, " \"", fileName, "\""));
             }
-        }
-        else if (isMac()) {
+        } else if (isMac()) {
             if (parameters.trim().length() == 0) {
                 process = Runtime.getRuntime().exec(
-                    new String[] { "/usr/bin/open", fileName });
-            }
-            else {
+                        new String[]{"/usr/bin/open", fileName});
+            } else {
                 process = Runtime.getRuntime().exec(
-                        new String[] { "/usr/bin/open", parameters.trim(), fileName });
+                        new String[]{"/usr/bin/open", parameters.trim(), fileName});
             }
         }
         try {
-            if (process != null && waitForTermination)
+            if (process != null && waitForTermination) {
                 process.waitFor();
+            }
         } catch (InterruptedException ignored) {
         }
         return process;
@@ -124,33 +120,36 @@ else if (isMac()) {
     private static String[] createCommand(String... arguments) {
         return arguments;
     }
-    
+
     /**
      * Opens a PDF document.
-     * @param fileName the name of the file to open
+     *
+     * @param fileName           the name of the file to open
      * @param waitForTermination true to wait for termination, false otherwise
      * @return a process
      * @throws IOException on error
      */
     public static Process openDocument(String fileName,
-                                       boolean waitForTermination) throws IOException {
+            boolean waitForTermination) throws IOException {
         return action(fileName, "", waitForTermination);
     }
 
     /**
      * Opens a PDF document.
-     * @param file the file to open
+     *
+     * @param file               the file to open
      * @param waitForTermination true to wait for termination, false otherwise
      * @return a process
      * @throws IOException on error
      */
     public static Process openDocument(File file,
-                                       boolean waitForTermination) throws IOException {
+            boolean waitForTermination) throws IOException {
         return openDocument(file.getAbsolutePath(), waitForTermination);
     }
 
     /**
      * Opens a PDF document.
+     *
      * @param fileName the name of the file to open
      * @return a process
      * @throws IOException on error
@@ -161,6 +160,7 @@ public static Process openDocument(String fileName) throws IOException {
 
     /**
      * Opens a PDF document.
+     *
      * @param file the file to open
      * @return a process
      * @throws IOException on error
@@ -168,33 +168,36 @@ public static Process openDocument(String fileName) throws IOException {
     public static Process openDocument(File file) throws IOException {
         return openDocument(file, false);
     }
-    
+
     /**
      * Prints a PDF document.
-     * @param fileName the name of the file to print
+     *
+     * @param fileName           the name of the file to print
      * @param waitForTermination true to wait for termination, false otherwise
      * @return a process
      * @throws IOException on error
      */
     public static Process printDocument(String fileName,
-                                        boolean waitForTermination) throws IOException {
+            boolean waitForTermination) throws IOException {
         return action(fileName, "/p", waitForTermination);
     }
 
     /**
      * Prints a PDF document.
-     * @param file the File to print
+     *
+     * @param file               the File to print
      * @param waitForTermination true to wait for termination, false otherwise
      * @return a process
      * @throws IOException on error
      */
     public static Process printDocument(File file,
-                                        boolean waitForTermination) throws IOException {
+            boolean waitForTermination) throws IOException {
         return printDocument(file.getAbsolutePath(), waitForTermination);
     }
 
     /**
      * Prints a PDF document.
+     *
      * @param fileName the name of the file to print
      * @return a process
      * @throws IOException on error
@@ -205,6 +208,7 @@ public static Process printDocument(String fileName) throws IOException {
 
     /**
      * Prints a PDF document.
+     *
      * @param file the File to print
      * @return a process
      * @throws IOException on error
@@ -212,33 +216,36 @@ public static Process printDocument(String fileName) throws IOException {
     public static Process printDocument(File file) throws IOException {
         return printDocument(file, false);
     }
-    
+
     /**
      * Prints a PDF document without opening a Dialog box.
-     * @param fileName the name of the file to print
+     *
+     * @param fileName           the name of the file to print
      * @param waitForTermination true to wait for termination, false otherwise
      * @return a process
      * @throws IOException on error
      */
     public static Process printDocumentSilent(String fileName,
-                                              boolean waitForTermination) throws IOException {
+            boolean waitForTermination) throws IOException {
         return action(fileName, "/p /h", waitForTermination);
     }
 
     /**
      * Prints a PDF document without opening a Dialog box.
-     * @param file the File to print
+     *
+     * @param file               the File to print
      * @param waitForTermination true to wait for termination, false otherwise
      * @return a process
      * @throws IOException on error
      */
     public static Process printDocumentSilent(File file,
-                                              boolean waitForTermination) throws IOException {
+            boolean waitForTermination) throws IOException {
         return printDocumentSilent(file.getAbsolutePath(), waitForTermination);
     }
 
     /**
      * Prints a PDF document without opening a Dialog box.
+     *
      * @param fileName the name of the file to print
      * @return a process
      * @throws IOException on error
@@ -249,6 +256,7 @@ public static Process printDocumentSilent(String fileName) throws IOException {
 
     /**
      * Prints a PDF document without opening a Dialog box.
+     *
      * @param file the File to print
      * @return a process
      * @throws IOException on error
@@ -256,7 +264,7 @@ public static Process printDocumentSilent(String fileName) throws IOException {
     public static Process printDocumentSilent(File file) throws IOException {
         return printDocumentSilent(file, false);
     }
-    
+
     /**
      * Launches a browser opening an URL.
      *
@@ -269,30 +277,31 @@ public static void launchBrowser(String url) throws IOException {
                 Class macUtils = Class.forName("com.apple.mrj.MRJFileUtils");
                 Method openURL = macUtils.getDeclaredMethod("openURL", String.class);
                 openURL.invoke(null, url);
-            }
-            else if (isWindows())
-                Runtime.getRuntime().exec(createCommand("rundll32 url.dll,FileProtocolHandler " , url));
-            else { //assume Unix or Linux
+            } else if (isWindows()) {
+                Runtime.getRuntime().exec(createCommand("rundll32 url.dll,FileProtocolHandler ", url));
+            } else { //assume Unix or Linux
                 String[] browsers = {
-                   "firefox", "opera", "konqueror", "mozilla", "netscape" };
+                        "firefox", "opera", "konqueror", "mozilla", "netscape"};
                 String browser = null;
-                for (int count = 0; count < browsers.length && browser == null; count++)
-                   if (Runtime.getRuntime().exec(new String[] {"which", browsers[count]}).waitFor() == 0)
-                      browser = browsers[count];
-                if (browser == null)
-                   throw new Exception(MessageLocalization.getComposedMessage("could.not.find.web.browser"));
-                else
-                   Runtime.getRuntime().exec(new String[] {browser, url});
+                for (int count = 0; count < browsers.length && browser == null; count++) {
+                    if (Runtime.getRuntime().exec(new String[]{"which", browsers[count]}).waitFor() == 0) {
+                        browser = browsers[count];
+                    }
                 }
-             }
-          catch (Exception e) {
-             throw new IOException(MessageLocalization.getComposedMessage("error.attempting.to.launch.web.browser"));
-          }
+                if (browser == null) {
+                    throw new Exception(MessageLocalization.getComposedMessage("could.not.find.web.browser"));
+                } else {
+                    Runtime.getRuntime().exec(new String[]{browser, url});
+                }
+            }
+        } catch (Exception e) {
+            throw new IOException(MessageLocalization.getComposedMessage("error.attempting.to.launch.web.browser"));
+        }
     }
 
     /**
      * Checks the Operating System.
-     * 
+     *
      * @return true if the current os is Windows
      */
     public static boolean isWindows() {
@@ -302,7 +311,7 @@ public static boolean isWindows() {
 
     /**
      * Checks the Operating System.
-     * 
+     *
      * @return true if the current os is Windows
      */
     public static boolean isWindows9X() {
@@ -312,7 +321,7 @@ public static boolean isWindows9X() {
 
     /**
      * Checks the Operating System.
-     * 
+     *
      * @return true if the current os is Apple
      */
     public static boolean isMac() {
@@ -322,7 +331,7 @@ public static boolean isMac() {
 
     /**
      * Checks the Operating System.
-     * 
+     *
      * @return true if the current os is Linux
      */
     public static boolean isLinux() {
diff --git a/pdf-toolbox/src/main/java/com/lowagie/tools/SplitPdf.java b/pdf-toolbox/src/main/java/com/lowagie/tools/SplitPdf.java
index ab410e3bf..b1c65f34a 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/tools/SplitPdf.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/tools/SplitPdf.java
@@ -50,45 +50,46 @@
 
 package com.lowagie.tools;
 
-import java.io.FileOutputStream;
-import com.lowagie.text.error_messages.MessageLocalization;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
+import com.lowagie.text.error_messages.MessageLocalization;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfImportedPage;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * This class demonstrates how to split a PDF file using iText.
+ *
  * @author Bruno Lowagie
  * @since 2.1.1 (renamed to follow Java naming conventions)
  */
 public class SplitPdf extends java.lang.Object {
-    
+
     /**
      * This class can be used to split an existing PDF file.
+     *
      * @param args the command line arguments
      */
     public static void main(String[] args) {
         if (args.length != 4) {
             System.err.println("arguments: srcfile destfile1 destfile2 pagenumber");
-        }
-        else {
+        } else {
             try {
                 int pagenumber = Integer.parseInt(args[3]);
-                
+
                 // we create a reader for a certain document
                 PdfReader reader = new PdfReader(args[0]);
                 // we retrieve the total number of pages
                 int n = reader.getNumberOfPages();
                 System.out.println("There are " + n + " pages in the original file.");
-                
+
                 if (pagenumber < 2 || pagenumber > n) {
-                    throw new DocumentException(MessageLocalization.getComposedMessage("you.can.t.split.this.document.at.page.1.there.is.no.such.page", pagenumber));
+                    throw new DocumentException(MessageLocalization.getComposedMessage(
+                            "you.can.t.split.this.document.at.page.1.there.is.no.such.page", pagenumber));
                 }
-                
+
                 // step 1: creation of a document-object
                 Document document1 = new Document(reader.getPageSizeWithRotation(1));
                 Document document2 = new Document(reader.getPageSizeWithRotation(pagenumber));
@@ -112,8 +113,7 @@ public static void main(String[] args) {
                     rotation = reader.getPageRotation(i);
                     if (rotation == 90 || rotation == 270) {
                         cb1.addTemplate(page, 0, -1f, 1f, 0, 0, reader.getPageSizeWithRotation(i).getHeight());
-                    }
-                    else {
+                    } else {
                         cb1.addTemplate(page, 1f, 0, 0, 1f, 0, 0);
                     }
                 }
@@ -125,8 +125,7 @@ public static void main(String[] args) {
                     rotation = reader.getPageRotation(i);
                     if (rotation == 90 || rotation == 270) {
                         cb2.addTemplate(page, 0, -1f, 1f, 0, 0, reader.getPageSizeWithRotation(i).getHeight());
-                    }
-                    else {
+                    } else {
                         cb2.addTemplate(page, 1f, 0, 0, 1f, 0, 0);
                     }
                     System.out.println("Processed page " + i);
@@ -134,8 +133,7 @@ public static void main(String[] args) {
                 // step 5: we close the document
                 document1.close();
                 document2.close();
-            }
-            catch(Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/tools/ToolboxAvailable.java b/pdf-toolbox/src/main/java/com/lowagie/tools/ToolboxAvailable.java
index ae77409c0..a06823f68 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/tools/ToolboxAvailable.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/tools/ToolboxAvailable.java
@@ -48,31 +48,30 @@
  */
 package com.lowagie.tools;
 
-import java.awt.GraphicsEnvironment;
-import javax.swing.JOptionPane;
-
 import com.lowagie.text.Document;
 import com.lowagie.toolbox.Toolbox;
+import java.awt.GraphicsEnvironment;
+import javax.swing.JOptionPane;
 
 public class ToolboxAvailable {
 
     /**
-     * Checks if the toolbox if available.
-     * If it is, the toolbox is started.
-     * If it isn't, an error message is shown.
+     * Checks if the toolbox if available. If it is, the toolbox is started. If it isn't, an error message is shown.
+     *
      * @param args the command-line args
      */
     public static void main(String[] args) {
         if (GraphicsEnvironment.isHeadless()) {
             System.out.println(Document.getVersion() + " Toolbox error: headless display");
-        } else
-        try {
-            Toolbox.main(args);
-        } catch (Exception e) {
-            JOptionPane.showMessageDialog(null,
-                    "You need the iText-toolbox.jar with class com.lowagie.toolbox.Toolbox to use the iText Toolbox.",
-                    Document.getVersion() + " Toolbox error",
-                    JOptionPane.ERROR_MESSAGE);
+        } else {
+            try {
+                Toolbox.main(args);
+            } catch (Exception e) {
+                JOptionPane.showMessageDialog(null,
+                        "You need the iText-toolbox.jar with class com.lowagie.toolbox.Toolbox to use the iText Toolbox.",
+                        Document.getVersion() + " Toolbox error",
+                        JOptionPane.ERROR_MESSAGE);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/main/java/org/librepdf/openpdf/examples/fonts/languages/Chinese.java b/pdf-toolbox/src/main/java/org/librepdf/openpdf/examples/fonts/languages/Chinese.java
index 12bf2c840..56e7f5f4c 100644
--- a/pdf-toolbox/src/main/java/org/librepdf/openpdf/examples/fonts/languages/Chinese.java
+++ b/pdf-toolbox/src/main/java/org/librepdf/openpdf/examples/fonts/languages/Chinese.java
@@ -1,12 +1,5 @@
 package org.librepdf.openpdf.examples.fonts.languages;
 
-import java.awt.Color;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
@@ -14,6 +7,12 @@
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.toolbox.plugins.watermarker.Watermarker;
+import java.awt.Color;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 public class Chinese {
 
diff --git a/pdf-toolbox/src/main/java/org/librepdf/openpdf/examples/fonts/languages/Japanese.java b/pdf-toolbox/src/main/java/org/librepdf/openpdf/examples/fonts/languages/Japanese.java
index 3916e4b1b..1993a6d11 100644
--- a/pdf-toolbox/src/main/java/org/librepdf/openpdf/examples/fonts/languages/Japanese.java
+++ b/pdf-toolbox/src/main/java/org/librepdf/openpdf/examples/fonts/languages/Japanese.java
@@ -5,7 +5,6 @@
 import com.lowagie.text.Font;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/conformance/PdfA1B.java b/pdf-toolbox/src/test/java/com/lowagie/examples/conformance/PdfA1B.java
index 5e8e71393..2283960ee 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/conformance/PdfA1B.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/conformance/PdfA1B.java
@@ -9,11 +9,13 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.conformance;
 
+import static com.lowagie.text.pdf.PdfWriter.PDFA1B;
+
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
@@ -23,7 +25,6 @@
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.xml.xmp.XmpWriter;
-
 import java.awt.color.ColorSpace;
 import java.awt.color.ICC_Profile;
 import java.io.ByteArrayOutputStream;
@@ -31,11 +32,9 @@
 import java.io.IOException;
 import java.util.Objects;
 
-import static com.lowagie.text.pdf.PdfWriter.PDFA1B;
-
 /**
  * Creates a document validating PDF/A-1b conformance
- * 
+ *
  * @author raodienne
  */
 
@@ -43,21 +42,21 @@ public class PdfA1B {
 
     /**
      * Creates a document validating PDF/A-1b conformance
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
         System.out.println("PDF/A-1b");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2: create writer and set conformance
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("PdfA1b.pdf"));
             writer.setPDFXConformance(PDFA1B);
-            
+
             // step 3: open the document
             document.open();
 
@@ -79,14 +78,15 @@ public static void main(String[] args) {
                 writer.setOutputIntents("Custom", "", null, "sRGB IEC61966-2.1",
                         ICC_Profile.getInstance(ColorSpace.CS_sRGB));
             }
-            
+
             // step 4:
-            
+
             // we make some content
             String fontDir = "com/lowagie/examples/fonts/";
 
             BaseFont notoBase = BaseFont.createFont(
-                    Objects.requireNonNull(PdfA1B.class.getClassLoader().getResource(fontDir+"noto/NotoSans-Regular.ttf")).getFile(),
+                    Objects.requireNonNull(
+                            PdfA1B.class.getClassLoader().getResource(fontDir + "noto/NotoSans-Regular.ttf")).getFile(),
                     BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
             Font noto = new Font(notoBase, 10, Font.NORMAL);
 
@@ -95,7 +95,7 @@ public static void main(String[] args) {
 
             // some paragraph
             Paragraph p2 = new Paragraph("blah, blah, blah", noto);
-            
+
             // we add the content
             document.add(p1);
             document.add(p2);
@@ -105,8 +105,7 @@ public static void main(String[] args) {
             document.add(p2);
             document.add(p2);
             document.add(p2);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/Layers.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/Layers.java
index 3d65dd03f..4b76ac7bc 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/Layers.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/Layers.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -23,41 +20,46 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Explains the concept concerning PdfContentByte layers.
  */
 public class Layers {
-    
+
     /**
      * Draws different things into different layers.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Layers");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2: creation of the writer
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("layers.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
-            
+
             // high level
             Paragraph p = new Paragraph();
-            for (int i = 0; i < 100; i++) p.add(new Chunk("Blah blah blah blah blah. "));
+            for (int i = 0; i < 100; i++) {
+                p.add(new Chunk("Blah blah blah blah blah. "));
+            }
             document.add(p);
             Image img = Image.getInstance("hitchcock.png");
             img.setAbsolutePosition(100, 500);
             document.add(img);
-            
+
             // low level
             PdfContentByte cb = writer.getDirectContent();
             PdfContentByte cbu = writer.getDirectContentUnder();
@@ -65,14 +67,13 @@ public static void main(String[] args) {
             cb.circle(250.0f, 500.0f, 50.0f);
             cb.fill();
             cb.sanityCheck();
-            
+
             cbu.setRGBColorFill(0xFF, 0x00, 0x00);
             cbu.circle(250.0f, 500.0f, 100.0f);
             cbu.fill();
             cbu.sanityCheck();
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/TemplateImages.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/TemplateImages.java
index 30311c0ea..9251621b9 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/TemplateImages.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/TemplateImages.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
@@ -28,18 +25,23 @@
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+
 /**
  * Wrapping a PdfTemplate in an Image.
  */
 public class TemplateImages {
+
     /**
      * PdfTemplates can be wrapped in an Image.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("PdfTemplate wrapped in an Image");
-            
+
         // step 1: creation of a document-object
         Rectangle rect = new Rectangle(PageSize.A4);
         rect.setBackgroundColor(new Color(238, 221, 88));
@@ -84,7 +86,7 @@ public static void main(String[] args) {
             table.addCell("I see a template on my right");
             table.addCell(cell);
             table.addCell("I see a template on my left");
-            
+
             Paragraph p1 = new Paragraph("This is a template ");
             p1.add(ck);
             p1.add(" just here.");
@@ -95,13 +97,13 @@ public static void main(String[] args) {
             p2.setLeading(img.getScaledHeight() * 1.1f);
             p2.setAlignment(Element.ALIGN_JUSTIFIED);
             img.scalePercent(70);
-            for (int k = 0; k < 20; ++k)
+            for (int k = 0; k < 20; ++k) {
                 p2.add(ck);
+            }
             document.add(p2);
             // step 5: we close the document
             document.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             System.err.println(de.getMessage());
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/Templates.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/Templates.java
index f426937b6..ebf93b173 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/Templates.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/Templates.java
@@ -9,50 +9,50 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 /**
  * Demonstrates the use of PdfTemplate.
  */
 public class Templates {
-    
+
     /**
      * @param args - the arguments passed by the command line
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Templates");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("templates.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we grab the ContentByte and do some stuff with it
             PdfContentByte cb = writer.getDirectContent();
-            
+
             // we create a PdfTemplate
             PdfTemplate template = cb.createTemplate(500, 200);
-            
+
             // we add some graphics
             template.moveTo(0, 200);
             template.lineTo(500, 0);
@@ -60,7 +60,7 @@ public static void main(String[] args) {
             template.setRGBColorStrokeF(255f, 0f, 0f);
             template.circle(250f, 100f, 80f);
             template.stroke();
-            
+
             // we add some text
             template.beginText();
             BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
@@ -69,19 +69,18 @@ public static void main(String[] args) {
             template.showText("Text at the position 100,100 (relative to the template!)");
             template.endText();
             template.sanityCheck();
-            
+
             // we add the template on different positions
             cb.addTemplate(template, 0, 0);
             cb.addTemplate(template, 0, 1, -1, 0, 500, 200);
             cb.addTemplate(template, .5f, 0, 0, .5f, 100, 400);
-            
+
             // we go to a new page
             document.newPage();
             cb.addTemplate(template, 0, 400);
             cb.addTemplate(template, 2, 0, 0, 2, -200, 400);
             cb.sanityCheck();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Groups.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Groups.java
index a2c8735aa..a79a41d57 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Groups.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Groups.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.colors;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.PdfContentByte;
@@ -23,16 +20,19 @@
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfTransparencyGroup;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates transparency and images.
  */
 public class Groups {
-    
+
     /**
      * Prints a square and fills half of it with a gray rectangle.
-     * @param x the x-coordinate of the rectangle
-     * @param y the y-coordinate of the rectangle
+     *
+     * @param x  the x-coordinate of the rectangle
+     * @param y  the y-coordinate of the rectangle
      * @param cb the PdfContentByte
      */
     public static void pictureBackdrop(float x, float y, PdfContentByte cb) {
@@ -47,8 +47,9 @@ public static void pictureBackdrop(float x, float y, PdfContentByte cb) {
 
     /**
      * Prints 3 circles in different colors that intersect with eachother.
-     * @param x the x-coordinate of the intersection
-     * @param y the y-coordinate of the intersection
+     *
+     * @param x  the x-coordinate of the intersection
+     * @param y  the y-coordinate of the intersection
      * @param cb the PdfContentByte
      */
     public static void pictureCircles(float x, float y, PdfContentByte cb) {
@@ -67,6 +68,7 @@ public static void pictureCircles(float x, float y, PdfContentByte cb) {
 
     /**
      * Demonstrates the Transparency functionality.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -81,7 +83,7 @@ public static void main(String[] args) {
             // step 4: content
             PdfContentByte cb = writer.getDirectContent();
             float gap = (document.getPageSize().getWidth() - 400) / 3;
-            
+
             pictureBackdrop(gap, 500, cb);
             pictureBackdrop(200 + 2 * gap, 500, cb);
             pictureBackdrop(gap, 500 - 200 - gap, cb);
@@ -89,7 +91,7 @@ public static void main(String[] args) {
 
             PdfTemplate tp;
             PdfTransparencyGroup group;
-            
+
             tp = cb.createTemplate(200, 200);
             pictureCircles(0, 0, tp);
             group = new PdfTransparencyGroup();
@@ -99,7 +101,6 @@ public static void main(String[] args) {
             tp.sanityCheck();
             cb.addTemplate(tp, gap, 500);
 
-            
             tp = cb.createTemplate(200, 200);
             pictureCircles(0, 0, tp);
             group = new PdfTransparencyGroup();
@@ -109,7 +110,6 @@ public static void main(String[] args) {
             tp.sanityCheck();
             cb.addTemplate(tp, 200 + 2 * gap, 500);
 
-            
             tp = cb.createTemplate(200, 200);
             pictureCircles(0, 0, tp);
             group = new PdfTransparencyGroup();
@@ -119,7 +119,6 @@ public static void main(String[] args) {
             tp.sanityCheck();
             cb.addTemplate(tp, gap, 500 - 200 - gap);
 
-            
             tp = cb.createTemplate(200, 200);
             pictureCircles(0, 0, tp);
             group = new PdfTransparencyGroup();
@@ -130,8 +129,7 @@ public static void main(String[] args) {
             cb.addTemplate(tp, 200 + 2 * gap, 500 - 200 - gap);
 
             cb.sanityCheck();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Pattern.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Pattern.java
index a50d4b370..dcbfe424c 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Pattern.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Pattern.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.colors;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.CMYKColor;
@@ -26,31 +23,35 @@
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.SpotColor;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Painting Patterns.
  */
 public class Pattern {
+
     /**
      * Painting Patterns.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Stencil");
-        
+
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4, 50, 50, 50, 50);
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("pattern.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add some content
             PdfContentByte cb = writer.getDirectContent();
             PdfTemplate tp = cb.createTemplate(400, 300);
@@ -58,14 +59,14 @@ public static void main(String[] args) {
             pat.rectangle(5, 5, 5, 5);
             pat.fill();
             pat.sanityCheck();
-            
+
             PdfSpotColor spc_cmyk = new PdfSpotColor("PANTONE 280 CV", new CMYKColor(0.9f, .2f, .3f, .1f));
             SpotColor spot = new SpotColor(spc_cmyk, 0.25f);
             tp.setPatternFill(pat, spot, .9f);
             tp.rectangle(0, 0, 400, 300);
             tp.fill();
             tp.sanityCheck();
-            
+
             cb.addTemplate(tp, 50, 50);
             PdfPatternPainter pat2 = cb.createPattern(10, 10, null);
             pat2.setLineWidth(2);
@@ -95,10 +96,9 @@ public static void main(String[] args) {
             cb.setPatternFill(pat2, new GrayColor(0.9f));
             cb.rectangle(350, 400, 30, 40);
             cb.fillStroke();
-            
+
             cb.sanityCheck();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Patterns.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Patterns.java
index e23339dcd..18a6f6cd2 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Patterns.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Patterns.java
@@ -9,12 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.colors;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
@@ -26,65 +24,68 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfPatternPainter;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Painting patterns
  */
 public class Patterns {
+
     /**
      * Painting patterns.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Painting Patterns");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("patterns.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we grab the ContentByte and do some stuff with it
             PdfContentByte cb = writer.getDirectContent();
-            
+
             BaseFont bf = BaseFont.createFont("Times-Roman", "winansi", false);
-            
+
             // step 5: we create some PdfPatternPainter instances for drawing path, text, or placing image
-            
+
             // Image instance to be placed in PdfPatternPainter canvas. Any nice one?
             Image img = Image.getInstance("pngnow.png");
 
             PdfPatternPainter p = cb.createPattern(60f, 60f, 60f, 60f);
             PdfPatternPainter p1 = cb.createPattern(60f, 60f, 60f, 60f);
-            PdfPatternPainter p2 = cb.createPattern(img.getScaledWidth(), img.getScaledHeight(), img.getScaledWidth(), img.getScaledHeight());
-            
-            
+            PdfPatternPainter p2 = cb.createPattern(img.getScaledWidth(), img.getScaledHeight(), img.getScaledWidth(),
+                    img.getScaledHeight());
+
             // step 6: put your drawing instruction in the painter canvas
-            
+
             // A star pattern taken from Adobe PDF Reference Book p.207
             String star = "0.3 g\n15.000 27.000 m\n"
-            + "7.947 5.292 l\n26.413 18.708 l\n"
-            + "3.587 18.708 l\n22.053 5.292 l\nf\n"
-            + "45.000 57.000 m\n37.947 35.292 l\n"
-            + "56.413 48.708 l\n33.587 48.708 l\n"
-            + "52.053 35.292 l\nf\n"
-            + "0.7 g\n15.000 57.000 m\n"
-            + "7.947 35.292 l\n26.413 48.708 l\n"
-            + "3.587 48.708 l\n22.053 35.292 l\nf\n"
-            + "45.000 27.000 m\n37.947 5.292 l\n"
-            + "56.413 18.708 l\n33.587 18.708 l\n"
-            + "52.053 5.292 l\nf";
-            
+                    + "7.947 5.292 l\n26.413 18.708 l\n"
+                    + "3.587 18.708 l\n22.053 5.292 l\nf\n"
+                    + "45.000 57.000 m\n37.947 35.292 l\n"
+                    + "56.413 48.708 l\n33.587 48.708 l\n"
+                    + "52.053 35.292 l\nf\n"
+                    + "0.7 g\n15.000 57.000 m\n"
+                    + "7.947 35.292 l\n26.413 48.708 l\n"
+                    + "3.587 48.708 l\n22.053 35.292 l\nf\n"
+                    + "45.000 27.000 m\n37.947 5.292 l\n"
+                    + "56.413 18.708 l\n33.587 18.708 l\n"
+                    + "52.053 5.292 l\nf";
+
             p.setLiteral(star);
-            
+
             // A Pattern with some text drawing
             p1.setGrayFill(0.3f);
             p1.setFontAndSize(bf, 12);
@@ -96,26 +97,27 @@ public static void main(String[] args) {
             p1.lineTo(60f, 60f);
             p1.stroke();
             p1.sanityCheck();
-            
+
             // A pattern with an image and position
             p2.addImage(img, img.getScaledWidth(), 0f, 0f, img.getScaledHeight(), 0f, 0f);
             p2.setPatternMatrix(1f, 0f, 0f, 1f, 60f, 60f);
             p2.sanityCheck();
-            
+
             // See if we can apply the pattern color to chunk, phrase or paragraph
             PatternColor pat = new PatternColor(p);
             PatternColor pat1 = new PatternColor(p1);
             PatternColor pat2 = new PatternColor(p2);
             String text = "Text with pattern";
-            document.add(new Paragraph(text, FontFactory.getFont(FontFactory.HELVETICA, 60, Font.BOLD, new GrayColor(0.3f))));
+            document.add(new Paragraph(text,
+                    FontFactory.getFont(FontFactory.HELVETICA, 60, Font.BOLD, new GrayColor(0.3f))));
             document.add(new Paragraph(text, FontFactory.getFont(FontFactory.HELVETICA, 60, Font.BOLD, pat)));
-            
+
             // draw a rectangle filled with star pattern
             cb.setPatternFill(p);
             cb.setGrayStroke(0.0f);
             cb.rectangle(20, 20, 284, 120);
             cb.fillStroke();
-            
+
             // draw some characters filled with star.
             // Note: A gray, rgb, cmyk or spot color should be applied first
             // otherwise, you will not be able to see the character glyph
@@ -130,23 +132,24 @@ public static void main(String[] args) {
             cb.showText("ABC");
             cb.endText();
             cb.setPatternFill(p);
-            
+
             // draw a circle. Similar to rectangle
             cb.setGrayStroke(0.0f);
             cb.circle(150f, 400f, 150f);
             cb.fillStroke();
-            
+
             // New Page to draw text in the pattern painter's canvas
             document.newPage();
-            
-            document.add(new Paragraph(text, FontFactory.getFont(FontFactory.HELVETICA, 60, Font.BOLD, new GrayColor(0.3f))));
+
+            document.add(new Paragraph(text,
+                    FontFactory.getFont(FontFactory.HELVETICA, 60, Font.BOLD, new GrayColor(0.3f))));
             document.add(new Paragraph(text, FontFactory.getFont(FontFactory.HELVETICA, 60, Font.BOLD, pat1)));
             // draw a rectangle
             cb.setPatternFill(p1);
             cb.setGrayStroke(0.0f);
             cb.rectangle(0, 0, 284, 120);
             cb.fillStroke();
-            
+
             // draw some characters
             cb.beginText();
             cb.setFontAndSize(bf, 1);
@@ -157,28 +160,29 @@ public static void main(String[] args) {
             cb.moveTextWithLeading(0.0f, 0.0f);
             cb.showText("ABC");
             cb.endText();
-            
+
             // draw a circle
             cb.setPatternFill(p1);
             cb.setGrayStroke(0.0f);
             cb.circle(150f, 400f, 150f);
             cb.fillStroke();
             cb.sanityCheck();
-            
+
             // New page to place image in the pattern painter's canvas
             document.newPage();
-            document.add(new Paragraph(text, FontFactory.getFont(FontFactory.HELVETICA, 60, Font.BOLD, new GrayColor(0.3f))));
+            document.add(new Paragraph(text,
+                    FontFactory.getFont(FontFactory.HELVETICA, 60, Font.BOLD, new GrayColor(0.3f))));
             document.add(new Paragraph(text, FontFactory.getFont(FontFactory.HELVETICA, 60, Font.BOLD, pat2)));
             // The original Image for comparison reason.
             // Note: The width and height is the same as bbox in pattern
             cb.addImage(img, img.getScaledWidth(), 0f, 0f, img.getScaledHeight(), 350f, 400f);
-            
+
             // draw a rectangle
             cb.setPatternFill(p2);
             cb.setGrayStroke(0.0f);
             cb.rectangle(60, 60, 300, 120);
             cb.fillStroke();
-            
+
             // draw some characters.
             // Note: if the image fills up the pattern, there's no need to draw text twice
             // since colors in image will be clipped to character glyph path
@@ -188,19 +192,18 @@ public static void main(String[] args) {
             cb.setPatternFill(p2);
             cb.showText("ABC");
             cb.endText();
-            
+
             // draw a circle
             cb.setPatternFill(p2);
             cb.setGrayStroke(0.0f);
             cb.circle(150f, 400f, 150f);
             cb.fillStroke();
-            
+
             cb.sanityCheck();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        
+
         // finally, we close the document
         document.close();
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Shading.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Shading.java
index bc02f123a..1485bbc0d 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Shading.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Shading.java
@@ -9,12 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.colors;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.CMYKColor;
@@ -22,12 +20,16 @@
 import com.lowagie.text.pdf.PdfFunction;
 import com.lowagie.text.pdf.PdfShading;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+
 /**
  * Shading example
  */
 public class Shading {
+
     /**
      * Shading example.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -38,13 +40,13 @@ public static void main(String[] args) {
             document.open();
 
             PdfFunction function1 = PdfFunction.type2(writer, new float[]{0, 1}, null,
-                new float[]{.929f, .357f, 1, .298f}, new float[]{.631f, .278f, 1, .027f}, 1.048f);
+                    new float[]{.929f, .357f, 1, .298f}, new float[]{.631f, .278f, 1, .027f}, 1.048f);
             PdfFunction function2 = PdfFunction.type2(writer, new float[]{0, 1}, null,
-                new float[]{.929f, .357f, 1, .298f}, new float[]{.941f, .4f, 1, .102f}, 1.374f);
+                    new float[]{.929f, .357f, 1, .298f}, new float[]{.941f, .4f, 1, .102f}, 1.374f);
             PdfFunction function3 = PdfFunction.type3(writer, new float[]{0, 1}, null,
-                new PdfFunction[]{function1, function2}, new float[]{.708f}, new float[]{1, 0, 0, 1});
+                    new PdfFunction[]{function1, function2}, new float[]{.708f}, new float[]{1, 0, 0, 1});
             PdfShading shading = PdfShading.type3(writer, new CMYKColor(0, 0, 0, 0),
-                new float[]{0, 0, .096f, 0, 0, 1}, null, function3, new boolean[]{true, true});
+                    new float[]{0, 0, .096f, 0, 0, 1}, null, function3, new boolean[]{true, true});
             PdfContentByte cb = writer.getDirectContent();
             cb.moveTo(316.789f, 140.311f);
             cb.curveTo(303.222f, 146.388f, 282.966f, 136.518f, 279.122f, 121.983f);
@@ -58,12 +60,11 @@ public static void main(String[] args) {
             cb.concatCTM(27.7843f, 0, 0, -27.7843f, 310.2461f, 121.1521f);
             cb.paintShading(shading);
             cb.restoreState();
-            
+
             cb.sanityCheck();
-            
+
             document.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/ShadingPattern.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/ShadingPattern.java
index e4440844c..de1a40cc4 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/ShadingPattern.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/ShadingPattern.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.colors;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.BaseFont;
@@ -23,13 +20,17 @@
 import com.lowagie.text.pdf.PdfShading;
 import com.lowagie.text.pdf.PdfShadingPattern;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Shading example
  */
 public class ShadingPattern {
+
     /**
      * Shading example.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -49,12 +50,12 @@ public static void main(String[] args) {
             cb.setFontAndSize(bf, 40);
             cb.showText("Look at this text!");
             cb.endText();
-            PdfShading shadingR = PdfShading.simpleRadial(writer, 200, 500, 50, 300, 500, 100, new Color(255, 247, 148), new Color(247, 138, 107), false, false);
+            PdfShading shadingR = PdfShading.simpleRadial(writer, 200, 500, 50, 300, 500, 100, new Color(255, 247, 148),
+                    new Color(247, 138, 107), false, false);
             cb.paintShading(shadingR);
             cb.sanityCheck();
             document.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/SoftMask.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/SoftMask.java
index 0b5b11db7..ec2a9b516 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/SoftMask.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/SoftMask.java
@@ -9,18 +9,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.colors;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Image;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates transparency and images.
@@ -29,6 +28,7 @@ public class SoftMask {
 
     /**
      * Demonstrates the Transparency functionality.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -55,15 +55,15 @@ public static void main(String[] args) {
             Image img = Image.getInstance("otsoe.jpg");
             img.setAbsolutePosition(100, 550);
             byte[] gradient = new byte[256];
-            for (int k = 0; k < 256; ++k)
-                gradient[k] = (byte)k;
+            for (int k = 0; k < 256; ++k) {
+                gradient[k] = (byte) k;
+            }
             Image smask = Image.getInstance(256, 1, 1, 8, gradient);
             smask.makeMask();
             img.setImageMask(smask);
             cb.addImage(img);
             cb.sanityCheck();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/SpotColors.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/SpotColors.java
index 98412b9a9..bab9b0768 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/SpotColors.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/SpotColors.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.colors;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
@@ -27,43 +24,46 @@
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.SpotColor;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates the use of spotcolors.
  */
 public class SpotColors {
-    
+
     /**
      * Demonstrates the use of spotcolors.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Pantone example : Spot Color");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("spotcolor.pdf"));
             BaseFont bf = BaseFont.createFont("Helvetica", "winansi", BaseFont.NOT_EMBEDDED);
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we grab the ContentByte and do some stuff with it
             PdfContentByte cb = writer.getDirectContent();
-            
+
             // step 5: we instantiate PdfSpotColor
-            
+
             // Note: I made up these names unless someone give me a PANTONE swatch as gift (phillip@formstar.com)
             PdfSpotColor spc_cmyk = new PdfSpotColor("PANTONE 280 CV", new CMYKColor(0.9f, .2f, .3f, .1f));
             PdfSpotColor spc_rgb = new PdfSpotColor("PANTONE 147", new Color(114, 94, 38));
             PdfSpotColor spc_g = new PdfSpotColor("PANTONE 100 CV", new GrayColor(0.9f));
-            
+
             // Stroke a rectangle with CMYK alternate
             cb.setColorStroke(spc_cmyk, .5f);
             cb.setLineWidth(10f);
@@ -74,23 +74,23 @@ public static void main(String[] args) {
             cb.lineTo(200, 800);
             // stroke the lines
             cb.stroke();
-            
+
             // Fill a rectangle with CMYK alternate
             cb.setColorFill(spc_cmyk, 0.25f);
             cb.rectangle(250, 700, 100, 100);
             cb.fill();
-            
+
             // Stroke a circle with RGB alternate
             cb.setColorStroke(spc_rgb, 0.9f);
             cb.setLineWidth(5f);
             cb.circle(150f, 500f, 100f);
             cb.stroke();
-            
+
             // Fill the circle with RGB alternate
             cb.setColorFill(spc_rgb, 0.9f);
             cb.circle(150f, 500f, 50f);
             cb.fill();
-            
+
             // example with colorfill
             cb.setColorFill(spc_g, 0.5f);
             cb.moveTo(100f, 200f);
@@ -100,9 +100,10 @@ public static void main(String[] args) {
             // cb.sanityCheck is called during newPage().
             document.newPage();
             String text = "Some text to show";
-            document.add(new Paragraph(text, new Font(Font.HELVETICA, 24, Font.NORMAL, new SpotColor(spc_cmyk, 0.25f))));
+            document.add(
+                    new Paragraph(text, new Font(Font.HELVETICA, 24, Font.NORMAL, new SpotColor(spc_cmyk, 0.25f))));
             document.add(new Paragraph(text, new Font(Font.HELVETICA, 24, Font.NORMAL, new SpotColor(spc_cmyk, 0.5f))));
-            
+
             // example with template
             PdfTemplate t = cb.createTemplate(500f, 500f);
             // Stroke a rectangle with CMYK alternate
@@ -115,7 +116,7 @@ public static void main(String[] args) {
             t.lineTo(200, 100);
             // stroke the lines
             t.stroke();
-            
+
             // Fill a rectangle with CMYK alternate
             t.setColorFill(spc_g, 0.5f);
             t.rectangle(100, 125, 100, 100);
@@ -129,13 +130,12 @@ public static void main(String[] args) {
             t.stroke();
             t.sanityCheck();
             cb.addTemplate(t, -1.0f, 0.00f, 0.00f, -1.0f, 550f, 550f);
-            
+
             cb.sanityCheck();
-        }
-        catch(Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
-        
+
         // step 5: we close the document
         document.close();
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/TableCellTransparency.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/TableCellTransparency.java
index ca932465b..c98763b68 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/TableCellTransparency.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/TableCellTransparency.java
@@ -27,7 +27,6 @@
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.RGBColor;
-
 import java.awt.Color;
 import java.io.FileOutputStream;
 
@@ -49,8 +48,10 @@ public static void main(String[] args) {
             document.open();
             Rectangle page = document.getPageSize();
             PdfContentByte cb = writer.getDirectContent();
-            Font fontPlain = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.NORMAL, new Color(255, 255, 255, 255));
-            Font fontHalf = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.NORMAL, new Color(255, 255, 255, 125));
+            Font fontPlain = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.NORMAL,
+                    new Color(255, 255, 255, 255));
+            Font fontHalf = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.NORMAL,
+                    new Color(255, 255, 255, 125));
 
             // Table cell transparency with RGB Color
             PdfPTable pdfTableRGB = new PdfPTable(3);
@@ -79,7 +80,8 @@ public static void main(String[] args) {
                 pdfPTableCMYK.addCell(cell);
             }
             pdfPTableCMYK.setTotalWidth(page.getWidth() - document.leftMargin() - document.rightMargin());
-            pdfPTableCMYK.writeSelectedRows(0, -1, document.leftMargin(), page.getHeight() - document.topMargin() - pdfTableRGB.getTotalHeight() - 10f, cb);
+            pdfPTableCMYK.writeSelectedRows(0, -1, document.leftMargin(),
+                    page.getHeight() - document.topMargin() - pdfTableRGB.getTotalHeight() - 10f, cb);
 
             // Draw pattern filled rectangle using CMYK Color
             PdfTemplate tp = addPatternFilledRectangle(cb, new CMYKColor(.8f, .2f, .1f, .5f, .5f));
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Transparency.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Transparency.java
index 7ffd2d6b8..ad3f4fd03 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Transparency.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/colors/Transparency.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.colors;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.PageSize;
@@ -26,16 +23,19 @@
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfTransparencyGroup;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates transparency and images.
  */
 public class Transparency {
-    
+
     /**
      * Prints a square and fills half of it with a gray rectangle.
-     * @param x the x-coordinate of the rectangle
-     * @param y the y-coordinate of the rectangle
+     *
+     * @param x  the x-coordinate of the rectangle
+     * @param y  the y-coordinate of the rectangle
      * @param cb the PdfContentByte
      */
     public static void pictureBackdrop(float x, float y, PdfContentByte cb) {
@@ -50,8 +50,9 @@ public static void pictureBackdrop(float x, float y, PdfContentByte cb) {
 
     /**
      * Prints 3 circles in different colors that intersect with eachother.
-     * @param x the x-coordinate of the intersection
-     * @param y the y-coordinate of the intersection
+     *
+     * @param x  the x-coordinate of the intersection
+     * @param y  the y-coordinate of the intersection
      * @param cb the PdfContentByte
      */
     public static void pictureCircles(float x, float y, PdfContentByte cb) {
@@ -68,6 +69,7 @@ public static void pictureCircles(float x, float y, PdfContentByte cb) {
 
     /**
      * Demonstrates the Transparency functionality.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -82,12 +84,12 @@ public static void main(String[] args) {
             // step 4: content
             PdfContentByte cb = writer.getDirectContent();
             float gap = (document.getPageSize().getWidth() - 400) / 3;
-            
+
             pictureBackdrop(gap, 500, cb);
             pictureBackdrop(200 + 2 * gap, 500, cb);
             pictureBackdrop(gap, 500 - 200 - gap, cb);
             pictureBackdrop(200 + 2 * gap, 500 - 200 - gap, cb);
-            
+
             pictureCircles(gap, 500, cb);
             cb.saveState();
             PdfGState gs1 = new PdfGState();
@@ -123,22 +125,21 @@ public static void main(String[] args) {
             Phrase ph = new Phrase("Ungrouped objects\nObject opacity = 1.0");
             ct.setSimpleColumn(ph, gap, 0, gap + 200, 500, 18, Element.ALIGN_CENTER);
             ct.go();
-            
+
             ph = new Phrase("Ungrouped objects\nObject opacity = 0.5");
             ct.setSimpleColumn(ph, 200 + 2 * gap, 0, 200 + 2 * gap + 200, 500, 18, Element.ALIGN_CENTER);
             ct.go();
-            
+
             ph = new Phrase("Transparency group\nObject opacity = 1.0\nGroup opacity = 0.5\nBlend mode = Normal");
             ct.setSimpleColumn(ph, gap, 0, gap + 200, 500 - 200 - gap, 18, Element.ALIGN_CENTER);
             ct.go();
-            
+
             ph = new Phrase("Transparency group\nObject opacity = 0.5\nGroup opacity = 1.0\nBlend mode = SoftLight");
             ct.setSimpleColumn(ph, 200 + 2 * gap, 0, 200 + 2 * gap + 200, 500 - 200 - gap, 18, Element.ALIGN_CENTER);
             ct.go();
-            
+
             cb.sanityCheck();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/AffineTransformation.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/AffineTransformation.java
index 63c4cb04f..745bdc57c 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/AffineTransformation.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/AffineTransformation.java
@@ -9,14 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.coordinates;
 
-import java.awt.geom.AffineTransform;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
@@ -24,6 +20,9 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.geom.AffineTransform;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Uses the AffineTransform class to change the transformation matrix.
@@ -32,28 +31,29 @@ public class AffineTransformation {
 
     /**
      * Changes the transformation matrix with AffineTransform.
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
-        System.out.println("Affine Transformation");        
+
+        System.out.println("Affine Transformation");
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
             // step 2: creation of the writer
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("affinetransformation.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfContentByte cb = writer.getDirectContent();
             cb.transform(AffineTransform.getScaleInstance(1.2, 0.75));
-            
+
             // we create a PdfTemplate
             PdfTemplate template = cb.createTemplate(25, 25);
-            
+
             // we add some crosses to visualize the coordinates
             template.moveTo(13, 0);
             template.lineTo(13, 25);
@@ -61,7 +61,7 @@ public static void main(String[] args) {
             template.lineTo(50, 13);
             template.stroke();
             template.sanityCheck();
-            
+
             // we add the template on different positions
             cb.addTemplate(template, 216 - 13, 720 - 13);
             cb.addTemplate(template, 360 - 13, 360 - 13);
@@ -75,7 +75,7 @@ public static void main(String[] args) {
             cb.lineTo(72, 144);
             cb.lineTo(144, 288);
             cb.stroke();
-            
+
             BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
             cb.beginText();
             cb.setFontAndSize(bf, 12);
@@ -84,11 +84,10 @@ public static void main(String[] args) {
             cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "(5\" * 1.2, 7\" * .75)", 360 + 25, 504 + 5, 0);
             cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "(1\" * 1.2, 2\" * .75)", 72 + 25, 144 + 5, 0);
             cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "(2\" * 1.2, 4\" * .75)", 144 + 25, 288 + 5, 0);
-            cb.endText(); 
-            
+            cb.endText();
+
             cb.sanityCheck();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/TransformImage.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/TransformImage.java
index 71fe56f21..a1229880d 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/TransformImage.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/TransformImage.java
@@ -9,19 +9,18 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.coordinates;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Add an image using different transformation matrices.
@@ -30,29 +29,29 @@ public class TransformImage {
 
     /**
      * Add an image using different transformation matrices.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
         Document.compress = false;
-        System.out.println("Transformating an Image");        
+        System.out.println("Transformating an Image");
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
             // step 2: creation of the writer
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("transformimage.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfContentByte cb = writer.getDirectContent();
             Image img = Image.getInstance("hitchcock.png");
             cb.addImage(img, 271, -50, -30, 550, 100, 100);
             cb.sanityCheck();
-   
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/Transformations.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/Transformations.java
index 2fbb68509..57e1db0ff 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/Transformations.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/Transformations.java
@@ -9,19 +9,18 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.coordinates;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Adding a template using different transformation matrices.
@@ -30,27 +29,28 @@ public class Transformations {
 
     /**
      * Adding a template using different transformation matrices.
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
-        System.out.println("Transformations");        
+
+        System.out.println("Transformations");
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
             // step 2: creation of the writer
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("transformations.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfContentByte cb = writer.getDirectContent();
-            
+
             // we create a PdfTemplate
             PdfTemplate template = cb.createTemplate(120, 120);
-            
+
             // we add some graphics
             template.moveTo(30, 10);
             template.lineTo(90, 10);
@@ -62,20 +62,19 @@ public static void main(String[] args) {
             template.closePath();
             template.stroke();
             template.sanityCheck();
-            
+
             // we add the template on different positions
             cb.addTemplate(template, 0, 0);
             cb.addTemplate(template, 0, 1, -1, 0, 200, 600);
             cb.addTemplate(template, .5f, 0, 0, .5f, 100, 400);
             cb.sanityCheck();
-            
+
             // we go to a new page
             document.newPage();
             cb.addTemplate(template, 0, 500);
             cb.addTemplate(template, 2, 0, -1, 2, 200, 300);
             cb.sanityCheck();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/UpsideDown.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/UpsideDown.java
index 929a117ba..e1c486997 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/UpsideDown.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/UpsideDown.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.coordinates;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
@@ -23,37 +20,41 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
- * Changes the default coordinate system so that the origin is in the upper left corner
- * instead of the lower left corner.
+ * Changes the default coordinate system so that the origin is in the upper left corner instead of the lower left
+ * corner.
  */
 public class UpsideDown {
+
     /**
-     * Changes the default coordinate system so that the origin is in the upper left corner
-     * instead of the lower left corner.
+     * Changes the default coordinate system so that the origin is in the upper left corner instead of the lower left
+     * corner.
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
-        System.out.println("UpsideDown");        
+
+        System.out.println("UpsideDown");
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
             // step 2: creation of the writer
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("upsidedown.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfContentByte cb = writer.getDirectContent();
             cb.concatCTM(1f, 0f, 0f, -1f, 0f, PageSize.A4.getHeight());
-            
+
             // we create a PdfTemplate
             PdfTemplate template = cb.createTemplate(25, 25);
-            
+
             // we add some crosses to visualize the coordinates
             template.moveTo(13, 0);
             template.lineTo(13, 25);
@@ -61,7 +62,7 @@ public static void main(String[] args) {
             template.lineTo(50, 13);
             template.stroke();
             template.sanityCheck();
-            
+
             // we add the template on different positions
             cb.addTemplate(template, 216 - 13, 720 - 13);
             cb.addTemplate(template, 360 - 13, 360 - 13);
@@ -75,7 +76,7 @@ public static void main(String[] args) {
             cb.lineTo(72, 144);
             cb.lineTo(144, 288);
             cb.stroke();
-            
+
             BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
             cb.beginText();
             cb.setFontAndSize(bf, 12);
@@ -85,10 +86,9 @@ public static void main(String[] args) {
             cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "(1\", 2\")", 72 + 25, 144 + 5, 0);
             cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "(2\", 4\")", 144 + 25, 288 + 5, 0);
             cb.endText();
-            
+
             cb.sanityCheck();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/XandYcoordinates.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/XandYcoordinates.java
index 207fe57e9..b560e6c4b 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/XandYcoordinates.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/coordinates/XandYcoordinates.java
@@ -9,50 +9,52 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.directcontent.coordinates;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates how the PDF coordinate system works.
+ *
  * @author blowagie
  */
 public class XandYcoordinates {
+
     /**
      * Creates a PDF document with shapes, lines and text at specific X and Y coordinates.
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
-        System.out.println("X and Y coordinate system");        
+
+        System.out.println("X and Y coordinate system");
         // step 1: creation of a document-object
         Document document = new Document();
-        
-        try {      
+
+        try {
             // step 2: creation of the writer
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("XandY.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfContentByte cb = writer.getDirectContent();
-            
+
             // we create a PdfTemplate
             PdfTemplate template = cb.createTemplate(25, 25);
-            
+
             // we add some crosses to visualize the coordinates
             template.moveTo(13, 0);
             template.lineTo(13, 25);
@@ -60,7 +62,7 @@ public static void main(String[] args) {
             template.lineTo(50, 13);
             template.stroke();
             template.sanityCheck();
-            
+
             // we add the template on different positions
             cb.addTemplate(template, 216 - 13, 720 - 13);
             cb.addTemplate(template, 360 - 13, 360 - 13);
@@ -74,7 +76,7 @@ public static void main(String[] args) {
             cb.lineTo(72, 144);
             cb.lineTo(144, 288);
             cb.stroke();
-            
+
             BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
             cb.beginText();
             cb.setFontAndSize(bf, 12);
@@ -83,11 +85,10 @@ public static void main(String[] args) {
             cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "(5\", 7\")", 360 + 25, 504 + 5, 0);
             cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "(1\", 2\")", 72 + 25, 144 + 5, 0);
             cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "(2\", 4\")", 144 + 25, 288 + 5, 0);
-            cb.endText(); 
-            
+            cb.endText();
+
             cb.sanityCheck();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Circles.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Circles.java
index 0e4a44648..40679f3ae 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Circles.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Circles.java
@@ -9,42 +9,42 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.graphics;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Simple use of PdfContentByte: drawing Circles
  */
 public class Circles {
-    
+
     /**
      * Draws some concentric circles.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Drawing circles");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2: creation of the writer
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("circles.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we grab the ContentByte and do some stuff with it
             PdfContentByte cb = writer.getDirectContent();
 
@@ -57,10 +57,9 @@ public static void main(String[] args) {
             cb.setRGBColorFill(0xFF, 0xFF, 0xFF);
             cb.circle(250.0f, 500.0f, 50.0f);
             cb.fill();
-            
+
             cb.sanityCheck();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/GState.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/GState.java
index 18dfb99cf..e12184f3d 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/GState.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/GState.java
@@ -9,19 +9,18 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.graphics;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfGState;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Changing the Graphics State with PdfGState.
@@ -30,9 +29,8 @@ public class GState {
 
     /**
      * Changing the Graphics State with PdfGState.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("Changing the Graphics State with PdfGState");
@@ -71,7 +69,7 @@ public static void main(String[] args) {
             cb.fill();
             cb.circle(260.0f, 500.0f, 50.0f);
             cb.fill();
-            
+
             cb.sanityCheck();
         } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Literal.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Literal.java
index a5a49353a..6a2b18d97 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Literal.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Literal.java
@@ -9,65 +9,63 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.graphics;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates how you can write PDF syntax directly to a document.
  */
 public class Literal {
 
-    
+
     /**
      * @param args the command line arguments
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Literal PDF Syntax");
         Document.compress = false;
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("literal.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we grab the ContentByte and do some stuff with it
             PdfContentByte cb = writer.getDirectContent();
             String star = "0.3 g\n15.000 27.000 m\n"
-                + "7.947 5.292 l\n26.413 18.708 l\n"
-                + "3.587 18.708 l\n22.053 5.292 l\nf\n"
-                + "45.000 57.000 m\n37.947 35.292 l\n"
-                + "56.413 48.708 l\n33.587 48.708 l\n"
-                + "52.053 35.292 l\nf\n"
-                + "0.7 g\n15.000 57.000 m\n"
-                + "7.947 35.292 l\n26.413 48.708 l\n"
-                + "3.587 48.708 l\n22.053 35.292 l\nf\n"
-                + "45.000 27.000 m\n37.947 5.292 l\n"
-                + "56.413 18.708 l\n33.587 18.708 l\n"
-                + "52.053 5.292 l\nf";
+                    + "7.947 5.292 l\n26.413 18.708 l\n"
+                    + "3.587 18.708 l\n22.053 5.292 l\nf\n"
+                    + "45.000 57.000 m\n37.947 35.292 l\n"
+                    + "56.413 48.708 l\n33.587 48.708 l\n"
+                    + "52.053 35.292 l\nf\n"
+                    + "0.7 g\n15.000 57.000 m\n"
+                    + "7.947 35.292 l\n26.413 48.708 l\n"
+                    + "3.587 48.708 l\n22.053 35.292 l\nf\n"
+                    + "45.000 27.000 m\n37.947 5.292 l\n"
+                    + "56.413 18.708 l\n33.587 18.708 l\n"
+                    + "52.053 5.292 l\nf";
             cb.setLiteral(star);
-            
+
             // sanityCheck doesn't check literals.
             //cb.sanityCheck();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Shapes.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Shapes.java
index cb77715c9..07c4a5207 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Shapes.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/Shapes.java
@@ -9,47 +9,47 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.graphics;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Drawing some shapes.
  */
 public class Shapes {
-    
+
     /**
      * Draws some shapes.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Drawing some shapes");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("shapes.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we grab the ContentByte and do some stuff with it
             PdfContentByte cb = writer.getDirectContent();
-            
+
             // an example of a rectangle with a diagonal in very thick lines
             cb.setLineWidth(10f);
             // draw a rectangle
@@ -59,18 +59,18 @@ public static void main(String[] args) {
             cb.lineTo(200, 800);
             // stroke the lines
             cb.stroke();
-            
+
             // an example of some circles
             cb.setLineDash(3, 3, 0);
             cb.setRGBColorStrokeF(0f, 255f, 0f);
             cb.circle(150f, 500f, 100f);
             cb.stroke();
-            
+
             cb.setLineWidth(5f);
             cb.resetRGBColorStroke();
             cb.circle(150f, 500f, 50f);
             cb.stroke();
-            
+
             // example with colorfill
             cb.setRGBColorFillF(0f, 255f, 0f);
             cb.moveTo(100f, 200f);
@@ -80,10 +80,9 @@ public static void main(String[] args) {
             // the color of the triangle will be red instead of green
             cb.setRGBColorFillF(255f, 0f, 0f);
             cb.closePathFillStroke();
-            
+
             cb.sanityCheck();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/State.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/State.java
index 5c2caf714..097c309a5 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/State.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/graphics/State.java
@@ -9,18 +9,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.graphics;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Changing the Graphics State with saveState() and restoreState().
@@ -29,9 +28,8 @@ public class State {
 
     /**
      * Changing the Graphics State with saveState() and restoreState().
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("Changing the Graphics State with save and restore");
@@ -69,7 +67,7 @@ public static void main(String[] args) {
             cb.restoreState();
             cb.circle(260.0f, 500.0f, 50.0f);
             cb.fill();
-            
+
             cb.sanityCheck();
         } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/Automatic.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/Automatic.java
index 3f6696a19..4869625a5 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/Automatic.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/Automatic.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.optionalcontent;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.Font;
@@ -25,14 +22,17 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfLayer;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Automatic layer grouping and nesting
  */
 public class Automatic {
-       
+
     /**
      * Automatic grouping and nesting.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -48,7 +48,8 @@ public static void main(String[] args) {
             document.open();
             // step 4
             PdfContentByte cb = writer.getDirectContent();
-            Phrase explanation = new Phrase("Automatic layer grouping and nesting", new Font(Font.HELVETICA, 20, Font.BOLD, Color.red));
+            Phrase explanation = new Phrase("Automatic layer grouping and nesting",
+                    new Font(Font.HELVETICA, 20, Font.BOLD, Color.red));
             ColumnText.showTextAligned(cb, Element.ALIGN_LEFT, explanation, 50, 650, 0);
             PdfLayer l12 = new PdfLayer("Layer nesting", writer);
             PdfLayer l1 = new PdfLayer("Layer 1", writer);
@@ -77,11 +78,10 @@ public static void main(String[] args) {
             ColumnText.showTextAligned(cb, Element.ALIGN_LEFT, p4, 50, 450, 0);
             cb.endLayer();
             cb.sanityCheck();
-            
+
             // step 5
             document.close();
-        }
-        catch(Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/ContentGroups.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/ContentGroups.java
index 379086d51..4be17326a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/ContentGroups.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/ContentGroups.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.optionalcontent;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.Font;
@@ -32,14 +29,17 @@
 import com.lowagie.text.pdf.PdfObject;
 import com.lowagie.text.pdf.PdfString;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates how to group optional content.
  */
 public class ContentGroups {
-       
+
     /**
      * Demonstrates how to group optional content.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -76,7 +76,7 @@ public static void main(String[] args) {
             ColumnText.showTextAligned(cb, Element.ALIGN_LEFT, p3, 50, 500, 0);
             cb.endLayer();
             cb.sanityCheck();
-            
+
             PdfOCProperties p = writer.getOCProperties();
             PdfArray order = new PdfArray();
             order.add(l1.getRef());
@@ -90,8 +90,7 @@ public static void main(String[] args) {
             p.put(PdfName.D, d);
             // step 5
             document.close();
-        }
-        catch(Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/Layers.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/Layers.java
index 0625cbff6..f30e70755 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/Layers.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/Layers.java
@@ -9,15 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.optionalcontent;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.Font;
@@ -27,14 +22,19 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfLayer;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Layer radio group and zoom.
  */
 public class Layers {
-       
+
     /**
      * Layer radio group and zoom.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -50,7 +50,8 @@ public static void main(String[] args) {
             document.open();
             // step 4
             PdfContentByte cb = writer.getDirectContent();
-            Phrase explanation = new Phrase("Layer radio group and zoom", new Font(Font.HELVETICA, 20, Font.BOLD, Color.red));
+            Phrase explanation = new Phrase("Layer radio group and zoom",
+                    new Font(Font.HELVETICA, 20, Font.BOLD, Color.red));
             ColumnText.showTextAligned(cb, Element.ALIGN_LEFT, explanation, 50, 650, 0);
             PdfLayer title = PdfLayer.createTitle("Layer radio group", writer);
             PdfLayer l1 = new PdfLayer("Layer 1", writer);
@@ -86,11 +87,11 @@ public static void main(String[] args) {
             cb.beginLayer(l4);
             ColumnText.showTextAligned(cb, Element.ALIGN_LEFT, p4, 50, 450, 0);
             cb.endLayer();
-            ColumnText.showTextAligned(cb, Element.ALIGN_LEFT, new Phrase("<< Zoom here!", new Font(Font.COURIER, 12, Font.NORMAL, Color.blue)), 150, 450, 0);
+            ColumnText.showTextAligned(cb, Element.ALIGN_LEFT,
+                    new Phrase("<< Zoom here!", new Font(Font.COURIER, 12, Font.NORMAL, Color.blue)), 150, 450, 0);
             // step 5
             document.close();
-        }
-        catch(Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/NestedLayers.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/NestedLayers.java
index af9c53fb9..0ae0f89be 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/NestedLayers.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/NestedLayers.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.optionalcontent;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.Font;
@@ -29,14 +26,17 @@
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfOCProperties;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates the use of nested layers.
  */
 public class NestedLayers {
-       
+
     /**
      * Demonstrates the use of nested layers
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -73,7 +73,7 @@ public static void main(String[] args) {
             cb.endLayer();
             cb.endLayer();
             cb.sanityCheck();
-            
+
             PdfOCProperties p = writer.getOCProperties();
             PdfArray order = new PdfArray();
             order.add(l1.getRef());
@@ -87,8 +87,7 @@ public static void main(String[] args) {
             p.put(PdfName.D, d);
             // step 5
             document.close();
-        }
-        catch(Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/OptionalContent.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/OptionalContent.java
index 94c0e213c..d8ac6fe52 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/OptionalContent.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/OptionalContent.java
@@ -9,15 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.optionalcontent;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
@@ -36,18 +31,24 @@
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.TextField;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Demonstrates the use of layers.
  */
 public class OptionalContent {
+
     /**
      * Demonstrates the use of layers.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
         try {
-            System.out.println("Optional content");        
+            System.out.println("Optional content");
             // step 1: creation of a document-object
             Document document = new Document(PageSize.A4, 50, 50, 50, 50);
             // step 2: creation of the writer
@@ -58,7 +59,8 @@ public static void main(String[] args) {
             document.open();
             // step 4: content
             PdfContentByte cb = writer.getDirectContent();
-            Phrase explanation = new Phrase("Automatic layers, form fields, images, templates and actions", new Font(Font.HELVETICA, 18, Font.BOLD, Color.red));
+            Phrase explanation = new Phrase("Automatic layers, form fields, images, templates and actions",
+                    new Font(Font.HELVETICA, 18, Font.BOLD, Color.red));
             ColumnText.showTextAligned(cb, Element.ALIGN_LEFT, explanation, 50, 650, 0);
             PdfLayer l1 = new PdfLayer("Layer 1", writer);
             PdfLayer l2 = new PdfLayer("Layer 2", writer);
@@ -104,14 +106,15 @@ public static void main(String[] args) {
             state.add(l3);
             state.add(l4);
             PdfAction action = PdfAction.setOCGstate(state, true);
-            Chunk ck = new Chunk("Click here to toggle the layers", new Font(Font.HELVETICA, 18, Font.NORMAL, Color.yellow)).setBackground(Color.blue).setAction(action);
+            Chunk ck = new Chunk("Click here to toggle the layers",
+                    new Font(Font.HELVETICA, 18, Font.NORMAL, Color.yellow)).setBackground(Color.blue)
+                    .setAction(action);
             ColumnText.showTextAligned(cb, Element.ALIGN_CENTER, new Phrase(ck), 250, 400, 0);
             cb.sanityCheck();
-            
+
             // step 5: closing the document
             document.close();
-        }
-        catch(Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/OrderedLayers.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/OrderedLayers.java
index e3cab75df..d353dd2aa 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/OrderedLayers.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/optionalcontent/OrderedLayers.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.optionalcontent;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.Font;
@@ -30,6 +27,8 @@
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfOCProperties;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates how to order optional content groups.
@@ -38,6 +37,7 @@ public class OrderedLayers {
 
     /**
      * Demonstrates how to order optional content groups.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -77,7 +77,7 @@ public static void main(String[] args) {
             ColumnText.showTextAligned(cb, Element.ALIGN_LEFT, p3, 50, 500, 0);
             cb.endLayer();
             cb.sanityCheck();
-            
+
             PdfOCProperties p = writer.getOCProperties();
             PdfArray order = new PdfArray();
             order.add(l1.getRef());
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/Bookmarks.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/Bookmarks.java
index 716cc2ab0..44722309b 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/Bookmarks.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/Bookmarks.java
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.directcontent.pageevents;
@@ -28,33 +28,21 @@
 
 /**
  * Creates a document with outlines (bookmarks).
- * 
+ *
  * @author blowagie
  */
 
 public class Bookmarks extends PdfPageEventHelper {
 
-    /** Keeps the number of the current paragraph. */
-    private int n = 0;
-    
     /**
-     * Adds an outline for every new Paragraph
-     * @param writer        The PdfWrite to write to the Document
-     * @param document      The Document to write to
-     * @param position      An int that specifies the y / x coordinate of the top / left edge of the window
+     * Keeps the number of the current paragraph.
      */
-    public void onParagraph(PdfWriter writer, Document document, float position) {
-        n++;
-        PdfContentByte cb = writer.getDirectContent();
-        PdfDestination destination = new PdfDestination(PdfDestination.FITH, position);
-        new PdfOutline(cb.getRootOutline(), destination, "paragraph " + n);
-    }
+    private int n = 0;
 
     /**
      * Creates a document with outlines.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -84,4 +72,18 @@ public static void main(String[] args) {
         // step 5: we close the document
         document.close();
     }
+
+    /**
+     * Adds an outline for every new Paragraph
+     *
+     * @param writer   The PdfWrite to write to the Document
+     * @param document The Document to write to
+     * @param position An int that specifies the y / x coordinate of the top / left edge of the window
+     */
+    public void onParagraph(PdfWriter writer, Document document, float position) {
+        n++;
+        PdfContentByte cb = writer.getDirectContent();
+        PdfDestination destination = new PdfDestination(PdfDestination.FITH, position);
+        new PdfOutline(cb.getRootOutline(), destination, "paragraph " + n);
+    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/EndPage.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/EndPage.java
index 86f517165..f72560f79 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/EndPage.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/EndPage.java
@@ -9,49 +9,47 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.pageevents;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
-
+import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Rectangle;
-import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfPageEventHelper;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates the use of PageEvents.
  */
 public class EndPage extends PdfPageEventHelper {
-    
+
     /**
      * Demonstrates the use of PageEvents.
+     *
      * @param args no arguments needed
      */
-    public static void main(String[] args)
-    {
+    public static void main(String[] args) {
         Document document = new Document(PageSize.A4, 50, 50, 70, 70);
         try {
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("endpage.pdf"));
             writer.setPageEvent(new EndPage());
             document.open();
             String text = "Lots of text. ";
-            for (int k = 0; k < 10; ++k)
+            for (int k = 0; k < 10; ++k) {
                 text += text;
+            }
             document.add(new Paragraph(text));
             document.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
-    
+
     /**
      * @see com.lowagie.text.pdf.PdfPageEventHelper#onEndPage(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document)
      */
@@ -59,19 +57,21 @@ public void onEndPage(PdfWriter writer, Document document) {
         try {
             Rectangle page = document.getPageSize();
             PdfPTable head = new PdfPTable(3);
-            for (int k = 1; k <= 6; ++k)
+            for (int k = 1; k <= 6; ++k) {
                 head.addCell("head " + k);
+            }
             head.setTotalWidth(page.getWidth() - document.leftMargin() - document.rightMargin());
-            head.writeSelectedRows(0, -1, document.leftMargin(), page.getHeight() - document.topMargin() + head.getTotalHeight(),
-                writer.getDirectContent());
+            head.writeSelectedRows(0, -1, document.leftMargin(),
+                    page.getHeight() - document.topMargin() + head.getTotalHeight(),
+                    writer.getDirectContent());
             PdfPTable foot = new PdfPTable(3);
-            for (int k = 1; k <= 6; ++k)
+            for (int k = 1; k <= 6; ++k) {
                 foot.addCell("foot " + k);
+            }
             foot.setTotalWidth(page.getWidth() - document.leftMargin() - document.rightMargin());
             foot.writeSelectedRows(0, -1, document.leftMargin(), document.bottomMargin(),
-                writer.getDirectContent());
-        }
-        catch (Exception e) {
+                    writer.getDirectContent());
+        } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/Events.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/Events.java
index 33e80eaed..47dcfe1d6 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/Events.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/Events.java
@@ -13,15 +13,6 @@
  */
 package com.lowagie.examples.directcontent.pageevents;
 
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.EmptyStackException;
-import java.util.Map;
-import java.util.TreeSet;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -39,40 +30,129 @@
 import com.lowagie.text.xml.SAXmyHandler;
 import com.lowagie.text.xml.TagMap;
 import com.lowagie.text.xml.XmlPeer;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.EmptyStackException;
+import java.util.Map;
+import java.util.TreeSet;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 
 /**
- * Example that takes an XML file, converts it to PDF and adds all kinds of
- * extra's, such as an alternating header, a footer with page x of y, a page
- * with metadata,...
+ * Example that takes an XML file, converts it to PDF and adds all kinds of extra's, such as an alternating header, a
+ * footer with page x of y, a page with metadata,...
  */
 public class Events {
 
     /**
-     * This is an example of a PageEvents class you should write.
-     * This is an inner class to keep all the code of the example in one file.
-     * If you want to use a PageEvent, you may want to put the code in a separate class.
+     * Converts a play in XML into PDF.
+     *
+     * @param args no arguments needed
+     */
+    public static void main(String[] args) {
+
+        System.out.println("Romeo and Juliet");
+
+        // step 1: creation of a document-object
+        Document document = new Document(PageSize.A4, 80, 50, 30, 65);
+
+        try {
+            // step 2:
+            // we create a writer that listens to the document
+            // and directs a XML-stream to a file
+            PdfWriter writer = PdfWriter.getInstance(document,
+                    new FileOutputStream("RomeoJuliet.pdf"));
+
+            // create add the event handler
+            MyPageEvents events = new Events().getPageEvents();
+            writer.setPageEvent(events);
+
+            // step 3: we create a parser and set the document handler
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+            factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+            SAXParser parser = factory.newSAXParser();
+
+            // step 4: we parse the document
+            parser.parse("playRomeoJuliet.xml", new Events().getXmlHandler(document));
+
+            document.newPage();
+            Speaker speaker;
+            for (Object o : events.getSpeakers()) {
+                speaker = (Speaker) o;
+                document.add(new Paragraph(speaker.getName() + ": "
+                        + speaker.getOccurrence() + " speech blocks"));
+            }
+            document.close();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.err.println(e.getMessage());
+        }
+    }
+
+    /**
+     * Gets a PageEvents object.
+     *
+     * @return a new PageEvents object
+     */
+    private MyPageEvents getPageEvents() {
+        return new MyPageEvents();
+    }
+
+    /**
+     * Gets a Handler object.
+     *
+     * @param document the document on which the handler operates
+     * @return a Handler object
+     */
+    private MyHandler getXmlHandler(Document document) {
+        try {
+            return new MyHandler(document, new RomeoJulietMap());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * This is an example of a PageEvents class you should write. This is an inner class to keep all the code of the
+     * example in one file. If you want to use a PageEvent, you may want to put the code in a separate class.
      */
 
     class MyPageEvents extends PdfPageEventHelper {
 
-        /** we will keep a list of speakers */
+        /**
+         * we will keep a list of speakers
+         */
         TreeSet speakers = new TreeSet<>();
 
-        /** This is the contentbyte object of the writer */
+        /**
+         * This is the contentbyte object of the writer
+         */
         PdfContentByte cb;
 
-        /** we will put the final number of pages in a template */
+        /**
+         * we will put the final number of pages in a template
+         */
         PdfTemplate template;
 
-        /** this is the BaseFont we are going to use for the header / footer */
+        /**
+         * this is the BaseFont we are going to use for the header / footer
+         */
         BaseFont bf = null;
 
-        /** this is the current act of the play */
+        /**
+         * this is the current act of the play
+         */
         String act = "";
 
         /**
          * Every speaker will be tagged, so that he can be added to the list of speakers.
-         * @see com.lowagie.text.pdf.PdfPageEventHelper#onGenericTag(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document, com.lowagie.text.Rectangle, java.lang.String)
+         *
+         * @see com.lowagie.text.pdf.PdfPageEventHelper#onGenericTag(com.lowagie.text.pdf.PdfWriter,
+         * com.lowagie.text.Document, com.lowagie.text.Rectangle, java.lang.String)
          */
         public void onGenericTag(PdfWriter writer, Document document,
                 Rectangle rect, String text) {
@@ -80,10 +160,11 @@ public void onGenericTag(PdfWriter writer, Document document,
         }
 
         /**
-         * The first thing to do when the document is opened, is to define the BaseFont,
-         * get the Direct Content object and create the template that will hold the final
-         * number of pages.
-         * @see com.lowagie.text.pdf.PdfPageEventHelper#onOpenDocument(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document)
+         * The first thing to do when the document is opened, is to define the BaseFont, get the Direct Content object
+         * and create the template that will hold the final number of pages.
+         *
+         * @see com.lowagie.text.pdf.PdfPageEventHelper#onOpenDocument(com.lowagie.text.pdf.PdfWriter,
+         * com.lowagie.text.Document)
          */
         public void onOpenDocument(PdfWriter writer, Document document) {
             try {
@@ -96,9 +177,10 @@ public void onOpenDocument(PdfWriter writer, Document document) {
         }
 
         /**
-         * Every ACT is seen as a Chapter. We get the title of the act, so that
-         * we can display it in the header.
-         * @see com.lowagie.text.pdf.PdfPageEventHelper#onChapter(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document, float, com.lowagie.text.Paragraph)
+         * Every ACT is seen as a Chapter. We get the title of the act, so that we can display it in the header.
+         *
+         * @see com.lowagie.text.pdf.PdfPageEventHelper#onChapter(com.lowagie.text.pdf.PdfWriter,
+         * com.lowagie.text.Document, float, com.lowagie.text.Paragraph)
          */
         public void onChapter(PdfWriter writer, Document document,
                 float paragraphPosition, Paragraph title) {
@@ -111,10 +193,11 @@ public void onChapter(PdfWriter writer, Document document,
         }
 
         /**
-         * After the content of the page is written, we put page X of Y
-         * at the bottom of the page and we add either "Romeo and Juliet"
-         * of the title of the current act as a header.
-         * @see com.lowagie.text.pdf.PdfPageEventHelper#onEndPage(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document)
+         * After the content of the page is written, we put page X of Y at the bottom of the page and we add either
+         * "Romeo and Juliet" of the title of the current act as a header.
+         *
+         * @see com.lowagie.text.pdf.PdfPageEventHelper#onEndPage(com.lowagie.text.pdf.PdfWriter,
+         * com.lowagie.text.Document)
          */
         public void onEndPage(PdfWriter writer, Document document) {
             int pageN = writer.getPageNumber();
@@ -138,9 +221,10 @@ public void onEndPage(PdfWriter writer, Document document) {
         }
 
         /**
-         * Just before the document is closed, we add the final number of pages to
-         * the template.
-         * @see com.lowagie.text.pdf.PdfPageEventHelper#onCloseDocument(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document)
+         * Just before the document is closed, we add the final number of pages to the template.
+         *
+         * @see com.lowagie.text.pdf.PdfPageEventHelper#onCloseDocument(com.lowagie.text.pdf.PdfWriter,
+         * com.lowagie.text.Document)
          */
         public void onCloseDocument(PdfWriter writer, Document document) {
             template.beginText();
@@ -151,7 +235,8 @@ public void onCloseDocument(PdfWriter writer, Document document) {
 
         /**
          * Getting the list of speakers.
-         * @return    a list of speakers and the number of occurrences.
+         *
+         * @return a list of speakers and the number of occurrences.
          */
         TreeSet getSpeakers() {
             return speakers;
@@ -159,83 +244,16 @@ TreeSet getSpeakers() {
     }
 
     /**
-     * Gets a PageEvents object.
-     * @return a new PageEvents object
-     */
-    private MyPageEvents getPageEvents() {
-        return new MyPageEvents();
-    }
-    /**
-     * Gets a Handler object.
-     * @param document  the document on which the handler operates
-     * @return a Handler object
-     */
-    private MyHandler getXmlHandler(Document document) {
-        try {
-            return new MyHandler(document, new RomeoJulietMap());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * Converts a play in XML into PDF.
-     * @param args no arguments needed
-     */
-    public static void main(String[] args) {
-
-        System.out.println("Romeo and Juliet");
-
-        // step 1: creation of a document-object
-        Document document = new Document(PageSize.A4, 80, 50, 30, 65);
-
-        try {
-            // step 2:
-            // we create a writer that listens to the document
-            // and directs a XML-stream to a file
-            PdfWriter writer = PdfWriter.getInstance(document,
-                    new FileOutputStream("RomeoJuliet.pdf"));
-
-            // create add the event handler
-            MyPageEvents events = new Events().getPageEvents();
-            writer.setPageEvent(events);
-
-            // step 3: we create a parser and set the document handler
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
-            factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-            SAXParser parser = factory.newSAXParser();
-
-            // step 4: we parse the document
-            parser.parse("playRomeoJuliet.xml", new Events().getXmlHandler(document));
-
-            document.newPage();
-            Speaker speaker;
-            for (Object o : events.getSpeakers()) {
-                speaker = (Speaker) o;
-                document.add(new Paragraph(speaker.getName() + ": "
-                        + speaker.getOccurrence() + " speech blocks"));
-            }
-            document.close();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.err.println(e.getMessage());
-        }
-    }
-
-    /**
-     * Special implementation of the XML handler.
-     * It adds a paragraph after each SPEAKER block and
-     * avoids closing the document after the final closing tag.
+     * Special implementation of the XML handler. It adds a paragraph after each SPEAKER block and avoids closing the
+     * document after the final closing tag.
      */
     class MyHandler extends SAXmyHandler {
 
         /**
          * We have to override the constructor
-         * @param document    the Document object
-         * @param tagmap    the tagmap
+         *
+         * @param document the Document object
+         * @param tagmap   the tagmap
          */
         MyHandler(Document document, Map tagmap) {
             super(document, tagmap);
@@ -243,9 +261,10 @@ class MyHandler extends SAXmyHandler {
 
         /**
          * We only alter the handling of some endtags.
-         * @param uri    the uri of the namespace
-         * @param lname    the local name of the tag
-         * @param name    the name of the tag
+         *
+         * @param uri   the uri of the namespace
+         * @param lname the local name of the tag
+         * @param name  the name of the tag
          */
         public void endElement(String uri, String lname, String name) {
             if (myTags.containsKey(name)) {
@@ -273,11 +292,9 @@ public void endElement(String uri, String lname, String name) {
     }
 
     /**
-     * Normally you either choose to use a HashMap with XmlPeer objects,
-     * or a TagMap object that reads a TagMap in XML.
-     * Here we used a hybrid solution (for educational purposes only!)
-     * with on one side the tags in the XML tagmap, on the other side
-     * an XmlPeer object that overrides the properties of one of the tags.
+     * Normally you either choose to use a HashMap with XmlPeer objects, or a TagMap object that reads a TagMap in XML.
+     * Here we used a hybrid solution (for educational purposes only!) with on one side the tags in the XML tagmap, on
+     * the other side an XmlPeer object that overrides the properties of one of the tags.
      */
 
     class RomeoJulietMap extends TagMap {
@@ -285,8 +302,7 @@ class RomeoJulietMap extends TagMap {
         private static final long serialVersionUID = 1024517625414654121L;
 
         /**
-         * Constructs a TagMap based on an XML file
-         * and/or on XmlPeer objects that are added.
+         * Constructs a TagMap based on an XML file and/or on XmlPeer objects that are added.
          */
         RomeoJulietMap() throws IOException {
             super(new FileInputStream("tagmapRomeoJuliet.xml"));
@@ -319,6 +335,7 @@ public Speaker(String name) {
 
         /**
          * Gets the name of the speaker.
+         *
          * @return a name
          */
         public String getName() {
@@ -327,6 +344,7 @@ public String getName() {
 
         /**
          * Gets the number of occurrences of the speaker.
+         *
          * @return a number of textblocks
          */
         int getOccurrence() {
@@ -334,8 +352,8 @@ int getOccurrence() {
         }
 
         /**
-         * There is something odd going on in this compareTo.
-         * Do you see it?
+         * There is something odd going on in this compareTo. Do you see it?
+         *
          * @param o an other speaker object
          * @see java.lang.Comparable#compareTo(java.lang.Object)
          */
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/PageNumbersWatermark.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/PageNumbersWatermark.java
index 5208308a3..4c1bbfd87 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/PageNumbersWatermark.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/pageevents/PageNumbersWatermark.java
@@ -9,24 +9,20 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.pageevents;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
-
+import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.Font;
 import com.lowagie.text.Image;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.Rectangle;
-import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfGState;
@@ -34,23 +30,38 @@
 import com.lowagie.text.pdf.PdfPageEventHelper;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+
 /**
  * Demonstrates the use of templates to add Watermarks and Pagenumbers.
  */
 public class PageNumbersWatermark extends PdfPageEventHelper {
-    /** An Image that goes in the header. */
+
+    /**
+     * An Image that goes in the header.
+     */
     public Image headerImage;
-    /** The headertable. */
+    /**
+     * The headertable.
+     */
     public PdfPTable table;
-    /** The Graphic state */
+    /**
+     * The Graphic state
+     */
     public PdfGState gstate;
-    /** A template that will hold the total number of pages. */
+    /**
+     * A template that will hold the total number of pages.
+     */
     public PdfTemplate tpl;
-    /** The font that will be used. */
+    /**
+     * The font that will be used.
+     */
     public BaseFont helv;
-    
+
     /**
      * Generates a document with a header containing Page x of y and with a Watermark on every page.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -64,21 +75,22 @@ public static void main(String[] args) {
             doc.open();
             // step 4: adding content
             String text = "some padding text ";
-            for (int k = 0; k < 10; ++k)
+            for (int k = 0; k < 10; ++k) {
                 text += text;
+            }
             Paragraph p = new Paragraph(text);
             p.setAlignment(Element.ALIGN_JUSTIFIED);
             doc.add(p);
             // step 5: closing the document
             doc.close();
-        }
-        catch ( Exception e ) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
-    
+
     /**
-     * @see com.lowagie.text.pdf.PdfPageEventHelper#onOpenDocument(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document)
+     * @see com.lowagie.text.pdf.PdfPageEventHelper#onOpenDocument(com.lowagie.text.pdf.PdfWriter,
+     * com.lowagie.text.Document)
      */
     public void onOpenDocument(PdfWriter writer, Document document) {
         try {
@@ -104,12 +116,11 @@ public void onOpenDocument(PdfWriter writer, Document document) {
             tpl.setBoundingBox(new Rectangle(-20, -20, 100, 100));
             // initialization of the font
             helv = BaseFont.createFont("Helvetica", BaseFont.WINANSI, false);
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
-    }    
-    
+    }
+
     /**
      * @see com.lowagie.text.pdf.PdfPageEventHelper#onEndPage(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document)
      */
@@ -153,21 +164,22 @@ public void onEndPage(PdfWriter writer, Document document) {
             cb.setColorFill(Color.red);
             cb.beginText();
             cb.setFontAndSize(helv, 48);
-            cb.showTextAligned(Element.ALIGN_CENTER, "Watermark Opacity " + writer.getPageNumber(), document.getPageSize().getWidth() / 2, document.getPageSize().getHeight() / 2, 45);
+            cb.showTextAligned(Element.ALIGN_CENTER, "Watermark Opacity " + writer.getPageNumber(),
+                    document.getPageSize().getWidth() / 2, document.getPageSize().getHeight() / 2, 45);
             cb.endText();
             try {
                 cb.addImage(headerImage, headerImage.getWidth(), 0, 0, headerImage.getHeight(), 440, 80);
-            }
-            catch(Exception e) {
+            } catch (Exception e) {
                 throw new ExceptionConverter(e);
             }
         }
         cb.restoreState();
         cb.sanityCheck();
     }
-    
+
     /**
-     * @see com.lowagie.text.pdf.PdfPageEventHelper#onStartPage(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document)
+     * @see com.lowagie.text.pdf.PdfPageEventHelper#onStartPage(com.lowagie.text.pdf.PdfWriter,
+     * com.lowagie.text.Document)
      */
     public void onStartPage(PdfWriter writer, Document document) {
         if (writer.getPageNumber() < 3) {
@@ -176,21 +188,23 @@ public void onStartPage(PdfWriter writer, Document document) {
             cb.setColorFill(Color.pink);
             cb.beginText();
             cb.setFontAndSize(helv, 48);
-            cb.showTextAligned(Element.ALIGN_CENTER, "My Watermark Under " + writer.getPageNumber(), document.getPageSize().getWidth() / 2, document.getPageSize().getHeight() / 2, 45);
+            cb.showTextAligned(Element.ALIGN_CENTER, "My Watermark Under " + writer.getPageNumber(),
+                    document.getPageSize().getWidth() / 2, document.getPageSize().getHeight() / 2, 45);
             cb.endText();
             cb.restoreState();
         }
     }
-    
+
     /**
-     * @see com.lowagie.text.pdf.PdfPageEventHelper#onCloseDocument(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document)
+     * @see com.lowagie.text.pdf.PdfPageEventHelper#onCloseDocument(com.lowagie.text.pdf.PdfWriter,
+     * com.lowagie.text.Document)
      */
     public void onCloseDocument(PdfWriter writer, Document document) {
-       tpl.beginText();
-       tpl.setFontAndSize(helv, 12);
-       tpl.setTextMatrix(0, 0);
-       tpl.showText(Integer.toString(writer.getPageNumber() - 1));
-       tpl.endText();
-       tpl.sanityCheck();
+        tpl.beginText();
+        tpl.setFontAndSize(helv, 12);
+        tpl.setTextMatrix(0, 0);
+        tpl.showText(Integer.toString(writer.getPageNumber() - 1));
+        tpl.endText();
+        tpl.sanityCheck();
     }
 }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/text/Logo.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/text/Logo.java
index 5cd9bc9d9..18e37770c 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/text/Logo.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/text/Logo.java
@@ -9,44 +9,44 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.text;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Draws the iText logo.
  */
 public class Logo {
-    
+
     /**
      * Draws the iText logo.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("iText logo");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2: creation of the writer
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("logo.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
             PdfContentByte cb = writer.getDirectContent();
@@ -55,7 +55,8 @@ public static void main(String[] args) {
             template.rectangle(2.5f, 2.5f, 495f, 195f);
             template.stroke();
             template.setLineWidth(12f);
-            template.arc(40f - (float) Math.sqrt(12800), 120f + (float) Math.sqrt(12800), 200f - (float) Math.sqrt(12800), -40f + (float) Math.sqrt(12800), 281.25f, 33.75f);
+            template.arc(40f - (float) Math.sqrt(12800), 120f + (float) Math.sqrt(12800),
+                    200f - (float) Math.sqrt(12800), -40f + (float) Math.sqrt(12800), 281.25f, 33.75f);
             template.arc(40f, 120f, 200f, -40f, 90f, 45f);
             template.stroke();
             template.setLineCap(1);
@@ -71,13 +72,12 @@ public static void main(String[] args) {
             template.showTextAligned(PdfContentByte.ALIGN_LEFT, "ext", 220f, 35f, 0f);
             template.endText();
             template.sanityCheck();
-            
+
             cb.addTemplate(template, 0, 1, -1, 0, 500, 200);
             cb.addTemplate(template, .5f, 0, 0, .5f, 100, 400);
             cb.addTemplate(template, 0.25f, 0, 0, 0.25f, 100, 100);
             cb.sanityCheck();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/text/Text.java b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/text/Text.java
index eb8de0da2..22b33c27a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/text/Text.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/directcontent/text/Text.java
@@ -9,44 +9,46 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.directcontent.text;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 /**
  * Adding text at an absolute position.
  */
 public class Text {
+
     /**
      * Adding text at absolute positions.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Text at absolute positions");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2: creation of the writer
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("text.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we grab the ContentByte and do some stuff with it
             PdfContentByte cb = writer.getDirectContent();
-            
+
             // first we draw some lines to be able to visualize the text alignment functions
             cb.setLineWidth(0f);
             cb.moveTo(250, 500);
@@ -84,10 +86,9 @@ public static void main(String[] args) {
 
             // we tell the contentByte, we've finished drawing text
             cb.endText();
-            
+
             cb.sanityCheck();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/EncodingFont.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/EncodingFont.java
index e0c4799e0..646385769 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/EncodingFont.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/EncodingFont.java
@@ -9,12 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.Font;
@@ -24,14 +22,71 @@
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Fonts and encoding.
  */
 public class EncodingFont {
 
+    final static char[] SYMBOL_TABLE = {
+            ' ', '!', '\u2200', '#', '\u2203', '%', '&', '\u220b', '(', ')', '*', '+', ',', '-', '.', '/',
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?',
+            '\u2245', '\u0391', '\u0392', '\u03a7', '\u0394', '\u0395', '\u03a6', '\u0393', '\u0397', '\u0399',
+            '\u03d1', '\u039a', '\u039b', '\u039c', '\u039d', '\u039f',
+            '\u03a0', '\u0398', '\u03a1', '\u03a3', '\u03a4', '\u03a5', '\u03c2', '\u03a9', '\u039e', '\u03a8',
+            '\u0396', '[', '\u2234', ']', '\u22a5', '_',
+            '\u0305', '\u03b1', '\u03b2', '\u03c7', '\u03b4', '\u03b5', '\u03d5', '\u03b3', '\u03b7', '\u03b9',
+            '\u03c6', '\u03ba', '\u03bb', '\u03bc', '\u03bd', '\u03bf',
+            '\u03c0', '\u03b8', '\u03c1', '\u03c3', '\u03c4', '\u03c5', '\u03d6', '\u03c9', '\u03be', '\u03c8',
+            '\u03b6', '{', '|', '}', '~', '\0',
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
+            '\u20ac', '\u03d2', '\u2032', '\u2264', '\u2044', '\u221e', '\u0192', '\u2663', '\u2666', '\u2665',
+            '\u2660', '\u2194', '\u2190', '\u2191', '\u2192', '\u2193',
+            '\u00b0', '\u00b1', '\u2033', '\u2265', '\u00d7', '\u221d', '\u2202', '\u2022', '\u00f7', '\u2260',
+            '\u2261', '\u2248', '\u2026', '\u2502', '\u2500', '\u21b5',
+            '\u2135', '\u2111', '\u211c', '\u2118', '\u2297', '\u2295', '\u2205', '\u2229', '\u222a', '\u2283',
+            '\u2287', '\u2284', '\u2282', '\u2286', '\u2208', '\u2209',
+            '\u2220', '\u2207', '\u00ae', '\u00a9', '\u2122', '\u220f', '\u221a', '\u2022', '\u00ac', '\u2227',
+            '\u2228', '\u21d4', '\u21d0', '\u21d1', '\u21d2', '\u21d3',
+            '\u25ca', '\u2329', '\0', '\0', '\0', '\u2211', '\u239b', '\u239c', '\u239d', '\u23a1', '\u23a2', '\u23a3',
+            '\u23a7', '\u23a8', '\u23a9', '\u23aa',
+            '\0', '\u232a', '\u222b', '\u2320', '\u23ae', '\u2321', '\u239e', '\u239f', '\u23a0', '\u23a4', '\u23a5',
+            '\u23a6', '\u23ab', '\u23ac', '\u23ad', '\0'
+    };
+    final static char[] DINGBATS_TABLE = {
+            '\u0020', '\u2701', '\u2702', '\u2703', '\u2704', '\u260e', '\u2706', '\u2707', '\u2708', '\u2709',
+            '\u261b', '\u261e', '\u270C', '\u270D', '\u270E', '\u270F',
+            '\u2710', '\u2711', '\u2712', '\u2713', '\u2714', '\u2715', '\u2716', '\u2717', '\u2718', '\u2719',
+            '\u271A', '\u271B', '\u271C', '\u271D', '\u271E', '\u271F',
+            '\u2720', '\u2721', '\u2722', '\u2723', '\u2724', '\u2725', '\u2726', '\u2727', '\u2605', '\u2729',
+            '\u272A', '\u272B', '\u272C', '\u272D', '\u272E', '\u272F',
+            '\u2730', '\u2731', '\u2732', '\u2733', '\u2734', '\u2735', '\u2736', '\u2737', '\u2738', '\u2739',
+            '\u273A', '\u273B', '\u273C', '\u273D', '\u273E', '\u273F',
+            '\u2740', '\u2741', '\u2742', '\u2743', '\u2744', '\u2745', '\u2746', '\u2747', '\u2748', '\u2749',
+            '\u274A', '\u274B', '\u25cf', '\u274D', '\u25a0', '\u274F',
+            '\u2750', '\u2751', '\u2752', '\u25b2', '\u25bc', '\u25c6', '\u2756', '\u25d7', '\u2758', '\u2759',
+            '\u275A', '\u275B', '\u275C', '\u275D', '\u275E', '\u0000',
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
+            '\u0000', '\u2761', '\u2762', '\u2763', '\u2764', '\u2765', '\u2766', '\u2767', '\u2663', '\u2666',
+            '\u2665', '\u2660', '\u2460', '\u2461', '\u2462', '\u2463',
+            '\u2464', '\u2465', '\u2466', '\u2467', '\u2468', '\u2469', '\u2776', '\u2777', '\u2778', '\u2779',
+            '\u277A', '\u277B', '\u277C', '\u277D', '\u277E', '\u277F',
+            '\u2780', '\u2781', '\u2782', '\u2783', '\u2784', '\u2785', '\u2786', '\u2787', '\u2788', '\u2789',
+            '\u278A', '\u278B', '\u278C', '\u278D', '\u278E', '\u278F',
+            '\u2790', '\u2791', '\u2792', '\u2793', '\u2794', '\u2192', '\u2194', '\u2195', '\u2798', '\u2799',
+            '\u279A', '\u279B', '\u279C', '\u279D', '\u279E', '\u279F',
+            '\u27A0', '\u27A1', '\u27A2', '\u27A3', '\u27A4', '\u27A5', '\u27A6', '\u27A7', '\u27A8', '\u27A9',
+            '\u27AA', '\u27AB', '\u27AC', '\u27AD', '\u27AE', '\u27AF',
+            '\u0000', '\u27B1', '\u27B2', '\u27B3', '\u27B4', '\u27B5', '\u27B6', '\u27B7', '\u27B8', '\u27B9',
+            '\u27BA', '\u27BB', '\u27BC', '\u27BD', '\u27BE', '\u0000'
+    };
+
     /**
      * Fonts and encoding.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -50,14 +105,15 @@ public static void main(String[] args) {
                 String file = all[z];
                 document.add(new Paragraph("Unicode equivalence for the font \""
                         + file
-                        +"\" with the encoding \""
-                        +file
+                        + "\" with the encoding \""
+                        + file
                         + "\"\n"));
                 char[] tb;
-                if (z == 0)
+                if (z == 0) {
                     tb = SYMBOL_TABLE;
-                else
+                } else {
                     tb = DINGBATS_TABLE;
+                }
                 BaseFont bf;
                 bf = BaseFont.createFont(file, file, true);
                 Font f = new Font(bf, 12);
@@ -81,51 +137,18 @@ public static void main(String[] args) {
             }
             // step 5
             document.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
-    
+
     static String cst(char c) {
-        if (c == 0)
+        if (c == 0) {
             return "\u00a0";
+        }
         String s = Integer.toHexString(c);
         s = s.toUpperCase();
         s = "0000" + s;
         return s.substring(s.length() - 4);
     }
-
-    final static char[] SYMBOL_TABLE = {
-            ' ', '!', '\u2200', '#', '\u2203', '%', '&', '\u220b', '(', ')', '*', '+', ',', '-', '.', '/',
-            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?',
-            '\u2245', '\u0391', '\u0392', '\u03a7', '\u0394', '\u0395', '\u03a6', '\u0393', '\u0397', '\u0399', '\u03d1', '\u039a', '\u039b', '\u039c', '\u039d', '\u039f',
-            '\u03a0', '\u0398', '\u03a1', '\u03a3', '\u03a4', '\u03a5', '\u03c2', '\u03a9', '\u039e', '\u03a8', '\u0396', '[', '\u2234', ']', '\u22a5', '_',
-            '\u0305', '\u03b1', '\u03b2', '\u03c7', '\u03b4', '\u03b5', '\u03d5', '\u03b3', '\u03b7', '\u03b9', '\u03c6', '\u03ba', '\u03bb', '\u03bc', '\u03bd', '\u03bf',
-            '\u03c0', '\u03b8', '\u03c1', '\u03c3', '\u03c4', '\u03c5', '\u03d6', '\u03c9', '\u03be', '\u03c8', '\u03b6', '{', '|', '}', '~', '\0',
-            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
-            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
-            '\u20ac', '\u03d2', '\u2032', '\u2264', '\u2044', '\u221e', '\u0192', '\u2663', '\u2666', '\u2665', '\u2660', '\u2194', '\u2190', '\u2191', '\u2192', '\u2193',
-            '\u00b0', '\u00b1', '\u2033', '\u2265', '\u00d7', '\u221d', '\u2202', '\u2022', '\u00f7', '\u2260', '\u2261', '\u2248', '\u2026', '\u2502', '\u2500', '\u21b5',
-            '\u2135', '\u2111', '\u211c', '\u2118', '\u2297', '\u2295', '\u2205', '\u2229', '\u222a', '\u2283', '\u2287', '\u2284', '\u2282', '\u2286', '\u2208', '\u2209',
-            '\u2220', '\u2207', '\u00ae', '\u00a9', '\u2122', '\u220f', '\u221a', '\u2022', '\u00ac', '\u2227', '\u2228', '\u21d4', '\u21d0', '\u21d1', '\u21d2', '\u21d3',
-            '\u25ca', '\u2329', '\0', '\0', '\0', '\u2211', '\u239b', '\u239c', '\u239d', '\u23a1', '\u23a2', '\u23a3', '\u23a7', '\u23a8', '\u23a9', '\u23aa',
-            '\0', '\u232a', '\u222b', '\u2320', '\u23ae', '\u2321', '\u239e', '\u239f', '\u23a0', '\u23a4', '\u23a5', '\u23a6', '\u23ab', '\u23ac', '\u23ad', '\0'
-    };
-    final static char[] DINGBATS_TABLE = {
-            '\u0020', '\u2701', '\u2702', '\u2703', '\u2704', '\u260e', '\u2706', '\u2707', '\u2708', '\u2709', '\u261b', '\u261e', '\u270C', '\u270D', '\u270E', '\u270F',
-            '\u2710', '\u2711', '\u2712', '\u2713', '\u2714', '\u2715', '\u2716', '\u2717', '\u2718', '\u2719', '\u271A', '\u271B', '\u271C', '\u271D', '\u271E', '\u271F',
-            '\u2720', '\u2721', '\u2722', '\u2723', '\u2724', '\u2725', '\u2726', '\u2727', '\u2605', '\u2729', '\u272A', '\u272B', '\u272C', '\u272D', '\u272E', '\u272F',
-            '\u2730', '\u2731', '\u2732', '\u2733', '\u2734', '\u2735', '\u2736', '\u2737', '\u2738', '\u2739', '\u273A', '\u273B', '\u273C', '\u273D', '\u273E', '\u273F',
-            '\u2740', '\u2741', '\u2742', '\u2743', '\u2744', '\u2745', '\u2746', '\u2747', '\u2748', '\u2749', '\u274A', '\u274B', '\u25cf', '\u274D', '\u25a0', '\u274F',
-            '\u2750', '\u2751', '\u2752', '\u25b2', '\u25bc', '\u25c6', '\u2756', '\u25d7', '\u2758', '\u2759', '\u275A', '\u275B', '\u275C', '\u275D', '\u275E', '\u0000',
-            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
-            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
-            '\u0000', '\u2761', '\u2762', '\u2763', '\u2764', '\u2765', '\u2766', '\u2767', '\u2663', '\u2666', '\u2665', '\u2660', '\u2460', '\u2461', '\u2462', '\u2463',
-            '\u2464', '\u2465', '\u2466', '\u2467', '\u2468', '\u2469', '\u2776', '\u2777', '\u2778', '\u2779', '\u277A', '\u277B', '\u277C', '\u277D', '\u277E', '\u277F',
-            '\u2780', '\u2781', '\u2782', '\u2783', '\u2784', '\u2785', '\u2786', '\u2787', '\u2788', '\u2789', '\u278A', '\u278B', '\u278C', '\u278D', '\u278E', '\u278F',
-            '\u2790', '\u2791', '\u2792', '\u2793', '\u2794', '\u2192', '\u2194', '\u2195', '\u2798', '\u2799', '\u279A', '\u279B', '\u279C', '\u279D', '\u279E', '\u279F',
-            '\u27A0', '\u27A1', '\u27A2', '\u27A3', '\u27A4', '\u27A5', '\u27A6', '\u27A7', '\u27A8', '\u27A9', '\u27AA', '\u27AB', '\u27AC', '\u27AD', '\u27AE', '\u27AF',
-            '\u0000', '\u27B1', '\u27B2', '\u27B3', '\u27B4', '\u27B5', '\u27B6', '\u27B7', '\u27B8', '\u27B9', '\u27BA', '\u27BB', '\u27BC', '\u27BD', '\u27BE', '\u0000'
-    };
 }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FontEncoding.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FontEncoding.java
index d8737ff64..7f6076b30 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FontEncoding.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FontEncoding.java
@@ -9,51 +9,52 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Specifying an encoding.
  */
 public class FontEncoding {
-    
+
     /**
      * Specifying an encoding.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Encodings");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2: creation of the writer
             PdfWriter.getInstance(document, new FileOutputStream("fontencoding.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content to the document
             BaseFont helvetica = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.CP1252, BaseFont.EMBEDDED);
             Font font = new Font(helvetica, 12, Font.NORMAL);
-            Chunk chunk = new Chunk("Sponsor this example and send me 1\u20ac. These are some special characters: \u0152\u0153\u0160\u0161\u0178\u017D\u0192\u02DC\u2020\u2021\u2030", font);
+            Chunk chunk = new Chunk(
+                    "Sponsor this example and send me 1\u20ac. These are some special characters: \u0152\u0153\u0160\u0161\u0178\u017D\u0192\u02DC\u2020\u2021\u2030",
+                    font);
             document.add(chunk);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FontFactoryType1Fonts.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FontFactoryType1Fonts.java
index 61a45237f..028cf5605 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FontFactoryType1Fonts.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FontFactoryType1Fonts.java
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.fonts;
@@ -25,7 +25,7 @@
 
 /**
  * Generates a PDF with the 14 Standard Type 1 Fonts (using FontFactory).
- * 
+ *
  * @author blowagie
  */
 
@@ -33,7 +33,7 @@ public class FontFactoryType1Fonts {
 
     /**
      * Generates a PDF file with the 14 standard Type 1 Fonts (using FontFactory)
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -51,7 +51,7 @@ public static void main(String[] args) {
             // step 3: we open the document
             document.open();
             // step 4:
-            
+
             // the 14 standard fonts in PDF
             Font[] fonts = new Font[15];
             fonts[0] = FontFactory.getFont(FontFactory.COURIER, Font.DEFAULTSIZE, Font.NORMAL);
@@ -71,7 +71,7 @@ public static void main(String[] args) {
             fonts[14] = FontFactory.getFont(FontFactory.COURIER, Font.DEFAULTSIZE, Font.BOLD | Font.UNDERLINE);
             // add the content
             for (int i = 0; i < fonts.length; i++) {
-                    document.add(new Paragraph("quick brown fox jumps over the lazy dog", fonts[i]));
+                document.add(new Paragraph("quick brown fox jumps over the lazy dog", fonts[i]));
             }
         } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FullFontNames.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FullFontNames.java
index 00216a922..04c521075 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FullFontNames.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/FullFontNames.java
@@ -9,15 +9,14 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts;
 
+import com.lowagie.text.pdf.BaseFont;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 
-import com.lowagie.text.pdf.BaseFont;
-
 /**
  * Retrieving the full font name
  */
@@ -25,11 +24,11 @@ public class FullFontNames {
 
     /**
      * Retrieving the full font name
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        try
-        {
+        try {
             BufferedWriter out = new BufferedWriter(new FileWriter("fullfontname_arialbi.txt"));
             BaseFont bf = BaseFont.createFont("c:\\windows\\fonts\\arialbi.ttf", "winansi", BaseFont.NOT_EMBEDDED);
             out.write("postscriptname: " + bf.getPostscriptFontName());
@@ -38,13 +37,13 @@ public static void main(String[] args) {
             out.write("\n\nListing the full font name:\n\n");
             for (String[] name : names) {
                 if (name[0].equals("3") && name[1].equals("1")) // Microsoft encoding
+                {
                     out.write(name[3] + "\r\n");
+                }
             }
             out.flush();
             out.close();
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidi.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidi.java
index 59e8284cb..e4fdfdbf2 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidi.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidi.java
@@ -30,8 +30,8 @@
 public class GlyphLayoutDocumentBidi {
 
     public static String INTRO_TEXT =
-        "Test of bidirectional text\n" +
-            "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
+            "Test of bidirectional text\n" +
+                    "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
 
     /**
      * Main method
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidiPerFont.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidiPerFont.java
index b37d68898..ac6107e6d 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidiPerFont.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentBidiPerFont.java
@@ -31,8 +31,8 @@
 public class GlyphLayoutDocumentBidiPerFont {
 
     public static String INTRO_TEXT =
-        "Test of bidirectional text\n" +
-            "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
+            "Test of bidirectional text\n" +
+                    "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
 
     /**
      * Main method
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentDin91379.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentDin91379.java
index 9160e1cf2..ee9b76c29 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentDin91379.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentDin91379.java
@@ -28,85 +28,85 @@
 public class GlyphLayoutDocumentDin91379 {
 
     public static String TEXT_INTRO =
-        "Test of formatting for letters and sequences defined in:\n"
-            + "DIN 91379:2022-08: Characters and defined character sequences in Unicode for the electronic\n "
-            + "processing of names and data exchange in Europe, with CD-ROM\n"
-            + "See https://www.beuth.de/de/norm/din-91379/353496133\n"
-            + "    https://github.com/String-Latin/DIN-91379-Characters-and-Sequences"
-            + "and https://en.wikipedia.org/wiki/DIN_91379\n\n"
-            + "Fonts used: Noto Sans Regular, Noto Sans Math Regular, Noto Serif Regular\n"
-            + "    see https://fonts.google.com/noto/specimen/Noto+Sans"
-            + "    and https://github.com/googlefonts/noto-fonts/tree/main/hinted/ttf\n"
-            + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
+            "Test of formatting for letters and sequences defined in:\n"
+                    + "DIN 91379:2022-08: Characters and defined character sequences in Unicode for the electronic\n "
+                    + "processing of names and data exchange in Europe, with CD-ROM\n"
+                    + "See https://www.beuth.de/de/norm/din-91379/353496133\n"
+                    + "    https://github.com/String-Latin/DIN-91379-Characters-and-Sequences"
+                    + "and https://en.wikipedia.org/wiki/DIN_91379\n\n"
+                    + "Fonts used: Noto Sans Regular, Noto Sans Math Regular, Noto Serif Regular\n"
+                    + "    see https://fonts.google.com/noto/specimen/Noto+Sans"
+                    + "    and https://github.com/googlefonts/noto-fonts/tree/main/hinted/ttf\n"
+                    + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
 
     public static String LATIN_CHARS_DIN_91379 =
-        "bll; Latin Letters (normative)\n"
-            + "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \n"
-            + "a b c d e f g h i j k l m n o p q r s t u v w x y z \n"
-            + "À à Â Ã Ä Å Æ Ç È É Ê Ë Ì à Î à à Ñ Ò Ó Ô Õ Ö Ø Ù Ú \n"
-            + "Û Ü à Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô \n"
-            + "õ ö ø ù ú û ü ý þ ÿ Ä€ Ä Ä‚ ă Ä„ Ä… Ć ć Ĉ ĉ ÄŠ Ä‹ ÄŒ Ä ÄŽ Ä \n"
-            + "Ä Ä‘ Ä’ Ä“ Ä” Ä• Ä– Ä— Ę Ä™ Äš Ä› Äœ Ä Äž ÄŸ Ä  Ä¡ Ä¢ Ä£ Ĥ Ä¥ Ħ ħ Ĩ Ä© \n"
-            + "Ī ī Ĭ ĭ Į į İ ı IJ ij Ĵ ĵ Ķ ķ ĸ Ĺ ĺ Ļ ļ Ľ ľ Ŀ ŀ Šł Ń \n"
-            + "ń Ņ ņ Ň ň ʼn Ŋ ŋ Ō ŠŎ ŠŠő Œ œ Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ŝ Š\n"
-            + "Ş ş Š š Ţ ţ Ť ť Ŧ ŧ Ũ ũ Ū ū Ŭ ŭ Ů ů Ű ű Ų ų Ŵ ŵ Ŷ ŷ \n"
-            + "Ÿ Ź ź Å» ż Ž ž Ƈ ƈ Æ Æ— Æ  Æ¡ Ư Æ° Æ· Ç ÇŽ Ç Ç Ç‘ Ç’ Ç“ Ç” Ç• Ç– \n"
-            + "Ǘ ǘ Ǚ ǚ Ǜ ǜ Ǟ ǟ Ǣ ǣ Ǥ ǥ Ǧ ǧ Ǩ ǩ Ǫ ǫ Ǭ ǭ Ǯ ǯ ǰ Ǵ ǵ Ǹ \n"
-            + "ǹ Ǻ ǻ Ǽ ǽ Ǿ ǿ Ȓ ȓ Ș ș Ț ț Ȟ ȟ ȧ Ȩ ȩ Ȫ ȫ Ȭ ȭ Ȯ ȯ Ȱ ȱ \n"
-            + "Ȳ ȳ ə ɨ ʒ Ḃ ḃ Ḇ ḇ Ḋ ḋ Ḍ ḠḎ ḠḠḑ ḗ Ḝ ḠḞ ḟ Ḡ ḡ Ḣ ḣ \n"
-            + "Ḥ ḥ Ḧ ḧ Ḩ ḩ Ḫ ḫ ḯ Ḱ ḱ Ḳ ḳ Ḵ ḵ Ḷ ḷ Ḻ ḻ Ṁ ṠṂ ṃ Ṅ ṅ Ṇ \n"
-            + "ṇ Ṉ ṉ Ṓ ṓ Ṕ ṕ Ṗ ṗ Ṙ ṙ Ṛ ṛ Ṟ ṟ Ṡ ṡ Ṣ ṣ Ṫ ṫ Ṭ ṭ Ṯ ṯ Ẁ \n"
-            + "ẠẂ ẃ Ẅ ẅ Ẇ ẇ Ẍ ẠẎ ẠẠẑ Ẓ ẓ Ẕ ẕ ẖ ẗ ẞ Ạ ạ Ả ả Ấ ấ \n"
-            + "Ầ ầ Ẩ ẩ Ẫ ẫ Ậ ậ Ắ ắ Ằ ằ Ẳ ẳ Ẵ ẵ Ặ ặ Ẹ ẹ Ẻ ẻ Ẽ ẽ Ế ế \n"
-            + "Ề ỠỂ ể Ễ ễ Ệ ệ Ỉ ỉ Ị ị Ọ ỠỎ ỠỠố Ồ ồ Ổ ổ Ỗ ỗ Ộ ộ \n"
-            + "Ớ ớ Ờ ỠỞ ở Ỡ ỡ Ợ ợ Ụ ụ Ủ ủ Ứ ứ Ừ ừ Ử ử Ữ ữ Ự ự Ỳ ỳ \n"
-            + "Ỵ ỵ Ỷ ỷ Ỹ ỹ \n"
-            + "Sequences\n"
-            + "AÌ‹ CÌ€ CÌ„ C̆ C̈ CÌ• CÌ£ C̦ C̨̆ DÌ‚ FÌ€ FÌ„ GÌ€ HÌ„ H̦ H̱ JÌ JÌŒ KÌ€ KÌ‚ KÌ„ K̇ KÌ• KÌ› K̦ KÍŸH \n"
-            + "KÍŸh LÌ‚ LÌ¥ L̥̄ L̦ MÌ€ MÌ‚ M̆ MÌ NÌ‚ NÌ„ N̆ N̦ PÌ€ PÌ„ PÌ• PÌ£ R̆ RÌ¥ R̥̄ SÌ€ SÌ„ S̛̄ S̱ TÌ€ TÌ„ \n"
-            + "T̈ TÌ• TÌ› U̇ ZÌ€ ZÌ„ Z̆ Z̈ Z̧ aÌ‹ cÌ€ cÌ„ c̆ c̈ cÌ• cÌ£ c̦ c̨̆ dÌ‚ fÌ€ fÌ„ gÌ€ hÌ„ h̦ jÌ kÌ€ \n"
-            + "kÌ‚ kÌ„ k̇ kÌ• kÌ› k̦ kÍŸh lÌ‚ lÌ¥ l̥̄ l̦ mÌ€ mÌ‚ m̆ mÌ nÌ‚ nÌ„ n̆ n̦ pÌ€ pÌ„ pÌ• pÌ£ r̆ rÌ¥ r̥̄ \n"
-            + "sÌ€ sÌ„ s̛̄ s̱ tÌ€ tÌ„ tÌ• tÌ› u̇ zÌ€ zÌ„ z̆ z̈ z̧ Ç̆ Û̄ ç̆ û̄ Ã¿Ì ÄŒÌ• Č̣ ÄÌ• ÄÌ£ Ä“Ì ÄªÌ Ä«Ì \n"
-            + "ÅÌ Å½Ì¦ Ž̧ ž̦ ž̧ Ḳ̄ ḳ̄ Ṣ̄ ṣ̄ Ṭ̄ á¹­Ì„ Ạ̈ ạ̈ Ọ̈ á»Ìˆ Ụ̄ Ụ̈ ụ̄ ụ̈ \n"
-            + "bnlreq; Non-Letters N1 (normative)\n"
-            + "  ' , - . ` ~ ¨ ´ · ʹ ʺ ʾ ʿ ˈ ˌ ’ ‡ \n"
-            + "bnl; Non-Letters N2 (normative)\n"
-            + "! \" # $ % & ( ) * + / 0 1 2 3 4 5 6 7 8 9 : ; < = > \n"
-            + "? @ [ \\ ] ^ _ { | } ¡ ¢ £ ¥ § © ª « ¬ ® ¯ ° ± ² ³ µ \n"
-            + "¶ ¹ º » ¿ × ÷ € \n"
-            + "bnlopt; Non-Letters N3 (normative)\n"
-            + "¤ ¦ ¸ ¼ ½ ¾ \n"
-            + "bnlnot; Non-Letters N4 (normative)\n"
-            + "-omitted-\n"
-            + "dc; Combining diacritics (normative)\n"
-            + "Ì€-omitted-\n"
-            + "gl; Greek Letters (extended)\n"
-            + "Ά Έ Ή Ί Ό Ύ ΠΠΑ Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ ΠΞ Ο Π Ρ Σ \n"
-            + "Τ Υ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν \n"
-            + "ξ ο Ï€ Ï Ï‚ σ Ï„ Ï… φ χ ψ ω ÏŠ Ï‹ ÏŒ Ï ÏŽ \n"
-            + "cl; Cyrillic Letters (extended)\n"
-            + "РРБ В Г Д Е Ж З И Й К Л М РО П Р С Т У Ф Х Ц Ч Ш \n"
-            + "Щ Ъ Ь Ю Я а б в г д е ж з и й к л м н о п Ñ€ Ñ Ñ‚ у Ñ„ \n"
-            + "Ñ… ц ч ш щ ÑŠ ÑŒ ÑŽ Ñ Ñ \n"
-            + "enl; Non-Letters E1 (extended)\n"
-            + "ƒ ʰ ʳ ˆ ˜ ˢ ᵈ ᵗ ‘ ‚ “ †„ † … ‰ ′ ″ ‹ › Ⱐⴠⵠⶠⷠ⸠\n"
-            + "⹠⿠₀ ₠₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉ ™ \n\n";
+            "bll; Latin Letters (normative)\n"
+                    + "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \n"
+                    + "a b c d e f g h i j k l m n o p q r s t u v w x y z \n"
+                    + "À à Â Ã Ä Å Æ Ç È É Ê Ë Ì à Î à à Ñ Ò Ó Ô Õ Ö Ø Ù Ú \n"
+                    + "Û Ü à Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô \n"
+                    + "õ ö ø ù ú û ü ý þ ÿ Ä€ Ä Ä‚ ă Ä„ Ä… Ć ć Ĉ ĉ ÄŠ Ä‹ ÄŒ Ä ÄŽ Ä \n"
+                    + "Ä Ä‘ Ä’ Ä“ Ä” Ä• Ä– Ä— Ę Ä™ Äš Ä› Äœ Ä Äž ÄŸ Ä  Ä¡ Ä¢ Ä£ Ĥ Ä¥ Ħ ħ Ĩ Ä© \n"
+                    + "Ī ī Ĭ ĭ Į į İ ı IJ ij Ĵ ĵ Ķ ķ ĸ Ĺ ĺ Ļ ļ Ľ ľ Ŀ ŀ Šł Ń \n"
+                    + "ń Ņ ņ Ň ň ʼn Ŋ ŋ Ō ŠŎ ŠŠő Œ œ Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ŝ Š\n"
+                    + "Ş ş Š š Ţ ţ Ť ť Ŧ ŧ Ũ ũ Ū ū Ŭ ŭ Ů ů Ű ű Ų ų Ŵ ŵ Ŷ ŷ \n"
+                    + "Ÿ Ź ź Å» ż Ž ž Ƈ ƈ Æ Æ— Æ  Æ¡ Ư Æ° Æ· Ç ÇŽ Ç Ç Ç‘ Ç’ Ç“ Ç” Ç• Ç– \n"
+                    + "Ǘ ǘ Ǚ ǚ Ǜ ǜ Ǟ ǟ Ǣ ǣ Ǥ ǥ Ǧ ǧ Ǩ ǩ Ǫ ǫ Ǭ ǭ Ǯ ǯ ǰ Ǵ ǵ Ǹ \n"
+                    + "ǹ Ǻ ǻ Ǽ ǽ Ǿ ǿ Ȓ ȓ Ș ș Ț ț Ȟ ȟ ȧ Ȩ ȩ Ȫ ȫ Ȭ ȭ Ȯ ȯ Ȱ ȱ \n"
+                    + "Ȳ ȳ ə ɨ ʒ Ḃ ḃ Ḇ ḇ Ḋ ḋ Ḍ ḠḎ ḠḠḑ ḗ Ḝ ḠḞ ḟ Ḡ ḡ Ḣ ḣ \n"
+                    + "Ḥ ḥ Ḧ ḧ Ḩ ḩ Ḫ ḫ ḯ Ḱ ḱ Ḳ ḳ Ḵ ḵ Ḷ ḷ Ḻ ḻ Ṁ ṠṂ ṃ Ṅ ṅ Ṇ \n"
+                    + "ṇ Ṉ ṉ Ṓ ṓ Ṕ ṕ Ṗ ṗ Ṙ ṙ Ṛ ṛ Ṟ ṟ Ṡ ṡ Ṣ ṣ Ṫ ṫ Ṭ ṭ Ṯ ṯ Ẁ \n"
+                    + "ẠẂ ẃ Ẅ ẅ Ẇ ẇ Ẍ ẠẎ ẠẠẑ Ẓ ẓ Ẕ ẕ ẖ ẗ ẞ Ạ ạ Ả ả Ấ ấ \n"
+                    + "Ầ ầ Ẩ ẩ Ẫ ẫ Ậ ậ Ắ ắ Ằ ằ Ẳ ẳ Ẵ ẵ Ặ ặ Ẹ ẹ Ẻ ẻ Ẽ ẽ Ế ế \n"
+                    + "Ề ỠỂ ể Ễ ễ Ệ ệ Ỉ ỉ Ị ị Ọ ỠỎ ỠỠố Ồ ồ Ổ ổ Ỗ ỗ Ộ ộ \n"
+                    + "Ớ ớ Ờ ỠỞ ở Ỡ ỡ Ợ ợ Ụ ụ Ủ ủ Ứ ứ Ừ ừ Ử ử Ữ ữ Ự ự Ỳ ỳ \n"
+                    + "Ỵ ỵ Ỷ ỷ Ỹ ỹ \n"
+                    + "Sequences\n"
+                    + "AÌ‹ CÌ€ CÌ„ C̆ C̈ CÌ• CÌ£ C̦ C̨̆ DÌ‚ FÌ€ FÌ„ GÌ€ HÌ„ H̦ H̱ JÌ JÌŒ KÌ€ KÌ‚ KÌ„ K̇ KÌ• KÌ› K̦ KÍŸH \n"
+                    + "KÍŸh LÌ‚ LÌ¥ L̥̄ L̦ MÌ€ MÌ‚ M̆ MÌ NÌ‚ NÌ„ N̆ N̦ PÌ€ PÌ„ PÌ• PÌ£ R̆ RÌ¥ R̥̄ SÌ€ SÌ„ S̛̄ S̱ TÌ€ TÌ„ \n"
+                    + "T̈ TÌ• TÌ› U̇ ZÌ€ ZÌ„ Z̆ Z̈ Z̧ aÌ‹ cÌ€ cÌ„ c̆ c̈ cÌ• cÌ£ c̦ c̨̆ dÌ‚ fÌ€ fÌ„ gÌ€ hÌ„ h̦ jÌ kÌ€ \n"
+                    + "kÌ‚ kÌ„ k̇ kÌ• kÌ› k̦ kÍŸh lÌ‚ lÌ¥ l̥̄ l̦ mÌ€ mÌ‚ m̆ mÌ nÌ‚ nÌ„ n̆ n̦ pÌ€ pÌ„ pÌ• pÌ£ r̆ rÌ¥ r̥̄ \n"
+                    + "sÌ€ sÌ„ s̛̄ s̱ tÌ€ tÌ„ tÌ• tÌ› u̇ zÌ€ zÌ„ z̆ z̈ z̧ Ç̆ Û̄ ç̆ û̄ Ã¿Ì ÄŒÌ• Č̣ ÄÌ• ÄÌ£ Ä“Ì ÄªÌ Ä«Ì \n"
+                    + "ÅÌ Å½Ì¦ Ž̧ ž̦ ž̧ Ḳ̄ ḳ̄ Ṣ̄ ṣ̄ Ṭ̄ á¹­Ì„ Ạ̈ ạ̈ Ọ̈ á»Ìˆ Ụ̄ Ụ̈ ụ̄ ụ̈ \n"
+                    + "bnlreq; Non-Letters N1 (normative)\n"
+                    + "  ' , - . ` ~ ¨ ´ · ʹ ʺ ʾ ʿ ˈ ˌ ’ ‡ \n"
+                    + "bnl; Non-Letters N2 (normative)\n"
+                    + "! \" # $ % & ( ) * + / 0 1 2 3 4 5 6 7 8 9 : ; < = > \n"
+                    + "? @ [ \\ ] ^ _ { | } ¡ ¢ £ ¥ § © ª « ¬ ® ¯ ° ± ² ³ µ \n"
+                    + "¶ ¹ º » ¿ × ÷ € \n"
+                    + "bnlopt; Non-Letters N3 (normative)\n"
+                    + "¤ ¦ ¸ ¼ ½ ¾ \n"
+                    + "bnlnot; Non-Letters N4 (normative)\n"
+                    + "-omitted-\n"
+                    + "dc; Combining diacritics (normative)\n"
+                    + "Ì€-omitted-\n"
+                    + "gl; Greek Letters (extended)\n"
+                    + "Ά Έ Ή Ί Ό Ύ ΠΠΑ Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ ΠΞ Ο Π Ρ Σ \n"
+                    + "Τ Υ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν \n"
+                    + "ξ ο Ï€ Ï Ï‚ σ Ï„ Ï… φ χ ψ ω ÏŠ Ï‹ ÏŒ Ï ÏŽ \n"
+                    + "cl; Cyrillic Letters (extended)\n"
+                    + "РРБ В Г Д Е Ж З И Й К Л М РО П Р С Т У Ф Х Ц Ч Ш \n"
+                    + "Щ Ъ Ь Ю Я а б в г д е ж з и й к л м н о п Ñ€ Ñ Ñ‚ у Ñ„ \n"
+                    + "Ñ… ц ч ш щ ÑŠ ÑŒ ÑŽ Ñ Ñ \n"
+                    + "enl; Non-Letters E1 (extended)\n"
+                    + "ƒ ʰ ʳ ˆ ˜ ˢ ᵈ ᵗ ‘ ‚ “ †„ † … ‰ ′ ″ ‹ › Ⱐⴠⵠⶠⷠ⸠\n"
+                    + "⹠⿠₀ ₠₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉ ™ \n\n";
 
     public static String LATIN_CHARS_DIN_91379_MATH =
-        "enl; Non Letters E1 (extended) math\n"
-            + "∞ ≤ ≥ \n";
+            "enl; Non Letters E1 (extended) math\n"
+                    + "∞ ≤ ≥ \n";
 
     public static String LATIN_CHARS_ADDITIONAL =
-        "Additional non-letters (not included in DIN 91379)\n"
-            + "– — •�\n\n";
+            "Additional non-letters (not included in DIN 91379)\n"
+                    + "– — •�\n\n";
 
     public static String TEST_KERNING =
-        "Kerning\n"
-            + "AVATAR Vector TeX\n\n";
+            "Kerning\n"
+                    + "AVATAR Vector TeX\n\n";
 
     public static String TEST_LIGATURES =
-        "Ligatures\n"
-            + "ff ffi ffl fi fl\n\n";
+            "Ligatures\n"
+                    + "ff ffi ffl fi fl\n\n";
 
     /**
      * Register and get font
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLiga.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLiga.java
index 3cf0b1e02..f2de839ba 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLiga.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLiga.java
@@ -30,12 +30,12 @@
 public class GlyphLayoutDocumentKernLiga {
 
     public static String INTRO_TEXT =
-        "Test of text attributes for kerning and ligatures\n"
-            + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
+            "Test of text attributes for kerning and ligatures\n"
+                    + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
 
 
     public static String TEST_TEXT =
-        "AVATAR Vector TeX ff ffi ffl fi fl.\n\n";
+            "AVATAR Vector TeX ff ffi ffl fi fl.\n\n";
 
     /**
      * Main method
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLigaPerFont.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLigaPerFont.java
index 34d2978d7..fccaaa8d5 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLigaPerFont.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutDocumentKernLigaPerFont.java
@@ -30,12 +30,12 @@
 public class GlyphLayoutDocumentKernLigaPerFont {
 
     public static String TEXT_INTRO =
-        "Test of kerning and ligatures per font\n"
-            + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
+            "Test of kerning and ligatures per font\n"
+                    + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
 
 
     public static String TEST_TEXT =
-        "AVATAR Vector TeX ff ffi ffl fi fl.";
+            "AVATAR Vector TeX ff ffi ffl fi fl.";
 
     /**
      * Main method
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutFormDin91379.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutFormDin91379.java
index 38f15ac59..70a0cded5 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutFormDin91379.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/GlyphLayoutFormDin91379.java
@@ -29,67 +29,67 @@
 public class GlyphLayoutFormDin91379 {
 
     public static String TEXT_INTRO =
-        "Test of formatting for letters and sequences defined in:\n"
-            + "DIN 91379:2022-08: Characters and defined character sequences in Unicode for the electronic\n "
-            + "processing of names and data exchange in Europe, with CD-ROM\n"
-            + "See https://www.beuth.de/de/norm/din-91379/353496133\n"
-            + "    https://github.com/String-Latin/DIN-91379-Characters-and-Sequences"
-            + "and https://en.wikipedia.org/wiki/DIN_91379\n\n"
-            + "Fonts used: Noto Sans Regular, Noto Sans Math Regular\n"
-            + "    see https://fonts.google.com/noto/specimen/Noto+Sans"
-            + "    and https://github.com/googlefonts/noto-fonts/tree/main/hinted/ttf\n"
-            + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
+            "Test of formatting for letters and sequences defined in:\n"
+                    + "DIN 91379:2022-08: Characters and defined character sequences in Unicode for the electronic\n "
+                    + "processing of names and data exchange in Europe, with CD-ROM\n"
+                    + "See https://www.beuth.de/de/norm/din-91379/353496133\n"
+                    + "    https://github.com/String-Latin/DIN-91379-Characters-and-Sequences"
+                    + "and https://en.wikipedia.org/wiki/DIN_91379\n\n"
+                    + "Fonts used: Noto Sans Regular, Noto Sans Math Regular\n"
+                    + "    see https://fonts.google.com/noto/specimen/Noto+Sans"
+                    + "    and https://github.com/googlefonts/noto-fonts/tree/main/hinted/ttf\n"
+                    + "Using LayoutProcessor for glyph layout with Java built-in routines.\n\n";
 
     public static String LATIN_CHARS_DIN_91379 =
-        "bll; Latin Letters (normative)\n"
-            + "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z "
-            + "a b c d e f g h i j k l m n o p q r s t u v w x y z "
-            + "À à Â Ã Ä Å Æ Ç È É Ê Ë Ì à Î à à Ñ Ò Ó Ô Õ Ö Ø Ù Ú "
-            + "Û Ü à Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô "
-            + "õ ö ø ù ú û ü ý þ ÿ Ä€ Ä Ä‚ ă Ä„ Ä… Ć ć Ĉ ĉ ÄŠ Ä‹ ÄŒ Ä ÄŽ Ä "
-            + "Ä Ä‘ Ä’ Ä“ Ä” Ä• Ä– Ä— Ę Ä™ Äš Ä› Äœ Ä Äž ÄŸ Ä  Ä¡ Ä¢ Ä£ Ĥ Ä¥ Ħ ħ Ĩ Ä© "
-            + "Ī ī Ĭ ĭ Į į İ ı IJ ij Ĵ ĵ Ķ ķ ĸ Ĺ ĺ Ļ ļ Ľ ľ Ŀ ŀ Šł Ń "
-            + "ń Ņ ņ Ň ň ʼn Ŋ ŋ Ō ŠŎ ŠŠő Œ œ Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ŝ Š"
-            + "Ş ş Š š Ţ ţ Ť ť Ŧ ŧ Ũ ũ Ū ū Ŭ ŭ Ů ů Ű ű Ų ų Ŵ ŵ Ŷ ŷ "
-            + "Ÿ Ź ź Å» ż Ž ž Ƈ ƈ Æ Æ— Æ  Æ¡ Ư Æ° Æ· Ç ÇŽ Ç Ç Ç‘ Ç’ Ç“ Ç” Ç• Ç– "
-            + "Ǘ ǘ Ǚ ǚ Ǜ ǜ Ǟ ǟ Ǣ ǣ Ǥ ǥ Ǧ ǧ Ǩ ǩ Ǫ ǫ Ǭ ǭ Ǯ ǯ ǰ Ǵ ǵ Ǹ "
-            + "ǹ Ǻ ǻ Ǽ ǽ Ǿ ǿ Ȓ ȓ Ș ș Ț ț Ȟ ȟ ȧ Ȩ ȩ Ȫ ȫ Ȭ ȭ Ȯ ȯ Ȱ ȱ "
-            + "Ȳ ȳ ə ɨ ʒ Ḃ ḃ Ḇ ḇ Ḋ ḋ Ḍ ḠḎ ḠḠḑ ḗ Ḝ ḠḞ ḟ Ḡ ḡ Ḣ ḣ "
-            + "Ḥ ḥ Ḧ ḧ Ḩ ḩ Ḫ ḫ ḯ Ḱ ḱ Ḳ ḳ Ḵ ḵ Ḷ ḷ Ḻ ḻ Ṁ ṠṂ ṃ Ṅ ṅ Ṇ "
-            + "ṇ Ṉ ṉ Ṓ ṓ Ṕ ṕ Ṗ ṗ Ṙ ṙ Ṛ ṛ Ṟ ṟ Ṡ ṡ Ṣ ṣ Ṫ ṫ Ṭ ṭ Ṯ ṯ Ẁ "
-            + "ẠẂ ẃ Ẅ ẅ Ẇ ẇ Ẍ ẠẎ ẠẠẑ Ẓ ẓ Ẕ ẕ ẖ ẗ ẞ Ạ ạ Ả ả Ấ ấ "
-            + "Ầ ầ Ẩ ẩ Ẫ ẫ Ậ ậ Ắ ắ Ằ ằ Ẳ ẳ Ẵ ẵ Ặ ặ Ẹ ẹ Ẻ ẻ Ẽ ẽ Ế ế "
-            + "Ề ỠỂ ể Ễ ễ Ệ ệ Ỉ ỉ Ị ị Ọ ỠỎ ỠỠố Ồ ồ Ổ ổ Ỗ ỗ Ộ ộ "
-            + "Ớ ớ Ờ ỠỞ ở Ỡ ỡ Ợ ợ Ụ ụ Ủ ủ Ứ ứ Ừ ừ Ử ử Ữ ữ Ự ự Ỳ ỳ "
-            + "Ỵ ỵ Ỷ ỷ Ỹ ỹ \n"
-            + "Sequences\n"
-            + "AÌ‹ CÌ€ CÌ„ C̆ C̈ CÌ• CÌ£ C̦ C̨̆ DÌ‚ FÌ€ FÌ„ GÌ€ HÌ„ H̦ H̱ JÌ JÌŒ KÌ€ KÌ‚ KÌ„ K̇ KÌ• KÌ› K̦ KÍŸH "
-            + "KÍŸh LÌ‚ LÌ¥ L̥̄ L̦ MÌ€ MÌ‚ M̆ MÌ NÌ‚ NÌ„ N̆ N̦ PÌ€ PÌ„ PÌ• PÌ£ R̆ RÌ¥ R̥̄ SÌ€ SÌ„ S̛̄ S̱ TÌ€ TÌ„ "
-            + "T̈ TÌ• TÌ› U̇ ZÌ€ ZÌ„ Z̆ Z̈ Z̧ aÌ‹ cÌ€ cÌ„ c̆ c̈ cÌ• cÌ£ c̦ c̨̆ dÌ‚ fÌ€ fÌ„ gÌ€ hÌ„ h̦ jÌ kÌ€ "
-            + "kÌ‚ kÌ„ k̇ kÌ• kÌ› k̦ kÍŸh lÌ‚ lÌ¥ l̥̄ l̦ mÌ€ mÌ‚ m̆ mÌ nÌ‚ nÌ„ n̆ n̦ pÌ€ pÌ„ pÌ• pÌ£ r̆ rÌ¥ r̥̄ "
-            + "sÌ€ sÌ„ s̛̄ s̱ tÌ€ tÌ„ tÌ• tÌ› u̇ zÌ€ zÌ„ z̆ z̈ z̧ Ç̆ Û̄ ç̆ û̄ Ã¿Ì ÄŒÌ• Č̣ ÄÌ• ÄÌ£ Ä“Ì ÄªÌ Ä«Ì "
-            + "ÅÌ Å½Ì¦ Ž̧ ž̦ ž̧ Ḳ̄ ḳ̄ Ṣ̄ ṣ̄ Ṭ̄ á¹­Ì„ Ạ̈ ạ̈ Ọ̈ á»Ìˆ Ụ̄ Ụ̈ ụ̄ ụ̈ \n"
-            + "bnlreq; Non-Letters N1 (normative)\n"
-            + "  ' , - . ` ~ ¨ ´ · ʹ ʺ ʾ ʿ ˈ ˌ ’ ‡ \n"
-            + "bnl; Non-Letters N2 (normative)\n"
-            + "! \" # $ % & ( ) * + / 0 1 2 3 4 5 6 7 8 9 : ; < = > "
-            + "? @ [ \\ ] ^ _ { | } ¡ ¢ £ ¥ § © ª « ¬ ® ¯ ° ± ² ³ µ "
-            + "¶ ¹ º » ¿ × ÷ € \n"
-            + "bnlopt; Non-Letters N3 (normative)\n"
-            + "¤ ¦ ¸ ¼ ½ ¾ \n"
-            + "bnlnot; Non-Letters N4 (normative) -omitted-\n"
-            + "dc; Combining diacritics (normative) ̀-omitted-\n"
-            + "gl; Greek Letters (extended)\n"
-            + "Ά Έ Ή Ί Ό Ύ ΠΠΑ Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ ΠΞ Ο Π Ρ Σ "
-            + "Τ Υ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν "
-            + "ξ ο Ï€ Ï Ï‚ σ Ï„ Ï… φ χ ψ ω ÏŠ Ï‹ ÏŒ Ï ÏŽ \n"
-            + "cl; Cyrillic Letters (extended)\n"
-            + "РРБ В Г Д Е Ж З И Й К Л М РО П Р С Т У Ф Х Ц Ч Ш "
-            + "Щ Ъ Ь Ю Я а б в г д е ж з и й к л м н о п Ñ€ Ñ Ñ‚ у Ñ„ "
-            + "Ñ… ц ч ш щ ÑŠ ÑŒ ÑŽ Ñ Ñ \n"
-            + "enl; Non-Letters E1 (extended)\n"
-            + "ƒ ʰ ʳ ˆ ˜ ˢ ᵈ ᵗ ‘ ‚ “ †„ † … ‰ ′ ″ ‹ › Ⱐⴠⵠⶠⷠ⸠"
-            + "⹠⿠₀ ₠₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉ ™ ∞ ≤ ≥ \n\n";
+            "bll; Latin Letters (normative)\n"
+                    + "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z "
+                    + "a b c d e f g h i j k l m n o p q r s t u v w x y z "
+                    + "À à Â Ã Ä Å Æ Ç È É Ê Ë Ì à Î à à Ñ Ò Ó Ô Õ Ö Ø Ù Ú "
+                    + "Û Ü à Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô "
+                    + "õ ö ø ù ú û ü ý þ ÿ Ä€ Ä Ä‚ ă Ä„ Ä… Ć ć Ĉ ĉ ÄŠ Ä‹ ÄŒ Ä ÄŽ Ä "
+                    + "Ä Ä‘ Ä’ Ä“ Ä” Ä• Ä– Ä— Ę Ä™ Äš Ä› Äœ Ä Äž ÄŸ Ä  Ä¡ Ä¢ Ä£ Ĥ Ä¥ Ħ ħ Ĩ Ä© "
+                    + "Ī ī Ĭ ĭ Į į İ ı IJ ij Ĵ ĵ Ķ ķ ĸ Ĺ ĺ Ļ ļ Ľ ľ Ŀ ŀ Šł Ń "
+                    + "ń Ņ ņ Ň ň ʼn Ŋ ŋ Ō ŠŎ ŠŠő Œ œ Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ŝ Š"
+                    + "Ş ş Š š Ţ ţ Ť ť Ŧ ŧ Ũ ũ Ū ū Ŭ ŭ Ů ů Ű ű Ų ų Ŵ ŵ Ŷ ŷ "
+                    + "Ÿ Ź ź Å» ż Ž ž Ƈ ƈ Æ Æ— Æ  Æ¡ Ư Æ° Æ· Ç ÇŽ Ç Ç Ç‘ Ç’ Ç“ Ç” Ç• Ç– "
+                    + "Ǘ ǘ Ǚ ǚ Ǜ ǜ Ǟ ǟ Ǣ ǣ Ǥ ǥ Ǧ ǧ Ǩ ǩ Ǫ ǫ Ǭ ǭ Ǯ ǯ ǰ Ǵ ǵ Ǹ "
+                    + "ǹ Ǻ ǻ Ǽ ǽ Ǿ ǿ Ȓ ȓ Ș ș Ț ț Ȟ ȟ ȧ Ȩ ȩ Ȫ ȫ Ȭ ȭ Ȯ ȯ Ȱ ȱ "
+                    + "Ȳ ȳ ə ɨ ʒ Ḃ ḃ Ḇ ḇ Ḋ ḋ Ḍ ḠḎ ḠḠḑ ḗ Ḝ ḠḞ ḟ Ḡ ḡ Ḣ ḣ "
+                    + "Ḥ ḥ Ḧ ḧ Ḩ ḩ Ḫ ḫ ḯ Ḱ ḱ Ḳ ḳ Ḵ ḵ Ḷ ḷ Ḻ ḻ Ṁ ṠṂ ṃ Ṅ ṅ Ṇ "
+                    + "ṇ Ṉ ṉ Ṓ ṓ Ṕ ṕ Ṗ ṗ Ṙ ṙ Ṛ ṛ Ṟ ṟ Ṡ ṡ Ṣ ṣ Ṫ ṫ Ṭ ṭ Ṯ ṯ Ẁ "
+                    + "ẠẂ ẃ Ẅ ẅ Ẇ ẇ Ẍ ẠẎ ẠẠẑ Ẓ ẓ Ẕ ẕ ẖ ẗ ẞ Ạ ạ Ả ả Ấ ấ "
+                    + "Ầ ầ Ẩ ẩ Ẫ ẫ Ậ ậ Ắ ắ Ằ ằ Ẳ ẳ Ẵ ẵ Ặ ặ Ẹ ẹ Ẻ ẻ Ẽ ẽ Ế ế "
+                    + "Ề ỠỂ ể Ễ ễ Ệ ệ Ỉ ỉ Ị ị Ọ ỠỎ ỠỠố Ồ ồ Ổ ổ Ỗ ỗ Ộ ộ "
+                    + "Ớ ớ Ờ ỠỞ ở Ỡ ỡ Ợ ợ Ụ ụ Ủ ủ Ứ ứ Ừ ừ Ử ử Ữ ữ Ự ự Ỳ ỳ "
+                    + "Ỵ ỵ Ỷ ỷ Ỹ ỹ \n"
+                    + "Sequences\n"
+                    + "AÌ‹ CÌ€ CÌ„ C̆ C̈ CÌ• CÌ£ C̦ C̨̆ DÌ‚ FÌ€ FÌ„ GÌ€ HÌ„ H̦ H̱ JÌ JÌŒ KÌ€ KÌ‚ KÌ„ K̇ KÌ• KÌ› K̦ KÍŸH "
+                    + "KÍŸh LÌ‚ LÌ¥ L̥̄ L̦ MÌ€ MÌ‚ M̆ MÌ NÌ‚ NÌ„ N̆ N̦ PÌ€ PÌ„ PÌ• PÌ£ R̆ RÌ¥ R̥̄ SÌ€ SÌ„ S̛̄ S̱ TÌ€ TÌ„ "
+                    + "T̈ TÌ• TÌ› U̇ ZÌ€ ZÌ„ Z̆ Z̈ Z̧ aÌ‹ cÌ€ cÌ„ c̆ c̈ cÌ• cÌ£ c̦ c̨̆ dÌ‚ fÌ€ fÌ„ gÌ€ hÌ„ h̦ jÌ kÌ€ "
+                    + "kÌ‚ kÌ„ k̇ kÌ• kÌ› k̦ kÍŸh lÌ‚ lÌ¥ l̥̄ l̦ mÌ€ mÌ‚ m̆ mÌ nÌ‚ nÌ„ n̆ n̦ pÌ€ pÌ„ pÌ• pÌ£ r̆ rÌ¥ r̥̄ "
+                    + "sÌ€ sÌ„ s̛̄ s̱ tÌ€ tÌ„ tÌ• tÌ› u̇ zÌ€ zÌ„ z̆ z̈ z̧ Ç̆ Û̄ ç̆ û̄ Ã¿Ì ÄŒÌ• Č̣ ÄÌ• ÄÌ£ Ä“Ì ÄªÌ Ä«Ì "
+                    + "ÅÌ Å½Ì¦ Ž̧ ž̦ ž̧ Ḳ̄ ḳ̄ Ṣ̄ ṣ̄ Ṭ̄ á¹­Ì„ Ạ̈ ạ̈ Ọ̈ á»Ìˆ Ụ̄ Ụ̈ ụ̄ ụ̈ \n"
+                    + "bnlreq; Non-Letters N1 (normative)\n"
+                    + "  ' , - . ` ~ ¨ ´ · ʹ ʺ ʾ ʿ ˈ ˌ ’ ‡ \n"
+                    + "bnl; Non-Letters N2 (normative)\n"
+                    + "! \" # $ % & ( ) * + / 0 1 2 3 4 5 6 7 8 9 : ; < = > "
+                    + "? @ [ \\ ] ^ _ { | } ¡ ¢ £ ¥ § © ª « ¬ ® ¯ ° ± ² ³ µ "
+                    + "¶ ¹ º » ¿ × ÷ € \n"
+                    + "bnlopt; Non-Letters N3 (normative)\n"
+                    + "¤ ¦ ¸ ¼ ½ ¾ \n"
+                    + "bnlnot; Non-Letters N4 (normative) -omitted-\n"
+                    + "dc; Combining diacritics (normative) ̀-omitted-\n"
+                    + "gl; Greek Letters (extended)\n"
+                    + "Ά Έ Ή Ί Ό Ύ ΠΠΑ Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ ΠΞ Ο Π Ρ Σ "
+                    + "Τ Υ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν "
+                    + "ξ ο Ï€ Ï Ï‚ σ Ï„ Ï… φ χ ψ ω ÏŠ Ï‹ ÏŒ Ï ÏŽ \n"
+                    + "cl; Cyrillic Letters (extended)\n"
+                    + "РРБ В Г Д Е Ж З И Й К Л М РО П Р С Т У Ф Х Ц Ч Ш "
+                    + "Щ Ъ Ь Ю Я а б в г д е ж з и й к л м н о п Ñ€ Ñ Ñ‚ у Ñ„ "
+                    + "Ñ… ц ч ш щ ÑŠ ÑŒ ÑŽ Ñ Ñ \n"
+                    + "enl; Non-Letters E1 (extended)\n"
+                    + "ƒ ʰ ʳ ˆ ˜ ˢ ᵈ ᵗ ‘ ‚ “ †„ † … ‰ ′ ″ ‹ › Ⱐⴠⵠⶠⷠ⸠"
+                    + "⹠⿠₀ ₠₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉ ™ ∞ ≤ ≥ \n\n";
 
     /**
      * Main method
@@ -98,7 +98,7 @@ public class GlyphLayoutFormDin91379 {
      */
     public static void main(String[] args) throws Exception {
         test("GlyphLayoutFormDin91379.pdf", "com/lowagie/examples/fonts/form/PdfFormLayoutProcessor.pdf",
-            TEXT_INTRO + LATIN_CHARS_DIN_91379);
+                TEXT_INTRO + LATIN_CHARS_DIN_91379);
     }
 
     /**
@@ -115,9 +115,9 @@ public static void test(String fileName, String formPath, String text) throws Ex
         LayoutProcessor.enableKernLiga();
 
         try (InputStream acroFormInputStream = GlyphLayoutFormDin91379.class.getClassLoader()
-            .getResourceAsStream(formPath);
-            FileOutputStream outputStream = new FileOutputStream(fileName);
-            PdfReader reader = new PdfReader(acroFormInputStream)
+                .getResourceAsStream(formPath);
+                FileOutputStream outputStream = new FileOutputStream(fileName);
+                PdfReader reader = new PdfReader(acroFormInputStream)
         ) {
 
             // The OpenType fonts loaded with FontFactory.register() are
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/ListEncodings.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/ListEncodings.java
index fcfccd917..d3ebb396e 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/ListEncodings.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/ListEncodings.java
@@ -9,17 +9,16 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts;
 
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.pdf.BaseFont;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
 
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.pdf.BaseFont;
-
 /**
  * Listing the encodings of font comic
  */
@@ -27,13 +26,15 @@ public class ListEncodings {
 
     /**
      * Listing the encodings of font comic.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("Listing Font properties");
         try {
             BufferedWriter out = new BufferedWriter(new FileWriter("encodings.txt"));
-            BaseFont bfComic = BaseFont.createFont("c:\\windows\\fonts\\comicbd.ttf", BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
+            BaseFont bfComic = BaseFont.createFont("c:\\windows\\fonts\\comicbd.ttf", BaseFont.CP1252,
+                    BaseFont.NOT_EMBEDDED);
             out.write("postscriptname: " + bfComic.getPostscriptFontName());
             out.write("\r\n\r\n");
             String[] codePages = bfComic.getCodePagesSupported();
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/StandardType1Fonts.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/StandardType1Fonts.java
index c41d6f524..361b2c2e7 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/StandardType1Fonts.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/StandardType1Fonts.java
@@ -9,23 +9,22 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.fonts;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates a PDF with the 14 Standard Type 1 Fonts.
- * 
+ *
  * @author blowagie
  */
 
@@ -33,7 +32,7 @@ public class StandardType1Fonts {
 
     /**
      * Generates a PDF file with the 14 standard Type 1 Fonts
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -51,7 +50,7 @@ public static void main(String[] args) {
             // step 3: we open the document
             document.open();
             // step 4:
-            
+
             // the 14 standard fonts in PDF: do not use this Font constructor!
             // this is for demonstration purposes only, use FontFactory!
             Font[] fonts = new Font[14];
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/TrueType.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/TrueType.java
index bb2c279f5..2ac18537f 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/TrueType.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/TrueType.java
@@ -9,11 +9,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts;
-import java.io.FileOutputStream;
-import java.io.IOException;
 
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -21,39 +19,42 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Using a True Type Font.
  */
 public class TrueType {
-    
+
     /**
      * Using a True Type Font.
+     *
      * @param args np arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("True Type fonts (not embedded)");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter.getInstance(document, new FileOutputStream("truetype.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content to the document
-            BaseFont bfComic = BaseFont.createFont("c:\\windows\\fonts\\comicbd.ttf", BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
+            BaseFont bfComic = BaseFont.createFont("c:\\windows\\fonts\\comicbd.ttf", BaseFont.CP1252,
+                    BaseFont.NOT_EMBEDDED);
             Font font = new Font(bfComic, 12);
             String text1 = "This is the quite popular True Type font 'Comic'.";
             document.add(new Paragraph(text1, font));
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/UnicodeExample.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/UnicodeExample.java
index 26fe1fc8c..0a5832481 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/UnicodeExample.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/UnicodeExample.java
@@ -9,46 +9,47 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Embedding True Type fonts.
  */
 public class UnicodeExample {
-    
+
     /**
      * Embedding True Type Fonts.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("True Types (embedded)");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2: creation of the writer-object
             PdfWriter.getInstance(document, new FileOutputStream("unicode.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content to the document
-            BaseFont bfComic = BaseFont.createFont("c:\\windows\\fonts\\comic.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
+            BaseFont bfComic = BaseFont.createFont("c:\\windows\\fonts\\comic.ttf", BaseFont.IDENTITY_H,
+                    BaseFont.EMBEDDED);
             Font font = new Font(bfComic, 12);
             String text1 = "This is the quite popular True Type font 'Comic'.";
             String text2 = "Some greek characters: \u0393\u0394\u03b6";
@@ -56,8 +57,7 @@ public static void main(String[] args) {
             document.add(new Paragraph(text1, font));
             document.add(new Paragraph(text2, font));
             document.add(new Paragraph(text3, font));
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/ChineseJapaneseKorean.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/ChineseJapaneseKorean.java
index 89633e050..77ebdc9d3 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/ChineseJapaneseKorean.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/ChineseJapaneseKorean.java
@@ -9,19 +9,18 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts.getting;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 
 /**
@@ -31,62 +30,62 @@ public class ChineseJapaneseKorean {
 
     /**
      * Using CJK fonts
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("CJK Fonts");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
         try {
-            
+
             // step 2: creation of the writer
             PdfWriter.getInstance(document, new FileOutputStream("cjk.pdf"));
-            
+
             // step 3: we open the document
             document.open();
             String chinese = "\u53d6\u6e96\u53d7\u4fdd\u4eba\u5728\u6211\u56fd\u7ecf\u6d4e\u7ed3\u6784"
-            + "\u8fdb\u884c\u6218\u7565\u6027\u8c03\u6574\u7684"
-            + "\u80CC\u666F\u4e0B\uff0c\u4FE1\u606f\u4ea7\u4e1a"
-            + "\u5c06\u6210\u4E3A\u62c9\u52A8\u7ecf\u6d4e\u589e"
-            + "\u957f\u7684\u65b0\u52A8\u529b\uff0c\u800c\u4f5c"
-            + "\u4E3A\u4FE1\u606f\u6280\u672f\u6838\u5fc3\u4e4b"
-            + "\u4e00\u7684\u8f6f\u4ef6\u4ea7\u4e1a\u5fc5\u7136"
-            + "\u6210\u4E3A\u4e4a\u540e\u56fd\u5bb6\u4ea7\u4e1a"
-            + "\u54d1\u5c55\u7684\u6218\u7565\u91cd\u70b9\uff0c"
-            + "\u6211\u56fd\u7684\u8f6f\u4ef6\u4ea7\u4e1a\u5c06"
-            + "\u4f1a\u5f97\u5230\u98de\u901f\u7684\u54d1\u5c55"
-            + "\u3002\u540c\u65f6\u4F34\u968f\u7740\u6211\u56fd"
-            + "\u52a0\u5165\u4e16\u8d38\u7ec4\u7ec7\uff0c\u8de8"
-            + "\u56fd\u4f01\u4e1a\u4e5f\u5c06\u5927\u89c4\uc4a3"
-            + "\u8fdb\u9a7b\u4e2d\u56fd\u8f6f\u4ef6\ucad0\u573a"
-            + "\u3002\u56e0\u6b64\uff0c\u9ad8\u7d20\u8d28\u5f0c"
-            + "\u4ef6\u4eba\u624d\u7684\u7ade\u4e89\ucac6\u5fc5"
-            + "\uc8d5\uc7f7\ubca4\uc1d2\u3002\u800c\u4e4b\u6b64"
-            + "\u7678\u5bf9\u5e94\u7684\u662f\u76ee\u524d\u6211"
-            + "\u56fd\u5bf9\u5f0c\u4ef6\u4eba\u624d\u57f9\u517b"
-            + "\u7684\u529b\u5ea6\u4e0d\u591f\uff0c\u6240\u80fd"
-            + "\u63d0\u4f9b\u4e13\u4e1a\u4eba\u624d\u8fdc\u8fdc"
-            + "\u6ee1\u8db3\u4e0d\u4e86\u5e02\u573a\u7684\u9700"
-            + "\u6c42\u3002\u56e0\u6b64\u4ee5\u5e02\u573a\u9700"
-            + "\u6c42\u4E3A\u7740\u773c\u70b9\uff0c\u6539\u9769"
-            + "\u5f0c\u4ef6\u4eba\u624d\u57f9\u517b\u7684\u6a21"
-            + "\u5f0f\uff0c\u52a0\u5927\u5f0c\u4ef6\u4eba\u624d"
-            + "\u57f9\u517b\u7684\u529b\u5ea6\uff0c\u5b9e\u73b0"
-            + "\u6211\u56fd\u5f0c\u4ef6\u4eba\u624d\u57f9\u517b"
-            + "\u7684\u5d88\u8d8a\u5f0f\u54d1\u5c55\uff0c\u5df2"
-            + "\u7ecf\u6210\u4E3A\u5f53\u524d\u6c0a\u7b49\u6559"
-            + "\u80b2\u6539\u9769\u4e0e\u54d1\u5c55\u7684\u4e00"
-            + "\u9879\u6781\u5176\u91cd\u8981\u800c\u4e14\u7678"
-            + "\u5f53\u7d27\u8feb\u7684\u4efb\u52a1\u3002";
-            
+                    + "\u8fdb\u884c\u6218\u7565\u6027\u8c03\u6574\u7684"
+                    + "\u80CC\u666F\u4e0B\uff0c\u4FE1\u606f\u4ea7\u4e1a"
+                    + "\u5c06\u6210\u4E3A\u62c9\u52A8\u7ecf\u6d4e\u589e"
+                    + "\u957f\u7684\u65b0\u52A8\u529b\uff0c\u800c\u4f5c"
+                    + "\u4E3A\u4FE1\u606f\u6280\u672f\u6838\u5fc3\u4e4b"
+                    + "\u4e00\u7684\u8f6f\u4ef6\u4ea7\u4e1a\u5fc5\u7136"
+                    + "\u6210\u4E3A\u4e4a\u540e\u56fd\u5bb6\u4ea7\u4e1a"
+                    + "\u54d1\u5c55\u7684\u6218\u7565\u91cd\u70b9\uff0c"
+                    + "\u6211\u56fd\u7684\u8f6f\u4ef6\u4ea7\u4e1a\u5c06"
+                    + "\u4f1a\u5f97\u5230\u98de\u901f\u7684\u54d1\u5c55"
+                    + "\u3002\u540c\u65f6\u4F34\u968f\u7740\u6211\u56fd"
+                    + "\u52a0\u5165\u4e16\u8d38\u7ec4\u7ec7\uff0c\u8de8"
+                    + "\u56fd\u4f01\u4e1a\u4e5f\u5c06\u5927\u89c4\uc4a3"
+                    + "\u8fdb\u9a7b\u4e2d\u56fd\u8f6f\u4ef6\ucad0\u573a"
+                    + "\u3002\u56e0\u6b64\uff0c\u9ad8\u7d20\u8d28\u5f0c"
+                    + "\u4ef6\u4eba\u624d\u7684\u7ade\u4e89\ucac6\u5fc5"
+                    + "\uc8d5\uc7f7\ubca4\uc1d2\u3002\u800c\u4e4b\u6b64"
+                    + "\u7678\u5bf9\u5e94\u7684\u662f\u76ee\u524d\u6211"
+                    + "\u56fd\u5bf9\u5f0c\u4ef6\u4eba\u624d\u57f9\u517b"
+                    + "\u7684\u529b\u5ea6\u4e0d\u591f\uff0c\u6240\u80fd"
+                    + "\u63d0\u4f9b\u4e13\u4e1a\u4eba\u624d\u8fdc\u8fdc"
+                    + "\u6ee1\u8db3\u4e0d\u4e86\u5e02\u573a\u7684\u9700"
+                    + "\u6c42\u3002\u56e0\u6b64\u4ee5\u5e02\u573a\u9700"
+                    + "\u6c42\u4E3A\u7740\u773c\u70b9\uff0c\u6539\u9769"
+                    + "\u5f0c\u4ef6\u4eba\u624d\u57f9\u517b\u7684\u6a21"
+                    + "\u5f0f\uff0c\u52a0\u5927\u5f0c\u4ef6\u4eba\u624d"
+                    + "\u57f9\u517b\u7684\u529b\u5ea6\uff0c\u5b9e\u73b0"
+                    + "\u6211\u56fd\u5f0c\u4ef6\u4eba\u624d\u57f9\u517b"
+                    + "\u7684\u5d88\u8d8a\u5f0f\u54d1\u5c55\uff0c\u5df2"
+                    + "\u7ecf\u6210\u4E3A\u5f53\u524d\u6c0a\u7b49\u6559"
+                    + "\u80b2\u6539\u9769\u4e0e\u54d1\u5c55\u7684\u4e00"
+                    + "\u9879\u6781\u5176\u91cd\u8981\u800c\u4e14\u7678"
+                    + "\u5f53\u7d27\u8feb\u7684\u4efb\u52a1\u3002";
+
             // step 4: we add content to the document
             BaseFont bfChinese = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
             Font FontChinese = new Font(bfChinese, 12, Font.NORMAL);
             Paragraph p = new Paragraph(chinese, FontChinese);
             document.add(p);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/FontFactoryStyles.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/FontFactoryStyles.java
index 2b16b1a24..f2e84090b 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/FontFactoryStyles.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/FontFactoryStyles.java
@@ -9,19 +9,18 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts.getting;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Changing the style of a FontFactory Font.
@@ -30,22 +29,23 @@ public class FontFactoryStyles {
 
     /**
      * Changing the style of a FontFactory Font.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("Changing the style of a FontFactory font");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2: creation of the writer
             PdfWriter.getInstance(document, new FileOutputStream("fontfactorystyles.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add some content
             FontFactory.register("c:\\windows\\fonts\\arial.ttf");
             FontFactory.register("c:\\windows\\fonts\\arialbd.ttf");
@@ -56,8 +56,7 @@ public static void main(String[] args) {
             myPhrase.add(new Phrase("bold ", FontFactory.getFont("Arial", 8, Font.BOLD)));
             myPhrase.add(new Phrase("bolditalic", FontFactory.getFont("Arial", 8, Font.BOLDITALIC)));
             document.add(myPhrase);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/OpenTypeFont.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/OpenTypeFont.java
index b5158138f..a25ecac75 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/OpenTypeFont.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/OpenTypeFont.java
@@ -9,25 +9,26 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts.getting;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Using an Open Type Font (CFF only).
  */
 public class OpenTypeFont {
+
     /**
      * Using oth
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -42,8 +43,7 @@ public static void main(String[] args) {
             BaseFont bf = BaseFont.createFont("liz.otf", BaseFont.CP1252, true);
             String text = "Some text with the otf font LIZ.";
             document.add(new Paragraph(text, new Font(bf, 14)));
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
         // step 5
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/RegisterFont.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/RegisterFont.java
index b197979fd..74606188e 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/RegisterFont.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/RegisterFont.java
@@ -9,15 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts.getting;
 
-import java.io.BufferedWriter;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
@@ -25,6 +20,10 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.BufferedWriter;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
 
 /**
  * Registering Fonts with the FontFactory.
@@ -33,26 +32,27 @@ public class RegisterFont {
 
     /**
      * Registering fonts with the fontfactory.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Registering fonts with the FontFactory");
-        
+
         FontFactory.register("c:\\windows\\fonts\\comicbd.ttf");
         FontFactory.register("c:\\windows\\fonts\\comic.ttf");
         FontFactory.register("c:\\windows\\fonts\\msgothic.ttc");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
             // step 2: creation of the writer
             PdfWriter.getInstance(document, new FileOutputStream("registerfont.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content to the document
             Font font0 = FontFactory.getFont(BaseFont.HELVETICA, BaseFont.WINANSI, 12);
             String text0 = "This is the quite popular built in font '" + BaseFont.HELVETICA + "'.";
@@ -63,7 +63,7 @@ public static void main(String[] args) {
             Font font2 = FontFactory.getFont("ComicSansMS-Bold", BaseFont.WINANSI, 12);
             String text2 = "This is the quite popular True Type font 'ComicSansMS-Bold'.";
             document.add(new Paragraph(text2, font2));
-            Font font3= FontFactory.getFont("MS-PGothic", BaseFont.IDENTITY_H, BaseFont.EMBEDDED, 12);
+            Font font3 = FontFactory.getFont("MS-PGothic", BaseFont.IDENTITY_H, BaseFont.EMBEDDED, 12);
             String text3 = "\u5951\u7d04\u8005\u4f4f\u6240\u30e9\u30a4\u30f3\uff11";
             document.add(new Paragraph(text3, font3));
             BufferedWriter out = new BufferedWriter(new FileWriter("registered.txt"));
@@ -79,8 +79,7 @@ public static void main(String[] args) {
             }
             out.flush();
             out.close();
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/TrueType.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/TrueType.java
index 5a7e1ae77..dbf7e04ba 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/TrueType.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/TrueType.java
@@ -9,48 +9,49 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts.getting;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Embedding True Type fonts.
  */
 public class TrueType {
-    
+
     /**
      * Embedding True Type Fonts.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("True Types (embedded)");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter.getInstance(document, new FileOutputStream("truetype.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content to the document
-            BaseFont bfComic = BaseFont.createFont("c:\\windows\\fonts\\comic.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
+            BaseFont bfComic = BaseFont.createFont("c:\\windows\\fonts\\comic.ttf", BaseFont.IDENTITY_H,
+                    BaseFont.EMBEDDED);
             Font font = new Font(bfComic, 12);
             String text1 = "This is the quite popular True Type font 'Comic'.";
             String text2 = "Some greek characters: \u0393\u0394\u03b6";
@@ -58,8 +59,7 @@ public static void main(String[] args) {
             document.add(new Paragraph(text1, font));
             document.add(new Paragraph(text2, font));
             document.add(new Paragraph(text3, font));
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/TrueTypeCollections.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/TrueTypeCollections.java
index af206bc5a..b7944a124 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/TrueTypeCollections.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/TrueTypeCollections.java
@@ -9,21 +9,20 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts.getting;
 
-import java.io.BufferedWriter;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.BufferedWriter;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
 
 /**
  * Using True Type Collections.
@@ -32,18 +31,19 @@ public class TrueTypeCollections {
 
     /**
      * Using true type collections.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("True Type Collections");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
             BufferedWriter out = new BufferedWriter(new FileWriter("msgothic.txt"));
             String[] names = BaseFont.enumerateTTCNames("c:\\windows\\fonts\\msgothic.ttc");
-            for (int i = 0; i < names.length; i++) {              
+            for (int i = 0; i < names.length; i++) {
                 out.write("font " + i + ": " + names[i]);
                 out.write("\r\n");
             }
@@ -51,20 +51,20 @@ public static void main(String[] args) {
             out.close();
             // step 2: creation of the writer
             PdfWriter.getInstance(document, new FileOutputStream("truetypecollections.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content to the document
-            BaseFont bf = BaseFont.createFont("c:\\windows\\fonts\\msgothic.ttc,1", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
+            BaseFont bf = BaseFont.createFont("c:\\windows\\fonts\\msgothic.ttc,1", BaseFont.IDENTITY_H,
+                    BaseFont.EMBEDDED);
             System.out.println("postscriptname: " + bf.getPostscriptFontName());
             Font font = new Font(bf, 16);
             String text1 = "\u5951\u7d04\u8005\u4f4f\u6240\u30e9\u30a4\u30f3\uff11";
             String text2 = "\u5951\u7d04\u8005\u96fb\u8a71\u756a\u53f7";
             document.add(new Paragraph(text1, font));
             document.add(new Paragraph(text2, font));
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/UsingFontFactory.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/UsingFontFactory.java
index 1a6e51dbb..1d6cb6f9d 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/UsingFontFactory.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/getting/UsingFontFactory.java
@@ -9,26 +9,25 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.fonts.getting;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.TreeSet;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.FontFactory;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.TreeSet;
 
 /**
  * Special rendering of Chunks.
- * 
+ *
  * @author blowagie
  */
 
@@ -36,7 +35,7 @@ public class UsingFontFactory {
 
     /**
      * Special rendering of Chunks.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -76,8 +75,7 @@ public static void main(String[] args) {
                 try {
                     p = new Paragraph(quick, FontFactory.getFont(name, BaseFont.WINANSI, BaseFont.EMBEDDED));
                     document.add(p);
-                }
-                catch (Exception e) {
+                } catch (Exception e) {
                     document.add(new Paragraph(e.getMessage()));
                 }
                 c--;
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java
index f28fb51a7..5241ca8db 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java
@@ -71,11 +71,11 @@ public static void main(String[] args) {
             String text = "\u0623\u0648\u0631\u0648\u0628\u0627, \u0628\u0631\u0645\u062c\u064a\u0627\u062a \u0627\u0644\u062d\u0627\u0633\u0648\u0628 + \u0627\u0646\u062a\u0631\u0646\u064a\u062a :";
             Phrase center = new Phrase(text + " Center", ft);
             ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_CENTER, center, 250, 700, 0,
-                PdfWriter.RUN_DIRECTION_RTL, 0);
+                    PdfWriter.RUN_DIRECTION_RTL, 0);
             ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_RIGHT, new Phrase(text + " Right", ft), 250, 650, 20,
-                PdfWriter.RUN_DIRECTION_RTL, 0);
+                    PdfWriter.RUN_DIRECTION_RTL, 0);
             ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_LEFT, new Phrase("Some text Left aligned", ft), 250,
-                600, 20);
+                    600, 20);
             float size = ColumnText.getWidth(center, PdfWriter.RUN_DIRECTION_RTL, 0);
             cb.setRGBColorStroke(255, 0, 0);
             cb.rectangle(250 - size / 2, 690, size, 30);
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ExtraStyles.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ExtraStyles.java
index 5e6cd6239..af5909fa7 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ExtraStyles.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ExtraStyles.java
@@ -9,25 +9,24 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.fonts.styles;
 
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
 import com.lowagie.text.pdf.PdfWriter;
-import org.junit.jupiter.api.Test;
-
 import java.io.ByteArrayOutputStream;
-
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  * Demonstrates how to underline and strike through text.
- * 
+ *
  * @author blowagie
  */
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FixedFontWidth.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FixedFontWidth.java
index ace7308d6..3eac148ac 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FixedFontWidth.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FixedFontWidth.java
@@ -9,18 +9,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts.styles;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Changing the width of font glyphs.
@@ -29,6 +28,7 @@ public class FixedFontWidth {
 
     /**
      * Changing the width of font glyphs.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -44,13 +44,13 @@ public static void main(String[] args) {
             BaseFont bf = BaseFont.createFont("Helvetica", "winansi", false, false, null, null);
             int[] widths = bf.getWidths();
             for (int k = 0; k < widths.length; ++k) {
-                if (widths[k] != 0)
+                if (widths[k] != 0) {
                     widths[k] = 1000;
+                }
             }
             bf.setForceWidthsOutput(true);
             document.add(new Paragraph("A big text to show Helvetica with fixed width.", new Font(bf)));
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
         // step 5
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FontColor.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FontColor.java
index 2d52e992a..c522baacf 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FontColor.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FontColor.java
@@ -9,15 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.fonts.styles;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -27,10 +23,13 @@
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * How to change the color of a font.
- * 
+ *
  * @author blowagie
  */
 
@@ -38,7 +37,7 @@ public class FontColor {
 
     /**
      * Changing Font colors
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -56,8 +55,10 @@ public static void main(String[] args) {
             // step 3: we open the document
             document.open();
             // step 4:
-            Font red = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.BOLD, new Color(0xFF, 0x00, 0x00));
-            Font blue = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.ITALIC, new Color(0x00, 0x00, 0xFF));
+            Font red = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.BOLD,
+                    new Color(0xFF, 0x00, 0x00));
+            Font blue = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.ITALIC,
+                    new Color(0x00, 0x00, 0xFF));
             Paragraph p;
             p = new Paragraph("Roses are ");
             p.add(new Chunk("red", red));
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FontStylePropagation.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FontStylePropagation.java
index d1b7bed61..e91419e3e 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FontStylePropagation.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/FontStylePropagation.java
@@ -9,14 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.fonts.styles;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
@@ -24,10 +21,12 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Explains the mechanism of Font Style Propagation.
- * 
+ *
  * @author blowagie
  */
 
@@ -35,7 +34,7 @@ public class FontStylePropagation {
 
     /**
      * Explains the mechanism of Font Style Propagation
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -57,24 +56,27 @@ public static void main(String[] args) {
             myPhrase.add(new Phrase("some other font ", new Font(Font.HELVETICA, 8)));
             myPhrase.add(new Phrase("This is the end of the sentence.\n", new Font(Font.TIMES_ROMAN, 8, Font.ITALIC)));
             document.add(myPhrase);
-            
+
             myPhrase = new Phrase(12);
             myPhrase.add(new Phrase("Hello 2! ", new Font(Font.TIMES_ROMAN, 8, Font.BOLD)));
             myPhrase.add(new Phrase("This is the end of the sentence.\n", new Font(Font.TIMES_ROMAN, 8, Font.ITALIC)));
             document.add(myPhrase);
-            
+
             myPhrase = new Phrase("Hello 3! ", FontFactory.getFont(FontFactory.TIMES_ROMAN, 8, Font.BOLD));
             myPhrase.add(new Phrase("some other font ", FontFactory.getFont(FontFactory.HELVETICA, 8)));
-            myPhrase.add(new Phrase("This is the end of the sentence.\n", FontFactory.getFont(FontFactory.TIMES_ROMAN, 8, Font.ITALIC)));
+            myPhrase.add(new Phrase("This is the end of the sentence.\n",
+                    FontFactory.getFont(FontFactory.TIMES_ROMAN, 8, Font.ITALIC)));
             document.add(myPhrase);
-            
+
             Paragraph myParagraph = new Paragraph("Hello 1bis! ", new Font(Font.TIMES_ROMAN, 8, Font.BOLD));
-            myParagraph.add(new Paragraph("This is the end of the sentence.", new Font(Font.TIMES_ROMAN, 8, Font.ITALIC)));
+            myParagraph.add(
+                    new Paragraph("This is the end of the sentence.", new Font(Font.TIMES_ROMAN, 8, Font.ITALIC)));
             document.add(myParagraph);
-            
+
             myParagraph = new Paragraph(12);
             myParagraph.add(new Paragraph("Hello 3bis! ", new Font(Font.TIMES_ROMAN, 8, Font.BOLD)));
-            myParagraph.add(new Paragraph("This is the end of the sentence.", new Font(Font.TIMES_ROMAN, 8, Font.ITALIC)));
+            myParagraph.add(
+                    new Paragraph("This is the end of the sentence.", new Font(Font.TIMES_ROMAN, 8, Font.ITALIC)));
             document.add(myParagraph);
         } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/RightToLeft.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/RightToLeft.java
index f75c99c81..16bba9b16 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/RightToLeft.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/RightToLeft.java
@@ -33,6 +33,82 @@
  */
 public class RightToLeft {
 
+    /**
+     * arabic text
+     */
+    public static String ar1 = "\u0623\u0648\u0631\u0648\u0628\u0627, \u0628\u0631\u0645\u062c\u064a\u0627\u062a "
+            + "\u0627\u0644\u062d\u0627\u0633\u0648\u0628 + \u0627\u0646\u062a\u0631\u0646\u064a\u062a :\n\n";
+    /**
+     * arabic text
+     */
+    public static String ar2 = "\u062a\u0635\u0628\u062d \u0639\u0627\u0644\u0645\u064a\u0627 \u0645\u0639 "
+            + "\u064a\u0648\u0646\u064a\u0643\u0648\u062f\n\n";
+    /**
+     * arabic text
+     */
+    public static String ar3 = "\u062a\u0633\u062c\u0651\u0644 \u0627\u0644\u0622\u0646 \u0644\u062d\u0636\u0648\u0631 "
+            + "\u0627\u0644\u0645\u0624\u062a\u0645\u0631 \u0627\u0644\u062f\u0648\u0644\u064a "
+            + "\u0627\u0644\u0639\u0627\u0634\u0631 \u0644\u064a\u0648\u0646\u064a\u0643\u0648\u062f, "
+            + "\u0627\u0644\u0630\u064a \u0633\u064a\u0639\u0642\u062f \u0641\u064a 10-12 \u0622\u0630\u0627\u0631 "
+            + "1997 \u0628\u0645\u062f\u064a\u0646\u0629 \u0645\u0627\u064a\u0646\u062a\u0633, "
+            + "\u0623\u0644\u0645\u0627\u0646\u064a\u0627. \u0648\u0633\u064a\u062c\u0645\u0639 "
+            + "\u0627\u0644\u0645\u0624\u062a\u0645\u0631 \u0628\u064a\u0646 \u062e\u0628\u0631\u0627\u0621 "
+            + "\u0645\u0646  \u0643\u0627\u0641\u0629 \u0642\u0637\u0627\u0639\u0627\u062a "
+            + "\u0627\u0644\u0635\u0646\u0627\u0639\u0629 \u0639\u0644\u0649 \u0627\u0644\u0634\u0628\u0643\u0629 "
+            + "\u0627\u0644\u0639\u0627\u0644\u0645\u064a\u0629 \u0627\u0646\u062a\u0631\u0646\u064a\u062a "
+            + "\u0648\u064a\u0648\u0646\u064a\u0643\u0648\u062f, \u062d\u064a\u062b \u0633\u062a\u062a\u0645, "
+            + "\u0639\u0644\u0649 \u0627\u0644\u0635\u0639\u064a\u062f\u064a\u0646 "
+            + "\u0627\u0644\u062f\u0648\u0644\u064a \u0648\u0627\u0644\u0645\u062d\u0644\u064a \u0639\u0644\u0649 "
+            + "\u062d\u062f \u0633\u0648\u0627\u0621 \u0645\u0646\u0627\u0642\u0634\u0629 \u0633\u0628\u0644 "
+            + "\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u064a\u0648\u0646\u0643\u0648\u062f  \u0641\u064a "
+            + "\u0627\u0644\u0646\u0638\u0645 \u0627\u0644\u0642\u0627\u0626\u0645\u0629 "
+            + "\u0648\u0641\u064a\u0645\u0627 \u064a\u062e\u0635 "
+            + "\u0627\u0644\u062a\u0637\u0628\u064a\u0642\u0627\u062a "
+            + "\u0627\u0644\u062d\u0627\u0633\u0648\u0628\u064a\u0629, \u0627\u0644\u062e\u0637\u0648\u0637, "
+            + "\u062a\u0635\u0645\u064a\u0645 \u0627\u0644\u0646\u0635\u0648\u0635  "
+            + "\u0648\u0627\u0644\u062d\u0648\u0633\u0628\u0629 \u0645\u062a\u0639\u062f\u062f\u0629 "
+            + "\u0627\u0644\u0644\u063a\u0627\u062a.\n\n";
+    /**
+     * arabic text
+     */
+    public static String ar4 = "ع\u0646\u062f\u0645\u0627 \u064a\u0631\u064a\u062f "
+            + "\u0627\u0644\u0639\u0627\u0644\u0645 \u0623\u0646 \u064a\u062a\u0643\u0644\u0651\u0645, "
+            + "\u0641\u0647\u0648 \u064a\u062a\u062d\u062f\u0651\u062b \u0628\u0644\u063a\u0629 "
+            + "\u064a\u0648\u0646\u064a\u0643\u0648\u062f\n\n";
+    /**
+     * hebrew text
+     */
+    public static String he1 = "\u05d0\u05d9\u05e8\u05d5\u05e4\u05d4, \u05ea\u05d5\u05db\u05e0\u05d4 "
+            + "\u05d5\u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8:\n\n";
+    /**
+     * hebrew text
+     */
+    public static String he2 = "Unicode \u05d9\u05d5\u05e6\u05d0 \u05dc\u05e9\u05d5\u05e7 "
+            + "\u05d4\u05e2\u05d5\u05dc\u05de\u05d9\n\n";
+    /**
+     * hebrew text
+     */
+    public static String he3 = "\u05d4\u05d9\u05e8\u05e9\u05de\u05d5 \u05db\u05e2\u05ea \u05dc\u05db\u05e0\u05e1 "
+            + "Unicode \u05d4\u05d1\u05d9\u05e0\u05dc\u05d0\u05d5\u05de\u05d9 \u05d4\u05e2\u05e9\u05d9\u05e8\u05d9, "
+            + "\u05e9\u05d9\u05d9\u05e2\u05e8\u05da \u05d1\u05d9\u05df "
+            + "\u05d4\u05ea\u05d0\u05e8\u05d9\u05db\u05d9\u05dd 12\u05be10 \u05d1\u05de\u05e8\u05e5 1997, "
+            + "\u05d1\u05de\u05d9\u05d9\u05e0\u05e5 \u05e9\u05d1\u05d2\u05e8\u05de\u05e0\u05d9\u05d4. "
+            + "\u05d1\u05db\u05e0\u05e1 \u05d9\u05e9\u05ea\u05ea\u05e4\u05d5 \u05de\u05d5\u05de\u05d7\u05d9\u05dd "
+            + "\u05de\u05db\u05dc \u05e2\u05e0\u05e4\u05d9 \u05d4\u05ea\u05e2\u05e9\u05d9\u05d9\u05d4 "
+            + "\u05d1\u05e0\u05d5\u05e9\u05d0 \u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8 "
+            + "\u05d4\u05e2\u05d5\u05dc\u05de\u05d9 \u05d5\u05d4\u05beUnicode, \u05d1\u05d4\u05ea\u05d0\u05de\u05d4 "
+            + "\u05dc\u05e9\u05d5\u05e7 \u05d4\u05d1\u05d9\u05e0\u05dc\u05d0\u05d5\u05de\u05d9 "
+            + "\u05d5\u05d4\u05de\u05e7\u05d5\u05de\u05d9, \u05d1\u05d9\u05d9\u05e9\u05d5\u05dd Unicode "
+            + "\u05d1\u05de\u05e2\u05e8\u05db\u05d5\u05ea \u05d4\u05e4\u05e2\u05dc\u05d4 "
+            + "\u05d5\u05d1\u05d9\u05d9\u05e9\u05d5\u05de\u05d9\u05dd, \u05d1\u05d2\u05d5\u05e4\u05e0\u05d9\u05dd, "
+            + "\u05d1\u05e4\u05e8\u05d9\u05e1\u05ea \u05d8\u05e7\u05e1\u05d8 "
+            + "\u05d5\u05d1\u05de\u05d7\u05e9\u05d5\u05d1 \u05e8\u05d1\u05be\u05dc\u05e9\u05d5\u05e0\u05d9.\n\n";
+    /**
+     * hebrew text
+     */
+    public static String he4 = "\u05db\u05d0\u05e9\u05e8 \u05d4\u05e2\u05d5\u05dc\u05dd \u05e8\u05d5\u05e6\u05d4 "
+            + "\u05dc\u05d3\u05d1\u05e8, \u05d4\u05d5\u05d0 \u05de\u05d3\u05d1\u05e8 \u05d1\u05beUnicode\n\n";
+
     /**
      * Writing RTL text such as Arabic or Hebrew.
      *
@@ -121,80 +197,4 @@ public static void main(String[] args) {
             e.printStackTrace();
         }
     }
-
-    /**
-     * arabic text
-     */
-    public static String ar1 = "\u0623\u0648\u0631\u0648\u0628\u0627, \u0628\u0631\u0645\u062c\u064a\u0627\u062a "
-            + "\u0627\u0644\u062d\u0627\u0633\u0648\u0628 + \u0627\u0646\u062a\u0631\u0646\u064a\u062a :\n\n";
-    /**
-     * arabic text
-     */
-    public static String ar2 = "\u062a\u0635\u0628\u062d \u0639\u0627\u0644\u0645\u064a\u0627 \u0645\u0639 "
-            + "\u064a\u0648\u0646\u064a\u0643\u0648\u062f\n\n";
-    /**
-     * arabic text
-     */
-    public static String ar3 = "\u062a\u0633\u062c\u0651\u0644 \u0627\u0644\u0622\u0646 \u0644\u062d\u0636\u0648\u0631 "
-            + "\u0627\u0644\u0645\u0624\u062a\u0645\u0631 \u0627\u0644\u062f\u0648\u0644\u064a "
-            + "\u0627\u0644\u0639\u0627\u0634\u0631 \u0644\u064a\u0648\u0646\u064a\u0643\u0648\u062f, "
-            + "\u0627\u0644\u0630\u064a \u0633\u064a\u0639\u0642\u062f \u0641\u064a 10-12 \u0622\u0630\u0627\u0631 "
-            + "1997 \u0628\u0645\u062f\u064a\u0646\u0629 \u0645\u0627\u064a\u0646\u062a\u0633, "
-            + "\u0623\u0644\u0645\u0627\u0646\u064a\u0627. \u0648\u0633\u064a\u062c\u0645\u0639 "
-            + "\u0627\u0644\u0645\u0624\u062a\u0645\u0631 \u0628\u064a\u0646 \u062e\u0628\u0631\u0627\u0621 "
-            + "\u0645\u0646  \u0643\u0627\u0641\u0629 \u0642\u0637\u0627\u0639\u0627\u062a "
-            + "\u0627\u0644\u0635\u0646\u0627\u0639\u0629 \u0639\u0644\u0649 \u0627\u0644\u0634\u0628\u0643\u0629 "
-            + "\u0627\u0644\u0639\u0627\u0644\u0645\u064a\u0629 \u0627\u0646\u062a\u0631\u0646\u064a\u062a "
-            + "\u0648\u064a\u0648\u0646\u064a\u0643\u0648\u062f, \u062d\u064a\u062b \u0633\u062a\u062a\u0645, "
-            + "\u0639\u0644\u0649 \u0627\u0644\u0635\u0639\u064a\u062f\u064a\u0646 "
-            + "\u0627\u0644\u062f\u0648\u0644\u064a \u0648\u0627\u0644\u0645\u062d\u0644\u064a \u0639\u0644\u0649 "
-            + "\u062d\u062f \u0633\u0648\u0627\u0621 \u0645\u0646\u0627\u0642\u0634\u0629 \u0633\u0628\u0644 "
-            + "\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u064a\u0648\u0646\u0643\u0648\u062f  \u0641\u064a "
-            + "\u0627\u0644\u0646\u0638\u0645 \u0627\u0644\u0642\u0627\u0626\u0645\u0629 "
-            + "\u0648\u0641\u064a\u0645\u0627 \u064a\u062e\u0635 "
-            + "\u0627\u0644\u062a\u0637\u0628\u064a\u0642\u0627\u062a "
-            + "\u0627\u0644\u062d\u0627\u0633\u0648\u0628\u064a\u0629, \u0627\u0644\u062e\u0637\u0648\u0637, "
-            + "\u062a\u0635\u0645\u064a\u0645 \u0627\u0644\u0646\u0635\u0648\u0635  "
-            + "\u0648\u0627\u0644\u062d\u0648\u0633\u0628\u0629 \u0645\u062a\u0639\u062f\u062f\u0629 "
-            + "\u0627\u0644\u0644\u063a\u0627\u062a.\n\n";
-    /**
-     * arabic text
-     */
-    public static String ar4 = "ع\u0646\u062f\u0645\u0627 \u064a\u0631\u064a\u062f "
-            + "\u0627\u0644\u0639\u0627\u0644\u0645 \u0623\u0646 \u064a\u062a\u0643\u0644\u0651\u0645, "
-            + "\u0641\u0647\u0648 \u064a\u062a\u062d\u062f\u0651\u062b \u0628\u0644\u063a\u0629 "
-            + "\u064a\u0648\u0646\u064a\u0643\u0648\u062f\n\n";
-    /**
-     * hebrew text
-     */
-    public static String he1 = "\u05d0\u05d9\u05e8\u05d5\u05e4\u05d4, \u05ea\u05d5\u05db\u05e0\u05d4 "
-            + "\u05d5\u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8:\n\n";
-    /**
-     * hebrew text
-     */
-    public static String he2 = "Unicode \u05d9\u05d5\u05e6\u05d0 \u05dc\u05e9\u05d5\u05e7 "
-            + "\u05d4\u05e2\u05d5\u05dc\u05de\u05d9\n\n";
-    /**
-     * hebrew text
-     */
-    public static String he3 = "\u05d4\u05d9\u05e8\u05e9\u05de\u05d5 \u05db\u05e2\u05ea \u05dc\u05db\u05e0\u05e1 "
-            + "Unicode \u05d4\u05d1\u05d9\u05e0\u05dc\u05d0\u05d5\u05de\u05d9 \u05d4\u05e2\u05e9\u05d9\u05e8\u05d9, "
-            + "\u05e9\u05d9\u05d9\u05e2\u05e8\u05da \u05d1\u05d9\u05df "
-            + "\u05d4\u05ea\u05d0\u05e8\u05d9\u05db\u05d9\u05dd 12\u05be10 \u05d1\u05de\u05e8\u05e5 1997, "
-            + "\u05d1\u05de\u05d9\u05d9\u05e0\u05e5 \u05e9\u05d1\u05d2\u05e8\u05de\u05e0\u05d9\u05d4. "
-            + "\u05d1\u05db\u05e0\u05e1 \u05d9\u05e9\u05ea\u05ea\u05e4\u05d5 \u05de\u05d5\u05de\u05d7\u05d9\u05dd "
-            + "\u05de\u05db\u05dc \u05e2\u05e0\u05e4\u05d9 \u05d4\u05ea\u05e2\u05e9\u05d9\u05d9\u05d4 "
-            + "\u05d1\u05e0\u05d5\u05e9\u05d0 \u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8 "
-            + "\u05d4\u05e2\u05d5\u05dc\u05de\u05d9 \u05d5\u05d4\u05beUnicode, \u05d1\u05d4\u05ea\u05d0\u05de\u05d4 "
-            + "\u05dc\u05e9\u05d5\u05e7 \u05d4\u05d1\u05d9\u05e0\u05dc\u05d0\u05d5\u05de\u05d9 "
-            + "\u05d5\u05d4\u05de\u05e7\u05d5\u05de\u05d9, \u05d1\u05d9\u05d9\u05e9\u05d5\u05dd Unicode "
-            + "\u05d1\u05de\u05e2\u05e8\u05db\u05d5\u05ea \u05d4\u05e4\u05e2\u05dc\u05d4 "
-            + "\u05d5\u05d1\u05d9\u05d9\u05e9\u05d5\u05de\u05d9\u05dd, \u05d1\u05d2\u05d5\u05e4\u05e0\u05d9\u05dd, "
-            + "\u05d1\u05e4\u05e8\u05d9\u05e1\u05ea \u05d8\u05e7\u05e1\u05d8 "
-            + "\u05d5\u05d1\u05de\u05d7\u05e9\u05d5\u05d1 \u05e8\u05d1\u05be\u05dc\u05e9\u05d5\u05e0\u05d9.\n\n";
-    /**
-     * hebrew text
-     */
-    public static String he4 = "\u05db\u05d0\u05e9\u05e8 \u05d4\u05e2\u05d5\u05dc\u05dd \u05e8\u05d5\u05e6\u05d4 "
-            + "\u05dc\u05d3\u05d1\u05e8, \u05d4\u05d5\u05d0 \u05de\u05d3\u05d1\u05e8 \u05d1\u05beUnicode\n\n";
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/Vertical.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/Vertical.java
index fae843f05..8847245cd 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/Vertical.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/Vertical.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts.styles;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
@@ -25,6 +22,8 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.VerticalText;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Writing Vertical Text.
@@ -38,7 +37,7 @@ public class Vertical {
             "", "", ""};
 
     static String[] encs = {"UniJIS-UCS2-V", "Identity-V"};
-    
+
     /**
      * @param text the text to convert
      * @return converted text
@@ -47,16 +46,18 @@ public static String convertCid(String text) {
         char[] cid = text.toCharArray();
         for (int k = 0; k < cid.length; ++k) {
             char c = cid[k];
-            if (c == '\n')
+            if (c == '\n') {
                 cid[k] = '\uff00';
-            else
-                cid[k] = (char)(c - ' ' + 8720);
+            } else {
+                cid[k] = (char) (c - ' ' + 8720);
+            }
         }
         return new String(cid);
     }
-    
+
     /**
      * Writing vertical text.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -98,8 +99,7 @@ public static void main(String[] args) {
                 document.newPage();
             }
             document.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/WidthHeight.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/WidthHeight.java
index d44dff9fd..d30b45117 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/WidthHeight.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/WidthHeight.java
@@ -9,45 +9,47 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.fonts.styles;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Asking a font for the width and height of a textstring.
  */
 public class WidthHeight {
+
     /**
      * Width and height of a textstring
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Width and height of a textstring");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2: creation of the writer-object
             PdfWriter.getInstance(document, new FileOutputStream("widthheight.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content to the document
-            BaseFont bfComic = BaseFont.createFont("c:\\windows\\fonts\\comic.ttf", BaseFont.WINANSI, BaseFont.EMBEDDED);
+            BaseFont bfComic = BaseFont.createFont("c:\\windows\\fonts\\comic.ttf", BaseFont.WINANSI,
+                    BaseFont.EMBEDDED);
             Font font = new Font(bfComic, 12);
             String text1 = "quick brown fox jumps";
             String text2 = " over ";
@@ -56,24 +58,28 @@ public static void main(String[] args) {
             document.add(new Paragraph("width: " + bfComic.getWidthPoint(text1, 12)));
             document.add(new Paragraph("ascent: " + bfComic.getAscentPoint(text1, 12)));
             document.add(new Paragraph("descent: " + bfComic.getDescentPoint(text1, 12)));
-            document.add(new Paragraph("height: " + (bfComic.getAscentPoint(text1, 12) - bfComic.getDescentPoint(text1, 12))));
+            document.add(new Paragraph(
+                    "height: " + (bfComic.getAscentPoint(text1, 12) - bfComic.getDescentPoint(text1, 12))));
             document.add(new Paragraph(text2, font));
             document.add(new Paragraph("width: " + bfComic.getWidthPoint(text2, 12)));
             document.add(new Paragraph("ascent: " + bfComic.getAscentPoint(text2, 12)));
             document.add(new Paragraph("descent: " + bfComic.getDescentPoint(text2, 12)));
-            document.add(new Paragraph("height: " + (bfComic.getAscentPoint(text2, 12) - bfComic.getDescentPoint(text2, 12))));
+            document.add(new Paragraph(
+                    "height: " + (bfComic.getAscentPoint(text2, 12) - bfComic.getDescentPoint(text2, 12))));
             document.add(new Paragraph(text3, font));
             document.add(new Paragraph("width: " + bfComic.getWidthPoint(text3, 12)));
             document.add(new Paragraph("ascent: " + bfComic.getAscentPoint(text3, 12)));
             document.add(new Paragraph("descent: " + bfComic.getDescentPoint(text3, 12)));
-            document.add(new Paragraph("height: " + (bfComic.getAscentPoint(text3, 12) - bfComic.getDescentPoint(text3, 12))));
+            document.add(new Paragraph(
+                    "height: " + (bfComic.getAscentPoint(text3, 12) - bfComic.getDescentPoint(text3, 12))));
             document.add(new Paragraph(text1 + text2 + text3, font));
             document.add(new Paragraph("width: " + bfComic.getWidthPoint(text1 + text2 + text3, 12)));
             document.add(new Paragraph("ascent: " + bfComic.getAscentPoint(text1 + text2 + text3, 12)));
             document.add(new Paragraph("descent: " + bfComic.getDescentPoint(text1 + text2 + text3, 12)));
-            document.add(new Paragraph("height: " + (bfComic.getAscentPoint(text1 + text2 + text3, 12) - bfComic.getDescentPoint(text1 + text2 + text3, 12))));
-        }
-        catch(DocumentException | IOException de) {
+            document.add(new Paragraph(
+                    "height: " + (bfComic.getAscentPoint(text1 + text2 + text3, 12) - bfComic.getDescentPoint(
+                            text1 + text2 + text3, 12))));
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/footer/Footer.java b/pdf-toolbox/src/test/java/com/lowagie/examples/footer/Footer.java
index 77e1d3ae7..ecc71ab68 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/footer/Footer.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/footer/Footer.java
@@ -7,18 +7,18 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfWriter;
-
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 
 public class Footer {
 
-/**
- * Create a document with 2 empty pages and custom numbered footer without before part.
-  * @param args
- */
+    /**
+     * Create a document with 2 empty pages and custom numbered footer without before part.
+     *
+     * @param args
+     */
 
-    public static void main(String []args) {
+    public static void main(String[] args) {
         Document document = new Document(PageSize.A4, 10f, 10f, 10f, 10f);
 
         try {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormCheckbox.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormCheckbox.java
index 4a8ff1133..ebf0beab6 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormCheckbox.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormCheckbox.java
@@ -9,15 +9,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
@@ -27,31 +24,36 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfFormField;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates an Acroform with a Checkbox
+ *
  * @author blowagie
  */
 public class FormCheckbox {
+
     /**
      * Generates an Acroform with a Checkbox
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Checkbox");
-        
+
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("checkbox.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfContentByte cb = writer.getDirectContent();
             cb.moveTo(0, 0);
@@ -60,7 +62,7 @@ public static void main(String[] args) {
             PdfAppearance tpOn = cb.createAppearance(20, 20);
             tpOff.rectangle(1, 1, 18, 18);
             tpOff.stroke();
-            
+
             tpOn.setRGBColorFill(255, 128, 128);
             tpOn.rectangle(1, 1, 18, 18);
             tpOn.fillStroke();
@@ -69,7 +71,7 @@ public static void main(String[] args) {
             tpOn.moveTo(1, 19);
             tpOn.lineTo(19, 1);
             tpOn.stroke();
-            
+
             field.setWidget(new Rectangle(100, 700, 120, 720), PdfAnnotation.HIGHLIGHT_INVERT);
             field.setFieldName("Urgent");
             field.setValueAsName("Off");
@@ -77,9 +79,8 @@ public static void main(String[] args) {
             field.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, "Off", tpOff);
             field.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, "On", tpOn);
             writer.addAnnotation(field);
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormCombo.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormCombo.java
index b1d3cc0f5..a19566318 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormCombo.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormCombo.java
@@ -9,15 +9,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
@@ -26,31 +23,36 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfFormField;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates an Acroform with a Combobox
+ *
  * @author blowagie
  */
 public class FormCombo {
+
     /**
      * Generates an Acroform with a Combobox
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Combo");
-        
+
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("combo.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfContentByte cb = writer.getDirectContent();
             cb.moveTo(0, 0);
@@ -60,9 +62,8 @@ public static void main(String[] args) {
             field.setFieldName("ACombo");
             field.setValueAsString("Red");
             writer.addAnnotation(field);
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormList.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormList.java
index 5fdac8a51..d4302f2ac 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormList.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormList.java
@@ -9,16 +9,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
@@ -26,56 +22,61 @@
 import com.lowagie.text.pdf.PdfFormField;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.TextField;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
 
 /**
  * Generates an Acroform with a List
+ *
  * @author blowagie
  */
 public class FormList {
+
     /**
      * Generates an Acroform with a list
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("List");
-        
+
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("d:\\listExamples\\listboxes.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
-            TextField fldDef = new TextField( writer, new Rectangle(100, 700, 180, 760), "AList" );
+            TextField fldDef = new TextField(writer, new Rectangle(100, 700, 180, 760), "AList");
             String[] options = {"Red", "Green", "Blue", "White", "Cyan", "Yellow", "Magenta", "Black"};
-            fldDef.setChoices( options );
+            fldDef.setChoices(options);
 
             // you must turn on multiselect before making multiple selections or they will be discarded.
-            fldDef.setOptions( TextField.MULTISELECT );
+            fldDef.setOptions(TextField.MULTISELECT);
 
-            java.util.List selections = new ArrayList<>( 3 );
+            java.util.List selections = new ArrayList<>(3);
             selections.add(1);
             selections.add(3);
             selections.add(5);
             fldDef.setChoiceSelections(selections); // index into chioces
-            
+
             PdfFormField field = fldDef.getListField();
-            writer.addAnnotation( field );
+            writer.addAnnotation(field);
 
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
         // step 5: we close the document
         document.close();
-        
+
     }
 }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormPushButton.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormPushButton.java
index 1cf38b4e1..bdfea4402 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormPushButton.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormPushButton.java
@@ -9,16 +9,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms;
 
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
@@ -28,31 +24,37 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfFormField;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates an Acroform with a PushButton
+ *
  * @author blowagie
  */
 public class FormPushButton {
+
     /**
      * Generates an Acroform with a PushButton
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("PushButton");
         Document.compress = false;
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("pushbutton.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfFormField pushbutton = PdfFormField.createPushButton(writer);
             PdfContentByte cb = writer.getDirectContent();
@@ -68,16 +70,15 @@ public static void main(String[] args) {
             PdfAppearance down = cb.createAppearance(100, 50);
             down.setColorFill(Color.BLUE);
             down.rectangle(5, 5, 90, 40);
-            down.fill();            
+            down.fill();
             pushbutton.setFieldName("PushMe");
             pushbutton.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, normal);
             pushbutton.setAppearance(PdfAnnotation.APPEARANCE_ROLLOVER, rollover);
             pushbutton.setAppearance(PdfAnnotation.APPEARANCE_DOWN, down);
             pushbutton.setWidget(new Rectangle(100, 700, 200, 750), PdfAnnotation.HIGHLIGHT_PUSH);
             writer.addAnnotation(pushbutton);
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormRadioButton.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormRadioButton.java
index b739005b2..2b566e046 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormRadioButton.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormRadioButton.java
@@ -9,15 +9,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
@@ -27,38 +24,43 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfFormField;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates an Acroform with a RadioButton
+ *
  * @author blowagie
  */
 public class FormRadioButton {
+
     /**
      * Generates an Acroform with a RadioButton
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("RadioButton");
-        
+
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("radiobutton.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfContentByte cb = writer.getDirectContent();
             cb.moveTo(0, 0);
             PdfFormField radio = PdfFormField.createRadioButton(writer, true);
             PdfAppearance tpOff = cb.createAppearance(20, 20);
             PdfAppearance tpOn = cb.createAppearance(20, 20);
-            
+
             tpOff.circle(10, 10, 9);
             tpOff.stroke();
 
@@ -76,25 +78,24 @@ public static void main(String[] args) {
             radio1.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, "Off", tpOff);
             radio1.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, "MasterCard", tpOn);
             radio.addKid(radio1);
-            
+
             PdfFormField radio2 = PdfFormField.createEmpty(writer);
             radio2.setWidget(new Rectangle(100, 660, 120, 680), PdfAnnotation.HIGHLIGHT_INVERT);
             radio2.setAppearanceState("Off");
             radio2.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, "Off", tpOff);
             radio2.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, "Visa", tpOn);
             radio.addKid(radio2);
-            
+
             PdfFormField radio3 = PdfFormField.createEmpty(writer);
             radio3.setWidget(new Rectangle(100, 620, 120, 640), PdfAnnotation.HIGHLIGHT_INVERT);
             radio3.setAppearanceState("Off");
             radio3.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, "Off", tpOff);
             radio3.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, "American", tpOn);
             radio.addKid(radio3);
-            
+
             writer.addAnnotation(radio);
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormSignature.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormSignature.java
index 713cac1fa..309ee84b1 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormSignature.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormSignature.java
@@ -9,53 +9,54 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfAcroForm;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates an Acroform with a Signature
+ *
  * @author blowagie
  */
 public class FormSignature {
+
     /**
      * Generates an Acroform with a Signature
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Signature");
-        
+
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("signature.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfAcroForm acroForm = writer.getAcroForm();
             document.add(new Paragraph("Hello World"));
             acroForm.addSignature("mysig", 73, 705, 149, 759);
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormTextField.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormTextField.java
index 0617465ab..79f19fe6c 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormTextField.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/FormTextField.java
@@ -9,16 +9,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms;
 
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
@@ -31,31 +27,37 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfFormField;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates an Acroform with a TextField
+ *
  * @author blowagie
  */
 public class FormTextField {
+
     /**
      * Generates an Acroform with a TextField
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Textfield");
-        
+
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4);
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("textfield.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             BaseFont helv = BaseFont.createFont("Helvetica", "winansi", false);
             PdfContentByte cb = writer.getDirectContent();
@@ -72,7 +74,7 @@ public static void main(String[] args) {
             field.setBorderStyle(new PdfBorderDictionary(2, PdfBorderDictionary.STYLE_SOLID));
             field.setPage();
             PdfAppearance tp = cb.createAppearance(171, 19);
-            PdfAppearance da = (PdfAppearance)tp.getDuplicate();
+            PdfAppearance da = (PdfAppearance) tp.getDuplicate();
             da.setFontAndSize(helv, fontSize);
             da.setColorFill(textColor);
             field.setDefaultAppearanceString(da);
@@ -91,9 +93,8 @@ public static void main(String[] args) {
             tp.endVariableText();
             field.setAppearance(PdfAnnotation.APPEARANCE_NORMAL, tp);
             writer.addAnnotation(field);
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/ListFields.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/ListFields.java
index c070baacd..1f6ac4970 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/ListFields.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/ListFields.java
@@ -9,19 +9,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
 import com.lowagie.text.pdf.PRAcroForm;
 import com.lowagie.text.pdf.PdfArray;
 import com.lowagie.text.pdf.PdfDictionary;
@@ -30,14 +23,23 @@
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfString;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Demonstrates the use of PageSize.
+ *
  * @author blowagie
  */
 public class ListFields {
+
     /**
      * Creates a PDF document with a certain pagesize
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -68,29 +70,33 @@ public static void main(String[] args) {
                 for (int page = 1; page <= reader.getNumberOfPages(); ++page) {
                     PdfDictionary dPage = reader.getPageN(page);
                     PdfArray annots = dPage.getAsArray(PdfName.ANNOTS);
-                    if (annots == null)
+                    if (annots == null) {
                         continue;
+                    }
                     for (int annotIdx = 0; annotIdx < annots.size(); ++annotIdx) {
                         PdfIndirectReference ref = annots.getAsIndirectObject(annotIdx);
                         PdfDictionary annotDict = annots.getAsDict(annotIdx);
                         PdfName subType = annotDict.getAsName(PdfName.SUBTYPE);
-                        if (subType == null || !subType.equals(PdfName.WIDGET))
+                        if (subType == null || !subType.equals(PdfName.WIDGET)) {
                             continue;
+                        }
                         PdfArray rect = annotDict.getAsArray(PdfName.RECT);
                         StringBuilder fName = new StringBuilder();
                         PRAcroForm.FieldInformation field = null;
                         while (annotDict != null) {
                             PdfString tName = annotDict.getAsString(PdfName.T);
-                            if (tName != null)
+                            if (tName != null) {
                                 fName.insert(0, tName.toString() + ".");
+                            }
                             if (ref != null) {
                                 field = refToField.get(ref.getNumber());
                             }
                             ref = annotDict.getAsIndirectObject(PdfName.PARENT);
                             annotDict = annotDict.getAsDict(PdfName.PARENT);
                         }
-                        if (fName.toString().endsWith("."))
+                        if (fName.toString().endsWith(".")) {
                             fName = new StringBuilder(fName.substring(0, fName.length() - 1));
+                        }
                         stream.println("page " + page + ", name - " + fName);
                         list.listAnyObject(rect);
                         if (field != null) {
@@ -105,8 +111,7 @@ public static void main(String[] args) {
             }
             stream.flush();
             stream.close();
-        }
-        catch(IOException ioe) {
+        } catch (IOException ioe) {
             System.err.println(ioe.getMessage());
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/SimpleRegistrationForm.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/SimpleRegistrationForm.java
index e810b39fe..79c7d69db 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/SimpleRegistrationForm.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/SimpleRegistrationForm.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.forms;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Rectangle;
@@ -26,24 +23,28 @@
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.TextField;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * General example using TableEvents and CellEvents.
  */
 public class SimpleRegistrationForm implements PdfPCellEvent {
-    
-    /** the writer with the acroform */
+
+    /**
+     * the writer with the acroform
+     */
     private PdfWriter writer;
 
-    /** the current fieldname */
+    /**
+     * the current fieldname
+     */
     private String fieldname = "NoName";
 
     /**
      * Construct an implementation of PdfPCellEvent.
-     * 
-     * @param writer
-     *            the writer with the Acroform that will have to hold the
-     *            fields.
+     *
+     * @param writer the writer with the Acroform that will have to hold the fields.
      */
     public SimpleRegistrationForm(PdfWriter writer) {
         this.writer = writer;
@@ -51,13 +52,9 @@ public SimpleRegistrationForm(PdfWriter writer) {
 
     /**
      * Construct an implementation of PdfPCellEvent.
-     * 
-     * @param writer
-     *            the writer with the Acroform that will have to hold the
-     *            fields.
-     * @param fieldname
-     *            the name of the TextField
-     *  
+     *
+     * @param writer    the writer with the Acroform that will have to hold the fields.
+     * @param fieldname the name of the TextField
      */
     public SimpleRegistrationForm(PdfWriter writer, String fieldname) {
         this.writer = writer;
@@ -65,25 +62,8 @@ public SimpleRegistrationForm(PdfWriter writer, String fieldname) {
     }
 
     /**
-     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell,
-     *      com.lowagie.text.Rectangle, com.lowagie.text.pdf.PdfContentByte[])
-     */
-    public void cellLayout(PdfPCell cell, Rectangle position,
-            PdfContentByte[] canvases) {
-        TextField tf = new TextField(writer, position, fieldname);
-        tf.setFontSize(12);
-        try {
-            PdfFormField field = tf.getTextField();
-            writer.addAnnotation(field);
-        } catch (IOException | DocumentException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Example originally written by Wendy Smoak to generate a Table with
-     * 'floating boxes'. Adapted by Bruno Lowagie.
-     * 
+     * Example originally written by Wendy Smoak to generate a Table with 'floating boxes'. Adapted by Bruno Lowagie.
+     *
      * @param args the command line arguments
      */
     public static void main(String[] args) {
@@ -131,4 +111,20 @@ public static void main(String[] args) {
         // step 5
         document.close();
     }
+
+    /**
+     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell, com.lowagie.text.Rectangle,
+     * com.lowagie.text.pdf.PdfContentByte[])
+     */
+    public void cellLayout(PdfPCell cell, Rectangle position,
+            PdfContentByte[] canvases) {
+        TextField tf = new TextField(writer, position, fieldname);
+        tf.setFontSize(12);
+        try {
+            PdfFormField field = tf.getTextField();
+            writer.addAnnotation(field);
+        } catch (IOException | DocumentException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/TextFields.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/TextFields.java
index 4004ce524..be57fe311 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/TextFields.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/TextFields.java
@@ -9,16 +9,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms;
 
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -28,31 +24,37 @@
 import com.lowagie.text.pdf.PdfFormField;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.TextField;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates the use of PageSize.
+ *
  * @author blowagie
  */
 public class TextFields {
+
     /**
      * Creates a PDF document with a certain pagesize
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Textfields");
-        
+
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4.rotate());
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("TextFields.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             TextField tf = new TextField(writer, new Rectangle(100, 300, 100 + 100, 300 + 50), "Dickens");
             tf.setBackgroundColor(Color.RED);
@@ -65,7 +67,7 @@ public static void main(String[] args) {
             tf.setRotation(90);
             PdfFormField field = tf.getTextField();
             writer.addAnnotation(field);
-            
+
             tf = new TextField(writer, new Rectangle(250, 300, 250 + 100, 300 + 20), "Combos");
             tf.setBackgroundColor(Color.RED);
             tf.setBorderColor(Color.BLUE);
@@ -78,7 +80,7 @@ public static void main(String[] args) {
             tf.setRotation(90);
             field = tf.getComboField();
             writer.addAnnotation(field);
-            
+
             tf = new TextField(writer, new Rectangle(400, 300, 400 + 100, 300 + 50), "Lists");
             tf.setBackgroundColor(Color.YELLOW);
             tf.setBorderColor(Color.RED);
@@ -90,9 +92,8 @@ public static void main(String[] args) {
             tf.setChoiceSelection(4);
             field = tf.getListField();
             writer.addAnnotation(field);
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/create/StudentCard.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/create/StudentCard.java
index c8467bbff..b577efe67 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/create/StudentCard.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/create/StudentCard.java
@@ -9,16 +9,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms.create;
 
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -32,33 +28,39 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates a StudentCard
+ *
  * @author blowagie
  */
 public class StudentCard {
+
     /**
      * Generates a StudentCard
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("StudentCard");
-        
+
         // step 1: creation of a document-object
         Rectangle rect = new Rectangle(243, 153);
         rect.setBackgroundColor(new Color(0xFF, 0xFF, 0xCC));
         Document document = new Document(rect, 10, 10, 10, 10);
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("studentcard.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             Font font = FontFactory.getFont(FontFactory.HELVETICA, 14, Font.BOLD, Color.BLUE);
             Paragraph p = new Paragraph("Ghent University", font);
@@ -69,7 +71,7 @@ public static void main(String[] args) {
             PdfPTable outertable = new PdfPTable(3);
             outertable.setTotalWidth(200);
             outertable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
-            float[] outer = { 60, 25, 15 };
+            float[] outer = {60, 25, 15};
             outertable.setWidths(outer);
             PdfPTable innertable = new PdfPTable(2);
             float[] inner = {35, 65};
@@ -88,13 +90,12 @@ public static void main(String[] args) {
             BarcodeEAN codeEAN = new BarcodeEAN();
             codeEAN.setCodeType(Barcode.EAN13);
             codeEAN.setCode("8010012529736");
-            Image imageEAN = codeEAN.createImageWithBarcode(cb, null, null);            
+            Image imageEAN = codeEAN.createImageWithBarcode(cb, null, null);
             imageEAN.setRotationDegrees(90);
             outertable.getDefaultCell().setBackgroundColor(Color.WHITE);
             outertable.addCell(imageEAN);
             outertable.writeSelectedRows(0, -1, 20, 100, writer.getDirectContent());
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/create/StudentCardForm.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/create/StudentCardForm.java
index 7db07e3c4..848380e74 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/create/StudentCardForm.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/create/StudentCardForm.java
@@ -9,16 +9,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.forms.create;
 
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -33,57 +29,53 @@
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.TextField;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates a StudentCard as a form
+ *
  * @author blowagie
  */
 public class StudentCardForm implements PdfPCellEvent {
-    
-    /** the writer with the acroform */
+
+    /**
+     * the writer with the acroform
+     */
     private PdfFormField field;
 
     /**
      * Construct an implementation of PdfPCellEvent.
-     * 
-     * @param field
-     *            a form field
-     *  
+     *
+     * @param field a form field
      */
     public StudentCardForm(PdfFormField field) {
         this.field = field;
     }
 
-    /**
-     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell,
-     *      com.lowagie.text.Rectangle, com.lowagie.text.pdf.PdfContentByte[])
-     */
-    public void cellLayout(PdfPCell cell, Rectangle position,
-            PdfContentByte[] canvases) {
-        field.setWidget(position, null);
-    }
-    
     /**
      * Generates a StudentCard as a form
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("StudentCard as a form");
-        
+
         // step 1: creation of a document-object
         Rectangle rect = new Rectangle(243, 153);
         rect.setBackgroundColor(new Color(0xFF, 0xFF, 0xCC));
         Document document = new Document(rect, 10, 10, 10, 10);
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("studentcardform.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             Font font = FontFactory.getFont(FontFactory.HELVETICA, 14, Font.BOLD, Color.BLUE);
             Paragraph p = new Paragraph("Ghent University", font);
@@ -93,7 +85,7 @@ public static void main(String[] args) {
             PdfPTable outertable = new PdfPTable(3);
             outertable.setTotalWidth(200);
             outertable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
-            float[] outer = { 60, 25, 15 };
+            float[] outer = {60, 25, 15};
             outertable.setWidths(outer);
             PdfPTable innertable = new PdfPTable(2);
             float[] inner = {35, 65};
@@ -154,12 +146,20 @@ public static void main(String[] args) {
             writer.addAnnotation(option);
             writer.addAnnotation(picture);
             writer.addAnnotation(barcode);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
         // step 5: we close the document
         document.close();
     }
+
+    /**
+     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell, com.lowagie.text.Rectangle,
+     * com.lowagie.text.pdf.PdfContentByte[])
+     */
+    public void cellLayout(PdfPCell cell, Rectangle position,
+            PdfContentByte[] canvases) {
+        field.setWidget(position, null);
+    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/FdfExample.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/FdfExample.java
index 5d68dd511..1f46fd2e2 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/FdfExample.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/FdfExample.java
@@ -9,25 +9,25 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.forms.fill;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.pdf.AcroFields;
 import com.lowagie.text.pdf.FdfReader;
 import com.lowagie.text.pdf.FdfWriter;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
+import java.io.FileOutputStream;
 
 /**
- * How to create an FDF file.
- * How to merge an FDF file with a PDF form.
+ * How to create an FDF file. How to merge an FDF file with a PDF form.
  */
 public class FdfExample {
+
     /**
      * Writes an FDF file and merges it with a PDF form.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -48,10 +48,9 @@ public static void main(String[] args) {
             AcroFields form = stamp.getAcroFields();
             form.setFields(fdfreader);
             stamp.close();
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        
+
     }
 }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/Register.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/Register.java
index cc516a163..5c3aad2d4 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/Register.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/Register.java
@@ -9,22 +9,23 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.forms.fill;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.pdf.AcroFields;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
+import java.io.FileOutputStream;
 
 /**
  * Fill in a simple registration form.
  */
 public class Register {
+
     /**
      * Reads a form and fills in the fields.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -50,8 +51,7 @@ public static void main(String[] args) {
             form2.setField("email", "bruno@lowagie.com");
             stamp2.setFormFlattening(true);
             stamp2.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/XfdfExample.java b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/XfdfExample.java
index b8e5e02df..efbd0a6c9 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/XfdfExample.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/forms/fill/XfdfExample.java
@@ -9,23 +9,24 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.forms.fill;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.pdf.AcroFields;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
 import com.lowagie.text.pdf.XfdfReader;
+import java.io.FileOutputStream;
 
 /**
  * How to merge an XFDF file with a PDF form.
  */
 public class XfdfExample {
+
     /**
      * Merges an XFDF file with a PDF form.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -37,10 +38,9 @@ public static void main(String[] args) {
             AcroFields form = stamp.getAcroFields();
             form.setFields(fdfreader);
             stamp.close();
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        
+
     }
 }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/CustomPageSize.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/CustomPageSize.java
index c21d6adb7..41e8d1ed5 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/CustomPageSize.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/CustomPageSize.java
@@ -9,50 +9,52 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates the use of PageSize.
+ *
  * @author blowagie
  */
 public class CustomPageSize {
+
     /**
      * Creates a PDF document with a certain pagesize
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Custom PageSize and backgroundcolor");
-        
+
         // step 1: creation of a document-object
         Rectangle pageSize = new Rectangle(216, 720);
         pageSize.setBackgroundColor(new java.awt.Color(0xFF, 0xFF, 0xDE));
         Document document = new Document(pageSize);
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            
+
             PdfWriter.getInstance(document, new FileOutputStream("CustomPageSize.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add some paragraphs to the document
             document.add(new Paragraph("The size of this page is 216x720 points."));
             document.add(new Paragraph("216pt / 72 points per inch = 3 inch"));
@@ -63,9 +65,8 @@ public static void main(String[] args) {
             document.add(new Paragraph("The size of this page is 7.62x25.4 cm."));
             document.add(new Paragraph("The backgroundcolor of the Rectangle used for this PageSize, is #FFFFDE."));
             document.add(new Paragraph("That's why the background of this document is yellowish..."));
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/DefaultPageSize.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/DefaultPageSize.java
index 95c2d1aeb..5adc13600 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/DefaultPageSize.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/DefaultPageSize.java
@@ -9,48 +9,50 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates the use of PageSize.
+ *
  * @author blowagie
  */
 public class DefaultPageSize {
+
     /**
      * Creates a PDF document with a certain pagesize
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("The default PageSize and some other standard sizes");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            
+
             PdfWriter.getInstance(document, new FileOutputStream("DefaultPageSize.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add some paragraphs to the document
             document.add(new Paragraph("The default PageSize is DIN A4."));
             document.setPageSize(PageSize.A3);
@@ -81,9 +83,8 @@ public static void main(String[] args) {
             document.newPage();
             document.add(new Paragraph("This PageSize is LETTER."));
             document.add(new Paragraph("A lot of other standard PageSizes are available."));
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloEncrypted.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloEncrypted.java
index b207a81fd..bb97d4a4a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloEncrypted.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloEncrypted.java
@@ -9,31 +9,29 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates an encrypted 'Hello World' PDF file.
- * 
+ *
  * @author blowagie
  */
 
 public class HelloEncrypted {
 
     /**
-     * Generates a PDF file with the text 'Hello World'
-     * that is protected with the password 'Hello'.
-     * 
+     * Generates a PDF file with the text 'Hello World' that is protected with the password 'Hello'.
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -48,7 +46,8 @@ public static void main(String[] args) {
             // and directs a PDF-stream to a file
             PdfWriter writer = PdfWriter.getInstance(document,
                     new FileOutputStream("HelloEncrypted.pdf"));
-            writer.setEncryption("Hello".getBytes(), "World".getBytes(), PdfWriter.ALLOW_COPY | PdfWriter.ALLOW_PRINTING, PdfWriter.STANDARD_ENCRYPTION_128);
+            writer.setEncryption("Hello".getBytes(), "World".getBytes(),
+                    PdfWriter.ALLOW_COPY | PdfWriter.ALLOW_PRINTING, PdfWriter.STANDARD_ENCRYPTION_128);
             // step 3: we open the document
             document.open();
             // step 4: we add a paragraph to the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloSystemOut.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloSystemOut.java
index f054a1a12..e836938aa 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloSystemOut.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloSystemOut.java
@@ -9,22 +9,21 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates a simple 'Hello World' PDF file.
- * 
+ *
  * @author blowagie
  */
 
@@ -32,7 +31,7 @@ public class HelloSystemOut {
 
     /**
      * Generates a PDF file with the text 'Hello World'
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorld.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorld.java
index 5fe79821b..c2a56fa1c 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorld.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorld.java
@@ -9,24 +9,23 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfName;
 import com.lowagie.text.pdf.PdfString;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates a simple 'Hello World' PDF file.
- * 
+ *
  * @author blowagie
  */
 
@@ -34,7 +33,7 @@ public class HelloWorld {
 
     /**
      * Generates a PDF file with the text 'Hello World'
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorldMeta.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorldMeta.java
index da7f5d95f..da769f1c6 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorldMeta.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorldMeta.java
@@ -9,22 +9,21 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates a simple PDF file with metadata.
- * 
+ *
  * @author blowagie
  */
 
@@ -32,7 +31,7 @@ public class HelloWorldMeta {
 
     /**
      * Generates a PDF file with metadata
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorldPdf.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorldPdf.java
index 41f418ff8..58af6173b 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorldPdf.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/HelloWorldPdf.java
@@ -9,25 +9,24 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general;
 
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 import com.lowagie.text.Anchor;
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
-import org.junit.jupiter.api.Test;
-
 import java.io.ByteArrayOutputStream;
-
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  * Generates a simple 'Hello World' PDF.
- * 
+ *
  * @author blowagie
  */
 
@@ -55,9 +54,9 @@ void testHelloWorld() throws Exception {
             pdfRef.setReference("./HelloWorldPdf.pdf");
             Anchor rtfRef = new Anchor("see Hello World in RTF.");
             rtfRef.setReference("./HelloWorldRtf.rtf");
-            
+
             // we add the references, but only to the HTML page:
-            
+
             pdf.pause();
             document.add(pdfRef);
             document.add(Chunk.NEWLINE);
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/LandscapePortrait.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/LandscapePortrait.java
index 50cc4fc5d..d8d00c3c8 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/LandscapePortrait.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/LandscapePortrait.java
@@ -9,55 +9,57 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates the creating PDF in portrait/landscape.
+ *
  * @author blowagie
  */
 public class LandscapePortrait {
+
     /**
      * Creates a PDF document with pages in portrait/landscape.
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Documents in Landscape and Portrait format");
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4.rotate());
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            
+
             PdfWriter.getInstance(document, new FileOutputStream("LandscapePortrait.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add some content
-            document.add(new Paragraph("To create a document in landscape format, just make the height smaller than the width. For instance by rotating the PageSize Rectangle: PageSize.A4.rotate()"));
+            document.add(new Paragraph(
+                    "To create a document in landscape format, just make the height smaller than the width. For instance by rotating the PageSize Rectangle: PageSize.A4.rotate()"));
             document.setPageSize(PageSize.A4);
             document.newPage();
             document.add(new Paragraph("This is portrait again"));
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/Margins.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/Margins.java
index 05edf04c8..d580d0074 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/Margins.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/Margins.java
@@ -9,50 +9,53 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates the use of margins.
+ *
  * @author blowagie
  */
 public class Margins {
+
     /**
      * Creates a PDF document with different pages that have different margins.
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
-        System.out.println("Document margins");        
+
+        System.out.println("Document margins");
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A5, 36, 72, 108, 180);
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            
+
             PdfWriter.getInstance(document, new FileOutputStream("Margins.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
-            document.add(new Paragraph("The left margin of this document is 36pt (0.5 inch); the right margin 72pt (1 inch); the top margin 108pt (1.5 inch); the bottom margin 180pt (2.5 inch). "));
+            document.add(new Paragraph(
+                    "The left margin of this document is 36pt (0.5 inch); the right margin 72pt (1 inch); the top margin 108pt (1.5 inch); the bottom margin 180pt (2.5 inch). "));
             Paragraph paragraph = new Paragraph();
             paragraph.setAlignment(Element.ALIGN_JUSTIFIED);
             for (int i = 0; i < 20; i++) {
@@ -65,8 +68,7 @@ public static void main(String[] args) {
             document.setMarginMirroring(true);
             document.add(new Paragraph("Starting on the next page, the margins will be mirrored."));
             document.add(paragraph);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/AddWatermarkPageNumbers.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/AddWatermarkPageNumbers.java
index 621361235..32c066008 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/AddWatermarkPageNumbers.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/AddWatermarkPageNumbers.java
@@ -9,14 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.general.copystamp;
 
-import java.io.FileOutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
 import com.lowagie.text.Element;
 import com.lowagie.text.Image;
 import com.lowagie.text.PageSize;
@@ -24,13 +20,18 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
+import java.io.FileOutputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Reads the pages of an existing PDF file, adds pagenumbers and a watermark.
  */
 public class AddWatermarkPageNumbers {
+
     /**
      * Reads the pages of an existing PDF file, adds pagenumbers and a watermark.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -80,8 +81,7 @@ public static void main(String[] args) {
             under.addTemplate(stamp.getImportedPage(reader2, 3), 1, 0, 0, 1, 0, 0);
             // closing PdfStamper will generate the new PDF file
             stamp.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/Concatenate.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/Concatenate.java
index 6b3318b0a..22fceb0df 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/Concatenate.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/Concatenate.java
@@ -13,21 +13,21 @@
 
 /**
  * This class demonstrates copying a PDF file using iText.
+ *
  * @author Mark Thompson
  */
 package com.lowagie.examples.general.copystamp;
 
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.pdf.PRAcroForm;
 import com.lowagie.text.pdf.PdfCopy;
 import com.lowagie.text.pdf.PdfImportedPage;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.SimpleBookmark;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Tool that can be used to concatenate existing PDF files.
@@ -35,24 +35,23 @@
 public class Concatenate {
 
     /**
-     * This class can be used to concatenate existing PDF files.
-     * (This was an example known as PdfCopy.java)
+     * This class can be used to concatenate existing PDF files. (This was an example known as PdfCopy.java)
+     *
      * @param args the command line arguments
      */
     public static void main(String[] args) {
         if (args.length < 2) {
             System.err.println("arguments: file1 [file2 ...] destfile");
-        }
-        else {
+        } else {
             System.out.println("PdfCopy example");
             try {
                 int pageOffset = 0;
                 List> master = new ArrayList<>();
                 int f = 0;
-                String outFile = args[args.length-1];
+                String outFile = args[args.length - 1];
                 Document document = null;
-                PdfCopy  writer = null;
-                while (f < args.length-1) {
+                PdfCopy writer = null;
+                while (f < args.length - 1) {
                     // we create a reader for a certain document
                     PdfReader reader = new PdfReader(args[f]);
                     reader.consolidateNamedDestinations();
@@ -60,12 +59,13 @@ public static void main(String[] args) {
                     int n = reader.getNumberOfPages();
                     List> bookmarks = SimpleBookmark.getBookmarkList(reader);
                     if (bookmarks != null) {
-                        if (pageOffset != 0)
+                        if (pageOffset != 0) {
                             SimpleBookmark.shiftPageNumbersInRange(bookmarks, pageOffset, null);
+                        }
                         master.addAll(bookmarks);
                     }
                     pageOffset += n;
-                    
+
                     if (f == 0) {
                         // step 1: creation of a document-object
                         document = new Document(reader.getPageSizeWithRotation(1));
@@ -82,16 +82,17 @@ public static void main(String[] args) {
                         writer.addPage(page);
                     }
                     PRAcroForm form = reader.getAcroForm();
-                    if (form != null)
+                    if (form != null) {
                         writer.copyAcroForm(reader);
+                    }
                     f++;
                 }
-                if (!master.isEmpty())
+                if (!master.isEmpty()) {
                     writer.setOutlines(master);
+                }
                 // step 5: we close the document
                 document.close();
-            }
-            catch(Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/ConcatenateForms.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/ConcatenateForms.java
index da7d600af..f73d512ce 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/ConcatenateForms.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/ConcatenateForms.java
@@ -12,10 +12,9 @@
  */
 package com.lowagie.examples.general.copystamp;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.pdf.PdfCopyFields;
 import com.lowagie.text.pdf.PdfReader;
+import java.io.FileOutputStream;
 
 /**
  * Concatenates 2 PDF files with forms. The resulting PDF has 1 merged AcroForm.
@@ -24,7 +23,8 @@ public class ConcatenateForms {
 
     /**
      * Concatenates 2 PDF files with forms. The resulting PDF has 1 merged AcroForm.
-     * @param args  no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
         try {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/EncryptorExample.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/EncryptorExample.java
index 3fece8dc6..c0c7702b2 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/EncryptorExample.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/EncryptorExample.java
@@ -9,15 +9,14 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.general.copystamp;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.pdf.PdfEncryptor;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Encrypts an existing PDF file.
@@ -26,6 +25,7 @@ public class EncryptorExample {
 
     /**
      * Reads and encrypts an existing PDF file.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -38,8 +38,7 @@ public static void main(String[] args) {
                     "World".getBytes(),
                     PdfWriter.ALLOW_PRINTING | PdfWriter.ALLOW_COPY,
                     false);
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/Register.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/Register.java
index b35545832..b28e2fa3a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/Register.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/Register.java
@@ -9,22 +9,23 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.general.copystamp;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.pdf.AcroFields;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
+import java.io.FileOutputStream;
 
 /**
  * Fill in a simple registration form.
  */
 public class Register {
+
     /**
      * Reads a form and fills in the fields.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -50,8 +51,7 @@ public static void main(String[] args) {
             form2.setField("email", "bruno@lowagie.com");
             stamp2.setFormFlattening(true);
             stamp2.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/TwoOnOne.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/TwoOnOne.java
index ccb64c5d8..dafe73307 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/TwoOnOne.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/copystamp/TwoOnOne.java
@@ -9,12 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.general.copystamp;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.BaseFont;
@@ -22,15 +20,16 @@
 import com.lowagie.text.pdf.PdfImportedPage;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
- * Reads the pages of an existing PDF file and puts 2 pages from the existing doc
- * into one of the new doc.
+ * Reads the pages of an existing PDF file and puts 2 pages from the existing doc into one of the new doc.
  */
 public class TwoOnOne {
+
     /**
-     * Reads the pages of an existing PDF file and puts 2 pages from the existing doc
-     * into one of the new doc.
+     * Reads the pages of an existing PDF file and puts 2 pages from the existing doc into one of the new doc.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -44,7 +43,7 @@ public static void main(String[] args) {
             Rectangle psize = reader.getPageSize(1);
             float width = psize.getHeight();
             float height = psize.getWidth();
-            
+
             // step 1: creation of a document-object
             Document document = new Document(new Rectangle(width, height));
             // step 2: we create a writer that listens to the document
@@ -69,13 +68,13 @@ public static void main(String[] args) {
                 BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
                 cb.beginText();
                 cb.setFontAndSize(bf, 14);
-                cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "page " + p + " of " + ((n / 2) + (n % 2 > 0? 1 : 0)), width / 2, 40, 0);
+                cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "page " + p + " of " + ((n / 2) + (n % 2 > 0 ? 1 : 0)),
+                        width / 2, 40, 0);
                 cb.endText();
             }
             // step 5: we close the document
             document.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/Measurements.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/Measurements.java
index bf682029d..a8ad8a295 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/Measurements.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/Measurements.java
@@ -9,48 +9,50 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general.faq;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates the measurement system.
+ *
  * @author blowagie
  */
 public class Measurements {
+
     /**
      * Creates a PDF document explaining the measurement system.
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
-        System.out.println("Measurements");        
+
+        System.out.println("Measurements");
         // step 1: creation of a document-object
         Rectangle pageSize = new Rectangle(288, 720);
         Document document = new Document(pageSize, 36, 18, 72, 72);
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            
+
             PdfWriter.getInstance(document, new FileOutputStream("Measurements.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             document.add(new Paragraph("The size of this page is 288x720 points."));
             document.add(new Paragraph("288pt / 72 points per inch = 4 inch"));
@@ -62,8 +64,7 @@ public static void main(String[] args) {
             document.add(new Paragraph("The left border is 36pt or 0.5 inch or 1.27 cm"));
             document.add(new Paragraph("The right border is 18pt or 0.25 inch or 0.63 cm."));
             document.add(new Paragraph("The top and bottom border are 72pt or 1 inch or 2.54 cm."));
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/NewPage.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/NewPage.java
index df97999d9..6e9d556f0 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/NewPage.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/NewPage.java
@@ -9,54 +9,57 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general.faq;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates the use of newPage.
+ *
  * @author blowagie
  */
 public class NewPage {
+
     /**
      * Creates a PDF document with different pages.
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
-        System.out.println("Using newPage()");        
+
+        System.out.println("Using newPage()");
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            
+
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("NewPage.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             document.add(new Paragraph("This is the first page."));
             document.newPage();
             document.add(new Paragraph("This is a new page"));
             document.newPage();
             document.newPage();
-            document.add(new Paragraph("We invoked new page twice, yet there was no blank page added. Between the second page and this one. This is normal behaviour."));
+            document.add(new Paragraph(
+                    "We invoked new page twice, yet there was no blank page added. Between the second page and this one. This is normal behaviour."));
             document.newPage();
             writer.setPageEmpty(false);
             document.newPage();
@@ -67,8 +70,7 @@ public static void main(String[] args) {
             document.add(new Paragraph("You can also add something invisible if you want a blank page."));
             document.add(Chunk.NEXTPAGE);
             document.add(new Paragraph("Using Chunk.NEXTPAGE also jumps to the next page"));
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/OpenPdfVersion.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/OpenPdfVersion.java
index 1887b6795..56f1abb9f 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/OpenPdfVersion.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/OpenPdfVersion.java
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general.faq;
@@ -46,14 +46,13 @@ public static void main(String[] args) {
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter.getInstance(document, new FileOutputStream("version.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             document.add(new Paragraph("This page was made using " + Document.getVersion()));
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/PdfVersion.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/PdfVersion.java
index 24f5b5646..05bddbbe5 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/PdfVersion.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/faq/PdfVersion.java
@@ -9,37 +9,39 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general.faq;
 
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates the use of setPdfVersion.
+ *
  * @author blowagie
  */
 public class PdfVersion {
+
     /**
      * Creates a PDF document and shows the PDF version.
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
-        
-        System.out.println("PDF version");        
+
+        System.out.println("PDF version");
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
@@ -47,11 +49,10 @@ public static void main(String[] args) {
             writer.setPdfVersion(PdfWriter.VERSION_1_2);
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             document.add(new Paragraph("This is a PDF-1.2 document"));
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/read/Info.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/read/Info.java
index dd47fc668..8da095e75 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/read/Info.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/read/Info.java
@@ -9,26 +9,27 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.general.read;
 
+import com.lowagie.text.pdf.PdfReader;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 
-import com.lowagie.text.pdf.PdfReader;
-
 /**
  * Getting information from a PDF file.
  */
 public class Info {
+
     /**
      * Getting information from a PDF file
-     * @param args     the names of paths to PDF files.
+     *
+     * @param args the names of paths to PDF files.
      */
     public static void main(String[] args) {
         try {
-        BufferedWriter out = new BufferedWriter(new FileWriter("info.txt"));
+            BufferedWriter out = new BufferedWriter(new FileWriter("info.txt"));
             for (String arg : args) {
                 PdfReader r = new PdfReader(arg);
                 out.write(arg);
@@ -36,10 +37,9 @@ public static void main(String[] args) {
                 out.write(r.getInfo().toString());
                 out.write("\r\n------------------------------------\r\n");
             }
-        out.flush();
-        out.close();
-        }
-        catch(Exception e) {
+            out.flush();
+            out.close();
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/read/ReadEncrypted.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/read/ReadEncrypted.java
index 81f0c5ac3..05f87a171 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/read/ReadEncrypted.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/read/ReadEncrypted.java
@@ -9,15 +9,14 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.general.read;
 
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
 
 /**
  * Reading an encrypted PDF file (you need the owner password to do this).
@@ -26,34 +25,33 @@ public class ReadEncrypted {
 
     /**
      * Reads an encrypted PDF document.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
         try {
             BufferedWriter out = new BufferedWriter(new FileWriter(
                     "info_encrypted.txt"));
             PdfReader r = new PdfReader("HelloEncrypted.pdf", "Hello"
-                        .getBytes());
+                    .getBytes());
             out.write(r.getInfo().toString());
             out.write("\r\n");
             int permissions = r.getPermissions();
-            out.write("Printing allowed: " + ((PdfWriter.ALLOW_PRINTING & permissions) > 0) );
+            out.write("Printing allowed: " + ((PdfWriter.ALLOW_PRINTING & permissions) > 0));
             out.write("\r\n");
-            out.write("Modifying contents allowed: " + ((PdfWriter.ALLOW_MODIFY_CONTENTS & permissions) > 0) );
+            out.write("Modifying contents allowed: " + ((PdfWriter.ALLOW_MODIFY_CONTENTS & permissions) > 0));
             out.write("\r\n");
-            out.write("Copying allowed: " + ((PdfWriter.ALLOW_COPY & permissions) > 0) );
+            out.write("Copying allowed: " + ((PdfWriter.ALLOW_COPY & permissions) > 0));
             out.write("\r\n");
-            out.write("Modifying annotations allowed: " + ((PdfWriter.ALLOW_MODIFY_ANNOTATIONS & permissions) > 0) );
+            out.write("Modifying annotations allowed: " + ((PdfWriter.ALLOW_MODIFY_ANNOTATIONS & permissions) > 0));
             out.write("\r\n");
-            out.write("Fill in allowed: " + ((PdfWriter.ALLOW_FILL_IN & permissions) > 0) );
+            out.write("Fill in allowed: " + ((PdfWriter.ALLOW_FILL_IN & permissions) > 0));
             out.write("\r\n");
-            out.write("Screen Readers allowed: " + ((PdfWriter.ALLOW_SCREENREADERS & permissions) > 0) );
+            out.write("Screen Readers allowed: " + ((PdfWriter.ALLOW_SCREENREADERS & permissions) > 0));
             out.write("\r\n");
-            out.write("Assembly allowed: " + ((PdfWriter.ALLOW_ASSEMBLY & permissions) > 0) );
+            out.write("Assembly allowed: " + ((PdfWriter.ALLOW_ASSEMBLY & permissions) > 0));
             out.write("\r\n");
-            out.write("Degraded printing allowed: " + ((PdfWriter.ALLOW_DEGRADED_PRINTING & permissions) > 0) );
+            out.write("Degraded printing allowed: " + ((PdfWriter.ALLOW_DEGRADED_PRINTING & permissions) > 0));
             out.write("\r\n");
             out.flush();
             out.close();
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/OutSimplePdf.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/OutSimplePdf.java
index ad417ea3e..45b3b8513 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/OutSimplePdf.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/OutSimplePdf.java
@@ -9,26 +9,26 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general.webapp;
 
+import com.lowagie.text.Chunk;
+import com.lowagie.text.Document;
+import com.lowagie.text.Paragraph;
+import com.lowagie.text.pdf.PdfWriter;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 
-import com.lowagie.text.Chunk;
-import com.lowagie.text.Document;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfWriter;
-
 /**
  * Hello World example as a Servlet.
  */
 public class OutSimplePdf extends HttpServlet {
+
     private static final long serialVersionUID = 2788260006560387781L;
 
     @Override
@@ -38,22 +38,24 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) {
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) {
-            makePdf(request, response, "POST");
+        makePdf(request, response, "POST");
     }
+
     /**
      * Performs the action: generate a PDF from a GET or POST.
-     * 
-     * @param request    the Servlets request object
-     * @param response    the Servlets request object
-     * @param methodGetPost    the method that was used in the form
+     *
+     * @param request       the Servlets request object
+     * @param response      the Servlets request object
+     * @param methodGetPost the method that was used in the form
      */
     public void makePdf(HttpServletRequest request, HttpServletResponse response, String methodGetPost) {
         try {
 
             // take the message from the URL or create default message
             String msg = request.getParameter("msg");
-            if (msg == null || msg.trim().length() <= 0)
+            if (msg == null || msg.trim().length() <= 0) {
                 msg = "[ specify a message in the 'msg' argument on the URL ]";
+            }
 
             // create simple doc and write to a ByteArrayOutputStream
             Document document = new Document();
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/ProgressServlet.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/ProgressServlet.java
index 1537ee42c..dd710a1a6 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/ProgressServlet.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/ProgressServlet.java
@@ -36,70 +36,6 @@ public class ProgressServlet extends HttpServlet {
 
     private static final long serialVersionUID = 6272312661092621179L;
 
-    /**
-     * This class will keep a Pdf file
-     *
-     * @author blowagie
-     */
-    public static class MyPdf implements Runnable {
-
-        /**
-         * the ByteArrayOutputStream that holds the PDF data.
-         */
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        /**
-         * the percentage of the PDF file that is finished
-         */
-        int p = 0;
-
-        @Override
-        public void run() {
-            // step 1
-            Document doc = new Document();
-            try {
-                // step 2
-                PdfWriter.getInstance(doc, baos);
-                // step 3
-                doc.open();
-                // step 4
-                while (p < 99) {
-                    doc.add(new Paragraph(new Date().toString()));
-                    // we slow the process down deliberately
-                    Thread.sleep(500);
-                    p++;
-                }
-            } catch (DocumentException | InterruptedException e) {
-                p = -1;
-                e.printStackTrace();
-            }
-            // step 5
-            doc.close();
-            p = 100;
-        }
-
-        /**
-         * Gets the complete PDF data
-         *
-         * @return the PDF as an array of bytes
-         * @throws DocumentException when the document isn't ready yet
-         */
-        public ByteArrayOutputStream getPdf() throws DocumentException {
-            if (p < 100) {
-                throw new DocumentException("The document isn't finished yet!");
-            }
-            return baos;
-        }
-
-        /**
-         * Gets the current percentage of the file that is done.
-         *
-         * @return a percentage or -1 if something went wrong.
-         */
-        public int getPercentage() {
-            return p;
-        }
-    }
-
     @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws IOException {
@@ -188,4 +124,68 @@ private void isError(ServletOutputStream stream) throws IOException {
         stream.print("\n\t\n\t\tError\n\t\n\t");
         stream.print("An error occured.\n\t\n");
     }
+
+    /**
+     * This class will keep a Pdf file
+     *
+     * @author blowagie
+     */
+    public static class MyPdf implements Runnable {
+
+        /**
+         * the ByteArrayOutputStream that holds the PDF data.
+         */
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        /**
+         * the percentage of the PDF file that is finished
+         */
+        int p = 0;
+
+        @Override
+        public void run() {
+            // step 1
+            Document doc = new Document();
+            try {
+                // step 2
+                PdfWriter.getInstance(doc, baos);
+                // step 3
+                doc.open();
+                // step 4
+                while (p < 99) {
+                    doc.add(new Paragraph(new Date().toString()));
+                    // we slow the process down deliberately
+                    Thread.sleep(500);
+                    p++;
+                }
+            } catch (DocumentException | InterruptedException e) {
+                p = -1;
+                e.printStackTrace();
+            }
+            // step 5
+            doc.close();
+            p = 100;
+        }
+
+        /**
+         * Gets the complete PDF data
+         *
+         * @return the PDF as an array of bytes
+         * @throws DocumentException when the document isn't ready yet
+         */
+        public ByteArrayOutputStream getPdf() throws DocumentException {
+            if (p < 100) {
+                throw new DocumentException("The document isn't finished yet!");
+            }
+            return baos;
+        }
+
+        /**
+         * Gets the current percentage of the file that is done.
+         *
+         * @return a percentage or -1 if something went wrong.
+         */
+        public int getPercentage() {
+            return p;
+        }
+    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/SilentPrintServlet.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/SilentPrintServlet.java
index d6af085ba..e060942e6 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/SilentPrintServlet.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/webapp/SilentPrintServlet.java
@@ -9,11 +9,15 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.general.webapp;
 
+import com.lowagie.text.Chunk;
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.pdf.PdfWriter;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
@@ -21,23 +25,22 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import com.lowagie.text.Chunk;
-import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.pdf.PdfWriter;
-
 /**
  * Explains how to print silently via Servlet/Browser.
- * @author     Heiner Jostkleigrewe, Heiner.Jostkleigrewe@gt-net.de
+ *
+ * @author Heiner Jostkleigrewe, Heiner.Jostkleigrewe@gt-net.de
  */
 public class SilentPrintServlet extends HttpServlet {
-    private static final long serialVersionUID = -3250788071256174348L;
 
-    /** a possible status */
+    /**
+     * a possible status
+     */
     public static final int ACT_INIT = 0;
-
-    /** a possible status */
+    /**
+     * a possible status
+     */
     public static final int ACT_REPORT_1 = 1;
+    private static final long serialVersionUID = -3250788071256174348L;
 
     @Override
     public void doGet(HttpServletRequest requ, HttpServletResponse resp)
@@ -53,15 +56,15 @@ public void doPost(HttpServletRequest requ, HttpServletResponse resp)
 
     /**
      * The actual business logic.
-     * 
-     * @param requ    the request object
-     * @param resp    the response object
+     *
+     * @param requ the request object
+     * @param resp the response object
      * @throws IOException on error
      */
     public void doWork(HttpServletRequest requ, HttpServletResponse resp)
             throws IOException {
         ServletOutputStream out = resp.getOutputStream();
-        
+
         // what did the user request?
         int action = ACT_INIT;
         int sub = ACT_INIT;
@@ -72,33 +75,34 @@ public void doWork(HttpServletRequest requ, HttpServletResponse resp)
         }
 
         switch (action) {
-        case ACT_INIT: {
-            htmlHeader(out, resp);
-            formular(out, requ, sub);
-            break;
-        }
-
-        case ACT_REPORT_1: {
-            Document document = new Document();
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-            try {
-                PdfWriter writer = PdfWriter.getInstance(document, baos);
-                document.open();
-                if (requ.getParameter("preview") == null)
-                    writer.addJavaScript("this.print(false);", false);
-                document.add(new Chunk("Silent Auto Print"));
-                document.close();
-            } catch (DocumentException e) {
-                e.printStackTrace();
+            case ACT_INIT: {
+                htmlHeader(out, resp);
+                formular(out, requ, sub);
+                break;
             }
-            resp.setContentType("application/pdf");
 
-            resp.setContentLength(baos.size());
-            baos.writeTo(out);
-            out.flush();
-            break;
-        }
+            case ACT_REPORT_1: {
+                Document document = new Document();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+                try {
+                    PdfWriter writer = PdfWriter.getInstance(document, baos);
+                    document.open();
+                    if (requ.getParameter("preview") == null) {
+                        writer.addJavaScript("this.print(false);", false);
+                    }
+                    document.add(new Chunk("Silent Auto Print"));
+                    document.close();
+                } catch (DocumentException e) {
+                    e.printStackTrace();
+                }
+                resp.setContentType("application/pdf");
+
+                resp.setContentLength(baos.size());
+                baos.writeTo(out);
+                out.flush();
+                break;
+            }
         }
     }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/html/HelloHtml.java b/pdf-toolbox/src/test/java/com/lowagie/examples/html/HelloHtml.java
index 83b8d9435..d4d7bf4d0 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/html/HelloHtml.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/html/HelloHtml.java
@@ -9,22 +9,21 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.html;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.html.HtmlWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates a simple 'Hello World' HTML page.
- * 
+ *
  * @author blowagie
  */
 
@@ -32,7 +31,7 @@ public class HelloHtml {
 
     /**
      * Generates an HTML page with the text 'Hello World'
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/html/HelloWorldMeta.java b/pdf-toolbox/src/test/java/com/lowagie/examples/html/HelloWorldMeta.java
index 7e1244095..f38404f39 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/html/HelloWorldMeta.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/html/HelloWorldMeta.java
@@ -9,22 +9,21 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.html;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.html.HtmlWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Generates a simple PDF file with metadata.
- * 
+ *
  * @author blowagie
  */
 
@@ -32,7 +31,7 @@ public class HelloWorldMeta {
 
     /**
      * Generates a PDF file with metadata
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/html/Images.java b/pdf-toolbox/src/test/java/com/lowagie/examples/html/Images.java
index 511f7445b..a4ed3ab51 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/html/Images.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/html/Images.java
@@ -9,35 +9,35 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.html;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.html.HtmlWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * General Images example.
  */
 public class Images {
-    
+
     /**
      * General Images example that generates an HTML file with wrong paths to the images where the paths are right.
-     * @param args    no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Images in HTML");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
             // step 2:
             // we create a writer that listens to the document
@@ -45,16 +45,16 @@ public static void main(String[] args) {
             HtmlWriter.getInstance(document, new FileOutputStream("images_wrong.html"));
             HtmlWriter writer = HtmlWriter.getInstance(document, new FileOutputStream("images_right.html"));
             writer.setImagepath("./");
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             document.add(new Paragraph("A picture of my dog: otsoe.jpg"));
             Image jpg = Image.getInstance("otsoe.jpg");
             document.add(jpg);
             document.add(new Paragraph("getacro.gif"));
-            Image gif= Image.getInstance("getacro.gif");
+            Image gif = Image.getInstance("getacro.gif");
             document.add(gif);
             document.add(new Paragraph("pngnow.png"));
             Image png = Image.getInstance("pngnow.png");
@@ -68,8 +68,7 @@ public static void main(String[] args) {
             document.add(new Paragraph("iText.tif"));
             Image tiff = Image.getInstance("iText.tif");
             document.add(tiff);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/html/ImagesURL.java b/pdf-toolbox/src/test/java/com/lowagie/examples/html/ImagesURL.java
index 5b3ce1a03..2c3907f18 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/html/ImagesURL.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/html/ImagesURL.java
@@ -9,51 +9,51 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.html;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.html.HtmlWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
 
 /**
  * Images example that uses the complete URL of the Image.
  */
 public class ImagesURL {
-    
+
     /**
      * Images example with a complete path to the images.
-     * @param args    no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Images with complete URL");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             HtmlWriter.getInstance(document, new FileOutputStream("images.html"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             document.add(new Paragraph("A picture of my dog: otsoe.jpg"));
             Image jpg = Image.getInstance(new URL("/examples/com/lowagie/examples/html/otsoe.jpg"));
             document.add(jpg);
             document.add(new Paragraph("getacro.gif"));
-            Image gif= Image.getInstance(new URL("/examples/com/lowagie/examples/html/getacro.gif"));
+            Image gif = Image.getInstance(new URL("/examples/com/lowagie/examples/html/getacro.gif"));
             document.add(gif);
             document.add(new Paragraph("pngnow.png"));
             Image png = Image.getInstance(new URL("/examples/com/lowagie/examples/html/pngnow.png"));
@@ -67,8 +67,7 @@ public static void main(String[] args) {
             document.add(new Paragraph("iText.tif"));
             Image tiff = Image.getInstance(new URL("/examples/com/lowagie/examples/html/iText.tif"));
             document.add(tiff);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseHelloHtml.java b/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseHelloHtml.java
index 4aa1e6468..7d9d60ca4 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseHelloHtml.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseHelloHtml.java
@@ -18,7 +18,6 @@
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.html.HtmlParser;
 import com.lowagie.text.pdf.PdfWriter;
-
 import java.io.FileOutputStream;
 import java.io.IOException;
 
@@ -44,7 +43,8 @@ public static void main(String[] args) {
             // step 2: we open the document
             document.open();
             // step 3: parsing the HTML document to convert it in PDF
-            HtmlParser.parse(document, ParseHelloHtml.class.getClassLoader().getResourceAsStream("com/lowagie/examples/html/parseHelloWorld.html"));
+            HtmlParser.parse(document, ParseHelloHtml.class.getClassLoader()
+                    .getResourceAsStream("com/lowagie/examples/html/parseHelloWorld.html"));
         } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseNestedHtmlList.java b/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseNestedHtmlList.java
index c2726141b..b66c75d33 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseNestedHtmlList.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseNestedHtmlList.java
@@ -18,7 +18,6 @@
 import com.lowagie.text.Element;
 import com.lowagie.text.html.simpleparser.HTMLWorker;
 import com.lowagie.text.html.simpleparser.StyleSheet;
-
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.HashMap;
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseTableHtml.java b/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseTableHtml.java
index 1d38b7b58..b0ce65a33 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseTableHtml.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseTableHtml.java
@@ -18,7 +18,6 @@
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.html.HtmlParser;
 import com.lowagie.text.pdf.PdfWriter;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -45,7 +44,8 @@ public static void main(String[] args) {
             // step 2: we open the document
             document.open();
             // step 3: parsing the HTML document to convert it in PDF
-            HtmlParser.parse(document, ParseHelloHtml.class.getClassLoader().getResourceAsStream("com/lowagie/examples/html/parseTable.html"));
+            HtmlParser.parse(document, ParseHelloHtml.class.getClassLoader()
+                    .getResourceAsStream("com/lowagie/examples/html/parseTable.html"));
         } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseTitleHtml.java b/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseTitleHtml.java
index 2c93d1fa5..413f07c2a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseTitleHtml.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/html/ParseTitleHtml.java
@@ -18,7 +18,6 @@
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.html.HtmlParser;
 import com.lowagie.text.pdf.PdfWriter;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -44,7 +43,8 @@ public static void main(String[] args) {
             // step 2: we open the document
             document.open();
             // step 3: parsing the HTML document to convert it in PDF
-            HtmlParser.parse(document, ParseHelloHtml.class.getClassLoader().getResourceAsStream("com/lowagie/examples/html/parseTitle.html"));
+            HtmlParser.parse(document, ParseHelloHtml.class.getClassLoader()
+                    .getResourceAsStream("com/lowagie/examples/html/parseTitle.html"));
         } catch (DocumentException | IOException de) {
             de.printStackTrace();
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/html/SpanTableHtml.java b/pdf-toolbox/src/test/java/com/lowagie/examples/html/SpanTableHtml.java
index bbbf139e6..791d52b24 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/html/SpanTableHtml.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/html/SpanTableHtml.java
@@ -13,6 +13,7 @@
 import java.nio.file.Paths;
 
 public class SpanTableHtml {
+
     public static void main(String[] args) throws IOException {
         testRowspan();
         testColspan();
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Chunks.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Chunks.java
index f6bb7551e..37c1c45bc 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Chunks.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Chunks.java
@@ -9,24 +9,23 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates some Chunk functionality.
- * 
+ *
  * @author blowagie
  */
 
@@ -34,7 +33,7 @@ public class Chunks {
 
     /**
      * Demonstrates some Chunk functionality.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -60,7 +59,8 @@ public static void main(String[] args) {
             Chunk dog = new Chunk("the lazy dog");
             float subscript = -8.0f;
             dog.setTextRise(subscript);
-            dog.setUnderline(new Color(0xFF, 0x00, 0x00), 3.0f, 0.0f, -5.0f + subscript, 0.0f, PdfContentByte.LINE_CAP_ROUND);
+            dog.setUnderline(new Color(0xFF, 0x00, 0x00), 3.0f, 0.0f, -5.0f + subscript, 0.0f,
+                    PdfContentByte.LINE_CAP_ROUND);
             document.add(fox);
             document.add(jumps);
             document.add(dog);
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/DifferentFonts.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/DifferentFonts.java
index a221e89ae..a3036a59a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/DifferentFonts.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/DifferentFonts.java
@@ -9,24 +9,25 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Selects the appropriate fonts that contain the glyphs needed to render text correctly.
  */
 public class DifferentFonts {
+
     /**
      * Using FontSelector.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -46,8 +47,7 @@ public static void main(String[] args) {
             document.add(new Paragraph(p));
             // step 5
             document.close();
-        }
-        catch(Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FancyLists.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FancyLists.java
index bb7774f50..95c567199 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FancyLists.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FancyLists.java
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects;
@@ -51,10 +51,10 @@ public static void main(String[] args) {
         try {
             // step 2:
             PdfWriter.getInstance(document, new FileOutputStream("fancylists.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
 
             // RomanList
@@ -75,7 +75,7 @@ public static void main(String[] args) {
             }
             document.add(roman2);
             document.newPage();
-            
+
             // GreekList
             GreekList greek = new GreekList(15);
             greek.setLowercase(true);
@@ -86,7 +86,7 @@ public static void main(String[] args) {
             }
             document.add(greek);
             document.newPage();
-            
+
             // GreekList
             GreekList greek2 = new GreekList(15);
             greek2.setLowercase(false);
@@ -96,9 +96,9 @@ public static void main(String[] args) {
                 greek2.add(i + "th item");
             }
             document.add(greek2);
-            
+
             // ZapfDingbatsList
-            ZapfDingbatsList z = new ZapfDingbatsList(42,15);
+            ZapfDingbatsList z = new ZapfDingbatsList(42, 15);
             z.add(new ListItem("first item"));
             z.add(new ListItem("second item"));
             for (int i = 3; i < 20; i++) {
@@ -106,7 +106,7 @@ public static void main(String[] args) {
             }
             document.add(z);
             document.newPage();
-            
+
             // ZapfDingbatsNumberList
             ZapfDingbatsNumberList z0 = new ZapfDingbatsNumberList(0, 15);
             z0.add(new ListItem("first item"));
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FontSelection.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FontSelection.java
index 175dc69ab..3a5e4beaf 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FontSelection.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FontSelection.java
@@ -9,25 +9,26 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.FontSelector;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Selects the appropriate fonts that contain the glyphs needed to render text correctly.
  */
 public class FontSelection {
+
     /**
      * Using FontSelector.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -40,8 +41,8 @@ public static void main(String[] args) {
             document.open();
             // step 4
             String text = "This text is the first verse of \u275dThe Iliad\u275e. It's not polytonic as it should be "
-            + "with \u2798 and \u279a entoation variants but that's all we have for now.\n\n"
-            + "\u2766\u00a0\u00a0\u039c\u03b7\u03bd\u03b9\u03bd \u03b1\u03b5\u03b9\u03b4\u03b5, \u03b8\u03b5\u03b1, \u03a0\u03b7\u03bb\u03b7\u03b9\u03b1\u03b4\u03b5\u03c9 \u0391\u03c7\u03b9\u03bb\u03b7\u03bf\u03c2";
+                    + "with \u2798 and \u279a entoation variants but that's all we have for now.\n\n"
+                    + "\u2766\u00a0\u00a0\u039c\u03b7\u03bd\u03b9\u03bd \u03b1\u03b5\u03b9\u03b4\u03b5, \u03b8\u03b5\u03b1, \u03a0\u03b7\u03bb\u03b7\u03b9\u03b1\u03b4\u03b5\u03c9 \u0391\u03c7\u03b9\u03bb\u03b7\u03bf\u03c2";
             FontSelector sel = new FontSelector();
             sel.addFont(new Font(Font.TIMES_ROMAN, 12));
             sel.addFont(new Font(Font.ZAPFDINGBATS, 12));
@@ -50,8 +51,7 @@ public static void main(String[] args) {
             document.add(new Paragraph(ph));
             // step 5
             document.close();
-        }
-        catch(Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Lists.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Lists.java
index 09b89e7cc..2d6c4ca9e 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Lists.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Lists.java
@@ -9,14 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -27,10 +24,12 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.html.HtmlWriter;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates some List functionality.
- * 
+ *
  * @author blowagie
  */
 
@@ -38,7 +37,7 @@ public class Lists {
 
     /**
      * Demonstrates some List functionality.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -51,17 +50,18 @@ public static void main(String[] args) {
             // step 2:
             PdfWriter.getInstance(document, new FileOutputStream("lists.pdf"));
             HtmlWriter.getInstance(document, new FileOutputStream("lists.html"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             List list = new List(true, 20);
             list.add(new ListItem("First line"));
-            list.add(new ListItem("The second line is longer to see what happens once the end of the line is reached. Will it start on a new line?"));
+            list.add(new ListItem(
+                    "The second line is longer to see what happens once the end of the line is reached. Will it start on a new line?"));
             list.add(new ListItem("Third line"));
             document.add(list);
-            
+
             document.add(new Paragraph("some books I really like:"));
             ListItem listItem;
             list = new List(true, 15);
@@ -72,10 +72,11 @@ public static void main(String[] args) {
             listItem.add(new Chunk(" by John Irving", FontFactory.getFont(FontFactory.TIMES_ROMAN, 11, Font.ITALIC)));
             list.add(listItem);
             listItem = new ListItem("Decamerone", FontFactory.getFont(FontFactory.TIMES_ROMAN, 12));
-            listItem.add(new Chunk(" by Giovanni Boccaccio", FontFactory.getFont(FontFactory.TIMES_ROMAN, 11, Font.ITALIC)));
+            listItem.add(
+                    new Chunk(" by Giovanni Boccaccio", FontFactory.getFont(FontFactory.TIMES_ROMAN, 11, Font.ITALIC)));
             list.add(listItem);
             document.add(list);
-            
+
             Paragraph paragraph = new Paragraph("some movies I really like:");
             list = new List(false, 10);
             list.add("Wild At Heart");
@@ -85,7 +86,7 @@ public static void main(String[] args) {
             list.add("Le mari de la coiffeuse");
             paragraph.add(list);
             document.add(paragraph);
-            
+
             document.add(new Paragraph("Some authors I really like:"));
             list = new List(false, 20);
             list.setListSymbol(new Chunk("\u2022", FontFactory.getFont(FontFactory.HELVETICA, 20, Font.BOLD)));
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/LongList.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/LongList.java
index f2adc260d..813ce4af7 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/LongList.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/LongList.java
@@ -14,13 +14,12 @@
 
 package com.lowagie.examples.objects;
 
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.List;
 import com.lowagie.text.ListItem;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates some List functionality.
@@ -47,7 +46,7 @@ public static void main(String[] args) throws FileNotFoundException {
         List list = new List(true);
         for (int i = 0; i < 30; i++) {
             list.add(new ListItem("This is the line with the number " + (i + 1)
-                + ". Don't worry if the line is very long, but we need to a line break."));
+                    + ". Don't worry if the line is very long, but we need to a line break."));
         }
         document.add(list);
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/NegativeLeading.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/NegativeLeading.java
index 6ec4de436..369367cec 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/NegativeLeading.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/NegativeLeading.java
@@ -9,22 +9,21 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Shows the effect of a negative leading.
- * 
+ *
  * @author blowagie
  */
 
@@ -32,9 +31,8 @@ public class NegativeLeading {
 
     /**
      * Demonstrates what happens if you choose a negative leading.
-     * 
-     * @param args
-     *            no arguments needed here
+     *
+     * @param args no arguments needed here
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Paragraphs.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Paragraphs.java
index af3f72131..799cdfd84 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Paragraphs.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Paragraphs.java
@@ -9,14 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -24,10 +21,12 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates some Paragraph functionality.
- * 
+ *
  * @author blowagie
  */
 
@@ -35,9 +34,8 @@ public class Paragraphs {
 
     /**
      * Demonstrates some Paragraph functionality.
-     * 
-     * @param args
-     *            no arguments needed here
+     *
+     * @param args no arguments needed here
      */
     public static void main(String[] args) {
 
@@ -61,12 +59,12 @@ public static void main(String[] args) {
             p1.add(new Chunk("You can add chunks "));
             p1.add(new Phrase("or you can add phrases. "));
             p1.add(new Phrase(
-                "Unless you change the leading with the method setLeading, the leading doesn't change if you add text with another leading. This can lead to some problems.",
-                FontFactory.getFont(FontFactory.HELVETICA, 18)));
+                    "Unless you change the leading with the method setLeading, the leading doesn't change if you add text with another leading. This can lead to some problems.",
+                    FontFactory.getFont(FontFactory.HELVETICA, 18)));
             document.add(p1);
             Paragraph p2 = new Paragraph(new Phrase(
                     "This is my second paragraph. ", FontFactory.getFont(
-                            FontFactory.HELVETICA, 12)));
+                    FontFactory.HELVETICA, 12)));
             p2.add("As you can see, it started on a new line.");
             document.add(p2);
             Paragraph p3 = new Paragraph("This is my third paragraph.",
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Phrases.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Phrases.java
index 24b49cc21..0b03a1b2a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Phrases.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Phrases.java
@@ -9,15 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -25,10 +21,13 @@
 import com.lowagie.text.FontFactory;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * How to use class Phrase.
- * 
+ *
  * @author blowagie
  */
 
@@ -36,9 +35,8 @@ public class Phrases {
 
     /**
      * Demonstrates how the class Phrase works.
-     * 
-     * @param args
-     *            no arguments needed here
+     *
+     * @param args no arguments needed here
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/SpaceWordRatio.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/SpaceWordRatio.java
index c46dd3be8..afba66693 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/SpaceWordRatio.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/SpaceWordRatio.java
@@ -9,24 +9,25 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Space Word Ratio.
  */
 public class SpaceWordRatio {
+
     /**
      * Space Word Ratio.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -46,8 +47,7 @@ public static void main(String[] args) {
             document.newPage();
             writer.setSpaceCharRatio(PdfWriter.NO_SPACE_CHAR_RATIO);
             document.add(p);
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
         // step 5
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/SymbolSubstitution.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/SymbolSubstitution.java
index 411d81ffb..52259189a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/SymbolSubstitution.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/SymbolSubstitution.java
@@ -9,22 +9,21 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Shows how special characters are substituted with Phrase.getInstance.
- * 
+ *
  * @author blowagie
  */
 
@@ -32,7 +31,7 @@ public class SymbolSubstitution {
 
     /**
      * How to substiture special characters with Phrase.getInstance.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -52,9 +51,9 @@ public static void main(String[] args) {
             // step 4:
             document.add(Phrase.getInstance("What is the " + (char) 945 + "-coefficient of the "
                     + (char) 946 + "-factor in the " + (char) 947 + "-equation?\n"));
-                    for (int i = 913; i < 970; i++) {
-                        document.add(Phrase.getInstance(" " + i + ": " + (char) i));
-                    }
+            for (int i = 913; i < 970; i++) {
+                document.add(Phrase.getInstance(" " + i + ": " + (char) i));
+            }
         } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/AHref.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/AHref.java
index d77b181d8..bc8492e92 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/AHref.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/AHref.java
@@ -9,15 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Anchor;
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
@@ -27,10 +23,13 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.html.HtmlWriter;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates how the Anchor object works.
- * 
+ *
  * @author blowagie
  */
 
@@ -38,7 +37,7 @@ public class AHref {
 
     /**
      * Demonstrates some Anchor functionality.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -51,19 +50,21 @@ public static void main(String[] args) {
             // step 2:
             PdfWriter.getInstance(document, new FileOutputStream("AHref.pdf"));
             HtmlWriter.getInstance(document, new FileOutputStream("AHref.html"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             Paragraph paragraph = new Paragraph("Please visit my ");
-            Anchor anchor1 = new Anchor("website (external reference)", FontFactory.getFont(FontFactory.HELVETICA, 12, Font.UNDERLINE, new Color(0, 0, 255)));
+            Anchor anchor1 = new Anchor("website (external reference)",
+                    FontFactory.getFont(FontFactory.HELVETICA, 12, Font.UNDERLINE, new Color(0, 0, 255)));
             anchor1.setReference("https://github.com/LibrePDF/OpenPDF");
             anchor1.setName("top");
             paragraph.add(anchor1);
             paragraph.add(new Chunk(".\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"));
             document.add(paragraph);
-            Anchor anchor2 = new Anchor("please jump to a local destination", FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL, new Color(0, 0, 255)));
+            Anchor anchor2 = new Anchor("please jump to a local destination",
+                    FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL, new Color(0, 0, 255)));
             anchor2.setReference("#top");
             document.add(anchor2);
         } catch (DocumentException | IOException de) {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/Actions.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/Actions.java
index 7bb035608..894b41b3b 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/Actions.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/Actions.java
@@ -9,23 +9,22 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfAction;
 import com.lowagie.text.pdf.PdfDestination;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Creates a document with some goto actions.
- * 
+ *
  * @author blowagie
  */
 
@@ -33,9 +32,8 @@ public class Actions {
 
     /**
      * Creates a document with some goto actions.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/Annotations.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/Annotations.java
index b08d4c5f8..4042c6e10 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/Annotations.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/Annotations.java
@@ -9,14 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Rectangle;
@@ -26,10 +23,12 @@
 import com.lowagie.text.pdf.PdfDestination;
 import com.lowagie.text.pdf.PdfFileSpecification;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Creates a document with some PdfAnnotations.
- * 
+ *
  * @author blowagie
  */
 
@@ -37,9 +36,8 @@ public class Annotations {
 
     /**
      * Creates a document with some PdfAnnotations.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -59,14 +57,19 @@ public static void main(String[] args) {
             PdfContentByte cb = writer.getDirectContent();
             // page 1
             PdfFileSpecification fs = PdfFileSpecification.fileExtern(writer, "cards.mpg");
-            writer.addAnnotation(PdfAnnotation.createScreen(writer, new Rectangle(200f, 700f, 300f, 800f), "cards.mpg",fs,"video/mpeg",true));
+            writer.addAnnotation(
+                    PdfAnnotation.createScreen(writer, new Rectangle(200f, 700f, 300f, 800f), "cards.mpg", fs,
+                            "video/mpeg", true));
             PdfAnnotation a = new PdfAnnotation(writer, 200f, 550f, 300f, 650f,
                     PdfAction.javaScript("app.alert('Hello');\r", writer));
             document.add(new Chunk("click to trigger javascript").setAnnotation(a).setLocalDestination("top"));
             writer.addAnnotation(a);
-            writer.addAnnotation(PdfAnnotation.createFileAttachment(writer, new Rectangle(100f, 650f, 150f, 700f), "This is some text", "some text".getBytes(), null, "some.txt"));
-            writer.addAnnotation(PdfAnnotation.createText(writer, new Rectangle(200f, 400f, 300f, 500f), "Help", "This Help annotation was made with 'createText'", false, "Help"));
-            writer.addAnnotation(PdfAnnotation.createText(writer, new Rectangle(200f, 250f, 300f, 350f), "Help", "This Comment annotation was made with 'createText'", true, "Comment"));
+            writer.addAnnotation(PdfAnnotation.createFileAttachment(writer, new Rectangle(100f, 650f, 150f, 700f),
+                    "This is some text", "some text".getBytes(), null, "some.txt"));
+            writer.addAnnotation(PdfAnnotation.createText(writer, new Rectangle(200f, 400f, 300f, 500f), "Help",
+                    "This Help annotation was made with 'createText'", false, "Help"));
+            writer.addAnnotation(PdfAnnotation.createText(writer, new Rectangle(200f, 250f, 300f, 350f), "Help",
+                    "This Comment annotation was made with 'createText'", true, "Comment"));
             cb.rectangle(200, 700, 100, 100);
             cb.rectangle(200, 550, 100, 100);
             cb.rectangle(200, 400, 100, 100);
@@ -74,23 +77,34 @@ public static void main(String[] args) {
             cb.stroke();
             document.newPage();
             // page 2
-            writer.addAnnotation(PdfAnnotation.createLink(writer, new Rectangle(200f, 700f, 300f, 800f), PdfAnnotation.HIGHLIGHT_TOGGLE, PdfAction.javaScript("app.alert('Hello');\r", writer)));
-            writer.addAnnotation(PdfAnnotation.createLink(writer, new Rectangle(200f, 550f, 300f, 650f), PdfAnnotation.HIGHLIGHT_OUTLINE, "top"));
-            writer.addAnnotation(PdfAnnotation.createLink(writer, new Rectangle(200f, 400f, 300f, 500f), PdfAnnotation.HIGHLIGHT_PUSH, 1, new PdfDestination(PdfDestination.FIT)));
-            writer.addAnnotation(PdfAnnotation.createSquareCircle(writer, new Rectangle(200f, 250f, 300f, 350f), "This Comment annotation was made with 'createSquareCircle'", false));
+            writer.addAnnotation(PdfAnnotation.createLink(writer, new Rectangle(200f, 700f, 300f, 800f),
+                    PdfAnnotation.HIGHLIGHT_TOGGLE, PdfAction.javaScript("app.alert('Hello');\r", writer)));
+            writer.addAnnotation(PdfAnnotation.createLink(writer, new Rectangle(200f, 550f, 300f, 650f),
+                    PdfAnnotation.HIGHLIGHT_OUTLINE, "top"));
+            writer.addAnnotation(PdfAnnotation.createLink(writer, new Rectangle(200f, 400f, 300f, 500f),
+                    PdfAnnotation.HIGHLIGHT_PUSH, 1, new PdfDestination(PdfDestination.FIT)));
+            writer.addAnnotation(PdfAnnotation.createSquareCircle(writer, new Rectangle(200f, 250f, 300f, 350f),
+                    "This Comment annotation was made with 'createSquareCircle'", false));
             document.newPage();
             // page 3
             PdfContentByte pcb = new PdfContentByte(writer);
             pcb.setColorFill(new Color(0xFF, 0x00, 0x00));
-            writer.addAnnotation(PdfAnnotation.createFreeText(writer, new Rectangle(200f, 700f, 300f, 800f), "This is some free text, blah blah blah", pcb));
-            writer.addAnnotation(PdfAnnotation.createLine(writer, new Rectangle(200f, 550f, 300f, 650f), "this is a line", 200, 550, 300, 650));
-            writer.addAnnotation(PdfAnnotation.createStamp(writer, new Rectangle(200f, 400f, 300f, 500f), "This is a stamp", "Stamp"));
-            writer.addAnnotation(PdfAnnotation.createPopup(writer, new Rectangle(200f, 250f, 300f, 350f), "Hello, I'm a popup!", true));
+            writer.addAnnotation(PdfAnnotation.createFreeText(writer, new Rectangle(200f, 700f, 300f, 800f),
+                    "This is some free text, blah blah blah", pcb));
+            writer.addAnnotation(
+                    PdfAnnotation.createLine(writer, new Rectangle(200f, 550f, 300f, 650f), "this is a line", 200, 550,
+                            300, 650));
+            writer.addAnnotation(
+                    PdfAnnotation.createStamp(writer, new Rectangle(200f, 400f, 300f, 500f), "This is a stamp",
+                            "Stamp"));
+            writer.addAnnotation(
+                    PdfAnnotation.createPopup(writer, new Rectangle(200f, 250f, 300f, 350f), "Hello, I'm a popup!",
+                            true));
             cb.rectangle(200, 700, 100, 100);
             cb.rectangle(200, 550, 100, 100);
             cb.rectangle(200, 250, 100, 100);
             cb.stroke();
-            
+
         } catch (Exception de) {
             de.printStackTrace();
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/ChainedActions.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/ChainedActions.java
index 77399d682..8101c7bfc 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/ChainedActions.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/ChainedActions.java
@@ -9,22 +9,21 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfAction;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Creates a documents with chained actions.
- * 
+ *
  * @author blowagie
  */
 
@@ -32,9 +31,8 @@ public class ChainedActions {
 
     /**
      * Creates a document with chained Actions.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/JavaScriptAction.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/JavaScriptAction.java
index 0e7a69fcb..b9f85875d 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/JavaScriptAction.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/JavaScriptAction.java
@@ -9,22 +9,21 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfAction;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Creates a documents with a javascript action.
- * 
+ *
  * @author blowagie
  */
 
@@ -32,9 +31,8 @@ public class JavaScriptAction {
 
     /**
      * Creates a document with a javascript action.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/LocalDestination.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/LocalDestination.java
index 18705f973..535040abb 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/LocalDestination.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/LocalDestination.java
@@ -9,22 +9,21 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfDestination;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Creates a document that jumps to a Local Destination upon opening.
- * 
+ *
  * @author blowagie
  */
 
@@ -32,12 +31,12 @@ public class LocalDestination {
 
     /**
      * Creates a document that jumps to a Local Destination upon opening.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
         System.out.println("local destination");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
         try {
@@ -52,11 +51,10 @@ public static void main(String[] args) {
             PdfContentByte cb = writer.getDirectContent();
             cb.localDestination("page2", new PdfDestination(PdfDestination.XYZ, -1, 10000, 0));
             writer.setOpenAction("page2");
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
-        
+
         // step 5: we close the document
         document.close();
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/LocalGoto.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/LocalGoto.java
index 2eefb4a1c..aa26dfad5 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/LocalGoto.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/LocalGoto.java
@@ -9,15 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -25,10 +21,13 @@
 import com.lowagie.text.FontFactory;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Creates a document with a Local Goto and a Local Destination.
- * 
+ *
  * @author blowagie
  */
 
@@ -36,39 +35,43 @@ public class LocalGoto {
 
     /**
      * Creates a document with a Local Goto and a Local Destination.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
         System.out.println("local goto");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             PdfWriter.getInstance(document, new FileOutputStream("LocalGoto.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
-            
+
             // we make some content
-            
+
             // a paragraph with a local goto
-            Paragraph p1 = new Paragraph("We will do something special with this paragraph. If you click on ", FontFactory.getFont(FontFactory.HELVETICA, 12));
-            p1.add(new Chunk("this word", FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL, new Color(0, 0, 255))).setLocalGoto("test"));
+            Paragraph p1 = new Paragraph("We will do something special with this paragraph. If you click on ",
+                    FontFactory.getFont(FontFactory.HELVETICA, 12));
+            p1.add(new Chunk("this word",
+                    FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL, new Color(0, 0, 255))).setLocalGoto(
+                    "test"));
             p1.add(" you will automatically jump to another location in this document.");
-            
+
             // some paragraph
             Paragraph p2 = new Paragraph("blah, blah, blah");
-            
+
             // a paragraph with a local destination
             Paragraph p3 = new Paragraph("This paragraph contains a ");
-            p3.add(new Chunk("local destination", FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL, new Color(0, 255, 0))).setLocalDestination("test"));
-            
+            p3.add(new Chunk("local destination", FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL,
+                    new Color(0, 255, 0))).setLocalDestination("test"));
+
             // we add the content
             document.add(p1);
             document.add(p2);
@@ -79,8 +82,7 @@ public static void main(String[] args) {
             document.add(p2);
             document.add(p2);
             document.add(p3);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/NamedActions.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/NamedActions.java
index 85303e35c..45a99d59e 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/NamedActions.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/NamedActions.java
@@ -9,13 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
@@ -25,10 +23,11 @@
 import com.lowagie.text.pdf.PdfAction;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Creates a documents with different named actions.
- * 
+ *
  * @author blowagie
  */
 
@@ -36,9 +35,8 @@ public class NamedActions {
 
     /**
      * Creates a document with Named Actions.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/OpenApplication.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/OpenApplication.java
index 23df17d6f..f0b284bc1 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/OpenApplication.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/OpenApplication.java
@@ -9,23 +9,22 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfAction;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Creates a documents with different named actions.
- * 
+ *
  * @author blowagie
  */
 
@@ -33,9 +32,8 @@ public class OpenApplication {
 
     /**
      * Creates a document with Named Actions.
-     * 
-     * @param args
-     *            the system root (for instance "C:\windows\")
+     *
+     * @param args the system root (for instance "C:\windows\")
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/RemoteGoto.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/RemoteGoto.java
index 5cb5cff7c..d2f08fa01 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/RemoteGoto.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/RemoteGoto.java
@@ -9,25 +9,24 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.net.URL;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.net.URL;
 
 /**
  * Creates 2 documents with links to eachother.
- * 
+ *
  * @author blowagie
  */
 
@@ -35,50 +34,63 @@ public class RemoteGoto {
 
     /**
      * Creates documents with Remote Goto functionality.
-     * 
+     *
      * @param args no arguments needed here
-     */    public static void main(String[] args) {
-        
+     */
+    public static void main(String[] args) {
+
         System.out.println("Remote goto (URLs and local destinations in another document)");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             PdfWriter writerA = PdfWriter.getInstance(document, new FileOutputStream("DocumentA.pdf"));
             PdfWriter writerB = PdfWriter.getInstance(document, new FileOutputStream("DocumentB.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
-            
+
             // we create some content
-            
+
             // a paragraph with a link to an external url
-            Paragraph p1 = new Paragraph("You can turn a Chunk into an ", FontFactory.getFont(FontFactory.HELVETICA, 12));
-            p1.add(new Chunk("anchor", FontFactory.getFont(FontFactory.HELVETICA, 12, Font.UNDERLINE, new Color(0, 0, 255))).setAnchor(new URL("https://github.com/LibrePDF/OpenPDF")));
+            Paragraph p1 = new Paragraph("You can turn a Chunk into an ",
+                    FontFactory.getFont(FontFactory.HELVETICA, 12));
+            p1.add(new Chunk("anchor",
+                    FontFactory.getFont(FontFactory.HELVETICA, 12, Font.UNDERLINE, new Color(0, 0, 255))).setAnchor(
+                    new URL("https://github.com/LibrePDF/OpenPDF")));
             p1.add(", for instance to the iText site.");
-            
+
             // some paragraph
             Paragraph p2 = new Paragraph("blah, blah, blah");
-            
+
             // two paragraphs with a local destination
             Paragraph p3a = new Paragraph("This paragraph contains a ");
-            p3a.add(new Chunk("local destination in document A", FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL, new Color(0, 255, 0))).setLocalDestination("test"));
+            p3a.add(new Chunk("local destination in document A",
+                    FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL,
+                            new Color(0, 255, 0))).setLocalDestination("test"));
             Paragraph p3b = new Paragraph("This paragraph contains a ");
-            p3b.add(new Chunk("local destination in document B", FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL, new Color(0, 255, 0))).setLocalDestination("test"));
-            
+            p3b.add(new Chunk("local destination in document B",
+                    FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL,
+                            new Color(0, 255, 0))).setLocalDestination("test"));
+
             // two paragraphs with a remote goto
-            Paragraph p4a = new Paragraph(new Chunk("Click this paragraph to go to a certain destination on document B").setRemoteGoto("DocumentB.pdf", "test"));
-            Paragraph p4b = new Paragraph(new Chunk("Click this paragraph to go to a certain destination on document A").setRemoteGoto("DocumentA.pdf", "test"));
-            
+            Paragraph p4a = new Paragraph(
+                    new Chunk("Click this paragraph to go to a certain destination on document B").setRemoteGoto(
+                            "DocumentB.pdf", "test"));
+            Paragraph p4b = new Paragraph(
+                    new Chunk("Click this paragraph to go to a certain destination on document A").setRemoteGoto(
+                            "DocumentA.pdf", "test"));
+
             // a special remote goto
             Paragraph p5a = new Paragraph("you can also jump to a ");
-            p5a.add(new Chunk("specific page on another document", FontFactory.getFont(FontFactory.HELVETICA, 12, Font.ITALIC)).setRemoteGoto("DocumentB.pdf", 3));
-            
+            p5a.add(new Chunk("specific page on another document",
+                    FontFactory.getFont(FontFactory.HELVETICA, 12, Font.ITALIC)).setRemoteGoto("DocumentB.pdf", 3));
+
             // we add all the content
             document.add(p1);
             document.add(p2);
@@ -119,7 +131,7 @@ public class RemoteGoto {
             // for both documents
             document.add(p2);
             document.add(p2);
-        } catch(Exception ioe) {
+        } catch (Exception ioe) {
             System.err.println(ioe.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/SimpleAnnotations.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/SimpleAnnotations.java
index 4acfae68b..0a35144d2 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/SimpleAnnotations.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/anchors/SimpleAnnotations.java
@@ -9,14 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.anchors;
 
-import java.io.FileOutputStream;
-import java.net.URL;
-
 import com.lowagie.text.Annotation;
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
@@ -26,10 +23,12 @@
 import com.lowagie.text.pdf.PdfAction;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.net.URL;
 
 /**
  * Creates two documents with different types of Annotations.
- * 
+ *
  * @author blowagie
  */
 
@@ -37,9 +36,8 @@ public class SimpleAnnotations {
 
     /**
      * Creates documents with some simple annotations.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -92,11 +90,11 @@ public static void main(String[] args) {
             }
             document1.add(new Annotation("blahblah", "Adding an annotation without specifying coordinates"));
             for (int i = 0; i < 3; i++) {
-                document1.add(new Paragraph("blahblahblah"));    
+                document1.add(new Paragraph("blahblahblah"));
             }
             document1.newPage();
             document1.add(new Chunk("marked chunk").setLocalDestination("mark"));
-            
+
             // document2
             document2.add(new Paragraph("Each square on this page represents an annotation."));
             PdfContentByte cb2 = writer2.getDirectContent();
@@ -109,7 +107,7 @@ public static void main(String[] args) {
             Annotation a7 = new Annotation(100f, 400f, 200f, 500f,
                     "SimpleAnnotations1.pdf", 2);
             document2.add(a7);
-            Annotation a8 = new Annotation(    100f, 250f, 200f, 350f,
+            Annotation a8 = new Annotation(100f, 250f, 200f, 350f,
                     "C://windows/notepad.exe", null, null, null);
             document2.add(a8);
             // draw rectangles to show where the annotations were added
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/Destinations.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/Destinations.java
index edc012bb8..eb07130c0 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/Destinations.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/Destinations.java
@@ -9,23 +9,22 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.bookmarks;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfDestination;
 import com.lowagie.text.pdf.PdfOutline;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Creates a document with some goto actions.
- * 
+ *
  * @author blowagie
  */
 
@@ -33,9 +32,8 @@ public class Destinations {
 
     /**
      * Creates a document with some goto actions.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -52,30 +50,30 @@ public static void main(String[] args) {
             document.open();
             // step 4: we grab the ContentByte and do some stuff with it
             PdfContentByte cb = writer.getDirectContent();
-            
+
             // we create a PdfTemplate
             PdfTemplate template = cb.createTemplate(25, 25);
-            
+
             // we add some crosses to visualize the destinations
             template.moveTo(13, 0);
             template.lineTo(13, 25);
             template.moveTo(0, 13);
             template.lineTo(50, 13);
             template.stroke();
-            
+
             // we add the template on different positions
             cb.addTemplate(template, 287, 787);
             cb.addTemplate(template, 187, 487);
             cb.addTemplate(template, 487, 287);
             cb.addTemplate(template, 87, 87);
-            
+
             // we define the destinations
             PdfDestination d1 = new PdfDestination(PdfDestination.XYZ, 300, 800, 0);
             PdfDestination d2 = new PdfDestination(PdfDestination.FITH, 500);
             PdfDestination d3 = new PdfDestination(PdfDestination.FITR, 200, 300, 400, 500);
             PdfDestination d4 = new PdfDestination(PdfDestination.FITBV, 100);
             PdfDestination d5 = new PdfDestination(PdfDestination.FIT);
-            
+
             // we define the outlines
             PdfOutline out1 = new PdfOutline(cb.getRootOutline(), d1, "root");
             PdfOutline out2 = new PdfOutline(out1, d2, "sub 1");
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/Layers.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/Layers.java
index 96545db4b..06f4f8e5a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/Layers.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/Layers.java
@@ -9,15 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.bookmarks;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -34,10 +30,13 @@
 import com.lowagie.text.pdf.PdfObject;
 import com.lowagie.text.pdf.PdfString;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates how layers work.
- * 
+ *
  * @author blowagie
  */
 
@@ -45,9 +44,8 @@ public class Layers {
 
     /**
      * Demonstrates some Layer functionality.
-     * 
-     * @param args
-     *            no arguments needed here
+     *
+     * @param args no arguments needed here
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/ListItemBookmarks.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/ListItemBookmarks.java
index 2df4fc79f..93a2e2b21 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/ListItemBookmarks.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/ListItemBookmarks.java
@@ -18,9 +18,8 @@
 import com.lowagie.text.pdf.PdfAction;
 import com.lowagie.text.pdf.PdfOutline;
 import com.lowagie.text.pdf.PdfWriter;
-import org.librepdf.openpdf.examples.content.Constants;
-
 import java.io.FileOutputStream;
+import org.librepdf.openpdf.examples.content.Constants;
 
 /**
  * Creates a document with outlines (bookmarks) for ListItems.
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/OutlineActions.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/OutlineActions.java
index 51684ce75..250dc43a2 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/OutlineActions.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/OutlineActions.java
@@ -9,15 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.bookmarks;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -28,10 +24,13 @@
 import com.lowagie.text.pdf.PdfDestination;
 import com.lowagie.text.pdf.PdfOutline;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates how pagelabels work.
- * 
+ *
  * @author blowagie
  */
 
@@ -39,7 +38,7 @@ public class OutlineActions {
 
     /**
      * Demonstrates some PageLabel functionality.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -63,7 +62,8 @@ public static void main(String[] args) {
             // we add the outline
             PdfContentByte cb = writer.getDirectContent();
             PdfOutline root = cb.getRootOutline();
-            PdfOutline links = new PdfOutline(root, new PdfAction("https://github.com/LibrePDF/OpenPDFlinks.html"), "Useful links");
+            PdfOutline links = new PdfOutline(root, new PdfAction("https://github.com/LibrePDF/OpenPDFlinks.html"),
+                    "Useful links");
             links.setColor(new Color(0x00, 0x80, 0x80));
             links.setStyle(Font.BOLD);
             new PdfOutline(links, new PdfAction("http://www.lowagie.com/iText"), "Bruno's iText site");
@@ -74,7 +74,7 @@ public static void main(String[] args) {
             new PdfOutline(other, new PdfAction("remote.pdf", 1), "Go to yhe first page of a remote file");
             new PdfOutline(other, new PdfAction("remote.pdf", "test"), "Go to a local destination in a remote file");
             new PdfOutline(other, PdfAction.javaScript("app.alert('Hello');\r", writer), "Say Hello");
-            
+
             remote.add(new Paragraph("Some remote document"));
             remote.newPage();
             Paragraph p = new Paragraph("This paragraph contains a ");
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/PageLabels.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/PageLabels.java
index c0aa6ed60..b15793d2f 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/PageLabels.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/PageLabels.java
@@ -9,26 +9,25 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.bookmarks;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.lowagie.text.Document;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfPageLabels;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfWriter;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
 
 /**
  * Demonstrates how pagelabels work.
- * 
+ *
  * @author blowagie
  */
 
@@ -36,7 +35,7 @@ public class PageLabels {
 
     /**
      * Demonstrates some PageLabel functionality.
-     * 
+     *
      * @param args no arguments needed here
      * @throws IOException thrown when a I/O operation fails
      */
@@ -54,7 +53,8 @@ public static void main(String[] args) throws IOException {
         // step 4:
         // we add some content
         for (int k = 1; k <= 10; ++k) {
-            document.add(new Paragraph("This document has the logical page numbers: i,ii,iii,iv,1,2,3,A-8,A-9,A-10\nReal page " + k));
+            document.add(new Paragraph(
+                    "This document has the logical page numbers: i,ii,iii,iv,1,2,3,A-8,A-9,A-10\nReal page " + k));
             document.newPage();
         }
         PdfPageLabels pdfPageLabels = new PdfPageLabels();
@@ -70,7 +70,8 @@ public static void main(String[] args) throws IOException {
         PdfReader reader = new PdfReader("PageLabels.pdf");
         final String[] pageLabels = PdfPageLabels.getPageLabels(reader);
         assertThat(pageLabels).isNotNull();
-        assertThat(Arrays.asList(pageLabels)).containsExactly("i", "ii", "iii", "iv", "1", "2", "3", "A-8", "A-9", "A-10");
+        assertThat(Arrays.asList(pageLabels)).containsExactly("i", "ii", "iii", "iv", "1", "2", "3", "A-8", "A-9",
+                "A-10");
         final PdfPageLabels.PdfPageLabelFormat[] pageLabelFormats = PdfPageLabels.getPageLabelFormats(reader);
         assertThat(pageLabelFormats).isNotNull();
         assertThat(pageLabelFormats).hasSize(3);
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/ParagraphBookmarks.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/ParagraphBookmarks.java
index ddb57243e..b7cc2cbfa 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/ParagraphBookmarks.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/bookmarks/ParagraphBookmarks.java
@@ -39,20 +39,6 @@ public class ParagraphBookmarks extends PdfPageEventHelper {
      */
     private int n = 0;
 
-    /**
-     * Adds an outline for every new Paragraph
-     *
-     * @param writer   the PdfWriter that link to the pdf
-     * @param document the Document to outline
-     * @param position the position in the document
-     */
-    public void onParagraph(PdfWriter writer, Document document, float position) {
-        n++;
-        PdfContentByte cb = writer.getDirectContent();
-        PdfDestination destination = new PdfDestination(PdfDestination.FITH, position);
-        new PdfOutline(cb.getRootOutline(), destination, "paragraph " + n);
-    }
-
     /**
      * Creates a document with outlines for each paragraph.
      *
@@ -86,4 +72,18 @@ public static void main(String[] args) {
         // step 5: we close the document
         document.close();
     }
+
+    /**
+     * Adds an outline for every new Paragraph
+     *
+     * @param writer   the PdfWriter that link to the pdf
+     * @param document the Document to outline
+     * @param position the position in the document
+     */
+    public void onParagraph(PdfWriter writer, Document document, float position) {
+        n++;
+        PdfContentByte cb = writer.getDirectContent();
+        PdfDestination destination = new PdfDestination(PdfDestination.FITH, position);
+        new PdfOutline(cb.getRootOutline(), destination, "paragraph " + n);
+    }
 }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Background.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Background.java
index d578aa9f8..6868ac77b 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Background.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Background.java
@@ -9,25 +9,24 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.FontFactory;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates how 'highlight' Chunks using a Background color.
- * 
+ *
  * @author blowagie
  */
 
@@ -35,7 +34,7 @@ public class Background {
 
     /**
      * Using Background Colors in Chunks.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/ChunkColor.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/ChunkColor.java
index c54965e8a..79062162d 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/ChunkColor.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/ChunkColor.java
@@ -9,15 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -27,10 +23,13 @@
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * How to change the color of a font.
- * 
+ *
  * @author blowagie
  */
 
@@ -38,7 +37,7 @@ public class ChunkColor {
 
     /**
      * Changing Font colors
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -56,8 +55,10 @@ public static void main(String[] args) {
             // step 3: we open the document
             document.open();
             // step 4:
-            Font red = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.BOLD, new Color(0xFF, 0x00, 0x00));
-            Font blue = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.ITALIC, new Color(0x00, 0x00, 0xFF));
+            Font red = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.BOLD,
+                    new Color(0xFF, 0x00, 0x00));
+            Font blue = FontFactory.getFont(FontFactory.HELVETICA, Font.DEFAULTSIZE, Font.ITALIC,
+                    new Color(0x00, 0x00, 0xFF));
             Paragraph p;
             p = new Paragraph("Roses are ");
             p.add(new Chunk("red", red));
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/EndOfLine.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/EndOfLine.java
index f03cd65d9..19b806afa 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/EndOfLine.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/EndOfLine.java
@@ -9,25 +9,24 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Shows what happens if the end of the line is reached
- * 
+ *
  * @author blowagie
  */
 
@@ -35,7 +34,7 @@ public class EndOfLine {
 
     /**
      * Demonstrates the use of the Phrase object.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -55,14 +54,16 @@ public static void main(String[] args) {
             // step 4:
             Chunk chunk = new Chunk("quick brown fox jumps over the lazy dog ");
             for (int i = 0; i < 5; i++) {
-                chunk.setTextRenderMode(PdfContentByte.TEXT_RENDER_MODE_STROKE, 0.3f, new Color(i * 30, i * 30, i * 30));
+                chunk.setTextRenderMode(PdfContentByte.TEXT_RENDER_MODE_STROKE, 0.3f,
+                        new Color(i * 30, i * 30, i * 30));
                 document.add(chunk);
             }
             document.newPage();
             Phrase p = new Phrase(16f);
             for (int i = 0; i < 5; i++) {
                 chunk = new Chunk("quick brown fox jumps over the lazy dog ");
-                chunk.setTextRenderMode(PdfContentByte.TEXT_RENDER_MODE_STROKE, 0.3f, new Color(i * 30, i * 30, i * 30));
+                chunk.setTextRenderMode(PdfContentByte.TEXT_RENDER_MODE_STROKE, 0.3f,
+                        new Color(i * 30, i * 30, i * 30));
                 p.add(chunk);
             }
             document.add(p);
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Generic.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Generic.java
index 6c9cdc8ba..f7d872652 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Generic.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Generic.java
@@ -9,14 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -25,36 +22,20 @@
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfPageEventHelper;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates the use of the Generic PageEvent.
- * 
+ *
  * @author blowagie
  */
 
 public class Generic extends PdfPageEventHelper {
-    /**
-     * Draws an ellipse if the text was ellipse, a box if the text was box.
-     * 
-     * @see com.lowagie.text.pdf.PdfPageEventHelper#onGenericTag(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document, com.lowagie.text.Rectangle, java.lang.String)
-     */
-    public void onGenericTag(PdfWriter writer, Document document, Rectangle rect, String text) {
-        if ("ellipse".equals(text)) {
-            PdfContentByte cb = writer.getDirectContent();
-            cb.setRGBColorStroke(0xFF, 0x00, 0x00);
-            cb.ellipse(rect.getLeft(), rect.getBottom() - 5f, rect.getRight(), rect.getTop());
-            cb.stroke();
-            cb.resetRGBColorStroke();
-        }
-        else if ("box".equals(text)) {
-            PdfContentByte cb = writer.getDirectContentUnder();
-            rect.setGrayFill(0.5f);
-            cb.rectangle(rect);
-        }
-    }
+
     /**
      * Generic page event.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -69,7 +50,7 @@ public static void main(String[] args) {
             PdfWriter writer = PdfWriter.getInstance(document,
                     new FileOutputStream("Generic.pdf"));
             writer.setPageEvent(new Generic());
-            
+
             // step 3: we open the document
             document.open();
             // step 4:
@@ -103,4 +84,24 @@ public static void main(String[] args) {
         // step 5: we close the document
         document.close();
     }
+
+    /**
+     * Draws an ellipse if the text was ellipse, a box if the text was box.
+     *
+     * @see com.lowagie.text.pdf.PdfPageEventHelper#onGenericTag(com.lowagie.text.pdf.PdfWriter,
+     * com.lowagie.text.Document, com.lowagie.text.Rectangle, java.lang.String)
+     */
+    public void onGenericTag(PdfWriter writer, Document document, Rectangle rect, String text) {
+        if ("ellipse".equals(text)) {
+            PdfContentByte cb = writer.getDirectContent();
+            cb.setRGBColorStroke(0xFF, 0x00, 0x00);
+            cb.ellipse(rect.getLeft(), rect.getBottom() - 5f, rect.getRight(), rect.getTop());
+            cb.stroke();
+            cb.resetRGBColorStroke();
+        } else if ("box".equals(text)) {
+            PdfContentByte cb = writer.getDirectContentUnder();
+            rect.setGrayFill(0.5f);
+            cb.rectangle(rect);
+        }
+    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Glossary.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Glossary.java
index 9b4881d83..6569b134a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Glossary.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Glossary.java
@@ -9,16 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Map;
-import java.util.TreeMap;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -29,30 +24,27 @@
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfPageEventHelper;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * Demonstrates the use of the Generic PageEvent.
- * 
+ *
  * @author blowagie
  */
 
 public class Glossary extends PdfPageEventHelper {
-    
-    /** keeps a glossary of words and the pages they appear on */
-    private Map glossary = new TreeMap<>();
-    
+
     /**
-     * All the text that is passed to this event, gets registered in the glossary.
-     * 
-     * @see com.lowagie.text.pdf.PdfPageEventHelper#onGenericTag(com.lowagie.text.pdf.PdfWriter, com.lowagie.text.Document, com.lowagie.text.Rectangle, java.lang.String)
+     * keeps a glossary of words and the pages they appear on
      */
-    public void onGenericTag(PdfWriter writer, Document document, Rectangle rect, String text) {
-        glossary.put(text, writer.getPageNumber());
-    }
-    
+    private Map glossary = new TreeMap<>();
+
     /**
      * Generic page event.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -68,7 +60,7 @@ public static void main(String[] args) {
                     new FileOutputStream("Glossary.pdf"));
             Glossary generic = new Glossary();
             writer.setPageEvent(generic);
-            
+
             // step 3: we open the document
             document.open();
             // step 4:
@@ -111,7 +103,7 @@ public static void main(String[] args) {
                     document.newPage();
                 }
             }
-            
+
             // we add the glossary
             document.newPage();
             for (Object o : generic.glossary.keySet()) {
@@ -129,4 +121,14 @@ public static void main(String[] args) {
         // step 5: we close the document
         document.close();
     }
+
+    /**
+     * All the text that is passed to this event, gets registered in the glossary.
+     *
+     * @see com.lowagie.text.pdf.PdfPageEventHelper#onGenericTag(com.lowagie.text.pdf.PdfWriter,
+     * com.lowagie.text.Document, com.lowagie.text.Rectangle, java.lang.String)
+     */
+    public void onGenericTag(PdfWriter writer, Document document, Rectangle rect, String text) {
+        glossary.put(text, writer.getPageNumber());
+    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Hyphenation.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Hyphenation.java
index 563975a1d..a113b30cd 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Hyphenation.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Hyphenation.java
@@ -9,14 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -24,10 +21,12 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.HyphenationAuto;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Make iText hyphenate your text.
- * 
+ *
  * @author blowagie
  */
 
@@ -35,9 +34,8 @@ public class Hyphenation {
 
     /**
      * Using auto-hyphenation.
-     * 
-     * @param args
-     *            no arguments needed here
+     *
+     * @param args no arguments needed here
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Lines.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Lines.java
index 39f565828..a3201dc91 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Lines.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Lines.java
@@ -9,15 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -25,10 +21,13 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates how to add lines to underline Chunks, strike through, etc...
- * 
+ *
  * @author blowagie
  */
 
@@ -36,7 +35,7 @@ public class Lines {
 
     /**
      * Underline or strike through text.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -60,7 +59,7 @@ public static void main(String[] args) {
             p.add(underlined);
             document.add(p);
             Chunk strikethru = new Chunk("strike through example");
-            strikethru.setUnderline(0.5f, 3f);    
+            strikethru.setUnderline(0.5f, 3f);
             document.add(strikethru);
             document.add(Chunk.NEWLINE);
             document.add(Chunk.NEWLINE);
@@ -68,7 +67,8 @@ public static void main(String[] args) {
             Chunk c;
             c = new Chunk("Multiple lines");
             c.setUnderline(new Color(0xFF, 0x00, 0x00), 0.0f, 0.3f, 0.0f, 0.4f, PdfContentByte.LINE_CAP_ROUND);
-            c.setUnderline(new Color(0x00, 0xFF, 0x00), 5.0f, 0.0f, 0.0f, -0.5f, PdfContentByte.LINE_CAP_PROJECTING_SQUARE);
+            c.setUnderline(new Color(0x00, 0xFF, 0x00), 5.0f, 0.0f, 0.0f, -0.5f,
+                    PdfContentByte.LINE_CAP_PROJECTING_SQUARE);
             c.setUnderline(new Color(0x00, 0x00, 0xFF), 0.0f, 0.2f, 15.0f, 0.0f, PdfContentByte.LINE_CAP_BUTT);
             document.add(c);
             document.add(Chunk.NEWLINE);
@@ -76,7 +76,8 @@ public static void main(String[] args) {
             document.add(Chunk.NEWLINE);
             c = new Chunk("Multiple lines", FontFactory.getFont(FontFactory.HELVETICA, 24));
             c.setUnderline(new Color(0xFF, 0x00, 0x00), 0.0f, 0.3f, 0.0f, 0.4f, PdfContentByte.LINE_CAP_ROUND);
-            c.setUnderline(new Color(0x00, 0xFF, 0x00), 5.0f, 0.0f, 0.0f, -0.5f, PdfContentByte.LINE_CAP_PROJECTING_SQUARE);
+            c.setUnderline(new Color(0x00, 0xFF, 0x00), 5.0f, 0.0f, 0.0f, -0.5f,
+                    PdfContentByte.LINE_CAP_PROJECTING_SQUARE);
             c.setUnderline(new Color(0x00, 0x00, 0xFF), 0.0f, 0.2f, 15.0f, 0.0f, PdfContentByte.LINE_CAP_BUTT);
             document.add(c);
         } catch (DocumentException | IOException de) {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Rendering.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Rendering.java
index 43846d476..95313aa7f 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Rendering.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Rendering.java
@@ -9,25 +9,24 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Special rendering of Chunks.
- * 
+ *
  * @author blowagie
  */
 
@@ -35,7 +34,7 @@ public class Rendering {
 
     /**
      * Special rendering of Chunks.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -71,7 +70,7 @@ public static void main(String[] args) {
             Chunk bold = new Chunk("This looks like Font.BOLD");
             bold.setTextRenderMode(PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE, 0.5f, new Color(0x00, 0x00, 0x00));
             document.add(bold);
-            
+
         } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Skew.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Skew.java
index 9a715fd6d..214b6e3ff 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Skew.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Skew.java
@@ -9,23 +9,22 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Making chunks skew.
- * 
+ *
  * @author blowagie
  */
 
@@ -33,7 +32,7 @@ public class Skew {
 
     /**
      * SetSkew.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -72,7 +71,7 @@ public static void main(String[] args) {
             Chunk italic = new Chunk("This looks like Font.ITALIC");
             italic.setSkew(0f, 12f);
             document.add(italic);
-            
+
         } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/SplitChar.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/SplitChar.java
index 512c06d9d..680e464a6 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/SplitChar.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/SplitChar.java
@@ -9,14 +9,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -26,10 +23,12 @@
 import com.lowagie.text.SplitCharacter;
 import com.lowagie.text.pdf.PdfChunk;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Demonstrates the use of the splitcharacter.
- * 
+ *
  * @author blowagie
  */
 
@@ -37,7 +36,7 @@ public class SplitChar implements SplitCharacter {
 
     /**
      * Demonstrates the use of the splitcharacter.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
@@ -59,12 +58,12 @@ public static void main(String[] args) {
             Paragraph p;
             String text = "Some.text.to.show.the.splitting.action.of.the.interface.";
             Font font = FontFactory.getFont(FontFactory.HELVETICA, 24);
-            
+
             document.add(new Paragraph("Normal split."));
             chunk = new Chunk(text, font);
             p = new Paragraph(24, chunk);
             document.add(p);
-            
+
             document.add(new Paragraph("The dot '.' is the split character."));
             chunk = new Chunk(text, font);
             chunk.setSplitCharacter(new SplitChar());
@@ -83,10 +82,11 @@ public static void main(String[] args) {
      */
     public boolean isSplitCharacter(int start, int current, int end, char[] cc, PdfChunk[] ck) {
         char c;
-        if (ck == null)
+        if (ck == null) {
             c = cc[current];
-        else
+        } else {
             c = (char) ck[Math.min(current, ck.length - 1)].getUnicodeEquivalent(cc[current]);
+        }
         return (c == '.');
     }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/SubSupScript.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/SubSupScript.java
index 77b2a393f..666f0aec9 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/SubSupScript.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/SubSupScript.java
@@ -9,25 +9,24 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.StringTokenizer;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.StringTokenizer;
 
 /**
  * Demonstrates how sub- and superscript works.
- * 
+ *
  * @author blowagie
  */
 
@@ -35,7 +34,7 @@ public class SubSupScript {
 
     /**
      * Demonstrates the use of Subscript and superscript.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Width.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Width.java
index 129a09325..767eb83d0 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Width.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/chunk/Width.java
@@ -9,23 +9,22 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 
 package com.lowagie.examples.objects.chunk;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * How to measure and scale the width of a Chunk.
- * 
+ *
  * @author blowagie
  */
 
@@ -33,7 +32,7 @@ public class Width {
 
     /**
      * Demonstrates how to measure and scale the width of a Chunk.
-     * 
+     *
      * @param args no arguments needed here
      */
     public static void main(String[] args) {
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/Column.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/Column.java
index 2b2c8b5b0..167ef4d3c 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/Column.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/Column.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.columns;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -25,50 +22,176 @@
 import com.lowagie.text.pdf.ColumnText;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Writes text in a column that can be added at an absolute position.
  */
 public class Column {
-    
+
+    /**
+     * a string array we want to output.
+     */
+    public static String[] uni = new String[27];
+    /**
+     * a string array we want to output.
+     */
+    public static String[] code = new String[27];
+    /**
+     * a string array we want to output.
+     */
+    public static String[] name = new String[27];
+
+    static {
+        uni[0] = "\\u0152";
+        code[0] = "\u0152";
+        name[0] = "LATIN CAPITAL LIGATURE OE";
+
+        uni[1] = "\\u0153";
+        code[1] = "\u0153";
+        name[1] = "LATIN SMALL LIGATURE OE";
+
+        uni[2] = "\\u0160";
+        code[2] = "\u0160";
+        name[2] = "LATIN CAPITAL LETTER S WITH CARON";
+
+        uni[3] = "\\u0161";
+        code[3] = "\u0161";
+        name[3] = "LATIN SMALL LETTER S WITH CARON";
+
+        uni[4] = "\\u0178";
+        code[4] = "\u0178";
+        name[4] = "LATIN CAPITAL LETTER Y WITH DIAERESIS";
+
+        uni[5] = "\\u017D";
+        code[5] = "\u017D";
+        name[5] = "LATIN CAPITAL LETTER Z WITH CARON";
+
+        uni[6] = "\\u017E";
+        code[6] = "\u017E";
+        name[6] = "LATIN SMALL LETTER Z WITH CARON";
+
+        uni[7] = "\\u0192";
+        code[7] = "\u0192";
+        name[7] = "LATIN SMALL LETTER F WITH HOOK";
+
+        uni[8] = "\\u02C6";
+        code[8] = "\u02C6";
+        name[8] = "MODIFIER LETTER CIRCUMFLEX ACCENT";
+
+        uni[9] = "\\u02DC";
+        code[9] = "\u02DC";
+        name[9] = "SMALL TILDE";
+
+        uni[10] = "\\u2013";
+        code[10] = "\u2013";
+        name[10] = "EN DASH";
+
+        uni[11] = "\\u2014";
+        code[11] = "\u2014";
+        name[11] = "EM DASH";
+
+        uni[12] = "\\u2018";
+        code[12] = "\u2018";
+        name[12] = "LEFT SINGLE QUOTATION MARK";
+
+        uni[13] = "\\u2019";
+        code[13] = "\u2019";
+        name[13] = "RIGHT SINGLE QUOTATION MARK";
+
+        uni[14] = "\\u201A";
+        code[14] = "\u201A";
+        name[14] = "SINGLE LOW-9 QUOTATION MARK";
+
+        uni[15] = "\\u201C";
+        code[15] = "\u201C";
+        name[15] = "LEFT DOUBLE QUOTATION MARK";
+
+        uni[16] = "\\u201D";
+        code[16] = "\u201D";
+        name[16] = "RIGHT DOUBLE QUOTATION MARK";
+
+        uni[17] = "\\u201E";
+        code[17] = "\u201E";
+        name[17] = "DOUBLE LOW-9 QUOTATION MARK";
+
+        uni[18] = "\\u2020";
+        code[18] = "\u2020";
+        name[18] = "DAGGER";
+
+        uni[19] = "\\u2021";
+        code[19] = "\u2021";
+        name[19] = "DOUBLE DAGGER";
+
+        uni[20] = "\\u2022";
+        code[20] = "\u2022";
+        name[20] = "BULLET";
+
+        uni[21] = "\\u2026";
+        code[21] = "\u2026";
+        name[21] = "HORIZONTAL ELLIPSIS";
+
+        uni[22] = "\\u2030";
+        code[22] = "\u2030";
+        name[22] = "PER MILLE SIGN";
+
+        uni[23] = "\\u2039";
+        code[23] = "\u2039";
+        name[23] = "SINGLE LEFT-POINTING ANGLE QUOTATION MARK";
+
+        uni[24] = "\\u203A";
+        code[24] = "\u203A";
+        name[24] = "SINGLE RIGHT-POINTING ANGLE QUOTATION MARK";
+
+        uni[25] = "\\u20AC";
+        code[25] = "\u20AC";
+        name[25] = "EURO SIGN";
+
+        uni[26] = "\\u2122";
+        code[26] = "\u2122";
+        name[26] = "TRADE MARK SIGN";
+    }
+
     /**
      * Demonstrating the use of ColumnText
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Simple single object columns");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2: creation of the writer
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("column.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
-            
+
             // we create some content
             BaseFont bf = BaseFont.createFont(BaseFont.COURIER, BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
             Font font = new Font(bf, 11, Font.NORMAL);
-            
+
             Phrase unicodes = new Phrase(15, "UNI\n", font);
             Phrase characters = new Phrase(15, "\n", font);
             Phrase names = new Phrase(15, "NAME\n", font);
-            
+
             for (int i = 0; i < 27; i++) {
                 unicodes.add(uni[i] + "\n");
                 characters.add(code[i] + "\n");
                 names.add(name[i] + "\n");
             }
-            
+
             // we grab the ContentByte and do some stuff with it
             PdfContentByte cb = writer.getDirectContent();
-            
+
             ColumnText ct = new ColumnText(cb);
             ct.setSimpleColumn(unicodes, 60, 300, 100, 300 + 28 * 15, 15, Element.ALIGN_CENTER);
             ct.go();
@@ -78,130 +201,12 @@ public static void main(String[] args) {
             ct.go();
             ct.setSimpleColumn(names, 160, 300, 500, 300 + 28 * 15, 15, Element.ALIGN_LEFT);
             ct.go();
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
         // step 5: we close the document
         document.close();
     }
-    
-    /** a string array we want to output. */
-    public static String[] uni = new String[27];
-    /** a string array we want to output. */
-    public static String[] code = new String[27];
-    /** a string array we want to output. */
-    public static String[] name = new String[27];
-    
-    static {
-        uni[0]="\\u0152";
-        code[0]="\u0152";
-        name[0]="LATIN CAPITAL LIGATURE OE";
-        
-        uni[1]="\\u0153";
-        code[1]="\u0153";
-        name[1]="LATIN SMALL LIGATURE OE";
-        
-        uni[2]="\\u0160";
-        code[2]="\u0160";
-        name[2]="LATIN CAPITAL LETTER S WITH CARON";
-        
-        uni[3]="\\u0161";
-        code[3]="\u0161";
-        name[3]="LATIN SMALL LETTER S WITH CARON";
-        
-        uni[4]="\\u0178";
-        code[4]="\u0178";
-        name[4]="LATIN CAPITAL LETTER Y WITH DIAERESIS";
-        
-        uni[5]="\\u017D";
-        code[5]="\u017D";
-        name[5]="LATIN CAPITAL LETTER Z WITH CARON";
-        
-        uni[6]="\\u017E";
-        code[6]="\u017E";
-        name[6]="LATIN SMALL LETTER Z WITH CARON";
-        
-        uni[7]="\\u0192";
-        code[7]="\u0192";
-        name[7]="LATIN SMALL LETTER F WITH HOOK";
-        
-        uni[8]="\\u02C6";
-        code[8]="\u02C6";
-        name[8]="MODIFIER LETTER CIRCUMFLEX ACCENT";
-        
-        uni[9]="\\u02DC";
-        code[9]="\u02DC";
-        name[9]="SMALL TILDE";
-        
-        uni[10]="\\u2013";
-        code[10]="\u2013";
-        name[10]="EN DASH";
-        
-        uni[11]="\\u2014";
-        code[11]="\u2014";
-        name[11]="EM DASH";
-        
-        uni[12]="\\u2018";
-        code[12]="\u2018";
-        name[12]="LEFT SINGLE QUOTATION MARK";
-        
-        uni[13]="\\u2019";
-        code[13]="\u2019";
-        name[13]="RIGHT SINGLE QUOTATION MARK";
-        
-        uni[14]="\\u201A";
-        code[14]="\u201A";
-        name[14]="SINGLE LOW-9 QUOTATION MARK";
-        
-        uni[15]="\\u201C";
-        code[15]="\u201C";
-        name[15]="LEFT DOUBLE QUOTATION MARK";
-        
-        uni[16]="\\u201D";
-        code[16]="\u201D";
-        name[16]="RIGHT DOUBLE QUOTATION MARK";
-        
-        uni[17]="\\u201E";
-        code[17]="\u201E";
-        name[17]="DOUBLE LOW-9 QUOTATION MARK";
-        
-        uni[18]="\\u2020";
-        code[18]="\u2020";
-        name[18]="DAGGER";
-        
-        uni[19]="\\u2021";
-        code[19]="\u2021";
-        name[19]="DOUBLE DAGGER";
-        
-        uni[20]="\\u2022";
-        code[20]="\u2022";
-        name[20]="BULLET";
-        
-        uni[21]="\\u2026";
-        code[21]="\u2026";
-        name[21]="HORIZONTAL ELLIPSIS";
-        
-        uni[22]="\\u2030";
-        code[22]="\u2030";
-        name[22]="PER MILLE SIGN";
-        
-        uni[23]="\\u2039";
-        code[23]="\u2039";
-        name[23]="SINGLE LEFT-POINTING ANGLE QUOTATION MARK";
-        
-        uni[24]="\\u203A";
-        code[24]="\u203A";
-        name[24]="SINGLE RIGHT-POINTING ANGLE QUOTATION MARK";
-        
-        uni[25]="\\u20AC";
-        code[25]="\u20AC";
-        name[25]="EURO SIGN";
-        
-        uni[26]="\\u2122";
-        code[26]="\u2122";
-        name[26]="TRADE MARK SIGN";
-    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnSimple.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnSimple.java
index 4b2a341a4..da9e7c255 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnSimple.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnSimple.java
@@ -1,21 +1,18 @@
 /*
  * $Id: ColumnSimple.java 3373 2008-05-12 16:21:24Z xlv $
- * 
+ *
  * This code is part of the 'OpenPDF Tutorial'.
  * You can find the complete tutorial at the following address:
  * https://github.com/LibrePDF/OpenPDF/wiki/Tutorial
- * 
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
  * A PARTICULAR PURPOSE.
- * 
- *  
+ *
+ *
  */
 package com.lowagie.examples.objects.columns;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -25,41 +22,167 @@
 import com.lowagie.text.pdf.ColumnText;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Writes text in a column that can be added at an absolute position.
  */
 public class ColumnSimple {
-    
+
+    /**
+     * a string array we want to output.
+     */
+    public static String[] uni = new String[27];
+    /**
+     * a string array we want to output.
+     */
+    public static String[] code = new String[27];
+    /**
+     * a string array we want to output.
+     */
+    public static String[] name = new String[27];
+
+    static {
+        uni[0] = "\\u0152";
+        code[0] = "\u0152";
+        name[0] = "LATIN CAPITAL LIGATURE OE";
+
+        uni[1] = "\\u0153";
+        code[1] = "\u0153";
+        name[1] = "LATIN SMALL LIGATURE OE";
+
+        uni[2] = "\\u0160";
+        code[2] = "\u0160";
+        name[2] = "LATIN CAPITAL LETTER S WITH CARON";
+
+        uni[3] = "\\u0161";
+        code[3] = "\u0161";
+        name[3] = "LATIN SMALL LETTER S WITH CARON";
+
+        uni[4] = "\\u0178";
+        code[4] = "\u0178";
+        name[4] = "LATIN CAPITAL LETTER Y WITH DIAERESIS";
+
+        uni[5] = "\\u017D";
+        code[5] = "\u017D";
+        name[5] = "LATIN CAPITAL LETTER Z WITH CARON";
+
+        uni[6] = "\\u017E";
+        code[6] = "\u017E";
+        name[6] = "LATIN SMALL LETTER Z WITH CARON";
+
+        uni[7] = "\\u0192";
+        code[7] = "\u0192";
+        name[7] = "LATIN SMALL LETTER F WITH HOOK";
+
+        uni[8] = "\\u02C6";
+        code[8] = "\u02C6";
+        name[8] = "MODIFIER LETTER CIRCUMFLEX ACCENT";
+
+        uni[9] = "\\u02DC";
+        code[9] = "\u02DC";
+        name[9] = "SMALL TILDE";
+
+        uni[10] = "\\u2013";
+        code[10] = "\u2013";
+        name[10] = "EN DASH";
+
+        uni[11] = "\\u2014";
+        code[11] = "\u2014";
+        name[11] = "EM DASH";
+
+        uni[12] = "\\u2018";
+        code[12] = "\u2018";
+        name[12] = "LEFT SINGLE QUOTATION MARK";
+
+        uni[13] = "\\u2019";
+        code[13] = "\u2019";
+        name[13] = "RIGHT SINGLE QUOTATION MARK";
+
+        uni[14] = "\\u201A";
+        code[14] = "\u201A";
+        name[14] = "SINGLE LOW-9 QUOTATION MARK";
+
+        uni[15] = "\\u201C";
+        code[15] = "\u201C";
+        name[15] = "LEFT DOUBLE QUOTATION MARK";
+
+        uni[16] = "\\u201D";
+        code[16] = "\u201D";
+        name[16] = "RIGHT DOUBLE QUOTATION MARK";
+
+        uni[17] = "\\u201E";
+        code[17] = "\u201E";
+        name[17] = "DOUBLE LOW-9 QUOTATION MARK";
+
+        uni[18] = "\\u2020";
+        code[18] = "\u2020";
+        name[18] = "DAGGER";
+
+        uni[19] = "\\u2021";
+        code[19] = "\u2021";
+        name[19] = "DOUBLE DAGGER";
+
+        uni[20] = "\\u2022";
+        code[20] = "\u2022";
+        name[20] = "BULLET";
+
+        uni[21] = "\\u2026";
+        code[21] = "\u2026";
+        name[21] = "HORIZONTAL ELLIPSIS";
+
+        uni[22] = "\\u2030";
+        code[22] = "\u2030";
+        name[22] = "PER MILLE SIGN";
+
+        uni[23] = "\\u2039";
+        code[23] = "\u2039";
+        name[23] = "SINGLE LEFT-POINTING ANGLE QUOTATION MARK";
+
+        uni[24] = "\\u203A";
+        code[24] = "\u203A";
+        name[24] = "SINGLE RIGHT-POINTING ANGLE QUOTATION MARK";
+
+        uni[25] = "\\u20AC";
+        code[25] = "\u20AC";
+        name[25] = "EURO SIGN";
+
+        uni[26] = "\\u2122";
+        code[26] = "\u2122";
+        name[26] = "TRADE MARK SIGN";
+    }
+
     /**
      * Demonstrating the use of ColumnText
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Simple Column");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("columnsimple.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
-            
+
             // we grab the ContentByte and do some stuff with it
             PdfContentByte cb = writer.getDirectContent();
-            
+
             BaseFont bf = BaseFont.createFont(BaseFont.COURIER, BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
             Font font = new Font(bf, 11, Font.NORMAL);
-            
+
             ColumnText ct = new ColumnText(cb);
             ct.setSimpleColumn(60, 300, 100, 300 + 28 * 15, 15, Element.ALIGN_CENTER);
             ct.addText(new Phrase(15, "UNI\n", font));
@@ -81,130 +204,12 @@ public static void main(String[] args) {
                 ct.addText(new Phrase(15, name[i] + "\n", font));
             }
             ct.go();
-            
-        }
-        catch(DocumentException | IOException de) {
+
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
         // step 5: we close the document
         document.close();
     }
-
-    /** a string array we want to output. */
-    public static String[] uni = new String[27];
-    /** a string array we want to output. */
-    public static String[] code = new String[27];
-    /** a string array we want to output. */
-    public static String[] name = new String[27];
-    
-    static {
-        uni[0]="\\u0152";
-        code[0]="\u0152";
-        name[0]="LATIN CAPITAL LIGATURE OE";
-        
-        uni[1]="\\u0153";
-        code[1]="\u0153";
-        name[1]="LATIN SMALL LIGATURE OE";
-        
-        uni[2]="\\u0160";
-        code[2]="\u0160";
-        name[2]="LATIN CAPITAL LETTER S WITH CARON";
-        
-        uni[3]="\\u0161";
-        code[3]="\u0161";
-        name[3]="LATIN SMALL LETTER S WITH CARON";
-        
-        uni[4]="\\u0178";
-        code[4]="\u0178";
-        name[4]="LATIN CAPITAL LETTER Y WITH DIAERESIS";
-        
-        uni[5]="\\u017D";
-        code[5]="\u017D";
-        name[5]="LATIN CAPITAL LETTER Z WITH CARON";
-        
-        uni[6]="\\u017E";
-        code[6]="\u017E";
-        name[6]="LATIN SMALL LETTER Z WITH CARON";
-        
-        uni[7]="\\u0192";
-        code[7]="\u0192";
-        name[7]="LATIN SMALL LETTER F WITH HOOK";
-        
-        uni[8]="\\u02C6";
-        code[8]="\u02C6";
-        name[8]="MODIFIER LETTER CIRCUMFLEX ACCENT";
-        
-        uni[9]="\\u02DC";
-        code[9]="\u02DC";
-        name[9]="SMALL TILDE";
-        
-        uni[10]="\\u2013";
-        code[10]="\u2013";
-        name[10]="EN DASH";
-        
-        uni[11]="\\u2014";
-        code[11]="\u2014";
-        name[11]="EM DASH";
-        
-        uni[12]="\\u2018";
-        code[12]="\u2018";
-        name[12]="LEFT SINGLE QUOTATION MARK";
-        
-        uni[13]="\\u2019";
-        code[13]="\u2019";
-        name[13]="RIGHT SINGLE QUOTATION MARK";
-        
-        uni[14]="\\u201A";
-        code[14]="\u201A";
-        name[14]="SINGLE LOW-9 QUOTATION MARK";
-        
-        uni[15]="\\u201C";
-        code[15]="\u201C";
-        name[15]="LEFT DOUBLE QUOTATION MARK";
-        
-        uni[16]="\\u201D";
-        code[16]="\u201D";
-        name[16]="RIGHT DOUBLE QUOTATION MARK";
-        
-        uni[17]="\\u201E";
-        code[17]="\u201E";
-        name[17]="DOUBLE LOW-9 QUOTATION MARK";
-        
-        uni[18]="\\u2020";
-        code[18]="\u2020";
-        name[18]="DAGGER";
-        
-        uni[19]="\\u2021";
-        code[19]="\u2021";
-        name[19]="DOUBLE DAGGER";
-        
-        uni[20]="\\u2022";
-        code[20]="\u2022";
-        name[20]="BULLET";
-        
-        uni[21]="\\u2026";
-        code[21]="\u2026";
-        name[21]="HORIZONTAL ELLIPSIS";
-        
-        uni[22]="\\u2030";
-        code[22]="\u2030";
-        name[22]="PER MILLE SIGN";
-        
-        uni[23]="\\u2039";
-        code[23]="\u2039";
-        name[23]="SINGLE LEFT-POINTING ANGLE QUOTATION MARK";
-        
-        uni[24]="\\u203A";
-        code[24]="\u203A";
-        name[24]="SINGLE RIGHT-POINTING ANGLE QUOTATION MARK";
-        
-        uni[25]="\\u20AC";
-        code[25]="\u20AC";
-        name[25]="EURO SIGN";
-        
-        uni[26]="\\u2122";
-        code[26]="\u2122";
-        name[26]="TRADE MARK SIGN";
-    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnTextMultiTable.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnTextMultiTable.java
index 10cd7ed36..449d47c2c 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnTextMultiTable.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnTextMultiTable.java
@@ -17,11 +17,10 @@
 
 
 /**
- * Scenario description: Generate a pdf file with multi tables by the ColumnText class, and the
- * first table is at the bottom of the first page. So the second table will
- * generate at the new page.
- * @author mainly written by alesky78, modified by chappyer
+ * Scenario description: Generate a pdf file with multi tables by the ColumnText class, and the first table is at the
+ * bottom of the first page. So the second table will generate at the new page.
  *
+ * @author mainly written by alesky78, modified by chappyer
  */
 public class ColumnTextMultiTable {
 
@@ -29,12 +28,10 @@ public class ColumnTextMultiTable {
     public static float A4_MARGIN_RIGHT = 40;
     public static float A4_MARGIN_TOP = 100;
     public static float A4_MARGIN_BOTTOM = A4_MARGIN_TOP;
-    public static float A4_WIDTH_BODY = PageSize.A4.getWidth()-A4_MARGIN_LEFT-A4_MARGIN_RIGHT;
-    public static float A4_HEIGHT_BODY = PageSize.A4.getHeight()-A4_MARGIN_TOP-A4_MARGIN_BOTTOM;
-
-    protected PdfWriter pdfWriter;
-
+    public static float A4_HEIGHT_BODY = PageSize.A4.getHeight() - A4_MARGIN_TOP - A4_MARGIN_BOTTOM;
+    public static float A4_WIDTH_BODY = PageSize.A4.getWidth() - A4_MARGIN_LEFT - A4_MARGIN_RIGHT;
     protected static Document document;
+    protected PdfWriter pdfWriter;
 
     public static void main(String[] args) throws IOException {
 
@@ -57,14 +54,15 @@ public static void main(String[] args) throws IOException {
         float space = columnTextTable.getHeightOfBlock(table);
 
         ColumnText ct = new ColumnText(columnTextTable.pdfWriter.getDirectContent());
-        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY+A4_MARGIN_LEFT, A4_HEIGHT_BODY+A4_MARGIN_BOTTOM);
+        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY + A4_MARGIN_LEFT,
+                A4_HEIGHT_BODY + A4_MARGIN_BOTTOM);
         float actualY = ColumnTextMultiTable.addFullBockToPage(A4_MARGIN_BOTTOM + space, ct, table);
 
         ct = new ColumnText(columnTextTable.pdfWriter.getDirectContent());
-        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY+A4_MARGIN_LEFT, A4_HEIGHT_BODY+A4_MARGIN_BOTTOM);
+        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY + A4_MARGIN_LEFT,
+                A4_HEIGHT_BODY + A4_MARGIN_BOTTOM);
         addFullBockToPage(actualY, ct, table);
 
-
         document.close();
 
         FileOutputStream fos = new FileOutputStream(outputPDF);
@@ -72,43 +70,14 @@ public static void main(String[] args) throws IOException {
         fos.close();
     }
 
-
-    /**
-     * Get the PdfPTable which will be written into the PDF file.
-     * @return PdfPTable
-     */
-    PdfPTable getPdfPTable(){
-        Paragraph f1,f2;
-        PdfPTable table;
-        table = new PdfPTable(1);
-        table.setTotalWidth(A4_WIDTH_BODY);
-        table.setLockedWidth(true);
-        table.setSplitRows(false);
-        PdfPCell cell;
-        f1 = new Paragraph( new Chunk("cell1 example content"));
-        f1.add(Chunk.NEWLINE);
-        f1.setAlignment(Element.ALIGN_CENTER);
-        f2 = new Paragraph( new Chunk("cell2 example content"));
-        f2.add(Chunk.NEWLINE);
-        f2.setAlignment(Element.ALIGN_CENTER);
-        cell = new PdfPCell();
-        cell.addElement(f1);
-        table.addCell(cell);
-        cell = new PdfPCell();
-        cell.addElement(f2);
-        table.addCell(cell);
-        return table;
-    }
-
-
-     static float addFullBockToPage(float actualY, ColumnText ct, Element... elements) {
+    static float addFullBockToPage(float actualY, ColumnText ct, Element... elements) {
         int result;
         for (Element element : elements) {
             ct.addElement(element);
         }
         ct.setYLine(actualY);
         result = ct.go(true);
-        if(!ColumnText.hasMoreText(result)) {
+        if (!ColumnText.hasMoreText(result)) {
             ct.setYLine(actualY);
             ct.setText(null);
             for (Element element : elements) {
@@ -116,8 +85,7 @@ static float addFullBockToPage(float actualY, ColumnText ct, Element... elements
             }
             ct.go(false);
             actualY = ct.getYLine();
-        }
-        else {
+        } else {
             ct.setText(null);
             for (Element element : elements) {
                 ct.addElement(element);
@@ -126,7 +94,7 @@ static float addFullBockToPage(float actualY, ColumnText ct, Element... elements
             result = 0;
             while (ColumnText.hasMoreText(result)) {
                 document.newPage();
-                ct.setYLine(A4_HEIGHT_BODY+A4_MARGIN_BOTTOM);
+                ct.setYLine(A4_HEIGHT_BODY + A4_MARGIN_BOTTOM);
                 result = ct.go(false);
             }
             actualY = ct.getYLine();
@@ -136,18 +104,48 @@ static float addFullBockToPage(float actualY, ColumnText ct, Element... elements
 
     }
 
+    /**
+     * Get the PdfPTable which will be written into the PDF file.
+     *
+     * @return PdfPTable
+     */
+    PdfPTable getPdfPTable() {
+        Paragraph f1, f2;
+        PdfPTable table;
+        table = new PdfPTable(1);
+        table.setTotalWidth(A4_WIDTH_BODY);
+        table.setLockedWidth(true);
+        table.setSplitRows(false);
+        PdfPCell cell;
+        f1 = new Paragraph(new Chunk("cell1 example content"));
+        f1.add(Chunk.NEWLINE);
+        f1.setAlignment(Element.ALIGN_CENTER);
+        f2 = new Paragraph(new Chunk("cell2 example content"));
+        f2.add(Chunk.NEWLINE);
+        f2.setAlignment(Element.ALIGN_CENTER);
+        cell = new PdfPCell();
+        cell.addElement(f1);
+        table.addCell(cell);
+        cell = new PdfPCell();
+        cell.addElement(f2);
+        table.addCell(cell);
+        return table;
+    }
+
     /**
      * Get the height of the input block.
+     *
      * @param elements The input elements which will be used to calculate the height.
      * @return height, which is the height of the input block.
      */
-    float getHeightOfBlock(Element... elements){
+    float getHeightOfBlock(Element... elements) {
         ColumnText ct = new ColumnText(pdfWriter.getDirectContent());
-        float startY = A4_HEIGHT_BODY+A4_MARGIN_BOTTOM;
+        float startY = A4_HEIGHT_BODY + A4_MARGIN_BOTTOM;
 
         float height;
 
-        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY+A4_MARGIN_LEFT, A4_HEIGHT_BODY+A4_MARGIN_BOTTOM);
+        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY + A4_MARGIN_LEFT,
+                A4_HEIGHT_BODY + A4_MARGIN_BOTTOM);
         ct.setYLine(startY);
 
         for (Element element : elements) {
@@ -155,9 +153,9 @@ float getHeightOfBlock(Element... elements){
         }
 
         int result = ct.go(true);
-        if(ColumnText.hasMoreText(result)) {
+        if (ColumnText.hasMoreText(result)) {
             return -1;
-        }else {
+        } else {
             height = startY - ct.getYLine();
             return height;
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnTextTable.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnTextTable.java
index 66b15c746..810932a36 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnTextTable.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/ColumnTextTable.java
@@ -16,8 +16,8 @@
 import java.io.IOException;
 
 /**
- * Scenario description: Generate a pdf file with a table by the ColumnText class, and this
- * table is place at the bottom of the file.
+ * Scenario description: Generate a pdf file with a table by the ColumnText class, and this table is place at the bottom
+ * of the file.
  */
 public class ColumnTextTable {
 
@@ -25,9 +25,8 @@ public class ColumnTextTable {
     public static float A4_MARGIN_RIGHT = 40;
     public static float A4_MARGIN_TOP = 100;
     public static float A4_MARGIN_BOTTOM = A4_MARGIN_TOP;
-    public static float A4_WIDTH_BODY = PageSize.A4.getWidth()-A4_MARGIN_LEFT-A4_MARGIN_RIGHT;
-    public static float A4_HEIGHT_BODY = PageSize.A4.getHeight()-A4_MARGIN_TOP-A4_MARGIN_BOTTOM;
-
+    public static float A4_HEIGHT_BODY = PageSize.A4.getHeight() - A4_MARGIN_TOP - A4_MARGIN_BOTTOM;
+    public static float A4_WIDTH_BODY = PageSize.A4.getWidth() - A4_MARGIN_LEFT - A4_MARGIN_RIGHT;
     protected PdfWriter pdfWriter;
 
     public static void main(String[] args) throws IOException {
@@ -49,7 +48,8 @@ public static void main(String[] args) throws IOException {
         PdfPTable table = columnTextTable.getPdfPTable();
 
         ColumnText ct = new ColumnText(columnTextTable.pdfWriter.getDirectContent());
-        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY+A4_MARGIN_LEFT, A4_HEIGHT_BODY+A4_MARGIN_BOTTOM);
+        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY + A4_MARGIN_LEFT,
+                A4_HEIGHT_BODY + A4_MARGIN_BOTTOM);
 
         float space = columnTextTable.getHeightOfBlock(table);
 
@@ -67,23 +67,23 @@ public static void main(String[] args) throws IOException {
     }
 
 
-
     /**
      * Get the PdfPTable which will be written into the PDF file.
+     *
      * @return PdfPTable
      */
-    PdfPTable getPdfPTable(){
-        Paragraph f1,f2;
+    PdfPTable getPdfPTable() {
+        Paragraph f1, f2;
         PdfPTable table;
         table = new PdfPTable(1);
         table.setTotalWidth(A4_WIDTH_BODY);
         table.setLockedWidth(true);
         table.setSplitRows(false);
         PdfPCell cell;
-        f1 = new Paragraph( new Chunk("cell1 example content"));
+        f1 = new Paragraph(new Chunk("cell1 example content"));
         f1.add(Chunk.NEWLINE);
         f1.setAlignment(Element.ALIGN_CENTER);
-        f2 = new Paragraph( new Chunk("cell2 example content"));
+        f2 = new Paragraph(new Chunk("cell2 example content"));
         f2.add(Chunk.NEWLINE);
         f2.setAlignment(Element.ALIGN_CENTER);
         cell = new PdfPCell();
@@ -96,19 +96,20 @@ PdfPTable getPdfPTable(){
     }
 
 
-
     /**
      * Get the height of the input block.
+     *
      * @param elements The input elements which will be used to calculate the height.
      * @return height, which is the height of the input block.
      */
-    float getHeightOfBlock(Element... elements){
+    float getHeightOfBlock(Element... elements) {
         ColumnText ct = new ColumnText(pdfWriter.getDirectContent());
-        float startY = A4_HEIGHT_BODY+A4_MARGIN_BOTTOM;
+        float startY = A4_HEIGHT_BODY + A4_MARGIN_BOTTOM;
 
         float height;
 
-        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY+A4_MARGIN_LEFT, A4_HEIGHT_BODY+A4_MARGIN_BOTTOM);
+        ct.setSimpleColumn(A4_MARGIN_LEFT, A4_MARGIN_BOTTOM, A4_WIDTH_BODY + A4_MARGIN_LEFT,
+                A4_HEIGHT_BODY + A4_MARGIN_BOTTOM);
         ct.setYLine(startY);
 
         for (Element element : elements) {
@@ -116,9 +117,9 @@ float getHeightOfBlock(Element... elements){
         }
 
         int result = ct.go(true);
-        if(ColumnText.hasMoreText(result)) {
+        if (ColumnText.hasMoreText(result)) {
             return -1;
-        }else {
+        } else {
             height = startY - ct.getYLine();
             return height;
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/MultiColumnR2L.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/MultiColumnR2L.java
index abf96336c..99bf38b14 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/MultiColumnR2L.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/MultiColumnR2L.java
@@ -9,16 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.columns;
 
-import java.awt.Color;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.Random;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -27,18 +21,49 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.MultiColumnText;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.Random;
 
 /**
  * An example using MultiColumnText with irregular columns.
  */
 public class MultiColumnR2L {
 
+    static Random rand = new Random();
+    static String[] verb = {"flows", "draws", "renders", "throws exception", "runs",
+            "crashes", "downloads", "usurps", "vexes", "whispers", "boils",
+            "capitulates", "crashes", "craves", "looks", "defies", "defers",
+            "defines", "envelops", "entombs", "falls", "fails", "halts",
+            "appears", "nags", "overflows", "burns", "dies", "writes",
+            "flushes"};
+    static String[] noun = {"ColumnText", "paragraph", "phrase", "chunk", "PdfContentByte",
+            "PdfPTable", "iText", "color", "vertical alignment", "horizontal alignment", "PdfWriter",
+            "ListItem", "PdfStamper", "PDF", "HTML", "XML", "column", "font",
+            "table", "FDF", "field", "NullPointerException", "CJK font"};
+    static String[] adjective = {"foul", "broken", "gray", "slow", "beautiful",
+            "throbbing", "sharp", "stout", "soundless", "neat",
+            "swift", "uniform", "upright", "vibrant", "dingy",
+            "vestigal", "messy", "sloppy", "baleful", "boastful",
+            "dark", "capricious", "concrete", "deliberate", "sharp",
+            "drunken", "undisciplined", "perfect", "bloated"};
+    static String[] adverb = {"randomly", "quickly", "triumphantly", "suggestively",
+            "slowly", "angrily", "uncomfortably", "finally", "unexpectedly",
+            "hysterically", "thinly", "dryly", "blazingly",
+            "terribly", "bleakly", "irritably", "dazzlingly", "expectantly",
+            "impersonally", "abruptly", "awfully", "caressingly", "completely",
+            "undesirably", "drolly", "hypocritically", "blankly",
+            "dimly"};
+
     /**
      * An example using MultiColumnText with irregular columns.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("MultiColumnText Right to Left");
         try {
             Document document = new Document();
@@ -46,7 +71,6 @@ public static void main(String[] args) {
             PdfWriter.getInstance(document, out);
             document.open();
 
-
             MultiColumnText mct = new MultiColumnText();
             mct.setColumnsRightToLeft(true);
 
@@ -73,64 +97,33 @@ public static void main(String[] args) {
     }
 
     private static Element newPara(String text, int alignment, int type) {
-       Font font = FontFactory.getFont("Helvetica", 10, type, Color.BLACK);
-       Paragraph p = new Paragraph(text, font);
-       p.setAlignment(alignment);
-       p.setLeading(font.getSize() * 1.2f);
-       return p;
+        Font font = FontFactory.getFont("Helvetica", 10, type, Color.BLACK);
+        Paragraph p = new Paragraph(text, font);
+        p.setAlignment(alignment);
+        p.setLeading(font.getSize() * 1.2f);
+        return p;
     }
 
-    static Random rand = new Random();
-
-
-    static String[] verb = {"flows", "draws", "renders", "throws exception", "runs",
-        "crashes", "downloads", "usurps", "vexes", "whispers", "boils",
-        "capitulates", "crashes", "craves", "looks", "defies", "defers",
-        "defines", "envelops", "entombs", "falls", "fails", "halts",
-        "appears", "nags", "overflows", "burns", "dies", "writes",
-        "flushes"};
-
-    static String[] noun = {"ColumnText", "paragraph", "phrase", "chunk", "PdfContentByte",
-        "PdfPTable", "iText", "color", "vertical alignment", "horizontal alignment", "PdfWriter",
-        "ListItem", "PdfStamper", "PDF", "HTML", "XML", "column", "font",
-        "table", "FDF", "field", "NullPointerException", "CJK font"};
-
-    static String[] adjective = {"foul", "broken", "gray", "slow", "beautiful",
-       "throbbing", "sharp", "stout", "soundless", "neat",
-       "swift", "uniform", "upright", "vibrant", "dingy",
-       "vestigal", "messy", "sloppy", "baleful", "boastful",
-       "dark", "capricious", "concrete", "deliberate", "sharp",
-        "drunken", "undisciplined", "perfect", "bloated"};
-
-    static String[] adverb = {"randomly", "quickly", "triumphantly", "suggestively",
-       "slowly", "angrily", "uncomfortably", "finally", "unexpectedly",
-       "hysterically", "thinly", "dryly", "blazingly",
-       "terribly", "bleakly", "irritably", "dazzlingly", "expectantly",
-       "impersonally", "abruptly", "awfully", "caressingly", "completely",
-       "undesirably", "drolly", "hypocritically", "blankly",
-       "dimly"};
-
-    private static String randomWord(String[] type)
-    {
-       return type[rand.nextInt(type.length)];
+    private static String randomWord(String[] type) {
+        return type[rand.nextInt(type.length)];
     }
 
     /**
      * Generates a random poem line.
+     *
      * @return a poem that is generated with some keywords.
      */
-    public static String poemLine()
-    {
-       StringBuilder results = new StringBuilder(150);
-       results.append(randomWord(adjective));
-       results.append(' ');
-       results.append(randomWord(noun));
-       results.append(' ');
-       results.append(randomWord(verb));
-       results.append(' ');
-       results.append(randomWord(adverb));
-       results.append(", ");
-       return results.toString();
- }
+    public static String poemLine() {
+        StringBuilder results = new StringBuilder(150);
+        results.append(randomWord(adjective));
+        results.append(' ');
+        results.append(randomWord(noun));
+        results.append(' ');
+        results.append(randomWord(verb));
+        results.append(' ');
+        results.append(randomWord(adverb));
+        results.append(", ");
+        return results.toString();
+    }
 
 }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/MultiColumnSimple.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/MultiColumnSimple.java
index 8b95fd6d6..4a539bb41 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/MultiColumnSimple.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/columns/MultiColumnSimple.java
@@ -9,16 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.columns;
 
-import java.awt.Color;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.Random;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -27,18 +21,49 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.MultiColumnText;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.Random;
 
 /**
  * An example using MultiColumnText with irregular columns.
  */
 public class MultiColumnSimple {
 
+    static Random rand = new Random();
+    static String[] verb = {"flows", "draws", "renders", "throws exception", "runs",
+            "crashes", "downloads", "usurps", "vexes", "whispers", "boils",
+            "capitulates", "crashes", "craves", "looks", "defies", "defers",
+            "defines", "envelops", "entombs", "falls", "fails", "halts",
+            "appears", "nags", "overflows", "burns", "dies", "writes",
+            "flushes"};
+    static String[] noun = {"ColumnText", "paragraph", "phrase", "chunk", "PdfContentByte",
+            "PdfPTable", "iText", "color", "vertical alignment", "horizontal alignment", "PdfWriter",
+            "ListItem", "PdfStamper", "PDF", "HTML", "XML", "column", "font",
+            "table", "FDF", "field", "NullPointerException", "CJK font"};
+    static String[] adjective = {"foul", "broken", "gray", "slow", "beautiful",
+            "throbbing", "sharp", "stout", "soundless", "neat",
+            "swift", "uniform", "upright", "vibrant", "dingy",
+            "vestigal", "messy", "sloppy", "baleful", "boastful",
+            "dark", "capricious", "concrete", "deliberate", "sharp",
+            "drunken", "undisciplined", "perfect", "bloated"};
+    static String[] adverb = {"randomly", "quickly", "triumphantly", "suggestively",
+            "slowly", "angrily", "uncomfortably", "finally", "unexpectedly",
+            "hysterically", "thinly", "dryly", "blazingly",
+            "terribly", "bleakly", "irritably", "dazzlingly", "expectantly",
+            "impersonally", "abruptly", "awfully", "caressingly", "completely",
+            "undesirably", "drolly", "hypocritically", "blankly",
+            "dimly"};
+
     /**
      * An example using MultiColumnText with irregular columns.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Simple MultiColumnText");
         try {
             Document document = new Document();
@@ -46,7 +71,6 @@ public static void main(String[] args) {
             PdfWriter.getInstance(document, out);
             document.open();
 
-
             MultiColumnText mct = new MultiColumnText();
 
             // set up 3 even columns with 10pt space between
@@ -71,64 +95,33 @@ public static void main(String[] args) {
     }
 
     private static Element newPara(String text, int alignment, int type) {
-       Font font = FontFactory.getFont("Helvetica", 10, type, Color.BLACK);
-       Paragraph p = new Paragraph(text, font);
-       p.setAlignment(alignment);
-       p.setLeading(font.getSize() * 1.2f);
-       return p;
+        Font font = FontFactory.getFont("Helvetica", 10, type, Color.BLACK);
+        Paragraph p = new Paragraph(text, font);
+        p.setAlignment(alignment);
+        p.setLeading(font.getSize() * 1.2f);
+        return p;
     }
 
-    static Random rand = new Random();
-
-
-    static String[] verb = {"flows", "draws", "renders", "throws exception", "runs",
-        "crashes", "downloads", "usurps", "vexes", "whispers", "boils",
-        "capitulates", "crashes", "craves", "looks", "defies", "defers",
-        "defines", "envelops", "entombs", "falls", "fails", "halts",
-        "appears", "nags", "overflows", "burns", "dies", "writes",
-        "flushes"};
-
-    static String[] noun = {"ColumnText", "paragraph", "phrase", "chunk", "PdfContentByte",
-        "PdfPTable", "iText", "color", "vertical alignment", "horizontal alignment", "PdfWriter",
-        "ListItem", "PdfStamper", "PDF", "HTML", "XML", "column", "font",
-        "table", "FDF", "field", "NullPointerException", "CJK font"};
-
-    static String[] adjective = {"foul", "broken", "gray", "slow", "beautiful",
-       "throbbing", "sharp", "stout", "soundless", "neat",
-       "swift", "uniform", "upright", "vibrant", "dingy",
-       "vestigal", "messy", "sloppy", "baleful", "boastful",
-       "dark", "capricious", "concrete", "deliberate", "sharp",
-        "drunken", "undisciplined", "perfect", "bloated"};
-
-    static String[] adverb = {"randomly", "quickly", "triumphantly", "suggestively",
-       "slowly", "angrily", "uncomfortably", "finally", "unexpectedly",
-       "hysterically", "thinly", "dryly", "blazingly",
-       "terribly", "bleakly", "irritably", "dazzlingly", "expectantly",
-       "impersonally", "abruptly", "awfully", "caressingly", "completely",
-       "undesirably", "drolly", "hypocritically", "blankly",
-       "dimly"};
-
-    private static String randomWord(String[] type)
-    {
-       return type[rand.nextInt(type.length)];
+    private static String randomWord(String[] type) {
+        return type[rand.nextInt(type.length)];
     }
 
     /**
      * Generates a random poem line.
+     *
      * @return a poem that is generated with some keywords.
      */
-    public static String poemLine()
-    {
-       StringBuilder results = new StringBuilder(150);
-       results.append(randomWord(adjective));
-       results.append(' ');
-       results.append(randomWord(noun));
-       results.append(' ');
-       results.append(randomWord(verb));
-       results.append(' ');
-       results.append(randomWord(adverb));
-       results.append(", ");
-       return results.toString();
- }
+    public static String poemLine() {
+        StringBuilder results = new StringBuilder(150);
+        results.append(randomWord(adjective));
+        results.append(' ');
+        results.append(randomWord(noun));
+        results.append(' ');
+        results.append(randomWord(verb));
+        results.append(' ');
+        results.append(randomWord(adverb));
+        results.append(", ");
+        return results.toString();
+    }
 
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AbsolutePositions.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AbsolutePositions.java
index 1ff9a906e..865a974aa 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AbsolutePositions.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AbsolutePositions.java
@@ -9,51 +9,52 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 /**
  * Add the image at an absolute position.
  */
 public class AbsolutePositions {
+
     /**
      * Adds an Image at an absolute position.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Absolute Positioning of an Image");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            
+
             PdfWriter.getInstance(document, new FileOutputStream("absolutepositions.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content
             Image png = Image.getInstance("hitchcock.png");
             png.setAbsolutePosition(171, 250);
             document.add(png);
             png.setAbsolutePosition(342, 500);
             document.add(png);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Alignment.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Alignment.java
index 05992db69..8c9623fc8 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Alignment.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Alignment.java
@@ -9,23 +9,25 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 /**
  * Demonstrates the alignment method and parameters.
  */
 public class Alignment {
+
     /**
      * Demonstrates the alignment method.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -35,22 +37,21 @@ public static void main(String[] args) {
         try {
             // step 2: creation of a writer
             PdfWriter.getInstance(document, new FileOutputStream("alignment.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             Image gif = Image.getInstance("vonnegut.gif");
             gif.setAlignment(Image.RIGHT);
             Image jpeg = Image.getInstance("otsoe.jpg");
             jpeg.setAlignment(Image.MIDDLE);
             Image png = Image.getInstance("hitchcock.png");
             png.setAlignment(Image.LEFT);
-            
+
             document.add(gif);
             document.add(jpeg);
             document.add(png);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AnnotatedImage.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AnnotatedImage.java
index 928308c8c..609a8fdf6 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AnnotatedImage.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AnnotatedImage.java
@@ -9,29 +9,31 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Annotation;
 import com.lowagie.text.Document;
 import com.lowagie.text.Image;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+
 /**
  * Images with an annotation.
  */
-public class AnnotatedImage {    
+public class AnnotatedImage {
+
     /**
      * Adds some annotated images to a PDF file.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("images and annotations");
-        
+
         // step 1: creation of a document-object
         Document document = new Document(PageSize.A4, 50, 50, 50, 50);
         try {
@@ -49,11 +51,10 @@ public static void main(String[] args) {
             wmf.setAnnotation(new Annotation(0, 0, 0, 0, "http://www.lowagie.com/iText"));
             wmf.setAbsolutePosition(100f, 200f);
             document.add(wmf);
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
-        
+
         // step 5: we close the document
         document.close();
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AwtImage.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AwtImage.java
index 0c26609c2..7d7e8e330 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AwtImage.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/AwtImage.java
@@ -14,17 +14,16 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
-import java.awt.Color;
-import java.awt.Toolkit;
-import java.io.ByteArrayOutputStream;
-import java.net.URL;
-import org.junit.jupiter.api.Test;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Image;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.awt.Toolkit;
+import java.io.ByteArrayOutputStream;
+import java.net.URL;
+import org.junit.jupiter.api.Test;
 
 /**
  * Using the java.awt.Image object.
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/DvdCover.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/DvdCover.java
index 1c25f496d..f7265f7be 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/DvdCover.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/DvdCover.java
@@ -9,14 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -25,78 +21,53 @@
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * This is a tool that allows you to make a DVD Cover.
+ *
  * @author blowagie
  */
 public class DvdCover {
-    
+
     /**
-     * Sets the Image that has to be on the back of the cover.
-     * @param back an Image object.
+     * the name of the file that has to be generated.
      */
-    public void setBack(Image back) {
-        this.back = back;
-    }
+    protected String filename;
     /**
-     * Sets the backgroundcolor of the cover.
-     * @param backgroundcolor a Color object.
+     * the title that has to be on the side of the cover.
      */
-    public void setBackgroundcolor(Color backgroundcolor) {
-        this.backgroundcolor = backgroundcolor;
-    }
+    protected String title;
     /**
-     * Sets the Image that has to be on the front of the cover.
-     * @param front an Image object.
+     * the backgroundcolor of the cover.
      */
-    public void setFront(Image front) {
-        this.front = front;
-    }
+    protected Color backgroundcolor;
     /**
-     * Sets the Image that has to be on the back of the cover.
-     * @param side an Image object.
+     * the front image of the cover.
      */
-    public void setSide(Image side) {
-        this.side = side;
-    }
+    protected Image front;
     /**
-     * Sets the title of the movie (will be printed on the side if there is no side image)
-     * @param title The title to set.
+     * the side image of the cover.
      */
-    public void setTitle(String title) {
-        this.title = title;
-    }
+    protected Image side;
     /**
-     * Sets the filename of the resulting PDF
-     * @param filename The filename to set.
+     * the back image of the cover.
      */
-    public void setFilename(String filename) {
-        this.filename = filename;
-    }
-    
-    /** the name of the file that has to be generated. */
-    protected String filename;
-    /** the title that has to be on the side of the cover. */
-    protected String title;
-    /** the backgroundcolor of the cover. */
-    protected Color backgroundcolor;
-    /** the front image of the cover. */
-    protected Image front;
-    /** the side image of the cover. */
-    protected Image side;
-    /** the back image of the cover. */
     protected Image back;
-    
+
     /**
      * Creates a DVD Cover object.
      */
     public DvdCover() {
     }
-    
+
     /**
      * Example that generates a DVD Cover in PDF.
-     * @param args    an array containing [0] a filename [1] a title [2] a backgroundcolor [3] a front image [4] a back image [5] a side image
+     *
+     * @param args an array containing [0] a filename [1] a title [2] a backgroundcolor [3] a front image [4] a back
+     *             image [5] a side image
      */
     public static void main(String[] args) {
         System.out.println("DVD Cover");
@@ -133,27 +104,85 @@ public static void main(String[] args) {
         }
         cover.generatePdf();
     }
-    
+
+    /**
+     * Sets the Image that has to be on the back of the cover.
+     *
+     * @param back an Image object.
+     */
+    public void setBack(Image back) {
+        this.back = back;
+    }
+
+    /**
+     * Sets the backgroundcolor of the cover.
+     *
+     * @param backgroundcolor a Color object.
+     */
+    public void setBackgroundcolor(Color backgroundcolor) {
+        this.backgroundcolor = backgroundcolor;
+    }
+
+    /**
+     * Sets the Image that has to be on the front of the cover.
+     *
+     * @param front an Image object.
+     */
+    public void setFront(Image front) {
+        this.front = front;
+    }
+
+    /**
+     * Sets the Image that has to be on the back of the cover.
+     *
+     * @param side an Image object.
+     */
+    public void setSide(Image side) {
+        this.side = side;
+    }
+
+    /**
+     * Sets the title of the movie (will be printed on the side if there is no side image)
+     *
+     * @param title The title to set.
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * Sets the filename of the resulting PDF
+     *
+     * @param filename The filename to set.
+     */
+    public void setFilename(String filename) {
+        this.filename = filename;
+    }
+
     /**
      * Method that generates the actual PDF file.
      */
-    public void generatePdf() {   
-        
+    public void generatePdf() {
+
         // step 1: creation of a document-object
         Rectangle pageSize = new Rectangle(780, 525);
-        if (backgroundcolor != null) pageSize.setBackgroundColor(backgroundcolor);
+        if (backgroundcolor != null) {
+            pageSize.setBackgroundColor(backgroundcolor);
+        }
         Document document = new Document(pageSize);
-        
+
         try {
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            if (filename == null) { filename = "dvdcover.pdf"; }
+            if (filename == null) {
+                filename = "dvdcover.pdf";
+            }
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(filename));
-                        
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             PdfContentByte cb = writer.getDirectContent();
             if (title != null) {
@@ -165,7 +194,7 @@ public void generatePdf() {
                 if (side == null) {
                     cb.showTextAligned(Element.ALIGN_CENTER, title, 385f, 262f, 270f);
                 }
-                cb.endText(); 
+                cb.endText();
             }
             cb.moveTo(370, 0);
             cb.lineTo(370, 525);
@@ -174,7 +203,8 @@ public void generatePdf() {
             cb.stroke();
             if (front != null) {
                 front.scaleToFit(370, 525);
-                front.setAbsolutePosition(410f + (370f - front.getScaledWidth()) / 2f, (525f - front.getScaledHeight()) / 2f);
+                front.setAbsolutePosition(410f + (370f - front.getScaledWidth()) / 2f,
+                        (525f - front.getScaledHeight()) / 2f);
                 document.add(front);
             }
             if (back != null) {
@@ -184,11 +214,11 @@ public void generatePdf() {
             }
             if (side != null) {
                 side.scaleToFit(40, 525);
-                side.setAbsolutePosition(370 + (40f - side.getScaledWidth()) / 2f, (525f - side.getScaledHeight()) / 2f);
+                side.setAbsolutePosition(370 + (40f - side.getScaledWidth()) / 2f,
+                        (525f - side.getScaledHeight()) / 2f);
                 document.add(side);
             }
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageChunks.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageChunks.java
index 07ca72670..6ece5ba36 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageChunks.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageChunks.java
@@ -9,14 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -26,12 +22,18 @@
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 /**
  * Wrapping Images in a Chunk.
  */
 public class ImageChunks {
+
     /**
      * Images wrapped in a Chunk.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -64,7 +66,7 @@ public static void main(String[] args) {
             table.addCell("I see an image\non my right");
             table.addCell(cell);
             table.addCell("I see an image\non my left");
-            
+
             Phrase p1 = new Phrase("This is an image ");
             p1.add(ck);
             p1.add(" just here.");
@@ -76,8 +78,7 @@ public static void main(String[] args) {
             document.add(p1);
             document.add(p1);
             document.add(table);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageMasks.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageMasks.java
index 8f6b6e7df..e1d5e2351 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageMasks.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageMasks.java
@@ -9,35 +9,35 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Image;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Applying a mask to an Image.
  */
 public class ImageMasks {
-    
+
     /**
      * Applying masks to images.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("masked images");
-        
+
         Document document = new Document(PageSize.A4, 50, 50, 50, 50);
         try {
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("maskedImages.pdf"));
-            
+
             document.open();
             Paragraph p = new Paragraph("Some text behind a masked image.");
             document.add(p);
@@ -50,7 +50,7 @@ public static void main(String[] args) {
             document.add(p);
             document.add(p);
             document.add(p);
-            
+
             document.add(p);
             document.add(p);
             document.add(p);
@@ -67,7 +67,8 @@ public static void main(String[] args) {
             document.add(p);
             document.add(p);
             PdfContentByte cb = writer.getDirectContent();
-            byte[] maskr = {(byte) 0x3c, (byte) 0x7e, (byte) 0xe7, (byte) 0xc3, (byte) 0xc3, (byte) 0xe7, (byte) 0x7e, (byte) 0x3c};
+            byte[] maskr = {(byte) 0x3c, (byte) 0x7e, (byte) 0xe7, (byte) 0xc3, (byte) 0xc3, (byte) 0xe7, (byte) 0x7e,
+                    (byte) 0x3c};
             Image mask = Image.getInstance(8, 8, 1, 1, maskr);
             mask.makeMask();
             mask.setInverted(true);
@@ -84,8 +85,7 @@ public static void main(String[] args) {
             cb.setRGBColorFill(0, 0, 255);
             cb.addImage(mask, mask.getScaledWidth() * 8, 0, 0, mask.getScaledHeight() * 8, 100, 350);
             document.close();
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageSequence.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageSequence.java
index 2d98fc5b5..53b8d0a8b 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageSequence.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImageSequence.java
@@ -9,38 +9,37 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
- * Generates 2 documents: one that respects the order of Images added,
- * another that has the default behaviour: only show the images if
- * they fit on the page, if they don't fit, wait until the next page.
+ * Generates 2 documents: one that respects the order of Images added, another that has the default behaviour: only show
+ * the images if they fit on the page, if they don't fit, wait until the next page.
  */
 public class ImageSequence {
+
     /**
-     * Generates 2 documents: one that respects the order of Images added,
-     * another that has the default behaviour: only show the images if
-     * they fit on the page, if they don't fit, wait until the next page.
-     * @param args    no arguments needed
+     * Generates 2 documents: one that respects the order of Images added, another that has the default behaviour: only
+     * show the images if they fit on the page, if they don't fit, wait until the next page.
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("ImageSequence");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
             // step 2:
             // we create a writer that listens to the document
@@ -48,16 +47,16 @@ public static void main(String[] args) {
             PdfWriter.getInstance(document, new FileOutputStream("notInSequence.pdf"));
             PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream("inSequence.pdf"));
             writer.setStrictImageSequence(true);
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             document.add(new Paragraph("1st image"));
             Image jpg = Image.getInstance("otsoe.jpg");
             document.add(jpg);
             document.add(new Paragraph("2nd image"));
-            Image gif= Image.getInstance("getacro.gif");
+            Image gif = Image.getInstance("getacro.gif");
             document.add(gif);
             document.add(new Paragraph("3rd image"));
             document.add(jpg);
@@ -69,8 +68,7 @@ public static void main(String[] args) {
             document.add(gif);
             document.add(new Paragraph("7th image"));
             document.add(jpg);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Images.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Images.java
index a4428312c..9c6176152 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Images.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Images.java
@@ -9,50 +9,50 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * General Images example.
  */
 public class Images {
-    
+
     /**
      * General Images example
-     * @param args    no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Images");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter.getInstance(document, new FileOutputStream("Images.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4:
             document.add(new Paragraph("A picture of my dog: otsoe.jpg"));
             Image jpg = Image.getInstance("otsoe.jpg");
             document.add(jpg);
             document.add(new Paragraph("getacro.gif"));
-            Image gif= Image.getInstance("getacro.gif");
+            Image gif = Image.getInstance("getacro.gif");
             document.add(gif);
             document.add(new Paragraph("pngnow.png"));
             Image png = Image.getInstance("pngnow.png");
@@ -69,8 +69,7 @@ public static void main(String[] args) {
             document.add(new Paragraph("iText.tif"));
             Image tif = Image.getInstance("iText.tif");
             document.add(tif);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImagesAlignment.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImagesAlignment.java
index c7427945b..1deac630c 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImagesAlignment.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/ImagesAlignment.java
@@ -9,19 +9,18 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Testing Image alignment.
@@ -30,6 +29,7 @@ public class ImagesAlignment {
 
     /**
      * Generates a PDF with Images that are aligned.
+     *
      * @param args no arguments needed
      */
     public static void main(java.lang.String[] args) {
@@ -41,10 +41,10 @@ public static void main(java.lang.String[] args) {
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
             PdfWriter.getInstance(document, new FileOutputStream("imagesAlignment.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: content
             Image gif = Image.getInstance("vonnegut.gif");
             gif.setAlignment(Image.RIGHT | Image.TEXTWRAP);
@@ -52,7 +52,7 @@ public static void main(java.lang.String[] args) {
             jpeg.setAlignment(Image.MIDDLE);
             Image png = Image.getInstance("hitchcock.png");
             png.setAlignment(Image.LEFT | Image.UNDERLYING);
-            
+
             for (int i = 0; i < 100; i++) {
                 document.add(new Phrase("Who is this? "));
             }
@@ -82,8 +82,7 @@ public static void main(java.lang.String[] args) {
             for (int i = 0; i < 100; i++) {
                 document.add(new Phrase("Who is this? "));
             }
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/RawData.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/RawData.java
index fc0c8a0f7..d7c1d0293 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/RawData.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/RawData.java
@@ -9,70 +9,71 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
 /**
  * Using raw data to construct an Image object.
  */
-public class RawData {    
+public class RawData {
+
     /**
      * Raw data.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("bytes[] / raw image");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            
+
             PdfWriter.getInstance(document, new FileOutputStream("rawdata.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content (example by Paulo Soares)
-            
+
             // creation a jpeg passed as an array of bytes to the Image
             RandomAccessFile rf = new RandomAccessFile("otsoe.jpg", "r");
-            int size = (int)rf.length();
+            int size = (int) rf.length();
             byte[] imext = new byte[size];
             rf.readFully(imext);
             rf.close();
             Image img1 = Image.getInstance(imext);
             img1.setAbsolutePosition(50, 500);
             document.add(img1);
-            
+
             // creation of an image of 100 x 100 pixels (x 3 bytes for the Red, Green and Blue value)
             byte[] data = new byte[100 * 100 * 3];
             for (int k = 0; k < 100; ++k) {
                 for (int j = 0; j < 300; j += 3) {
-                    data[k * 300 + j] = (byte)(255 * Math.sin(j * .5 * Math.PI / 300));
-                    data[k * 300 + j + 1] = (byte)(256 - j * 256 / 300);
-                    data[k * 300 + j + 2] = (byte)(255 * Math.cos(k * .5 * Math.PI / 100));
+                    data[k * 300 + j] = (byte) (255 * Math.sin(j * .5 * Math.PI / 300));
+                    data[k * 300 + j + 1] = (byte) (256 - j * 256 / 300);
+                    data[k * 300 + j + 2] = (byte) (255 * Math.cos(k * .5 * Math.PI / 100));
                 }
             }
             Image img2 = Image.getInstance(100, 100, 3, 8, data);
             img2.setAbsolutePosition(200, 200);
             document.add(img2);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Rotating.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Rotating.java
index 8b14ebd07..2dcefddb5 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Rotating.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Rotating.java
@@ -9,79 +9,79 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Rotating images.
  */
 public class Rotating {
+
     /**
      * Rotating images.
+     *
      * @param args No arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Rotating an Image");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            
+
             PdfWriter.getInstance(document, new FileOutputStream("rotating.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content
             Image jpg = Image.getInstance("otsoe.jpg");
             jpg.setAlignment(Image.MIDDLE);
-            
-            jpg.setRotation((float)Math.PI / 6);
+
+            jpg.setRotation((float) Math.PI / 6);
             document.add(new Paragraph("rotate 30 degrees"));
             document.add(jpg);
             document.newPage();
-            
-            jpg.setRotation((float)Math.PI / 4);
+
+            jpg.setRotation((float) Math.PI / 4);
             document.add(new Paragraph("rotate 45 degrees"));
             document.add(jpg);
             document.newPage();
-            
-            jpg.setRotation((float)Math.PI / 2);
+
+            jpg.setRotation((float) Math.PI / 2);
             document.add(new Paragraph("rotate pi/2 radians"));
             document.add(jpg);
             document.newPage();
-            
-            jpg.setRotation((float)(Math.PI * 0.75));
+
+            jpg.setRotation((float) (Math.PI * 0.75));
             document.add(new Paragraph("rotate 135 degrees"));
             document.add(jpg);
             document.newPage();
-            
-            jpg.setRotation((float)Math.PI);
+
+            jpg.setRotation((float) Math.PI);
             document.add(new Paragraph("rotate pi radians"));
             document.add(jpg);
             document.newPage();
-            
-            jpg.setRotation((float)(2.0 * Math.PI));
+
+            jpg.setRotation((float) (2.0 * Math.PI));
             document.add(new Paragraph("rotate 2 x pi radians"));
             document.add(jpg);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Scaling.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Scaling.java
index 93c86809b..9f89716a6 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Scaling.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Scaling.java
@@ -9,44 +9,46 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.images;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 /**
  * Scaling of images.
  */
 public class Scaling {
+
     /**
      * Scaling an image.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
-        
+
         System.out.println("Scaling an Image");
-        
+
         // step 1: creation of a document-object
         Document document = new Document();
-        
+
         try {
-            
+
             // step 2:
             // we create a writer that listens to the document
             // and directs a PDF-stream to a file
-            
+
             PdfWriter.getInstance(document, new FileOutputStream("scaling.pdf"));
-            
+
             // step 3: we open the document
             document.open();
-            
+
             // step 4: we add content
             Image jpg1 = Image.getInstance("otsoe.jpg");
             jpg1.scaleAbsolute(160, 120);
@@ -64,8 +66,7 @@ public static void main(String[] args) {
             jpg4.scalePercent(100, 50);
             document.add(new Paragraph("scalePercent(100, 50)"));
             document.add(jpg4);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/AddBigTable.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/AddBigTable.java
index b88b3b531..3a455076d 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/AddBigTable.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/AddBigTable.java
@@ -9,17 +9,16 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Add a big table to a PDF with document.add().
@@ -28,9 +27,8 @@ public class AddBigTable {
 
     /**
      * Big PdfPTable with document.add().
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -44,9 +42,9 @@ public static void main(String[] args) {
             // step3
             document.open();
             // step4
-            String[] bogusData = { "M0065920", "SL", "FR86000P", "PCGOLD",
+            String[] bogusData = {"M0065920", "SL", "FR86000P", "PCGOLD",
                     "119000", "96 06", "2001-08-13", "4350", "6011648299",
-                    "FLFLMTGP", "153", "119000.00" };
+                    "FLFLMTGP", "153", "119000.00"};
             int NumColumns = 12;
 
             PdfPTable datatable = new PdfPTable(NumColumns);
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellAlignment.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellAlignment.java
index 71b890306..27e8efd8d 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellAlignment.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellAlignment.java
@@ -9,12 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.PageSize;
@@ -22,6 +20,7 @@
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Change the alignment of the contents of a PdfPCell.
@@ -30,9 +29,8 @@ public class CellAlignment {
 
     /**
      * Changing the alignment
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -48,7 +46,8 @@ public static void main(String[] args) {
             // step4
             PdfPTable table = new PdfPTable(2);
             PdfPCell cell;
-            Paragraph p = new Paragraph("Quick brown fox jumps over the lazy dog. Quick brown fox jumps over the lazy dog.");
+            Paragraph p = new Paragraph(
+                    "Quick brown fox jumps over the lazy dog. Quick brown fox jumps over the lazy dog.");
             table.addCell("default alignment");
             cell = new PdfPCell(p);
             table.addCell(cell);
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellColors.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellColors.java
index 434dce4d0..2f084709e 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellColors.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellColors.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
@@ -23,6 +20,8 @@
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * The Cell is derived from the Rectangle object, so we can do all kinds of things with the borders and colors.
@@ -31,9 +30,8 @@ public class CellColors {
 
     /**
      * Rectangle operations.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellHeights.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellHeights.java
index 65db47ad6..10d647dbf 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellHeights.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellHeights.java
@@ -9,18 +9,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Change the height of a cell (fixed height), disable text wrapping, set a minimum height.
@@ -29,9 +28,8 @@ public class CellHeights {
 
     /**
      * Height manipulations of cells.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -48,18 +46,20 @@ public static void main(String[] args) {
             PdfPTable table = new PdfPTable(2);
             table.setExtendLastRow(true);
             PdfPCell cell;
-            
+
             // wrap / nowrap
-            cell = new PdfPCell(new Paragraph("blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah"));
+            cell = new PdfPCell(new Paragraph(
+                    "blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah"));
             table.addCell("wrap");
             cell.setNoWrap(false);
             table.addCell(cell);
             table.addCell("no wrap");
             cell.setNoWrap(true);
             table.addCell(cell);
-            
+
             // height
-            cell = new PdfPCell(new Paragraph("1. blah blah\n2. blah blah blah\n3. blah blah\n4. blah blah blah\n5. blah blah\n6. blah blah blah\n7. blah blah\n8. blah blah blah"));
+            cell = new PdfPCell(new Paragraph(
+                    "1. blah blah\n2. blah blah blah\n3. blah blah\n4. blah blah blah\n5. blah blah\n6. blah blah blah\n7. blah blah\n8. blah blah blah"));
             table.addCell("height");
             table.addCell(cell);
             table.addCell("fixed height");
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellPaddingLeading.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellPaddingLeading.java
index befdc2d0b..62ce7fa55 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellPaddingLeading.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellPaddingLeading.java
@@ -9,18 +9,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Changing the padding and the leading of the content of a PdfPCell.
@@ -29,9 +28,8 @@ public class CellPaddingLeading {
 
     /**
      * Changing padding and leading.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -47,7 +45,8 @@ public static void main(String[] args) {
             // step4
             PdfPTable table = new PdfPTable(2);
             PdfPCell cell;
-            Paragraph p = new Paragraph("Quick brown fox jumps over the lazy dog. Quick brown fox jumps over the lazy dog.");
+            Paragraph p = new Paragraph(
+                    "Quick brown fox jumps over the lazy dog. Quick brown fox jumps over the lazy dog.");
             table.addCell("default");
             table.addCell(p);
             table.addCell("padding 10");
@@ -64,18 +63,21 @@ public static void main(String[] args) {
             cell.setPaddingLeft(20f);
             table.addCell(cell);
             document.add(table);
-            
+
             document.newPage();
             table = new PdfPTable(2);
             table.addCell("no leading at all");
             table.getDefaultCell().setLeading(0f, 0f);
-            table.addCell("blah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\n");
+            table.addCell(
+                    "blah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\n");
             table.getDefaultCell().setLeading(14f, 0f);
             table.addCell("fixed leading of 14pt");
-            table.addCell("blah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\n");
+            table.addCell(
+                    "blah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\n");
             table.addCell("relative leading of 1.0 times the fontsize");
             table.getDefaultCell().setLeading(0f, 1.0f);
-            table.addCell("blah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\n");
+            table.addCell(
+                    "blah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\nblah blah\nblah blah blah\n");
             document.add(table);
         } catch (Exception de) {
             de.printStackTrace();
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellWidths.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellWidths.java
index 19e37ddeb..637ace8a5 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellWidths.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/CellWidths.java
@@ -9,18 +9,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Define the widths of the columns of a PdfPTable.
@@ -29,9 +28,8 @@ public class CellWidths {
 
     /**
      * Width manipulations of cells.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/DefaultCell.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/DefaultCell.java
index 368a63298..cb274c6d6 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/DefaultCell.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/DefaultCell.java
@@ -9,20 +9,19 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * A very simple PdfPTable example using getDefaultCell().
@@ -31,9 +30,8 @@ public class DefaultCell {
 
     /**
      * Demonstrates the use of getDefaultCell().
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/ImageCell.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/ImageCell.java
index 75d0f6811..175947967 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/ImageCell.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/ImageCell.java
@@ -9,19 +9,18 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Image;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * A cell with an Image.
@@ -30,9 +29,8 @@ public class ImageCell {
 
     /**
      * A cell with an image.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/MyFirstTable.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/MyFirstTable.java
index 01ae7ed70..9fadb1a9e 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/MyFirstTable.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/MyFirstTable.java
@@ -9,20 +9,19 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * A very simple PdfPTable example.
@@ -31,9 +30,8 @@ public class MyFirstTable {
 
     /**
      * A very simple PdfPTable example.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/NestedTables.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/NestedTables.java
index dac4e9acc..e2f9157f6 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/NestedTables.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/NestedTables.java
@@ -9,16 +9,15 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates the use of nested tables.
@@ -27,9 +26,8 @@ public class NestedTables {
 
     /**
      * Using nested tables.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -53,11 +51,9 @@ public static void main(String[] args) {
             for (int k = 0; k < 24; ++k) {
                 if (k == 1) {
                     table.addCell(nested1);
-                }
-                else if (k == 20) {
+                } else if (k == 20) {
                     table.addCell(nested2);
-                }
-                else {
+                } else {
                     table.addCell("cell " + k);
                 }
             }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/SplitRows.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/SplitRows.java
index 1488ea3d5..af25ebd9c 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/SplitRows.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/SplitRows.java
@@ -9,18 +9,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Add a table to a PDF with document.add() and if the cell doesn't fit, the row is split in two parts.
@@ -29,9 +28,8 @@ public class SplitRows {
 
     /**
      * Demonstrates how rows are split when the cell is too big.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -54,7 +52,9 @@ public static void main(String[] args) {
             document3.open();
             // step4
             String text = "Quick brown fox jumps over the lazy dog. ";
-            for (int i = 0; i < 5; i++) text += text;
+            for (int i = 0; i < 5; i++) {
+                text += text;
+            }
             PdfPTable table = new PdfPTable(2);
             PdfPCell largeCell;
             Phrase phrase;
@@ -63,7 +63,9 @@ public static void main(String[] args) {
                 for (int j = 0; j < i; j++) {
                     phrase.add(new Phrase(text));
                 }
-                if (i == 7) phrase = new Phrase(text);
+                if (i == 7) {
+                    phrase = new Phrase(text);
+                }
                 table.addCell(String.valueOf(i));
                 largeCell = new PdfPCell(phrase);
                 table.addCell(largeCell);
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableBorders.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableBorders.java
index 4a3112cdc..3692e9869 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableBorders.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableBorders.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
@@ -27,16 +24,18 @@
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Demonstrates different borderstyles.
  */
 public class TableBorders {
+
     /**
      * Demonstrates different borderstyles.
-     * 
-     * @param args
-     *            the number of rows for each table fragment.
+     *
+     * @param args the number of rows for each table fragment.
      */
     public static void main(String[] args) {
 
@@ -50,7 +49,7 @@ public static void main(String[] args) {
             // step3
             document.open();
             // step4
-            
+
             // page 1
             Font tableFont = FontFactory.getFont("Helvetica", 8, Font.BOLD, Color.BLACK);
             float padding = 0f;
@@ -68,9 +67,9 @@ public static void main(String[] args) {
             Paragraph p;
             p = new Paragraph("\nVarious border widths and colors\nuseAscender=true, useDescender=true", font);
             document.add(p);
-            
+
             document.newPage();
-            
+
             // page 2
             padding = 2f;
             border = new Rectangle(0f, 0f);
@@ -80,11 +79,13 @@ public static void main(String[] args) {
             border.setBorderWidthTop(2f);
             border.setBorderColor(Color.BLACK);
             makeTestPage(tableFont, border, writer, document, padding, true, true);
-            p = new Paragraph("More typical use - padding of 2\nuseBorderPadding=true, useAscender=true, useDescender=true", font);
+            p = new Paragraph(
+                    "More typical use - padding of 2\nuseBorderPadding=true, useAscender=true, useDescender=true",
+                    font);
             document.add(p);
-            
+
             document.newPage();
-            
+
             // page 3
             padding = 0f;
             border = new Rectangle(0f, 0f);
@@ -96,9 +97,9 @@ public static void main(String[] args) {
             makeTestPage(tableFont, border, writer, document, padding, false, true);
             p = new Paragraph("\nuseBorderPadding=true, useAscender=false, useDescender=true", font);
             document.add(p);
-            
+
             document.newPage();
-            
+
             // page 4
             padding = 0f;
             border = new Rectangle(0f, 0f);
@@ -110,9 +111,9 @@ public static void main(String[] args) {
             makeTestPage(tableFont, border, writer, document, padding, false, false);
             p = new Paragraph("\nuseBorderPadding=true, useAscender=false, useDescender=false", font);
             document.add(p);
-            
+
             document.newPage();
-            
+
             // page 5
             padding = 0f;
             border = new Rectangle(0f, 0f);
@@ -132,7 +133,7 @@ public static void main(String[] args) {
     }
 
     private static void makeTestPage(Font tableFont, Rectangle borders, PdfWriter writer, Document document,
-                              float padding, boolean ascender, boolean descender) throws DocumentException {
+            float padding, boolean ascender, boolean descender) throws DocumentException {
         document.newPage();
         PdfPTable table = null;
         table = new PdfPTable(4);
@@ -140,19 +141,34 @@ private static void makeTestPage(Font tableFont, Rectangle borders, PdfWriter wr
 
         float leading = tableFont.getSize() * 1.2f;
 
-        table.addCell(makeCell("1-Top", Element.ALIGN_TOP, Element.ALIGN_LEFT, tableFont, leading, padding, borders, ascender, descender));
-        table.addCell(makeCell("2-Middle", Element.ALIGN_MIDDLE, Element.ALIGN_LEFT, tableFont, leading, padding, borders, ascender, descender));
-        table.addCell(makeCell("3-Bottom", Element.ALIGN_BOTTOM, Element.ALIGN_LEFT, tableFont, leading, padding, borders, ascender, descender));
-        table.addCell(makeCell("4-Has a y", Element.ALIGN_TOP, Element.ALIGN_LEFT, tableFont, leading, padding, borders, ascender, descender));
+        table.addCell(
+                makeCell("1-Top", Element.ALIGN_TOP, Element.ALIGN_LEFT, tableFont, leading, padding, borders, ascender,
+                        descender));
+        table.addCell(
+                makeCell("2-Middle", Element.ALIGN_MIDDLE, Element.ALIGN_LEFT, tableFont, leading, padding, borders,
+                        ascender, descender));
+        table.addCell(
+                makeCell("3-Bottom", Element.ALIGN_BOTTOM, Element.ALIGN_LEFT, tableFont, leading, padding, borders,
+                        ascender, descender));
+        table.addCell(makeCell("4-Has a y", Element.ALIGN_TOP, Element.ALIGN_LEFT, tableFont, leading, padding, borders,
+                ascender, descender));
 
-        table.addCell(makeCell("5-Abcdy", Element.ALIGN_TOP, Element.ALIGN_LEFT, tableFont, leading, padding, borders, ascender, descender));
-        table.addCell(makeCell("6-Abcdy", Element.ALIGN_MIDDLE, Element.ALIGN_LEFT, tableFont, leading, padding, borders, ascender, descender));
-        table.addCell(makeCell("7-Abcdy", Element.ALIGN_BOTTOM, Element.ALIGN_LEFT, tableFont, leading, padding, borders, ascender, descender));
-        table.addCell(makeCell("8-This\nis\na little\ntaller", Element.ALIGN_TOP, Element.ALIGN_LEFT, tableFont, leading, padding, borders, ascender, descender));
+        table.addCell(makeCell("5-Abcdy", Element.ALIGN_TOP, Element.ALIGN_LEFT, tableFont, leading, padding, borders,
+                ascender, descender));
+        table.addCell(
+                makeCell("6-Abcdy", Element.ALIGN_MIDDLE, Element.ALIGN_LEFT, tableFont, leading, padding, borders,
+                        ascender, descender));
+        table.addCell(
+                makeCell("7-Abcdy", Element.ALIGN_BOTTOM, Element.ALIGN_LEFT, tableFont, leading, padding, borders,
+                        ascender, descender));
+        table.addCell(
+                makeCell("8-This\nis\na little\ntaller", Element.ALIGN_TOP, Element.ALIGN_LEFT, tableFont, leading,
+                        padding, borders, ascender, descender));
         document.add(table);
     }
 
-    private static PdfPCell makeCell(String text, int vAlignment, int hAlignment, Font font, float leading, float padding, Rectangle borders, boolean ascender, boolean descender) {
+    private static PdfPCell makeCell(String text, int vAlignment, int hAlignment, Font font, float leading,
+            float padding, Rectangle borders, boolean ascender, boolean descender) {
         Paragraph p = new Paragraph(text, font);
         p.setLeading(leading);
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableSpacing.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableSpacing.java
index ce00084db..10f461b9f 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableSpacing.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableSpacing.java
@@ -9,19 +9,18 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Defining the spacing between the table and other content.
@@ -30,9 +29,8 @@ public class TableSpacing {
 
     /**
      * Defining the spacing between the table and other content.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableWidthAlignment.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableWidthAlignment.java
index 9acbf7d20..c3405b6d3 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableWidthAlignment.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/TableWidthAlignment.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.PageSize;
@@ -23,6 +20,8 @@
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Changing the width and alignment of the complete table.
@@ -31,9 +30,8 @@ public class TableWidthAlignment {
 
     /**
      * Changing the width and alignment of the complete table.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/JTable2Pdf.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/JTable2Pdf.java
index b1ecde1f7..41720a001 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/JTable2Pdf.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/JTable2Pdf.java
@@ -9,36 +9,37 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.alternatives;
 
+import com.lowagie.text.Document;
+import com.lowagie.text.PageSize;
+import com.lowagie.text.pdf.PdfContentByte;
+import com.lowagie.text.pdf.PdfWriter;
 import java.awt.BorderLayout;
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.FileOutputStream;
-
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JTable;
 import javax.swing.JToolBar;
 
-import com.lowagie.text.Document;
-import com.lowagie.text.PageSize;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.PdfWriter;
-
 /**
  * Constructing a JTable and printing it to PDF.
  */
 public class JTable2Pdf extends JFrame {
+
     private static final long serialVersionUID = 8461166420041411734L;
-    /** The JTable we will show in a Swing app and print to PDF. */
+    /**
+     * The JTable we will show in a Swing app and print to PDF.
+     */
     private JTable table;
-    
+
     /**
      * Constructor for PrintJTable.
      */
@@ -47,56 +48,72 @@ public JTable2Pdf() {
         setTitle("JTable test");
         createToolbar();
         createTable();
-        
+
         addWindowListener(new WindowAdapter() {
-            public void windowClosing(WindowEvent e)
-            {System.exit(0);}
-        });        
+            public void windowClosing(WindowEvent e) {
+                System.exit(0);
+            }
+        });
     }
-    
+
+    /**
+     * A very simple PdfPTable example.
+     *
+     * @param args no arguments needed
+     */
+    public static void main(String[] args) {
+        System.out.println("Printing a JTable");
+        JTable2Pdf frame = new JTable2Pdf();
+        frame.pack();
+        frame.setVisible(true);
+        frame.print();
+        frame.dispose();
+    }
+
     /**
      * Create a table with some dummy data
      */
     private void createTable() {
-        Object[][] data ={
-            {"Mary", "Campione", "Snowboarding", 5, Boolean.FALSE},
-             {"Alison", "Huml", "Rowing", 3, Boolean.TRUE},
-              {"Kathy", "Walrath", "Chasing toddlers",
-                      2, Boolean.FALSE},
-               {"Mark", "Andrews", "Speed reading", 20, Boolean.TRUE},
+        Object[][] data = {
+                {"Mary", "Campione", "Snowboarding", 5, Boolean.FALSE},
+                {"Alison", "Huml", "Rowing", 3, Boolean.TRUE},
+                {"Kathy", "Walrath", "Chasing toddlers",
+                        2, Boolean.FALSE},
+                {"Mark", "Andrews", "Speed reading", 20, Boolean.TRUE},
                 {"Angela", "Lih", "Teaching high school", 4, Boolean.FALSE}
         };
-        
+
         String[] columnNames =
-        {"First Name", "Last Name", "Sport", "# of Years", "Vegetarian"};
-        
+                {"First Name", "Last Name", "Sport", "# of Years", "Vegetarian"};
+
         table = new JTable(data, columnNames);
-        
+
         // Use a panel to contains the table and add it the frame
         JPanel tPanel = new JPanel(new BorderLayout());
         tPanel.add(table.getTableHeader(), BorderLayout.NORTH);
         tPanel.add(table, BorderLayout.CENTER);
-        
+
         getContentPane().add(tPanel, BorderLayout.CENTER);
     }
-    
+
     /**
      * Toolbar for print and exit
      */
     private void createToolbar() {
         JToolBar tb = new JToolBar();
-        
+
         JButton printBtn = new JButton("Print");
         printBtn.addActionListener(e -> print());
-        
+
         JButton exitBtn = new JButton("Exit");
         exitBtn.addActionListener(e -> exit());
-        
+
         tb.add(printBtn);
         tb.add(exitBtn);
-        
+
         getContentPane().add(tb, BorderLayout.NORTH);
     }
+
     /**
      * Print the table into a PDF file
      */
@@ -104,11 +121,11 @@ private void print() {
         Document document = new Document(PageSize.A4.rotate());
         try {
             PdfWriter writer =
-            PdfWriter.getInstance(document, new FileOutputStream("jTable.pdf"));
-            
+                    PdfWriter.getInstance(document, new FileOutputStream("jTable.pdf"));
+
             document.open();
             PdfContentByte cb = writer.getDirectContent();
-            
+
             // Create the graphics as shapes
             cb.saveState();
             Graphics2D g2 = cb.createGraphicsShapes(500, 500);
@@ -117,51 +134,37 @@ private void print() {
             g2.clipRect(0, 0, 500, 500);
             table.print(g2);
             g2.setClip(oldClip);
-            
+
             g2.dispose();
             cb.restoreState();
-            
+
             document.newPage();
-            
+
             // Create the graphics with pdf fonts
             cb.saveState();
             g2 = cb.createGraphics(500, 500);
-            
+
             // Print the table to the graphics
             oldClip = g2.getClip();
             g2.clipRect(0, 0, 500, 500);
             table.print(g2);
             g2.setClip(oldClip);
-            
+
             g2.dispose();
             cb.restoreState();
-            
+
         } catch (Exception e) {
             e.printStackTrace();
             System.err.println(e.getMessage());
         }
-        
+
         document.close();
     }
-    
+
     /**
      * Exit app
      */
     private void exit() {
         System.exit(0);
-    }    
-    /**
-     * A very simple PdfPTable example.
-     * 
-     * @param args
-     *            no arguments needed
-     */
-    public static void main(String[] args) {
-        System.out.println("Printing a JTable");
-        JTable2Pdf frame = new JTable2Pdf();
-        frame.pack();
-        frame.setVisible(true);
-        frame.print();
-        frame.dispose();
     }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/LargeCell.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/LargeCell.java
index 964564f43..d1ea19d8b 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/LargeCell.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/LargeCell.java
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.alternatives;
 
@@ -25,8 +25,10 @@
  * Using CellsFitPage for a Cell that doesn't fit the page.
  */
 public class LargeCell {
+
     /**
      * Demonstrates the features of the old Table class.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -60,8 +62,7 @@ public static void main(String[] args) {
             table.addCell("text");
             table.addCell("text");
             document.add(table);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/MyFirstTable.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/MyFirstTable.java
index 559c49b68..cb43b0f06 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/MyFirstTable.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/MyFirstTable.java
@@ -9,18 +9,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.alternatives;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Table;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * A very simple Table example.
@@ -29,9 +28,8 @@ public class MyFirstTable {
 
     /**
      * A very simple Table example.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("My first table");
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/NestedTables.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/NestedTables.java
index 8cf30b062..c61e6e91a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/NestedTables.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/NestedTables.java
@@ -9,27 +9,27 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.alternatives;
 
-import java.awt.Point;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Table;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Point;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Nested tables.
  */
 public class NestedTables {
-    
+
     /**
      * Nested tables.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -42,48 +42,48 @@ public static void main(String[] args) {
             // step 3: we open the document
             document.open();
             // step 4: we create a table and add it to the document
-            
+
             // example 1
-            
+
             Table secondTable = new Table(2);
             secondTable.addCell("2nd table 0.0");
             secondTable.addCell("2nd table 0.1");
             secondTable.addCell("2nd table 1.0");
             secondTable.addCell("2nd table 1.1");
-            
-            Table aTable = new Table(4,4);    // 4 rows, 4 columns
+
+            Table aTable = new Table(4, 4);    // 4 rows, 4 columns
             aTable.setAutoFillEmptyCells(true);
-            aTable.addCell("2.2", new Point(2,2));
-            aTable.addCell("3.3", new Point(3,3));
-            aTable.addCell("2.1", new Point(2,1));
-            aTable.insertTable(secondTable, new Point(1,3));
+            aTable.addCell("2.2", new Point(2, 2));
+            aTable.addCell("3.3", new Point(3, 3));
+            aTable.addCell("2.1", new Point(2, 1));
+            aTable.insertTable(secondTable, new Point(1, 3));
             document.add(aTable);
             document.add(new Paragraph("converted to PdfPTable:"));
             aTable.setConvert2pdfptable(true);
             document.add(aTable);
             document.newPage();
-            
+
             // example 2
-            
+
             Table thirdTable = new Table(2);
             thirdTable.addCell("3rd table 0.0");
             thirdTable.addCell("3rd table 0.1");
             thirdTable.addCell("3rd table 1.0");
             thirdTable.addCell("3rd table 1.1");
-            
-            aTable = new Table(5,5);
+
+            aTable = new Table(5, 5);
             aTable.setAutoFillEmptyCells(true);
-            aTable.addCell("2.2", new Point(2,2));
-            aTable.addCell("3.3", new Point(3,3));
-            aTable.addCell("2.1", new Point(2,1));
-            aTable.insertTable(secondTable, new Point(1,3));
-            aTable.insertTable(thirdTable, new Point(6,2));
-            document.add(aTable); 
+            aTable.addCell("2.2", new Point(2, 2));
+            aTable.addCell("3.3", new Point(3, 3));
+            aTable.addCell("2.1", new Point(2, 1));
+            aTable.insertTable(secondTable, new Point(1, 3));
+            aTable.insertTable(thirdTable, new Point(6, 2));
+            document.add(aTable);
             document.add(new Paragraph("converted to PdfPTable:"));
             aTable.setConvert2pdfptable(true);
-            document.add(aTable);     
-            document.newPage();  
-            
+            document.add(aTable);
+            document.newPage();
+
             // example 3
             aTable = new Table(3);
             float[] widths = {1, 2, 1};
@@ -95,25 +95,25 @@ public static void main(String[] args) {
             Table t2 = new Table(2);
             t2.addCell("2.1");
             t2.addCell("2.2");
-            
+
             // now insert the nested
             aTable.insertTable(t2);
             aTable.addCell("new cell");
-            document.add(aTable);    
+            document.add(aTable);
             document.add(new Paragraph("converted to PdfPTable:"));
             aTable.setConvert2pdfptable(true);
             document.add(aTable);
             document.newPage();
-            
+
             // relative column widths are preserved
-            
-            Table a = new Table( 2 );
-            a.setWidths( new float[] { 85, 15 } );
+
+            Table a = new Table(2);
+            a.setWidths(new float[]{85, 15});
             a.addCell("a-1");
             a.addCell("a-2");
-            
+
             Table b = new Table(5);
-            b.setWidths( new float[] { 15, 7, 7, 7, 7 } );
+            b.setWidths(new float[]{15, 7, 7, 7, 7});
             b.addCell("b-1");
             b.addCell("b-2");
             b.addCell("b-3");
@@ -121,19 +121,18 @@ public static void main(String[] args) {
             b.addCell("b-5");
 
             // now, insert these 2 tables into a third for layout purposes
-            Table c = new Table( 3, 1 );
-            c.setWidth( 100.0f );
-            c.setWidths( new float[] { 20, 2, 78 } );
-            c.insertTable(a, new Point(0,0) );
-            c.insertTable(b, new Point(0,2) );
+            Table c = new Table(3, 1);
+            c.setWidth(100.0f);
+            c.setWidths(new float[]{20, 2, 78});
+            c.insertTable(a, new Point(0, 0));
+            c.insertTable(b, new Point(0, 2));
 
             document.add(c);
             document.add(new Paragraph("converted to PdfPTable:"));
             c.setConvert2pdfptable(true);
             document.add(c);
 
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/OldTable.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/OldTable.java
index 130f162d3..eccf66eea 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/OldTable.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/OldTable.java
@@ -9,26 +9,27 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.alternatives;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Cell;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Table;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Uses the old Table class to have rowspan and spacing.
  */
 public class OldTable {
+
     /**
      * Demonstrates the features of the old Table class.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -66,8 +67,7 @@ public static void main(String[] args) {
             table.addCell(cell);
             table.addCell("cell test2");
             document.add(table);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/PaddingBorders.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/PaddingBorders.java
index 648839a59..36c12c958 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/PaddingBorders.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/PaddingBorders.java
@@ -9,27 +9,28 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.alternatives;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Cell;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Table;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Changing the padding and the borders of table cells.
  */
 public class PaddingBorders {
+
     /**
      * Creating tables with different borders and padding.
+     *
      * @param args no arguments needed.
      */
     public static void main(String[] args) {
@@ -60,7 +61,7 @@ public static void main(String[] args) {
             table.setConvert2pdfptable(true);
             document.add(new Paragraph("converted to PdfPTable:"));
             document.add(table);
-            
+
             table = new Table(3);
             table.setBorderWidth(3);
             table.setBorderColor(new Color(255, 0, 0));
@@ -87,8 +88,7 @@ public static void main(String[] args) {
             table.setConvert2pdfptable(true);
             document.add(new Paragraph("converted to PdfPTable:"));
             document.add(table);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/RepeatingTable.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/RepeatingTable.java
index cec30a716..31ac52540 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/RepeatingTable.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/RepeatingTable.java
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.alternatives;
 
@@ -34,39 +34,41 @@ public class RepeatingTable {
 
     /**
      * Shows how a table is split if it doesn't fit the page.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("table splitting");
         // creation of the document with a certain size and certain margins
         Document document = new Document(PageSize.A4.rotate(), 50, 50, 50, 50);
-        
+
         try {
             // creation of the different writers
             PdfWriter.getInstance(document, new FileOutputStream("repeatingtable.pdf"));
-            
+
             // we add some meta information to the document
             document.addAuthor("Alan Soukup");
             document.addSubject("This is the result of a Test.");
-            
+
             document.open();
-            
+
             Table datatable = new Table(10);
 
             int[] headerwidths = {10, 24, 12, 12, 7, 7, 7, 7, 7, 7};
             datatable.setWidths(headerwidths);
             datatable.setWidth(100);
             datatable.setPadding(3);
-            
+
             // the first cell spans 10 columns
-            Cell cell = new Cell(new Phrase("Administration -System Users Report", FontFactory.getFont(FontFactory.HELVETICA, 24, Font.BOLD)));
+            Cell cell = new Cell(new Phrase("Administration -System Users Report",
+                    FontFactory.getFont(FontFactory.HELVETICA, 24, Font.BOLD)));
             cell.setHorizontalAlignment(HorizontalAlignment.CENTER);
             cell.setLeading(30);
             cell.setColspan(10);
             cell.setBorder(Rectangle.NO_BORDER);
             cell.setBackgroundColor(new Color(0xC0, 0xC0, 0xC0));
             datatable.addCell(cell);
-            
+
             // These cells span 2 rows
             datatable.getDefaultCell().setBorderWidth(2);
             datatable.getDefaultCell().setHorizontalAlignment(HorizontalAlignment.CENTER);
@@ -80,12 +82,12 @@ public static void main(String[] args) {
             datatable.addCell("Prod");
             datatable.addCell("Proj");
             datatable.addCell("Online");
-            
+
             // this is the end of the table header
             datatable.endHeaders();
-            
+
             datatable.getDefaultCell().setBorderWidth(1);
-            
+
             for (int i = 1; i < 30; i++) {
 
                 datatable.getDefaultCell().setHorizontalAlignment(HorizontalAlignment.LEFT);
@@ -104,7 +106,7 @@ public static void main(String[] args) {
                 datatable.addCell("Yes");
                 datatable.addCell("No");
                 datatable.addCell("Yes");
-                
+
             }
             document.add(new Paragraph("com.lowagie.text.Table - Cells split"));
             document.add(datatable);
@@ -121,11 +123,10 @@ public static void main(String[] args) {
             document.add(new Paragraph("com.lowagie.text.pdf.PdfPTable - Cells kept together\n\n"));
             datatable.setConvert2pdfptable(true);
             document.add(datatable);
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        
+
         // we close the document
         document.close();
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/SpecificCells.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/SpecificCells.java
index f9a978823..25f4eef81 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/SpecificCells.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/SpecificCells.java
@@ -9,27 +9,28 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.alternatives;
 
-import java.awt.Point;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Table;
 import com.lowagie.text.alignment.HorizontalAlignment;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Point;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * In this example we are going to add Cell in specific columns/rows.
  */
 public class SpecificCells {
+
     /**
      * In this example we are going to add Cell in specific columns/rows.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
@@ -47,9 +48,9 @@ public static void main(String[] args) {
             aTable = new Table(4, 4);    // 4 rows, 4 columns
             aTable.setHorizontalAlignment(HorizontalAlignment.RIGHT);
             aTable.addCell("2.2", new Point(2, 2));
-            aTable.addCell("3.3", new Point(3,3));
-            aTable.addCell("2.1", new Point(2,1));
-            aTable.addCell("1.3", new Point(1,3));
+            aTable.addCell("3.3", new Point(3, 3));
+            aTable.addCell("2.1", new Point(2, 1));
+            aTable.addCell("1.3", new Point(1, 3));
             document.add(aTable);
             document.add(new Paragraph("converted to PdfPTable:"));
             aTable.setConvert2pdfptable(true);
@@ -58,12 +59,12 @@ public static void main(String[] args) {
             aTable = new Table(4, 4);    // 4 rows, 4 columns
             aTable.setHorizontalAlignment(HorizontalAlignment.CENTER);
             aTable.addCell("2.2", new Point(2, 2));
-            aTable.addCell("3.3", new Point(3,3));
-            aTable.addCell("2.1", new Point(2,1));
-            aTable.addCell("1.3", new Point(1,3));
-            aTable.addCell("5.2", new Point(5,2));
-            aTable.addCell("6.1", new Point(6,1));
-            aTable.addCell("5.0", new Point(5,0));  
+            aTable.addCell("3.3", new Point(3, 3));
+            aTable.addCell("2.1", new Point(2, 1));
+            aTable.addCell("1.3", new Point(1, 3));
+            aTable.addCell("5.2", new Point(5, 2));
+            aTable.addCell("6.1", new Point(6, 1));
+            aTable.addCell("5.0", new Point(5, 0));
             document.add(aTable);
             document.add(new Paragraph("converted to PdfPTable:"));
             aTable.setConvert2pdfptable(true);
@@ -79,19 +80,18 @@ public static void main(String[] args) {
             aTable.addColumns(2);
             float[] f = {1f, 1f, 1f, 1f};
             aTable.setWidths(f);
-            aTable.addCell("2.2", new Point(2,2));
-            aTable.addCell("3.3", new Point(3,3));
-            aTable.addCell("2.1", new Point(2,1));
-            aTable.addCell("1.3", new Point(1,3));
-            aTable.addCell("5.2", new Point(5,2));
-            aTable.addCell("6.1", new Point(6,1));
-            aTable.addCell("5.0", new Point(5,0)); 
-            document.add(aTable); 
+            aTable.addCell("2.2", new Point(2, 2));
+            aTable.addCell("3.3", new Point(3, 3));
+            aTable.addCell("2.1", new Point(2, 1));
+            aTable.addCell("1.3", new Point(1, 3));
+            aTable.addCell("5.2", new Point(5, 2));
+            aTable.addCell("6.1", new Point(6, 1));
+            aTable.addCell("5.0", new Point(5, 0));
+            document.add(aTable);
             document.add(new Paragraph("converted to PdfPTable:"));
             aTable.setConvert2pdfptable(true);
             document.add(aTable);
-        }
-        catch(DocumentException | IOException de) {
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
         // step 5: we close the document
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/TablePdfPTable.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/TablePdfPTable.java
index da4d57d8c..e41f4024e 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/TablePdfPTable.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/TablePdfPTable.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.alternatives;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.PageSize;
@@ -23,6 +20,8 @@
 import com.lowagie.text.SimpleCell;
 import com.lowagie.text.SimpleTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Example that is used to test the TableAttributes class.
@@ -31,13 +30,14 @@ public class TablePdfPTable {
 
     /**
      * Example that is used to test the TableAttributes class.
+     *
      * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("TableAttributes");
         // creation of the document with a certain size and certain margins
         Document document = new Document(PageSize.A4.rotate(), 50, 50, 50, 50);
-        
+
         try {
             // creation of the different writers
             PdfWriter.getInstance(document, new FileOutputStream("tableattributes.pdf"));
@@ -69,15 +69,15 @@ public static void main(String[] args) {
             for (int i = 0; i < 100; i++) {
                 row = new SimpleCell(SimpleCell.ROW);
                 switch (i % 3) {
-                case 0:
-                    row.setBackgroundColor(Color.red);
-                    break;
-                case 1:
-                    row.setBackgroundColor(Color.green);
-                    break;
-                case 2:
-                    row.setBackgroundColor(Color.blue);
-                    break;
+                    case 0:
+                        row.setBackgroundColor(Color.red);
+                        break;
+                    case 1:
+                        row.setBackgroundColor(Color.green);
+                        break;
+                    case 2:
+                        row.setBackgroundColor(Color.blue);
+                        break;
                 }
                 if (i % 2 == 1) {
                     row.setBorderWidth(3f);
@@ -94,8 +94,7 @@ public static void main(String[] args) {
                     cell.add(new Paragraph("Hello!"));
                     cell.setHorizontalAlignment(Element.ALIGN_CENTER);
                     row.add(cell);
-                }
-                else {
+                } else {
                     cell = new SimpleCell(SimpleCell.CELL);
                     cell.add(new Paragraph("A"));
                     row.add(cell);
@@ -110,13 +109,12 @@ public static void main(String[] args) {
                 table.addElement(row);
             }
             document.add(table);
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        
+
         // we close the document
         document.close();
     }
-    
+
 }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/TableWithImage.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/TableWithImage.java
index e3c89f52a..f880fb0aa 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/TableWithImage.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/alternatives/TableWithImage.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.alternatives;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Cell;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -23,6 +20,8 @@
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Table;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * A very simple Table example.
@@ -31,9 +30,8 @@ public class TableWithImage {
 
     /**
      * A very simple PdfPTable example.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
         System.out.println("A table with Image");
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/CellEvents.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/CellEvents.java
index da58789b5..366b47deb 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/CellEvents.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/CellEvents.java
@@ -9,12 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.pdfptable;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Image;
 import com.lowagie.text.PageSize;
@@ -24,29 +22,17 @@
 import com.lowagie.text.pdf.PdfPCellEvent;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * General example using CellEvents.
  */
 public class CellEvents implements PdfPCellEvent {
 
-    /**
-     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell,
-     *      com.lowagie.text.Rectangle, com.lowagie.text.pdf.PdfContentByte[])
-     */
-    public void cellLayout(PdfPCell cell, Rectangle position,
-            PdfContentByte[] canvases) {
-        PdfContentByte cb = canvases[PdfPTable.TEXTCANVAS];
-        cb.moveTo(position.getLeft(), position.getBottom());
-        cb.lineTo(position.getRight(), position.getTop());
-        cb.stroke();
-    }
-
     /**
      * General example using cell events.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -82,4 +68,16 @@ public static void main(String[] args) {
         // step5
         document.close();
     }
+
+    /**
+     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell, com.lowagie.text.Rectangle,
+     * com.lowagie.text.pdf.PdfContentByte[])
+     */
+    public void cellLayout(PdfPCell cell, Rectangle position,
+            PdfContentByte[] canvases) {
+        PdfContentByte cb = canvases[PdfPTable.TEXTCANVAS];
+        cb.moveTo(position.getLeft(), position.getBottom());
+        cb.lineTo(position.getRight(), position.getTop());
+        cb.stroke();
+    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/FloatingBoxes.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/FloatingBoxes.java
index 81f584b7d..d79a03e8e 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/FloatingBoxes.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/FloatingBoxes.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.pdfptable;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
@@ -26,6 +23,8 @@
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfPTableEvent;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * General example using TableEvents and CellEvents.
@@ -33,44 +32,8 @@
 public class FloatingBoxes implements PdfPCellEvent, PdfPTableEvent {
 
     /**
-     * @see com.lowagie.text.pdf.PdfPTableEvent#tableLayout(com.lowagie.text.pdf.PdfPTable,
-     *      float[][], float[], int, int, com.lowagie.text.pdf.PdfContentByte[])
-     */
-    public void tableLayout(PdfPTable table, float[][] width, float[] height,
-            int headerRows, int rowStart, PdfContentByte[] canvases) {
-        float[] widths = width[0];
-        float x1 = widths[0];
-        float x2 = widths[widths.length - 1];
-        float y1 = height[0];
-        float y2 = height[height.length - 1];
-        PdfContentByte canvas = canvases[PdfPTable.LINECANVAS];
-        canvas.setRGBColorStroke(0x00, 0x00, 0xFF);
-        canvas.rectangle(x1, y1, x2 - x1, y2 - y1);
-        canvas.stroke();
-        canvas.resetRGBColorStroke();
-    }
-
-    /**
-     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell,
-     *      com.lowagie.text.Rectangle, com.lowagie.text.pdf.PdfContentByte[])
-     */
-    public void cellLayout(PdfPCell cell, Rectangle position,
-            PdfContentByte[] canvases) {
-        float x1 = position.getLeft() + 2;
-        float x2 = position.getRight() - 2;
-        float y1 = position.getTop() - 2;
-        float y2 = position.getBottom() + 2;
-        PdfContentByte canvas = canvases[PdfPTable.LINECANVAS];
-        canvas.setRGBColorStroke(0xFF, 0x00, 0x00);
-        canvas.rectangle(x1, y1, x2 - x1, y2 - y1);
-        canvas.stroke();
-        canvas.resetRGBColorStroke();
-    }
-
-    /**
-     * Example originally written by Wendy Smoak to generate a Table with
-     * 'floating boxes'. Adapted by Bruno Lowagie.
-     * 
+     * Example originally written by Wendy Smoak to generate a Table with 'floating boxes'. Adapted by Bruno Lowagie.
+     *
      * @param args the command-line arguments
      */
     public static void main(String[] args) {
@@ -103,4 +66,39 @@ public static void main(String[] args) {
         // step 5
         document.close();
     }
+
+    /**
+     * @see com.lowagie.text.pdf.PdfPTableEvent#tableLayout(com.lowagie.text.pdf.PdfPTable, float[][], float[], int,
+     * int, com.lowagie.text.pdf.PdfContentByte[])
+     */
+    public void tableLayout(PdfPTable table, float[][] width, float[] height,
+            int headerRows, int rowStart, PdfContentByte[] canvases) {
+        float[] widths = width[0];
+        float x1 = widths[0];
+        float x2 = widths[widths.length - 1];
+        float y1 = height[0];
+        float y2 = height[height.length - 1];
+        PdfContentByte canvas = canvases[PdfPTable.LINECANVAS];
+        canvas.setRGBColorStroke(0x00, 0x00, 0xFF);
+        canvas.rectangle(x1, y1, x2 - x1, y2 - y1);
+        canvas.stroke();
+        canvas.resetRGBColorStroke();
+    }
+
+    /**
+     * @see com.lowagie.text.pdf.PdfPCellEvent#cellLayout(com.lowagie.text.pdf.PdfPCell, com.lowagie.text.Rectangle,
+     * com.lowagie.text.pdf.PdfContentByte[])
+     */
+    public void cellLayout(PdfPCell cell, Rectangle position,
+            PdfContentByte[] canvases) {
+        float x1 = position.getLeft() + 2;
+        float x2 = position.getRight() - 2;
+        float y1 = position.getTop() - 2;
+        float y2 = position.getBottom() + 2;
+        PdfContentByte canvas = canvases[PdfPTable.LINECANVAS];
+        canvas.setRGBColorStroke(0xFF, 0x00, 0x00);
+        canvas.rectangle(x1, y1, x2 - x1, y2 - y1);
+        canvas.stroke();
+        canvas.resetRGBColorStroke();
+    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/FragmentTable.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/FragmentTable.java
index e6be9b311..99ed32541 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/FragmentTable.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/FragmentTable.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.pdfptable;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
@@ -24,16 +21,18 @@
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Break a large table up into different smaller tables in order to save memory.
  */
 public class FragmentTable {
+
     /**
      * Break a large table up into several smaller tables for memory management purposes.
-     * 
-     * @param args
-     *            the number of rows for each table fragment.
+     *
+     * @param args the number of rows for each table fragment.
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/SplitTable.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/SplitTable.java
index a84d16b5d..6641d8187 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/SplitTable.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/SplitTable.java
@@ -9,28 +9,26 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.pdfptable;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Break a large table up into different smaller tables in order to save memory.
  */
 public class SplitTable {
+
     /**
-     * Break a large table up into several smaller tables for memory management
-     * purposes.
-     * 
-     * @param args
-     *            the number of rows for each table fragment.
+     * Break a large table up into several smaller tables for memory management purposes.
+     *
+     * @param args the number of rows for each table fragment.
      */
     public static void main(String[] args) {
 
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/TableEvents1.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/TableEvents1.java
index 9923c195e..2f8fc97dc 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/TableEvents1.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/TableEvents1.java
@@ -9,12 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.pdfptable;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Font;
 import com.lowagie.text.PageSize;
@@ -26,68 +24,17 @@
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfPTableEvent;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * General example using TableEvents.
  */
 public class TableEvents1 implements PdfPTableEvent {
-    /**
-     * @see com.lowagie.text.pdf.PdfPTableEvent#tableLayout(com.lowagie.text.pdf.PdfPTable, float[][], float[], int, int, com.lowagie.text.pdf.PdfContentByte[])
-     */
-    public void tableLayout(PdfPTable table, float[][] width, float[] heights, int headerRows, int rowStart, PdfContentByte[] canvases) {
-        
-        // widths of the different cells of the first row
-        float[] widths = width[0];
-        
-        PdfContentByte cb = canvases[PdfPTable.TEXTCANVAS];
-        cb.saveState();
-        // border for the complete table
-        cb.setLineWidth(2);
-        cb.setRGBColorStroke(255, 0, 0);
-        cb.rectangle(widths[0], heights[heights.length - 1], widths[widths.length - 1] - widths[0], heights[0] - heights[heights.length - 1]);
-        cb.stroke();
-        
-        // border for the header rows
-        if (headerRows > 0) {
-            float headerHeight = heights[0];
-            for (int k = 0; k < headerRows; ++k)
-                headerHeight += heights[k];
-            cb.setRGBColorStroke(0, 0, 255);
-            cb.rectangle(widths[0], heights[headerRows], widths[widths.length - 1] - widths[0], heights[0] - heights[headerRows]);
-            cb.stroke();
-        }
-        cb.restoreState();
-        
-        cb = canvases[PdfPTable.BASECANVAS];
-        cb.saveState();
-        // border for the cells
-        cb.setLineWidth(.5f);
-        // loop over the rows
-        for (int line = 0; line < heights.length - 1; ++line) {
-            // loop over the columns
-            for (int col = 0; col < widths.length - 1; ++col) {
-                if (line == 0 && col == 0)
-                    cb.setAction(new PdfAction("https://github.com/LibrePDF/OpenPDF"),
-                        widths[col], heights[line + 1], widths[col + 1], heights[line]);
-                cb.setRGBColorStrokeF((float)Math.random(), (float)Math.random(), (float)Math.random());
-                // horizontal borderline
-                cb.moveTo(widths[col], heights[line]);
-                cb.lineTo(widths[col + 1], heights[line]);
-                cb.stroke();
-                // vertical borderline
-                cb.setRGBColorStrokeF((float)Math.random(), (float)Math.random(), (float)Math.random());
-                cb.moveTo(widths[col], heights[line]);
-                cb.lineTo(widths[col], heights[line + 1]);
-                cb.stroke();
-            }
-        }
-        cb.restoreState();
-    }
-    
+
     /**
      * General example using table events.
-     * @param args
-     *         no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -103,41 +50,101 @@ public static void main(String[] args) {
             PdfPTable table = new PdfPTable(4);
             table.getDefaultCell().setBorder(Rectangle.NO_BORDER);
             for (int k = 0; k < 24; ++k) {
-                if (k != 0)
+                if (k != 0) {
                     table.addCell(String.valueOf(k));
-                else
+                } else {
                     table.addCell("This is an URL");
+                }
             }
             TableEvents1 event = new TableEvents1();
             table.setTableEvent(event);
-            
+
             // add the table with document add
             document.add(table);
             // add the table at an absolute position
             table.setTotalWidth(300);
             table.writeSelectedRows(0, -1, 100, 600, writer.getDirectContent());
-            
+
             document.newPage();
-            
+
             table = new PdfPTable(4);
             float fontSize = 12;
             BaseFont bf = BaseFont.createFont("Helvetica", "winansi", false);
             table.getDefaultCell().setPaddingTop(bf.getFontDescriptor(BaseFont.ASCENT, fontSize) - fontSize + 2);
             table.getDefaultCell().setBorder(Rectangle.NO_BORDER);
             for (int k = 0; k < 500 * 4; ++k) {
-                if (k == 0)
+                if (k == 0) {
                     table.addCell(new Phrase("This is an URL", new Font(bf, fontSize)));
-                else
+                } else {
                     table.addCell(new Phrase(String.valueOf(k), new Font(bf, fontSize)));
+                }
             }
             table.setTableEvent(event);
             table.setHeaderRows(3);
             document.add(table);
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
         // step5
         document.close();
     }
+
+    /**
+     * @see com.lowagie.text.pdf.PdfPTableEvent#tableLayout(com.lowagie.text.pdf.PdfPTable, float[][], float[], int,
+     * int, com.lowagie.text.pdf.PdfContentByte[])
+     */
+    public void tableLayout(PdfPTable table, float[][] width, float[] heights, int headerRows, int rowStart,
+            PdfContentByte[] canvases) {
+
+        // widths of the different cells of the first row
+        float[] widths = width[0];
+
+        PdfContentByte cb = canvases[PdfPTable.TEXTCANVAS];
+        cb.saveState();
+        // border for the complete table
+        cb.setLineWidth(2);
+        cb.setRGBColorStroke(255, 0, 0);
+        cb.rectangle(widths[0], heights[heights.length - 1], widths[widths.length - 1] - widths[0],
+                heights[0] - heights[heights.length - 1]);
+        cb.stroke();
+
+        // border for the header rows
+        if (headerRows > 0) {
+            float headerHeight = heights[0];
+            for (int k = 0; k < headerRows; ++k) {
+                headerHeight += heights[k];
+            }
+            cb.setRGBColorStroke(0, 0, 255);
+            cb.rectangle(widths[0], heights[headerRows], widths[widths.length - 1] - widths[0],
+                    heights[0] - heights[headerRows]);
+            cb.stroke();
+        }
+        cb.restoreState();
+
+        cb = canvases[PdfPTable.BASECANVAS];
+        cb.saveState();
+        // border for the cells
+        cb.setLineWidth(.5f);
+        // loop over the rows
+        for (int line = 0; line < heights.length - 1; ++line) {
+            // loop over the columns
+            for (int col = 0; col < widths.length - 1; ++col) {
+                if (line == 0 && col == 0) {
+                    cb.setAction(new PdfAction("https://github.com/LibrePDF/OpenPDF"),
+                            widths[col], heights[line + 1], widths[col + 1], heights[line]);
+                }
+                cb.setRGBColorStrokeF((float) Math.random(), (float) Math.random(), (float) Math.random());
+                // horizontal borderline
+                cb.moveTo(widths[col], heights[line]);
+                cb.lineTo(widths[col + 1], heights[line]);
+                cb.stroke();
+                // vertical borderline
+                cb.setRGBColorStrokeF((float) Math.random(), (float) Math.random(), (float) Math.random());
+                cb.moveTo(widths[col], heights[line]);
+                cb.lineTo(widths[col], heights[line + 1]);
+                cb.stroke();
+            }
+        }
+        cb.restoreState();
+    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/TableEvents2.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/TableEvents2.java
index 04748c2c0..71a178ca7 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/TableEvents2.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/TableEvents2.java
@@ -9,12 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.pdfptable;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.Font;
@@ -27,69 +25,17 @@
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfPTableEvent;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * General example using TableEvents (with colspan).
  */
 public class TableEvents2 implements PdfPTableEvent {
-    /**
-     * @see com.lowagie.text.pdf.PdfPTableEvent#tableLayout(com.lowagie.text.pdf.PdfPTable, float[][], float[], int, int, com.lowagie.text.pdf.PdfContentByte[])
-     */
-    public void tableLayout(PdfPTable table, float[][] width, float[] heights, int headerRows, int rowStart, PdfContentByte[] canvases) {
-        
-        // widths of the different cells of the first row
-        float[] widths = width[0];
-        
-        PdfContentByte cb = canvases[PdfPTable.TEXTCANVAS];
-        cb.saveState();
-        // border for the complete table
-        cb.setLineWidth(2);
-        cb.setRGBColorStroke(255, 0, 0);
-        cb.rectangle(widths[0], heights[heights.length - 1], widths[widths.length - 1] - widths[0], heights[0] - heights[heights.length - 1]);
-        cb.stroke();
-        
-        // border for the header rows
-        if (headerRows > 0) {
-            float headerHeight = heights[0];
-            for (int k = 0; k < headerRows; ++k)
-                headerHeight += heights[k];
-            cb.setRGBColorStroke(0, 0, 255);
-            cb.rectangle(widths[0], heights[headerRows], widths[widths.length - 1] - widths[0], heights[0] - heights[headerRows]);
-            cb.stroke();
-        }
-        cb.restoreState();
-        
-        cb = canvases[PdfPTable.BASECANVAS];
-        cb.saveState();
-        // border for the cells
-        cb.setLineWidth(.5f);
-        // loop over the rows
-        for (int line = 0; line < heights.length - 1; ++line) {
-            widths = width[line];
-            // loop over the columns
-            for (int col = 0; col < widths.length - 1; ++col) {
-                if (line == 0 && col == 0)
-                    cb.setAction(new PdfAction("https://github.com/LibrePDF/OpenPDF"),
-                        widths[col], heights[line + 1], widths[col + 1], heights[line]);
-                cb.setRGBColorStrokeF((float)Math.random(), (float)Math.random(), (float)Math.random());
-                // horizontal borderline
-                cb.moveTo(widths[col], heights[line]);
-                cb.lineTo(widths[col + 1], heights[line]);
-                cb.stroke();
-                // vertical borderline
-                cb.setRGBColorStrokeF((float)Math.random(), (float)Math.random(), (float)Math.random());
-                cb.moveTo(widths[col], heights[line]);
-                cb.lineTo(widths[col], heights[line + 1]);
-                cb.stroke();
-            }
-        }
-        cb.restoreState();
-    }
-    
+
     /**
      * General example using table events (with colspan).
-     * @param args
-     *         no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -105,9 +51,9 @@ public static void main(String[] args) {
             PdfPTable table = new PdfPTable(4);
             table.getDefaultCell().setBorder(Rectangle.NO_BORDER);
             for (int k = 0; k < 24; ++k) {
-                if (k != 0)
+                if (k != 0) {
                     table.addCell(String.valueOf(k));
-                else {
+                } else {
                     table.getDefaultCell().setColspan(3);
                     table.getDefaultCell().setHorizontalAlignment(Element.ALIGN_CENTER);
                     table.addCell("This is a very big URL");
@@ -125,7 +71,7 @@ public static void main(String[] args) {
             table.setTotalWidth(300);
             table.writeSelectedRows(0, -1, 100, 600, writer.getDirectContent());
             document.newPage();
-            
+
             table = new PdfPTable(4);
             float fontSize = 12;
             BaseFont bf = BaseFont.createFont("Helvetica", "winansi", false);
@@ -139,18 +85,77 @@ public static void main(String[] args) {
                     table.getDefaultCell().setColspan(1);
                     table.getDefaultCell().setHorizontalAlignment(Element.ALIGN_LEFT);
                     k += 3;
-                }
-                else
+                } else {
                     table.addCell(new Phrase(String.valueOf(k), new Font(bf, fontSize)));
+                }
             }
             table.setTableEvent(event);
             table.setHeaderRows(3);
             document.add(table);
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
         // step5
         document.close();
     }
+
+    /**
+     * @see com.lowagie.text.pdf.PdfPTableEvent#tableLayout(com.lowagie.text.pdf.PdfPTable, float[][], float[], int,
+     * int, com.lowagie.text.pdf.PdfContentByte[])
+     */
+    public void tableLayout(PdfPTable table, float[][] width, float[] heights, int headerRows, int rowStart,
+            PdfContentByte[] canvases) {
+
+        // widths of the different cells of the first row
+        float[] widths = width[0];
+
+        PdfContentByte cb = canvases[PdfPTable.TEXTCANVAS];
+        cb.saveState();
+        // border for the complete table
+        cb.setLineWidth(2);
+        cb.setRGBColorStroke(255, 0, 0);
+        cb.rectangle(widths[0], heights[heights.length - 1], widths[widths.length - 1] - widths[0],
+                heights[0] - heights[heights.length - 1]);
+        cb.stroke();
+
+        // border for the header rows
+        if (headerRows > 0) {
+            float headerHeight = heights[0];
+            for (int k = 0; k < headerRows; ++k) {
+                headerHeight += heights[k];
+            }
+            cb.setRGBColorStroke(0, 0, 255);
+            cb.rectangle(widths[0], heights[headerRows], widths[widths.length - 1] - widths[0],
+                    heights[0] - heights[headerRows]);
+            cb.stroke();
+        }
+        cb.restoreState();
+
+        cb = canvases[PdfPTable.BASECANVAS];
+        cb.saveState();
+        // border for the cells
+        cb.setLineWidth(.5f);
+        // loop over the rows
+        for (int line = 0; line < heights.length - 1; ++line) {
+            widths = width[line];
+            // loop over the columns
+            for (int col = 0; col < widths.length - 1; ++col) {
+                if (line == 0 && col == 0) {
+                    cb.setAction(new PdfAction("https://github.com/LibrePDF/OpenPDF"),
+                            widths[col], heights[line + 1], widths[col + 1], heights[line]);
+                }
+                cb.setRGBColorStrokeF((float) Math.random(), (float) Math.random(), (float) Math.random());
+                // horizontal borderline
+                cb.moveTo(widths[col], heights[line]);
+                cb.lineTo(widths[col + 1], heights[line]);
+                cb.stroke();
+                // vertical borderline
+                cb.setRGBColorStrokeF((float) Math.random(), (float) Math.random(), (float) Math.random());
+                cb.moveTo(widths[col], heights[line]);
+                cb.lineTo(widths[col], heights[line + 1]);
+                cb.stroke();
+            }
+        }
+        cb.restoreState();
+    }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/Tables.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/Tables.java
index a1bb2791b..bca8da656 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/Tables.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/Tables.java
@@ -14,13 +14,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.pdfptable;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
@@ -30,6 +27,8 @@
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Adds a table to a page twice.
@@ -38,14 +37,13 @@ public class Tables {
 
     /**
      * Adds a table to a page twice.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
         Font font8 = FontFactory.getFont(FontFactory.HELVETICA, 8);
-        
+
         // step 1
         Document document = new Document(PageSize.A4);
 
@@ -59,7 +57,7 @@ public static void main(String[] args) {
             document.open();
 
             // step 4
-            float[] columnDefinitionSize = { 33.33F, 33.33F, 33.33F };
+            float[] columnDefinitionSize = {33.33F, 33.33F, 33.33F};
 
             float pos = height / 2;
             PdfPTable table = null;
@@ -83,9 +81,9 @@ public static void main(String[] args) {
             table.addCell(new Phrase("39100 Dole France", font8));
             table.addCell(new Phrase("12345 Ulm Germany", font8));
             table.addCell(new Phrase("45789 Cambridge  England", font8));
-            
+
             document.add(table);
-            
+
             table = new PdfPTable(columnDefinitionSize);
             table.getDefaultCell().setBorder(0);
             table.setHorizontalAlignment(0);
@@ -104,11 +102,9 @@ public static void main(String[] args) {
             table.addCell(new Phrase("39100 Dole France", font8));
             table.addCell(new Phrase("12345 Ulm Germany", font8));
             table.addCell(new Phrase("45789 Cambridge  England", font8));
-            
-            table.writeSelectedRows(0, -1, 50, pos, writer.getDirectContent());
-        }
 
-        catch (DocumentException | IOException de) {
+            table.writeSelectedRows(0, -1, 50, pos, writer.getDirectContent());
+        } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
         // step 5
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/VerticalTextInCells.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/VerticalTextInCells.java
index f548fe81c..5ed0cd609 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/VerticalTextInCells.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/VerticalTextInCells.java
@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.pdfptable;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.Image;
@@ -25,16 +22,18 @@
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import java.awt.Color;
+import java.io.FileOutputStream;
 
 /**
  * Vertical Text in Cells.
  */
 public class VerticalTextInCells {
-    
+
     /**
      * Example with vertical text in Cells.
-     * @param args
-     *         no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -47,7 +46,7 @@ public static void main(String[] args) {
             // step3
             document.open();
             // step4
-            
+
             // make a PdfTemplate with the vertical text
             PdfTemplate template = writer.getDirectContent().createTemplate(20, 20);
             BaseFont bf = BaseFont.createFont("Helvetica", "winansi", false);
@@ -83,8 +82,7 @@ public static void main(String[] args) {
             table.addCell(cell);
             table.addCell("I see a template on my left");
             document.add(table);
-        }
-        catch (Exception de) {
+        } catch (Exception de) {
             de.printStackTrace();
         }
         // step5
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/WriteSelectedRows.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/WriteSelectedRows.java
index bbd2493d0..95a1fc3af 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/WriteSelectedRows.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/tables/pdfptable/WriteSelectedRows.java
@@ -9,18 +9,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  
+ *
  */
 package com.lowagie.examples.objects.tables.pdfptable;
 
-import java.io.FileOutputStream;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Rectangle;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
+import java.io.FileOutputStream;
 
 /**
  * Writing a PdfPTable at an absolute position.
@@ -29,9 +28,8 @@ public class WriteSelectedRows {
 
     /**
      * Demonstrates the writeSelectedRows method.
-     * 
-     * @param args
-     *            no arguments needed
+     *
+     * @param args no arguments needed
      */
     public static void main(String[] args) {
 
@@ -56,7 +54,7 @@ public static void main(String[] args) {
             document.add(table);
             document.newPage();
             table = new PdfPTable(2);
-            float[] rows = { 50f, 250f };
+            float[] rows = {50f, 250f};
             table.setTotalWidth(rows);
             for (int k = 0; k < 200; ++k) {
                 table.addCell("row " + k);
diff --git a/pdf-toolbox/src/test/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerTest.java b/pdf-toolbox/src/test/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerTest.java
index c6ad101f9..a87108113 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerTest.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerTest.java
@@ -4,13 +4,12 @@
 import static java.nio.file.Files.readAllBytes;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.lowagie.text.DocumentException;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
-import com.lowagie.text.DocumentException;
 import org.junit.jupiter.api.Test;
 
 class WatermarkerTest {
@@ -38,7 +37,7 @@ void shouldWriteWatermarkWithIOStreams() throws IOException, DocumentException {
 
     @SuppressWarnings("unused")
     private void writeOnDisk(byte[] result) throws IOException {
-        try(FileOutputStream fileOutputStream = new FileOutputStream(new File("src/test/resources/Result.pdf"))) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(new File("src/test/resources/Result.pdf"))) {
             fileOutputStream.write(result);
         }
     }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerToolTest.java b/pdf-toolbox/src/test/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerToolTest.java
index 04080b32b..0826388da 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerToolTest.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/toolbox/plugins/watermarker/WatermarkerToolTest.java
@@ -6,13 +6,13 @@ public class WatermarkerToolTest {
      * Adding text at absolute positions.
      *
      * @param args no arguments needed
-     *
-     * Before passing that test, you have to create a MyFile.pdf at the project root.
-     * The generated files will be written there too.
-     *
+     *             
              
+     *             Before passing that test, you have to create a MyFile.pdf at the project root. The generated files
+     *             will be written there too.
      */
     public static void main(String[] args) {
         WatermarkerTool.main(new String[]{"MyFile.pdf", "Specimen", "120", "0.5", "MyFile-watermark.pdf"});
-        WatermarkerTool.main(new String[]{"MyFile.pdf", "Specimen", "120", "0.5", "MyFile-watermark-red.pdf", "#FF0000"});
+        WatermarkerTool.main(
+                new String[]{"MyFile.pdf", "Specimen", "120", "0.5", "MyFile-watermark-red.pdf", "#FF0000"});
     }
 }
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/java/com/lowagie/tools/ConcatPdfTest.java b/pdf-toolbox/src/test/java/com/lowagie/tools/ConcatPdfTest.java
index 1aca5e4a6..2b04db867 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/tools/ConcatPdfTest.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/tools/ConcatPdfTest.java
@@ -1,64 +1,60 @@
 package com.lowagie.tools;
 
+import com.lowagie.text.pdf.PdfReader;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import com.lowagie.text.pdf.PdfReader;
-
 public class ConcatPdfTest {
-    
+
     public ConcatPdfTest() {
         super();
     }
-    
+
     @Test
-    public void  testConcat1() throws IOException {
-        
+    public void testConcat1() throws IOException {
+
         List sources = new ArrayList<>();
         sources.add(new File("src/test/resources/groups.pdf"));
         sources.add(new File("src/test/resources/layers.pdf"));
-        
+
         File target = new File("target/test-pdfs/concat1.pdf");
         target.getParentFile().mkdirs();
         ConcatPdf.concat(sources, target);
-        
+
         Assertions.assertEquals(2, countPages(target));
     }
-    
+
     @Test
-    public void  testConcat2() throws IOException {
-        
+    public void testConcat2() throws IOException {
+
         List sources = new ArrayList<>();
         sources.add(new File("src/test/resources/groups.pdf"));
         sources.add(new File("src/test/resources/pattern.pdf"));
         sources.add(new File("src/test/resources/templates.pdf"));
         sources.add(new File("src/test/resources/layers.pdf"));
-        
-        
+
         File target = new File("target/test-pdfs/concat2.pdf");
         target.getParentFile().mkdirs();
         ConcatPdf.concat(sources, target);
-        
+
         Assertions.assertEquals(5, countPages(target));
     }
 
-    
+
     private int countPages(File file) {
-        
+
         try {
             PdfReader reader = new PdfReader(new BufferedInputStream(Files.newInputStream(file.toPath())));
             int count = reader.getNumberOfPages();
             reader.close();
-            return count;            
-        }
-        catch (Exception e) {
+            return count;
+        } catch (Exception e) {
             return 0;
         }
     }
diff --git a/pdf-toolbox/src/test/resources/com/lowagie/examples/html/example1forHTMLWorker.html b/pdf-toolbox/src/test/resources/com/lowagie/examples/html/example1forHTMLWorker.html
index 86528c592..caafed95f 100644
--- a/pdf-toolbox/src/test/resources/com/lowagie/examples/html/example1forHTMLWorker.html
+++ b/pdf-toolbox/src/test/resources/com/lowagie/examples/html/example1forHTMLWorker.html
@@ -7,38 +7,38 @@
 
              
 
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
              
   
              line 1line 2line 3line 4line 5line 6line 7line 8line 1line 2line 3line 4line 5line 6line 7line 8
   
              
   
              line 3line 4line 5line 6line 7line 8line 3line 4line 5line 6line 7line 8
   
              
   
              line 3line 4line 5line 6line 7line 8line 3line 4line 5line 6line 7line 8
   
              
   
              line 3line 4line 5line 6line 7line 8line 3line 4line 5line 6line 7line 8
   
              
 
              
 
diff --git a/pdf-toolbox/src/test/resources/com/lowagie/examples/html/example2forHTMLWorker.html b/pdf-toolbox/src/test/resources/com/lowagie/examples/html/example2forHTMLWorker.html
index 4c5842b7d..2b12c84b2 100644
--- a/pdf-toolbox/src/test/resources/com/lowagie/examples/html/example2forHTMLWorker.html
+++ b/pdf-toolbox/src/test/resources/com/lowagie/examples/html/example2forHTMLWorker.html
@@ -7,35 +7,35 @@
 
              
 
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
              
   
              line 1line 2line 3line 4line 5line 1line 2line 3line 4line 5
   
              
   
              line 1line 2line 3line 4line 5line 6line 1line 2line 3line 4line 5line 6
   
              
   
              line 1line 2line 3line 4line 5line 6line 1line 2line 3line 4line 5line 6
   
              
   
              line 1line 2line 3line 4line 5line 6line 1line 2line 3line 4line 5line 6
   
              
 
              
 
diff --git a/pdf-toolbox/src/test/resources/com/lowagie/examples/html/parseHelloWorld.html b/pdf-toolbox/src/test/resources/com/lowagie/examples/html/parseHelloWorld.html
index 599023f63..d51452248 100644
--- a/pdf-toolbox/src/test/resources/com/lowagie/examples/html/parseHelloWorld.html
+++ b/pdf-toolbox/src/test/resources/com/lowagie/examples/html/parseHelloWorld.html
@@ -2,22 +2,22 @@
 
 
              What should you say?
              
 
                
-    
              • Hello
                • 
-    
              • World
                • 
+  
              • Hello
                • 
+  
              • World
                • 
 
              
 
                
-    
              1. Element-1
-        
                  
-            
                1. Element-1-1
                  2. 
-            
                2. Element-1-2
                  3. 
-        
                
-    
                2. 
-    
              2. Element-2
-        
                  
-            
                1. Element-2-1
                  2. 
-            
                2. Element-2-2
                  3. 
-        
                
-    
                3. 
+  
              3. Element-1
+    
                  
+      
                1. Element-1-1
                  2. 
+      
                2. Element-1-2
                  3. 
+    
                
+  
                4. 
+  
              4. Element-2
+    
                  
+      
                1. Element-2-1
                  2. 
+      
                2. Element-2-2
                  3. 
+    
                
+  
                5. 
 
              
 
 
\ No newline at end of file
diff --git a/pdf-toolbox/src/test/resources/com/lowagie/examples/html/parseTitle.html b/pdf-toolbox/src/test/resources/com/lowagie/examples/html/parseTitle.html
index 72b74b208..ad8b06145 100644
--- a/pdf-toolbox/src/test/resources/com/lowagie/examples/html/parseTitle.html
+++ b/pdf-toolbox/src/test/resources/com/lowagie/examples/html/parseTitle.html
@@ -1,11 +1,11 @@
 
 
 
-    
-    Title
+  
+  Title
 
 
-    
              This is a test
              
-    
              This is a test2
              
+
              This is a test
              
+
              This is a test2
              
 
 
\ No newline at end of file

From d72dd85050b0ae1656d468f79fec92c53029f4ca Mon Sep 17 00:00:00 2001
From: Claudio Clemens 
Date: Sun, 10 Mar 2024 15:22:39 +0100
Subject: [PATCH 22/31] CheckStyle rules upgrade

- Copy all inactive rules back to checkstyle.xml
- Activated many rules.
- Reduced real line-length from 235 to 180
- Fixes some checkstyle-lower-hanging-fruits

(cherry picked from commit 9f8dceb58ac36f99b9bfae8be0ee46c994140ce2)
---
 checkstyle.xml                                | 604 ++++++++++++------
 config/checkstyle-inactive.xml                | 200 ------
 .../main/java/com/lowagie/text/Element.java   | 110 ++--
 .../src/main/java/com/lowagie/text/Jpeg.java  |   2 +-
 .../text/factories/RomanNumberFactory.java    |   5 +-
 .../java/com/lowagie/text/html/Markup.java    |   2 +-
 .../java/com/lowagie/text/pdf/BaseFont.java   |   4 +-
 .../com/lowagie/text/pdf/FontDetails.java     |   6 +-
 .../com/lowagie/text/pdf/IntHashtable.java    |  17 +-
 .../com/lowagie/text/pdf/LayoutProcessor.java |   4 +-
 .../text/pdf/MappedRandomAccessFile.java      |   2 +
 .../com/lowagie/text/pdf/PRTokeniser.java     |   5 +-
 .../java/com/lowagie/text/pdf/PdfChunk.java   |   2 +-
 .../com/lowagie/text/pdf/PdfGraphics2D.java   |  44 +-
 .../java/com/lowagie/text/pdf/PdfName.java    |   7 +-
 .../text/pdf/PdfPublicKeySecurityHandler.java |   5 +-
 .../java/com/lowagie/text/pdf/PdfReader.java  |   3 +-
 .../com/lowagie/text/pdf/fonts/FontTest.java  |  20 +-
 .../rups/controller/PdfReaderController.java  |   6 +-
 .../com/lowagie/toolbox/plugins/Add3D.java    |   8 +-
 .../examples/fonts/styles/ComplexText.java    |   3 +-
 .../examples/general/LandscapePortrait.java   |   3 +-
 .../examples/objects/FontSelection.java       |   4 +-
 .../examples/objects/NegativeLeading.java     |   9 +-
 .../com/lowagie/examples/objects/Phrases.java |   3 +-
 25 files changed, 563 insertions(+), 515 deletions(-)
 delete mode 100644 config/checkstyle-inactive.xml

diff --git a/checkstyle.xml b/checkstyle.xml
index 27ac2683f..ef31903da 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,6 +1,6 @@
 
 
+  "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 
 
+
 
-    
+  
 
-    
-    
-    
-    
-        
+  
+  
+  
+  
+    
+  
+  
+  
+    
+    
+  
+
+  
+  
+  
+    
+  
+
+  
+    
+    
+     
+    
+  
+
+  
+    
+      
+    
+    
+    
+      
+      
+      
     
-    
-    
 
-    
-    
-    
+    
 
-    
-        
-        
-         
-        
+    
+    
+    
+      
+    
+    
+      
+      
+    
+    
+      
     
 
-    
-        
-            
-        
-        
-        
-            
-            
-            
-        
-        
-        
-        
-        
-            
+    
+    
+    
+    
-        
-            
-            
-            
+      
+      
+      
+    
+
+    
+      
+      
+      
-        
-        
-        
-        
-        
-        
-        
-        
-            
-            
-            
-        
-        
-            
-            
-            
-        
-        
-            
-            
-            
-            
-        
-        
-            
-            
-            
-            
-        
-        
-            
-            
-            
-        
-        
-            
-            
-            
-        
-        
-            
+      
+    
+    
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
+    
+
+    
+    
+
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+       
+      
+    
+
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
-            
-        
-        
-        
-            
-            
-        
-        
-            
-            
-        
-        
-        
-            
-            
-        
-        
-            
-            
-        
-        
-            
-            
+      
+    
+
+    
+    
+    
+    
+
+    
+      
+      
+    
+    
+      
+      
+    
+
+    
+    
-        
-            
-            
-            
-            
+    -->
+
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+
+    
+    
+
+    
+      
+      
+      
+      
+    
+
+    
+    
-        
-            
+              
+              
+              
+            
+    -->
+    
+    
+    
+    
+
+    
+      
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+    
+    
+      
+    
+
+    
+    
-        
-            
-
-            
+      
+      
+    
+    
+      
+      
+      
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+
+    
+    
+    
+    
-        
-            
-            
-            
-            
-            
+    -->
+    
+    
+
+    
+      
+    
+
+    
+    
-        
-        
-            
-            
+    -->
+    
+    
+
+    
+    
+      
+      
     
+  
 
diff --git a/config/checkstyle-inactive.xml b/config/checkstyle-inactive.xml
deleted file mode 100644
index 7f52a04ac..000000000
--- a/config/checkstyle-inactive.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-    
-    
-    
-        
-        
-    
-    
-    
-        
-    
-    
-    
-        
-        
-        
-    
-    
-    
-        
-    
-    
-        
-    
-    
-        
-        
-    
-    
-        
-        
-        
-    
-    
-    
-        
-    
-    
-        
-        
-        
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    
-    
-    
-    
-    
-        
-        
-    
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-    
-        
-        
-    
-    
-    
-    
-    
-        
-        
-        
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-    
-    
-        
-        
-        
-        
-    
-    
-    
-        
-        
-    
-    
-        
-    
-    
-        
-        
-    
-    
-    
-    
-    
-    
-        
-    
-    
-    
-    
-        
-        
-    
-    
-    
-        
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-    
-    
-        
-    
-    
-        
-    
-    
-        
-    
-
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/Element.java b/openpdf/src/main/java/com/lowagie/text/Element.java
index ba4e120e2..2a1ad02cb 100644
--- a/openpdf/src/main/java/com/lowagie/text/Element.java
+++ b/openpdf/src/main/java/com/lowagie/text/Element.java
@@ -81,174 +81,174 @@ public interface Element {
     /**
      * This is a possible type of Element.
      */
-    public static final int HEADER = 0;
+    int HEADER = 0;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int TITLE = 1;
+    int TITLE = 1;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int SUBJECT = 2;
+    int SUBJECT = 2;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int KEYWORDS = 3;
+    int KEYWORDS = 3;
 
     /**
      * This is a possible type of Element .
      */
-    public static final int AUTHOR = 4;
+    int AUTHOR = 4;
 
     /**
      * This is a possible type of Element .
      */
-    public static final int PRODUCER = 5;
+    int PRODUCER = 5;
 
     /**
      * This is a possible type of Element .
      */
-    public static final int CREATIONDATE = 6;
+    int CREATIONDATE = 6;
 
     /**
      * This is a possible type of Element .
      */
-    public static final int CREATOR = 7;
+    int CREATOR = 7;
 
     /**
-     * This is a possible type of Element .
+     * This is a possible type of Element .
      */
-    public static final int MODIFICATIONDATE = 8;
+    int MODIFICATIONDATE = 8;
 
     // static membervariables (content)
 
     /**
      * This is a possible type of Element.
      */
-    public static final int CHUNK = 10;
+    int CHUNK = 10;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int PHRASE = 11;
+    int PHRASE = 11;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int PARAGRAPH = 12;
+    int PARAGRAPH = 12;
 
     /**
      * This is a possible type of Element
      */
-    public static final int SECTION = 13;
+    int SECTION = 13;
 
     /**
      * This is a possible type of Element
      */
-    public static final int LIST = 14;
+    int LIST = 14;
 
     /**
      * This is a possible type of Element
      */
-    public static final int LISTITEM = 15;
+    int LISTITEM = 15;
 
     /**
      * This is a possible type of Element
      */
-    public static final int CHAPTER = 16;
+    int CHAPTER = 16;
 
     /**
      * This is a possible type of Element
      */
-    public static final int ANCHOR = 17;
+    int ANCHOR = 17;
 
     // static membervariables (tables)
 
     /**
      * This is a possible type of Element.
      */
-    public static final int CELL = 20;
+    int CELL = 20;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int ROW = 21;
+    int ROW = 21;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int TABLE = 22;
+    int TABLE = 22;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int PTABLE = 23;
+    int PTABLE = 23;
 
     // static membervariables (annotations)
 
     /**
      * This is a possible type of Element.
      */
-    public static final int ANNOTATION = 29;
+    int ANNOTATION = 29;
 
     // static membervariables (geometric figures)
 
     /**
      * This is a possible type of Element.
      */
-    public static final int RECTANGLE = 30;
+    int RECTANGLE = 30;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int JPEG = 32;
+    int JPEG = 32;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int JPEG2000 = 33;
+    int JPEG2000 = 33;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int IMGRAW = 34;
+    int IMGRAW = 34;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int IMGTEMPLATE = 35;
+    int IMGTEMPLATE = 35;
 
     /**
      * This is a possible type of Element.
      *
      * @since 2.1.5
      */
-    public static final int JBIG2 = 36;
+    int JBIG2 = 36;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int MULTI_COLUMN_TEXT = 40;
+    int MULTI_COLUMN_TEXT = 40;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int MARKED = 50;
+    int MARKED = 50;
 
     /**
      * This is a possible type of Element.
      *
      * @since 2.1.2
      */
-    public static final int YMARK = 55;
+    int YMARK = 55;
 
     /**
      * This is a possible type of Element.
      */
-    public static final int FOOTNOTE = 56;
+    int FOOTNOTE = 56;
 
     // static membervariables (alignment)
 
@@ -256,99 +256,99 @@ public interface Element {
      * A possible value for paragraph alignment. This specifies that the text is aligned to the left indent and extra
      * whitespace should be placed on the right.
      */
-    public static final int ALIGN_UNDEFINED = -1;
+    int ALIGN_UNDEFINED = -1;
 
     /**
      * A possible value for paragraph alignment. This specifies that the text is aligned to the left indent and extra
      * whitespace should be placed on the right.
      */
-    public static final int ALIGN_LEFT = 0;
+    int ALIGN_LEFT = 0;
 
     /**
      * A possible value for paragraph alignment. This specifies that the text is aligned to the center and extra
      * whitespace should be placed equally on the left and right.
      */
-    public static final int ALIGN_CENTER = 1;
+    int ALIGN_CENTER = 1;
 
     /**
      * A possible value for paragraph alignment. This specifies that the text is aligned to the right indent and extra
      * whitespace should be placed on the left.
      */
-    public static final int ALIGN_RIGHT = 2;
+    int ALIGN_RIGHT = 2;
 
     /**
      * A possible value for paragraph alignment. This specifies that extra whitespace should be spread out through the
      * rows of the paragraph with the text lined up with the left and right indent except on the last line which should
      * be aligned to the left.
      */
-    public static final int ALIGN_JUSTIFIED = 3;
+    int ALIGN_JUSTIFIED = 3;
 
     /**
      * A possible value for vertical alignment.
      */
 
-    public static final int ALIGN_TOP = 4;
+    int ALIGN_TOP = 4;
 
     /**
      * A possible value for vertical alignment.
      */
 
-    public static final int ALIGN_MIDDLE = 5;
+    int ALIGN_MIDDLE = 5;
 
     /**
      * A possible value for vertical alignment.
      */
 
-    public static final int ALIGN_BOTTOM = 6;
+    int ALIGN_BOTTOM = 6;
 
     /**
      * A possible value for vertical alignment.
      */
-    public static final int ALIGN_BASELINE = 7;
+    int ALIGN_BASELINE = 7;
 
     /**
      * Does the same as ALIGN_JUSTIFIED but the last line is also spread out.
      */
-    public static final int ALIGN_JUSTIFIED_ALL = 8;
+    int ALIGN_JUSTIFIED_ALL = 8;
 
     // static member variables for CCITT compression
 
     /**
      * Pure two-dimensional encoding (Group 4)
      */
-    public static final int CCITTG4 = 0x100;
+    int CCITTG4 = 0x100;
 
     /**
      * Pure one-dimensional encoding (Group 3, 1-D)
      */
-    public static final int CCITTG3_1D = 0x101;
+    int CCITTG3_1D = 0x101;
 
     /**
      * Mixed one- and two-dimensional encoding (Group 3, 2-D)
      */
-    public static final int CCITTG3_2D = 0x102;
+    int CCITTG3_2D = 0x102;
 
     /**
      * A flag indicating whether 1-bits are to be interpreted as black pixels and 0-bits as white pixels,
      */
-    public static final int CCITT_BLACKIS1 = 1;
+    int CCITT_BLACKIS1 = 1;
 
     /**
      * A flag indicating whether the filter expects extra 0-bits before each encoded line so that the line begins on a
      * byte boundary.
      */
-    public static final int CCITT_ENCODEDBYTEALIGN = 2;
+    int CCITT_ENCODEDBYTEALIGN = 2;
 
     /**
      * A flag indicating whether end-of-line bit patterns are required to be present in the encoding.
      */
-    public static final int CCITT_ENDOFLINE = 4;
+    int CCITT_ENDOFLINE = 4;
 
     /**
      * A flag indicating whether the filter expects the encoded data to be terminated by an end-of-block pattern,
      * overriding the Rows parameter. The use of this flag will set the key /EndOfBlock to false.
      */
-    public static final int CCITT_ENDOFBLOCK = 8;
+    int CCITT_ENDOFBLOCK = 8;
 
     // methods
 
@@ -367,7 +367,7 @@ public interface Element {
      * @return a type
      */
 
-    public int type();
+    int type();
 
     /**
      * Checks if this element is a content object. If not, it's a metadata object.
@@ -376,7 +376,7 @@ public interface Element {
      * @since iText 2.0.8
      */
 
-    public boolean isContent();
+    boolean isContent();
 
     /**
      * Checks if this element is nestable.
@@ -385,7 +385,7 @@ public interface Element {
      * @since iText 2.0.8
      */
 
-    public boolean isNestable();
+    boolean isNestable();
 
     /**
      * Gets all the chunks in this element.
@@ -393,7 +393,7 @@ public interface Element {
      * @return an ArrayList
      */
 
-    public ArrayList getChunks();
+    ArrayList getChunks();
 
     /**
      * Gets the content of the text element.
@@ -402,5 +402,5 @@ public interface Element {
      */
 
     @Override
-    public String toString();
+    String toString();
 }
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/Jpeg.java b/openpdf/src/main/java/com/lowagie/text/Jpeg.java
index b26c88afc..d8111977f 100644
--- a/openpdf/src/main/java/com/lowagie/text/Jpeg.java
+++ b/openpdf/src/main/java/com/lowagie/text/Jpeg.java
@@ -185,7 +185,7 @@ private static int getShort(InputStream is) throws IOException {
      * Returns a type of marker.
      *
      * @param marker an int
-     * @return a type: VALID_MARKER, UNSUPPORTED_MARKER or NOPARAM_MARKER
+     * @return a type: VALID_MARKER, UNSUPPORTED_MARKER or NOPARAM_MARKER
      */
     private static int marker(int marker) {
         for (int validMarker : VALID_MARKERS) {
diff --git a/openpdf/src/main/java/com/lowagie/text/factories/RomanNumberFactory.java b/openpdf/src/main/java/com/lowagie/text/factories/RomanNumberFactory.java
index 0ef1230f6..4205bc87a 100644
--- a/openpdf/src/main/java/com/lowagie/text/factories/RomanNumberFactory.java
+++ b/openpdf/src/main/java/com/lowagie/text/factories/RomanNumberFactory.java
@@ -106,8 +106,9 @@ public static String getString(int index) {
             }
             // look for the next digit that can be used in a special way
             int j = pos;
-            while (!roman[++j].pre)
-                ;
+            while (!roman[++j].pre) {
+                // find j
+            }
 
             // does the special notation apply?
             if (index + roman[j].value >= dig.value) {
diff --git a/openpdf/src/main/java/com/lowagie/text/html/Markup.java b/openpdf/src/main/java/com/lowagie/text/html/Markup.java
index 04f6fa918..a101fd332 100644
--- a/openpdf/src/main/java/com/lowagie/text/html/Markup.java
+++ b/openpdf/src/main/java/com/lowagie/text/html/Markup.java
@@ -484,7 +484,7 @@ public static float parseLength(String string, float actualFontSize) {
         if (string == null) {
             return 0f;
         }
-        FontSize fs = FontSize.parse(string);// it can be one of the CCS font size names (e.g. 'x-large')
+        FontSize fs = FontSize.parse(string); // it can be one of the CCS font size names (e.g. 'x-large')
         if (fs != null) {
             if (fs.isRelative()) {
                 return fs.getScale() * actualFontSize;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/BaseFont.java b/openpdf/src/main/java/com/lowagie/text/pdf/BaseFont.java
index f0761b859..671e4cdaa 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/BaseFont.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/BaseFont.java
@@ -1313,7 +1313,7 @@ public float getWidthPoint(int char1, float fontSize) {
     }
 
     /**
-     * Converts a String to a byte array according to the font's encoding.
+     * Converts a String to a byte array according to the font's encoding.
      *
      * @param text the String to be converted
      * @return an array of byte representing the conversion according to the font's encoding
@@ -1344,7 +1344,7 @@ byte[] convertToBytes(String text) {
     }
 
     /**
-     * Converts a char to a byte array according to the font's encoding.
+     * Converts a char to a byte array according to the font's encoding.
      *
      * @param char1 the char to be converted
      * @return an array of byte representing the conversion according to the font's encoding
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/FontDetails.java b/openpdf/src/main/java/com/lowagie/text/pdf/FontDetails.java
index ed037d537..4e8e0d68e 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/FontDetails.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/FontDetails.java
@@ -291,12 +291,12 @@ byte[] convertToBytes(GlyphVector glyphVector, int beginIndex, int endIndex) {
         int glyphCount = 0;
         for (int i = beginIndex; i < endIndex; i++) {
             int code = glyphVector.getGlyphCode(i);
-            if (code == 0xFFFE || code == 0xFFFF) {// considered non-glyphs by
-                // AWT
+            if (code == 0xFFFE || code == 0xFFFF) {
+                // considered non-glyphs by AWT
                 continue;
             }
 
-            glyphs[glyphCount++] = (char) code;// FIXME supplementary plane?
+            glyphs[glyphCount++] = (char) code; // FIXME supplementary plane?
 
             Integer codeKey = code;
             if (!longTag.containsKey(codeKey)) {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/IntHashtable.java b/openpdf/src/main/java/com/lowagie/text/pdf/IntHashtable.java
index ee34d54a4..2e9be555f 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/IntHashtable.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/IntHashtable.java
@@ -72,7 +72,7 @@ public class IntHashtable implements Cloneable {
      *
      * @serial
      */
-    private float loadFactor;
+    private final float loadFactor;
 
     /***
      * 
              Constructs a new, empty hashtable with a default capacity and load
@@ -364,8 +364,9 @@ public int[] getKeys() {
         Entry entry = null;
         while (true) {
             if (entry == null) {
-                while ((index-- > 0) && ((entry = table[index]) == null))
-                    ;
+                while ((index-- > 0) && ((entry = table[index]) == null)) {
+                    // searching
+                }
             }
             if (entry == null) {
                 break;
@@ -383,8 +384,9 @@ public int getOneKey() {
         }
         int index = table.length;
         Entry entry = null;
-        while ((index-- > 0) && ((entry = table[index]) == null))
-            ;
+        while ((index-- > 0) && ((entry = table[index]) == null)) {
+            // searching
+        }
         if (entry == null) {
             return 0;
         }
@@ -473,8 +475,9 @@ public boolean hasNext() {
 
         public Object next() {
             if (entry == null) {
-                while ((index-- > 0) && ((entry = table[index]) == null))
-                    ;
+                while ((index-- > 0) && ((entry = table[index]) == null)) {
+                    // searching
+                }
             }
             if (entry != null) {
                 Entry e = entry;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java b/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java
index c26db6c8b..209b26c36 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java
@@ -208,8 +208,8 @@ private static void setRunDirection(com.lowagie.text.Font font, Boolean runDirec
      *
      * @param font           The font for which kerning is to be turned on
      * @param textAttributes Map of text attributes to be set
-     * @see 
-     * Oracle: The Javaâ„¢ Tutorials, Using Text Attributes to Style Text*
+     * @see Oracle: The Javaâ„¢ Tutorials,
+     * Using Text Attributes to Style Text
      */
     private static void setTextAttributes(com.lowagie.text.Font font, Map textAttributes) {
         BaseFont baseFont = font.getBaseFont();
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java b/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java
index d16ba3dae..599a07e49 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java
@@ -230,6 +230,8 @@ public void close() throws IOException {
      *
      * @see java.lang.Object#finalize()
      */
+    @Override
+    @Deprecated(since = "OpenPDF-2.0.2", forRemoval = true)
     protected void finalize() throws Throwable {
         close();
         super.finalize();
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java b/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java
index 1708135eb..cb29452d9 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java
@@ -572,8 +572,9 @@ public boolean readLineSegment(byte[] input) throws IOException {
         // skip initial whitespace; added this because PdfReader.rebuildXref()
         // assumes that line provided by readLineSegment does not have init. whitespace;
         if (ptr < len) {
-            while (isWhitespace((c = read())))
-                ;
+            while (isWhitespace((c = read()))) {
+                // consume input
+            }
         }
         while (!eol && ptr < len) {
             switch (c) {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfChunk.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfChunk.java
index 761b066c4..89716ca7f 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfChunk.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfChunk.java
@@ -892,7 +892,7 @@ boolean isExtSplitCharacter(int start, int current, int end, char[] cc, PdfChunk
      * Removes all the ' ' and '-'-characters on the right of a String.
      * 
              
      *
-     * @param string the String that has to be trimmed.
+     * @param string the String that has to be trimmed.
      * @return the trimmed String
      */
     String trim(String string) {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfGraphics2D.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfGraphics2D.java
index 1017dbfb7..aa46afd1b 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfGraphics2D.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfGraphics2D.java
@@ -145,7 +145,7 @@ public class PdfGraphics2D extends Graphics2D {
     private float width;
     private float height;
     private Area clip;
-    private RenderingHints rhints = new RenderingHints(null);
+    private final RenderingHints rhints = new RenderingHints(null);
     private Stroke stroke;
     private Stroke originalStroke;
     private PdfContentByte cb;
@@ -374,7 +374,7 @@ public void drawString(String s, float x, float y) {
         if (onlyShapes) {
             drawGlyphVector(this.font.layoutGlyphVector(getFontRenderContext(), s.toCharArray(), 0, s.length(),
                     java.awt.Font.LAYOUT_LEFT_TO_RIGHT), x, y);
-//            Use the following line to compile in JDK 1.3    
+//            Use the following line to compile in JDK 1.3
 //            drawGlyphVector(this.font.createGlyphVector(getFontRenderContext(), s), x, y);
         } else {
             if (!Float.isFinite(fontSize) || fontSize < PdfContentByte.MIN_FONT_SIZE) {
@@ -769,7 +769,7 @@ public void setRenderingHints(Map hints) {
      * @see Graphics#translate(int, int)
      */
     public void translate(int x, int y) {
-        translate((double) x, (double) y);
+        translate(x, (double) y);
     }
 
     /**
@@ -1542,7 +1542,7 @@ private boolean drawImage(Image img, Image mask, AffineTransform xform, Color bg
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 ImageWriteParam iwparam = new JPEGImageWriteParam(Locale.getDefault());
                 iwparam.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
-                iwparam.setCompressionQuality(jpegQuality);//Set here your compression rate
+                iwparam.setCompressionQuality(jpegQuality); //Set here your compression rate
                 ImageWriter iw = ImageIO.getImageWritersByFormatName("jpg").next();
                 ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
                 iw.setOutput(ios);
@@ -1792,14 +1792,16 @@ public String toString() {
 
 
     /**
-     * Wrapper class that helps to draw string with sun.font.CompositeFont (Windows logical fonts).
               If the given
+     * Wrapper class that helps to draw string with sun.font.CompositeFont (Windows logical fonts).
+     *
+     * 
               If the given
      * font is a sun.font.CompositeFont than try to find some font (an implementation of sun.font.Font2D) that will
      * display current text. For some symbols that cannot be displayed with the font from the first slot of the
-     * composite font all other font will be checked.
              
-     * 
              
+     * composite font all other font will be checked.
+     * 
              
      * This processing is not necessary only for Mac OS - there isn't used "sun.font.CompositeFont", but
-     * "sun.font.CFont".
              
-     * 
              
+     * "sun.font.CFont".
+     * 
              
      * Since the sun.* packages are not part of the supported, public interface the reflection will be
      * used.
      */
@@ -1872,9 +1874,12 @@ static boolean isSupported() {
 
         /**
          * Update module of the given class to open the given package to the target module if the target module is
-         * opened for the current module.
               This helps to avoid warnings for the
-         * --illegal-access=permit. Actually (java 9-13) "permit" is default mode, but in the future java
-         * releases the default mode will be "deny". It's also important to add --add-opens for the given
+         * opened for the current module.
+         *
+         * 
              
+         * This helps to avoid warnings for the
+         * --illegal-access=permit. Actually (java 9-13) "permit" is default mode, but in the future java
+         * releases the default mode will be "deny". It's also important to add --add-opens for the given
          * package if it's need.
          */
         private static void updateModuleToOpenPackage(Class classInModule, String packageName) {
@@ -1962,8 +1967,10 @@ boolean isCompositeFont(Font font) {
         }
 
         /**
-         * Draw text with the given font at the specified position. This method splits the string into parts so that it
-         * can be displayed with a matching (font that can display all symbols of this part of string) slot font.
              
+         * Draw text with the given font at the specified position.
+         * 
              This method splits the string into parts so that it
+         * can be displayed with a matching (font that can display all symbols of this part of string) slot font.
+         * 
              
          * If some class/method cannot be found or throw exception the default drawing string function will be used for
          * a drawing string.
          *
@@ -2005,10 +2012,11 @@ boolean isCompositeFont(Font font) {
         }
 
         /**
-         * Split string into visible and not visible parts.
               This method split string into substring parts. For each
-         * splitted part correspond found {@link BaseFont base font} from the slots of the composite font witch can
-         * display all characters of the part of string. If no font found the {@link BaseFont base font} from the own
-         * composite font will be used.
+         * Split string into visible and not visible parts.
+         * 
              
+         * This method split string into substring parts. For each splitted part correspond found
+         * {@link BaseFont base font} from the slots of the composite font witch can display all characters of the part
+         * of string. If no font found the {@link BaseFont base font} from the own composite font will be used.
          *
          * @param s
          * @param compositeFont
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfName.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfName.java
index 82abca951..741233547 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfName.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfName.java
@@ -222,7 +222,8 @@ public class PdfName extends PdfObject implements Comparable {
      * two cases listed below. Every annotation (including those whose Subtype value is Widget, as used for form
      * fields), except for the two cases listed below, shall have at least one appearance dictionary. Exclusions:
      * 
                
-     * 
              • Annotations where the value of the Rect key consists of an array where the value at index 1 is equal to the value at index 3 or the value at index 2 is equal to the value at index 4
                • 
+     * 
              • Annotations where the value of the Rect key consists of an array where the value at index 1 is equal to the
+     * value at index 3 or the value at index 2 is equal to the value at index 4
                • 
      * 
              • Annotations whose Subtype value is Popup, Projection or Link.
                • 
      * 
              
      */
@@ -3208,12 +3209,12 @@ public class PdfName extends PdfObject implements Comparable {
     /**
      * List of names used for widget annotations
      */
-    private static ArrayList widgetNames;
+    private static final ArrayList widgetNames;
 
     /**
      * List of names used in form field dictionaries
      */
-    private static ArrayList formfieldNames;
+    private static final ArrayList formfieldNames;
 
     /*
      * Use reflection to cache all the static public final names so
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
index a0df9a623..5ef29f9d7 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java
@@ -180,10 +180,7 @@ public byte[] getEncodedRecipient(int index) throws IOException,
         }
 
         Certificate certificate = recipient.getCertificate();
-        int permission = recipient.getPermission();// PdfWriter.AllowCopy |
-        // PdfWriter.AllowPrinting |
-        // PdfWriter.AllowScreenReaders |
-        // PdfWriter.AllowAssembly;
+        int permission = recipient.getPermission();
 
         permission |= 0xfffff0c0;
         permission &= 0xfffffffc;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfReader.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfReader.java
index d8b536331..b127dfadd 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfReader.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfReader.java
@@ -1637,7 +1637,8 @@ private void readDecryptedDocObj() throws IOException {
                     ownerPasswordUsed = true;
                 }
             } else {
-                // implements Algorithm 2.A: Retrieving the file encryption key from an encrypted document in order to decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3
+                /* implements Algorithm 2.A: Retrieving the file encryption key from an encrypted document in order to
+                 decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3 */
                 s = enc.get(PdfName.UE).toString();
                 strings.remove(enc.get(PdfName.UE));
                 byte[] ueValue = com.lowagie.text.DocWriter.getISOBytes(s);
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/FontTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/FontTest.java
index 1c4c28bd7..71ad88053 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/fonts/FontTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/fonts/FontTest.java
@@ -36,15 +36,17 @@
  */
 class FontTest {
 
-    private static final Map> STYLES_TO_TEST_METHOD = new HashMap>() {{
-        put(Font.NORMAL, f -> !f.isBold() && !f.isItalic() && !f.isStrikethru() && !f.isUnderlined());
-        put(Font.BOLD, Font::isBold);
-        put(Font.ITALIC, Font::isItalic);
-        put(Font.UNDERLINE, Font::isUnderlined);
-        put(Font.STRIKETHRU, Font::isStrikethru);
-        put(Font.BOLDITALIC, f -> f.isBold() && f.isItalic());
-        put(Font.UNDERLINE | Font.BOLD, f -> f.isUnderlined() && f.isBold());
-    }};
+    private static final Map> STYLES_TO_TEST_METHOD = new HashMap<>() {
+        {
+            put(Font.NORMAL, f -> !f.isBold() && !f.isItalic() && !f.isStrikethru() && !f.isUnderlined());
+            put(Font.BOLD, Font::isBold);
+            put(Font.ITALIC, Font::isItalic);
+            put(Font.UNDERLINE, Font::isUnderlined);
+            put(Font.STRIKETHRU, Font::isStrikethru);
+            put(Font.BOLDITALIC, f -> f.isBold() && f.isItalic());
+            put(Font.UNDERLINE | Font.BOLD, f -> f.isUnderlined() && f.isBold());
+        }
+    };
 
     private static final String FONT_NAME_WITHOUT_STYLES = "non-existing-font";
 
diff --git a/pdf-swing/src/main/java/com/lowagie/rups/controller/PdfReaderController.java b/pdf-swing/src/main/java/com/lowagie/rups/controller/PdfReaderController.java
index 55e2bb45f..92e333e0c 100644
--- a/pdf-swing/src/main/java/com/lowagie/rups/controller/PdfReaderController.java
+++ b/pdf-swing/src/main/java/com/lowagie/rups/controller/PdfReaderController.java
@@ -270,11 +270,7 @@ public void update(Observable observable, Object obj) {
             if (node.isRecursive()) {
                 pdfTree.selectNode(node.getAncestor());
                 return;
-            }/*
-            if (node.isIndirect()) {
-                xref.selectRowByReference(node.getNumber());
-                return;
-            }*/
+            }
             render(node.getPdfObject());
         }
     }
diff --git a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Add3D.java b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Add3D.java
index a07c760ef..ff50bc39e 100644
--- a/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Add3D.java
+++ b/pdf-toolbox/src/main/java/com/lowagie/toolbox/plugins/Add3D.java
@@ -214,9 +214,11 @@ public void execute() {
             stream.writeLength();
 
             // Create 3D view dictionary
-            // PDF documentation states that this can be left out, but without normally we will just get a blank 3D image because of wrong coordinate space transformations, etc.
-            // Instead of providing camera-to-world transformation here, we could also reference view in U3D file itself (would be U3DPath key instead of C2W key, U3D value instead of M value for MS key), but i haven't tried up to now
-            // We could also provide an activation dictionary (defining activation behavior), and field-of-view for P entry if needed
+            // PDF documentation states that this can be left out, but without normally we will just get a blank 3D
+            // image because of wrong coordinate space transformations, etc. Instead of providing camera-to-world
+            // transformation here, we could also reference view in U3D file itself (would be U3DPath key instead of
+            // C2W key, U3D value instead of M value for MS key), but i haven't tried up to now We could also provide
+            // an activation dictionary (defining activation behavior), and field-of-view for P entry if needed
             PdfDictionary dict = new PdfDictionary(new PdfName(PDF_NAME_3DVIEW));
 
             dict.put(new PdfName(PDF_NAME_XN), new PdfString("Default"));
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java
index 5241ca8db..1d17ccae0 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/fonts/styles/ComplexText.java
@@ -68,7 +68,8 @@ public static void main(String[] args) {
             BaseFont bf = BaseFont.createFont("c:\\windows\\fonts\\arialuni.ttf", BaseFont.IDENTITY_H, true);
             Font ft = new Font(bf, 12);
             // This is the text:
-            String text = "\u0623\u0648\u0631\u0648\u0628\u0627, \u0628\u0631\u0645\u062c\u064a\u0627\u062a \u0627\u0644\u062d\u0627\u0633\u0648\u0628 + \u0627\u0646\u062a\u0631\u0646\u064a\u062a :";
+            String text = "\u0623\u0648\u0631\u0648\u0628\u0627, \u0628\u0631\u0645\u062c\u064a\u0627\u062a"
+                    + " \u0627\u0644\u062d\u0627\u0633\u0648\u0628 + \u0627\u0646\u062a\u0631\u0646\u064a\u062a :";
             Phrase center = new Phrase(text + " Center", ft);
             ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_CENTER, center, 250, 700, 0,
                     PdfWriter.RUN_DIRECTION_RTL, 0);
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/general/LandscapePortrait.java b/pdf-toolbox/src/test/java/com/lowagie/examples/general/LandscapePortrait.java
index d8d00c3c8..c97edb75d 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/general/LandscapePortrait.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/general/LandscapePortrait.java
@@ -54,7 +54,8 @@ public static void main(String[] args) {
 
             // step 4: we add some content
             document.add(new Paragraph(
-                    "To create a document in landscape format, just make the height smaller than the width. For instance by rotating the PageSize Rectangle: PageSize.A4.rotate()"));
+                    "To create a document in landscape format, just make the height smaller than the width. For "
+                            + "instance by rotating the PageSize Rectangle: PageSize.A4.rotate()"));
             document.setPageSize(PageSize.A4);
             document.newPage();
             document.add(new Paragraph("This is portrait again"));
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FontSelection.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FontSelection.java
index 3a5e4beaf..3903c8ec9 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FontSelection.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/FontSelection.java
@@ -42,7 +42,9 @@ public static void main(String[] args) {
             // step 4
             String text = "This text is the first verse of \u275dThe Iliad\u275e. It's not polytonic as it should be "
                     + "with \u2798 and \u279a entoation variants but that's all we have for now.\n\n"
-                    + "\u2766\u00a0\u00a0\u039c\u03b7\u03bd\u03b9\u03bd \u03b1\u03b5\u03b9\u03b4\u03b5, \u03b8\u03b5\u03b1, \u03a0\u03b7\u03bb\u03b7\u03b9\u03b1\u03b4\u03b5\u03c9 \u0391\u03c7\u03b9\u03bb\u03b7\u03bf\u03c2";
+                    + "\u2766\u00a0\u00a0\u039c\u03b7\u03bd\u03b9\u03bd \u03b1\u03b5\u03b9\u03b4\u03b5, "
+                    + "\u03b8\u03b5\u03b1, \u03a0\u03b7\u03bb\u03b7\u03b9\u03b1\u03b4\u03b5\u03c9 "
+                    + "\u0391\u03c7\u03b9\u03bb\u03b7\u03bf\u03c2";
             FontSelector sel = new FontSelector();
             sel.addFont(new Font(Font.TIMES_ROMAN, 12));
             sel.addFont(new Font(Font.ZAPFDINGBATS, 12));
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/NegativeLeading.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/NegativeLeading.java
index 369367cec..aed127d3a 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/NegativeLeading.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/NegativeLeading.java
@@ -50,10 +50,11 @@ public static void main(String[] args) {
             document.open();
             // step 4:
             document.add(new Phrase(16, "\n\n\n"));
-            document
-                    .add(new Phrase(
-                            -16,
-                            "Hello, this is a very long phrase to show you the somewhat odd effect of a negative leading. You can write from bottom to top. This is not fully supported. It's something between a feature and a bug."));
+            document.add(
+                    new Phrase(-16,
+                            "Hello, this is a very long phrase to show you the somewhat odd effect of a negative"
+                                    + " leading. You can write from bottom to top. This is not fully supported. It's"
+                                    + " something between a feature and a bug."));
         } catch (DocumentException | IOException de) {
             System.err.println(de.getMessage());
         }
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Phrases.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Phrases.java
index 0b03a1b2a..024bcb3ee 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Phrases.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/Phrases.java
@@ -57,7 +57,8 @@ public static void main(String[] args) {
             // In this example the leading is passed as a parameter
             Phrase phrase2 = new Phrase(
                     24,
-                    "(2) this is a phrase with leading 24. You can only see the difference if the line is long enough. Do you see it? There is more space between this line and the previous one.\n");
+                    "(2) this is a phrase with leading 24. You can only see the difference if the line is long"
+                            + " enough. Do you see it? There is more space between this line and the previous one.\n");
             // When a Font is passed (explicitely or embedded in a chunk),
             // the default leading = 1.5 * size of the font
             Phrase phrase3 = new Phrase(

From d603c602864ac9d40ca2fec8cb429afb34692d23 Mon Sep 17 00:00:00 2001
From: Claudio Clemens 
Date: Sun, 10 Mar 2024 16:03:13 +0100
Subject: [PATCH 23/31] Main pom.xml updated

- reformatted
- developers: added asturio
- scm just after developers
- minor correction
- checkstyle setup in pluginManagement
- created "release"-profile
- source, javadoc and gpg only run in "release"-profile
- set version vor maven-site-plugin
- gpg.skip not needed anymore
- added -Prelease to createRelease.sh

(cherry picked from commit 1da07d03148c6898e31d65476dc6d84eff33d5ff)
---
 .github/workflows/maven.yml |   4 +-
 CONTRIBUTING.md             |  60 ++-
 createRelease.sh            |   2 +-
 pom.xml                     | 921 ++++++++++++++++++------------------
 4 files changed, 534 insertions(+), 453 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index bfc7034bd..34f1b6867 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Check maven version
         run: mvn -v; echo "** ls **"; pwd && ls -l
       - name: Build with Maven
-        run: mvn -B install --file pom.xml -Dgpg.skip
+        run: mvn -B install --file pom.xml
 
   codacy-coverage-reporter:
     runs-on: ubuntu-latest
@@ -42,7 +42,7 @@ jobs:
           distribution: temurin
           java-version: 17
       - name: Build with Maven
-        run: mvn -B verify --file pom.xml -Dgpg.skip
+        run: mvn -B verify --file pom.xml
       - name: Run codacy-coverage-reporter
         uses: codacy/codacy-coverage-reporter-action@v1
         with:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a69364c97..9ff4d1055 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1 +1,59 @@
-Draft
+# Contributing to OpenPDF
+
+## How to contribute with Code
+
+1. Create a GitHub account
+2. Fork the project on GitHub
+3. Make any improvements you want in your fork (in any branch)
+4. Create a pull request
+
+### Building the project
+
+1. Clone the repository (or your fork)
+2. Run `mvn clean install` in the root directory
+
+### Compatibility matrix
+
+| OpenPDF version | Java version |
+|-----------------|--------------|
+| 1.3             | 8            |
+| 1.4             | 11           |
+| 2.0 (master)    | 17           |
+
+### Please note
+
+- We use the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html) with
+  some exceptionsu
+  - Indentation: 4 spaces
+  - Continuation indent: 8 spaces
+  - Line length: 120 characters
+- Make sure to add tests for your changes
+- Fix any checkstyle issues before submitting your pull request (`mvn checkstyle:check`)
+- Fix any issues found by the CI build after submitting your pull request
+
+### How to contribute with Documentation
+
+- Feel free to add content to the [Wiki](https://github.com/LibrePDF/OpenPDF/wiki)
+- Also participate in the [Discussions](https://github.com/LibrePDF/OpenPDF/discussions), answering and asking questions
+- You may also contribute with translations in `src/main/java/com/lowagie/text/error_messages`
+- Or add some examples in the module `pdf-toolbox`
+- Our [Migration Guide](https://github.com/LibrePDF/OpenPDF/wiki/Migrating-from-iText-2-and-4) need some love, so
+  feel free to contribute. Please describe there the minor changes you had to do to migrate from iText to OpenPDF.
+
+### How to contribute with Bug Reports
+
+- Please be as detailed as possible, including the version of OpenPDF you are using, the Java version, and the operating
+  system
+- If possible, provide a minimal code example that reproduces the problem
+- Describe the expected behavior and the actual behavior
+- Describe how to reproduce the bug
+
+## Become a maintainer
+
+We are looking for maintainers to help us with the project. We need help in:
+
+- Reviewing and accepting pull requests
+- Answering questions in the discussions or issues
+- Triaging issues which are important to fix
+
+Interested in making OpenPDF better? Please contact @asturio (Claudio Clemens).
diff --git a/createRelease.sh b/createRelease.sh
index 88bc8f77d..12c0a4b22 100755
--- a/createRelease.sh
+++ b/createRelease.sh
@@ -44,7 +44,7 @@ echo "#3. Commit changes and tag"
 git commit -a -m "Set version to ${VERSION}" && git tag "${VERSION}"
 
 echo "#4. Make a staging release"
-mvn clean deploy
+mvn clean deploy -Prelease
 RC=$?
 if [ $RC -eq 0 ]
 then
diff --git a/pom.xml b/pom.xml
index 3ba960121..44c3bc254 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,477 +1,500 @@
 
 
-    4.0.0
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  4.0.0
 
-    com.github.librepdf
-    openpdf-parent
-    1.4.1-SNAPSHOT 
-    pom
+  com.github.librepdf
+  openpdf-parent
+  1.4.1-SNAPSHOT 
+  pom
 
-    
-    OpenPDF - Free and Open PDF
-    Open and Free PDF library.
-    https://github.com/LibrePDF/OpenPDF
-    
-        
-            GNU Lesser General Public License (LGPL), Version 2.1
-            https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-            repo
-        
-        
-            Mozilla Public License Version 2.0
-            https://www.mozilla.org/en-US/MPL/2.0/
-            repo
-        
-    
+  
+  OpenPDF - Free and Open PDF
+  Open and Free PDF library.
+  https://github.com/LibrePDF/OpenPDF
 
-    
-        
-            The OpenPDF Project
-            https://github.com/librepdf
-        
-    
+  
+    
+      GNU Lesser General Public License (LGPL), Version 2.1
+      https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+      repo
+    
+    
+      Mozilla Public License Version 2.0
+      https://www.mozilla.org/en-US/MPL/2.0/
+      repo
+    
+  
 
-    
-        openpdf
-        pdf-swing
-        pdf-toolbox
-        openpdf-fonts-extra
-    
+  
+    
+      The OpenPDF Project
+      https://github.com/librepdf
+    
+    
+      Claudio Clemens
+      asturio@gmx.net
+      LibrePDF
+      https://github.com/librepdf
+    
+  
 
-    
-        scm:git:https://github.com/LibrePDF/OpenPDF
-        scm:git:https://github.com/LibrePDF/OpenPDF
-        scm:git:https://github.com/LibrePDF/OpenPDF
-    
-    
-    
-        
-            ossrh
-            https://oss.sonatype.org/content/repositories/snapshots
-        
-    
+  
+    scm:git:https://github.com/LibrePDF/OpenPDF
+    scm:git:https://github.com/LibrePDF/OpenPDF.git
+    scm:git:https://github.com/LibrePDF/OpenPDF.git
+  
 
-    
-        com.github.librepdf.openpdf.parent
-        11
-        UTF-8
-        UTF-8
+  
+    openpdf
+    pdf-swing
+    pdf-toolbox
+    openpdf-fonts-extra
+  
+  
+  
+    
+      ossrh
+      https://oss.sonatype.org/content/repositories/snapshots
+    
+  
 
-        
-        5.1.9
-        3.3.1
-        3.3.2
-        3.12.1
-        3.1.0
-        3.3.0
-        3.6.3
-        3.0.1
-        2.4
-        3.3.0
-        3.2.5
-        false
-        1.6.13
-        1.2.1
-        1.3.7
+  
+    com.github.librepdf.openpdf.parent
+    11
+    UTF-8
+    UTF-8
 
-        
-        1.77
-        2.15.1
-        2.1.4
-        2.9
-        6.0.0
-        1.0.24
-        1.5.4
-        1.0.5
+    
+    5.1.9
+    3.3.1
+    3.3.2
+    3.12.1
+    3.1.0
+    3.3.0
+    3.6.3
+    3.3.2
+    3.0.1
+    2.4
+    3.12.1
+    3.3.0
+    3.2.5
+    false
+    1.6.13
+    1.2.1
+    1.3.7
 
-        
-        3.25.3
-        2.2
-        0.8.11
-        5.10.2
-        4.11.0
-        5.9.0
+    
+    1.77
+    2.15.1
+    2.1.4
+    2.9
+    6.0.0
+    1.0.24
+    1.5.4
+    1.0.5
 
-        10.13.0
-        3.3.2
-    
+    
+    3.25.3
+    10.14.0
+    2.2
+    0.8.11
+    5.10.2
+    4.11.0
+    5.9.0
+  
 
-    
-        
-            
-                org.bouncycastle
-                bcprov-jdk18on
-                ${bouncycastle.version}
-            
-            
-                org.bouncycastle
-                bcpkix-jdk18on
-                ${bouncycastle.version}
-            
-            
-                org.apache.xmlgraphics
-                fop
-                ${fop.version}
-            
-            
-                commons-io
-                commons-io
-                ${commons-io.version}
-            
-            
-                org.jfree
-                jfreechart
-                ${jfreechart.version}
-            
-            
-                org.jfree
-                jcommon
-                ${jcommon.version}
-            
-            
-                org.swinglabs
-                pdf-renderer
-                ${pdf-renderer.version}
-            
-            
-                org.dom4j
-                dom4j
-                ${dom4j.version}
-            
-            
-                jakarta.servlet
-                jakarta.servlet-api
-                ${jakarta.servlet-api.version}
-            
-            
-            
-                org.assertj
-                assertj-core
-                ${assertj.version}
-                test
-            
-            
-                org.junit.jupiter
-                junit-jupiter-api
-                ${junit.version}
-                test
-            
-            
-                org.junit.jupiter
-                junit-jupiter-params
-                ${junit.version}
-                test
-            
+  
+    
+      
+        org.bouncycastle
+        bcprov-jdk18on
+        ${bouncycastle.version}
+      
+      
+        org.bouncycastle
+        bcpkix-jdk18on
+        ${bouncycastle.version}
+      
+      
+        org.apache.xmlgraphics
+        fop
+        ${fop.version}
+      
+      
+        commons-io
+        commons-io
+        ${commons-io.version}
+      
+      
+        org.jfree
+        jfreechart
+        ${jfreechart.version}
+      
+      
+        org.jfree
+        jcommon
+        ${jcommon.version}
+      
+      
+        org.swinglabs
+        pdf-renderer
+        ${pdf-renderer.version}
+      
+      
+        org.dom4j
+        dom4j
+        ${dom4j.version}
+      
+      
+        jakarta.servlet
+        jakarta.servlet-api
+        ${jakarta.servlet-api.version}
+      
+      
+      
+        org.assertj
+        assertj-core
+        ${assertj.version}
+        test
+      
+      
+        org.junit.jupiter
+        junit-jupiter-api
+        ${junit.version}
+        test
+      
+      
+        org.junit.jupiter
+        junit-jupiter-params
+        ${junit.version}
+        test
+      
+      
+        org.hamcrest
+        hamcrest
+        ${hamcrest.version}
+        test
+      
+    
+  
+
+  
+    
+      
+        
+          org.apache.maven.plugins
+          maven-checkstyle-plugin
+          ${maven-checkstyle-plugin.version}
+          
+            checkstyle.xml
+            true
+          
+          
             
-                org.hamcrest
-                hamcrest
-                ${hamcrest.version}
-                test
+              com.puppycrawl.tools
+              checkstyle
+              ${checkstyle.version}
             
+          
+        
+        
+          
+          org.apache.maven.plugins
+          maven-site-plugin
+          ${maven-site-plugin.version}
+        
+      
+    
+
+    
+      
+      
+        maven-clean-plugin
+        ${maven-clean-plugin.version}
+        
+          
+            
+              ./out
+              false
+            
+            
+              ./test
+              false
+            
+            
+              ./target
+              false
+            
+            
+              .
+              
+                *.rtf
+                *.pdf
+                *.html
+              
+              false
+            
+          
+        
+      
+      
+      
+        org.apache.maven.plugins
+        maven-compiler-plugin
+        ${maven.compiler.plugin.version}
+        
+          ${java.version}
+          
+            -Xlint:unchecked
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-release-plugin
+        ${maven-release-plugin.version}
+        
+          true
+        
+      
+      
+        org.apache.maven.plugins
+        maven-jar-plugin
+        ${maven-jar-plugin.version}
+        
+          
+          
+            ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+            
+              ${java-module-name}
+              true
+            
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-repository-plugin
+        ${maven-repository-plugin.version}
+      
+      
+        org.sonatype.plugins
+        nexus-staging-maven-plugin
+        ${nexus-staging-maven-plugin.version}
+        true
+        
+          ossrh
+          https://oss.sonatype.org/
+          false
+        
+      
+      
+        org.apache.felix
+        maven-bundle-plugin
+        ${maven-bundle-plugin.version}
+        true
+        
+          
+            bundle-manifest
+            process-classes
+            
+            
+              manifest
+            
+          
+        
+        
+          
+          true
+        
+      
+      
+        eu.stamp-project
+        pitmp-maven-plugin
+        ${pitmp-maven-plugin.version}
+        
+          
+            org.pitest
+            pitest-junit5-plugin
+            ${pitest-junit5-plugin.version}
+          
+          
+          
+            org.bouncycastle
+            bcprov-jdk18on
+            ${bouncycastle.version}
+          
         
-    
+        
+          
+            java.util.logging
+            org.apache.log4j
+            org.slf4j
+            org.apache.commons.logging
+          
+          ${project.build.directory}/pitest
+          ${project.build.directory}/pitest
+        
+      
+
+      
+        org.apache.maven.plugins
+        maven-surefire-plugin
+        ${maven-surefire-plugin.version}
+      
+      
+        org.apache.maven.plugins
+        maven-failsafe-plugin
+        ${maven-surefire-plugin.version}
+      
+      
+        org.jacoco
+        jacoco-maven-plugin
+        ${jacoco-maven-plugin.version}
+        
+          
+            
+              prepare-agent
+            
+          
+          
+            report
+            prepare-package
+            
+              report
+            
+          
+        
+      
+    
+  
 
-    
-        
-            
-                
-                    org.apache.maven.plugins
-                    maven-checkstyle-plugin
-                    ${maven-checkstyle-plugin.version}
-                    
-                        checkstyle.xml
-                        true
-                    
-                    
-                        
-                            com.puppycrawl.tools
-                            checkstyle
-                            ${checkstyle.version}
-                        
-                    
-                
-            
-        
+  
+    
+      
+        org.apache.maven.plugins
+        maven-checkstyle-plugin
+        
+          
+            
+              checkstyle
+            
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-jxr-plugin
+        ${maven-jxr-plugin.version}
+      
+    
+  
 
+  
+    
+      jdk11-plus
+      
+        [11,)
+      
+      
+        
+          
+            org.mockito
+            mockito-core
+            ${mockito5.version}
+          
+        
+      
+      
         
-            
-            
-                org.apache.maven.plugins
-                maven-source-plugin
-                ${maven-source-plugin.version}
-                
-                    
-                        attach-sources
-                        verify
-                        
-                            jar-no-fork
-                        
-                    
-                
-            
-            
-            
-                org.apache.maven.plugins
-                maven-javadoc-plugin
-                ${maven-javadoc-plugin.version}
-                
-                    ${java.version}
-                
-                
-                    
-                        attach-javadocs
-                        
-                            jar
-                        
-                        
-                        
-                            -Xdoclint:none
-                        
-                    
-                
-            
-            
-            
-                maven-clean-plugin
-                ${maven-clean-plugin.version}
-                
-                    
-                        
-                            ./out
-                            false
-                        
-                        
-                            ./test
-                            false
-                        
-                        
-                            ./target
-                            false
-                        
-                        
-                            .
-                            
-                                *.rtf
-                                *.pdf
-                                *.html
-                            
-                            false
-                        
-                    
-                
-            
-            
-            
-                org.apache.maven.plugins
-                maven-compiler-plugin
-                ${maven.compiler.plugin.version}
-                
-                    ${java.version}
-                    ${project.build.sourceEncoding}
-                    
-                        -Xlint:unchecked
-                    
-                
-            
-            
-                org.apache.maven.plugins
-                maven-release-plugin
-                ${maven-release-plugin.version}
-                
-                    true
-                
-            
-            
-                org.apache.maven.plugins
-                maven-jar-plugin
-                ${maven-jar-plugin.version}
-                
-                    
-                    
-                        ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-                        
-                            ${java-module-name}
-                            true
-                        
-                    
-                
-            
-            
-                org.apache.maven.plugins
-                maven-repository-plugin
-                ${maven-repository-plugin.version}
-            
-            
-            
-                org.apache.maven.plugins
-                maven-gpg-plugin
-                ${maven-gpg-plugin.version}
-                
-                    
-                        sign-artifacts
-                        verify
-                        
-                            sign
-                        
-                    
-                
-            
-            
-                org.sonatype.plugins
-                nexus-staging-maven-plugin
-                ${nexus-staging-maven-plugin.version}
-                true
-                
-                    ossrh
-                    https://oss.sonatype.org/
-                    false
-                
-            
-            
-                org.apache.felix
-                maven-bundle-plugin
-                ${maven-bundle-plugin.version}
-                true
-                
-                    
-                        bundle-manifest
-                        process-classes
-                        
-                        
-                            manifest
-                        
-                    
-                
+          
+            org.apache.maven.plugins
+            maven-compiler-plugin
+            ${maven.compiler.plugin.version}
+            
+              11
+            
+            
+              
+                compile-java-11
+                
+                  compile
+                
                 
-                    
-                    true
+                  11
+                  
+                    ${project.basedir}/src/main/java
+                  
+                  true
                 
-            
-            
-                eu.stamp-project
-                pitmp-maven-plugin
-                ${pitmp-maven-plugin.version}
-                
-                    
-                        org.pitest
-                        pitest-junit5-plugin
-                        ${pitest-junit5-plugin.version}
-                    
-                    
-                    
-                        org.bouncycastle
-                        bcprov-jdk18on
-                        ${bouncycastle.version}
-                    
-                
+              
+            
+          
+        
+      
+    
+
+    
+      release
+      
+        
+          
+          
+            org.apache.maven.plugins
+            maven-javadoc-plugin
+            ${maven-javadoc-plugin.version}
+            
+              ${java.version}
+            
+            
+              
+                attach-javadocs
+                
+                  jar
+                
+                
                 
-                    
-                        java.util.logging
-                        org.apache.log4j
-                        org.slf4j
-                        org.apache.commons.logging
-                    
-                    ${project.build.directory}/pitest
-                    ${project.build.directory}/pitest
+                  -Xdoclint:none
                 
-            
+              
+            
+          
 
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-                ${maven-surefire-plugin.version}
-            
-            
-                org.apache.maven.plugins
-                maven-failsafe-plugin
-                ${maven-surefire-plugin.version}
-            
-            
-                org.jacoco
-                jacoco-maven-plugin
-                ${jacoco-maven-plugin.version}
-                
-                    
-                        
-                            prepare-agent
-                        
-                    
-                    
-                        report
-                        prepare-package
-                        
-                            report
-                        
-                    
-                
-            
-        
-    
+          
+          
+            org.apache.maven.plugins
+            maven-source-plugin
+            ${maven-source-plugin.version}
+            
+              
+                attach-sources
+                verify
+                
+                  jar-no-fork
+                
+              
+            
+          
 
-    
-        
-            
-                org.apache.maven.plugins
-                maven-checkstyle-plugin
-                
-                    
-                        
-                            checkstyle
-                        
-                    
-                
-            
-            
-                org.apache.maven.plugins
-                maven-jxr-plugin
-                ${maven-jxr-plugin.version}
-            
+          
+          
+            org.apache.maven.plugins
+            maven-gpg-plugin
+            ${maven-gpg-plugin.version}
+            
+              
+                sign-artifacts
+                verify
+                
+                  sign
+                
+              
+            
+          
         
-    
 
-    
-        
-            jdk11-plus
-            
-                [11,)
-            
-            
-                
-                    
-                        org.mockito
-                        mockito-core
-                        ${mockito5.version}
-                    
-                
-            
-            
-                
-                    
-                        org.apache.maven.plugins
-                        maven-compiler-plugin
-                        ${maven.compiler.plugin.version}
-                        
-                            11
-                        
-                        
-                            
-                                compile-java-11
-                                
-                                    compile
-                                
-                                
-                                    11
-                                    
-                                        ${project.basedir}/src/main/java
-                                    
-                                    true
-                                
-                            
-                        
-                    
-                
-            
-        
-    
+      
+    
+  
 

From a31c615a3e86b5a0a0956910e53ed7c957a3a7ea Mon Sep 17 00:00:00 2001
From: Claudio Clemens 
Date: Mon, 11 Mar 2024 16:57:12 +0100
Subject: [PATCH 24/31] Corrected tests to run also on Windows

---
 .../test/java/com/lowagie/text/ImageTest.java | 44 +++++++++++++++----
 .../com/lowagie/text/pdf/FontDetailsTest.java | 29 ++++++++++++
 .../lowagie/text/pdf/PdfSmartCopyTest.java    | 16 +++----
 3 files changed, 72 insertions(+), 17 deletions(-)
 create mode 100644 openpdf/src/test/java/com/lowagie/text/pdf/FontDetailsTest.java

diff --git a/openpdf/src/test/java/com/lowagie/text/ImageTest.java b/openpdf/src/test/java/com/lowagie/text/ImageTest.java
index 2d1ef0f5f..0139b3611 100644
--- a/openpdf/src/test/java/com/lowagie/text/ImageTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/ImageTest.java
@@ -2,8 +2,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.IOException;
+import java.io.InputStream;
 import org.junit.jupiter.api.Test;
 
 class ImageTest {
@@ -19,44 +21,59 @@ void shouldReturnImageWithUrlForUrl() throws Exception {
 
     @Test
     void shouldReturnImageWithUrlForPath() throws Exception {
-        final Image image = Image.getInstance(ClassLoader.getSystemResource("H.gif").getPath());
+        String fileName = "src/test/resources/H.gif";
+        final Image image = Image.getInstance(fileName);
         assertNotNull(image.getUrl());
     }
 
     @Test
-    void performanceTestPng() throws IOException {
+    void shouldReturnImageWithoutUrl() throws IOException {
+        byte[] imageBytes = readFileBytes();
+        Image image = Image.getInstance(imageBytes);
+        assertNotNull(image);
+        assertNull(image.getUrl());
+        assertThat(image.getRawData()).isNotEmpty();
+    }
+
+    @Test
+    void performanceTestPngFilename() throws IOException {
         long start = System.nanoTime();
         Image image = null;
         for (int i = 0; i < PERFORMANCE_ITERATIONS; i++) {
-            image = Image.getInstance(ClassLoader.getSystemResource("imageTest/ImageTest.png").getPath());
+            String fileName = "src/test/resources/imageTest/ImageTest.png";
+            image = Image.getInstance(fileName);
         }
         long deltaMillis = (System.nanoTime() - start) / 1_000_000 / PERFORMANCE_ITERATIONS;
         if (PERFORMANCE_ITERATIONS > 1) {
             System.out.format("Load PNG ~time after %d iterations %d ms%n", PERFORMANCE_ITERATIONS, deltaMillis);
         }
-        assertNotNull(image.getUrl());
+        assertNotNull(image);
+        assertThat(image.getRawData()).isNotEmpty();
     }
 
     @Test
-    void performanceTestJpg() throws IOException {
+    void performanceTestJpgWithFilename() throws IOException {
         long start = System.nanoTime();
         Image image = null;
         for (int i = 0; i < PERFORMANCE_ITERATIONS; i++) {
-            image = Image.getInstance(ClassLoader.getSystemResource("imageTest/ImageTest.jpg").getPath());
+            String fileName = "src/test/resources/imageTest/ImageTest.jpg";
+            image = Image.getInstance(fileName);
         }
         long deltaMillis = (System.nanoTime() - start) / 1_000_000 / PERFORMANCE_ITERATIONS;
         if (PERFORMANCE_ITERATIONS > 1) {
             System.out.format("Load JPG ~time after %d iterations %d ms%n", PERFORMANCE_ITERATIONS, deltaMillis);
         }
         assertNotNull(image.getUrl());
+        assertThat(image.getRawData()).isNotEmpty();
     }
 
     @Test
-    void performanceTestGif() throws IOException {
+    void performanceTestGifWithFilename() throws IOException {
         long start = System.nanoTime();
         Image image = null;
         for (int i = 0; i < PERFORMANCE_ITERATIONS; i++) {
-            image = Image.getInstance(ClassLoader.getSystemResource("imageTest/ImageTest.gif").getPath());
+            String fileName = "src/test/resources/imageTest/ImageTest.gif";
+            image = Image.getInstance(fileName);
         }
         long deltaMillis = (System.nanoTime() - start) / 1_000_000 / PERFORMANCE_ITERATIONS;
         if (PERFORMANCE_ITERATIONS > 1) {
@@ -65,4 +82,15 @@ void performanceTestGif() throws IOException {
         assertThat(deltaMillis).isLessThan(200);
         assertNotNull(image.getUrl());
     }
+
+    private byte[] readFileBytes() throws IOException {
+        byte[] bytes = null;
+        try (InputStream stream = this.getClass().getResourceAsStream("/imageTest/ImageTest.png")) {
+            if (stream != null) {
+                bytes = stream.readAllBytes();
+            }
+        }
+        return bytes;
+    }
+
 }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/FontDetailsTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/FontDetailsTest.java
new file mode 100644
index 000000000..83e4eefff
--- /dev/null
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/FontDetailsTest.java
@@ -0,0 +1,29 @@
+package com.lowagie.text.pdf;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatNullPointerException;
+
+import com.lowagie.text.TextRenderingOptions;
+import java.io.IOException;
+import org.junit.jupiter.api.Test;
+
+class FontDetailsTest {
+
+    @SuppressWarnings("DataFlowIssue")
+    @Test
+    void convertToBytesBaseFontNullShouldThrowNpe() {
+        assertThatNullPointerException().isThrownBy(() -> new FontDetails(null, null, null));
+    }
+
+    @Test
+    void convertToBytesShouldExerciseSomeCode() throws IOException {
+        String filename = "src/test/resources/fonts/jp/GenShinGothic-Normal.ttf";
+        BaseFont baseFont = BaseFont.createFont(filename, BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
+        FontDetails fontDetails = new FontDetails(null, null, baseFont);
+        TextRenderingOptions options = new TextRenderingOptions();
+        byte[] bytes = fontDetails.convertToBytes("hällö wörld", options);
+        assertThat(bytes).hasSize(22);
+        assertThat(fontDetails.isSubset()).isTrue();
+    }
+
+}
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfSmartCopyTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfSmartCopyTest.java
index 1895b9f98..35d5a65ec 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfSmartCopyTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfSmartCopyTest.java
@@ -3,7 +3,7 @@
 import com.lowagie.text.Document;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
+import java.nio.file.Files;
 import java.time.Duration;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -15,20 +15,19 @@ public PdfSmartCopyTest() {
     }
 
     @Test
-    public void test1() throws IOException {
+    public void test1() {
         File orig = new File("src/test/resources/pdfsmartcopy_bec.pdf");
         check(orig, 1);
     }
 
-
-    private void check(File orig, int count) throws IOException {
-        Assertions.assertTimeout(Duration.ofSeconds(10), () -> {
-            File out = new File("target/test-classes/pdfsmartocy-" + count + ".pdf");
-            out.getParentFile().mkdirs();
+    @SuppressWarnings("SameParameterValue")
+    private void check(File orig, int counter) {
+        Assertions.assertTimeout(Duration.ofSeconds(20), () -> {
+            File out = new File("target/test-classes/pdfsmartocy-" + counter + ".pdf");
+            Files.createDirectories(out.getParentFile().toPath());
             Document document = new Document();
             FileOutputStream outputStream = new FileOutputStream(out);
             PdfCopy copy = new PdfSmartCopy(document, outputStream);
-            //        PdfCopy copy = new PdfCopy(document, outputStream);
             document.open();
 
             PdfReader reader = new PdfReader(orig.getAbsolutePath());
@@ -44,5 +43,4 @@ private void check(File orig, int count) throws IOException {
         });
     }
 
-
 }

From 4f7d9d903eead5ecefa6c139cf612fc15727b85a Mon Sep 17 00:00:00 2001
From: asturio 
Date: Fri, 29 Mar 2024 23:33:18 +0100
Subject: [PATCH 25/31] Merge/1.3 in 1.4 (#1121)

Pick enhancements from 1.3 into 1.4

- Shandra's IndirectObjects
- Lonzak's ECDSA fixes
- Many @Overrides
- Javadoc
- Cleanups
---
 .github/workflows/checkstyle.yml              |  10 +-
 .../workflows/codacy-coverage-reporter.yaml   |  24 +
 .github/workflows/maven.yml                   |  44 +-
 changelogs/1.3.32.md                          |   2 +-
 config/eclipse-java-openpdf-style.xml         | 846 ++++++++++--------
 .../com/lowagie/text/ExceptionConverter.java  |  25 +-
 .../html/simpleparser/FactoryProperties.java  |   8 +-
 .../java/com/lowagie/text/pdf/AcroFields.java |  36 +-
 .../text/pdf/MappedRandomAccessFile.java      |   7 +-
 .../com/lowagie/text/pdf/PRTokeniser.java     |  28 +-
 .../com/lowagie/text/pdf/PdfContentByte.java  |   5 +-
 .../java/com/lowagie/text/pdf/PdfCopy.java    |   1 +
 .../com/lowagie/text/pdf/PdfCopyFields.java   |   5 +
 .../java/com/lowagie/text/pdf/PdfPKCS7.java   | 160 +++-
 .../com/lowagie/text/pdf/PdfStamperImp.java   |  17 +-
 .../java/com/lowagie/text/pdf/PdfWriter.java  |  24 +-
 .../text/pdf/hyphenation/Hyphenator.java      |  71 +-
 .../pdf/hyphenation/SimplePatternParser.java  |  16 +-
 .../text/pdf/PdfFormFlatteningTest.java       |  38 +
 .../indirect_object_in_rectangle.pdf          | Bin 0 -> 11921 bytes
 .../pageevents/tagmapRomeoJuliet.xml          | 176 ++--
 21 files changed, 909 insertions(+), 634 deletions(-)
 create mode 100644 .github/workflows/codacy-coverage-reporter.yaml
 create mode 100644 openpdf/src/test/resources/flattening/indirect_object_in_rectangle.pdf

diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml
index 83535da18..0c18f88ca 100644
--- a/.github/workflows/checkstyle.yml
+++ b/.github/workflows/checkstyle.yml
@@ -1,9 +1,5 @@
 name: OpenPDF checkstyle
-on:
-  push:
-    branches: [ '*' ]
-  pull_request:
-    branches: [ '*' ]
+on: [ push, pull_request ]
 
 jobs:
   checkstyle_job:
@@ -11,9 +7,9 @@ jobs:
     name: Checkstyle job
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
       - name: Run check style
-        uses: dbelyaev/action-checkstyle@v1.2.1
+        uses: dbelyaev/action-checkstyle@v1
         with:
           checkstyle_config: 'checkstyle.xml'
           reporter: 'github-pr-check'
diff --git a/.github/workflows/codacy-coverage-reporter.yaml b/.github/workflows/codacy-coverage-reporter.yaml
new file mode 100644
index 000000000..42b85baba
--- /dev/null
+++ b/.github/workflows/codacy-coverage-reporter.yaml
@@ -0,0 +1,24 @@
+name: Codacy Coverage Reporter
+
+on: [ push ]
+
+jobs:
+  codacy-coverage-reporter:
+    runs-on: ubuntu-latest
+    name: codacy-coverage-reporter
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Create coverage reports
+        run: mvn -B verify --file pom.xml
+
+      - name: Run codacy-coverage-reporter
+        uses: codacy/codacy-coverage-reporter-action@v1
+        with:
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          coverage-reports: ./openpdf/target/site/jacoco/jacoco.xml, ./pdf-toolbox/target/site/jacoco/jacoco.xml, ./openpdf-fonts-extra/target/site/jacoco/jacoco.xml
\ No newline at end of file
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 34f1b6867..08646df86 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -2,11 +2,7 @@
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
 name: OpenPDF maven build
-on:
-  push:
-    branches: [ '*' ]
-  pull_request:
-    branches: [ master, 1.3-java8, 1.4-java11 ]
+on: [ push, pull_request ]
 
 permissions:
   contents: read
@@ -14,41 +10,17 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # Java 11 in this branch 1.4-java11
-        java: [ 11 ]
-    name: Java ${{matrix.java}}
+    name: Build with Java 11
     steps:
-      - uses: actions/checkout@v4.1.1
-      - name: Setup java
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: ${{matrix.java}}
+          java-version: 11
+
       - name: Check maven version
         run: mvn -v; echo "** ls **"; pwd && ls -l
-      - name: Build with Maven
-        run: mvn -B install --file pom.xml
 
-  codacy-coverage-reporter:
-    runs-on: ubuntu-latest
-    name: Java 17 and codacy-coverage-reporter
-    steps:
-      - uses: actions/checkout@v4.1.1
-      - name: Setup java
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 17
       - name: Build with Maven
-        run: mvn -B verify --file pom.xml
-      - name: Run codacy-coverage-reporter
-        uses: codacy/codacy-coverage-reporter-action@v1
-        with:
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          # or
-          # api-token: ${{ secrets.CODACY_API_TOKEN }}
-          coverage-reports: ./openpdf/target/site/jacoco/jacoco.xml,./pdf-toolbox/target/site/jacoco/jacoco.xml,./openpdf-fonts-extra/target/site/jacoco/jacoco.xml
-          # or a comma-separated list for multiple reports
-          # coverage-reports: , 
+        run: mvn -B install --file pom.xml
\ No newline at end of file
diff --git a/changelogs/1.3.32.md b/changelogs/1.3.32.md
index 0cd02be3e..f06bb57ea 100644
--- a/changelogs/1.3.32.md
+++ b/changelogs/1.3.32.md
@@ -18,4 +18,4 @@
 * Bump com.ibm.icu:icu4j from 73.2 to 74.1 (#976)
 * Bump org.pitest:pitest-junit5-plugin from 1.2.0 to 1.2.1 (#975)
 * Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2
-* Bump org.apache.maven.plugins:maven-checkstyle-plugin (#978) 
+* Bump org.apache.maven.plugins:maven-checkstyle-plugin (#978)
diff --git a/config/eclipse-java-openpdf-style.xml b/config/eclipse-java-openpdf-style.xml
index 70795e269..181580403 100644
--- a/config/eclipse-java-openpdf-style.xml
+++ b/config/eclipse-java-openpdf-style.xml
@@ -1,380 +1,472 @@
 
 
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
 
\ No newline at end of file
diff --git a/openpdf/src/main/java/com/lowagie/text/ExceptionConverter.java b/openpdf/src/main/java/com/lowagie/text/ExceptionConverter.java
index 2c7092639..0f7d5270f 100644
--- a/openpdf/src/main/java/com/lowagie/text/ExceptionConverter.java
+++ b/openpdf/src/main/java/com/lowagie/text/ExceptionConverter.java
@@ -89,7 +89,7 @@ public class ExceptionConverter extends RuntimeException {
      */
     public ExceptionConverter(Exception ex) {
         this.ex = ex;
-        prefix = (ex instanceof RuntimeException) ? "" : "ExceptionConverter: ";
+        this.prefix = (ex instanceof RuntimeException) ? "" : "ExceptionConverter: ";
     }
 
     /**
@@ -113,7 +113,7 @@ public static final RuntimeException convertException(Exception ex) {
      * @return the original exception
      */
     public Exception getException() {
-        return ex;
+        return this.ex;
     }
 
     /**
@@ -121,8 +121,9 @@ public Exception getException() {
      *
      * @return message of the original exception
      */
+    @Override
     public String getMessage() {
-        return ex.getMessage();
+        return this.ex.getMessage();
     }
 
     /**
@@ -130,8 +131,9 @@ public String getMessage() {
      *
      * @return localized version of the message
      */
+    @Override
     public String getLocalizedMessage() {
-        return ex.getLocalizedMessage();
+        return this.ex.getLocalizedMessage();
     }
 
     /**
@@ -139,13 +141,15 @@ public String getLocalizedMessage() {
      *
      * @return String version of the exception
      */
+    @Override
     public String toString() {
-        return prefix + ex;
+        return this.prefix + this.ex;
     }
 
     /**
      * we have to override this as well
      */
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
@@ -155,10 +159,11 @@ public void printStackTrace() {
      *
      * @param printStream printStream
      */
+    @Override
     public void printStackTrace(java.io.PrintStream printStream) {
         synchronized (printStream) {
-            printStream.print(prefix);
-            ex.printStackTrace(printStream);
+            printStream.print(this.prefix);
+            this.ex.printStackTrace(printStream);
         }
     }
 
@@ -167,10 +172,11 @@ public void printStackTrace(java.io.PrintStream printStream) {
      *
      * @param printWriter printWriter
      */
+    @Override
     public void printStackTrace(java.io.PrintWriter printWriter) {
         synchronized (printWriter) {
-            printWriter.print(prefix);
-            ex.printStackTrace(printWriter);
+            printWriter.print(this.prefix);
+            this.ex.printStackTrace(printWriter);
         }
     }
 
@@ -180,6 +186,7 @@ public void printStackTrace(java.io.PrintWriter printWriter) {
      *
      * @return a Throwable
      */
+    @Override
     public synchronized Throwable fillInStackTrace() {
         return this;
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java
index 210939c27..4c4c89ce4 100755
--- a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java
+++ b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java
@@ -219,7 +219,13 @@ public static HyphenationEvent getHyphenation(String s) {
         return new HyphenationAuto(lang, country, leftMin, rightMin);
     }
 
-    @Deprecated
+    /**
+     * This method isn't used by iText, but you can use it to analyze the value of a style attribute inside a HashMap.
+     * The different elements of the style attribute are added to the HashMap as key-value pairs.
+     *
+     * @param h a Map that should have at least a key named style. After this method is invoked, more keys could be
+     *          added.
+     */
     // this method is nor called anywhere. But it is public so theoretically it could be called by consumers of OpenPdf, but why?
     public static void insertStyle(Map h) {
         String style = h.get("style");
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/AcroFields.java b/openpdf/src/main/java/com/lowagie/text/pdf/AcroFields.java
index 2797fc4ea..9503cf089 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/AcroFields.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/AcroFields.java
@@ -198,7 +198,7 @@ public static Object[] splitDAelements(String da) {
                             }
                             break;
                         case "g":
-                            if (stack.size() >= 1) {
+                            if (!stack.isEmpty()) {
                                 float gray = Float.parseFloat(stack.get(stack.size() - 1));
                                 if (gray != 0) {
                                     ret[DA_COLOR] = new GrayColor(gray);
@@ -283,7 +283,7 @@ void fill() {
             return;
         }
         PdfArray arrfds = (PdfArray) PdfReader.getPdfObjectRelease(top.get(PdfName.FIELDS));
-        if (arrfds == null || arrfds.size() == 0) {
+        if (arrfds == null || arrfds.isEmpty()) {
             return;
         }
         for (int k = 1; k <= reader.getNumberOfPages(); ++k) {
@@ -344,7 +344,7 @@ void fill() {
                         annot = null;
                     }
                 }
-                if (name.length() > 0) {
+                if (!name.isEmpty()) {
                     name = name.substring(0, name.length() - 1);
                 }
                 Item item = fields.get(name);
@@ -466,11 +466,11 @@ public String[] getAppearanceStates(String fieldName) {
      * @return String[] of appearance names or null if the field can not be found
      */
     public String[] getAppearanceNames(String fieldName, int idx) {
-        Item fd = (Item) this.fields.get(fieldName);
+        Item fd = this.fields.get(fieldName);
         if (fd == null) {
             return null;
         }
-        ArrayList names = new ArrayList();
+        ArrayList names = new ArrayList<>();
 
         PdfDictionary dic = fd.getWidget(idx);
         dic = dic.getAsDict(PdfName.AP);
@@ -478,9 +478,8 @@ public String[] getAppearanceNames(String fieldName, int idx) {
             dic = dic.getAsDict(PdfName.N);
             if (dic != null) {
 
-                Iterator it = dic.getKeys().iterator();
-                while (it.hasNext()) {
-                    String name = PdfName.decodeName(((PdfName) it.next()).toString());
+                for (PdfName pdfName : dic.getKeys()) {
+                    String name = PdfName.decodeName(pdfName.toString());
                     if (!names.contains(name)) {
                         names.add(name);
                     }
@@ -799,7 +798,6 @@ public void decodeGenericDictionary(PdfDictionary merged, BaseField tx) throws D
         }
         //flags
         PdfNumber nfl = merged.getAsNumber(PdfName.F);
-        flags = 0;
         tx.setVisibility(BaseField.VISIBLE_BUT_DOES_NOT_PRINT);
         if (nfl != null) {
             flags = nfl.intValue();
@@ -870,7 +868,7 @@ PdfAppearance getAppearance(PdfDictionary merged, String[] values, String fieldN
         topFirst = 0;
         String text = (values.length > 0) ? values[0] : null;
 
-        TextField tx = null;
+        TextField tx;
         if (fieldCache == null || !fieldCache.containsKey(fieldName)) {
             tx = new TextField(writer, null, null);
             tx.setExtraMargin(extraMarginLeft, extraMarginTop);
@@ -1055,7 +1053,7 @@ public String getField(String name) {
             }
             PdfArray opts = item.getValue(0).getAsArray(PdfName.OPT);
             if (opts != null) {
-                int idx = 0;
+                int idx;
                 try {
                     idx = Integer.parseInt(value);
                     PdfString ps = opts.getAsString(idx);
@@ -1072,7 +1070,7 @@ public String getField(String name) {
         } else if (v instanceof PdfName) {
             return PdfName.decodeName(v.toString());
         } else if (v instanceof PdfArray) {
-            return ((PdfArray) v).toString();
+            return v.toString();
         } else {
             return "";
         }
@@ -1097,10 +1095,6 @@ public String[] getListSelection(String name) {
         if (item == null) {
             return ret;
         }
-        //PdfName type = (PdfName)PdfReader.getPdfObject(((PdfDictionary)item.merged.get(0)).get(PdfName.FT));
-        //if (!PdfName.CH.equals(type)) {
-        //    return ret;
-        //}
         PdfArray values = item.getMerged(0).getAsArray(PdfName.I);
         if (values == null) {
             return ret;
@@ -1320,7 +1314,7 @@ public Object getFieldProperty(String field, String name, int idx) {
             throw new RuntimeException("No reader has been supplied to this AcroFields instance!");
         }
         try {
-            Item item = (Item) this.fields.get(field);
+            Item item = this.fields.get(field);
             if (item == null) {
                 return false;
             }
@@ -2225,7 +2219,7 @@ public HashMap getSignatureTypes() {
             }
 
             PdfArray ref = v.getAsArray(PdfName.REFERENCE);
-            if (ref == null || ref.size() == 0) {
+            if (ref == null || ref.isEmpty()) {
                 this.sigTypes.put(entry.getKey(), SignatureType.APPROVAL);
             } else {
 
@@ -2859,7 +2853,7 @@ public Item(PdfIndirectReference ref) {
          */
         public void writeToAll(PdfName key, PdfObject value, int writeFlags) {
             int i;
-            PdfDictionary curDict = null;
+            PdfDictionary curDict;
             if ((writeFlags & WRITE_MERGED) != 0) {
                 for (i = 0; i < merged.size(); ++i) {
                     curDict = getMerged(i);
@@ -3102,6 +3096,7 @@ private RevisionStream(RandomAccessFileOrArray raf, int length) {
             this.length = length;
         }
 
+        @Override
         public int read() throws IOException {
             int n = read(b);
             if (n != 1) {
@@ -3110,6 +3105,7 @@ public int read() throws IOException {
             return b[0] & 0xff;
         }
 
+        @Override
         public int read(byte[] b, int off, int len) throws IOException {
             if (b == null) {
                 throw new NullPointerException();
@@ -3129,6 +3125,7 @@ public int read(byte[] b, int off, int len) throws IOException {
             return elen;
         }
 
+        @Override
         public void close() throws IOException {
             if (!closed) {
                 raf.close();
@@ -3139,6 +3136,7 @@ public void close() throws IOException {
 
     private static class SorterComparator implements Comparator {
 
+        @Override
         public int compare(Object[] o1, Object[] o2) {
             int n1 = ((int[]) o1[1])[0];
             int n2 = ((int[]) o2[1])[0];
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java b/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java
index 599a07e49..f00cfe5b1 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java
@@ -77,8 +77,7 @@ public class MappedRandomAccessFile implements AutoCloseable {
      * @throws FileNotFoundException on error
      * @throws IOException           on error
      */
-    public MappedRandomAccessFile(String filename, String mode)
-            throws IOException {
+    public MappedRandomAccessFile(String filename, String mode) throws IOException {
 
         if (mode.equals("rw")) {
             init(
@@ -157,9 +156,8 @@ public FileChannel getChannel() {
     public int read() {
         try {
             byte b = mappedByteBuffer.get();
-            int n = b & 0xff;
 
-            return n;
+            return b & 0xff;
         } catch (BufferUnderflowException e) {
             return -1; // EOF
         }
@@ -216,6 +214,7 @@ public long length() {
      * @throws IOException on error
      * @see java.io.RandomAccessFile#close()
      */
+    @Override
     public void close() throws IOException {
         clean(mappedByteBuffer);
         mappedByteBuffer = null;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java b/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java
index cb29452d9..cabf581d2 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java
@@ -119,15 +119,15 @@ public PRTokeniser(RandomAccessFileOrArray file) {
         this.file = file;
     }
 
-    public static final boolean isWhitespace(int ch) {
+    public static boolean isWhitespace(int ch) {
         return (ch == 0 || ch == 9 || ch == 10 || ch == 12 || ch == 13 || ch == 32);
     }
 
-    public static final boolean isDelimiter(int ch) {
+    public static boolean isDelimiter(int ch) {
         return (ch == '(' || ch == ')' || ch == '<' || ch == '>' || ch == '[' || ch == ']' || ch == '/' || ch == '%');
     }
 
-    public static final boolean isDelimiterWhitespace(int ch) {
+    public static boolean isDelimiterWhitespace(int ch) {
         return delims[ch + 1];
     }
 
@@ -147,8 +147,8 @@ public static int getHex(int v) {
     public static int[] checkObjectStart(byte[] line) {
         try {
             PRTokeniser tk = new PRTokeniser(line);
-            int num = 0;
-            int gen = 0;
+            int num;
+            int gen;
             if (!tk.nextToken() || tk.getTokenType() != TK_NUMBER) {
                 return null;
             }
@@ -327,12 +327,6 @@ public void nextValidToken() throws IOException {
             stringValue = n1;
             return;
         }
-//                if (type == TK_ENDOFFILE && level > 0)
-//                    {
-//                        file.seek(ptr);
-//                        type = TK_NUMBER;
-//                        stringValue = n1;
-//                    }
 
         throwError("Unexpected end of file");
         // if we hit here, the file is either corrupt (stream ended unexpectedly),
@@ -341,7 +335,7 @@ public void nextValidToken() throws IOException {
     }
 
     public boolean nextToken() throws IOException {
-        int ch = 0;
+        int ch;
         do {
             ch = file.read();
         } while (ch != -1 && isWhitespace(ch));
@@ -353,7 +347,7 @@ public boolean nextToken() throws IOException {
         // Note:  We have to initialize stringValue here, after we've looked for the end of the stream,
         // to ensure that we don't lose the value of a token that might end exactly at the end
         // of the stream
-        StringBuffer outBuf = null;
+        StringBuilder outBuf = null;
         stringValue = EMPTY;
 
         switch (ch) {
@@ -364,7 +358,7 @@ public boolean nextToken() throws IOException {
                 type = TK_END_ARRAY;
                 break;
             case '/': {
-                outBuf = new StringBuffer();
+                outBuf = new StringBuilder();
                 type = TK_NAME;
                 while (true) {
                     ch = file.read();
@@ -395,7 +389,7 @@ public boolean nextToken() throws IOException {
                     type = TK_START_DIC;
                     break;
                 }
-                outBuf = new StringBuffer();
+                outBuf = new StringBuilder();
                 type = TK_STRING;
                 hexString = true;
                 int v2 = 0;
@@ -439,7 +433,7 @@ public boolean nextToken() throws IOException {
                 } while (ch != -1 && ch != '\r' && ch != '\n');
                 break;
             case '(': {
-                outBuf = new StringBuffer();
+                outBuf = new StringBuilder();
                 type = TK_STRING;
                 hexString = false;
                 int nesting = 0;
@@ -535,7 +529,7 @@ public boolean nextToken() throws IOException {
                 break;
             }
             default: {
-                outBuf = new StringBuffer();
+                outBuf = new StringBuilder();
                 if (ch == '-' || ch == '+' || ch == '.' || (ch >= '0' && ch <= '9')) {
                     type = TK_NUMBER;
                     do {
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java
index 40b1fae2c..9c2f401ab 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java
@@ -1955,7 +1955,6 @@ public float getEffectiveStringWidth(String text, boolean kerned) {
             w = (w * state.scale) / 100.0f;
         }
 
-        //System.out.println("String width = " + Float.toString(w));
         return w;
     }
 
@@ -3344,7 +3343,7 @@ private void beginLayer2(PdfOCG layer) {
      * Ends a layer controlled graphic block. It will end the most recent open block.
      */
     public void endLayer() {
-        int n = 1;
+        int n;
         if (layerDepth != null && !layerDepth.isEmpty()) {
             n = layerDepth.get(layerDepth.size() - 1);
             layerDepth.remove(layerDepth.size() - 1);
@@ -3401,7 +3400,7 @@ public void beginMarkedContentSequence(PdfStructureElement struc, PdfDictionary
         PdfObject obj = struc.get(PdfName.K);
         int mark = pdf.getMarkPoint();
         if (obj != null) {
-            PdfArray ar = null;
+            PdfArray ar;
             if (obj.isNumber()) {
                 ar = new PdfArray();
                 ar.add(obj);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopy.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopy.java
index dcdb79eb2..d8f7bba7d 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopy.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopy.java
@@ -493,6 +493,7 @@ public PdfIndirectReference add(PdfOutline outline) {
         return null;
     }
 
+    @Override
     public void addAnnotation(PdfAnnotation annot) {
     }
 
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java
index a997d4f7c..45884c09d 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java
@@ -163,6 +163,7 @@ public void setEncryption(boolean strength, String userPassword, String ownerPas
     /**
      * Closes the output document.
      */
+    @Override
     public void close() {
         fc.close();
     }
@@ -224,6 +225,7 @@ public void setFullCompression() {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(byte[], byte[], int, int)
      */
+    @Override
     public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType)
             throws DocumentException {
         fc.setEncryption(userPassword, ownerPassword, permissions, encryptionType);
@@ -233,6 +235,7 @@ public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permiss
      * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#addViewerPreference(com.lowagie.text.pdf.PdfName,
      * com.lowagie.text.pdf.PdfObject)
      */
+    @Override
     public void addViewerPreference(PdfName key, PdfObject value) {
         fc.addViewerPreference(key, value);
     }
@@ -240,6 +243,7 @@ public void addViewerPreference(PdfName key, PdfObject value) {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#setViewerPreferences(int)
      */
+    @Override
     public void setViewerPreferences(int preferences) {
         fc.setViewerPreferences(preferences);
     }
@@ -248,6 +252,7 @@ public void setViewerPreferences(int preferences) {
      * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(java.security.cert.Certificate[], int[],
      * int)
      */
+    @Override
     public void setEncryption(Certificate[] certs, int[] permissions, int encryptionType) throws DocumentException {
         fc.setEncryption(certs, permissions, encryptionType);
     }
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPKCS7.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPKCS7.java
index a77b01fe6..944e4503f 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfPKCS7.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfPKCS7.java
@@ -109,12 +109,14 @@
 import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.asn1.tsp.MessageImprint;
+import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
 import org.bouncycastle.cert.ocsp.BasicOCSPResp;
 import org.bouncycastle.cert.ocsp.CertificateID;
 import org.bouncycastle.cert.ocsp.SingleResp;
 import org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory;
 import org.bouncycastle.jce.provider.X509CRLParser;
+import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
 import org.bouncycastle.operator.DigestCalculatorProvider;
 import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
 import org.bouncycastle.tsp.TimeStampToken;
@@ -139,6 +141,10 @@ public class PdfPKCS7 {
     private static final Map digestNames = new HashMap<>();
     private static final Map algorithmNames = new HashMap<>();
     private static final Map allowedDigests = new HashMap<>();
+    //for correct OID determination
+    private static final HashMap rsaOids = new HashMap<>();
+    private static final HashMap dsaOids = new HashMap<>();
+    private static final HashMap ecdsaOids = new HashMap<>();
 
     static {
         digestNames.put("1.2.840.113549.2.5", "MD5");
@@ -182,13 +188,15 @@ public class PdfPKCS7 {
         algorithmNames.put("1.3.36.3.3.1.3", "RSA");
         algorithmNames.put("1.3.36.3.3.1.2", "RSA");
         algorithmNames.put("1.3.36.3.3.1.4", "RSA");
-        algorithmNames.put(ID_ECDSA, "ECDSA");
-        algorithmNames.put("1.2.840.10045.4.1", "ECDSA");
-        algorithmNames.put("1.2.840.10045.4.3", "ECDSA");
-        algorithmNames.put("1.2.840.10045.4.3.2", "ECDSA");
-        algorithmNames.put("1.2.840.10045.4.3.3", "ECDSA");
-        algorithmNames.put("1.2.840.10045.4.3.4", "ECDSA");
+        algorithmNames.put("1.2.840.10045.2.1", "ECDSA");
+        algorithmNames.put("1.2.840.10045.4.1", "ECDSA"); //SHA1
+        algorithmNames.put("1.2.840.10045.4.3", "ECDSA"); //SHA2
+        algorithmNames.put("1.2.840.10045.4.3.1", "ECDSA"); //SHA224
+        algorithmNames.put("1.2.840.10045.4.3.2", "ECDSA"); //SHA256
+        algorithmNames.put("1.2.840.10045.4.3.3", "ECDSA"); //SHA384
+        algorithmNames.put("1.2.840.10045.4.3.4", "ECDSA"); //SHA512
         algorithmNames.put("1.2.840.113549.1.1.10", "RSAandMGF1");
+
         allowedDigests.put("MD5", "1.2.840.113549.2.5");
         allowedDigests.put("MD2", "1.2.840.113549.2.2");
         allowedDigests.put("SHA1", "1.3.14.3.2.26");
@@ -209,6 +217,50 @@ public class PdfPKCS7 {
         allowedDigests.put("RIPEMD-160", "1.3.36.3.2.1");
         allowedDigests.put("RIPEMD256", "1.3.36.3.2.3");
         allowedDigests.put("RIPEMD-256", "1.3.36.3.2.3");
+
+        //all oids according to http://oidref.com/1.2.840.113549.1.1
+        rsaOids.put("SHA256", "1.2.840.113549.1.1.11");
+        //add a 2nd time with "-" due to different crypto providers (sun vs bc)
+        rsaOids.put("SHA-256", "1.2.840.113549.1.1.11");
+        rsaOids.put("SHA384", "1.2.840.113549.1.1.12");
+        rsaOids.put("SHA-384", "1.2.840.113549.1.1.12");
+        rsaOids.put("SHA512", "1.2.840.113549.1.1.13");
+        rsaOids.put("SHA-512", "1.2.840.113549.1.1.13");
+        rsaOids.put("SHA224", "1.2.840.113549.1.1.14");
+        rsaOids.put("SHA-224", "1.2.840.113549.1.1.14");
+        rsaOids.put("SHA3-224", "2.16.840.1.101.3.4.3.13");
+        rsaOids.put("SHA3-256", "2.16.840.1.101.3.4.3.14");
+        rsaOids.put("SHA3-384", "2.16.840.1.101.3.4.3.15");
+        rsaOids.put("SHA3-512", "2.16.840.1.101.3.4.3.16");
+
+        dsaOids.put("SHA224", "2.16.840.1.101.3.4.3.1");
+        dsaOids.put("SHA-224", "2.16.840.1.101.3.4.3.1");
+        dsaOids.put("SHA256", "2.16.840.1.101.3.4.3.2");
+        dsaOids.put("SHA-256", "2.16.840.1.101.3.4.3.2");
+        //https://oid-rep.orange-labs.fr/get/2.16.840.1.101.3.4.3.3
+        dsaOids.put("SHA384", "2.16.840.1.101.3.4.3.3");
+        dsaOids.put("SHA-384", "2.16.840.1.101.3.4.3.3");
+        dsaOids.put("SHA512", "2.16.840.1.101.3.4.3.4");
+        dsaOids.put("SHA-512", "2.16.840.1.101.3.4.3.4");
+        //https://javadoc.io/doc/org.bouncycastle/bcprov-ext-jdk15on/1.55/org/bouncycastle/asn1/nist/NISTObjectIdentifiers.html
+        dsaOids.put("SHA3-224", "2.16.840.1.101.3.4.3.5");
+        dsaOids.put("SHA3-256", "2.16.840.1.101.3.4.3.6");
+        dsaOids.put("SHA3-384", "2.16.840.1.101.3.4.3.7");
+        dsaOids.put("SHA3-512", "2.16.840.1.101.3.4.3.8");
+
+        ecdsaOids.put("SHA1", "1.2.840.10045.4.1");
+        ecdsaOids.put("SHA224", "1.2.840.10045.4.3.1");
+        ecdsaOids.put("SHA-224", "1.2.840.10045.4.3.1");
+        ecdsaOids.put("SHA256", "1.2.840.10045.4.3.2");
+        ecdsaOids.put("SHA-256", "1.2.840.10045.4.3.2");
+        ecdsaOids.put("SHA384", "1.2.840.10045.4.3.3");
+        ecdsaOids.put("SHA-384", "1.2.840.10045.4.3.3");
+        ecdsaOids.put("SHA512", "1.2.840.10045.4.3.4");
+        ecdsaOids.put("SHA-512", "1.2.840.10045.4.3.4");
+        ecdsaOids.put("SHA3-224", "2.16.840.1.101.3.4.3.9");
+        ecdsaOids.put("SHA3-256", "2.16.840.1.101.3.4.3.10");
+        ecdsaOids.put("SHA3-384", "2.16.840.1.101.3.4.3.11");
+        ecdsaOids.put("SHA3-512", "2.16.840.1.101.3.4.3.12");
     }
 
     private final List certs;
@@ -511,21 +563,13 @@ public PdfPKCS7(PrivateKey privKey, Certificate[] certChain, CRL[] crlList,
         }
 
         if (privKey != null) {
-            //
-            // Now we have private key, find out what the digestEncryptionAlgorithm
-            // is.
-            //
-            digestEncryptionAlgorithm = privKey.getAlgorithm();
-            if (digestEncryptionAlgorithm.equals("RSA")) {
-                digestEncryptionAlgorithm = ID_RSA;
-            } else if (digestEncryptionAlgorithm.equals("DSA")) {
-                digestEncryptionAlgorithm = ID_DSA;
-            } else if (digestEncryptionAlgorithm.equals("EC") || digestEncryptionAlgorithm.equals("ECDSA")) {
-                digestEncryptionAlgorithm = ID_ECDSA;
-            } else {
-                throw new NoSuchAlgorithmException(
-                        MessageLocalization.getComposedMessage("unknown.key.algorithm.1",
-                                digestEncryptionAlgorithm));
+            // Now we have private key, find out what the digestEncryptionAlgorithm is.
+            String signingAlgorithm = privKey.getAlgorithm();
+            this.digestEncryptionAlgorithm = getOidForAlgorithmAndHash(signingAlgorithm, hashAlgorithm);
+
+            if (this.digestEncryptionAlgorithm == null) {
+                throw new ExceptionConverter(new NoSuchAlgorithmException(
+                        "Unknown key algorithm " + this.digestEncryptionAlgorithm + " and hash " + hashAlgorithm));
             }
         }
         if (hasRSAdata) {
@@ -548,6 +592,57 @@ public PdfPKCS7(PrivateKey privKey, Certificate[] certChain, CRL[] crlList,
         }
     }
 
+    /**
+     * Determines an OID by signing and hash algorithm. If nothing is found null will be returned.
+     *
+     * @param signingAlgorithm - currently RSA, DSA and ECDSA are supported.
+     * @param hashAlgorithm    like SHA1, SHA2 or SHA3
+     */
+    private static String getOidForAlgorithmAndHash(String signingAlgorithm, String hashAlgorithm) {
+
+        String returnValue;
+
+        switch (signingAlgorithm) {
+            case "RSA":
+                returnValue = rsaOids.get(hashAlgorithm);
+                //fallback
+                if (returnValue == null) {
+                    returnValue = ID_RSA;
+                }
+                break;
+            case "DSA":
+                returnValue = dsaOids.get(hashAlgorithm);
+                //fallback
+                if (returnValue == null) {
+                    returnValue = ID_DSA;
+                }
+                break;
+            case "EC":
+            case "ECDSA":
+                returnValue = ecdsaOids.get(hashAlgorithm);
+                //fallback
+                if (returnValue == null) {
+                    returnValue = ID_ECDSA;
+                }
+                break;
+            default:
+                returnValue = null;
+        }
+
+        if (returnValue == null) {
+            //nothing found so check BC
+            DefaultSignatureAlgorithmIdentifierFinder finder = new DefaultSignatureAlgorithmIdentifierFinder();
+            try {
+                AlgorithmIdentifier id = finder.find(hashAlgorithm + "with" + signingAlgorithm);
+                returnValue = id.getAlgorithm().getId();
+            } catch (IllegalArgumentException iae) {
+                //it was just a try, return null then
+            }
+        }
+
+        return returnValue;
+    }
+
     /**
      * Gets the digest name for a certain id
      *
@@ -1239,19 +1334,16 @@ public byte[] getEncodedPKCS1() {
      */
     public void setExternalDigest(byte[] digest, byte[] RSAdata,
             String digestEncryptionAlgorithm) {
-        externalDigest = digest;
-        externalRSAdata = RSAdata;
+        this.externalDigest = digest;
+        this.externalRSAdata = RSAdata;
         if (digestEncryptionAlgorithm != null) {
-            if (digestEncryptionAlgorithm.equals("RSA")) {
-                this.digestEncryptionAlgorithm = ID_RSA;
-            } else if (digestEncryptionAlgorithm.equals("DSA")) {
-                this.digestEncryptionAlgorithm = ID_DSA;
-            } else if (digestEncryptionAlgorithm.equals("EC")) {
-                digestEncryptionAlgorithm = ID_ECDSA;
-            } else {
+            String hashAlgorithm = getHashAlgorithm();
+            this.digestEncryptionAlgorithm = PdfPKCS7.getOidForAlgorithmAndHash(digestEncryptionAlgorithm,
+                    hashAlgorithm);
+
+            if (this.digestEncryptionAlgorithm == null) {
                 throw new ExceptionConverter(new NoSuchAlgorithmException(
-                        MessageLocalization.getComposedMessage("unknown.key.algorithm.1",
-                                digestEncryptionAlgorithm)));
+                        "Unknown key algorithm " + digestEncryptionAlgorithm + " hash " + hashAlgorithm));
             }
         }
     }
@@ -1742,10 +1834,10 @@ public static class X509Name {
          * @param seq an ASN1 Sequence
          */
         public X509Name(ASN1Sequence seq) {
-            Enumeration e = seq.getObjects();
+            Enumeration e = seq.getObjects();
 
             while (e.hasMoreElements()) {
-                ASN1Set set = (ASN1Set) e.nextElement();
+                ASN1Set set = e.nextElement();
 
                 for (int i = 0; i < set.size(); i++) {
                     ASN1Sequence s = (ASN1Sequence) set.getObjectAt(i);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamperImp.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamperImp.java
index c2b102360..495e74b8a 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamperImp.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamperImp.java
@@ -979,8 +979,8 @@ void flatFields() {
 
                     if (bboxRaw != null && rectRaw != null) {
                         transformNeeded = true;
-                        PdfRectangle bbox = new PdfRectangle(bboxRaw);
-                        PdfRectangle rect = new PdfRectangle(rectRaw);
+                        PdfRectangle bbox = new PdfRectangle(PdfReader.getNormalizedRectangle(bboxRaw));
+                        PdfRectangle rect = new PdfRectangle(PdfReader.getNormalizedRectangle(rectRaw));
 
                         float rectWidth = rect.width();
                         float rectHeight = rect.height();
@@ -1474,7 +1474,7 @@ private void addAnnotationToDocument(PdfAnnotation annot) {
             if (annot.isForm()) {
                 fieldsAdded = true;
                 getAcroFields();
-                //@sonatype-lift ignore since before 'isForm' is called 
+                //@sonatype-lift ignore since before 'isForm' is called
                 PdfFormField field = (PdfFormField) annot;
                 if (field.getParent() != null) {
                     return;
@@ -1498,7 +1498,7 @@ private void addAnnotationToDocument(PdfAnnotation annot) {
                             fieldTemplates.putAll(templates);
                         }
                     }
-                    //@sonatype-lift ignore since before 'isForm' is called 
+                    //@sonatype-lift ignore since before 'isForm' is called
                     PdfFormField field = (PdfFormField) annot;
                     if (field.getParent() == null) {
                         addDocumentField(field.getIndirectReference());
@@ -1690,6 +1690,7 @@ void setOutlines() throws IOException {
      * @param preferences the viewer preferences
      * @see PdfWriter#setViewerPreferences(int)
      */
+    @Override
     public void setViewerPreferences(int preferences) {
         useVp = true;
         this.viewerPreferences.setViewerPreferences(preferences);
@@ -1702,6 +1703,7 @@ public void setViewerPreferences(int preferences) {
      * @param value the value for the viewer preference
      * @see PdfViewerPreferences#addViewerPreference
      */
+    @Override
     public void addViewerPreference(PdfName key, PdfObject value) {
         useVp = true;
         this.viewerPreferences.addViewerPreference(key, value);
@@ -1712,6 +1714,7 @@ public void addViewerPreference(PdfName key, PdfObject value) {
      *
      * @param f the flags. This flags are ORed with current ones
      */
+    @Override
     public void setSigFlags(int f) {
         sigFlags |= f;
     }
@@ -1724,6 +1727,7 @@ public void setSigFlags(int f) {
      * @throws PdfException ignore
      * @see PdfStamper#setPageAction(PdfName, PdfAction, int)
      */
+    @Override
     public void setPageAction(PdfName actionType, PdfAction action) throws PdfException {
         throw new UnsupportedOperationException(MessageLocalization.getComposedMessage(
                 "use.setpageaction.pdfname.actiontype.pdfaction.action.int.page"));
@@ -1759,6 +1763,7 @@ void setPageAction(PdfName actionType, PdfAction action, int page) throws PdfExc
      *
      * @param seconds ignore
      */
+    @Override
     public void setDuration(int seconds) {
         throw new UnsupportedOperationException(MessageLocalization.getComposedMessage(
                 "use.setpageaction.pdfname.actiontype.pdfaction.action.int.page"));
@@ -1769,6 +1774,7 @@ public void setDuration(int seconds) {
      *
      * @param transition ignore
      */
+    @Override
     public void setTransition(PdfTransition transition) {
         throw new UnsupportedOperationException(MessageLocalization.getComposedMessage(
                 "use.setpageaction.pdfname.actiontype.pdfaction.action.int.page"));
@@ -1845,6 +1851,7 @@ boolean isAppend() {
      * @param action     the action to execute in response to the trigger
      * @throws PdfException on invalid action type
      */
+    @Override
     public void setAdditionalAction(PdfName actionType, PdfAction action) throws PdfException {
         if (!(actionType.equals(DOCUMENT_CLOSE) ||
                 actionType.equals(WILL_SAVE) ||
@@ -1873,6 +1880,7 @@ public void setAdditionalAction(PdfName actionType, PdfAction action) throws Pdf
     /**
      * @see com.lowagie.text.pdf.PdfWriter#setOpenAction(com.lowagie.text.pdf.PdfAction)
      */
+    @Override
     public void setOpenAction(PdfAction action) {
         openAction = action;
     }
@@ -1880,6 +1888,7 @@ public void setOpenAction(PdfAction action) {
     /**
      * @see com.lowagie.text.pdf.PdfWriter#setOpenAction(java.lang.String)
      */
+    @Override
     public void setOpenAction(String name) {
         throw new UnsupportedOperationException(
                 MessageLocalization.getComposedMessage("open.actions.by.name.are.not.supported"));
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java
index d6062fbdd..ba2ca8ac7 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java
@@ -1423,6 +1423,7 @@ public void setAtLeastPdfVersion(char version) {
      * @see com.lowagie.text.pdf.interfaces.PdfVersion#addDeveloperExtension(com.lowagie.text.pdf.PdfDeveloperExtension)
      * @since 2.1.6
      */
+    @Override
     public void addDeveloperExtension(PdfDeveloperExtension de) {
         pdf_version.addDeveloperExtension(de);
     }
@@ -1437,15 +1438,15 @@ PdfVersionImp getPdfVersion() {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(char)
      */
+    @Override
     public void setPdfVersion(char version) {
         pdf_version.setPdfVersion(version);
     }
 
-//  [F3] adding fonts
-
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfVersion#setPdfVersion(com.lowagie.text.pdf.PdfName)
      */
+    @Override
     public void setPdfVersion(PdfName version) {
         pdf_version.setPdfVersion(version);
     }
@@ -1453,6 +1454,7 @@ public void setPdfVersion(PdfName version) {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#setViewerPreferences(int)
      */
+    @Override
     public void setViewerPreferences(int preferences) {
         pdf.setViewerPreferences(preferences);
     }
@@ -1461,6 +1463,7 @@ public void setViewerPreferences(int preferences) {
      * @see com.lowagie.text.pdf.interfaces.PdfViewerPreferences#addViewerPreference(com.lowagie.text.pdf.PdfName,
      * com.lowagie.text.pdf.PdfObject)
      */
+    @Override
     public void addViewerPreference(PdfName key, PdfObject value) {
         pdf.addViewerPreference(key, value);
     }
@@ -1623,6 +1626,7 @@ public void addFileAttachment(PdfFileSpecification fs) throws IOException {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfDocumentActions#setOpenAction(java.lang.String)
      */
+    @Override
     public void setOpenAction(String name) {
         pdf.setOpenAction(name);
     }
@@ -1630,6 +1634,7 @@ public void setOpenAction(String name) {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfDocumentActions#setOpenAction(com.lowagie.text.pdf.PdfAction)
      */
+    @Override
     public void setOpenAction(PdfAction action) {
         pdf.setOpenAction(action);
     }
@@ -1638,6 +1643,7 @@ public void setOpenAction(PdfAction action) {
      * @see com.lowagie.text.pdf.interfaces.PdfDocumentActions#setAdditionalAction(com.lowagie.text.pdf.PdfName,
      * com.lowagie.text.pdf.PdfAction)
      */
+    @Override
     public void setAdditionalAction(PdfName actionType, PdfAction action) throws DocumentException {
         if (!(actionType.equals(DOCUMENT_CLOSE) ||
                 actionType.equals(WILL_SAVE) ||
@@ -1665,6 +1671,7 @@ public void setCollection(PdfCollection collection) {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfAnnotations#getAcroForm()
      */
+    @Override
     public PdfAcroForm getAcroForm() {
         return pdf.getAcroForm();
     }
@@ -1672,6 +1679,7 @@ public PdfAcroForm getAcroForm() {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfAnnotations#addAnnotation(com.lowagie.text.pdf.PdfAnnotation)
      */
+    @Override
     public void addAnnotation(PdfAnnotation annot) {
         pdf.addAnnotation(annot);
     }
@@ -1685,6 +1693,7 @@ void addAnnotation(PdfAnnotation annot, int page) {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfAnnotations#addCalculationOrder(com.lowagie.text.pdf.PdfFormField)
      */
+    @Override
     public void addCalculationOrder(PdfFormField annot) {
         pdf.addCalculationOrder(annot);
     }
@@ -1692,6 +1701,7 @@ public void addCalculationOrder(PdfFormField annot) {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfAnnotations#setSigFlags(int)
      */
+    @Override
     public void setSigFlags(int f) {
         pdf.setSigFlags(f);
     }
@@ -1744,6 +1754,7 @@ private byte[] createXmpMetadataBytes() {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfXConformance#getPDFXConformance()
      */
+    @Override
     public int getPDFXConformance() {
         return pdfxConformance.getPDFXConformance();
     }
@@ -1751,6 +1762,7 @@ public int getPDFXConformance() {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfXConformance#setPDFXConformance(int)
      */
+    @Override
     public void setPDFXConformance(int pdfx) {
         if (pdfxConformance.getPDFXConformance() == pdfx) {
             return;
@@ -1775,6 +1787,7 @@ public void setPDFXConformance(int pdfx) {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfXConformance#isPdfX()
      */
+    @Override
     public boolean isPdfX() {
         return pdfxConformance.isPdfX();
     }
@@ -1896,6 +1909,7 @@ PdfEncryption getEncryption() {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(byte[], byte[], int, int)
      */
+    @Override
     public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permissions, int encryptionType)
             throws DocumentException {
         if (pdf.isOpen()) {
@@ -1911,6 +1925,7 @@ public void setEncryption(byte[] userPassword, byte[] ownerPassword, int permiss
      * @see com.lowagie.text.pdf.interfaces.PdfEncryptionSettings#setEncryption(java.security.cert.Certificate[], int[],
      * int)
      */
+    @Override
     public void setEncryption(Certificate[] certs, int[] permissions, int encryptionType) throws DocumentException {
         if (pdf.isOpen()) {
             throw new DocumentException(
@@ -2452,6 +2467,7 @@ public void setPageEmpty(boolean pageEmpty) {
      * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setPageAction(com.lowagie.text.pdf.PdfName,
      * com.lowagie.text.pdf.PdfAction)
      */
+    @Override
     public void setPageAction(PdfName actionType, PdfAction action) throws DocumentException {
         if (!actionType.equals(PAGE_OPEN) && !actionType.equals(PAGE_CLOSE)) {
             throw new DocumentException(
@@ -2466,6 +2482,7 @@ public void setPageAction(PdfName actionType, PdfAction action) throws DocumentE
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setDuration(int)
      */
+    @Override
     public void setDuration(int seconds) {
         pdf.setDuration(seconds);
     }
@@ -2473,6 +2490,7 @@ public void setDuration(int seconds) {
     /**
      * @see com.lowagie.text.pdf.interfaces.PdfPageActions#setTransition(com.lowagie.text.pdf.PdfTransition)
      */
+    @Override
     public void setTransition(PdfTransition transition) {
         pdf.setTransition(transition);
     }
@@ -2538,6 +2556,7 @@ public void setSpaceCharRatio(float spaceCharRatio) {
      *
      * @return the run direction
      */
+    @Override
     public int getRunDirection() {
         return runDirection;
     }
@@ -2547,6 +2566,7 @@ public int getRunDirection() {
      *
      * @param runDirection the run direction
      */
+    @Override
     public void setRunDirection(int runDirection) {
         if (runDirection < RUN_DIRECTION_NO_BIDI || runDirection > RUN_DIRECTION_RTL) {
             throw new RuntimeException(MessageLocalization.getComposedMessage("invalid.run.direction.1", runDirection));
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenator.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenator.java
index accafa976..f17504f1d 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenator.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/Hyphenator.java
@@ -93,14 +93,14 @@ public static HyphenationTree getHyphenationTree(String lang,
      * @return a hyphenation tree
      */
     public static HyphenationTree getResourceHyphenationTree(String key) {
-        try {
-            InputStream stream = BaseFont.getResourceStream(defaultHyphLocation + key + ".xml");
-            if (stream == null && key.length() > 2) {
-                stream = BaseFont.getResourceStream(defaultHyphLocation + key.substring(0, 2) + ".xml");
-            }
-            if (stream == null) {
-                return null;
-            }
+
+        InputStream stream = readHyphenationFile(key);
+
+        if (stream == null) {
+            return null;
+        }
+
+        try (InputStream resourceStream = stream) {
             HyphenationTree hTree = new HyphenationTree();
             hTree.loadSimplePatterns(stream);
             return hTree;
@@ -109,29 +109,30 @@ public static HyphenationTree getResourceHyphenationTree(String key) {
         }
     }
 
+    private static InputStream readHyphenationFile(String key) {
+        InputStream stream = BaseFont.getResourceStream(defaultHyphLocation + key + ".xml");
+        if (stream == null && key.length() > 2) {
+            stream = BaseFont.getResourceStream(defaultHyphLocation + key.substring(0, 2) + ".xml");
+        }
+        return stream;
+    }
+
     /**
      * @param key The language to get the tree from
-     * @return a hyphenation tree
+     * @return a hyphenation tree or null
      */
     public static HyphenationTree getFileHyphenationTree(String key) {
-        try {
-            if (hyphenDir == null) {
-                return null;
-            }
-            InputStream stream = null;
-            File hyphenFile = new File(hyphenDir, key + ".xml");
-            if (hyphenFile.canRead()) {
-                stream = new FileInputStream(hyphenFile);
-            }
-            if (stream == null && key.length() > 2) {
-                hyphenFile = new File(hyphenDir, key.substring(0, 2) + ".xml");
-                if (hyphenFile.canRead()) {
-                    stream = new FileInputStream(hyphenFile);
-                }
-            }
-            if (stream == null) {
-                return null;
-            }
+
+        if (hyphenDir == null) {
+            return null;
+        }
+
+        File hyphenFile = getHyphenFile(key);
+        if (hyphenFile == null) {
+            return null;
+        }
+
+        try (InputStream stream = new FileInputStream(hyphenFile)) {
             HyphenationTree hTree = new HyphenationTree();
             hTree.loadSimplePatterns(stream);
             return hTree;
@@ -140,6 +141,22 @@ public static HyphenationTree getFileHyphenationTree(String key) {
         }
     }
 
+    private static File getHyphenFile(String key) {
+        File hyphenFile = new File(hyphenDir, key + ".xml");
+        if (hyphenFile.canRead()) {
+            return hyphenFile;
+        }
+
+        if (key.length() > 2) {
+            hyphenFile = new File(hyphenDir, key.substring(0, 2) + ".xml");
+            if (hyphenFile.canRead()) {
+                return hyphenFile;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * @param lang     The language
      * @param country  The country
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java
index 4ca9ad73b..dac2d128e 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java
@@ -117,13 +117,13 @@ protected static String getInterletterValues(String pat) {
     }
 
     public static void main(String[] args) {
-        try {
-            if (args.length > 0) {
+        if (args.length > 0) {
+            try (FileInputStream fis = new FileInputStream(args[0])) {
                 SimplePatternParser pp = new SimplePatternParser();
-                pp.parse(new FileInputStream(args[0]), pp);
+                pp.parse(fis, pp);
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
         }
     }
 
@@ -180,9 +180,11 @@ protected String getExceptionWord(List ex) {
         return res.toString();
     }
 
+    @Override
     public void endDocument() {
     }
 
+    @Override
     public void endElement(String tag) {
         if (token.length() > 0) {
             String word = token.toString();
@@ -249,6 +251,7 @@ public void startElement(String tag, Map h) {
         token.setLength(0);
     }
 
+    @Override
     public void text(String str) {
         StringTokenizer tk = new StringTokenizer(str);
         while (tk.hasMoreTokens()) {
@@ -274,14 +277,17 @@ public void text(String str) {
     }
 
     // PatternConsumer implementation for testing purposes
+    @Override
     public void addClass(String c) {
         System.out.println("class: " + c);
     }
 
+    @Override
     public void addException(String w, ArrayList e) {
         System.out.println("exception: " + w + " : " + e.toString());
     }
 
+    @Override
     public void addPattern(String p, String v) {
         System.out.println("pattern: " + p + " : " + v);
     }
diff --git a/openpdf/src/test/java/com/lowagie/text/pdf/PdfFormFlatteningTest.java b/openpdf/src/test/java/com/lowagie/text/pdf/PdfFormFlatteningTest.java
index 7b222f509..0d17b0183 100644
--- a/openpdf/src/test/java/com/lowagie/text/pdf/PdfFormFlatteningTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/pdf/PdfFormFlatteningTest.java
@@ -5,6 +5,10 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -127,4 +131,38 @@ void testFlattenTextfieldsWithRotationAndMatrix() throws IOException {
             pdfReader.close();
         }
     }
+
+    @Test
+    void testFlattenFieldsWithPdfIndirectObjectInRect() throws IOException {
+        final Path targetFilePath = Paths.get("target/indirect_object_in_rectangle-flattened.pdf");
+        try (InputStream resource = getClass().getResourceAsStream(
+                "/flattening/indirect_object_in_rectangle.pdf")) {
+            Assertions.assertNotNull(resource, "File could not be found!");
+            OutputStream fos = Files.newOutputStream(targetFilePath);
+
+            PdfReader pdfReader = new PdfReader(resource);
+            PdfStamper stamper = new PdfStamper(pdfReader, fos);
+
+            stamper.getAcroFields().setGenerateAppearances(true);
+            stamper.setFormFlattening(true);
+
+            pdfReader.close();
+            stamper.close();
+        }
+        //Verify no form fields left (the correct shape is difficult to verify...)
+        try (InputStream resource = Files.newInputStream(targetFilePath)) {
+
+            Assertions.assertNotNull(resource, "File could not be found!");
+            PdfReader pdfReader = new PdfReader(resource);
+
+            PdfDictionary acroForm = (PdfDictionary) PdfReader.getPdfObjectRelease(
+                    pdfReader.getCatalog().get(PdfName.ACROFORM));
+            Assertions.assertTrue(acroForm == null
+                    || acroForm.getAsArray(PdfName.FIELDS) == null
+                    || acroForm.getAsArray(PdfName.FIELDS).isEmpty());
+
+            pdfReader.close();
+        }
+    }
+
 }
diff --git a/openpdf/src/test/resources/flattening/indirect_object_in_rectangle.pdf b/openpdf/src/test/resources/flattening/indirect_object_in_rectangle.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..09b02848083ab110f377cdf48453bc9acd5a436d
GIT binary patch
literal 11921
zcmeG?XIK5CY31>WWJaaffG3%WO
zo(V-k6cc)8F`;5Y#Zyd(XZ)&XXJG~JdGG!4KHs0)=b7!9?yBml>Z%Uaxi@E3t`*iaSi4#VmYGuZ6h1_yP*Ns5#tjH)Nt4+?
zvEA_))FRPpbtWGlM@p+e+;9*c!&ab5ZK4c#pqeyM{*+v&pzttCt28BHV#3GAXfjZw
z#xZzS&tkUYB%+O7VYYf}xS>P1@35mCQu?=%HXW99?^W!!Cd;bs_3hii@rohSclpeK
z;q&iD`J7o=oN%Hbg`1lETT;rZaY@eAN2kqv%B$X2QX+7@_f3Lb>x1n+B9@p=80KgJ
ztvW+|8!@(+meWtCHBnmlrumP?{R}$2uP!B?(GMnIb3ju@t;;-^#V3{pKQr_hI#z&IQP0|OHX
zyg^+|4Ak+Mx+sHAE~QNII2Z+n$51IIG=$MQ6Q~*^EF%*|DyiCmVWTdsvday+K%GH@
zu>~|A;gpF~kR}r2(tY9)q=o|3SOi35j10q4y-GnDLbQoGjBNp>ZNLw3)jFk3XQ+|s
z%nydyq%*ilz&qeV
zg;`DkHiI{Wl3{+N9$6qwqaUWxDO8CnN`aY;Dy9jw%V_P`{L9n1ljs+UC3~0n)Flm)ZO}V+_gJG~Z{91u*l;@{2!vM1JP?f?M
zZ*iI7wF)=Z;?ORHln_tb2PWilJotndx(+=UjMD0PFy@Z?M}rjv
zXu*#_PI!f(_t(j-6`0jD7;~Zh-!ewSNPihd`!m?c&`8-RaB#r)m!@INjDf67MX5m`
zdRmDdjwTB5TP0Y5jX=mC7zRW9rI^KdVxz;P7;P#xkjSfO(HVMH8R;pCA>nK5D{MY;
zHP8_F*H`8ZWUa{5K<~^H!sX)Oq{*O4v7N_|i`C3&Fp<@|m#xDfSFuiPh_Ge!7{$~~
zOeyKy7{cx_mh92cTiUpdfVU%t5X86*e9*hx-Y&9h<5l(N7uscMvGEW;KVQ-aR>`4V
zy=IVU54I`*0MKZG)q%f7P|49c4XKTihR4(lGfcc%iPosHjxy-RU^Mw9kp}Q`gzHZk
za48!-rw#axoqu!uSM1
zKO*=>Jh4TVHq=hHf!A2!QON-qE6#r^5iAW4H2BQJ1V
zu1DXff38SufrB;?^N!lAa0nm03!oj@ANysA^s6R))LiQ
zWvbyFV9-0#jkV2MB6!3jEhD2xnm^_p(dL0ZVeX?#J`eZ-9U^>GTKhwAY?vQwIzSDU
z3Xl$cAn6eXEfK1KLp155V&Qmd6K`z&rh*Hns&`2z^^0D-YITvMrIIv{}H=Az`gg
z4NZo&El%BcWNLNmtl!97X#UaAeC0uXf34nX4%X7DudkM%m#@|%omn234r``on|1Ch
zvoJIDa@YdcZNkD(vxSo-B&6SYboYL7&qIe6tQr!1zuWzeoxbU`@z8|Tljlud*`P(+
z#dDf>X=p!gz@G;`9EfSs;`!6g4SUSY-`1SdT-ps!2={R7-Qa@5q^oW&yG5OXCpNfy
z`sE_~Op)Av0c+8cmWfj?%~H&0ByM=E>j1&XkWr0;=N5_!GJkjDdaw5{Ja^$jbRpZN
zzk94x?(exh`Fn>Ja&d9N7OcQ+M^Ap^E$v4+G<}}e!DVpo++OA7uDv@x?zHfc!P(BO
zuhX`(PGyAbyM8~n@tbu2!a9!I;)N$yOm2W3vI{vT!oM=XqbZh|y(LCD+R3pA9)ZJ-
zB$!eulT2VQ930KbsEGx;8MOO_Rg??6Z^FnT?Jy*sp_E!mgr1YIqKO|(g#gh#+KMylzmAr?l!Dew^3mZ{_ttx}CPg;Eox
z8H|aT-60}cyLjM38UA@Zk&QXnEckv>jAPj=OYs;3sWs}+PF9|31C6#hNI7obcf6K&
zyzH10r{ImW+t`vK_Zs`E*%#C+V24r|_muIyq8DDXsVHHvFNVKc{mH8PRL_rx5%1sw5yH{3=tCK4$
zZ{9vwo$<;pv)9I7cV8x&+s!MNgNK9qj<+o0l64F)`R&6Bv}$FH?k?)T{x`qL|WyA!6%{eF1Y>iZ=vn_S%3^YZ?{
zgTrFAhe{uGTj9ownd{>I}dJl`h(JU6!(NO2FE}
zLf?tq&-a`5E_+o$)TUc!E-pU3Z?)t@bDgID!y(>|lTzAe|M70`o(n9yx!H{ly)2Jk
zb?Utx@gl!#{@XL--)>5E7j`s}`T12{y17*oty
zxubZ}$_m%)?Y{~tb_~l1+g>!af7iPsyS{yunxb?+wIpq0`=3u7*&LP?d*^9M?@LY0
zyW2}gf0lkbk-8em>whITSDxJ<`>I2Z$4k4Hdz;%mxL_B(tL5#J=ik0_
z>qF_;X78${cYH3cADs2eoW+U<35NCg+6iZ0$JyIw+PjuD=#$VoeR97x_7mIKAC~ZD
zI-JD1-k)Tj^W6!F_?(^h76(>lSJUKfIo;IuM-uvVY?xO#LEmQXl%ETmJrB}%8`o_6
zYpZksf@{_r>ojoIZZQm_+y(h;kXwUIwopapc
zP%&fr+OFrckE+iNdeq3&YJa2gjl(6aGb=Nf6ZRL$Zfb|T!u*_$^CwHox}-GQ_S5Jx
z*W7PMIJ7QY|J>&-G0xtn^~fo`?#y`J*S<~X!$DoXadHmq8SEK7bBR;hhIWqwn=Blp
z=x=Btp7Vpmbz#tn=1XQ82DNCn?oLwMU*;5_@4Tzs(|{T0hd&};^U@k;_$tp`Y1E`}
zSy@2S9>LA#H0|x{y><=}d^P0lO#O8IJR&@0V9&OH`8QxsUE$vs8{B5qtb;{aMGcGY
z6@?b%6~(okr3iTG9I)U*2xrmcO99t?uLr%GYg)+*Pm9>Ju&YfbvbU^mkquLm7-JMPxO{o;}#F@o3u^D@h$`fPc6$*E#OMW+f)
z#kZa3mHRi}NL{$J>%lIk>y=4sE^bP~A9dN^Yq&4I?)%429(BL)^TmR7{Yj#uc5YIj
z(~(0%k6-;mboA{nFG}Z*E|$
zJ}}qt%<);r>K4hr1l@0z59RPtS4D}_l6xcN=%F1f81wi-2~!HlzAKFwY!XAf;Bn3{1cv5Thb;x6;%_v_ND
z%SdsvbVG(`dMnY*F`GQ+WSmNONRRY9n=8uQuy0rHpXPm!2aai%w=7RP*89o3)8S>y
zD)$s?N}uK*ipJXUn!Rz<=5b5cmyRwCx|yBU#=EH7(r)qI`LCyXPw_hC9pr_l6^~{Y_s9h!
zm)>4+oApi5lD-vfx_&$UVdZ1Iy8DZQ&WD-?H%)3TYWrN1IV6*#k1ty@C0C-7{Pt5s
zlaD<_J%@Hb(EqJuW@vE8i65PWMP6g3=MMRh>gL1~>|(vXcdi3jNKVh0LQZVmVfv8i
zmCXtY2ILIbm!K}Z*>rQ$xT5(pPX_n>z30o1Cr*M5#$8IfBs_oS{Om^==c{F2vfi>c
zN4@4(&AEJh!gue(+PcQMio4Ayaye!`9$sX;YrHq(UO|L@V3f28%0+&Qmb$)p@VIr`mTlX4t@O{ke|lewG|G(c4B7|#A9glIma|{Y
zemVA`_o<&xRi0h*!~MLZYwKP$E@@oxQ;%sI4j(w2F>U9ZdmVJcyoP@lb1Bv|epW)r
zkwwPPtmT7QA2+Os>)XdC#@Fp6eogvvO5fpv-mAa_^M`o$Sbjoys(bHs?HbN@C~is>
zyc`kdA2;#Z_}HnV)>lYUWBy9`tH*AC?`@y*CgZCT=Uv_RMq|J&+f)
zyNhPy8`JLbX1^+zjOE)yg>l~w-nlg~aLu~gam_D#Z1t9v-RUpwF!$N9rN_4JKe2z|
z{)bhmRWmwYZFzlq^LeZ1jqY5@cj0~9)Jd~UxJErjtYM%}^|$v_6;)lYx+3(~T)lku
znXaNBkFB|Pr-3^2$Fld~M^~L`*`$^BcGyjIsh4=kyGXkY4dOqo$X(fU<${$Teo6Y}
z@+#j|+38){Lckx1yzUihyE;77T!BN^6-r#Lyuf48dP-VXz0-s#{!QX
zIW9R~aKihvm_Z5qZ_ns1*+H;zJdiNjvKX#uHoY`|$csBQ(_}u>UUgz^K^uJJe
z(f{JHOCgs|U5>bXz9hEf>Xjd^lwDO^eRNHI?Zx%6*WcfmRNA<7_RTgom)+`eYu#=4
z+u3D;vV(X0@0`9Xy?f)H{N9uM#`_;0Of7F&zU*Q5hg%hb43so2B1WDz
zS}s;N_xEx1O7Tq5=rs^*#ZokCtwJ#3491hr46_=2O&40D2hF<&KZPNIi~1
z+jS8X@)~%(*`THwQpj;iO=;kCWCR>`Jsi+acz6xkSG&<@>S5_^r2hg38lW3)4FZt&
zgqX7`F%^ZKy`53inMH6}90>IZJ=tteI`r&G5LQ_b0v*7n>LUm|IXq9U0Akg35Ul3%
zRTQBoPh1~`36jU?bZYC+TO-~mQf_5OA@@u~Cp{P*Qm==z9chA5!$C|d1g$_%hzpyM
zl0*Exoy}&I!jmf#b7gE&!J-l=9*f5&L@XI0PGpHFicpY*LctRXz9bQ%HJV7RoT?$g
zS5PFy6UkTtF^6RFlt?I8{6wCDOA?8sP^Pew0ERrRp?i?$zlz--{vvq)MeN=k
zJN&n?d&Z){ra?(26vjtxV)@a|B2k-aYZ%j4tC0VAs!6TV+c|}$pb|;5+T@Ja0(#-d
zC2VlL@Gt3G0Bn4S_D&iL+!LH0ukrd?s#eDS7iEpq{|n+)n*VlU)xrgvoi}qNVT)`pvj5@LwKP`WY;1AJ=~Hl5-D-&a+4@}BWN4s^YIGey=L}IM*j3it
zKU=a2=!6iuwdQPu?vdG+(-A_gy#=tz|EZxnjMOLkL(&2yei$vZP)fporiD@(nDd#x
zDlw5l7Y-EUDDW^`W}wDW7%nFbaB9KjDg$hI6V+4-hASWmMo!-U@fZ&
zmzxdr^$>i4N@WJ!Xi6)CtOYjQec`oT$aVTuhF=|Qv?)-9N(;&ta-cJv5=>DIX<8WW
z0spW&hrxsMwh?ZHAhQD3kZ`a7^(rW(fdY>7YO|5ir72lwG=oA_kQafQlAyWvla!kw
zNeb7PA-{l2t6im2AcL_`l|verT1|qzXl;;yI}K@+o7FUXA`k+a$Cyb2VA1bMq#D?x
zyJD(Qav6vrvDgzXVfvNW8mq)&hPb3wB@&B$N?=U{V-K+mg;<6{tSyDuTFf}6
zJtj$KKz>2NSyl^{4AxIFBuEB?v?T$@T;#1dSxbtvsELGH@OEa%zz~q{;uJ%KvLymQ
zR?Ai~a4H5)WecaOg`<#~v`ptZ21&;t>1>g7R-jsBg=#Eh%Ykt)N-{I}W(MDEi*K&Q
zOJ&+&GC)d7wYD%>X4X`o+9}uOQku@(i?<{sV)S*b&F#L;ZLS5bE`ap{mrYnQ)c$ti
z`!5=-SHISqUr0Rji*YkSk{Tp9&W2rQ52b{G;*AvaHInVn?ko!wqLL{yW$0krl&zEozqCv@pU*JL=A2Rmp)QNfZ=%J*9I&gr*
zhV>K`wXzWck)_T?HbPuqUWhtc`nAR73+w3sqNjCvAt0TzejkwOS(iUH8x~*0pDiy0
zN?ZN1j?FhGo!pc(*uAZI=jsRA!I&d5@udePv10rysFZ%^C>dC?7z!Fy%
zj!V>oqbZ?38=dmSLK|LS#a5{)1Iq9QABp!OMRE?C$KmkUJV>A73B?LXNG4=ZBj5=V
zDUpwtSRhdFxFnm95oBT_$zh8XJf0A;OhlxB6w2j3!*Sc>-Dn-Gt#o2=G$eec!FC9e
lCmdbq6j~O_pk>h+w2lx7G?-{#VY3M_$I-
-	
-	
-	
-	
-		
-		
-	
-	
-		
-		
-	
-	
-		
-	
-	
-		
-		
-	
-	
-		
-		
-		
-		
-	
-	
-		
-		
-		
-	
-	
-		
-		
-	
-	
-		
-		
-		
-	
-	
-		
-		
-		
-	
-	
-		
-		
-	
-	
-		
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-		
-		
-	
-	
-		
-		
-	
-	
-		
-		
-		
-	
-	
-		
-		
-		
-	
-	
-		
-		
-		
-		
-	
+  
+  
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+    
+  
 
\ No newline at end of file

From 6d5e9f3b64f5febc0a8501c16c6cd50487aa89a7 Mon Sep 17 00:00:00 2001
From: Claudio Clemens 
Date: Sat, 30 Mar 2024 09:01:45 +0100
Subject: [PATCH 26/31] Correct version number to 1.4.2-SNAPSHOT

---
 openpdf-fonts-extra/pom.xml |   2 +-
 openpdf/pom.xml             | 189 ++++++++++++++++++------------------
 pdf-swing/pom.xml           |  53 +++++-----
 pdf-toolbox/pom.xml         |  85 ++++++++--------
 pom.xml                     |   2 +-
 5 files changed, 167 insertions(+), 164 deletions(-)

diff --git a/openpdf-fonts-extra/pom.xml b/openpdf-fonts-extra/pom.xml
index 146aaf787..a8e792d76 100644
--- a/openpdf-fonts-extra/pom.xml
+++ b/openpdf-fonts-extra/pom.xml
@@ -5,7 +5,7 @@
   
     com.github.librepdf
     openpdf-parent
-    1.4.1-SNAPSHOT
+    1.4.2-SNAPSHOT
   
 
   openpdf-fonts-extra
diff --git a/openpdf/pom.xml b/openpdf/pom.xml
index eee68d082..40b085a0b 100644
--- a/openpdf/pom.xml
+++ b/openpdf/pom.xml
@@ -1,102 +1,103 @@
 
-
-    4.0.0
+
+  4.0.0
 
-    
-        com.github.librepdf
-        openpdf-parent
-        1.4.1-SNAPSHOT
-    
+  
+    com.github.librepdf
+    openpdf-parent
+    1.4.2-SNAPSHOT
+  
 
-    openpdf
+  openpdf
 
-    
-        com.github.librepdf.openpdf
-    
+  
+    com.github.librepdf.openpdf
+  
 
-    
-        
-            com.ibm.icu
-            icu4j
-            74.2
-            true
-        
-        
-            org.bouncycastle
-            bcprov-jdk18on
-            true
-        
-        
-            org.bouncycastle
-            bcpkix-jdk18on
-            true
-        
-        
-            org.apache.xmlgraphics
-            fop
-            true
-        
+  
+    
+      com.ibm.icu
+      icu4j
+      74.2
+      true
+    
+    
+      org.bouncycastle
+      bcprov-jdk18on
+      true
+    
+    
+      org.bouncycastle
+      bcpkix-jdk18on
+      true
+    
+    
+      org.apache.xmlgraphics
+      fop
+      true
+    
 
-        
-        
-            org.junit.jupiter
-            junit-jupiter-api
-            test
-        
-        
-            org.junit.jupiter
-            junit-jupiter-params
-            test
-        
-        
-            org.assertj
-            assertj-core
-            test
-        
-        
-            org.mockito
-            mockito-core
-            5.10.0
-            test
-        
-        
-            org.hamcrest
-            hamcrest
-            test
-        
-        
-            commons-io
-            commons-io
-            test
-        
-        
-            org.verapdf
-            validation-model
-            1.24.1
-            true
-            test
-        
-    
+    
+    
+      org.junit.jupiter
+      junit-jupiter-api
+      test
+    
+    
+      org.junit.jupiter
+      junit-jupiter-params
+      test
+    
+    
+      org.assertj
+      assertj-core
+      test
+    
+    
+      org.mockito
+      mockito-core
+      5.10.0
+      test
+    
+    
+      org.hamcrest
+      hamcrest
+      test
+    
+    
+      commons-io
+      commons-io
+      test
+    
+    
+      org.verapdf
+      validation-model
+      1.24.1
+      true
+      test
+    
+  
 
-    
-        
-            
-                src/main/resources
-            
-            
-                src/main/resources-filtered
-                true
-            
-        
-        
-            
-                org.apache.felix
-                maven-bundle-plugin
-                
-                    
-                    true
-                
-            
-        
-    
+  
+    
+      
+        src/main/resources
+      
+      
+        src/main/resources-filtered
+        true
+      
+    
+    
+      
+        org.apache.felix
+        maven-bundle-plugin
+        
+          
+          true
+        
+      
+    
+  
 
diff --git a/pdf-swing/pom.xml b/pdf-swing/pom.xml
index 7ea911a11..7a9115312 100644
--- a/pdf-swing/pom.xml
+++ b/pdf-swing/pom.xml
@@ -1,33 +1,34 @@
 
-
-    4.0.0
+
+  4.0.0
 
-    
-        com.github.librepdf
-        openpdf-parent
-        1.4.1-SNAPSHOT
-    
+  
+    com.github.librepdf
+    openpdf-parent
+    1.4.2-SNAPSHOT
+  
 
-    pdf-swing
+  pdf-swing
 
-    
-        com.github.librepdf.pdfSwing
-    
+  
+    com.github.librepdf.pdfSwing
+  
 
-    
-        
-            com.github.librepdf
-            openpdf
-            ${project.version}
-        
-        
-            org.swinglabs
-            pdf-renderer
-        
-        
-            org.dom4j
-            dom4j
-        
-    
+  
+    
+      com.github.librepdf
+      openpdf
+      ${project.version}
+    
+    
+      org.swinglabs
+      pdf-renderer
+    
+    
+      org.dom4j
+      dom4j
+    
+  
 
 
diff --git a/pdf-toolbox/pom.xml b/pdf-toolbox/pom.xml
index d0fcbb9da..1d69d20c4 100644
--- a/pdf-toolbox/pom.xml
+++ b/pdf-toolbox/pom.xml
@@ -1,50 +1,51 @@
 
-
-    4.0.0
+
+  4.0.0
 
-    
-        com.github.librepdf
-        openpdf-parent
-        1.4.1-SNAPSHOT
-    
+  
+    com.github.librepdf
+    openpdf-parent
+    1.4.2-SNAPSHOT
+  
 
-    pdf-toolbox
+  pdf-toolbox
 
-    
-        com.github.librepdf.pdfToolbox
-    
+  
+    com.github.librepdf.pdfToolbox
+  
 
-    
-        
-            com.github.librepdf
-            openpdf
-            ${project.version}
-        
-        
-            org.jfree
-            jfreechart
-        
-        
-            org.jfree
-            jcommon
-        
+  
+    
+      com.github.librepdf
+      openpdf
+      ${project.version}
+    
+    
+      org.jfree
+      jfreechart
+    
+    
+      org.jfree
+      jcommon
+    
 
-        
-        
-            jakarta.servlet
-            jakarta.servlet-api
-            test
-        
-        
-            org.junit.jupiter
-            junit-jupiter-api
-            test
-        
-        
-            org.assertj
-            assertj-core
-            test
-        
-    
+    
+    
+      jakarta.servlet
+      jakarta.servlet-api
+      test
+    
+    
+      org.junit.jupiter
+      junit-jupiter-api
+      test
+    
+    
+      org.assertj
+      assertj-core
+      test
+    
+  
 
 
diff --git a/pom.xml b/pom.xml
index 44c3bc254..fd6097fb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   com.github.librepdf
   openpdf-parent
-  1.4.1-SNAPSHOT 
+  1.4.2-SNAPSHOT 
   pom
 
   

From 3c973edfa02ce3867c9fc359bc4a09e1be86dff7 Mon Sep 17 00:00:00 2001
From: Claudio Clemens 
Date: Sat, 30 Mar 2024 09:03:01 +0100
Subject: [PATCH 27/31] Set version to 1.4.2

---
 openpdf-fonts-extra/pom.xml | 2 +-
 openpdf/pom.xml             | 2 +-
 pdf-swing/pom.xml           | 2 +-
 pdf-toolbox/pom.xml         | 2 +-
 pom.xml                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openpdf-fonts-extra/pom.xml b/openpdf-fonts-extra/pom.xml
index a8e792d76..072f655c7 100644
--- a/openpdf-fonts-extra/pom.xml
+++ b/openpdf-fonts-extra/pom.xml
@@ -5,7 +5,7 @@
   
     com.github.librepdf
     openpdf-parent
-    1.4.2-SNAPSHOT
+    1.4.2
   
 
   openpdf-fonts-extra
diff --git a/openpdf/pom.xml b/openpdf/pom.xml
index 40b085a0b..2d8fa4053 100644
--- a/openpdf/pom.xml
+++ b/openpdf/pom.xml
@@ -6,7 +6,7 @@
   
     com.github.librepdf
     openpdf-parent
-    1.4.2-SNAPSHOT
+    1.4.2
   
 
   openpdf
diff --git a/pdf-swing/pom.xml b/pdf-swing/pom.xml
index 7a9115312..6b8943e7f 100644
--- a/pdf-swing/pom.xml
+++ b/pdf-swing/pom.xml
@@ -6,7 +6,7 @@
   
     com.github.librepdf
     openpdf-parent
-    1.4.2-SNAPSHOT
+    1.4.2
   
 
   pdf-swing
diff --git a/pdf-toolbox/pom.xml b/pdf-toolbox/pom.xml
index 1d69d20c4..2336676bf 100644
--- a/pdf-toolbox/pom.xml
+++ b/pdf-toolbox/pom.xml
@@ -6,7 +6,7 @@
   
     com.github.librepdf
     openpdf-parent
-    1.4.2-SNAPSHOT
+    1.4.2
   
 
   pdf-toolbox
diff --git a/pom.xml b/pom.xml
index fd6097fb0..377b24934 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   com.github.librepdf
   openpdf-parent
-  1.4.2-SNAPSHOT 
+  1.4.2 
   pom
 
   

From 6610e636e7426ca8960167fce71271349c6d566d Mon Sep 17 00:00:00 2001
From: Teodor Danciu 
Date: Fri, 3 Apr 2026 14:54:51 +0300
Subject: [PATCH 28/31] modify visibility of fields and methods to allow
 subclassing PdfStructureTreeRoot

(cherry picked from commit c71083951591f55ef71addbd681066e55e13385f)
---
 .../com/lowagie/text/pdf/PdfStructureTreeRoot.java    |  6 ++++--
 .../src/main/java/com/lowagie/text/pdf/PdfWriter.java | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStructureTreeRoot.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStructureTreeRoot.java
index 631c27030..7dcc3da24 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStructureTreeRoot.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStructureTreeRoot.java
@@ -70,7 +70,8 @@ public class PdfStructureTreeRoot extends PdfDictionary {
     /**
      * Creates a new instance of PdfStructureTreeRoot
      */
-    PdfStructureTreeRoot(PdfWriter writer) {
+    /* Jaspersoft modification: made protected */
+    protected PdfStructureTreeRoot(PdfWriter writer) {
         super(PdfName.STRUCTTREEROOT);
         this.writer = writer;
         reference = writer.getPdfIndirectReference();
@@ -138,7 +139,8 @@ private void nodeProcess(PdfDictionary dictionary, PdfIndirectReference referenc
         }
     }
 
-    void buildTree() throws IOException {
+    /* Jaspersoft modification: made protected */
+    protected void buildTree() throws IOException {
         Map numTree = new HashMap<>();
         for (Integer i : parentTree.keySet()) {
             PdfArray ar = parentTree.get(i);
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java
index ba2ca8ac7..57933f284 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfWriter.java
@@ -2252,6 +2252,17 @@ public PdfStructureTreeRoot getStructureTreeRoot() {
         return structureTreeRoot;
     }
 
+    /* Jaspersoft modification start */
+    /**
+	 * Sets the structure tree root. It is not advisable to use this method directly, but it can be useful when subclassing the PdfStructureTreeRoot.
+	 *
+	 * @param structureTreeRoot the structure tree root to set
+	 */
+    public void setStructureTreeRoot(PdfStructureTreeRoot structureTreeRoot) {
+        this.structureTreeRoot = structureTreeRoot;
+    }
+    /* Jaspersoft modification end */
+
     /**
      * Use this method to get the Optional Content Properties Dictionary. Each call fills the dictionary with the
      * current layer state. It's advisable to only call this method right before close and do any modifications at that

From 22f6051b580be5aa14d9c482cf2712f63ab63b3e Mon Sep 17 00:00:00 2001
From: Lucian Chirita 
Date: Fri, 15 May 2026 15:07:45 +0300
Subject: [PATCH 29/31] honor X positions in glyph vectors

fixes https://github.com/Jaspersoft/jasperreports/issues/561

(cherry picked from commit 33eecabd2d0d1a5ae084c3ac986be80092f7eca0)
---
 .../com/lowagie/text/pdf/PdfContentByte.java  | 52 +++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java
index 9c2f401ab..93ff13f74 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java
@@ -151,6 +151,9 @@ public class PdfContentByte {
      */
     public static final int TEXT_RENDER_MODE_CLIP = 7;
     static final float MIN_FONT_SIZE = 0.0001f;
+    /* Jaspersoft modification start */
+    private static final double GLYPH_POSITION_TOLERANCE = 0.1;
+    /* Jaspersoft modification end */
     private static final float[] unitRect = {0, 0, 0, 1, 1, 0, 1, 1};
     private static final Map abrev = new HashMap<>();
     // membervariables
@@ -1746,9 +1749,52 @@ public void showText(GlyphVector glyphVector, int beginIndex, int endIndex) {
             throw new NullPointerException(
                     MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text"));
         }
-        byte[] b = state.fontDetails.convertToBytes(glyphVector, beginIndex, endIndex);
-        escapeString(b, content);
-        content.append("Tj").append_i(separator);
+        /* Jaspersoft modification start */
+        boolean needsAdjustment = false;
+        double curPos = 0;
+        for (int i = beginIndex; i < endIndex; i++) {
+            int glyphCode = glyphVector.getGlyphCode(i);
+            if (glyphCode == 0xFFFE || glyphCode == 0xFFFF) {
+                continue;
+            }
+
+            double targetPos = glyphVector.getGlyphPosition(i).getX();
+            if (Math.abs(curPos - targetPos) > GLYPH_POSITION_TOLERANCE) {
+                needsAdjustment = true;
+                break;
+            }
+
+            curPos = targetPos + glyphVector.getGlyphMetrics(i).getAdvanceX();
+        }
+
+        if (!needsAdjustment) {
+            byte[] b = state.fontDetails.convertToBytes(glyphVector, beginIndex, endIndex);
+            escapeString(b, content);
+            content.append("Tj").append_i(separator);
+            return;
+        }
+
+        content.append("[");
+        curPos = 0;
+        for (int i = beginIndex; i < endIndex; i++) {
+            int glyphCode = glyphVector.getGlyphCode(i);
+            if (glyphCode == 0xFFFE || glyphCode == 0xFFFF) {
+                continue;
+            }
+
+            double targetPos = glyphVector.getGlyphPosition(i).getX();
+            double adjustment = (curPos - targetPos) / state.size * 1000;
+            if (adjustment != 0) {
+                content.append(adjustment);
+            }
+
+            byte[] b = state.fontDetails.convertToBytes(glyphVector, i, i + 1);
+            escapeString(b, content);
+
+            curPos = targetPos + glyphVector.getGlyphMetrics(i).getAdvanceX();
+        }
+        content.append("]TJ").append_i(separator);
+        /* Jaspersoft modification end */
     }
 
     /**

From e6d6cb949c28435a0cdbabd8ac01b784169628fb Mon Sep 17 00:00:00 2001
From: Lucian Chirita 
Date: Wed, 20 May 2026 15:53:04 +0300
Subject: [PATCH 30/31] improve glyph vector X position adjustement

adds to 33eecabd2d0d1a5ae084c3ac986be80092f7eca0

fixes https://github.com/Jaspersoft/jasperreports/issues/561
fixes https://github.com/Jaspersoft/jasperreports/issues/301

(cherry picked from commit c82bc875353809e419d69aa96d66ec5329b202e0)
---
 .../com/lowagie/text/pdf/PdfContentByte.java  | 51 ++++++++-----------
 1 file changed, 20 insertions(+), 31 deletions(-)

diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java
index 93ff13f74..386d21fed 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java
@@ -1750,50 +1750,39 @@ public void showText(GlyphVector glyphVector, int beginIndex, int endIndex) {
                     MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text"));
         }
         /* Jaspersoft modification start */
-        boolean needsAdjustment = false;
-        double curPos = 0;
+        boolean neededAdjustment = false;
+        double expectedPos = glyphVector.getGlyphPosition(beginIndex).getX();
+        int segmentStart = beginIndex;
         for (int i = beginIndex; i < endIndex; i++) {
             int glyphCode = glyphVector.getGlyphCode(i);
             if (glyphCode == 0xFFFE || glyphCode == 0xFFFF) {
                 continue;
             }
 
-            double targetPos = glyphVector.getGlyphPosition(i).getX();
-            if (Math.abs(curPos - targetPos) > GLYPH_POSITION_TOLERANCE) {
-                needsAdjustment = true;
-                break;
+            double actualPos = glyphVector.getGlyphPosition(i).getX();
+            double delta = actualPos - expectedPos;
+            if (Math.abs(delta) > GLYPH_POSITION_TOLERANCE && i > segmentStart) {
+                if (!neededAdjustment) {
+                    neededAdjustment = true;
+                    content.append("[");
+                }
+                byte[] segmentBytes = state.fontDetails.convertToBytes(glyphVector, segmentStart, i);
+                escapeString(segmentBytes, content);
+                content.append(-(delta * 1000 / state.size));
+                segmentStart = i;
             }
-
-            curPos = targetPos + glyphVector.getGlyphMetrics(i).getAdvanceX();
+            expectedPos = actualPos + glyphVector.getGlyphMetrics(i).getAdvanceX();
         }
 
-        if (!needsAdjustment) {
+        if (!neededAdjustment) {
             byte[] b = state.fontDetails.convertToBytes(glyphVector, beginIndex, endIndex);
             escapeString(b, content);
             content.append("Tj").append_i(separator);
-            return;
-        }
-
-        content.append("[");
-        curPos = 0;
-        for (int i = beginIndex; i < endIndex; i++) {
-            int glyphCode = glyphVector.getGlyphCode(i);
-            if (glyphCode == 0xFFFE || glyphCode == 0xFFFF) {
-                continue;
-            }
-
-            double targetPos = glyphVector.getGlyphPosition(i).getX();
-            double adjustment = (curPos - targetPos) / state.size * 1000;
-            if (adjustment != 0) {
-                content.append(adjustment);
-            }
-
-            byte[] b = state.fontDetails.convertToBytes(glyphVector, i, i + 1);
-            escapeString(b, content);
-
-            curPos = targetPos + glyphVector.getGlyphMetrics(i).getAdvanceX();
+        } else {
+            byte[] remaining = state.fontDetails.convertToBytes(glyphVector, segmentStart, endIndex);
+            escapeString(remaining, content);
+            content.append("]TJ").append_i(separator);
         }
-        content.append("]TJ").append_i(separator);
         /* Jaspersoft modification end */
     }
 

From 265f0d4c28fab9e8dcefab081e32ac4402b669cc Mon Sep 17 00:00:00 2001
From: Tang Keyin 
Date: Fri, 9 Oct 2026 16:11:45 +0000
Subject: [PATCH 31/31] set version to 1.4.2.jaspersoft.1-SNAPSHOT

Signed-off-by: Tang Keyin 
---
 openpdf-fonts-extra/pom.xml | 2 +-
 openpdf/pom.xml             | 2 +-
 pdf-swing/pom.xml           | 2 +-
 pdf-toolbox/pom.xml         | 2 +-
 pom.xml                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openpdf-fonts-extra/pom.xml b/openpdf-fonts-extra/pom.xml
index 072f655c7..3ad756682 100644
--- a/openpdf-fonts-extra/pom.xml
+++ b/openpdf-fonts-extra/pom.xml
@@ -5,7 +5,7 @@
   
     com.github.librepdf
     openpdf-parent
-    1.4.2
+    1.4.2.jaspersoft.1-SNAPSHOT
   
 
   openpdf-fonts-extra
diff --git a/openpdf/pom.xml b/openpdf/pom.xml
index 2d8fa4053..ac6e8ab17 100644
--- a/openpdf/pom.xml
+++ b/openpdf/pom.xml
@@ -6,7 +6,7 @@
   
     com.github.librepdf
     openpdf-parent
-    1.4.2
+    1.4.2.jaspersoft.1-SNAPSHOT
   
 
   openpdf
diff --git a/pdf-swing/pom.xml b/pdf-swing/pom.xml
index 6b8943e7f..c05345eff 100644
--- a/pdf-swing/pom.xml
+++ b/pdf-swing/pom.xml
@@ -6,7 +6,7 @@
   
     com.github.librepdf
     openpdf-parent
-    1.4.2
+    1.4.2.jaspersoft.1-SNAPSHOT
   
 
   pdf-swing
diff --git a/pdf-toolbox/pom.xml b/pdf-toolbox/pom.xml
index 2336676bf..b1d70b2cf 100644
--- a/pdf-toolbox/pom.xml
+++ b/pdf-toolbox/pom.xml
@@ -6,7 +6,7 @@
   
     com.github.librepdf
     openpdf-parent
-    1.4.2
+    1.4.2.jaspersoft.1-SNAPSHOT
   
 
   pdf-toolbox
diff --git a/pom.xml b/pom.xml
index 377b24934..66c932efb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   com.github.librepdf
   openpdf-parent
-  1.4.2 
+  1.4.2.jaspersoft.1-SNAPSHOT 
   pom